[Libreoffice-commits] core.git: sc/source sw/source

[Libreoffice Gerrit user]

 sc/source/core/data/drwlayer.cxx                |    1 +
 sw/source/core/doc/DocumentDrawModelManager.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit fbc2b2d93a091c9dba26139878dd3d0acc5f31e9
Author:     Regina Henschel <rb.henschel at t-online.de>
AuthorDate: Fri Oct 5 21:24:45 2018 +0200
Commit:     Regina Henschel <rb.henschel at t-online.de>
CommitDate: Sun Oct 7 15:11:36 2018 +0200

    tdf#120317 Set control layer name if not default
    
    In commit a9ec212c1b545d745285f0ab3119a80713b1d1f2 the internal
    default name of the layer, which holds form controls, was changed to
    controls, the same name as used in file format and UNO. Users of
    the class SdrLayerAdmin have to set the control layer name
    explicitly in case they want an own, different name.
    
    Change-Id: Ia08a85a4d01a75ee2c5115da25b2a409204ccc01
    Reviewed-on: https://gerrit.libreoffice.org/61447
    Tested-by: Jenkins
    Reviewed-by: Regina Henschel <rb.henschel at t-online.de>

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 7fd0e6bd6201..1e97aa0600f8 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -296,6 +296,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) :
     rAdmin.NewLayer("hinten",   sal_uInt8(SC_LAYER_BACK));
     rAdmin.NewLayer("intern",   sal_uInt8(SC_LAYER_INTERN));
     rAdmin.NewLayer("Controls", sal_uInt8(SC_LAYER_CONTROLS));
+    rAdmin.SetControlLayerName("Controls");
     rAdmin.NewLayer("hidden",   sal_uInt8(SC_LAYER_HIDDEN));
     // "Controls" is new - must also be created when loading
 
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index e6da069859fd..1f5f4bfa8f5a 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -93,6 +93,7 @@ void DocumentDrawModelManager::InitDrawModel()
 
     sLayerNm = "Controls";
     mnControls = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+    mpDrawModel->GetLayerAdmin().SetControlLayerName(sLayerNm);
 
     // add invisible layers corresponding to the visible ones.
     {