[Libreoffice-commits] core.git: filter/source sd/qa

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/icgm/class0.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 524e2103b639831eb4b27102d4ddff3a568a1b21
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jun 25 15:51:39 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 25 21:19:50 2021 +0200

    ofz#30930 each picture triggers accumulating codesets
    
    seems to make more sense on EndPicture to return to the pre-StartPicture
    state
    
    Change-Id: I2ac2a5585f8acd5d817d083bccfd6551fb773342
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117902
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index aa6152d241d0..01e1dd2977db 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -49,13 +49,13 @@ void CGM::ImplDoClass0()
         break;
         case 0x03 : /*Begin Picture*/
         {
-            ImplDefaultReplacement();
-            ImplSetMapMode();
             if ( mbPicture )
                 mbStatus = false;
             else
             {
                 *pCopyOfE = *pElement;
+                ImplDefaultReplacement();
+                ImplSetMapMode();
                 mbPicture = mbFirstOutPut = true;
                 mbFigure = false;
                 mnAct4PostReset = 0;
diff --git a/sd/qa/unit/data/cgm/fail/recurse-1.cgm b/sd/qa/unit/data/cgm/pass/recurse-1.cgm
similarity index 100%
rename from sd/qa/unit/data/cgm/fail/recurse-1.cgm
rename to sd/qa/unit/data/cgm/pass/recurse-1.cgm