[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Vasily Melenchuk (via logerrit)]

 sw/source/core/doc/doclay.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit e752f7d984a82eb720c2cb63be44ea1935d39502
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Fri Sep 11 14:06:23 2020 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Sep 15 10:40:15 2020 +0200

    tdf#135623: modified generation of unique fly name
    
    Modified lcl_GetUniqueFlyName() is right now always marks
    current fly format name number as used. Yes, this can
    lead to some gaps in numbering is some cases, but meanwhile
    guarantee that there will be no duplicates if format name
    does not match SdrObject name.
    
    Change-Id: If39ed993614ae1665deba21ae8d5e6bd542fb6e0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102460
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 07a695ec1988ee8b02256cab2e07a1b429ead24b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102636
    Reviewed-by: Vasily Melenchuk <vasily.melenchuk at cib.de>
    (cherry picked from commit c514e9cfca2901f325644a65ee1b87455a56e7f0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102638
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 2a63e2112b6b..ec4861fe39b2 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1349,11 +1349,9 @@ static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, const char* pDefStrId, s
             if (pObj)
                 lcl_collectUsedNums(aUsedNums, nNmLen, *pObj, aName);
         }
-        else
-        {
-            OUString sName = pFlyFormat->GetName();
-            lcl_collectUsedNums(aUsedNums, nNmLen, sName, aName);
-        }
+
+        OUString sName = pFlyFormat->GetName();
+        lcl_collectUsedNums(aUsedNums, nNmLen, sName, aName);
     }
 
     // All numbers are flagged accordingly, so determine the right one