|author||Mike Kaganski <email@example.com>||2018-09-03 19:27:57 +0300|
|committer||Andras Timar <firstname.lastname@example.org>||2018-09-05 15:00:45 +0200|
tdf#119146: fix populating maCurrentSubsets
Regression from commit 4600b07c1d787f959618d9ecf54161e4ea4ffa61 Before the mentioned commit, creating a subset X, and then adding sub-subsets until all the subset is excluded, had left the subset X with two *empty* nodes in maCurrentSubsets, 1st of them having both mnStartIndex and mnEndIndex equal to maSubset.mnStartIndex, and 2nd having both mnStartIndex and mnEndIndex equal to maSubset.mnEndIndex. The commit above changed that to adding maSubset to maCurrentSubsets in the beginning of each exclusion, which finally resulted in a messy maCurrentSubsets with multiple duplicating nodes effectively covering all maSubset. That resulted in the item as a whole handled *besides* the sub-subsets. This commit (1) avoids adding extra maSubset to maCurrentSubsets, and (2) adds the two empty nodes in case all the subset has been excluded by its sub-subsets. Change-Id: I7fc5f2d0b6ecf4f9247351da3a2746032150557b Reviewed-on: https://gerrit.libreoffice.org/59948 Tested-by: Jenkins Reviewed-by: Mike Kaganski <email@example.com> (cherry picked from commit a8aaffa6ea0f0fd8cf1d22883173df64a93e3322) Reviewed-on: https://gerrit.libreoffice.org/59952 Reviewed-by: Caolán McNamara <firstname.lastname@example.org> Tested-by: Caolán McNamara <email@example.com> Reviewed-on: https://gerrit.libreoffice.org/60024 Tested-by: Mike Kaganski <firstname.lastname@example.org> Reviewed-by: Andras Timar <email@example.com>
1 files changed, 21 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 849df8d9897c..f88a0337aa31 100644
@@ -213,6 +213,25 @@ namespace slideshow
+ // Excluding subsets must not leave an absolutely empty maCurrentSubsets, because it
+ // would mean "non-subsetting" mode unconditionally, with whole object added to subsets.
+ // So to indicate a subset with all parts excluded, add two empty subsets (starting and
+ // ending).
+ if (maCurrentSubsets.empty())
+ if (maSubset.isEmpty())
+ maCurrentSubsets.emplace_back(0, 0);
+ maCurrentSubsets.emplace_back(maSubset.getEndIndex(), maSubset.getEndIndex());
@@ -275,10 +294,10 @@ namespace slideshow
- // only add subset to vector, if it's not empty - that's
+ // only add subset to vector, if vector is empty, and subset is not empty - that's
// because the vector's content is later literally used
// for e.g. painting.
- if( !maSubset.isEmpty() )
+ if (maCurrentSubsets.empty() && !maSubset.isEmpty())
maCurrentSubsets.push_back( maSubset );