officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu | 12 ------- sd/inc/strings.hrc | 3 + sd/source/console/PresenterSlideShowView.cxx | 17 ++-------- 3 files changed, 8 insertions(+), 24 deletions(-)
New commits: commit 808c3ace57d33d6a6f2af408ad694398f15be550 Author: Gabor Kelemen <[email protected]> AuthorDate: Sun Jan 11 17:45:36 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Sun Jan 18 14:39:20 2026 +0100 Simplify string access in Presenter Console No need to store static UI strings in the registry Change-Id: Ief7ab77a8e854a89a9f8b28a4b56dda13e8c8774 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197017 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu index a2039c30a233..9c5949ced066 100644 --- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu +++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu @@ -1887,18 +1887,6 @@ <prop oor:name="IsOpaque"> <value>true</value> </prop> - <node oor:name="Strings"> - <node oor:name="ClickToExitPresentationText" oor:op="replace"> - <prop oor:name="String"> - <value xml:lang="en-US">Click to exit presentation...</value> - </prop> - </node> - <node oor:name="ClickToExitPresentationTitle" oor:op="replace"> - <prop oor:name="String"> - <value xml:lang="en-US">Current Slide (end)</value> - </prop> - </node> - </node> </node> <node oor:name="NextSlidePreview" oor:op="replace"> <prop oor:name="ViewURL"> diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 1bd737c2cb72..a4fcd5c79a47 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -479,4 +479,7 @@ #define STR_A11Y_PRESENTER_PREVIEW NC_("STR_A11Y_PRESENTER_PREVIEW", "Current Slide Info") #define STR_A11Y_PRESENTER_NOTES NC_("STR_A11Y_PRESENTER_NOTES", "Presenter Notes") +#define STR_CLICKTOEXITPRESENTATION_TEXT NC_("STR_CLICKTOEXITPRESENTATION_TEXT", "Click to exit presentation...") +#define STR_CLICKTOEXITPRESENTATION_TITLE NC_("STR_CLICKTOEXITPRESENTATION_TITLE", "Current Slide (end)") + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/console/PresenterSlideShowView.cxx b/sd/source/console/PresenterSlideShowView.cxx index b7286e60ce4b..49e432cc2895 100644 --- a/sd/source/console/PresenterSlideShowView.cxx +++ b/sd/source/console/PresenterSlideShowView.cxx @@ -25,6 +25,9 @@ #include <PresenterHelper.hxx> #include <DrawController.hxx> #include <framework/ConfigurationController.hxx> +#include <strings.hrc> +#include <sdresid.hxx> + #include <com/sun/star/awt/InvalidateStyle.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/Pointer.hpp> @@ -158,18 +161,8 @@ void PresenterSlideShowView::LateInit() } // Read text for one past last slide. - PresenterConfigurationAccess aConfiguration ( - mxComponentContext, - PresenterConfigurationAccess::msPresenterScreenRootName, - PresenterConfigurationAccess::READ_ONLY); - aConfiguration.GetConfigurationNode( - u"Presenter/Views/CurrentSlidePreview/" - "Strings/ClickToExitPresentationText/String"_ustr) - >>= msClickToExitPresentationText; - aConfiguration.GetConfigurationNode( - u"Presenter/Views/CurrentSlidePreview/" - "Strings/ClickToExitPresentationTitle/String"_ustr) - >>= msClickToExitPresentationTitle; + msClickToExitPresentationText = SdResId(STR_CLICKTOEXITPRESENTATION_TEXT); + msClickToExitPresentationTitle = SdResId(STR_CLICKTOEXITPRESENTATION_TITLE); } PresenterSlideShowView::~PresenterSlideShowView()
