[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - embeddedobj/source

[Szymon Kłos]

 embeddedobj/source/general/docholder.cxx |    7 +++++--
 embeddedobj/source/general/intercept.cxx |    2 +-
 embeddedobj/source/inc/docholder.hxx     |    7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit e780090d115e26076203a86d8d30cc34cf29a020
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Mon Jul 17 19:45:16 2017 +0200

    Embedded documents: show title in menu entries
    
    Change-Id: I478d81798e6f1e2d96e570cb6788a438c6a0be62
    Reviewed-on: https://gerrit.libreoffice.org/40080
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 0a490153e8d5..6beb13d8fa7c 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -983,8 +983,11 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
             {
                 LanguageTag aLocale( Application::GetSettings().GetUILanguageTag() );
                 ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "sfx", aLocale );
-                OUString nTitle = ResId( STR_EMBEDDED_TITLE, *pResMgr );
-                xModelTitle->setTitle( m_pEmbedObj->getContainerName() + nTitle );
+                OUString sEmbedded = ResId( STR_EMBEDDED_TITLE, *pResMgr );
+                xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded);
+                m_aContainerName = m_pEmbedObj->getContainerName();
+                // TODO: get real m_aDocumentNamePart
+                m_aDocumentNamePart = sEmbedded;
             }
 
             if ( bInPlace )
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 96e35954d9ef..e40114c17874 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -161,7 +161,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "Close and Return";
         aStateEvent.IsEnabled = true;
         aStateEvent.Requery = false;
-        aStateEvent.State <<= ( "($2) " + m_pDocHolder->GetTitle() );
+        aStateEvent.State <<= ( "($2)" + m_pDocHolder->GetContainerName() );
         Control->statusChanged(aStateEvent);
 
 
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 2fac504a68ce..f96cae689ceb 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -128,7 +128,12 @@ public:
 
     OUString GetTitle() const
     {
-        return m_aContainerName + " - " + m_aDocumentNamePart;
+        return m_aContainerName + ( m_aDocumentNamePart.isEmpty() ? OUString() : ( " - " + m_aDocumentNamePart ) );
+    }
+
+    OUString GetContainerName() const
+    {
+        return m_aContainerName;
     }
 
     void SetOutplaceFrameProperties( const css::uno::Sequence< css::uno::Any >& aProps )