ooo-build r14954 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 19:28:04 2008
New Revision: 14954
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14954&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/vba/svx-source-form-fmundo-cxx-m37.diff:
	* patches/vba/svx-source-form-fmundo-cxx.diff:
	* patches/dev300/apply: adjusted for dev300-m38.



Added:
   trunk/patches/vba/svx-source-form-fmundo-cxx-m37.diff   (props changed)
      - copied unchanged from r14946, /trunk/patches/vba/svx-source-form-fmundo-cxx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/svx-source-form-fmundo-cxx.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 19:28:04 2008
@@ -1694,8 +1694,14 @@
 svx-source-inc-fmundo-hxx.diff, i#68893
 svx-source-form-fmscriptingenv-cxx.diff, i#68893
 svx-source-form-makefile.diff, i#68893
+
+[ VBAObjects < dev300-m38 ]
+svx-source-form-fmundo-cxx-m37.diff, i#68893
+
+[ VBAObjects >= dev300-m38 ]
 svx-source-form-fmundo-cxx.diff, i#68893
 
+[ VBAObjects ]
 vbaevents-services-build.diff, i#68893
 
 scp_vba_uno_service.diff, i#68893

Modified: trunk/patches/vba/svx-source-form-fmundo-cxx.diff
==============================================================================
--- trunk/patches/vba/svx-source-form-fmundo-cxx.diff	(original)
+++ trunk/patches/vba/svx-source-form-fmundo-cxx.diff	Mon Dec 29 19:28:04 2008
@@ -1,19 +1,8 @@
-Index: svx/source/form/fmundo.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/form/fmundo.cxx,v
-retrieving revision 1.40
-diff -u -p -r1.40 fmundo.cxx
---- svx/source/form/fmundo.cxx	24 Oct 2006 15:12:39 -0000	1.40
-+++ svx/source/form/fmundo.cxx	21 Jun 2007 19:43:39 -0000
-@@ -152,6 +152,7 @@
- #include <comphelper/stl_types.hxx>
- #endif
- 
-+
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::awt;
- using namespace ::com::sun::star::beans;
-@@ -164,6 +165,90 @@ using namespace ::com::sun::star::reflec
+diff --git svx/source/form/fmundo.cxx svx/source/form/fmundo.cxx
+index ee1d592..f3b5c3d 100644
+--- svx/source/form/fmundo.cxx
++++ svx/source/form/fmundo.cxx
+@@ -86,6 +86,90 @@ using namespace ::com::sun::star::reflection;
  using namespace ::com::sun::star::form::binding;
  using namespace ::svxform;
  
@@ -104,7 +93,7 @@
  //------------------------------------------------------------------------------
  // some helper structs for caching property infos
  //------------------------------------------------------------------------------
-@@ -206,6 +291,13 @@ FmXUndoEnvironment::FmXUndoEnvironment(F
+@@ -128,6 +212,13 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
                     ,m_bDisposed( false )
  {
  	DBG_CTOR(FmXUndoEnvironment,NULL);
@@ -118,21 +107,21 @@
  }
  
  //------------------------------------------------------------------------------
-@@ -784,9 +876,17 @@ void FmXUndoEnvironment::switchListening
- 	    Reference< XEventAttacherManager > xManager( _rxContainer, UNO_QUERY );
+@@ -752,9 +843,17 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
  	    if ( xManager.is() )
+ 	    {
              if ( _bStartListening )
 +            {
  		        m_pScriptingEnv->registerEventAttacherManager( xManager );
-+			if ( m_vbaListener.is() )
-+				xManager->addScriptListener( m_vbaListener );
++                if ( m_vbaListener.is() )
++                    xManager->addScriptListener( m_vbaListener );
 +            }
              else
 +            {
  		        m_pScriptingEnv->revokeEventAttacherManager( xManager );
-+			if ( m_vbaListener.is() )
-+				xManager->removeScriptListener( m_vbaListener );
++                if ( m_vbaListener.is() )
++                    xManager->removeScriptListener( m_vbaListener );
 +            }
+ 		}
  
          // also handle all children of this element
- 	    sal_uInt32 nCount = _rxContainer->getCount();