[Libreoffice-commits] core.git: filter/source

Noel Power noel.power at suse.com
Thu Jun 27 02:36:40 PDT 2013


 filter/source/msfilter/svdfppt.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7abce44fbd7385d6c67c74db10dc0d25a7093abb
Author: Noel Power <noel.power at suse.com>
Date:   Thu Jun 27 10:32:15 2013 +0100

    roundtrip VBA project blob for ppt
    
    Need to save out the VBA project storage to ensure we don't get any
    nasty warnings trying to open ppt files containing old controls
    
    Change-Id: Ic2ff3ac5863ee3b901b1ee48f7d45e82dcb27ff9

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2e37372..1f1e3a6 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2008,12 +2008,10 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
                                         }
                                         if ( i && bCopied )
                                         {
-                                            SvxImportMSVBasic aMSVBas( *pShell, *xDest );
-
                                             uno::Reference < embed::XStorage > xDoc( pShell->GetStorage() );
                                             if ( xDoc.is() )
                                             {
-                                                SotStorageRef xVBA = SotStorage::OpenOLEStorage( xDoc, String( RTL_CONSTASCII_USTRINGPARAM( "_MS_VBA_Macros" ) ) );
+                                                SotStorageRef xVBA = SotStorage::OpenOLEStorage( xDoc, SvxImportMSVBasic::GetMSBasicStorageName() );
                                                 if ( xVBA.Is() && ( xVBA->GetError() == SVSTREAM_OK ) )
                                                 {
                                                     SotStorageRef xSubVBA = xVBA->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM( "_MS_VBA_Overhead" ) ) );
@@ -2048,6 +2046,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
                                                         }
                                                     }
                                                 }
+                                                xVBA->Commit();
                                             }
                                         }
                                     }


More information about the Libreoffice-commits mailing list