diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2018-01-29 10:50:39 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2018-01-29 13:13:40 +0100 |
| commit | 077e0f3b6439dbe9d63aa438b8b076f5d93baf43 (patch) | |
| tree | 931a0515edbb45ba7856b6e731bed25fb246a104 /embeddedobj | |
| parent | 42bfd68be7525b2ac4d7c4cab5393d7a4a8e4242 (diff) | |
tdf#114677 Correct title in Base forms cleanup
Change-Id: I224858ffce50b00273d80f915831ec7789cfa64a
Reviewed-on: https://gerrit.libreoffice.org/48819
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index d7c40a109a3d..798b4c3c59f5 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -969,17 +969,14 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace ) // set document title to show in the title bar css::uno::Reference< css::frame::XTitle > xModelTitle( xDoc, css::uno::UNO_QUERY ); - if( xModelTitle.is() ) + if( xModelTitle.is() && m_pEmbedObj && !m_pEmbedObj->getContainerName().isEmpty() ) { std::locale aResLoc = Translate::Create("sfx"); OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc); - if( !m_pEmbedObj->getContainerName().isEmpty() ) - { - xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded ); - m_aContainerName = m_pEmbedObj->getContainerName(); - // TODO: get real m_aDocumentNamePart - m_aDocumentNamePart = sEmbedded; - } + xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded ); + m_aContainerName = m_pEmbedObj->getContainerName(); + // TODO: get real m_aDocumentNamePart + m_aDocumentNamePart = sEmbedded; } if ( bInPlace ) |