diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-05-13 15:56:52 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2019-05-16 14:26:59 +0200 |
commit | 1bdbd26987c387dcee170775ecc1305be03669e1 (patch) | |
tree | 5baf28f57f85d9040ffe78f9c39cd92e8f83fb72 | |
parent | Resolves: tdf#125266 hang on selecting read online help (diff) | |
download | core-1bdbd26987c387dcee170775ecc1305be03669e1.tar.gz core-1bdbd26987c387dcee170775ecc1305be03669e1.zip |
Presentation minimizer: Handle also presentation.GraphicObjectShape URL
Change-Id: I326b2803bf2d98d440e14d7f3f75ca61c2c9e49a
Reviewed-on: https://gerrit.libreoffice.org/72303
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit aa446591b7feb5bb667533ef7acdfc636105f9d9)
Reviewed-on: https://gerrit.libreoffice.org/72360
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | sdext/source/minimizer/graphiccollector.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
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++; } |