[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                          |    5 +--
 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |   16 +---------
 2 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit fe769fbfeca9e2eb44ed4e3f13c487e8f5a8216d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:11:00 2011 +0300

    Make sfx2-pre-and-postprocess-during-save-load.diff apply again

diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
index a3c6d27..c18b47c 100644
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
@@ -1,10 +1,3 @@
----
- package/source/xstor/xstorage.cxx |    8 +-
- sfx2/source/doc/objstor.cxx       |  257 ++++++++++++++++++++++++++++++++++++-
- 2 files changed, 251 insertions(+), 14 deletions(-)
-
-diff --git package/source/xstor/xstorage.cxx package/source/xstor/xstorage.cxx
-index c6cc37f..848c7c6 100644
 --- package/source/xstor/xstorage.cxx
 +++ package/source/xstor/xstorage.cxx
 @@ -4458,13 +4458,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const ::rtl::OUString& aName )
@@ -22,8 +15,6 @@ index c6cc37f..848c7c6 100644
      }
  
      return ( pElement != NULL );
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index a2c1047..24e6c30 100644
 --- sfx2/source/doc/objstor.cxx
 +++ sfx2/source/doc/objstor.cxx
 @@ -105,6 +105,9 @@
@@ -262,7 +253,7 @@ index a2c1047..24e6c30 100644
  
  sal_Bool SfxObjectShell::SaveTo_Impl
 @@ -1554,6 +1737,59 @@ sal_Bool SfxObjectShell::SaveTo_Impl
-             bOk = SaveChildren( TRUE );
+             bOk = SaveChildren( sal_True );
      }
  
 +    if (bOk) { // commit *before* we do the conversion!
@@ -282,7 +273,7 @@ index a2c1047..24e6c30 100644
 +            // setup status bar
 +            SfxItemSet *pSet2 = rMedium.GetItemSet();
 +            const SfxUnoAnyItem *pItem=NULL;
-+            SfxItemState ret=pSet2->GetItemState( SID_PROGRESS_STATUSBAR_CONTROL, TRUE, (const SfxPoolItem**)&pItem);
++            SfxItemState ret=pSet2->GetItemState( SID_PROGRESS_STATUSBAR_CONTROL, sal_True, (const SfxPoolItem**)&pItem);
 +            uno::Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator;
 +            if (ret==SFX_ITEM_SET && pItem!=NULL)
 +            {
@@ -350,6 +341,3 @@ index a2c1047..24e6c30 100644
          for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ )
          {
              if ( aSubElements[nInd].equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Configurations" ) ) ) )
--- 
-1.7.0.1
-
commit 3c3a67d1db3a9be02f20feb87e34ae64771d069a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:10:34 2011 +0300

    VBAObjects is very unhappy applying, bypass for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 959795e..5457ba0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -593,14 +593,13 @@ mono-climaker-bridgetest.diff
 [ MonoComp ]
 mono-component-support.diff
 
-[ VBAObjects ]
+# FIXME 2011-04-04: Not much here applies
+[ VBAObjects and not VBAObjects  ]
 SectionOwner => noelpwer
 # fix vbasupport for field related changes ( note this code
 # is disabled in vbasupportdev300 upstream )
 cws-vbasupportdev300_m83-fix.diff, cbosdo
 vba-enable-fieldrelatedbits.diff
-# This one is in the repo, it seems
-#vba-container-controls.diff
 # need to adapt ooo-build wrt the changes intorduced into container_controls
 oox-projectname-oobuild-specifix.diff
 # fix problem with inserting imported modules with oox