ooo-build r14868 - in branches/opensuse-11-1: . patches/dev300

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Dec 16 11:15:11 2008
New Revision: 14868
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14868&view=rev

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

        * patches/dev300/apply:  add vba-xl-import-crash.diff for n#458985
        ( not necessary here for m9 but will future proof the branch )
        * patches/dev300/vba-xl-import-crash.diff:



Added:
   branches/opensuse-11-1/patches/dev300/vba-xl-import-crash.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Tue Dec 16 11:15:11 2008
@@ -1673,6 +1673,8 @@
 patch_i92329.diff, i#92329
 
 vba-fix-docmodule-import-crash.diff, n#447560
+
+vba-xl-import-crash.diff, n#458985
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: branches/opensuse-11-1/patches/dev300/vba-xl-import-crash.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/vba-xl-import-crash.diff	Tue Dec 16 11:15:11 2008
@@ -0,0 +1,13 @@
+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;
+ 
+-        if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) )
++        if ( GetMedium() && GetMedium()->GetName().Len() &&  IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() )
+         {
+ 			try
+ 			{