[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - embeddedobj/source

[Szymon Kłos]

 embeddedobj/source/general/docholder.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 19bfffcf3a89fd2fd070e1a878ac628e93d06cc7
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Sun Jan 28 18:18:32 2018 +0100

    tdf#114677 Correct title in Base forms
    
    Change-Id: I07bdb46cce88e876583e1d4217dff3f77f2f3814
    Reviewed-on: https://gerrit.libreoffice.org/48801
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 5426a14e39660bde0dece27cf5ec26b9938bd962)
    Reviewed-on: https://gerrit.libreoffice.org/48810
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 18fbd91641c8..798b4c3c59f5 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -969,11 +969,11 @@ 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);
-                xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded);
+                xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded );
                 m_aContainerName = m_pEmbedObj->getContainerName();
                 // TODO: get real m_aDocumentNamePart
                 m_aDocumentNamePart = sEmbedded;