[ooo-build-commit] patches/dev300

[Noel Power]

 patches/dev300/apply                  |    1 +
 patches/dev300/fix-embedobj-load.diff |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit fc8dbb016ba89eee27efabb750ca8f350b5a8199
Author: Noel Power <noel.power at novell.com>
Date:   Wed Nov 25 16:53:10 2009 +0000

    fix problem loading embedded ole object ( word doc ) when loading doc file
    
    * patches/dev300/apply:
    * patches/dev300/fix-embedobj-load.diff: fix for n#557965

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c2c5b35..082550d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1704,6 +1704,7 @@ vba-word-support-m4.diff, Fong
 vba-reenable-cwssheetproctectbits.diff
 eventhelper-closecrash-fix.diff, n#438606
 vba-fix-find-wraparound-onfail.diff, n#554261
+fix-embedobj-load.diff, n#557965
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/dev300/fix-embedobj-load.diff b/patches/dev300/fix-embedobj-load.diff
new file mode 100644
index 0000000..73234df
--- /dev/null
+++ b/patches/dev300/fix-embedobj-load.diff
@@ -0,0 +1,18 @@
+diff --git sfx2/source/doc/sfxbasemodel.cxx sfx2/source/doc/sfxbasemodel.cxx
+index 28355da..1ebd5ae 100644
+--- sfx2/source/doc/sfxbasemodel.cxx
++++ sfx2/source/doc/sfxbasemodel.cxx
+@@ -3624,7 +3624,12 @@ void SAL_CALL SfxBaseModel::switchToStorage( const uno::Reference< XSTORAGE >& x
+                                             uno::Reference< uno::XInterface >(),
+                                             nError ? nError : ERRCODE_IO_GENERAL );
+     }
+-
++    // UICfgMgr has a reference to the old storage, update it
++    uno::Reference< ui::XUIConfigurationStorage > xUICfgMgrStorage( getUIConfigurationManager(), uno::UNO_QUERY );
++    if ( xUICfgMgrStorage.is() )
++    {
++        xUICfgMgrStorage->setStorage( xStorage ); 
++    } 
+     m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE;
+ }
+