3 LO-L3s fixed OBS-URL: https://build.opensuse.org/request/show/703455 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=786
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From 1bdbd26987c387dcee170775ecc1305be03669e1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= <tamas.zolnai@collabora.com>
|
|
Date: Mon, 13 May 2019 15:56:52 +0200
|
|
Subject: Presentation minimizer: Handle also presentation.GraphicObjectShape
|
|
URL
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
sdext/source/minimizer/graphiccollector.cxx | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
|
|
index 26ae7fc..4888260 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++;
|
|
}
|
|
--
|
|
cgit v1.1
|
|
|