diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-07-17 19:45:16 +0200 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2017-07-18 10:49:47 +0200 |
| commit | e780090d115e26076203a86d8d30cc34cf29a020 (patch) | |
| tree | b09224f173926b923efe6c66a4221507418f742f | |
| parent | 6d65d020ea85fd8087e6491ad715df7630f4451f (diff) | |
Embedded documents: show title in menu entries
Change-Id: I478d81798e6f1e2d96e570cb6788a438c6a0be62
Reviewed-on: https://gerrit.libreoffice.org/40080
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 7 | ||||
| -rw-r--r-- | embeddedobj/source/general/intercept.cxx | 2 | ||||
| -rw-r--r-- | embeddedobj/source/inc/docholder.hxx | 7 |
3 files changed, 12 insertions, 4 deletions
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 ) |