ooo-build r14855 - in trunk: . patches/dev300

[noelpwer svn gnome org]

Author: noelpwer
Date: Mon Dec 15 16:34:03 2008
New Revision: 14855
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14855&view=rev

Log:
2008-12-15  Noel Power  <noel power novell com>

        *  patches/dev300/vba-xl-import-crash.diff: tentative fix for n#458985



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/vba-xl-import-crash.diff

Modified: trunk/patches/dev300/vba-xl-import-crash.diff
==============================================================================
--- trunk/patches/dev300/vba-xl-import-crash.diff	(original)
+++ trunk/patches/dev300/vba-xl-import-crash.diff	Mon Dec 15 16:34:03 2008
@@ -1,12 +1,13 @@
---- basic.orig/source/basmgr/basicmanagerrepository.cxx	2008-11-25 19:14:29.000000000 +0000
-+++ basic/source/basmgr/basicmanagerrepository.cxx	2008-12-01 17:22:12.000000000 +0000
-@@ -431,7 +431,8 @@ namespace basic
-         {
- 		    // load BASIC-manager
- 		    SfxErrorContext aErrContext( ERRCTX_SFX_LOADBASIC,
--                ::comphelper::DocumentInfo::getDocumentTitle( _rxDocumentModel ) );
-+                //::comphelper::DocumentInfo::getDocumentTitle( _rxDocumentModel ) );
-+                ::rtl::OUString::createFromAscii("Can't Access title") );
- 		    String aAppBasicDir = SvtPathOptions().GetBasicPath();
+diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
+index 80944e4..204dd55 100644
+--- sfx2/source/doc/objserv.cxx
++++ sfx2/source/doc/objserv.cxx
+@@ -1333,7 +1333,7 @@ sal_uInt16 SfxObjectShell::ImplGetSignatureState( sal_Bool bScriptingContent )
+     {
+         *pState = SIGNATURESTATE_NOSIGNATURES;
  
-             // Storage and BaseURL are only needed by binary documents!
+-        if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) )
++        if ( GetMedium() && GetMedium()->GetName().Len() &&  IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() )
+         {
+ 			try
+ 			{