summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga.extern@allotropia.de>2024-02-29 16:34:45 +0100
committerBalazs Varga <balazs.varga.extern@allotropia.de>2024-03-22 11:44:16 +0100
commite136900e7a971385be9367a3dcaedea54d1e7207 (patch)
treeeda20891aa4e54b2107cd4bf235bf20d9d63c8d1 /slideshow
parent7d384d63105af039cd0246395d005f337073eac6 (diff)
tdf#159258 sd: fix to show objects in slideshow if they have
fillstyle or linestyle. Also the shape will be appeared in print and pdf view. (Powerpoint doing the same.) TODO: the placeholder bitmap and the default text was not removed from the slideshow/print/pdf view. Change-Id: Ifadc9a692d77b60a7e3514afe8e6ea5cab0018c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164163 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx20
1 files changed, 19 insertions, 1 deletions
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 92162eeb60ad..7823a5588efd 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -346,7 +346,25 @@ bool ShapeImporter::isSkip(
"IsEmptyPresentationObject") &&
bEmpty )
{
- return true;
+ // check object have fill or linestyle, if have, it should be visible
+ drawing::FillStyle aFillStyle{ drawing::FillStyle_NONE };
+ if (getPropertyValue(aFillStyle,
+ xPropSet, "FillStyle") &&
+ aFillStyle != drawing::FillStyle_NONE)
+ {
+ bEmpty = false;
+ }
+
+ drawing::LineStyle aLineStyle{ drawing::LineStyle_NONE };
+ if (bEmpty && getPropertyValue(aLineStyle,
+ xPropSet, "LineStyle") &&
+ aLineStyle != drawing::LineStyle_NONE)
+ {
+ bEmpty = false;
+ }
+
+ if (bEmpty)
+ return true;
}
//skip shapes which corresponds to annotations