[Libreoffice-commits] core.git: include/svx svx/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 06:40:04 UTC 2018


 include/svx/svdlayer.hxx       |    1 -
 svx/source/svdraw/svdlayer.cxx |    4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 922c4a61ca21848777703a28abfd442dd0b4a858
Author:     Regina Henschel <rb.henschel at t-online.de>
AuthorDate: Mon Oct 29 13:28:22 2018 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Oct 30 07:39:42 2018 +0100

    Remove now unused mbUserDefinedLayer from SdrLayer
    
    Commit 'Special methods NewStandardLayer and SetStandardLayer
    not needed' has removed the last user of mbUserDefinedLayer.
    
    Change-Id: Id4d4fbbfa9b1425225181ea6b0750a4205683902
    Reviewed-on: https://gerrit.libreoffice.org/62506
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 9c7d9ae53432..dca763194356 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -67,7 +67,6 @@ class SVX_DLLPUBLIC SdrLayer
     bool mbPrintableODF; // corresponds to ODF draw:display
     bool mbLockedODF; // corresponds to ODF draw:protected
     SdrModel*  pModel; // For broadcasting
-    bool mbUserDefinedLayer;
     SdrLayerID const nID;
 
     SdrLayer(SdrLayerID nNewID, const OUString& rNewName);
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index ab149bfcfa4b..a5b78f987ece 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -68,7 +68,7 @@ void SdrLayerIDSet::PutValue( const css::uno::Any & rAny )
 }
 
 SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) :
-    maName(rNewName), pModel(nullptr), mbUserDefinedLayer(true), nID(nNewID)
+    maName(rNewName), pModel(nullptr), nID(nNewID)
 {
     // ODF default values
     mbVisibleODF = true;
@@ -82,7 +82,6 @@ void SdrLayer::SetName(const OUString& rNewName)
         return;
 
     maName = rNewName;
-    mbUserDefinedLayer = true;
 
     if (pModel)
     {
@@ -95,7 +94,6 @@ void SdrLayer::SetName(const OUString& rNewName)
 bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const
 {
     return (nID == rCmpLayer.nID
-        && mbUserDefinedLayer == rCmpLayer.mbUserDefinedLayer
         && maName == rCmpLayer.maName);
 }
 


More information about the Libreoffice-commits mailing list