Kaydet (Commit) ada8c921 authored tarafından Szymon Kłos's avatar Szymon Kłos Kaydeden (comit) Andras Timar

OLE: show title of parent document in MSO

Change-Id: I5eee6568e0805eb0c609640923a77ebc4244cb12
Reviewed-on: https://gerrit.libreoffice.org/39859Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/39935Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst 0bd7b4ce
...@@ -1063,19 +1063,16 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID ) ...@@ -1063,19 +1063,16 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID )
if ( FAILED( hr ) ) if ( FAILED( hr ) )
throw io::IOException(); // TODO throw io::IOException(); // TODO
// TODO/LATER: the real names should be used here
m_pNativeImpl->m_pOleObject->SetHostNames( L"app name", L"untitled" );
} }
void OleComponent::SetHostName( const OUString&, void OleComponent::SetHostName( const OUString&,
const OUString& ) const OUString& aEmbDocName )
{ {
if ( !m_pNativeImpl->m_pOleObject ) if ( !m_pNativeImpl->m_pOleObject )
throw embed::WrongStateException(); // TODO: the object is in wrong state throw embed::WrongStateException(); // TODO: the object is in wrong state
// TODO: use aContName and aEmbDocName in m_pNativeImpl->m_pOleObject->SetHostNames() m_pNativeImpl->m_pOleObject->SetHostNames( L"app name", reinterpret_cast<const wchar_t*>( aEmbDocName.getStr() ) );
} }
......
...@@ -886,6 +886,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) ...@@ -886,6 +886,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
m_pOleComponent->ExecuteVerb( nVerbID ); m_pOleComponent->ExecuteVerb( nVerbID );
m_pOleComponent->SetHostName( OUString(), m_aContainerName );
// ==== the STAMPIT related solution ============================= // ==== the STAMPIT related solution =============================
bool bModifiedOnExecution = m_aVerbExecutionController.EndControlExecution_WasModified(); bool bModifiedOnExecution = m_aVerbExecutionController.EndControlExecution_WasModified();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment