[Libreoffice-commits] core.git: embeddedobj/source

[Stephan Bergmann (via logerrit)]

 embeddedobj/source/msole/olecomponent.cxx |    3 +--
 embeddedobj/source/msole/olecomponent.hxx |    2 +-
 embeddedobj/source/msole/oleembed.cxx     |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c638985dd3a63cdf76b2af67cd890f656a9c38eb
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Nov 25 09:50:15 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 25 11:27:00 2020 +0100

    Remove unused OleComponent::SetHostName aContName parameter
    
    Unused ever since the code was introduced in
    5ea5c0afebd272d5f44e6524c0f67b5317639919 "#112923# embedded object for MS OLE".
    (The accompanying
    
      // TODO: use aContName and aEmbDocName in m_pOleObject->SetHostNames()
    
    comment was removed when a307ad7ae029a0a62404996a63954e7026001ce3 "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 at collabora.com>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index ea5bb265aa2c..4a123d5ca0ab 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -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
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 7cfcce4fd13a..3ff53291c01f 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -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 );
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index b22ece2f7cea..91b19bcdd78c 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -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();