mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused OleComponent::SetHostName aContName parameter

Browse Source 
Unused ever since the code was introduced in
5ea5c0afeb "#112923# embedded object for MS OLE".
(The accompanying

  // TODO: use aContName and aEmbDocName in m_pOleObject->SetHostNames()

comment was removed when a307ad7ae0 "OLE: show
title of parent document in MSO" started to use the aEmbDocName parameter, which
had previously been unused too.)

Change-Id: I0fbb20dbf526a3fdbdc4a3e76e64fa80e8460480
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106571
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann
2020-11-25 09:50:15 +01:00
parent 6b8d498576
commit c638985dd3
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
embeddedobj/source/msole/olecomponent.cxx
View File

@@ -1079,8 +1079,7 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID )
}
void OleComponent::SetHostName( const OUString&,
const OUString& aEmbDocName )
void OleComponent::SetHostName( const OUString& aEmbDocName )
{
if ( !m_pNativeImpl->m_pOleObject )
throw embed::WrongStateException(); // TODO: the object is in wrong state

2
embeddedobj/source/msole/olecomponent.hxx
View File

@@ -112,7 +112,7 @@ public:
css::uno::Sequence< css::embed::VerbDescriptor > GetVerbList();
void ExecuteVerb( sal_Int32 nVerbID );
void SetHostName( const OUString& aContName, const OUString& aEmbDocName );
void SetHostName( const OUString& aEmbDocName );
void SetExtent( const css::awt::Size& aVisAreaSize, sal_Int64 nAspect );
css::awt::Size GetExtent( sal_Int64 nAspect );

2
embeddedobj/source/msole/oleembed.cxx
View File

@@ -875,7 +875,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
m_pOleComponent->ExecuteVerb( nVerbID );
m_pOleComponent->SetHostName( OUString(), m_aContainerName );
m_pOleComponent->SetHostName( m_aContainerName );
// ==== the STAMPIT related solution =============================
bool bModifiedOnExecution = m_aVerbExecutionController.EndControlExecution_WasModified();