[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sdext/source

[Tamás Zolnai (via logerrit)]

 sdext/source/minimizer/graphiccollector.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1bdbd26987c387dcee170775ecc1305be03669e1
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon May 13 15:56:52 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 16 14:26:59 2019 +0200

    Presentation minimizer: Handle also presentation.GraphicObjectShape URL
    
    Change-Id: I326b2803bf2d98d440e14d7f3f75ca61c2c9e49a
    Reviewed-on: https://gerrit.libreoffice.org/72303
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit aa446591b7feb5bb667533ef7acdfc636105f9d9)
    Reviewed-on: https://gerrit.libreoffice.org/72360
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index 26ae7fca3555..4888260ba0e1 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -222,7 +222,8 @@ static void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxMS
                 continue;
             }
 
-            if ( sShapeType == "com.sun.star.drawing.GraphicObjectShape" )
+            if ( sShapeType == "com.sun.star.drawing.GraphicObjectShape" ||
+                 sShapeType == "com.sun.star.presentation.GraphicObjectShape" )
                 ImpAddGraphicEntity( rxMSF, xShape, rGraphicSettings, rGraphicEntities );
 
             // now check for a fillstyle
@@ -342,7 +343,8 @@ static void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF,
                 continue;
             }
 
-            if ( sShapeType == "com.sun.star.drawing.GraphicObjectShape" )
+            if ( sShapeType == "com.sun.star.drawing.GraphicObjectShape" ||
+                 sShapeType == "com.sun.star.presentation.GraphicObjectShape" )
             {
                 rnGraphics++;
             }