summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2019-09-27 14:12:39 +0200
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2019-09-30 15:08:38 +0200
commit44c0b7416d1abee971ef0b4b17e67f6e391dd807 (patch)
tree51ff9cba344e5697f1f8c6e602e5c96f7117814d
parent69fa5a847357360142d98c9b955cc73c70f23d68 (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>
-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?
}