diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2018-09-14 18:56:23 +0200 |
|---|---|---|
| committer | Regina Henschel <rb.henschel@t-online.de> | 2018-09-21 11:32:34 +0200 |
| commit | a9ec212c1b545d745285f0ab3119a80713b1d1f2 (patch) | |
| tree | ca538b767f4f5ac69926e6da6c988a7175c21f6e /sd/source/filter/ppt | |
| parent | ed480e918b6c1d3566ebfdfae6687bc4a4a06c10 (diff) | |
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 <rb.henschel@t-online.de>
Diffstat (limited to 'sd/source/filter/ppt')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index c885ed988ac5..16ed1e845c9a 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -76,6 +76,7 @@ #include <DrawDocShell.hxx> #include <FrameView.hxx> #include <optsitem.hxx> +#include <unokywds.hxx> #include <unotools/fltrcfg.hxx> #include <sfx2/progress.hxx> @@ -251,8 +252,8 @@ bool ImplSdPPTImport::Import() const_cast<EditEngine&>(rOutl.GetEditEngine()).SetControlWord( nControlWord ); SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); - mnBackgroundLayerID = rAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRND ) ); - mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRNDOBJ ) ); + mnBackgroundLayerID = rAdmin.GetLayerID( sUNO_LayerName_background ); + mnBackgroundObjectsLayerID = rAdmin.GetLayerID( sUNO_LayerName_background_objects ); ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); if ( pDocShell ) |