[ooo-build-commit] patches/vba

[Tor Lillqvist]

 patches/vba/vbaevents-services-sources.diff |   38 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 4fe037bd62f9827dae3e3bab9e2e45ee2800ba64
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 17:53:01 2009 +0300

    Adapt vbaevents-services-sources.diff for dev300-m54
    
    * patches/vba/vbaevents-services-sources.diff: Adapt for dev300-m54.

diff --git a/patches/vba/vbaevents-services-sources.diff b/patches/vba/vbaevents-services-sources.diff
index 8f88599..ca10481 100644
--- a/patches/vba/vbaevents-services-sources.diff
+++ b/patches/vba/vbaevents-services-sources.diff
@@ -122,16 +122,16 @@
 +
 +
 +
---- comphelper/source/misc/makefile.mk.old	2009-04-02 10:56:32.000000000 +0000
-+++ comphelper/source/misc/makefile.mk	2009-04-06 16:41:59.000000000 +0000
+--- comphelper/source/misc/makefile.mk
++++ comphelper/source/misc/makefile.mk
 @@ -58,6 +58,7 @@ SLOFILES=   \
              $(SLO)$/componentmodule.obj \
              $(SLO)$/configurationhelper.obj \
              $(SLO)$/documentinfo.obj \
 +	    $(SLO)$/evtmethodhelper.obj \
+             $(SLO)$/documentiologring.obj \
              $(SLO)$/evtlistenerhlp.obj \
              $(SLO)$/facreg.obj \
-             $(SLO)$/ihwrapnofilter.obj \
 --- extensions/source/propctrlr/eventhandler.cxx.old	2009-04-02 10:51:17.000000000 +0000
 +++ extensions/source/propctrlr/eventhandler.cxx	2009-04-06 16:41:59.000000000 +0000
 @@ -62,6 +62,7 @@
@@ -586,8 +586,8 @@
      const String&   GetUpperName() const;
  
  	const String&	GetPageStyle() const					{ return aPageStyle; }
---- sc/source/core/data/document.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/core/data/document.cxx	2009-04-06 16:41:59.000000000 +0000
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
 @@ -154,6 +154,32 @@ BOOL ScDocument::GetName( SCTAB nTab, St
  	return FALSE;
  }
@@ -643,9 +643,9 @@
 +                pTab[nPos]->SetCodeName( rName );
  				++nMaxTableNumber;
 +
- 				for (i = 0; i <= MAXTAB; i++)
- 					if (pTab[i])
- 						pTab[i]->UpdateCompile();
+                 // UpdateBroadcastAreas must be called between UpdateInsertTab, 
+                 // which ends listening, and StartAllListeners, to not modify 
+                 // areas that are to be inserted by starting listeners.
 @@ -420,7 +453,10 @@ BOOL ScDocument::DeleteTab( SCTAB nTab,
  									pRefUndoDoc ? pRefUndoDoc->pTab[i] : 0);
  				delete pTab[nTab];
@@ -704,16 +704,16 @@
  	protected:
          ExcScenarioList         aScenList;
  
---- sc/source/ui/unoobj/docuno.cxx.old	2009-04-06 16:41:53.000000000 +0000
-+++ sc/source/ui/unoobj/docuno.cxx	2009-04-06 16:41:59.000000000 +0000
+--- sc/source/ui/unoobj/docuno.cxx
++++ sc/source/ui/unoobj/docuno.cxx
 @@ -104,6 +104,7 @@ using namespace com::sun::star;
  //	alles ohne Which-ID, Map nur fuer PropertySetInfo
  
  //!	umbenennen, sind nicht mehr nur Options
 +#include <com/sun/star/script/ScriptEventDescriptor.hpp>
- const SfxItemPropertyMap* lcl_GetDocOptPropertyMap()
+ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
  {
- 	static SfxItemPropertyMap aDocOptPropertyMap_Impl[] =
+     static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
 @@ -311,6 +312,7 @@ uno::Any SAL_CALL ScModelObj::queryInter
  	SC_QUERYINTERFACE( view::XRenderable )
  	SC_QUERYINTERFACE( document::XLinkTargetSupplier )
@@ -2013,22 +2013,24 @@
 +    <runtime-module-dependency>sal3</runtime-module-dependency>
 +    
 +</module-description>
---- svx/source/form/fmtools.cxx.old	2009-04-02 11:03:31.000000000 +0000
-+++ svx/source/form/fmtools.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -105,6 +105,7 @@
+--- svx/source/form/fmtools.cxx
++++ svx/source/form/fmtools.cxx
+@@ -105,7 +105,7 @@
+ #include <comphelper/extract.hxx>
  #include <comphelper/uno3.hxx>
  #include <connectivity/dbexception.hxx>
- #include <comphelper/extract.hxx>
+-#include <comphelper/extract.hxx>
 +#include <comphelper/evtmethodhelper.hxx>
  #include <cppuhelper/typeprovider.hxx>
  #include <algorithm>
- 
-@@ -719,36 +720,6 @@ sal_Int16 getControlTypeByObject(const R
+ #include <rtl/logfile.hxx>
+@@ -719,37 +720,6 @@ sal_Int16 getControlTypeByObject(const R
  	return ::rtl::OUString();
  }
  //------------------------------------------------------------------------------
 -Sequence< ::rtl::OUString> getEventMethods(const Type& type)
 -{
+-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::getEventMethods" );
 -	typelib_InterfaceTypeDescription *pType=0;
 -	type.getDescription( (typelib_TypeDescription**)&pType);
 -