From 116b9d6ddf2b61186b29f0370234eec9c1bbe306 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sun, 2 Apr 2023 01:18:42 +0300 Subject: Avoid conversions between OUString and OString in VCL Standardize on OUString, which is the main internal string class. Convert from/to OUString only when communicating with respective external APIs. Removes about 200 conversions from the code. Change-Id: I96ecee7c6fd271bb76639220e96d69d2964bed26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149930 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- sfx2/source/inc/StyleList.hxx | 6 +++--- sfx2/source/inc/helpids.h | 42 +++++++++++++++++++++--------------------- sfx2/source/inc/templdgi.hxx | 20 ++++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'sfx2/source/inc') diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx index f6ba9f318593..5eba936c6cb5 100644 --- a/sfx2/source/inc/StyleList.hxx +++ b/sfx2/source/inc/StyleList.hxx @@ -63,7 +63,7 @@ class StyleList final : public SfxListener public: // Constructor StyleList(weld::Builder* pBuilder, SfxBindings* pBindings, SfxCommonTemplateDialog_Impl* Parent, - weld::Container* pC, OString treeviewname, OString flatviewname); + weld::Container* pC, OUString treeviewname, OUString flatviewname); // Destructor ~StyleList(); @@ -144,7 +144,7 @@ private: sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt, const DropTargetHelper& rHelper); void DropHdl(const OUString& rStyle, const OUString& rParent); - void MenuSelect(const OString& rIdent); + void MenuSelect(const OUString& rIdent); void PrepareMenu(const Point& rPos); void ShowMenu(const CommandEvent& rCEvt); void CreateContextMenu(); @@ -232,7 +232,7 @@ private: std::unique_ptr pIdle; - OString sLastItemIdent; + OUString sLastItemIdent; SfxModule* m_Module; sal_uInt16 m_nModifier; weld::Container* m_pContainer; diff --git a/sfx2/source/inc/helpids.h b/sfx2/source/inc/helpids.h index 91248f469163..7dbce5235779 100644 --- a/sfx2/source/inc/helpids.h +++ b/sfx2/source/inc/helpids.h @@ -19,30 +19,30 @@ #ifndef INCLUDED_SFX2_SOURCE_INC_HELPIDS_H #define INCLUDED_SFX2_SOURCE_INC_HELPIDS_H -#include +#include -inline constexpr OStringLiteral HID_TEMPLATE_FMT = "SFX2_HID_TEMPLATE_FMT"; -inline constexpr OStringLiteral HID_TEMPLATE_FILTER = "SFX2_HID_TEMPLATE_FILTER"; -inline constexpr OStringLiteral HID_TEMPLDLG_NEWBYEXAMPLE = "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"; -inline constexpr OStringLiteral HID_TEMPLDLG_UPDATEBYEXAMPLE = "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"; -inline constexpr OStringLiteral HID_TEMPLDLG_WATERCAN = "SFX2_HID_TEMPLDLG_WATERCAN"; -inline constexpr OStringLiteral HID_NAVIGATOR_WINDOW = "SFX2_HID_NAVIGATOR_WINDOW"; -inline constexpr OStringLiteral HID_TABDLG_RESET_BTN = "SFX2_HID_TABDLG_RESET_BTN"; -inline constexpr OStringLiteral HID_TABDLG_STANDARD_BTN = "SFX2_HID_TABDLG_STANDARD_BTN"; -inline constexpr OStringLiteral HID_TEMPLDLG_TOOLBOX_LEFT = "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"; -inline constexpr OStringLiteral HID_HELP_WINDOW = "SFX2_HID_HELP_WINDOW"; -inline constexpr OStringLiteral HID_HELP_TOOLBOX = "SFX2_HID_HELP_TOOLBOX"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_INDEX = "SFX2_HID_HELP_TOOLBOXITEM_INDEX"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_START = "SFX2_HID_HELP_TOOLBOXITEM_START"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_BACKWARD = "SFX2_HID_HELP_TOOLBOXITEM_BACKWARD"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_FORWARD = "SFX2_HID_HELP_TOOLBOXITEM_FORWARD"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_PRINT = "SFX2_HID_HELP_TOOLBOXITEM_PRINT"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_BOOKMARKS = "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"; -inline constexpr OStringLiteral HID_HELP_TOOLBOXITEM_SEARCHDIALOG = "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"; +inline constexpr OUStringLiteral HID_TEMPLATE_FMT = u"SFX2_HID_TEMPLATE_FMT"; +inline constexpr OUStringLiteral HID_TEMPLATE_FILTER = u"SFX2_HID_TEMPLATE_FILTER"; +inline constexpr OUStringLiteral HID_TEMPLDLG_NEWBYEXAMPLE = u"SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"; +inline constexpr OUStringLiteral HID_TEMPLDLG_UPDATEBYEXAMPLE = u"SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"; +inline constexpr OUStringLiteral HID_TEMPLDLG_WATERCAN = u"SFX2_HID_TEMPLDLG_WATERCAN"; +inline constexpr OUStringLiteral HID_NAVIGATOR_WINDOW = u"SFX2_HID_NAVIGATOR_WINDOW"; +inline constexpr OUStringLiteral HID_TABDLG_RESET_BTN = u"SFX2_HID_TABDLG_RESET_BTN"; +inline constexpr OUStringLiteral HID_TABDLG_STANDARD_BTN = u"SFX2_HID_TABDLG_STANDARD_BTN"; +inline constexpr OUStringLiteral HID_TEMPLDLG_TOOLBOX_LEFT = u"SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"; +inline constexpr OUStringLiteral HID_HELP_WINDOW = u"SFX2_HID_HELP_WINDOW"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOX = u"SFX2_HID_HELP_TOOLBOX"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_INDEX = u"SFX2_HID_HELP_TOOLBOXITEM_INDEX"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_START = u"SFX2_HID_HELP_TOOLBOXITEM_START"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_BACKWARD = u"SFX2_HID_HELP_TOOLBOXITEM_BACKWARD"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_FORWARD = u"SFX2_HID_HELP_TOOLBOXITEM_FORWARD"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_PRINT = u"SFX2_HID_HELP_TOOLBOXITEM_PRINT"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_BOOKMARKS = u"SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"; +inline constexpr OUStringLiteral HID_HELP_TOOLBOXITEM_SEARCHDIALOG = u"SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"; -inline constexpr OStringLiteral HID_QUERY_LOAD_TEMPLATE = "SFX2_HID_QUERY_LOAD_TEMPLATE"; +inline constexpr OUStringLiteral HID_QUERY_LOAD_TEMPLATE = u"SFX2_HID_QUERY_LOAD_TEMPLATE"; -inline constexpr OStringLiteral HID_SIDEBAR_WINDOW = "SFX2_HID_SIDEBAR_WINDOW"; +inline constexpr OUStringLiteral HID_SIDEBAR_WINDOW = u"SFX2_HID_SIDEBAR_WINDOW"; #endif diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 89d8fcfe0bc3..322747b5636e 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -112,7 +112,7 @@ protected: bool IsSafeForWaterCan() const; void SetFamily(SfxStyleFamily nFamily); - void ActionSelect(const OString& rId, StyleList& rStyleList); + void ActionSelect(const OUString& rId, StyleList& rStyleList); void SaveFactoryStyleFilter(SfxObjectShell const* i_pObjSh, sal_Int32 i_nFilter); @@ -160,11 +160,11 @@ public: void EnableExample_Impl(sal_uInt16 nId, bool bEnable); // This comes into action when a family is selected or a style is applied for use - virtual void CheckItem(const OString& /*rMesId*/, bool /*bCheck*/ = true) {} + virtual void CheckItem(const OUString& /*rMesId*/, bool /*bCheck*/ = true) {} // This is used for watercan or when newmenu or watercan is enabled or updated - virtual void EnableItem(const OString& /*rMesId*/, bool /*bCheck*/ = true) {} + virtual void EnableItem(const OUString& /*rMesId*/, bool /*bCheck*/ = true) {} // This is used for watercan - virtual bool IsCheckedItem(const OString& /*rMesId*/) { return true; } + virtual bool IsCheckedItem(const OUString& /*rMesId*/) { return true; } // This is used when a style is selected void SelectStyle(const OUString& rStyle, bool bIsCallback, StyleList& rStyleList); @@ -210,14 +210,14 @@ private: void FillToolMenu(); - DECL_LINK(ToolBoxLSelect, const OString&, void); - DECL_LINK(ToolBoxRSelect, const OString&, void); - DECL_LINK(ToolMenuSelectHdl, const OString&, void); + DECL_LINK(ToolBoxLSelect, const OUString&, void); + DECL_LINK(ToolBoxRSelect, const OUString&, void); + DECL_LINK(ToolMenuSelectHdl, const OUString&, void); virtual void EnableEdit( bool, StyleList* rStyleList) override; - virtual void EnableItem(const OString& rMesId, bool bCheck = true) override; - virtual void CheckItem(const OString& rMesId, bool bCheck = true) override; - virtual bool IsCheckedItem(const OString& rMesId) override; + virtual void EnableItem(const OUString& rMesId, bool bCheck = true) override; + virtual void CheckItem(const OUString& rMesId, bool bCheck = true) override; + virtual bool IsCheckedItem(const OUString& rMesId) override; virtual void InsertFamilyItem(sal_uInt16 nId, const SfxStyleFamilyItem& rItem) override; virtual void EnableFamilyItem(sal_uInt16 nId, bool bEnabled) override; virtual void ClearFamilyList() override; -- cgit