xmloff/source/text/XMLTextFrameContext.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 86963c2e23aebfa7b9df4e2d28278dfb581974d3
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
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 81b3b18..e032bdd 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -587,7 +587,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
