[Libreoffice-commits] core.git: embeddedobj/source

[Szymon Kłos]

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

New commits:
commit 5426a14e39660bde0dece27cf5ec26b9938bd962
Author: Szymon Kłos <szymon.k...@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 <c...@libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/embeddedobj/source/general/docholder.cxx 
b/embeddedobj/source/general/docholder.cxx
index 18fbd91641c8..d7c40a109a3d 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -973,10 +973,13 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
             {
                 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits