From ced0d1cf10c02437c9ceb2f55fecb38859b30391 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Oct 27 2018 19:22:42 +0000 Subject: fix up patch --- diff --git a/0001-tdf-120376-sd-fix-duplicated-styles-on-copy-paste.patch b/0001-tdf-120376-sd-fix-duplicated-styles-on-copy-paste.patch index 2e73087..db23c36 100644 --- a/0001-tdf-120376-sd-fix-duplicated-styles-on-copy-paste.patch +++ b/0001-tdf-120376-sd-fix-duplicated-styles-on-copy-paste.patch @@ -1,4 +1,4 @@ -From 96e6a375a03bc4bfc7f269c4e6e20cc867ae66e2 Mon Sep 17 00:00:00 2001 +From 7c789011bc9dba216b86f28891b7ea2e4f4df67c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 27 Oct 2018 19:56:00 +0200 Subject: [PATCH] tdf#120376 sd: fix duplicated styles on copy/paste @@ -14,7 +14,7 @@ Change-Id: I3425982feb08e980eca9243cc16120897b65a70f 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx -index c627970..f7e81e1 100644 +index c627970..aa3d1de 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -652,7 +652,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily @@ -22,7 +22,7 @@ index c627970..f7e81e1 100644 GetStyleSheetByPositionInIndex(aSheetsWithName.front()).get(); if (!rRenameSuffix.isEmpty() && - pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false)) -+ !pExistingSheet->GetItemSet().Equals(pSheet->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, @@ -32,7 +32,7 @@ index c627970..f7e81e1 100644 nSuffix++; - } while( pExistingSheet && pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false) ); + } while (pExistingSheet && -+ !pExistingSheet->GetItemSet().Equals(pSheet->GetItemSet(), false)); ++ !pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false)); aName = aTmpName; bAddToList = true; }