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

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Nov 21 12:42:59 2008
New Revision: 14566
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14566&view=rev

Log:
2008-11-21  Noel Power  <noel power novell com>

        * vba-fix-docmodule-import-crash.diff: fix for bnc#447560
        * patches/dev300/apply:



Added:
   trunk/patches/vba/vba-fix-docmodule-import-crash.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 21 12:42:59 2008
@@ -1801,6 +1801,8 @@
 # fix window.SplitRow issue
 vba-window-api-fix.diff, Fong
 
+vba-fix-docmodule-import-crash.diff, n#447560
+
 [ VBAObjects < ooo300-m3 ]
 bytearray-string-fix.diff, i#91911, Fong
 

Added: trunk/patches/vba/vba-fix-docmodule-import-crash.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-fix-docmodule-import-crash.diff	Fri Nov 21 12:42:59 2008
@@ -0,0 +1,22 @@
+diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
+index 3b2feb0..2826ed4 100644
+--- svx/source/msfilter/svxmsbas.cxx
++++ svx/source/msfilter/svxmsbas.cxx
+@@ -457,8 +457,15 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
+ 				// get the api object for the codename
+ 				if ( xVBACodeNamedObjectAccess.is() )
+ 				{
+-					sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
+-					OSL_TRACE("** Straight up creation of Module");
++					try
++					{
++						sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
++						OSL_TRACE("** Straight up creation of Module");
++					}
++					catch(uno::Exception& e)
++					{
++						OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
++					}
+ 				}
+ 			}
+                         aSourceAny <<= sModuleInfo;