[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - xmloff/source

[Caolán McNamara]

 xmloff/source/text/XMLTextFrameContext.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ac05fade5b56be408b014140bd243b21e807be4a
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jan 19 14:03:12 2016 +0000

    Resolves: tdf#96245 relax test for duplicate frame names
    
    to allow duplicated unnamed frames
    
    Change-Id: I871849b23d01209f027b6295777db705f7dc86d8
    (cherry picked from commit 86963c2e23aebfa7b9df4e2d28278dfb581974d3)

diff --git a/xmloff/source/text/XMLTextFrameContext.cxx 
b/xmloff/source/text/XMLTextFrameContext.cxx
index 2b4727e..20768ff 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -597,7 +597,8 @@ void XMLTextFrameContext_Impl::Create( bool 
/*bHRefOrBase64*/ )
             {
                 bool bSuccess = xTextImportHelper->GetRenameMap().Add( 
XML_TEXT_RENAME_TYPE_FRAME,
                                              sOldName, sName );
-                if (!bSuccess)
+
+                if (!bSuccess && !sOldName.isEmpty())
                 {
                     bCreateFailed = true;
                     return;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits