diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2018-01-28 18:18:32 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 17:38:29 +0200 |
| commit | 9291f0e879ca6af224b3f9c692d79149516d3f22 (patch) | |
| tree | 9b0fb7b6f9abfbb36cbac0ad70ac4f10b64ec84d /embeddedobj | |
| parent | e38ea1de47a110f3e17ebceab22364789ee006b3 (diff) | |
tdf#114677 Correct title in Base forms
Reviewed-on: https://gerrit.libreoffice.org/48801
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 5426a14e39660bde0dece27cf5ec26b9938bd962)
Change-Id: I07bdb46cce88e876583e1d4217dff3f77f2f3814
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 798b4c3c59f5..d7c40a109a3d 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -969,14 +969,17 @@ 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() && m_pEmbedObj && !m_pEmbedObj->getContainerName().isEmpty() ) + if( xModelTitle.is() ) { std::locale aResLoc = Translate::Create("sfx"); OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc); - xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded ); - m_aContainerName = m_pEmbedObj->getContainerName(); - // TODO: get real m_aDocumentNamePart - m_aDocumentNamePart = sEmbedded; + if( !m_pEmbedObj->getContainerName().isEmpty() ) + { + xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded ); + m_aContainerName = m_pEmbedObj->getContainerName(); + // TODO: get real m_aDocumentNamePart + m_aDocumentNamePart = sEmbedded; + } } if ( bInPlace ) |