diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 0c02ced825e6..9fb811725369 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2351,7 +2351,29 @@ sal_Bool SfxObjectShell::InsertFrom( SfxMedium& rMedium ) aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InsertMode" ) ); aArgs[nEnd-1].Value <<= (sal_Bool) sal_True; - return xLoader->filter( aArgs ); +//-> #i119492 +// return xLoader->filter( aArgs ); +// During loading, some OLE objects like chart will be set modified flag, so needs to reset the flag to false after loading + sal_Bool bRtn = xLoader->filter( aArgs ); + uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); + for ( sal_Int32 n = 0; n < aNames.getLength(); n++ ) + { + ::rtl::OUString aName = aNames[n]; + uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aName ); + 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 || nState == embed::EmbedStates::RUNNING ) // means that the object is not active + { + uno::Reference< util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY ); + if ( xModifiable.is() ) + xModifiable->setModified(sal_False); + } + } + } + return bRtn; +//<- #i119492 }catch(const uno::Exception&) {} } |