summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-10-27 19:56:00 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-10-28 11:34:11 +0100
commitba5d56afd88ba29ba7f222d15f4b9046011cc38e (patch)
treeb75daafca4166a4b86cabcb1b39d2ed5e264d0ce
parent6720da69043a5ca206e9feac8396335e7b0af793 (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/62452 Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
-rw-r--r--sd/source/core/stlpool.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index c627970fd4e2..aa3d1de8a89a 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;
}