ooo-build r14771 - in trunk: . patches/vba

From: pflin svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14771 - in trunk: . patches/vba
Date: Mon, 8 Dec 2008 02:52:49 +0000 (UTC)
Author: pflin
Date: Mon Dec  8 02:52:49 2008
New Revision: 14771
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14771&view=rev

Log:
2008-12-08  Fong Lin  <pflin novell com>
	* patches/vba/vba-word-support.diff: Fixed some type errors.



Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-word-support.diff

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Mon Dec  8 02:52:49 2008
@@ -168,7 +168,7 @@
  						bSetName = false; // don't overwrite uno name
  					else
 diff --git forms/source/misc/InterfaceContainer.cxx forms/source/misc/InterfaceContainer.cxx
-index 78d65d6..f908eff 100644
+index c7e9494..053cda6 100644
 --- forms/source/misc/InterfaceContainer.cxx
 +++ forms/source/misc/InterfaceContainer.cxx
 @@ -132,9 +132,8 @@ OInterfaceContainer::fakeVbaEventsHack(  sal_Int32 _nIndex )
@@ -475,7 +475,7 @@
  			bool bAsComment = !bLoadExecutable || !lcl_hasVBAEnabled();
              aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
 diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index c09c087..8abc135 100644
+index bd1a653..3beaa29 100644
 --- sc/source/ui/docshell/docsh.cxx
 +++ sc/source/ui/docshell/docsh.cxx
 @@ -131,7 +131,8 @@
@@ -525,10 +525,10 @@
          uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
          if ( xEvt.is() )
 diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index 92f87a3..d1d08ca 100644
+index a340ff2..fd91983 100644
 --- sc/source/ui/unoobj/docuno.cxx
 +++ sc/source/ui/unoobj/docuno.cxx
-@@ -106,7 +106,6 @@ using namespace com::sun::star::document::VbaEventId;
+@@ -107,7 +107,6 @@ using namespace com::sun::star::document::VbaEventId;
  //	alles ohne Which-ID, Map nur fuer PropertySetInfo
  
  //!	umbenennen, sind nicht mehr nur Options
@@ -536,7 +536,7 @@
  const SfxItemPropertyMap* lcl_GetDocOptPropertyMap()
  {
  	static SfxItemPropertyMap aDocOptPropertyMap_Impl[] =
-@@ -313,7 +312,6 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
+@@ -314,7 +313,6 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
  	SC_QUERYINTERFACE( view::XRenderable )
  	SC_QUERYINTERFACE( document::XLinkTargetSupplier )
  	SC_QUERYINTERFACE( beans::XPropertySet )
@@ -544,7 +544,7 @@
  	SC_QUERYINTERFACE( document::XDocumentEventCompatibleHelper)
  	SC_QUERYINTERFACE( lang::XMultiServiceFactory )
  	SC_QUERYINTERFACE( lang::XServiceInfo )
-@@ -1715,49 +1713,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
+@@ -1720,49 +1718,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
  
  	return concatServiceNames( aMyServices, aDrawServices );
  }
@@ -695,10 +695,10 @@
  	return xRet;
  }
 diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
-index e90317d..0cb5b40 100644
+index 447e0e7..1e89e5b 100644
 --- scp2/source/ooo/file_library_ooo.scp
 +++ scp2/source/ooo/file_library_ooo.scp
-@@ -422,6 +422,17 @@ File gid_File_Lib_Vbaobj
+@@ -406,6 +406,17 @@ File gid_File_Lib_Vbaobj
    #endif
  End
  
@@ -896,7 +896,7 @@
              xRet =  (cppu::OWeakObject*)new SwXFootnote(sal_False);
          break;
 diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index b581124..4dc4011 100644
+index c292f2b..5055206 100644
 --- sw/source/filter/ww8/ww8par.cxx
 +++ sw/source/filter/ww8/ww8par.cxx
 @@ -140,6 +140,8 @@
@@ -906,9 +906,9 @@
 +#include <comphelper/processfactory.hxx>
 +#include <basic/basmgr.hxx>
  
- #define MM_250 1417             // WW-Default fuer Hor. Seitenraender: 2.5 cm
- #define MM_200 1134             // WW-Default fuer u.Seitenrand: 2.0 cm
-@@ -3971,7 +3973,38 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
+ #ifdef DEBUG
+ #include <iostream>
+@@ -4003,7 +4005,38 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
      }
      else //ordinary case
      {
@@ -947,7 +947,7 @@
      }
  
      ::SetProgressState(nProgress, mpDocShell);    // Update
-@@ -4045,26 +4078,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
+@@ -4077,26 +4110,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
              eMode |= nsRedlineMode_t::REDLINE_ON;
          if( pWDop->fRMView )
              eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
@@ -976,10 +976,10 @@
      maInsertedTables.DelAndMakeTblFrms();
 diff --git sw/source/ui/vba/helperdecl.hxx sw/source/ui/vba/helperdecl.hxx
 new file mode 100644
-index 0000000..1581e66
+index 0000000..4ed2834
 --- /dev/null
 +++ sw/source/ui/vba/helperdecl.hxx
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,143 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1009,6 +1009,10 @@
 + * for a copy of the LGPLv3 License.
 + *
 + ************************************************************************/
++#ifndef SW_VBA_HELPERDEC1_HXX
++#define SW_VBA_HELPERDEC1_HXX
++
++
 +#include <comphelper/servicedecl.hxx>
 +#include <ooo/vba/XHelperInterface.hpp>
 +
@@ -1118,6 +1122,7 @@
 +} // namespace service_decl
 +} // namespace comphelper
 +
++#endif /* SW_VBA_HELPERDEC1_HXX */
 diff --git sw/source/ui/vba/makefile.mk sw/source/ui/vba/makefile.mk
 new file mode 100644
 index 0000000..96b7c8b
@@ -1403,7 +1408,7 @@
 +}
 diff --git sw/source/ui/vba/vbaapplication.hxx sw/source/ui/vba/vbaapplication.hxx
 new file mode 100644
-index 0000000..cfe655e
+index 0000000..0496ccf
 --- /dev/null
 +++ sw/source/ui/vba/vbaapplication.hxx
 @@ -0,0 +1,58 @@
@@ -1436,8 +1441,8 @@
 + * for a copy of the LGPLv3 License.
 + *
 + ************************************************************************/
-+#ifndef SC_VBA_APPLICATION_HXX
-+#define SC_VBA_APPLICATION_HXX
++#ifndef SW_VBA_APPLICATION_HXX
++#define SW_VBA_APPLICATION_HXX
 +
 +
 +#include <ooo/vba/word/XApplication.hpp>
@@ -1464,7 +1469,7 @@
 +	virtual rtl::OUString& getServiceImplName();
 +	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 +};
-+#endif /* SC_VBA_APPLICATION_HXX */
++#endif /* SW_VBA_APPLICATION_HXX */
 diff --git sw/source/ui/vba/vbaglobals.cxx sw/source/ui/vba/vbaglobals.cxx
 new file mode 100644
 index 0000000..ccdafd3
@@ -1582,7 +1587,7 @@
 +
 diff --git sw/source/ui/vba/vbaglobals.hxx sw/source/ui/vba/vbaglobals.hxx
 new file mode 100644
-index 0000000..e150515
+index 0000000..e3ec3d8
 --- /dev/null
 +++ sw/source/ui/vba/vbaglobals.hxx
 @@ -0,0 +1,69 @@
@@ -1615,8 +1620,8 @@
 + * for a copy of the LGPLv3 License.
 + *
 + ************************************************************************/
-+#ifndef SC_VBA_GLOBALS
-+#define SC_VBA_GLOBALS
++#ifndef SW_VBA_GLOBALS_HXX
++#define SW_VBA_GLOBALS_HXX
 +
 +#include <com/sun/star/lang/XServiceInfo.hpp>
 +#include <com/sun/star/lang/XInitialization.hpp>
@@ -1654,7 +1659,7 @@
 +                        throw (css::uno::RuntimeException);
 +	virtual css::uno::Sequence< css::uno::Any > SAL_CALL getGlobals(  ) throw (css::uno::RuntimeException);
 +    };
-+#endif // 
++#endif /* SW_VBA_GLOBALS_HXX */ 
 diff --git sw/source/ui/vba/vbahelper.cxx sw/source/ui/vba/vbahelper.cxx
 new file mode 100644
 index 0000000..8e448ce
@@ -2145,7 +2150,7 @@
 +} //ooo
 diff --git sw/source/ui/vba/vbahelper.hxx sw/source/ui/vba/vbahelper.hxx
 new file mode 100644
-index 0000000..b8f4615
+index 0000000..51ffb2f
 --- /dev/null
 +++ sw/source/ui/vba/vbahelper.hxx
 @@ -0,0 +1,331 @@
@@ -2178,8 +2183,8 @@
 + * for a copy of the LGPLv3 License.
 + *
 + ************************************************************************/
-+#ifndef SC_VBA_HELPER_HXX
-+#define SC_VBA_HELPER_HXX
++#ifndef SW_VBA_HELPER_HXX
++#define SW_VBA_HELPER_HXX
 +
 +#include <com/sun/star/drawing/XShape.hpp>
 +#include <com/sun/star/beans/XIntrospectionAccess.hpp>
@@ -2472,17 +2477,17 @@
 +namespace ov = ooo::vba;
 +
 +#ifdef DEBUG
-+#  define SC_VBA_FIXME(a) OSL_TRACE( a )
-+#  define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
++#  define SW_VBA_FIXME(a) OSL_TRACE( a )
++#  define SW_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
 +#else
-+#  define SC_VBA_FIXME(a)
-+#  define SC_VBA_STUB()
++#  define SW_VBA_FIXME(a)
++#  define SW_VBA_STUB()
 +#endif
 +
 +#endif
 diff --git sw/source/ui/vba/vbahelperinterface.hxx sw/source/ui/vba/vbahelperinterface.hxx
 new file mode 100644
-index 0000000..b01f524
+index 0000000..644c390
 --- /dev/null
 +++ sw/source/ui/vba/vbahelperinterface.hxx
 @@ -0,0 +1,116 @@
@@ -2515,8 +2520,8 @@
 + * for a copy of the LGPLv3 License.
 + *
 + ************************************************************************/
-+#ifndef SC_VBA_HELPERINTERFACE_HXX
-+#define SC_VBA_HELPERINTERFACE_HXX
++#ifndef SW_VBA_HELPERINTERFACE_HXX
++#define SW_VBA_HELPERINTERFACE_HXX
 +
 +#include <cppuhelper/implbase1.hxx>
 +#include <ooo/vba/XHelperInterface.hpp>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]