Index: sw/source/ui/app/docsh.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/docsh.cxx,v
retrieving revision 1.71.24.1
diff -u -p -r1.71.24.1 docsh.cxx
--- sw/source/ui/app/docsh.cxx	17 Aug 2007 07:10:07 -0000	1.71.24.1
+++ sw/source/ui/app/docsh.cxx	14 Nov 2007 12:12:36 -0000
@@ -642,16 +642,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& 
             xDocSh->DoClose();
 		}
 
-        if( pDoc->ContainsMSVBasic() )
-        {
-            //TODO/MBA: it looks as that this code can be removed!
-            //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
-            //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
-            if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
-                nVBWarning = SvxImportMSVBasic::
-                                GetSaveWarningOfMSVBAStorage( *this );
-            pDoc->SetContainsMSVBasic( FALSE );
-        }
 
 		// TabellenBox Edit beenden!
 		if( pWrtShell )
Index: svx/source/msfilter/msoleexp.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/msfilter/msoleexp.cxx,v
retrieving revision 1.20
diff -u -p -r1.20 msoleexp.cxx
--- svx/source/msfilter/msoleexp.cxx	27 Jun 2007 18:35:44 -0000	1.20
+++ svx/source/msfilter/msoleexp.cxx	14 Nov 2007 12:19:05 -0000
@@ -272,7 +272,12 @@ void SvxMSExportOLEObjects::ExportOLEObj
         aSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
         aSeq[1].Value <<= ::rtl::OUString( pExpFilter->GetName() );
         uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
-        xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
+        try
+        {
+            xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
+        }
+        catch( uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ? 
+        
         SotStorageRef xOLEStor = new SotStorage( pStream, TRUE );
         xOLEStor->CopyTo( &rDestStg );
         rDestStg.Commit();
