From a9ec212c1b545d745285f0ab3119a80713b1d1f2 Mon Sep 17 00:00:00 2001 From: Regina Henschel Date: Fri, 14 Sep 2018 18:56:23 +0200 Subject: tdf#67248 Use localized layer name only for display in UI The internal management of layers was based on localized layer names. So it could happen, that a custom layer name was a standard layer name (which includes special handling) in one local and not in the other. The patch changes the implementation to use the same real layer names as in file, and use localized standard layer names only for display in the UI. Removes no longer needed RestoreLayerName() Removes convertToInternalName(), ersatz convertToLocalizedName() Removes no longer needed convertToExternalName() Includes fix for tdf#119956 in addition Change-Id: Iaedb73e4017e728f7ca3b0dc4aa7bb7f0e6ce6da Reviewed-on: https://gerrit.libreoffice.org/60507 Tested-by: Jenkins Reviewed-by: Regina Henschel --- sd/source/ui/view/drviewsb.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sd/source/ui/view/drviewsb.cxx') diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 9fd8f21f5cd7..540cc6e006fb 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,8 +78,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = GetDoc()->GetLayerAdmin(); - SdrLayerID nBackground = rLayerAdmin.GetLayerID( SdResId(STR_LAYER_BCKGRND) ); - SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SdResId(STR_LAYER_BCKGRNDOBJ) ); + SdrLayerID nBackground = rLayerAdmin.GetLayerID(sUNO_LayerName_background); + SdrLayerID nBgObj = rLayerAdmin.GetLayerID(sUNO_LayerName_background_objects); SdrLayerIDSet aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers(); SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); @@ -168,7 +168,7 @@ void DrawViewShell::ModifyLayer ( for( nPos = 0; nPos < nPageCount; nPos++ ) { sal_uInt16 nId = GetLayerTabControl()->GetPageId( nPos ); - if (GetLayerTabControl()->GetPageText(nId) == pLayer->GetName()) + if (GetLayerTabControl()->GetLayerName(nId) == pLayer->GetName()) { nCurPage = nId; break; -- cgit