[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-8' - sd/source

[Regina Henschel (via logerrit)]

 sd/source/ui/unoidl/unolayer.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit af01bedc4433ed20aa68e98314cc46185a989b1b
Author:     Regina Henschel <rb.henschel at t-online.de>
AuthorDate: Fri Sep 27 14:12:39 2019 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Oct 4 15:12:13 2019 +0200

    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 at t-online.de>
    (cherry picked from commit 12f9a9f341fd8f8a98f7cd98f296a8729d279e0d)
    Reviewed-on: https://gerrit.libreoffice.org/79786
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 44c0b7416d1abee971ef0b4b17e67f6e391dd807)
    Reviewed-on: https://gerrit.libreoffice.org/79859
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

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?
 }