diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-09-11 14:06:23 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-09-19 21:11:48 +0200 |
| commit | 700df0490e4e674b0bc22d165ff0614fd8e610ae (patch) | |
| tree | 451cc485ddb8b458275111bee56593b0831d734c /sw | |
| parent | f1783b3fd850db25ace370df4633f75ff6bc053a (diff) | |
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@CIB.de>
(cherry picked from commit 07a695ec1988ee8b02256cab2e07a1b429ead24b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102636
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
(cherry picked from commit c514e9cfca2901f325644a65ee1b87455a56e7f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102638
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/doclay.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
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 |