mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#114677 Correct title in Base forms cleanup

Browse Source 
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>
This commit is contained in:
Szymon Kłos
2018-01-29 10:50:39 +01:00
parent 42bfd68be7
commit 077e0f3b64
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
embeddedobj/source/general/docholder.cxx
View File

@@ -969,17 +969,14 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
// set document title to show in the title bar // set document title to show in the title bar
css::uno::Reference< css::frame::XTitle > xModelTitle( xDoc, css::uno::UNO_QUERY ); 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"); std::locale aResLoc = Translate::Create("sfx");
OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc); OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc);
if( !m_pEmbedObj->getContainerName().isEmpty() ) xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded );
{ m_aContainerName = m_pEmbedObj->getContainerName();
xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded ); // TODO: get real m_aDocumentNamePart
m_aContainerName = m_pEmbedObj->getContainerName(); m_aDocumentNamePart = sEmbedded;
// TODO: get real m_aDocumentNamePart
m_aDocumentNamePart = sEmbedded;
}
} }
if ( bInPlace ) if ( bInPlace )