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

[Szymon Kłos]

 embeddedobj/source/general/docholder.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 077e0f3b6439dbe9d63aa438b8b076f5d93baf43
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Mon Jan 29 10:50:39 2018 +0100

    tdf#114677 Correct title in Base forms cleanup
    
    Change-Id: I224858ffce50b00273d80f915831ec7789cfa64a
    Reviewed-on: https://gerrit.libreoffice.org/48819
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

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 )