applied_patches/0397-vba-fix-docmodule-import-crash.diff

   1 diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
   2 index 3b2feb0..2826ed4 100644
   3 --- svx/source/msfilter/svxmsbas.cxx
   4 +++ svx/source/msfilter/svxmsbas.cxx
   5 @@ -457,8 +457,15 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
   6                                 // get the api object for the codename
   7                                 if ( xVBACodeNamedObjectAccess.is() )
   8                                 {
   9 -                                       sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );
  10 -                                       OSL_TRACE("** Straight up creation of Module");
  11 +                                       try
  12 +                                       {
  13 +                                               sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );
  14 +                                               OSL_TRACE("** Straight up creation of Module");
  15 +                                       }
  16 +                                       catch(uno::Exception& e)
  17 +                                       {
  18 +                                               OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
  19 +                                       }
  20                                 }
  21                         }
  22                          aSourceAny <<= sModuleInfo;