From 34100ec12962e2799d1ab454dcfc3513968aa22d Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Mon, 12 May 2014 16:13:38 -0400
Subject: It makes no sense to create object container when no objects are
 embedded.

Change-Id: Id13a0955a2b26dcc06766ad85f6ff9c598b4f0f2
---
 sfx2/source/doc/objmisc.cxx | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'sfx2')

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 163e3261cdbd..070703e1a36e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -302,25 +302,28 @@ bool SfxObjectShell::IsModified()
         return false;
     }
 
-    uno::Sequence < OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames();
-    for ( sal_Int32 n=0; n<aNames.getLength(); n++ )
+    if (pImp->mpObjectContainer)
     {
-        uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] );
-        OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
-        if ( xObj.is() )
+        uno::Sequence < OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames();
+        for ( sal_Int32 n=0; n<aNames.getLength(); n++ )
         {
-            try
+            uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] );
+            OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+            if ( xObj.is() )
             {
-                sal_Int32 nState = xObj->getCurrentState();
-                if ( nState != embed::EmbedStates::LOADED )
+                try
                 {
-                    uno::Reference< util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY );
-                    if ( xModifiable.is() && xModifiable->isModified() )
-                        return true;
+                    sal_Int32 nState = xObj->getCurrentState();
+                    if ( nState != embed::EmbedStates::LOADED )
+                    {
+                        uno::Reference< util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY );
+                        if ( xModifiable.is() && xModifiable->isModified() )
+                            return true;
+                    }
                 }
+                catch( uno::Exception& )
+                {}
             }
-            catch( uno::Exception& )
-            {}
         }
     }
 
-- 
cgit