diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-19 14:03:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-19 21:21:41 +0000 |
| commit | ac05fade5b56be408b014140bd243b21e807be4a (patch) | |
| tree | 850a2586b265b72127bdfb3b3121793197a841c7 /xmloff | |
| parent | d6c5a8103b103b80ef171c09ca593e68ae867189 (diff) | |
Resolves: tdf#96245 relax test for duplicate frame names
to allow duplicated unnamed frames
Change-Id: I871849b23d01209f027b6295777db705f7dc86d8
(cherry picked from commit 86963c2e23aebfa7b9df4e2d28278dfb581974d3)
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 2b4727e0c218..20768ff1fd55 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; |