diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-12 16:13:38 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-12 17:59:40 -0400 |
| commit | 34100ec12962e2799d1ab454dcfc3513968aa22d (patch) | |
| tree | 8a5e682b24af0890b96f52fd951bbccf7f3cd7cb /sfx2 | |
| parent | ad8a7bf570576186f37d5c30bb41bb119ded1626 (diff) | |
It makes no sense to create object container when no objects are embedded.
Change-Id: Id13a0955a2b26dcc06766ad85f6ff9c598b4f0f2
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 29 |
1 files changed, 16 insertions, 13 deletions
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& ) - {} } } |