From 12a99f16edb791245a1b56bc9e879f2dd3f1f656 Mon Sep 17 00:00:00 2001 From: Regina Henschel Date: Sun, 21 Oct 2018 18:24:12 +0200 Subject: Special methods NewStandardLayer and SetStandardLayer not needed The method SetStandardLayer() is only used once, in method SdrLayerAdmin::NewStandardLayer(). This method is only used once, in OReportDefinition::init(). The difference between a layer 'Standard' and other layers is only in mbUserDefinedLayer. But this difference is no where evaluated. Therefore an ordinary layer is sufficient. The layer name is neither stored nor used in the UI, thus translation is not needed. A layer name must be set, but in this case it is not used in code, thus handle it same as for layer 'back'. Change-Id: Ifd4400d432d3b4702e950d3a717ed13d4075c279 Reviewed-on: https://gerrit.libreoffice.org/62144 Tested-by: Jenkins Reviewed-by: Regina Henschel --- include/svx/strings.hrc | 1 - include/svx/svdlayer.hxx | 7 ------- 2 files changed, 8 deletions(-) (limited to 'include') diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 18fd984a1bd8..e0b57303719e 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -258,7 +258,6 @@ #define STR_UndoObjName NC_("STR_UndoObjName", "Change object name of %1 to") #define STR_UndoObjTitle NC_("STR_UndoObjTitle", "Change object title of %1") #define STR_UndoObjDescription NC_("STR_UndoObjDescription", "Change object description of %1") -#define STR_StandardLayerName NC_("STR_StandardLayerName", "Standard") #define STR_ItemValON NC_("STR_ItemValON", "on") #define STR_ItemValOFF NC_("STR_ItemValOFF", "off") #define STR_ItemValYES NC_("STR_ItemValYES", "yes") diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index e8433a660cf2..9c7d9ae53432 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -95,10 +95,6 @@ public: SdrLayerID GetID() const { return nID; } void SetModel(SdrModel* pNewModel) { pModel=pNewModel; } - // A SdrLayer should be considered the standard Layer. It shall then set the - // appropriate country-specific name. SetName() sets the "StandardLayer" flag - // and if necessary returns "Userdefined". - void SetStandardLayer(); }; #define SDRLAYER_MAXCOUNT 255 @@ -139,9 +135,6 @@ public: // New layer is created and inserted SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF); - // New layer, name is retrieved from the resource - void NewStandardLayer(sal_uInt16 nPos); - // Iterate over all layers sal_uInt16 GetLayerCount() const { return sal_uInt16(maLayers.size()); } -- cgit