diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-27 19:56:00 +0200 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-10-28 15:08:30 +0100 |
commit | 1cf4d604db563a47e1c7f6282226aaa45c344374 (patch) | |
tree | 505f2379ab55926bae07ac39209b0c968baa8b33 | |
parent | e40c944e8e654228e1893fc1bded8e1bded41ee7 (diff) |
tdf#120376 sd: fix duplicated styles on copy/paste
Unfortunately the comparison was inverted, so a style is copied
iff it already exists, which is clearly the reviewer's fault...
(regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b)
Change-Id: I3425982feb08e980eca9243cc16120897b65a70f
Reviewed-on: https://gerrit.libreoffice.org/62436
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62449
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit 8bef4f3033fff8eb12a58d3fa4cdd49076e18cf2)
Reviewed-on: https://gerrit.libreoffice.org/62474
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r-- | sd/source/core/stlpool.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 884c9ffa1e68..43d66378f80a 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -652,7 +652,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily pExistingSheet = GetStyleSheetByPositionInIndex(aSheetsWithName.front()).get(); if (!rRenameSuffix.isEmpty() && - pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false)) + !pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false)) { // we have found a sheet with the same name, but different contents. Try to find a new name. // If we already have a sheet with the new name, and it is equal to the one in the source pool, @@ -664,7 +664,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily aTmpName = aName + rRenameSuffix + OUString::number(nSuffix); pExistingSheet = Find(aTmpName, eFamily); nSuffix++; - } while( pExistingSheet && pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false) ); + } while (pExistingSheet && + !pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false)); aName = aTmpName; bAddToList = true; } |