Kaydet (Commit) 12a99f16 authored tarafından Regina Henschel's avatar Regina Henschel

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: 's avatarRegina Henschel <rb.henschel@t-online.de>
üst 0c18395d
......@@ -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")
......
......@@ -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()); }
......
......@@ -590,7 +590,7 @@ void OReportDefinition::init()
m_pImpl->m_pReportModel->GetItemPool().FreezeIdRanges();
m_pImpl->m_pReportModel->SetScaleUnit( MapUnit::Map100thMM );
SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin();
rAdmin.NewStandardLayer(sal_uInt8(RPT_LAYER_FRONT));
rAdmin.NewLayer("front", sal_uInt8(RPT_LAYER_FRONT));
rAdmin.NewLayer("back", sal_uInt8(RPT_LAYER_BACK));
rAdmin.NewLayer("HiddenLayer", sal_uInt8(RPT_LAYER_HIDDEN));
......
......@@ -76,17 +76,6 @@ SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) :
mbLockedODF = false;
}
void SdrLayer::SetStandardLayer()
{
mbUserDefinedLayer=false;
maName = SvxResId(STR_StandardLayerName);
if (pModel!=nullptr) {
SdrHint aHint(SdrHintKind::LayerChange);
pModel->Broadcast(aHint);
pModel->SetChanged();
}
}
void SdrLayer::SetName(const OUString& rNewName)
{
if (rNewName == maName)
......@@ -201,19 +190,6 @@ SdrLayer* SdrLayerAdmin::NewLayer(const OUString& rName, sal_uInt16 nPos)
return pLay;
}
void SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos)
{
SdrLayerID nID=GetUniqueLayerID();
SdrLayer* pLay=new SdrLayer(nID,OUString());
pLay->SetStandardLayer();
pLay->SetModel(pModel);
if(nPos==0xFFFF)
maLayers.push_back(std::unique_ptr<SdrLayer>(pLay));
else
maLayers.insert(maLayers.begin() + nPos, std::unique_ptr<SdrLayer>(pLay));
Broadcast();
}
sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
{
sal_uInt16 nRet=SDRLAYERPOS_NOTFOUND;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment