summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2019-09-27 14:12:39 +0200
committerAndras Timar <andras.timar@collabora.com>2019-10-04 15:41:13 +0200
commite55c0e1239ff01b2c1917e6070f00970b1cf8e6e (patch)
tree9f90c1658c395dc353b3d6706b7abb5450b48735 /sd
parent953da95ce65d08ca556a2ab16a0bd989f8010288 (diff)
tdf#125585 write default layer status for OLE objects
The layer status is taken from the active view, when saving the document. But embedded documents have no view. Error was, that for all layers value 'false' was written in that case. With this patch the defaults (visible, printable, not locked) (true, true, false) are written. Change-Id: I2388ce31cc208fba075083889ec1bb2f874ef482 Reviewed-on: https://gerrit.libreoffice.org/79701 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 12f9a9f341fd8f8a98f7cd98f296a8729d279e0d) Reviewed-on: https://gerrit.libreoffice.org/79786 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 0a42ecdad7b3..2d0d7ab435ce 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -264,6 +264,15 @@ bool SdLayer::get( LayerAttribute what ) throw()
case LOCKED: return pFrameView->GetLockedLayers().IsSet(pLayer->GetID());
}
}
+
+ // no view at all, e.g. Draw embedded as OLE in text document, ODF default values
+ switch(what)
+ {
+ case VISIBLE: return true;
+ case PRINTABLE: return true;
+ case LOCKED: return false;
+ }
+
}
return false; //TODO: uno::Exception?
}