diff options
678 files changed, 4144 insertions, 4250 deletions
diff --git a/avmedia/inc/helpids.h b/avmedia/inc/helpids.h index 1f9a4c305e1d..f49f12fb3e00 100644 --- a/avmedia/inc/helpids.h +++ b/avmedia/inc/helpids.h @@ -19,18 +19,18 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_PLAY = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"; -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_PAUSE = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"; -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_STOP = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"; -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_MUTE = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"; -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_LOOP = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"; -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_OPEN = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"; -inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_INSERT = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"; -inline constexpr OStringLiteral HID_AVMEDIA_ZOOMLISTBOX = "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"; -inline constexpr OStringLiteral HID_AVMEDIA_TIMEEDIT = "AVMEDIA_HID_AVMEDIA_TIMEEDIT"; -inline constexpr OStringLiteral HID_AVMEDIA_VOLUMESLIDER = "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"; -inline constexpr OStringLiteral HID_AVMEDIA_PLAYERWINDOW = "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_PLAY = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_PAUSE = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_STOP = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_MUTE = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_LOOP = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_OPEN = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"; +inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_INSERT = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"; +inline constexpr OUStringLiteral HID_AVMEDIA_ZOOMLISTBOX = u"AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"; +inline constexpr OUStringLiteral HID_AVMEDIA_TIMEEDIT = u"AVMEDIA_HID_AVMEDIA_TIMEEDIT"; +inline constexpr OUStringLiteral HID_AVMEDIA_VOLUMESLIDER = u"AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"; +inline constexpr OUStringLiteral HID_AVMEDIA_PLAYERWINDOW = u"AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 6b004626ff83..f168ef566807 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -57,7 +57,7 @@ private: DECL_LINK(implTimeHdl, weld::Scale&, void); DECL_LINK(implTimeEndHdl, Timer*, void); DECL_LINK(implVolumeHdl, weld::Scale&, void); - DECL_LINK(implSelectHdl, const OString&, void); + DECL_LINK(implSelectHdl, const OUString&, void); DECL_LINK(implZoomSelectHdl, weld::ComboBox&, void); DECL_LINK(implTimeoutHdl, Timer*, void); diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index 534c27c2c33c..d2c254293811 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -209,16 +209,16 @@ void MediaControlBase::UpdateToolBoxes(const MediaItem& rMediaItem) } } -void MediaControlBase::SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem const & aItem, std::string_view rId) +void MediaControlBase::SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem const & aItem, std::u16string_view rId) { - if (rId == "apply") + if (rId == u"apply") { MediaFloater* pFloater = avmedia::getMediaFloater(); if( pFloater ) pFloater->dispatchCurrentURL(); } - else if (rId == "play") + else if (rId == u"play") { aExecItem.setState( MediaState::Play ); @@ -229,24 +229,24 @@ void MediaControlBase::SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem co UpdatePlayState(aExecItem); } - else if (rId == "pause") + else if (rId == u"pause") { aExecItem.setState( MediaState::Pause ); UpdatePlayState(aExecItem); } - else if (rId == "stop") + else if (rId == u"stop") { aExecItem.setState( MediaState::Stop ); aExecItem.setTime( 0.0 ); UpdatePlayState(aExecItem); } - else if (rId == "mute") + else if (rId == u"mute") { aExecItem.setMute( mxMuteToolBox->get_item_active("mute") ); } - else if (rId == "loop") + else if (rId == u"loop") { aExecItem.setLoop( mxPlayToolBox->get_item_active("loop") ); } diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 23d700595f95..a9c33ff45455 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -156,7 +156,7 @@ IMPL_LINK( MediaControl, implVolumeHdl, weld::Scale&, rSlider, void ) update(); } -IMPL_LINK( MediaControl, implSelectHdl, const OString&, rIdent, void ) +IMPL_LINK( MediaControl, implSelectHdl, const OUString&, rIdent, void ) { MediaItem aExecItem; if (rIdent == "open") diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h index 28b855ffb602..e34d054ed899 100644 --- a/basctl/inc/helpids.h +++ b/basctl/inc/helpids.h @@ -18,22 +18,22 @@ */ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_BASICIDE_OBJECTCAT = "BASCTL_HID_BASICIDE_OBJECTCAT"; +inline constexpr OUStringLiteral HID_BASICIDE_OBJECTCAT = u"BASCTL_HID_BASICIDE_OBJECTCAT"; -inline constexpr OStringLiteral HID_BASICIDE_REMOVEWATCH = "BASCTL_HID_BASICIDE_REMOVEWATCH"; +inline constexpr OUStringLiteral HID_BASICIDE_REMOVEWATCH = u"BASCTL_HID_BASICIDE_REMOVEWATCH"; -inline constexpr OStringLiteral HID_BASICIDE_MODULWINDOW = "BASCTL_HID_BASICIDE_MODULWINDOW"; -inline constexpr OStringLiteral HID_BASICIDE_DIALOGWINDOW = "BASCTL_HID_BASICIDE_DIALOGWINDOW"; +inline constexpr OUStringLiteral HID_BASICIDE_MODULWINDOW = u"BASCTL_HID_BASICIDE_MODULWINDOW"; +inline constexpr OUStringLiteral HID_BASICIDE_DIALOGWINDOW = u"BASCTL_HID_BASICIDE_DIALOGWINDOW"; -inline constexpr OStringLiteral HID_BASICIDE_EDITORWINDOW = "BASCTL_HID_BASICIDE_EDITORWINDOW"; -inline constexpr OStringLiteral HID_BASICIDE_BREAKPOINTWINDOW = "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"; -inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW = "BASCTL_HID_BASICIDE_WATCHWINDOW"; -inline constexpr OStringLiteral HID_BASICIDE_STACKWINDOW = "BASCTL_HID_BASICIDE_STACKWINDOW"; -inline constexpr OStringLiteral HID_BASICIDE_TABBAR = "BASCTL_HID_BASICIDE_TABBAR"; -inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW_EDIT = "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"; -inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW_LIST = "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"; -inline constexpr OStringLiteral HID_BASICIDE_STACKWINDOW_LIST = "BASCTL_HID_BASICIDE_STACKWINDOW_LIST"; +inline constexpr OUStringLiteral HID_BASICIDE_EDITORWINDOW = u"BASCTL_HID_BASICIDE_EDITORWINDOW"; +inline constexpr OUStringLiteral HID_BASICIDE_BREAKPOINTWINDOW = u"BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"; +inline constexpr OUStringLiteral HID_BASICIDE_WATCHWINDOW = u"BASCTL_HID_BASICIDE_WATCHWINDOW"; +inline constexpr OUStringLiteral HID_BASICIDE_STACKWINDOW = u"BASCTL_HID_BASICIDE_STACKWINDOW"; +inline constexpr OUStringLiteral HID_BASICIDE_TABBAR = u"BASCTL_HID_BASICIDE_TABBAR"; +inline constexpr OUStringLiteral HID_BASICIDE_WATCHWINDOW_EDIT = u"BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"; +inline constexpr OUStringLiteral HID_BASICIDE_WATCHWINDOW_LIST = u"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"; +inline constexpr OUStringLiteral HID_BASICIDE_STACKWINDOW_LIST = u"BASCTL_HID_BASICIDE_STACKWINDOW_LIST"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 12a78d9b65f4..5384eb70fa89 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1400,7 +1400,7 @@ void ModulWindow::OnNewDocument () m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers); } -OString ModulWindow::GetHid () const +OUString ModulWindow::GetHid () const { return HID_BASICIDE_MODULWINDOW; } diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 2c9bc3f9930f..116dab2bb905 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -387,7 +387,7 @@ public: virtual void Deactivating () override; virtual void OnNewDocument () override; - virtual OString GetHid () const override; + virtual OUString GetHid () const override; virtual ItemType GetType () const override; virtual bool HasActiveEditor () const override; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 6e4208747f4a..4819de623900 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1555,7 +1555,7 @@ void BreakPointWindow::Command( const CommandEvent& rCEvt ) // test if break point is enabled... std::unique_ptr<weld::Menu> xBrkPropMenu = xUIBuilder->weld_menu("breakmenu"); xBrkPropMenu->set_active("active", pBrk->bEnabled); - OString sCommand = xBrkPropMenu->popup_at_rect(pPopupParent, aRect); + OUString sCommand = xBrkPropMenu->popup_at_rect(pPopupParent, aRect); if (sCommand == "active") { pBrk->bEnabled = !pBrk->bEnabled; @@ -1573,7 +1573,7 @@ void BreakPointWindow::Command( const CommandEvent& rCEvt ) else { std::unique_ptr<weld::Menu> xBrkListMenu = xUIBuilder->weld_menu("breaklistmenu"); - OString sCommand = xBrkListMenu->popup_at_rect(pPopupParent, aRect); + OUString sCommand = xBrkListMenu->popup_at_rect(pPopupParent, aRect); if (sCommand == "manage") { BreakPointDialog aBrkDlg(pPopupParent, GetBreakPoints()); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 309caa0357c9..4e51cd4ed760 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1242,7 +1242,7 @@ css::uno::Reference< css::accessibility::XAccessible > DialogWindow::CreateAcces return new AccessibleDialogWindow(this); } -OString DialogWindow::GetHid () const +OUString DialogWindow::GetHid () const { return HID_BASICIDE_DIALOGWINDOW; } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 5fd607108dc1..bbd71ad08ce0 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -313,7 +313,7 @@ WinBits const DockingWindow::StyleBits = WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE; -DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) +DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID) : ResizableDockingWindow(pParent) , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), rUIXMLDescription, true)) , pLayout(nullptr) diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index e2511ee53b6b..6b4afb79f772 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -791,7 +791,7 @@ IMPL_LINK(MacroChooser, ContextMenuHdl, const CommandEvent&, rCEvt, bool) xDropMenu->set_active("alphabetically", m_xMacroBox->get_sort_order()); xDropMenu->set_active("properorder", !m_xMacroBox->get_sort_order()); - OString sCommand(xPopup->popup_at_rect(m_xMacroBox.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); + OUString sCommand(xPopup->popup_at_rect(m_xMacroBox.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); if (sCommand == "alphabetically") { m_xMacroBox->make_sorted(); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 617d80e7f033..4b67e320b5ac 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -211,7 +211,7 @@ OrganizeDialog::OrganizeDialog(weld::Window* pParent, const css::uno::Reference< SetCurrentEntry(xDocFrame); - OString sPage; + OUString sPage; if (tabId == 0) sPage = "modules"; else if (tabId == 1) @@ -225,7 +225,7 @@ OrganizeDialog::OrganizeDialog(weld::Window* pParent, const css::uno::Reference< pDispatcher->Execute( SID_BASICIDE_STOREALLMODULESOURCES ); } -IMPL_LINK(OrganizeDialog, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(OrganizeDialog, ActivatePageHdl, const OUString&, rPage, void) { if (rPage == "modules") m_xModulePage->ActivatePage(); @@ -239,7 +239,7 @@ OrganizeDialog::~OrganizeDialog() { } -OrganizePage::OrganizePage(weld::Container* pParent, const OUString& rUIFile, const OString &rName, OrganizeDialog* pDialog) +OrganizePage::OrganizePage(weld::Container* pParent, const OUString& rUIFile, const OUString &rName, OrganizeDialog* pDialog) : m_pDialog(pDialog) , m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) , m_xContainer(m_xBuilder->weld_container(rName)) @@ -563,8 +563,8 @@ public: }; // ObjectPage -ObjectPage::ObjectPage(weld::Container* pParent, const OString &rName, BrowseMode nMode, OrganizeDialog* pDialog) - : OrganizePage(pParent, "modules/BasicIDE/ui/" + OStringToOUString(rName, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + ".ui", +ObjectPage::ObjectPage(weld::Container* pParent, const OUString &rName, BrowseMode nMode, OrganizeDialog* pDialog) + : OrganizePage(pParent, "modules/BasicIDE/ui/" + rName.toAsciiLowerCase() + ".ui", rName, pDialog) , m_xBasicBox(new SbTreeListBox(m_xBuilder->weld_tree_view("library"), pDialog->getDialog())) , m_xEditButton(m_xBuilder->weld_button("edit")) diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 37e8567b5e6c..4f4cbcbda3ad 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -115,7 +115,7 @@ protected: std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xContainer; - OrganizePage(weld::Container* pParent, const OUString& rUIFile, const OString &rName, OrganizeDialog* pDialog); + OrganizePage(weld::Container* pParent, const OUString& rUIFile, const OUString &rName, OrganizeDialog* pDialog); virtual ~OrganizePage(); public: @@ -147,7 +147,7 @@ class ObjectPage final : public OrganizePage void EndTabDialog(); public: - ObjectPage(weld::Container* pParent, const OString& rName, BrowseMode nMode, OrganizeDialog* pDialog); + ObjectPage(weld::Container* pParent, const OUString& rName, BrowseMode nMode, OrganizeDialog* pDialog); virtual ~ObjectPage() override; void SetCurrentEntry(const EntryDescriptor& rDesc) { m_xBasicBox->SetCurrentEntry(rDesc); } @@ -206,7 +206,7 @@ private: std::unique_ptr<ObjectPage> m_xDialogPage; std::unique_ptr<LibPage> m_xLibPage; - DECL_LINK(ActivatePageHdl, const OString&, void); + DECL_LINK(ActivatePageHdl, const OUString&, void); void SetCurrentEntry(const css::uno::Reference<css::frame::XFrame>& xDocFrame); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 5b61e1b88748..14fc68f07951 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -107,7 +107,7 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - virtual OString GetHid () const override; + virtual OUString GetHid () const override; virtual ItemType GetType () const override; }; diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 4bc92481f3ca..513fbce3a41c 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -82,7 +82,7 @@ struct BasicStatus class DockingWindow : public ResizableDockingWindow { public: - DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID); + DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID); DockingWindow(Layout* pParent); virtual ~DockingWindow() override; virtual void dispose() override; @@ -237,7 +237,7 @@ public: void SetName( const OUString& aName ) { m_aName = aName; } virtual void OnNewDocument (); - virtual OString GetHid () const = 0; + virtual OUString GetHid () const = 0; virtual ItemType GetType () const = 0; void InsertLibInfo () const; bool Is (ScriptDocument const&, std::u16string_view, std::u16string_view, ItemType, bool bFindSuspended); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index ac6f8bb9a976..12d22805790f 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -95,7 +95,7 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState) { std::unique_ptr<vcl::OWizardPage> xRet; - OString sIdent(OString::number(nState)); + OUString sIdent(OUString::number(nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); switch( nState ) diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 0a236282f4ab..367b1d183a54 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -74,7 +74,7 @@ DataEditor::~DataEditor() } // react on click (or keypress) on toolbar icon -IMPL_LINK(DataEditor, ToolboxHdl, const OString&, rId, void) +IMPL_LINK(DataEditor, ToolboxHdl, const OUString&, rId, void) { if (rId == "InsertRow") m_xBrwData->InsertRow(); diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 87af01aaa33a..4946edc0ffc5 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -126,7 +126,7 @@ short DataSourceDialog::run() return nResult; } -IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OUString&, rPage, void) { if (rPage == "range") m_xRangeChooserTabPage->Activate(); @@ -135,7 +135,7 @@ IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OString&, rPage, void) } // allow/disallow user to leave page -IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OString&, bool) +IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OUString&, bool) { return m_bTogglingEnabled; } diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index f20571e22f55..6a79bac4a414 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -37,8 +37,8 @@ SchAxisDlg::SchAxisDlg(weld::Window* pWindow, OUString("modules/schart/ui/insertaxisdlg.ui") : OUString("modules/schart/ui/insertgriddlg.ui"), bAxisDlg ? - OString("InsertAxisDialog") : - OString("InsertGridDialog")) + OUString("InsertAxisDialog") : + OUString("InsertGridDialog")) , m_xCbPrimaryX(m_xBuilder->weld_check_button("primaryX")) , m_xCbPrimaryY(m_xBuilder->weld_check_button("primaryY")) , m_xCbPrimaryZ(m_xBuilder->weld_check_button("primaryZ")) diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 359a998c9466..a0b548e43767 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -497,7 +497,7 @@ SchAttribTabDlg::~SchAttribTabDlg() { } -void SchAttribTabDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SchAttribTabDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "border") diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index f5fc702a2a76..b742e8a22eda 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -41,7 +41,7 @@ ShapeFontDialog::ShapeFontDialog(weld::Window* pParent, const SfxItemSet* pAttr, AddTabPage("position", RID_SVXPAGE_CHAR_POSITION ); } -void ShapeFontDialog::PageCreated(const OString& rId, SfxTabPage& rPage) +void ShapeFontDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) { SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) ); if (rId == "font") diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index e5b422ceaf16..4c72d4d8126b 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -47,7 +47,7 @@ ShapeParagraphDialog::ShapeParagraphDialog(weld::Window* pParent, AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } -void ShapeParagraphDialog::PageCreated(const OString& rId, SfxTabPage& rPage) +void ShapeParagraphDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) { if (rId == "labelTP_TABULATOR") { diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 367f1104e0d0..1891ffff679e 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -57,7 +57,7 @@ View3DDialog::View3DDialog(weld::Window* pParent, const rtl::Reference<::chart:: m_xTabControl->set_current_page(m_nLastPageId); } -IMPL_LINK(View3DDialog, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(View3DDialog, ActivatePageHdl, const OUString&, rPage, void) { if (rPage == "appearance") m_xAppearance->ActivatePage(); diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 9671169db019..205e822a12a5 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -63,7 +63,7 @@ private: VclPtr<DataBrowser> m_xBrwData; /// handles actions of the toolbox - DECL_LINK( ToolboxHdl, const OString&, void ); + DECL_LINK( ToolboxHdl, const OUString&, void ); /// is called, if the cursor of the table has moved DECL_LINK( BrowserCursorMovedHdl, DataBrowser*, void); }; diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 2dce4169d22b..166131e30ec9 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -52,8 +52,8 @@ public: virtual void setValidPage( BuilderPage * pTabPage ) override; private: - DECL_LINK(ActivatePageHdl, const OString&, void); - DECL_LINK(DeactivatePageHdl, const OString&, bool); + DECL_LINK(ActivatePageHdl, const OUString&, void); + DECL_LINK(DeactivatePageHdl, const OUString&, bool); std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider; std::unique_ptr< DialogModel > m_apDialogModel; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 4311add0f733..621f096753e4 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -122,7 +122,7 @@ private: DECL_LINK(OKPressed, weld::Button&, void); - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: SchAttribTabDlg(weld::Window* pParent, const SfxItemSet* pAttr, diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index 6998ba47094b..cfeb002fb92d 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -33,7 +33,7 @@ public: const ViewElementListProvider* pViewElementListProvider); private: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; const ViewElementListProvider* m_pViewElementListProvider; }; diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index 9d4d7496d64d..15d0c014d848 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -30,7 +30,7 @@ public: ShapeParagraphDialog(weld::Window* pParent, const SfxItemSet* pAttr); private: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; }; } // namespace chart diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index c165e828535e..66c4a8eaf41a 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -41,7 +41,7 @@ public: virtual short run() override; private: - DECL_LINK(ActivatePageHdl, const OString&, void); + DECL_LINK(ActivatePageHdl, const OUString&, void); ControllerLockHelper m_aControllerLocker; diff --git a/chart2/source/controller/inc/helpids.h b/chart2/source/controller/inc/helpids.h index 69a23771c8dd..8e683334fdd3 100644 --- a/chart2/source/controller/inc/helpids.h +++ b/chart2/source/controller/inc/helpids.h @@ -19,14 +19,14 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_SCH_WIN_DOCUMENT = "CHART2_HID_SCH_WIN_DOCUMENT"; -inline constexpr OStringLiteral HID_SCH_ERROR_BARS_FROM_DATA = "CHART2_SCH_ERROR_BARS_FROM_DATA"; +inline constexpr OUStringLiteral HID_SCH_WIN_DOCUMENT = u"CHART2_HID_SCH_WIN_DOCUMENT"; +inline constexpr OUStringLiteral HID_SCH_ERROR_BARS_FROM_DATA = u"CHART2_SCH_ERROR_BARS_FROM_DATA"; -inline constexpr OStringLiteral HID_SCH_WIZARD_ROADMAP = "CHART2_HID_SCH_WIZARD_ROADMAP"; -inline constexpr OStringLiteral HID_SCH_DATA_SERIES_LABEL = "CHART2_HID_SCH_DATA_SERIES_LABEL"; +inline constexpr OUStringLiteral HID_SCH_WIZARD_ROADMAP = u"CHART2_HID_SCH_WIZARD_ROADMAP"; +inline constexpr OUStringLiteral HID_SCH_DATA_SERIES_LABEL = u"CHART2_HID_SCH_DATA_SERIES_LABEL"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 5793825b5d76..dad5b5e1fc55 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -275,7 +275,7 @@ void SvxMenuConfigPage::SelectElement() UpdateButtonStates(); } -IMPL_LINK(SvxMenuConfigPage, GearHdl, const OString&, rIdent, void) +IMPL_LINK(SvxMenuConfigPage, GearHdl, const OUString&, rIdent, void) { if (rIdent == "menu_gear_add") { @@ -371,7 +371,7 @@ IMPL_LINK_NOARG(SvxMenuConfigPage, RemoveCommandHdl, weld::Button&, void) } } -IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&, rIdent, void) +IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OUString&, rIdent, void) { weld::TreeView& rTreeView = m_xContentsListBox->get_widget(); if (rIdent == "insertseparator") @@ -423,7 +423,7 @@ IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&, rIdent, void) } } -IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OString&, rIdent, void) +IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OUString&, rIdent, void) { if (rIdent == "renameItem") { @@ -541,7 +541,7 @@ IMPL_LINK(SvxMenuConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEvt, xContextMenu->set_visible("changeIcon", false); xContextMenu->set_visible("resetIcon", false); xContextMenu->set_visible("restoreDefault", false); - OString sCommand(xContextMenu->popup_at_rect( + OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); if (sCommand == "remove") @@ -580,7 +580,7 @@ IMPL_LINK(SvxMenuConfigPage, FunctionContextMenuHdl, const CommandEvent&, rCEvt, xContextMenu->set_visible("changeIcon", false); xContextMenu->set_visible("resetIcon", false); xContextMenu->set_visible("restoreDefault", false); - OString sCommand(xContextMenu->popup_at_rect( + OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); if (sCommand == "add") diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 359dc02bb1f5..73a836ff7a17 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -287,7 +287,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, SelectToolbarEntry, weld::TreeView&, void) UpdateButtonStates(); } -IMPL_LINK(SvxToolbarConfigPage, GearHdl, const OString&, rIdent, void) +IMPL_LINK(SvxToolbarConfigPage, GearHdl, const OUString&, rIdent, void) { SvxConfigEntry* pCurrentToolbar = GetTopLevelSelection(); @@ -427,7 +427,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, RemoveCommandHdl, weld::Button&, void) DeleteSelectedContent(); } -IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OString&, rIdent, void) +IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OUString&, rIdent, void) { if (rIdent == "insertseparator") { @@ -452,7 +452,7 @@ IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OString&, rIdent, void) } } -IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OString&, rIdent, void) +IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OUString&, rIdent, void) { bool bNeedsApply = false; @@ -876,7 +876,7 @@ IMPL_LINK(SvxToolbarConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEv xContextMenu->set_visible("changeIcon", bIsValidSelection && !bIsSeparator); xContextMenu->set_visible("resetIcon", bIsValidSelection && !bIsSeparator); xContextMenu->set_visible("restoreDefault", bIsValidSelection && !bIsSeparator); - OString sCommand(xContextMenu->popup_at_rect( + OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); if (sCommand == "remove") @@ -916,7 +916,7 @@ IMPL_LINK(SvxToolbarConfigPage, FunctionContextMenuHdl, const CommandEvent&, rCE xContextMenu->set_visible("changeIcon", false); xContextMenu->set_visible("resetIcon", false); xContextMenu->set_visible("restoreDefault", false); - OString sCommand(xContextMenu->popup_at_rect( + OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); if (sCommand == "add") diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 91584562a647..d41012850bce 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -236,7 +236,7 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, const SfxItemSet* pInSe #endif } -void SvxConfigDialog::ActivatePage(const OString& rPage) +void SvxConfigDialog::ActivatePage(const OUString& rPage) { SfxTabDialogController::ActivatePage(rPage); GetResetButton()->set_visible(rPage != "keyboard"); @@ -257,7 +257,7 @@ void SvxConfigDialog::SetFrame(const css::uno::Reference<css::frame::XFrame>& xF RemoveTabPage("keyboard"); } -void SvxConfigDialog::PageCreated(const OString &rId, SfxTabPage& rPage) +void SvxConfigDialog::PageCreated(const OUString &rId, SfxTabPage& rPage) { if (rId == "menus" || rId == "keyboard" || rId == "notebookbar" || rId == "toolbars" || rId == "contextmenus") diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 7746333fe796..aa77952563a8 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -1204,7 +1204,7 @@ IMPL_LINK(SvxScriptSelectorDialog, ContextMenuHdl, const CommandEvent&, rCEvt, b xDropMenu->set_active("alphabetically", xTreeView.get_sort_order()); xDropMenu->set_active("properorder", !xTreeView.get_sort_order()); - OString sCommand(xPopup->popup_at_rect(&xTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); + OUString sCommand(xPopup->popup_at_rect(&xTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); if (sCommand == "alphabetically") { xTreeView.make_sorted(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 3980c8b6c3f7..6a22ee2c3d99 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -72,7 +72,7 @@ void SvxMacroTabPage_::EnableButtons() } SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, - const OString& rID, const SfxItemSet& rAttrSet) + const OUString& rID, const SfxItemSet& rAttrSet) : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet) , m_nAssignedEvents(0) , bDocModified(false) diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index bf386e597412..d46a22a9071f 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -848,7 +848,7 @@ void TmpRepositoryCommandEnv::update(uno::Any const& /*Status */) {} void TmpRepositoryCommandEnv::pop() {} -IMPL_LINK(AdditionsDialog, GearHdl, const OString&, rIdent, void) +IMPL_LINK(AdditionsDialog, GearHdl, const OUString&, rIdent, void) { if (rIdent == "gear_sort_voting") { diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx b/cui/source/dialogs/SignatureLineDialogBase.cxx index 4e591124bc44..e0ae28fe5040 100644 --- a/cui/source/dialogs/SignatureLineDialogBase.cxx +++ b/cui/source/dialogs/SignatureLineDialogBase.cxx @@ -18,7 +18,7 @@ using namespace css::uno; using namespace css::frame; SignatureLineDialogBase::SignatureLineDialogBase(weld::Widget* pParent, Reference<XModel> xModel, - const OUString& rUIFile, const OString& rDialogId) + const OUString& rUIFile, const OUString& rDialogId) : GenericDialogController(pParent, rUIFile, rDialogId) , m_xModel(std::move(xModel)) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 7b671fd84dfa..b5356aa30a45 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -833,15 +833,15 @@ int SpellDialog::InitUserDicts() IMPL_LINK_NOARG(SpellDialog, AddToDictClickHdl, weld::Button&, void) { - AddToDictionaryExecute(OString::number(1)); + AddToDictionaryExecute(OUString::number(1)); } -IMPL_LINK(SpellDialog, AddToDictSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SpellDialog, AddToDictSelectHdl, const OUString&, rIdent, void) { AddToDictionaryExecute(rIdent); } -void SpellDialog::AddToDictionaryExecute(const OString& rItemId) +void SpellDialog::AddToDictionaryExecute(const OUString& rItemId) { auto xGuard(std::make_unique<UndoChangeGroupGuard>(*m_xSentenceED)); @@ -1526,7 +1526,7 @@ void SentenceEditWindow_Impl::Init(weld::Toolbar* pToolbar) m_pToolbar->connect_clicked(LINK(this,SentenceEditWindow_Impl,ToolbarHdl)); } -IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const OString&, rCurItemId, void) +IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const OUString&, rCurItemId, void) { if (rCurItemId == "paste") { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index e432b4fce85b..530ef109c216 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -492,7 +492,7 @@ GalleryThemeProperties::GalleryThemeProperties(weld::Widget* pParent, m_xDialog->set_title(aText); } -void GalleryThemeProperties::PageCreated(const OString& rId, SfxTabPage &rPage) +void GalleryThemeProperties::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "general") static_cast<TPGalleryThemeGeneral&>( rPage ).SetXChgData( pData ); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index c67ee92d141c..48373e7f1968 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -124,7 +124,7 @@ void CuiGraphicPreviewWindow::Resize() } GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent, - const OUString& rUIXMLDescription, const OString& rID, + const OUString& rUIXMLDescription, const OUString& rID, const Graphic& rGraphic) : GenericDialogController(pParent, rUIXMLDescription, rID) , maTimer("cui GraphicFilterDialog maTimer") diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 3352a7a10f5a..9eb5a1fa367e 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, weld::Button&, void) |************************************************************************/ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem ) { - OString sPageId("internet"); + OUString sPageId("internet"); OUString aStrURL(pItem->GetURL()); INetURLObject aURL(aStrURL); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 77d335f109c2..c1b9b270f9c9 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -105,7 +105,7 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase(weld::Container* pParent, SvxHpLinkDlg* pDlg, const OUString& rUIXMLDescription, - const OString& rID, + const OUString& rID, const SfxItemSet* pItemSet) : IconChoicePage(pParent, rUIXMLDescription, rID, pItemSet) , mxCbbFrame(xBuilder->weld_combo_box("frame")) diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 6e6ffaf5c53a..0c2219f0ee71 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -31,7 +31,7 @@ \**********************************************************************/ IconChoicePage::IconChoicePage(weld::Container* pParent, - const OUString& rUIXMLDescription, const OString& rID, + const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet* pItemSet) : xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) , xContainer(xBuilder->weld_container(rID)) @@ -70,7 +70,7 @@ bool IconChoicePage::QueryClose() | add new page | \**********************************************************************/ -void SvxHpLinkDlg::AddTabPage(const OString& rId, CreatePage pCreateFunc /* != 0 */) +void SvxHpLinkDlg::AddTabPage(const OUString& rId, CreatePage pCreateFunc /* != 0 */) { weld::Container* pPage = m_xIconCtrl->get_page(rId); maPageList.emplace_back(new IconChoicePageData(rId, pCreateFunc(pPage, this, pSet))); @@ -83,9 +83,9 @@ void SvxHpLinkDlg::AddTabPage(const OString& rId, CreatePage pCreateFunc /* != 0 | Show / Hide page or button | \**********************************************************************/ -void SvxHpLinkDlg::ShowPage(const OString& rId) +void SvxHpLinkDlg::ShowPage(const OUString& rId) { - OString sOldPageId = GetCurPageId(); + OUString sOldPageId = GetCurPageId(); bool bInvalidate = sOldPageId != rId; if (bInvalidate) { @@ -104,7 +104,7 @@ void SvxHpLinkDlg::ShowPage(const OString& rId) | select a page | \**********************************************************************/ -IMPL_LINK(SvxHpLinkDlg, ChosePageHdl_Impl, const OString&, rId, void) +IMPL_LINK(SvxHpLinkDlg, ChosePageHdl_Impl, const OUString&, rId, void) { if (rId != msCurrentPageId) { @@ -280,7 +280,7 @@ void SvxHpLinkDlg::Start() | \**********************************************************************/ -IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::string_view rId ) +IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::u16string_view rId ) { IconChoicePageData *pRet = nullptr; for (const auto & pData : maPageList) @@ -300,7 +300,7 @@ IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::string_view rId ) | \**********************************************************************/ -void SvxHpLinkDlg::SwitchPage( const OString& rId ) +void SvxHpLinkDlg::SwitchPage( const OUString& rId ) { m_xIconCtrl->set_current_page(rId); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 53488a72e334..3cb50c2a6066 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -72,7 +72,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( } InsertObjectDialog_Impl::InsertObjectDialog_Impl(weld::Window* pParent, - const OUString& rUIXMLDescription, const OString& rID, + const OUString& rUIXMLDescription, const OUString& rID, css::uno::Reference < css::embed::XStorage > xStorage) : GenericDialogController(pParent, rUIXMLDescription, rID) , m_xStorage(std::move( xStorage )) diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index bec311442756..1ff1a14411cb 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -31,7 +31,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return m_xCountEdit->get_value(); } -SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OString& rHelpId) +SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OUString& rHelpId) : GenericDialogController(pParent, "cui/ui/insertrowcolumn.ui", "InsertRowColumnDialog") , m_xCountEdit(m_xBuilder->weld_spin_button("insert_number")) , m_xBeforeBtn(m_xBuilder->weld_radio_button("insert_before")) diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index c23146f91fbd..fca03c02d42d 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -252,7 +252,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl( if (mxText) { mxText->set_size_request(400, mxText->get_height_rows(10)); - OUString aHelpId = OStringToOUString( mrParentDialog.get_help_id(), RTL_TEXTENCODING_UTF8 ); + OUString aHelpId = mrParentDialog.get_help_id(); Size aSizeCm = Application::GetDefaultDevice()->PixelToLogic(maParentDialogSize, MapMode(MapUnit::MapCM)); maMainMarkupText = lcl_ParagraphWithImage( aHelpId, aSizeCm ); mxText->set_text( maMainMarkupText ); @@ -276,7 +276,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, weld::Button&, // 'save screenshot...' pressed, offer to save maParentDialogBitmap // as PNG image, use *.id file name as screenshot file name offering // get a suggestion for the filename from buildable name - OString aDerivedFileName = mrParentDialog.get_buildable_name(); + OUString aDerivedFileName = mrParentDialog.get_buildable_name(); auto xFileDlg = std::make_unique<sfx2::FileDialogHelper>(ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, mpParentWindow); @@ -293,7 +293,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, weld::Button&, xFilePicker->appendFilter("*.png", "*.png"); xFilePicker->setCurrentFilter("*.png"); - xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, RTL_TEXTENCODING_UTF8)); + xFilePicker->setDefaultName(aDerivedFileName); xFilePicker->setMultiSelectionMode(false); if (xFilePicker->execute() != ui::dialogs::ExecutableDialogResults::OK) @@ -546,10 +546,7 @@ bool ScreenshotAnnotationDlg_Impl::MouseButtonUp() OUStringBuffer aBookmarks(maMainMarkupText); for (auto&& rCandidate : maSelected) - { - OUString aHelpId = OStringToOUString( rCandidate->GetHelpId(), RTL_TEXTENCODING_UTF8 ); - aBookmarks.append(lcl_Bookmark( aHelpId )); - } + aBookmarks.append(lcl_Bookmark(rCandidate->GetHelpId())); mxText->set_text( aBookmarks.makeStringAndClear() ); bRepaint = true; diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 3afbc0f694d3..c5c4d22e162c 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -67,7 +67,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const SfxItemS RemoveTabPage("asian"); } -void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SvxFormatCellsDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "area") { diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 40c2e369ab6b..9ed00b46377d 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -59,7 +59,7 @@ SvxSearchFormatDialog::~SvxSearchFormatDialog() { } -void SvxSearchFormatDialog::PageCreated(const OString& rId, SfxTabPage& rPage) +void SvxSearchFormatDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) { if (rId == "font") { diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f0177530fa70..5478b62ad55c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -165,7 +165,7 @@ void AbstractSvxCharacterMapDialog_Impl::SetText(const OUString& rStr) m_xDlg->set_title(rStr); } -void CuiAbstractTabController_Impl::SetCurPageId( const OString &rName ) +void CuiAbstractTabController_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -191,12 +191,12 @@ void CuiAbstractTabController_Impl::SetText( const OUString& rStr ) m_xDlg->set_title(rStr); } -std::vector<OString> CuiAbstractTabController_Impl::getAllPageUIXMLDescriptions() const +std::vector<OUString> CuiAbstractTabController_Impl::getAllPageUIXMLDescriptions() const { return m_xDlg->getAllPageUIXMLDescriptions(); } -bool CuiAbstractTabController_Impl::selectPageByUIXMLDescription(const OString& rUIXMLDescription) +bool CuiAbstractTabController_Impl::selectPageByUIXMLDescription(const OUString& rUIXMLDescription) { return m_xDlg->selectPageByUIXMLDescription(rUIXMLDescription); } @@ -206,7 +206,7 @@ BitmapEx CuiAbstractTabController_Impl::createScreenshot() const return m_xDlg->createScreenshot(); } -OString CuiAbstractTabController_Impl::GetScreenshotId() const +OUString CuiAbstractTabController_Impl::GetScreenshotId() const { return m_xDlg->GetScreenshotId(); } @@ -466,7 +466,7 @@ bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed() } // AbstractSvxTransformTabDialog implementations just forwards everything to the dialog -void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OString& rName ) +void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OUString& rName ) { m_xDlg->SetCurPageId( rName ); } @@ -498,7 +498,7 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<Svx } // AbstractSvxCaptionDialog implementations just forwards everything to the dialog -void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OString& rName ) +void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OUString& rName ) { m_xDlg->SetCurPageId(rName); } @@ -571,12 +571,12 @@ void AbstractSvxNameDialog_Impl::SetCheckNameTooltipHdl( const Link<AbstractSvxN m_xDlg->SetCheckNameTooltipHdl( Link<SvxNameDialog&,OUString>()); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& rHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const OUString& rHelpId) { m_xDlg->SetEditHelpId(rHelpId); } -void AbstractSvxNameDialog_Impl::SetHelpId(const OString& rHelpId) +void AbstractSvxNameDialog_Impl::SetHelpId(const OUString& rHelpId) { m_xDlg->set_help_id(rHelpId); } @@ -691,7 +691,7 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic(const Graphic& rGra } // AbstractSvxAreaTabDialog implementations just forwards everything to the dialog -void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName ) +void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OUString& rName ) { m_xDlg->SetCurPageId( rName ); } @@ -1409,7 +1409,7 @@ VclPtr<SfxAbstractInsertObjectDialog> AbstractDialogFactory_Impl::CreateInsertOb if ( pDlg ) { - pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetHelpId(rCommand); return VclPtr<AbstractInsertObjectDialog_Impl>::Create( std::move(pDlg) ); } return nullptr; @@ -1421,7 +1421,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateEditObjectDialog(wel if ( rCommand == ".uno:InsertObjectFloatingFrame" ) { auto pDlg = std::make_unique<SfxInsertFloatingFrameDialog>(pParent, xObj); - pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetHelpId(rCommand); return VclPtr<AbstractInsertObjectDialog_Impl>::Create( std::move(pDlg) ); } return nullptr; @@ -1460,7 +1460,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateOptionsDialog(weld:: return VclPtr<CuiAbstractController_Impl>::Create(std::make_unique<OfaTreeOptionsDialog>(pParent, rExtensionId)); } -VclPtr<SvxAbstractInsRowColDlg> AbstractDialogFactory_Impl::CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId) +VclPtr<SvxAbstractInsRowColDlg> AbstractDialogFactory_Impl::CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId) { return VclPtr<SvxInsRowColDlg>::Create(pParent, bCol, rHelpId); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 991ec082ad48..8e23592d87b7 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -122,17 +122,17 @@ DECL_ABSTDLG_CLASS_UNIQUE(CuiAbstractSingleTabController, SfxAbstractDialog, Sfx // CuiAbstractTabController_Impl DECL_ABSTDLG_CLASS_SHARED_ASYNC(CuiAbstractTabController, SfxAbstractTabDialog, SfxTabDialogController) - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; virtual void SetText( const OUString& rStr ) override; // screenshotting - virtual std::vector<OString> getAllPageUIXMLDescriptions() const override; - virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override; + virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override; + virtual bool selectPageByUIXMLDescription(const OUString& rUIXMLDescription) override; virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; // AbstractHangulHanjaConversionDialog_Impl @@ -235,7 +235,7 @@ DECL_ABSTDLG_CLASS(AbstractSvxJSearchOptionsDialog,SvxJSearchOptionsDialog) // AbstractSvxTransformTabDialog_Impl DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxTransformTabDialog,SvxTransformTabDialog) virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override; - virtual void SetCurPageId( const OString& rName ) override; + virtual void SetCurPageId( const OUString& rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -245,7 +245,7 @@ DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxTransformTabDialog,SvxTransformTabDialog) // AbstractSvxCaptionDialog_Impl DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxCaptionDialog,SvxCaptionTabDialog) virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override; - virtual void SetCurPageId( const OString& rName ) override; + virtual void SetCurPageId( const OUString& rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -268,9 +268,9 @@ DECL_ABSTDLG_CLASS(AbstractSvxNameDialog,SvxNameDialog) virtual void GetName( OUString& rName ) override ; virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) override ; virtual void SetCheckNameTooltipHdl( const Link<AbstractSvxNameDialog&, OUString>& rLink ) override ; - virtual void SetEditHelpId(const OString&) override ; + virtual void SetEditHelpId(const OUString&) override ; //from class Window - virtual void SetHelpId( const OString& ) override ; + virtual void SetHelpId( const OUString& ) override ; virtual void SetText( const OUString& rStr ) override ; private: @@ -334,7 +334,7 @@ DECL_ABSTDLG_CLASS(AbstractGraphicFilterDialog,GraphicFilterDialog) // AbstractSvxAreaTabDialog_Impl DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxAreaTabDialog,SvxAreaTabDialog) - virtual void SetCurPageId(const OString& rName) override; + virtual void SetCurPageId(const OUString& rName) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet(const SfxItemSet* pInSet) override; @@ -586,7 +586,7 @@ public: virtual VclPtr<VclAbstractDialog> CreateOptionsDialog( weld::Window* pParent, const OUString& rExtensionId ) override; - virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId) override; + virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId) override; virtual VclPtr<AbstractPasswordToOpenModifyDialog> CreatePasswordToOpenModifyDialog(weld::Window* pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) override; diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 415aa1e9da36..302d11bbc6ea 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -58,7 +58,7 @@ class AdditionsDialog : public weld::GenericDialogController private: Timer m_aSearchDataTimer; - DECL_LINK(GearHdl, const OString&, void); + DECL_LINK(GearHdl, const OUString&, void); DECL_LINK(SearchUpdateHdl, weld::Entry&, void); DECL_LINK(ImplUpdateDataHdl, Timer*, void); DECL_LINK(FocusOut_Impl, weld::Widget&, void); diff --git a/cui/source/inc/SignatureLineDialogBase.hxx b/cui/source/inc/SignatureLineDialogBase.hxx index 3cc645819be8..dd114d81ab7d 100644 --- a/cui/source/inc/SignatureLineDialogBase.hxx +++ b/cui/source/inc/SignatureLineDialogBase.hxx @@ -21,7 +21,7 @@ class SignatureLineDialogBase : public weld::GenericDialogController { public: SignatureLineDialogBase(weld::Widget* pParent, css::uno::Reference<css::frame::XModel> xModel, - const OUString& rUIFile, const OString& rDialogId); + const OUString& rUIFile, const OUString& rDialogId); virtual short run() override; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 3c6a7b229ebb..3c45ffce043b 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -61,7 +61,7 @@ private: bool GetErrorDescription(SpellErrorDescription& rSpellErrorDescription, sal_Int32 nPosition); - DECL_LINK(ToolbarHdl, const OString&, void); + DECL_LINK(ToolbarHdl, const OUString&, void); protected: virtual bool KeyInput( const KeyEvent& rKEvt ) override; @@ -176,14 +176,14 @@ private: DECL_LINK(CancelHdl, weld::Button&, void); DECL_LINK(ModifyHdl, LinkParamNone*, void); DECL_LINK(UndoHdl, weld::Button&, void); - DECL_LINK(AddToDictSelectHdl, const OString&, void); + DECL_LINK(AddToDictSelectHdl, const OUString&, void); DECL_LINK(AddToDictClickHdl, weld::Button&, void); DECL_LINK(LanguageSelectHdl, weld::ComboBox&, void); DECL_LINK(DialogUndoHdl, SpellUndoAction_Impl&, void); DECL_LINK(InitHdl, void*, void); - void AddToDictionaryExecute(const OString& rItemId); + void AddToDictionaryExecute(const OUString& rItemId); void StartSpellOptDlg_Impl(); int InitUserDicts(); void UpdateBoxes_Impl(bool bCallFromSelectHdl = false); diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index bc8fba3f5780..36fee041de76 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -33,15 +33,15 @@ private: DECL_LINK(ContentContextMenuHdl, const CommandEvent&, bool); DECL_LINK(FunctionContextMenuHdl, const CommandEvent&, bool); - DECL_LINK(GearHdl, const OString&, void); + DECL_LINK(GearHdl, const OUString&, void); DECL_LINK(SelectCategory, weld::ComboBox&, void); DECL_LINK(AddCommandHdl, weld::Button&, void); DECL_LINK(RemoveCommandHdl, weld::Button&, void); - DECL_LINK(InsertHdl, const OString&, void); - DECL_LINK(ModifyItemHdl, const OString&, void); + DECL_LINK(InsertHdl, const OUString&, void); + DECL_LINK(ModifyItemHdl, const OUString&, void); DECL_LINK(ResetMenuHdl, weld::Button&, void); DECL_LINK(MenuEntriesSizeAllocHdl, const Size&, void); diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index e035d6b7ef31..28fe658f2cca 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -32,7 +32,7 @@ private: DECL_LINK(SelectToolbarEntry, weld::TreeView&, void); DECL_LINK(MoveHdl, weld::Button&, void); - DECL_LINK(GearHdl, const OString&, void); + DECL_LINK(GearHdl, const OUString&, void); DECL_LINK(SelectCategory, weld::ComboBox&, void); @@ -42,8 +42,8 @@ private: DECL_LINK(AddCommandHdl, weld::Button&, void); DECL_LINK(RemoveCommandHdl, weld::Button&, void); - DECL_LINK(InsertHdl, const OString&, void); - DECL_LINK(ModifyItemHdl, const OString&, void); + DECL_LINK(InsertHdl, const OUString&, void); + DECL_LINK(ModifyItemHdl, const OUString&, void); DECL_LINK(ResetToolbarHdl, weld::Button&, void); virtual void ListModified() override; diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index 1c7a289723a6..c18b5b3da4e6 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -32,7 +32,7 @@ public: bool bEnableSelector, bool bEnableDrawingLayerFillStyles); protected: - virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override; private: bool mbEnableBackgroundSelector : 1; ///< for Border/Background diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 0ee8e1ba89fe..aaf15b5a870c 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -69,12 +69,12 @@ class SvxConfigDialog : public SfxTabDialogController private: css::uno::Reference< css::frame::XFrame > m_xFrame; - virtual void ActivatePage(const OString& rPage) override; + virtual void ActivatePage(const OUString& rPage) override; public: SvxConfigDialog(weld::Window*, const SfxItemSet*); - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); }; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index e61675c1e2c3..b1fd167d6a72 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -39,7 +39,7 @@ protected: bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet); + SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet& rAttrSet); void SetPrevFontWidthScale( const SfxItemSet& rSet ); void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6467e0bf1f63..cac63d8a6b1e 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -182,7 +182,7 @@ class GalleryThemeProperties : public SfxTabDialogController { ExchangeData* pData; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: GalleryThemeProperties(weld::Widget* pParent, ExchangeData* pData, SfxItemSet const * pItemSet); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 122ac87724da..075c74c29f42 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -79,7 +79,7 @@ protected: public: - GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic); + GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, const Graphic& rGraphic); virtual Graphic GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY) = 0; }; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index b43361edfea1..cc85db7cfe3c 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -67,7 +67,7 @@ private: std::vector< std::unique_ptr<IconChoicePageData> > maPageList; - OString msCurrentPageId; + OUString msCurrentPageId; const SfxItemSet* pSet; std::unique_ptr<SfxItemSet> pOutSet; @@ -87,17 +87,17 @@ private: std::unique_ptr<weld::Button> m_xHelpBtn; std::unique_ptr<weld::Button> m_xResetBtn; - DECL_LINK( ChosePageHdl_Impl, const OString&, void ); + DECL_LINK( ChosePageHdl_Impl, const OUString&, void ); - IconChoicePageData* GetPageData ( std::string_view rId ); + IconChoicePageData* GetPageData ( std::u16string_view rId ); - void SwitchPage( const OString& rId ); + void SwitchPage( const OUString& rId ); DECL_LINK( ResetHdl, weld::Button&, void) ; DECL_LINK (ClickOkHdl_Impl, weld::Button&, void ); DECL_LINK (ClickApplyHdl_Impl, weld::Button&, void ); - IconChoicePage* GetTabPage( std::string_view rPageId ) + IconChoicePage* GetTabPage( std::u16string_view rPageId ) { return GetPageData(rPageId)->xPage.get(); } void ActivatePageImpl (); @@ -113,11 +113,11 @@ public: virtual ~SvxHpLinkDlg () override; // interface - void AddTabPage(const OString &rId, CreatePage pCreateFunc /* != NULL */); + void AddTabPage(const OUString &rId, CreatePage pCreateFunc /* != NULL */); - void SetCurPageId( const OString& rId ) { msCurrentPageId = rId; SwitchPage(rId ); } - const OString & GetCurPageId() const { return msCurrentPageId; } - void ShowPage( const OString& rId ); + void SetCurPageId( const OUString& rId ) { msCurrentPageId = rId; SwitchPage(rId ); } + const OUString& GetCurPageId() const { return msCurrentPageId; } + void ShowPage( const OUString& rId ); /// gives via map converted local slots if applicable WhichRangesContainer GetInputRanges( const SfxItemPool& ); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 1d2c5cb0a534..836470ab2286 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -108,7 +108,7 @@ class SvxAreaTabDialog final : public SfxTabDialogController ChangeType mnGradientListState; ChangeType mnHatchingListState; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; virtual short Ok() override; DECL_LINK(CancelHdlImpl, weld::Button&, void); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 7e4d7798f563..1122a2017f00 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -54,7 +54,7 @@ class SvxLineTabDialog final : public SfxTabDialogController sal_Int32 nPosDashLb; sal_Int32 nPosLineEndLb; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; virtual short Ok() override; DECL_LINK(CancelHdlImpl, weld::Button&, void); @@ -170,7 +170,7 @@ private: std::unique_ptr<weld::CheckButton> m_xSymbolRatioCB; // handler for gallery popup menu button + size - DECL_LINK(GraphicHdl_Impl, const OString&, void); + DECL_LINK(GraphicHdl_Impl, const OUString&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(MenuCreateHdl_Impl, weld::Toggleable&, void); DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 0baa56b61948..414540222c7d 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -66,7 +66,7 @@ public: m_xBtnOK->set_tooltip_text(rLink.Call(*this)); } - void SetEditHelpId(const OString& aHelpId) { m_xEdtName->set_help_id(aHelpId); } + void SetEditHelpId(const OUString& aHelpId) { m_xEdtName->set_help_id(aHelpId); } }; /** #i68101# diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index f82e0a1c8166..b17932ffa558 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -18,35 +18,36 @@ */ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME - = "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"; -inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB = "CUI_HID_OFA_FONT_SUBST_CLB"; -inline constexpr OStringLiteral HID_DBPATH_CTL_PATH = "CUI_HID_DBPATH_CTL_PATH"; +inline constexpr OUStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME + = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"; +inline constexpr OUStringLiteral HID_OFA_FONT_SUBST_CLB = u"CUI_HID_OFA_FONT_SUBST_CLB"; +inline constexpr OUStringLiteral HID_DBPATH_CTL_PATH = u"CUI_HID_DBPATH_CTL_PATH"; #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" -inline constexpr OStringLiteral HID_OFADLG_TREELISTBOX = "CUI_HID_OFADLG_TREELISTBOX"; -inline constexpr OStringLiteral HID_SVX_CONFIG_TOOLBAR = "CUI_HID_SVX_CONFIG_TOOLBAR"; -inline constexpr OStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS - = "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"; -inline constexpr OStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS - = "CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS"; -inline constexpr OStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID - = "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"; -inline constexpr OStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST - = "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"; -inline constexpr OStringLiteral HID_SVX_CONFIG_NAME_SUBMENU = "CUI_HID_SVX_CONFIG_NAME_SUBMENU"; -inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_MENU = "CUI_HID_SVX_CONFIG_RENAME_MENU"; -inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM - = "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"; -inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR = "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"; -inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM - = "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"; -inline constexpr OStringLiteral HID_SVX_UP_TOOLBAR_ITEM = "CUI_HID_SVX_UP_TOOLBAR_ITEM"; -inline constexpr OStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM = "CUI_HID_SVX_DOWN_TOOLBAR_ITEM"; -inline constexpr OStringLiteral HID_SVX_SAVE_IN = "CUI_HID_SVX_SAVE_IN"; -inline constexpr OStringLiteral HID_SVX_TOPLEVELLISTBOX = "CUI_HID_SVX_TOPLEVELLISTBOX"; -inline constexpr OStringLiteral HID_SVX_DESCFIELD = "CUI_HID_SVX_DESCFIELD"; -inline constexpr OStringLiteral HID_MACRO_HEADERTABLISTBOX = "CUI_HID_MACRO_HEADERTABLISTBOX"; +inline constexpr OUStringLiteral HID_OFADLG_TREELISTBOX = u"CUI_HID_OFADLG_TREELISTBOX"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR = u"CUI_HID_SVX_CONFIG_TOOLBAR"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS + = u"CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS + = u"CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS"; +inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID + = u"CUI_HID_HANGULDLG_SUGGESTIONS_GRID"; +inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST + = u"CUI_HID_HANGULDLG_SUGGESTIONS_LIST"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_NAME_SUBMENU = u"CUI_HID_SVX_CONFIG_NAME_SUBMENU"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU = u"CUI_HID_SVX_CONFIG_RENAME_MENU"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM + = u"CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR + = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"; +inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM + = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"; +inline constexpr OUStringLiteral HID_SVX_UP_TOOLBAR_ITEM = u"CUI_HID_SVX_UP_TOOLBAR_ITEM"; +inline constexpr OUStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM = u"CUI_HID_SVX_DOWN_TOOLBAR_ITEM"; +inline constexpr OUStringLiteral HID_SVX_SAVE_IN = u"CUI_HID_SVX_SAVE_IN"; +inline constexpr OUStringLiteral HID_SVX_TOPLEVELLISTBOX = u"CUI_HID_SVX_TOPLEVELLISTBOX"; +inline constexpr OUStringLiteral HID_SVX_DESCFIELD = u"CUI_HID_SVX_DESCFIELD"; +inline constexpr OUStringLiteral HID_MACRO_HEADERTABLISTBOX = u"CUI_HID_MACRO_HEADERTABLISTBOX"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index e3c399bd48b5..f0f7ef751997 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -94,7 +94,7 @@ public: weld::Container* pParent, SvxHpLinkDlg* pDlg, const OUString& rUIXMLDescription, - const OString& rID, + const OUString& rID, const SfxItemSet* pItemSet ); virtual ~SvxHyperlinkTabPageBase () override; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 6367016fe8b5..e31aaa74e0db 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -44,12 +44,12 @@ private: protected: - IconChoicePage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet* pItemSet); + IconChoicePage(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet* pItemSet); public: virtual ~IconChoicePage(); - OString GetHelpId() const { return xContainer->get_help_id(); } + OUString GetHelpId() const { return xContainer->get_help_id(); } const SfxItemSet& GetItemSet() const { return *pSet; } @@ -67,12 +67,12 @@ public: /// Data-structure for pages in dialog struct IconChoicePageData { - OString sId; + OUString sId; std::unique_ptr<IconChoicePage> xPage; ///< the TabPage itself bool bRefresh; ///< Flag: page has to be newly initialized // constructor - IconChoicePageData(OString aId, std::unique_ptr<IconChoicePage> xInPage) + IconChoicePageData(OUString aId, std::unique_ptr<IconChoicePage> xInPage) : sId(std::move(aId)) , xPage(std::move(xInPage)) , bRefresh(false) diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 4938314a3cd3..61c707507087 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -36,12 +36,12 @@ protected: comphelper::EmbeddedObjectContainer aCnt; InsertObjectDialog_Impl(weld::Window * pParent, - const OUString& rUIXMLDescription, const OString& rID, + const OUString& rUIXMLDescription, const OUString& rID, css::uno::Reference < css::embed::XStorage > xStorage); public: const css::uno::Reference<css::embed::XEmbeddedObject>& GetObject() const { return m_xObj; } virtual css::uno::Reference<css::io::XInputStream> GetIconIfIconified(OUString* pGraphicMediaType); - void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); } + void SetHelpId(const OUString& rHelpId) { m_xDialog->set_help_id(rHelpId); } virtual bool IsCreateNew() const; }; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index e003795383dc..597ef172c3e9 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -30,7 +30,7 @@ private: std::unique_ptr<weld::RadioButton> m_xAfterBtn; public: - SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId); + SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId); virtual short Execute() override; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 8146ec388f53..5d7f778d5c38 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -102,7 +102,7 @@ private: Link<SvxSwFrameValidation&,void> aValidateLink; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: SvxCaptionTabDialog(weld::Window* pParent, const SdrView* pView, diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index cecdf3b55224..2f2471bb09eb 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -71,7 +71,7 @@ protected: bool bDocModified, bAppEvents, bInitialized; std::vector< EventDisplayName > aDisplayNames; - SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet); + SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet& rItemSet); void EnableButtons(); static css::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 8f554722fa67..dd1dfbaf31c6 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -265,7 +265,7 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK(LevelHdl_Impl, weld::TreeView&, void); DECL_LINK(LevelHdl, void *, void); DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void); - DECL_LINK(GraphicHdl_Impl, const OString&, void); + DECL_LINK(GraphicHdl_Impl, const OUString&, void); DECL_LINK(BulletHdl_Impl, weld::Button&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index c8fcbf704095..aac8d982b454 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -40,7 +40,7 @@ private: public: SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, bool bStyle); - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; }; diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index e95fccd413fd..712abc8b55bc 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -30,7 +30,7 @@ public: virtual ~SvxSearchFormatDialog() override; protected: - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; private: std::unique_ptr<FontList> m_pFontList; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 8f4767e22fe8..010d3954716c 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -96,7 +96,7 @@ class SvxTextTabDialog : public SfxTabDialogController private: const SdrView* pView; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 30b789dc73c4..0a30b720fc81 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -41,7 +41,7 @@ private: SvxAnchorIds nAnchorCtrls; Link<SvxSwFrameValidation&,void> aValidateLink; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: SvxTransformTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 15d3dadcf244..335c517622b5 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -62,7 +62,7 @@ struct // group Group eGroup; // .ui group name - const char *pGroup; + OUString pGroup; } const vGroupInfo[] = { @@ -82,9 +82,9 @@ struct // group Group eGroup; //checkbox (or simple text) - const char *pText; + OUString pText; //color listbox - const char *pColor; + OUString pColor; // has checkbox? bool bCheckBox; } @@ -235,7 +235,7 @@ private: // text std::unique_ptr<weld::Label> m_xText; public: - Chapter(weld::Builder& rBuilder, const char* pLabelWidget, bool bShow); + Chapter(weld::Builder& rBuilder, const OUString& pLabelWidget, bool bShow); void SetText(const OUString& rLabel) { m_xText->set_label(rLabel); } }; @@ -243,7 +243,7 @@ private: // text (checkbox) + color list box struct Entry { - Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, const char* pTextWidget, const char* pColorWidget, + Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, const OUString& pTextWidget, const OUString& pColorWidget, const Color& rColor, int nCheckBoxLabelOffset, const ColorListBox* pCache, bool bCheckBox, bool bShow); void SetText(const OUString& rLabel) { dynamic_cast<weld::Label&>(*m_xText).set_label(rLabel); } int get_height_request() const @@ -305,7 +305,7 @@ private: // ctor for default groups // rParent: parent window (ColorConfigWindow_Impl) // eGroup: which group is this? -ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const char* pLabelWidget, bool bShow) +ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const OUString& pLabelWidget, bool bShow) : m_xText(rBuilder.weld_label(pLabelWidget)) { if (!bShow) @@ -314,7 +314,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const char* pL // ColorConfigWindow_Impl::Entry ColorConfigWindow_Impl::Entry::Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, - const char* pTextWidget, const char* pColorWidget, + const OUString& pTextWidget, const OUString& pColorWidget, const Color& rColor, int nCheckBoxLabelOffset, const ColorListBox* pCache, bool bCheckBox, bool bShow) : m_xColorList(new ColorListBox(rBuilder.weld_menu_button(pColorWidget), diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 0940894216bb..b3fb5cb02baf 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -80,7 +80,7 @@ namespace Lang struct { // id of the text - const char *pTextId; + OUString pTextId; // language flags (see Lang above): // which language is this row for? unsigned nLangFlags; @@ -110,7 +110,7 @@ struct // in which row? RowType eRow; // id of the edit box - const char *pEditId; + OUString pEditId; // id for SvtUserOptions in unotools/useroptions.hxx UserOptToken nUserOptionsId; // id for settings the focus (defined in svx/optgenrl.hxx) diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 3cc3aab9a9ef..c1ee526574e6 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -37,7 +37,7 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage(weld::Container* pPage, { for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i) { - OString sDefaultId("default" + OString::number(i)); + OUString sDefaultId("default" + OUString::number(i)); m_vDefaultPersonaImages[i] = m_xBuilder->weld_toggle_button(sDefaultId); m_vDefaultPersonaImages[i]->connect_clicked( LINK(this, SvxPersonalizationTabPage, DefaultPersona)); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 93f4432d16ee..be7bcda79227 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -653,8 +653,8 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, HelpHdl_Impl, weld::Widget&, bool) OptionsPageInfo* pPageInfo = weld::fromId<OptionsPageInfo*>(xTreeLB->get_id(*xCurrentPageEntry)); if (pPageInfo->m_xPage) { - OString sHelpId(pPageInfo->m_xPage->GetHelpId()); - pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), m_xDialog.get()); + OUString sHelpId(pPageInfo->m_xPage->GetHelpId()); + pHelp->Start(sHelpId, m_xDialog.get()); return false; } } @@ -985,7 +985,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pNewPage = pPageInfo->m_xPage.get(); // fdo#58170 use current page's layout child HelpId, unless there isn't a current page - OString sHelpId(pNewPage ? pNewPage->GetHelpId() : OString()); + OUString sHelpId(pNewPage ? pNewPage->GetHelpId() : OUString()); if (sHelpId.isEmpty()) sHelpId = HID_OFADLG_TREELISTBOX; xTreeLB->set_help_id(sHelpId); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 446775c6abad..aea3f7d9727e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -167,7 +167,7 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl, weld::ComboBox&, void) if(eNewLang == eLastDialogLanguage) return; - OString sPageId = GetCurPageId(); + OUString sPageId = GetCurPageId(); if (sPageId == "replace") { OfaAutocorrReplacePage* pPage = static_cast<OfaAutocorrReplacePage*>(GetTabPage(sPageId)); diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index 488fc5283a6b..9fc59604476e 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -33,8 +33,8 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent, ? OUString("cui/ui/borderareatransparencydialog.ui") : OUString("cui/ui/borderbackgrounddialog.ui"), bEnableDrawingLayerFillStyles - ? OString("BorderAreaTransparencyDialog") - : OString("BorderBackgroundDialog"), + ? OUString("BorderAreaTransparencyDialog") + : OUString("BorderBackgroundDialog"), &rCoreSet) , mbEnableBackgroundSelector(bEnableSelector) { @@ -51,7 +51,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent, } } -void SvxBorderBackgroundDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage) +void SvxBorderBackgroundDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) { if (rPageId == "background") { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 7f418a762047..0c600f83ab24 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -132,7 +132,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() return m_aPreviewWin.GetCTLFont(); } -SvxCharBasePage::SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet& rItemset) : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rItemset) , m_bPreviewBackgroundToCharacter( false ) { diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index cb048426c73a..c5661586472c 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -474,7 +474,7 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(weld::Window* pParent, const SdrView* p SvxCaptionTabPage::GetRanges ); } -void SvxCaptionTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SvxCaptionTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "RID_SVXPAGE_POSITION_SIZE") { diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 348d96e339e8..2179ad2cf107 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1796,14 +1796,14 @@ IMPL_LINK(SvxNumOptionsTabPage, BulRelSizeHdl_Impl, weld::MetricSpinButton&, rFi SetModified(); } -IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OString&, rIdent, void) +IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OUString&, rIdent, void) { OUString aGrfName; Size aSize; bool bSucc(false); SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_CUISTR_EDIT_GRAPHIC), GetFrameWeld()); - OString sNumber; + OUString sNumber; if (rIdent.startsWith("gallery", &sNumber)) { auto idx = sNumber.toUInt32(); diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index d03199c7b982..9b082680fcee 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, weld::Button&, void) m_xDialog->response(RET_CANCEL); } -void SvxAreaTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SvxAreaTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "RID_SVXPAGE_AREA") { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 1cf54885047d..ac6cadd51109 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -160,7 +160,7 @@ IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl, weld::Button&, void) m_xDialog->response(RET_CANCEL); } -void SvxLineTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SvxLineTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "RID_SVXPAGE_LINE") { diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e086969bbbd1..b5ba3d90ce62 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -53,7 +53,7 @@ SvxTextTabDialog::SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAtt |* \************************************************************************/ -void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SvxTextTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId != "RID_SVXPAGE_TEXTATTR") return; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 85efe01a1c2f..06e95d3fdcaf 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1517,7 +1517,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::Toggleable&, void) // #58425# Symbols on a list (e.g. StarChart) // Handler for menu button -IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OString&, rIdent, void) +IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OUString&, rIdent, void) { const Graphic* pGraphic = nullptr; Graphic aGraphic; @@ -1525,7 +1525,7 @@ IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OString&, rIdent, void) bool bEnable = true; tools::Long nPreviousSymbolType = m_nSymbolType; - OString sNumber; + OUString sNumber; if (rIdent.startsWith("gallery", &sNumber)) { SvxBmpItemInfo* pInfo = m_aGalleryBrushItems[sNumber.toUInt32()].get(); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 40f54d302a3f..05fd9e56704f 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -93,7 +93,7 @@ SvxTransformTabDialog::SvxTransformTabDialog(weld::Window* pParent, const SfxIte } -void SvxTransformTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SvxTransformTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "RID_SVXPAGE_POSITION_SIZE") { @@ -386,11 +386,11 @@ SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController* { for (int i = 0; i < 2; ++i) { - m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" + OString::number(i+1)); - m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" + OString::number(i+1)); - m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OString::number(i+1), FieldUnit::CM); - m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OString::number(i+1)); - m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OString::number(i+1), FieldUnit::CM); + m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" + OUString::number(i+1)); + m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" + OUString::number(i+1)); + m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OUString::number(i+1), FieldUnit::CM); + m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OUString::number(i+1)); + m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OUString::number(i+1), FieldUnit::CM); } // this page needs ExchangeSupport diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h index 2c013c173397..4757d5d4b3f1 100644 --- a/dbaccess/inc/helpids.h +++ b/dbaccess/inc/helpids.h @@ -20,93 +20,93 @@ #ifndef INCLUDED_DBACCESS_INC_HELPIDS_H #define INCLUDED_DBACCESS_INC_HELPIDS_H -#include <rtl/string.hxx> - -inline constexpr OStringLiteral HID_DATABROWSE_HEADER = "DBACCESS_HID_DATABROWSE_HEADER"; -inline constexpr OStringLiteral HID_CTL_TABBROWSER = "DBACCESS_HID_CTL_TABBROWSER"; -inline constexpr OStringLiteral HID_CTL_TREEVIEW = "DBACCESS_HID_CTL_TREEVIEW"; - -inline constexpr OStringLiteral HID_DSADMIN_BROWSECONN = "DBACCESS_HID_DSADMIN_BROWSECONN"; - -inline constexpr OStringLiteral HID_CTL_QRYSQLEDIT = "DBACCESS_HID_CTL_QRYSQLEDIT"; - -inline constexpr OStringLiteral HID_CTL_QRYDGNTAB = "DBACCESS_HID_CTL_QRYDGNTAB"; -inline constexpr OStringLiteral HID_CTL_QRYDGNCRIT = "DBACCESS_HID_CTL_QRYDGNCRIT"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_VISIBLE = "DBACCESS_HID_QRYDGN_ROW_VISIBLE"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_TABLE = "DBACCESS_HID_QRYDGN_ROW_TABLE"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_FIELD = "DBACCESS_HID_QRYDGN_ROW_FIELD"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_ORDER = "DBACCESS_HID_QRYDGN_ROW_ORDER"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_FUNCTION = "DBACCESS_HID_QRYDGN_ROW_FUNCTION"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_ALIAS = "DBACCESS_HID_QRYDGN_ROW_ALIAS"; -inline constexpr OStringLiteral HID_QRYDGN_ROW_CRIT = "DBACCESS_HID_QRYDGN_ROW_CRIT"; - -inline constexpr OStringLiteral HID_TAB_DESIGN_FIELDCONTROL = "DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"; -inline constexpr OStringLiteral HID_TAB_DESIGN_DESCWIN = "DBACCESS_HID_TAB_DESIGN_DESCWIN"; -inline constexpr OStringLiteral HID_TABDESIGN_BACKGROUND = "DBACCESS_HID_TABDESIGN_BACKGROUND"; -inline constexpr OStringLiteral HID_CTL_TABLEEDIT = "DBACCESS_HID_CTL_TABLEEDIT"; -inline constexpr OStringLiteral HID_TABDESIGN_NAMECELL = "DBACCESS_HID_TABDESIGN_NAMECELL"; -inline constexpr OStringLiteral HID_TABDESIGN_TYPECELL = "DBACCESS_HID_TABDESIGN_TYPECELL"; -inline constexpr OStringLiteral HID_TABDESIGN_COMMENTCELL = "DBACCESS_HID_TABDESIGN_COMMENTCELL"; -inline constexpr OStringLiteral HID_TAB_DESIGN_HELP_TEXT_FRAME = "DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME"; -inline constexpr OStringLiteral HID_TAB_ENT_DEFAULT = "DBACCESS_HID_TAB_ENT_DEFAULT"; -inline constexpr OStringLiteral HID_TAB_ENT_FORMAT_SAMPLE = "DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE"; -inline constexpr OStringLiteral HID_TAB_ENT_FORMAT = "DBACCESS_HID_TAB_ENT_FORMAT"; -inline constexpr OStringLiteral HID_TAB_ENT_BOOL_DEFAULT = "DBACCESS_HID_TAB_ENT_BOOL_DEFAULT"; -inline constexpr OStringLiteral HID_TAB_ENT_REQUIRED = "DBACCESS_HID_TAB_ENT_REQUIRED"; -inline constexpr OStringLiteral HID_TAB_ENT_AUTOINCREMENT = "DBACCESS_HID_TAB_ENT_AUTOINCREMENT"; -inline constexpr OStringLiteral HID_TAB_ENT_TEXT_LEN = "DBACCESS_HID_TAB_ENT_TEXT_LEN"; -inline constexpr OStringLiteral HID_TAB_ENT_TYPE = "DBACCESS_HID_TAB_ENT_TYPE"; -inline constexpr OStringLiteral HID_TAB_ENT_COLUMNNAME = "DBACCESS_HID_TAB_ENT_COLUMNNAME"; -inline constexpr OStringLiteral HID_TAB_ENT_NUMTYP = "DBACCESS_HID_TAB_ENT_NUMTYP"; -inline constexpr OStringLiteral HID_TAB_ENT_LEN = "DBACCESS_HID_TAB_ENT_LEN"; -inline constexpr OStringLiteral HID_TAB_ENT_SCALE = "DBACCESS_HID_TAB_ENT_SCALE"; -inline constexpr OStringLiteral HID_CTL_RELATIONTAB = "DBACCESS_HID_CTL_RELATIONTAB"; -inline constexpr OStringLiteral HID_RELATIONDIALOG_LEFTFIELDCELL = "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"; -inline constexpr OStringLiteral HID_RELATIONDIALOG_RIGHTFIELDCELL = "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"; -inline constexpr OStringLiteral HID_CONFIRM_DROP_BUTTON_ALL = "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"; -inline constexpr OStringLiteral HID_DSADMIN_LDAP_HOSTNAME = "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"; -inline constexpr OStringLiteral HID_DSADMIN_MOZILLA_PROFILE_NAME = "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"; -inline constexpr OStringLiteral HID_DSADMIN_THUNDERBIRD_PROFILE_NAME = "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"; - -inline constexpr OStringLiteral HID_DLGINDEX_INDEXDETAILS_FIELD = "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"; -inline constexpr OStringLiteral HID_DLGINDEX_INDEXDETAILS_SORTORDER = "DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"; - -inline constexpr OStringLiteral HID_TAB_AUTOINCREMENTVALUE = "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"; - -inline constexpr OStringLiteral HID_DSADMIN_DBASE_PATH = "DBACCESS_HID_DSADMIN_DBASE_PATH"; -inline constexpr OStringLiteral HID_DSADMIN_MYSQL_DATABASE = "DBACCESS_HID_DSADMIN_MYSQL_DATABASE"; -inline constexpr OStringLiteral HID_DSADMIN_MYSQL_ODBC_DATASOURCE = "DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"; -inline constexpr OStringLiteral HID_DSADMIN_ODBC_DATASOURCE = "DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"; -inline constexpr OStringLiteral HID_DSADMIN_MSACCESS_MDB_FILE = "DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"; -inline constexpr OStringLiteral HID_DSADMIN_FLAT_PATH = "DBACCESS_HID_DSADMIN_FLAT_PATH"; -inline constexpr OStringLiteral HID_DSADMIN_CALC_PATH = "DBACCESS_HID_DSADMIN_CALC_PATH"; -inline constexpr OStringLiteral HID_DSADMIN_WRITER_PATH = "DBACCESS_HID_DSADMIN_WRITER_PATH"; -inline constexpr OStringLiteral HID_DSADMIN_ORACLE_DATABASE = "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"; - -inline constexpr OStringLiteral HID_APP_TABLE_TREE = "DBACCESS_HID_APP_TABLE_TREE"; -inline constexpr OStringLiteral HID_APP_FORM_TREE = "DBACCESS_HID_APP_FORM_TREE"; -inline constexpr OStringLiteral HID_APP_QUERY_TREE = "DBACCESS_HID_APP_QUERY_TREE"; -inline constexpr OStringLiteral HID_APP_REPORT_TREE = "DBACCESS_HID_APP_REPORT_TREE"; -inline constexpr OStringLiteral HID_APP_CREATION_LIST = "DBACCESS_HID_APP_CREATION_LIST"; -inline constexpr OStringLiteral HID_APP_SWAP_ICONCONTROL = "DBACCESS_HID_APP_SWAP_ICONCONTROL"; - - -inline constexpr OStringLiteral HID_APP_HELP_TEXT = "DBACCESS_HID_APP_HELP_TEXT"; -inline constexpr OStringLiteral HID_APP_DESCRIPTION_TEXT = "DBACCESS_HID_APP_DESCRIPTION_TEXT"; -inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_CB = "DBACCESS_HID_APP_VIEW_PREVIEW_CB"; -inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_1 = "DBACCESS_HID_APP_VIEW_PREVIEW_1"; -inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_2 = "DBACCESS_HID_APP_VIEW_PREVIEW_2"; -inline constexpr OStringLiteral HID_TABDESIGN_HELPTEXT = "DBACCESS_HID_TABDESIGN_HELPTEXT"; -inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_3 = "DBACCESS_HID_APP_VIEW_PREVIEW_3"; - - -inline constexpr OStringLiteral HID_DBWIZ_PREVIOUS = "DBACCESS_HID_DBWIZ_PREVIOUS"; -inline constexpr OStringLiteral HID_DBWIZ_NEXT = "DBACCESS_HID_DBWIZ_NEXT"; -inline constexpr OStringLiteral HID_DBWIZ_CANCEL = "DBACCESS_HID_DBWIZ_CANCEL"; -inline constexpr OStringLiteral HID_DBWIZ_FINISH = "DBACCESS_HID_DBWIZ_FINISH"; -inline constexpr OStringLiteral HID_DBWIZ_HELP = "DBACCESS_HID_DBWIZ_HELP"; - -inline constexpr OStringLiteral HID_DBWIZ_ROADMAP = "DBACCESS_HID_DBWIZ_ROADMAP"; +#include <rtl/ustring.hxx> + +inline constexpr OUStringLiteral HID_DATABROWSE_HEADER = u"DBACCESS_HID_DATABROWSE_HEADER"; +inline constexpr OUStringLiteral HID_CTL_TABBROWSER = u"DBACCESS_HID_CTL_TABBROWSER"; +inline constexpr OUStringLiteral HID_CTL_TREEVIEW = u"DBACCESS_HID_CTL_TREEVIEW"; + +inline constexpr OUStringLiteral HID_DSADMIN_BROWSECONN = u"DBACCESS_HID_DSADMIN_BROWSECONN"; + +inline constexpr OUStringLiteral HID_CTL_QRYSQLEDIT = u"DBACCESS_HID_CTL_QRYSQLEDIT"; + +inline constexpr OUStringLiteral HID_CTL_QRYDGNTAB = u"DBACCESS_HID_CTL_QRYDGNTAB"; +inline constexpr OUStringLiteral HID_CTL_QRYDGNCRIT = u"DBACCESS_HID_CTL_QRYDGNCRIT"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_VISIBLE = u"DBACCESS_HID_QRYDGN_ROW_VISIBLE"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_TABLE = u"DBACCESS_HID_QRYDGN_ROW_TABLE"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_FIELD = u"DBACCESS_HID_QRYDGN_ROW_FIELD"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_ORDER = u"DBACCESS_HID_QRYDGN_ROW_ORDER"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_FUNCTION = u"DBACCESS_HID_QRYDGN_ROW_FUNCTION"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_ALIAS = u"DBACCESS_HID_QRYDGN_ROW_ALIAS"; +inline constexpr OUStringLiteral HID_QRYDGN_ROW_CRIT = u"DBACCESS_HID_QRYDGN_ROW_CRIT"; + +inline constexpr OUStringLiteral HID_TAB_DESIGN_FIELDCONTROL = u"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"; +inline constexpr OUStringLiteral HID_TAB_DESIGN_DESCWIN = u"DBACCESS_HID_TAB_DESIGN_DESCWIN"; +inline constexpr OUStringLiteral HID_TABDESIGN_BACKGROUND = u"DBACCESS_HID_TABDESIGN_BACKGROUND"; +inline constexpr OUStringLiteral HID_CTL_TABLEEDIT = u"DBACCESS_HID_CTL_TABLEEDIT"; +inline constexpr OUStringLiteral HID_TABDESIGN_NAMECELL = u"DBACCESS_HID_TABDESIGN_NAMECELL"; +inline constexpr OUStringLiteral HID_TABDESIGN_TYPECELL = u"DBACCESS_HID_TABDESIGN_TYPECELL"; +inline constexpr OUStringLiteral HID_TABDESIGN_COMMENTCELL = u"DBACCESS_HID_TABDESIGN_COMMENTCELL"; +inline constexpr OUStringLiteral HID_TAB_DESIGN_HELP_TEXT_FRAME = u"DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME"; +inline constexpr OUStringLiteral HID_TAB_ENT_DEFAULT = u"DBACCESS_HID_TAB_ENT_DEFAULT"; +inline constexpr OUStringLiteral HID_TAB_ENT_FORMAT_SAMPLE = u"DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE"; +inline constexpr OUStringLiteral HID_TAB_ENT_FORMAT = u"DBACCESS_HID_TAB_ENT_FORMAT"; +inline constexpr OUStringLiteral HID_TAB_ENT_BOOL_DEFAULT = u"DBACCESS_HID_TAB_ENT_BOOL_DEFAULT"; +inline constexpr OUStringLiteral HID_TAB_ENT_REQUIRED = u"DBACCESS_HID_TAB_ENT_REQUIRED"; +inline constexpr OUStringLiteral HID_TAB_ENT_AUTOINCREMENT = u"DBACCESS_HID_TAB_ENT_AUTOINCREMENT"; +inline constexpr OUStringLiteral HID_TAB_ENT_TEXT_LEN = u"DBACCESS_HID_TAB_ENT_TEXT_LEN"; +inline constexpr OUStringLiteral HID_TAB_ENT_TYPE = u"DBACCESS_HID_TAB_ENT_TYPE"; +inline constexpr OUStringLiteral HID_TAB_ENT_COLUMNNAME = u"DBACCESS_HID_TAB_ENT_COLUMNNAME"; +inline constexpr OUStringLiteral HID_TAB_ENT_NUMTYP = u"DBACCESS_HID_TAB_ENT_NUMTYP"; +inline constexpr OUStringLiteral HID_TAB_ENT_LEN = u"DBACCESS_HID_TAB_ENT_LEN"; +inline constexpr OUStringLiteral HID_TAB_ENT_SCALE = u"DBACCESS_HID_TAB_ENT_SCALE"; +inline constexpr OUStringLiteral HID_CTL_RELATIONTAB = u"DBACCESS_HID_CTL_RELATIONTAB"; +inline constexpr OUStringLiteral HID_RELATIONDIALOG_LEFTFIELDCELL = u"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"; +inline constexpr OUStringLiteral HID_RELATIONDIALOG_RIGHTFIELDCELL = u"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"; +inline constexpr OUStringLiteral HID_CONFIRM_DROP_BUTTON_ALL = u"DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"; +inline constexpr OUStringLiteral HID_DSADMIN_LDAP_HOSTNAME = u"DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"; +inline constexpr OUStringLiteral HID_DSADMIN_MOZILLA_PROFILE_NAME = u"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"; +inline constexpr OUStringLiteral HID_DSADMIN_THUNDERBIRD_PROFILE_NAME = u"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"; + +inline constexpr OUStringLiteral HID_DLGINDEX_INDEXDETAILS_FIELD = u"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"; +inline constexpr OUStringLiteral HID_DLGINDEX_INDEXDETAILS_SORTORDER = u"DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"; + +inline constexpr OUStringLiteral HID_TAB_AUTOINCREMENTVALUE = u"DBACCESS_HID_TAB_AUTOINCREMENTVALUE"; + +inline constexpr OUStringLiteral HID_DSADMIN_DBASE_PATH = u"DBACCESS_HID_DSADMIN_DBASE_PATH"; +inline constexpr OUStringLiteral HID_DSADMIN_MYSQL_DATABASE = u"DBACCESS_HID_DSADMIN_MYSQL_DATABASE"; +inline constexpr OUStringLiteral HID_DSADMIN_MYSQL_ODBC_DATASOURCE = u"DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"; +inline constexpr OUStringLiteral HID_DSADMIN_ODBC_DATASOURCE = u"DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"; +inline constexpr OUStringLiteral HID_DSADMIN_MSACCESS_MDB_FILE = u"DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"; +inline constexpr OUStringLiteral HID_DSADMIN_FLAT_PATH = u"DBACCESS_HID_DSADMIN_FLAT_PATH"; +inline constexpr OUStringLiteral HID_DSADMIN_CALC_PATH = u"DBACCESS_HID_DSADMIN_CALC_PATH"; +inline constexpr OUStringLiteral HID_DSADMIN_WRITER_PATH = u"DBACCESS_HID_DSADMIN_WRITER_PATH"; +inline constexpr OUStringLiteral HID_DSADMIN_ORACLE_DATABASE = u"DBACCESS_HID_DSADMIN_ORACLE_DATABASE"; + +inline constexpr OUStringLiteral HID_APP_TABLE_TREE = u"DBACCESS_HID_APP_TABLE_TREE"; +inline constexpr OUStringLiteral HID_APP_FORM_TREE = u"DBACCESS_HID_APP_FORM_TREE"; +inline constexpr OUStringLiteral HID_APP_QUERY_TREE = u"DBACCESS_HID_APP_QUERY_TREE"; +inline constexpr OUStringLiteral HID_APP_REPORT_TREE = u"DBACCESS_HID_APP_REPORT_TREE"; +inline constexpr OUStringLiteral HID_APP_CREATION_LIST = u"DBACCESS_HID_APP_CREATION_LIST"; +inline constexpr OUStringLiteral HID_APP_SWAP_ICONCONTROL = u"DBACCESS_HID_APP_SWAP_ICONCONTROL"; + + +inline constexpr OUStringLiteral HID_APP_HELP_TEXT = u"DBACCESS_HID_APP_HELP_TEXT"; +inline constexpr OUStringLiteral HID_APP_DESCRIPTION_TEXT = u"DBACCESS_HID_APP_DESCRIPTION_TEXT"; +inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_CB = u"DBACCESS_HID_APP_VIEW_PREVIEW_CB"; +inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_1 = u"DBACCESS_HID_APP_VIEW_PREVIEW_1"; +inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_2 = u"DBACCESS_HID_APP_VIEW_PREVIEW_2"; +inline constexpr OUStringLiteral HID_TABDESIGN_HELPTEXT = u"DBACCESS_HID_TABDESIGN_HELPTEXT"; +inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_3 = u"DBACCESS_HID_APP_VIEW_PREVIEW_3"; + + +inline constexpr OUStringLiteral HID_DBWIZ_PREVIOUS = u"DBACCESS_HID_DBWIZ_PREVIOUS"; +inline constexpr OUStringLiteral HID_DBWIZ_NEXT = u"DBACCESS_HID_DBWIZ_NEXT"; +inline constexpr OUStringLiteral HID_DBWIZ_CANCEL = u"DBACCESS_HID_DBWIZ_CANCEL"; +inline constexpr OUStringLiteral HID_DBWIZ_FINISH = u"DBACCESS_HID_DBWIZ_FINISH"; +inline constexpr OUStringLiteral HID_DBWIZ_HELP = u"DBACCESS_HID_DBWIZ_HELP"; + +inline constexpr OUStringLiteral HID_DBWIZ_ROADMAP = u"DBACCESS_HID_DBWIZ_ROADMAP"; #endif diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 668ddfd673f8..a649420a8c00 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -553,7 +553,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA { OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed."); - OString sHelpId; + OUString sHelpId; switch( _eType ) { case E_FORM: @@ -670,7 +670,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine } } -std::unique_ptr<DBTreeViewBase> OAppDetailPageHelper::createSimpleTree(const OString& rHelpId, ElementType eType) +std::unique_ptr<DBTreeViewBase> OAppDetailPageHelper::createSimpleTree(const OUString& rHelpId, ElementType eType) { const bool bSQLType = eType == E_TABLE || eType == E_QUERY; std::unique_ptr<DBTreeViewBase> xTreeView(new DBTreeView(m_xBox.get(), bSQLType)); @@ -1079,7 +1079,7 @@ namespace if (!rEvent.IsEnabled) { const OUString &rURL = rEvent.FeatureURL.Complete; - m_rMBPreview.remove_item(rURL.toUtf8()); + m_rMBPreview.remove_item(rURL); } } @@ -1152,13 +1152,13 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, weld::Toggleable&, voi xComponent->dispose(); } -IMPL_LINK(OAppDetailPageHelper, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(OAppDetailPageHelper, MenuSelectHdl, const OUString&, rIdent, void) { if (rIdent.isEmpty()) return; css::util::URL aURL; - aURL.Complete = OUString::fromUtf8(rIdent); + aURL.Complete = rIdent; Reference<XDispatchProvider> xProvider(getBorderWin().getView()->getAppController().getFrame(), UNO_QUERY); Reference<XDispatch> xDisp = xProvider->queryDispatch(aURL, "_self", 0); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 25cc3229a2d4..fb47cb70c558 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -144,7 +144,7 @@ namespace dbaui @return The new tree. */ - std::unique_ptr<DBTreeViewBase> createSimpleTree(const OString& rHelpId, ElementType eType); + std::unique_ptr<DBTreeViewBase> createSimpleTree(const OUString& rHelpId, ElementType eType); DECL_LINK( OnEntryDoubleClick, weld::TreeView&, bool ); DECL_LINK( OnEntrySelChange, LinkParamNone*, void ); @@ -154,7 +154,7 @@ namespace dbaui DECL_LINK( OnDeleteEntry, LinkParamNone*, void ); DECL_LINK(OnDropdownClickHdl, weld::Toggleable&, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } diff --git a/dbaccess/source/ui/app/ChildWindow.cxx b/dbaccess/source/ui/app/ChildWindow.cxx index a8091c8637a5..2f27ccb30b46 100644 --- a/dbaccess/source/ui/app/ChildWindow.cxx +++ b/dbaccess/source/ui/app/ChildWindow.cxx @@ -13,7 +13,7 @@ namespace dbaui { OChildWindow::OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, - const OString& rID) + const OUString& rID) : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) , m_xContainer(m_xBuilder->weld_container(rID)) { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 99ee5c30eb73..bec17b409519 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -593,7 +593,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& r rMenu.insert_separator(nPos++, "separator2"); } -void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult) +void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult) { if (rExecutionResult == "colwidth") static_cast<SbaGridControl*>(GetParent())->SetColWidth(nColId); @@ -790,7 +790,7 @@ void SbaGridControl::SetBrowserAttrs() } } -void SbaGridControl::PostExecuteRowContextMenu(const OString& rExecutionResult) +void SbaGridControl::PostExecuteRowContextMenu(const OUString& rExecutionResult) { if (rExecutionResult == "tableattr") SetBrowserAttrs(); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 1416b43fc2ed..f341482ea92f 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -585,7 +585,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) } } -void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler) +void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OUString& _sHelpId,bool _bAddChangeHandler) { if ( _bAddChangeHandler ) _pControl->GetComboBox().connect_changed(LINK(this,OFieldDescControl,ChangeHdl)); @@ -593,7 +593,7 @@ void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OStr InitializeControl(_pControl->GetWidget(), _sHelpId); } -void OFieldDescControl::InitializeControl(weld::Widget* pControl,const OString& _sHelpId) +void OFieldDescControl::InitializeControl(weld::Widget* pControl,const OUString& _sHelpId) { pControl->set_help_id(_sHelpId); pControl->connect_focus_in(LINK(this, OFieldDescControl, OnControlFocusGot)); @@ -606,7 +606,7 @@ void OFieldDescControl::InitializeControl(weld::Widget* pControl,const OString& } } -std::unique_ptr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(const OString& rId, TranslateId pHelpId, short _nProperty, const OString& _sHelpId) +std::unique_ptr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(const OUString& rId, TranslateId pHelpId, short _nProperty, const OUString& _sHelpId) { auto xControl = std::make_unique<OPropNumericEditCtrl>( m_xBuilder->weld_spin_button(rId), pHelpId, _nProperty); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index d033aebf7e1a..d6e3b3d87f44 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -285,7 +285,7 @@ namespace dbaui void ORelationControl::InitController( CellControllerRef& /*rController*/, sal_Int32 nRow, sal_uInt16 nColumnId ) { - OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); + OUString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 86bb65c7b6cb..5997e5b80e17 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -403,7 +403,7 @@ bool SQLEditView::Command(const CommandEvent& rCEvt) xContextMenu->set_visible("undo", false); xContextMenu->set_visible("specialchar", vcl::GetGetSpecialCharsFunction() != nullptr); - OString sCommand = xContextMenu->popup_at_rect(pPopupParent, aRect); + OUString sCommand = xContextMenu->popup_at_rect(pPopupParent, aRect); if (sCommand == "cut") pEditView->Cut(); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 0a7364fe60b4..81922a88beec 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -72,7 +72,7 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - OConnectionHelper::OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs) + OConnectionHelper::OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pPage, pController, _rUIXMLDescription, _rId, _rCoreAttrs) , m_bUserGrabFocus(false) , m_pCollection(nullptr) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index b4c00548f682..bbcf24783355 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -38,7 +38,7 @@ namespace dbaui bool m_bUserGrabFocus; public: - OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs); + OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper() override; OUString m_eType; // the type can't be changed in this class, so we hold it as member. diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 7ff32140e933..e867ba266688 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -128,7 +128,7 @@ namespace dbaui case ::dbaccess::DST_MYSQL_ODBC: case ::dbaccess::DST_ODBC: m_xFT_Connection->set_label(DBA_RES(STR_NAME_OF_ODBC_DATASOURCE)); - m_xConnectionURL->set_help_id( eType == ::dbaccess::DST_MYSQL_ODBC ? OString(HID_DSADMIN_MYSQL_ODBC_DATASOURCE) : OString(HID_DSADMIN_ODBC_DATASOURCE)); + m_xConnectionURL->set_help_id( eType == ::dbaccess::DST_MYSQL_ODBC ? OUString(HID_DSADMIN_MYSQL_ODBC_DATASOURCE) : OUString(HID_DSADMIN_ODBC_DATASOURCE)); break; case ::dbaccess::DST_LDAP: m_xFT_Connection->set_label(DBA_RES(STR_HOSTNAME)); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 8f57c24f99eb..33ea535a1dd8 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -61,7 +61,7 @@ namespace dbaui return std::make_unique<OConnectionTabPageSetup>(pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, TranslateId(), TranslateId(), STR_COMMONURL); } - OConnectionTabPageSetup::OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId) + OConnectionTabPageSetup::OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId) : OConnectionHelper(pPage, pController, _rUIXMLDescription, _rId, _rCoreAttrs) , m_xHelpText(m_xBuilder->weld_label("helptext")) , m_xHeaderText(m_xBuilder->weld_label("header")) diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 0039a7160a6e..27b8eab284ae 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -39,7 +39,7 @@ namespace dbaui DECL_LINK(OnEditModified, weld::Entry&, void); public: - OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId); + OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId); virtual ~OConnectionTabPageSetup() override; static std::unique_ptr<OGenericAdministrationPage> CreateDbaseTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index d7396dc4970f..da6ec80c2763 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -131,7 +131,7 @@ OUserAdmin::OUserAdmin(weld::Container* pPage, weld::DialogController* pControll m_xUSER->connect_changed(LINK(this, OUserAdmin, ListDblClickHdl)); } -IMPL_LINK(OUserAdmin, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(OUserAdmin, MenuSelectHdl, const OUString&, rIdent, void) { try { diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 045d8c39806f..76460a8468e7 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -46,7 +46,7 @@ class OUserAdmin final : public OGenericAdministrationPage // methods DECL_LINK(ListDblClickHdl, weld::ComboBox&, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); void FillUserNames(); diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index e623f9945424..b4cf62f3be22 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -108,7 +108,7 @@ namespace dbaui m_pImpl->saveChanges(*GetOutputItemSet()); return nRet; } - void OUserAdminDlg::PageCreated(const OString& rId, SfxTabPage& _rPage) + void OUserAdminDlg::PageCreated(const OUString& rId, SfxTabPage& _rPage) { // register ourself as modified listener static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( m_pImpl->getORB() ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 5f0eedbb0496..def0e05fcc87 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -48,7 +48,7 @@ namespace dbaui { } - OGenericAdministrationPage::OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet) + OGenericAdministrationPage::OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& rAttrSet) : SfxTabPage(pPage, pController, rUIXMLDescription, rId, &rAttrSet) , m_abEnableRoadmap(false) , m_pAdminDialog(nullptr) diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index de8265751992..63d4a1cbadab 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -94,7 +94,7 @@ namespace dbaui css::uno::Reference< css::uno::XComponentContext > m_xORB; public: - OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet); + OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& rAttrSet); /// set a handler which gets called every time something on the page has been modified void SetModifiedHandler(const Link<OGenericAdministrationPage const *, void>& _rHandler) { m_aModifiedHandler = _rHandler; } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 1cf713ce3d23..0770970d1b7e 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -46,7 +46,7 @@ namespace dbaui struct BooleanSettingDesc { std::unique_ptr<weld::CheckButton>& xControl; // the dialog's control which displays this setting - OString sControlId; // the widget name of the control in the .ui + OUString sControlId; // the widget name of the control in the .ui sal_uInt16 nItemId; // the ID of the item (in an SfxItemSet) which corresponds to this setting bool bInvertedDisplay; // true if and only if the checkbox is checked when the item is sal_False, and vice versa bool bOptionalBool; // type is OptionalBool @@ -410,7 +410,7 @@ namespace dbaui return nRet; } - void AdvancedSettingsDialog::PageCreated(const OString& rId, SfxTabPage& _rPage) + void AdvancedSettingsDialog::PageCreated(const OUString& rId, SfxTabPage& _rPage) { // register ourself as modified listener static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() ); diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 3f8ddcfa3996..a8a1ce1e51bd 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -71,7 +71,7 @@ short ODbAdminDialog::Ok() // TODO : AR_ERROR is not handled correctly, we always close the dialog here } -void ODbAdminDialog::PageCreated(const OString& rId, SfxTabPage& _rPage) +void ODbAdminDialog::PageCreated(const OUString& rId, SfxTabPage& _rPage) { // register ourself as modified listener static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() ); @@ -80,7 +80,7 @@ void ODbAdminDialog::PageCreated(const OString& rId, SfxTabPage& _rPage) SfxTabDialogController::PageCreated(rId, _rPage); } -void ODbAdminDialog::addDetailPage(const OString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc) +void ODbAdminDialog::addDetailPage(const OUString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc) { AddTabPage(rPageId, DBA_RES(pTextId), pCreateFunc); } @@ -142,7 +142,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName case ::dbaccess::DST_USERDEFINE10: { OUString aTitle(DBA_RES(STR_PAGETITLE_ADVANCED)); - AddTabPage("user" + OString::number(eType - dbaccess::DST_USERDEFINE1 + 1), aTitle, ODriversSettings::CreateUser); + AddTabPage("user" + OUString::number(eType - dbaccess::DST_USERDEFINE1 + 1), aTitle, ODriversSettings::CreateUser); } break; default: @@ -183,7 +183,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ::dbaccess::ODsnTypeCollection* pCollection = pCollectionItem->getCollection(); if ( pCollection->determineType(getDatasourceType( *m_xExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE ) { - OString sMySqlNative("mysqlnative"); + OUString sMySqlNative("mysqlnative"); AddTabPage(sMySqlNative, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE); RemoveTabPage("advanced"); m_sMainPageID = sMySqlNative; diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index fa06535022e0..8d1f737c52c5 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -218,7 +218,7 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialog::createPage(WizardState _nState) TranslateId pStringId = STR_PAGETITLE_ADVANCED; std::unique_ptr<BuilderPage> xPage; - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); switch(_nState) diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index d3d4c1dbde16..8bee3588952e 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -460,7 +460,7 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialogSetup::createPage(WizardState _nSta { std::unique_ptr<OGenericAdministrationPage> xPage; - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); switch(_nState) diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 8a06d7de1c18..57ae3bd59fd7 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -52,7 +52,7 @@ namespace dbaui using namespace ::dbtools; OCommonBehaviourTabPage::OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController, - const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rCoreAttrs, + const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags) : OGenericAdministrationPage(pPage, pController, rUIXMLDescription, rId, rCoreAttrs) , m_nControlFlags(nControlFlags) diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index cd570594afdb..3ebfcff1ef26 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -57,7 +57,7 @@ namespace dbaui public: virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; - OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags); + OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags); protected: virtual ~OCommonBehaviourTabPage() override; diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 1df2acc20a77..24a1c4e81c2d 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -47,7 +47,7 @@ SbaSbAttrDlg::~SbaSbAttrDlg() { } -void SbaSbAttrDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage) +void SbaSbAttrDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rPageId == "format") diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 544d9577fdd9..be9e96612a83 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -27,7 +27,7 @@ namespace dbaui DlgSize::DlgSize(weld::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard ) : GenericDialogController(pParent, bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"), - bRow ? OString("RowHeightDialog") : OString("ColWidthDialog")) + bRow ? OUString("RowHeightDialog") : OUString("ColWidthDialog")) , m_nPrevValue(nVal) , m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM)) , m_xCB_STANDARD(m_xBuilder->weld_check_button("automatic")) diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 4c93128482d5..d12602ce2eec 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -409,7 +409,7 @@ namespace dbaui updateToolbox(); } - IMPL_LINK(DbaIndexDialog, OnIndexAction, const OString&, rClicked, void) + IMPL_LINK(DbaIndexDialog, OnIndexAction, const OUString&, rClicked, void) { if (rClicked == "ID_INDEX_NEW") OnNewIndex(); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 81fa5100d0ef..b54bc8280839 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -482,7 +482,7 @@ void OSQLMessageBox::impl_createStandardButtons( MessBoxStyle _nStyle ) else aTmp = m_sHelpURL; - m_xDialog->set_help_id(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8)); + m_xDialog->set_help_id(aTmp); } void OSQLMessageBox::impl_addDetailsButton() diff --git a/dbaccess/source/ui/inc/ChildWindow.hxx b/dbaccess/source/ui/inc/ChildWindow.hxx index 8da6c8570dea..c2f68ac46f78 100644 --- a/dbaccess/source/ui/inc/ChildWindow.hxx +++ b/dbaccess/source/ui/inc/ChildWindow.hxx @@ -16,7 +16,7 @@ namespace dbaui class OChildWindow { protected: - OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID); + OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID); std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xContainer; @@ -29,7 +29,7 @@ public: void Enable(bool bEnable) { m_xContainer->set_sensitive(bEnable); } - void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); } + void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); } void Show() { m_xContainer->show(); } }; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 478a41070f73..410e086116fe 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -117,9 +117,9 @@ namespace dbaui void UpdateFormatSample(OFieldDescription const * pFieldDescr); bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; - std::unique_ptr<OPropNumericEditCtrl> CreateNumericControl(const OString& rId, TranslateId pHelpId, short _nProperty, const OString& _sHelpId); - void InitializeControl(weld::Widget* _pControl,const OString& _sHelpId); - void InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); + std::unique_ptr<OPropNumericEditCtrl> CreateNumericControl(const OUString& rId, TranslateId pHelpId, short _nProperty, const OUString& _sHelpId); + void InitializeControl(weld::Widget* _pControl,const OUString& _sHelpId); + void InitializeControl(OPropListBoxCtrl* _pControl,const OUString& _sHelpId,bool _bAddChangeHandler); bool IsFocusInEditableWidget() const; @@ -165,7 +165,7 @@ namespace dbaui void SetReadOnly( bool bReadOnly ); void Enable(bool bEnable) { m_xContainer->set_sensitive(bEnable); } - void SetHelpId(const OString& rId) { m_xContainer->set_help_id(rId); } + void SetHelpId(const OUString& rId) { m_xContainer->set_help_id(rId); } virtual bool isCutAllowed() override; virtual bool isCopyAllowed() override; diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 941eab5faed3..95edbe5f5527 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -47,7 +47,7 @@ namespace dbaui css::uno::Reference< css::sdbc::XConnection> m_xConnection; bool m_bOwnConnection; protected: - virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override; public: OUserAdminDlg(weld::Window* pParent, SfxItemSet* pItems, const css::uno::Reference< css::uno::XComponentContext >& rxORB, diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index cc7564cbae59..ef3d7f23b20c 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -31,7 +31,7 @@ namespace dbaui OCopyTableWizard* m_pParent; bool m_bFirstTime; // Page is called the first time; should be set in the reset method - OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID); + OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID); public: virtual ~OWizardPage() override; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index b28fe5ce3857..7c38562145a5 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -37,7 +37,7 @@ namespace dbaui std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; protected: - virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override; virtual short Ok() override; public: diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index a99c2c3affe3..6042f761ce2f 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -43,7 +43,7 @@ public: public: bool get_visible() const { return m_xEntry->get_visible(); } void connect_changed(const Link<weld::Entry&, void>& rLink) { m_xEntry->connect_changed(rLink); } - void set_help_id(const OString& rName) { m_xEntry->set_help_id(rName); } + void set_help_id(const OUString& rName) { m_xEntry->set_help_id(rName); } void hide() { m_xEntry->hide(); diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 8caf3c129102..53222a6afca2 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -49,7 +49,7 @@ class ODbAdminDialog final : public SfxTabDialogController, public IItemSetHelpe private: std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - OString m_sMainPageID; + OUString m_sMainPageID; public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed @@ -89,9 +89,9 @@ public: private: // adds a new detail page and remove all the old ones - void addDetailPage(const OString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc); + void addDetailPage(const OUString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc); - virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override; virtual short Ok() override; /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index 6c3a00f95472..83fe0466e4f8 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -34,7 +34,7 @@ namespace dbaui SbaSbAttrDlg(weld::Widget* pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat); virtual ~SbaSbAttrDlg() override; - virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index f03b04f6f0b8..b3ba37936e79 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -74,7 +74,7 @@ namespace dbaui void IndexSelected(); DECL_LINK( OnIndexSelected, weld::TreeView&, void ); - DECL_LINK( OnIndexAction, const OString&, void ); + DECL_LINK( OnIndexAction, const OUString&, void ); DECL_LINK( OnEntryEditing, const weld::TreeIter&, bool ); DECL_LINK( OnEntryEdited, const IterString&, bool ); DECL_LINK( OnModifiedClick, weld::Toggleable&, void ); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 4c0f37654647..ae96bb291bbb 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -163,7 +163,7 @@ namespace dbaui virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& rMenu, weld::Menu& rInsertMenu, weld::Menu& rChangeMenu, weld::Menu& rShowMenu) override; - virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult) override; + virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult) override; private: // DragSourceHelper overridables @@ -254,7 +254,7 @@ namespace dbaui // DbGridControl overridables virtual void PreExecuteRowContextMenu(weld::Menu& rMenu) override; - virtual void PostExecuteRowContextMenu(const OString& rExecutionResult) override; + virtual void PostExecuteRowContextMenu(const OUString& rExecutionResult) override; // DbGridControl overridables virtual void onRowChange() override; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index ad6cb25b4d63..481732985d12 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -106,7 +106,7 @@ public: const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr ); void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); } - void add_button(const OUString& rText, int nResponse, const OString& rHelpId = OString()) { m_xDialog->add_button(rText, nResponse, rHelpId); } + void add_button(const OUString& rText, int nResponse, const OUString& rHelpId = {}) { m_xDialog->add_button(rText, nResponse, rHelpId); } void set_default_response(int nResponse) { m_xDialog->set_default_response(nResponse); } virtual ~OSQLMessageBox() override; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 8937cfb2d78d..3ad6d58a3149 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -36,7 +36,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITLE); } -OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) +OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : ::vcl::OWizardPage(pPage, pWizard, rUIXMLDescription, rID) , m_pParent(pWizard) , m_bFirstTime(true) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 4d8e73141a5c..590b3f9adce5 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -578,7 +578,7 @@ OCopyTableWizard::OCopyTableWizard(weld::Window* pParent, const OUString& _rDefa weld::Container* OCopyTableWizard::CreatePageContainer() { - OString sIdent(OString::number(m_nPageCount)); + OUString sIdent(OUString::number(m_nPageCount)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); return pPageContainer; } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 830a30bac02c..f5b4ee4baafc 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -389,7 +389,7 @@ IMPL_LINK(OWizTypeSelectList, CommandHdl, const CommandEvent&, rCEvt, bool) if (bCheckOk) xContextMenu->set_active("primarykey", true); - OString sCommand(xContextMenu->popup_at_rect(m_xControl.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); + OUString sCommand(xContextMenu->popup_at_rect(m_xControl.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); if (sCommand != "primarykey") return true; diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index e816dfa9e585..1be2fd39d9b7 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1122,7 +1122,7 @@ void OJoinTableView::executePopup(const Point& rPos, VclPtr<OTableConnection>& r weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect); std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/joinviewmenu.ui")); std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu")); - OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); + OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); if (sIdent == "delete") RemoveConnection(rSelConnection, true); else if (sIdent == "edit") diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 2ab69afb13c0..f053d4b43dd1 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1953,7 +1953,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect); std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/querycolmenu.ui")); std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu")); - OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); + OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); if (sIdent == "delete") RemoveField(nColId); else if (sIdent == "width") @@ -1973,7 +1973,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) xContextMenu->set_active("alias", m_bVisibleRow[BROW_COLUMNALIAS_ROW]); xContextMenu->set_active("distinct", static_cast<OQueryController&>(getDesignView()->getController()).isDistinct()); - OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); + OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); if (sIdent == "functions") { SetRowVisible(BROW_FUNCTION_ROW, !IsRowVisible(BROW_FUNCTION_ROW)); @@ -2536,7 +2536,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window _pControl->EnableInput(bEnable); } -void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OString& _sHelpId) +void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OUString& _sHelpId) { weld::Entry& rEntry = m_pTextCell->get_widget(); rEntry.set_text(_sText); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 761870fb8180..3bddd9a9c996 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -227,7 +227,7 @@ namespace dbaui void appendUndoAction(const OUString& _rOldValue,std::u16string_view _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; static void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OString& _sHelpId); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OUString& _sHelpId); void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index db33d26fcd81..241efe597ef4 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1424,7 +1424,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) // All actions which change the number of rows must be run asynchronously // otherwise there may be problems between the Context menu and the Browser m_nDataPos = GetCurRow(); - OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); + OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); if (sIdent == "cut") cut(); else if (sIdent == "copy") diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 1526682eddd7..18e24c3d5e12 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -116,7 +116,7 @@ void OTableRowView::Command(const CommandEvent& rEvt) sal_Int32 nSelectRowCount = GetSelectRowCount(); xContextMenu->set_sensitive("cut", nSelectRowCount != 0); xContextMenu->set_sensitive("copy", nSelectRowCount != 0); - OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); + OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); if (sIdent == "cut") cut(); else if (sIdent == "copy") diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index f0ad04cb3217..fd155a5749d5 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -88,7 +88,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl ExtMgrDialog* m_pParent; void SetButtonStatus( const TEntry_Impl& rEntry ); - OString ShowPopupMenu( const Point &rPos, const tools::Long nPos ); + OUString ShowPopupMenu( const Point &rPos, const tools::Long nPos ); public: explicit ExtBoxWithBtns_Impl(std::unique_ptr<weld::ScrolledWindow> xScroll); @@ -200,7 +200,7 @@ bool ExtBoxWithBtns_Impl::Command(const CommandEvent& rCEvt) const Point aMousePos(rCEvt.GetMousePosPixel()); const auto nPos = PointToPos(aMousePos); - OString sCommand = ShowPopupMenu(aMousePos, nPos); + OUString sCommand = ShowPopupMenu(aMousePos, nPos); if (sCommand == "CMD_ENABLE") m_pParent->enablePackage( GetEntryData( nPos )->m_xPackage, true ); @@ -221,7 +221,7 @@ bool ExtBoxWithBtns_Impl::Command(const CommandEvent& rCEvt) return true; } -OString ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const tools::Long nPos ) +OUString ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const tools::Long nPos ) { if ( nPos >= static_cast<tools::Long>(getItemCount()) ) return "CMD_NONE"; diff --git a/desktop/source/inc/helpids.h b/desktop/source/inc/helpids.h index 023ffdea7bea..da49afb99446 100644 --- a/desktop/source/inc/helpids.h +++ b/desktop/source/inc/helpids.h @@ -19,9 +19,9 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_EXTENSION_MANAGER_LISTBOX_ENABLE = "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"; -inline constexpr OStringLiteral HID_EXTENSION_MANAGER_LISTBOX_DISABLE = "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"; +inline constexpr OUStringLiteral HID_EXTENSION_MANAGER_LISTBOX_ENABLE = u"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"; +inline constexpr OUStringLiteral HID_EXTENSION_MANAGER_LISTBOX_DISABLE = u"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 5a5d3e4399b2..ba1deeee2eae 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4657,28 +4657,25 @@ static void lcl_sendDialogEvent(unsigned long long int nWindowId, const char* pA try { - OString sControlId = OUStringToOString(aMap["id"], RTL_TEXTENCODING_ASCII_US); + OUString sControlId = aMap["id"]; // dialogs send own id but notebookbar and sidebar controls are remembered by SfxViewShell id - bool bFoundWeldedControl = jsdialog::ExecuteAction(std::to_string(nWindowId), sControlId, aMap); - if (!bFoundWeldedControl) - bFoundWeldedControl = jsdialog::ExecuteAction(std::to_string(nCurrentShellId) + "sidebar", sControlId, aMap); - if (!bFoundWeldedControl) - bFoundWeldedControl = jsdialog::ExecuteAction(std::to_string(nCurrentShellId) + "notebookbar", sControlId, aMap); - if (!bFoundWeldedControl) - bFoundWeldedControl = jsdialog::ExecuteAction(std::to_string(nCurrentShellId) + "formulabar", sControlId, aMap); - if (!bFoundWeldedControl && !SfxViewShell::Current()) - { - // this is needed for dialogs shown before document is loaded: MacroWarning dialog, etc... - // these dialogs are created with WindowId "0" - bFoundWeldedControl = jsdialog::ExecuteAction("0", sControlId, aMap); - } - - if (bFoundWeldedControl) + if (jsdialog::ExecuteAction(OUString::number(nWindowId), sControlId, aMap)) + return; + auto sCurrentShellId = OUString::number(nCurrentShellId); + if (jsdialog::ExecuteAction(sCurrentShellId + "sidebar", sControlId, aMap)) + return; + if (jsdialog::ExecuteAction(sCurrentShellId + "notebookbar", sControlId, aMap)) + return; + if (jsdialog::ExecuteAction(sCurrentShellId + "formulabar", sControlId, aMap)) + return; + // this is needed for dialogs shown before document is loaded: MacroWarning dialog, etc... + // these dialogs are created with WindowId "0" + if (!SfxViewShell::Current() && jsdialog::ExecuteAction("0", sControlId, aMap)) return; // force resend - used in mobile-wizard - jsdialog::SendFullUpdate(std::to_string(nCurrentShellId) + "sidebar", "Panel"); + jsdialog::SendFullUpdate(sCurrentShellId + "sidebar", "Panel"); } catch(...) {} } diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index f243d6d8feb6..801fca0e0b21 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -923,7 +923,7 @@ static void LOKSendSpellPopupMenu(const weld::Menu& rMenu, LanguageType nGuessLa { for(int i = 0; i < nSuggestions; ++i) { - OString sItemId = OString::number(MN_ALTSTART + i); + OUString sItemId = OUString::number(MN_ALTSTART + i); OUString sText = rMenu.get_label(sItemId); aItemTree.put("text", sText.toUtf8().getStr()); aItemTree.put("type", "command"); @@ -1170,7 +1170,7 @@ bool EditView::ExecuteSpellPopup(const Point& rPosPixel, const Link<SpellCallbac return true; } - OString sId = xPopupMenu->popup_at_rect(pPopupParent, aTempRect); + OUString sId = xPopupMenu->popup_at_rect(pPopupParent, aTempRect); aPaM2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP2); aPaM = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP); diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h index 48a623dd1319..b16b8506d161 100644 --- a/extensions/inc/helpids.h +++ b/extensions/inc/helpids.h @@ -22,59 +22,59 @@ #include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_ABSPILOT_PREVIOUS = "EXTENSIONS_HID_ABSPILOT_PREVIOUS"; -inline constexpr OStringLiteral HID_ABSPILOT_NEXT = "EXTENSIONS_HID_ABSPILOT_NEXT"; -inline constexpr OStringLiteral HID_ABSPILOT_CANCEL = "EXTENSIONS_HID_ABSPILOT_CANCEL"; -inline constexpr OStringLiteral HID_ABSPILOT_FINISH = "EXTENSIONS_HID_ABSPILOT_FINISH"; -inline constexpr OStringLiteral UID_ABSPILOT_HELP = "EXTENSIONS_UID_ABSPILOT_HELP"; -inline constexpr OStringLiteral HID_ABSPILOT = "EXTENSIONS_HID_ABSPILOT"; +inline constexpr OUStringLiteral HID_ABSPILOT_PREVIOUS = u"EXTENSIONS_HID_ABSPILOT_PREVIOUS"; +inline constexpr OUStringLiteral HID_ABSPILOT_NEXT = u"EXTENSIONS_HID_ABSPILOT_NEXT"; +inline constexpr OUStringLiteral HID_ABSPILOT_CANCEL = u"EXTENSIONS_HID_ABSPILOT_CANCEL"; +inline constexpr OUStringLiteral HID_ABSPILOT_FINISH = u"EXTENSIONS_HID_ABSPILOT_FINISH"; +inline constexpr OUStringLiteral UID_ABSPILOT_HELP = u"EXTENSIONS_UID_ABSPILOT_HELP"; +inline constexpr OUStringLiteral HID_ABSPILOT = u"EXTENSIONS_HID_ABSPILOT"; -inline constexpr OStringLiteral HID_BIB_IDENTIFIER_POS = "EXTENSIONS_HID_BIB_IDENTIFIER_POS"; -inline constexpr OStringLiteral HID_BIB_AUTHORITYTYPE_POS = "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS"; -inline constexpr OStringLiteral HID_BIB_AUTHOR_POS = "EXTENSIONS_HID_BIB_AUTHOR_POS"; -inline constexpr OStringLiteral HID_BIB_TITLE_POS = "EXTENSIONS_HID_BIB_TITLE_POS"; -inline constexpr OStringLiteral HID_BIB_YEAR_POS = "EXTENSIONS_HID_BIB_YEAR_POS"; -inline constexpr OStringLiteral HID_BIB_ISBN_POS = "EXTENSIONS_HID_BIB_ISBN_POS"; -inline constexpr OStringLiteral HID_BIB_BOOKTITLE_POS = "EXTENSIONS_HID_BIB_BOOKTITLE_POS"; -inline constexpr OStringLiteral HID_BIB_CHAPTER_POS = "EXTENSIONS_HID_BIB_CHAPTER_POS"; -inline constexpr OStringLiteral HID_BIB_EDITION_POS = "EXTENSIONS_HID_BIB_EDITION_POS"; -inline constexpr OStringLiteral HID_BIB_EDITOR_POS = "EXTENSIONS_HID_BIB_EDITOR_POS"; -inline constexpr OStringLiteral HID_BIB_HOWPUBLISHED_POS = "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS"; -inline constexpr OStringLiteral HID_BIB_INSTITUTION_POS = "EXTENSIONS_HID_BIB_INSTITUTION_POS"; -inline constexpr OStringLiteral HID_BIB_JOURNAL_POS = "EXTENSIONS_HID_BIB_JOURNAL_POS"; -inline constexpr OStringLiteral HID_BIB_MONTH_POS = "EXTENSIONS_HID_BIB_MONTH_POS"; -inline constexpr OStringLiteral HID_BIB_NOTE_POS = "EXTENSIONS_HID_BIB_NOTE_POS"; -inline constexpr OStringLiteral HID_BIB_ANNOTE_POS = "EXTENSIONS_HID_BIB_ANNOTE_POS"; -inline constexpr OStringLiteral HID_BIB_NUMBER_POS = "EXTENSIONS_HID_BIB_NUMBER_POS"; -inline constexpr OStringLiteral HID_BIB_ORGANIZATIONS_POS = "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS"; -inline constexpr OStringLiteral HID_BIB_PAGES_POS = "EXTENSIONS_HID_BIB_PAGES_POS"; -inline constexpr OStringLiteral HID_BIB_PUBLISHER_POS = "EXTENSIONS_HID_BIB_PUBLISHER_POS"; -inline constexpr OStringLiteral HID_BIB_ADDRESS_POS = "EXTENSIONS_HID_BIB_ADDRESS_POS"; -inline constexpr OStringLiteral HID_BIB_SCHOOL_POS = "EXTENSIONS_HID_BIB_SCHOOL_POS"; -inline constexpr OStringLiteral HID_BIB_SERIES_POS = "EXTENSIONS_HID_BIB_SERIES_POS"; -inline constexpr OStringLiteral HID_BIB_REPORTTYPE_POS = "EXTENSIONS_HID_BIB_REPORTTYPE_POS"; -inline constexpr OStringLiteral HID_BIB_VOLUME_POS = "EXTENSIONS_HID_BIB_VOLUME_POS"; -inline constexpr OStringLiteral HID_BIB_URL_POS = "EXTENSIONS_HID_BIB_URL_POS"; -inline constexpr OStringLiteral HID_BIB_CUSTOM1_POS = "EXTENSIONS_HID_BIB_CUSTOM1_POS"; -inline constexpr OStringLiteral HID_BIB_CUSTOM2_POS = "EXTENSIONS_HID_BIB_CUSTOM2_POS"; -inline constexpr OStringLiteral HID_BIB_CUSTOM3_POS = "EXTENSIONS_HID_BIB_CUSTOM3_POS"; -inline constexpr OStringLiteral HID_BIB_CUSTOM4_POS = "EXTENSIONS_HID_BIB_CUSTOM4_POS"; -inline constexpr OStringLiteral HID_BIB_CUSTOM5_POS = "EXTENSIONS_HID_BIB_CUSTOM5_POS"; -inline constexpr OStringLiteral HID_BIB_LOCAL_URL_POS = "EXTENSIONS_HID_BIB_LOCAL_URL_POS"; +inline constexpr OUStringLiteral HID_BIB_IDENTIFIER_POS = u"EXTENSIONS_HID_BIB_IDENTIFIER_POS"; +inline constexpr OUStringLiteral HID_BIB_AUTHORITYTYPE_POS = u"EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS"; +inline constexpr OUStringLiteral HID_BIB_AUTHOR_POS = u"EXTENSIONS_HID_BIB_AUTHOR_POS"; +inline constexpr OUStringLiteral HID_BIB_TITLE_POS = u"EXTENSIONS_HID_BIB_TITLE_POS"; +inline constexpr OUStringLiteral HID_BIB_YEAR_POS = u"EXTENSIONS_HID_BIB_YEAR_POS"; +inline constexpr OUStringLiteral HID_BIB_ISBN_POS = u"EXTENSIONS_HID_BIB_ISBN_POS"; +inline constexpr OUStringLiteral HID_BIB_BOOKTITLE_POS = u"EXTENSIONS_HID_BIB_BOOKTITLE_POS"; +inline constexpr OUStringLiteral HID_BIB_CHAPTER_POS = u"EXTENSIONS_HID_BIB_CHAPTER_POS"; +inline constexpr OUStringLiteral HID_BIB_EDITION_POS = u"EXTENSIONS_HID_BIB_EDITION_POS"; +inline constexpr OUStringLiteral HID_BIB_EDITOR_POS = u"EXTENSIONS_HID_BIB_EDITOR_POS"; +inline constexpr OUStringLiteral HID_BIB_HOWPUBLISHED_POS = u"EXTENSIONS_HID_BIB_HOWPUBLISHED_POS"; +inline constexpr OUStringLiteral HID_BIB_INSTITUTION_POS = u"EXTENSIONS_HID_BIB_INSTITUTION_POS"; +inline constexpr OUStringLiteral HID_BIB_JOURNAL_POS = u"EXTENSIONS_HID_BIB_JOURNAL_POS"; +inline constexpr OUStringLiteral HID_BIB_MONTH_POS = u"EXTENSIONS_HID_BIB_MONTH_POS"; +inline constexpr OUStringLiteral HID_BIB_NOTE_POS = u"EXTENSIONS_HID_BIB_NOTE_POS"; +inline constexpr OUStringLiteral HID_BIB_ANNOTE_POS = u"EXTENSIONS_HID_BIB_ANNOTE_POS"; +inline constexpr OUStringLiteral HID_BIB_NUMBER_POS = u"EXTENSIONS_HID_BIB_NUMBER_POS"; +inline constexpr OUStringLiteral HID_BIB_ORGANIZATIONS_POS = u"EXTENSIONS_HID_BIB_ORGANIZATIONS_POS"; +inline constexpr OUStringLiteral HID_BIB_PAGES_POS = u"EXTENSIONS_HID_BIB_PAGES_POS"; +inline constexpr OUStringLiteral HID_BIB_PUBLISHER_POS = u"EXTENSIONS_HID_BIB_PUBLISHER_POS"; +inline constexpr OUStringLiteral HID_BIB_ADDRESS_POS = u"EXTENSIONS_HID_BIB_ADDRESS_POS"; +inline constexpr OUStringLiteral HID_BIB_SCHOOL_POS = u"EXTENSIONS_HID_BIB_SCHOOL_POS"; +inline constexpr OUStringLiteral HID_BIB_SERIES_POS = u"EXTENSIONS_HID_BIB_SERIES_POS"; +inline constexpr OUStringLiteral HID_BIB_REPORTTYPE_POS = u"EXTENSIONS_HID_BIB_REPORTTYPE_POS"; +inline constexpr OUStringLiteral HID_BIB_VOLUME_POS = u"EXTENSIONS_HID_BIB_VOLUME_POS"; +inline constexpr OUStringLiteral HID_BIB_URL_POS = u"EXTENSIONS_HID_BIB_URL_POS"; +inline constexpr OUStringLiteral HID_BIB_CUSTOM1_POS = u"EXTENSIONS_HID_BIB_CUSTOM1_POS"; +inline constexpr OUStringLiteral HID_BIB_CUSTOM2_POS = u"EXTENSIONS_HID_BIB_CUSTOM2_POS"; +inline constexpr OUStringLiteral HID_BIB_CUSTOM3_POS = u"EXTENSIONS_HID_BIB_CUSTOM3_POS"; +inline constexpr OUStringLiteral HID_BIB_CUSTOM4_POS = u"EXTENSIONS_HID_BIB_CUSTOM4_POS"; +inline constexpr OUStringLiteral HID_BIB_CUSTOM5_POS = u"EXTENSIONS_HID_BIB_CUSTOM5_POS"; +inline constexpr OUStringLiteral HID_BIB_LOCAL_URL_POS = u"EXTENSIONS_HID_BIB_LOCAL_URL_POS"; #define HID_BIB_DB_GRIDCTRL "EXTENSIONS_HID_BIB_DB_GRIDCTRL" -inline constexpr OStringLiteral HID_GROUPWIZARD_PREVIOUS = "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS"; -inline constexpr OStringLiteral HID_GROUPWIZARD_NEXT = "EXTENSIONS_HID_GROUPWIZARD_NEXT"; -inline constexpr OStringLiteral HID_GROUPWIZARD_CANCEL = "EXTENSIONS_HID_GROUPWIZARD_CANCEL"; -inline constexpr OStringLiteral HID_GROUPWIZARD_FINISH = "EXTENSIONS_HID_GROUPWIZARD_FINISH"; -inline constexpr OStringLiteral HID_LISTWIZARD_PREVIOUS = "EXTENSIONS_HID_LISTWIZARD_PREVIOUS"; -inline constexpr OStringLiteral HID_LISTWIZARD_NEXT = "EXTENSIONS_HID_LISTWIZARD_NEXT"; -inline constexpr OStringLiteral HID_LISTWIZARD_CANCEL = "EXTENSIONS_HID_LISTWIZARD_CANCEL"; -inline constexpr OStringLiteral HID_LISTWIZARD_FINISH = "EXTENSIONS_HID_LISTWIZARD_FINISH"; -inline constexpr OStringLiteral HID_GRIDWIZARD_PREVIOUS = "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS"; -inline constexpr OStringLiteral HID_GRIDWIZARD_NEXT = "EXTENSIONS_HID_GRIDWIZARD_NEXT"; -inline constexpr OStringLiteral HID_GRIDWIZARD_CANCEL = "EXTENSIONS_HID_GRIDWIZARD_CANCEL"; -inline constexpr OStringLiteral HID_GRIDWIZARD_FINISH = "EXTENSIONS_HID_GRIDWIZARD_FINISH"; +inline constexpr OUStringLiteral HID_GROUPWIZARD_PREVIOUS = u"EXTENSIONS_HID_GROUPWIZARD_PREVIOUS"; +inline constexpr OUStringLiteral HID_GROUPWIZARD_NEXT = u"EXTENSIONS_HID_GROUPWIZARD_NEXT"; +inline constexpr OUStringLiteral HID_GROUPWIZARD_CANCEL = u"EXTENSIONS_HID_GROUPWIZARD_CANCEL"; +inline constexpr OUStringLiteral HID_GROUPWIZARD_FINISH = u"EXTENSIONS_HID_GROUPWIZARD_FINISH"; +inline constexpr OUStringLiteral HID_LISTWIZARD_PREVIOUS = u"EXTENSIONS_HID_LISTWIZARD_PREVIOUS"; +inline constexpr OUStringLiteral HID_LISTWIZARD_NEXT = u"EXTENSIONS_HID_LISTWIZARD_NEXT"; +inline constexpr OUStringLiteral HID_LISTWIZARD_CANCEL = u"EXTENSIONS_HID_LISTWIZARD_CANCEL"; +inline constexpr OUStringLiteral HID_LISTWIZARD_FINISH = u"EXTENSIONS_HID_LISTWIZARD_FINISH"; +inline constexpr OUStringLiteral HID_GRIDWIZARD_PREVIOUS = u"EXTENSIONS_HID_GRIDWIZARD_PREVIOUS"; +inline constexpr OUStringLiteral HID_GRIDWIZARD_NEXT = u"EXTENSIONS_HID_GRIDWIZARD_NEXT"; +inline constexpr OUStringLiteral HID_GRIDWIZARD_CANCEL = u"EXTENSIONS_HID_GRIDWIZARD_CANCEL"; +inline constexpr OUStringLiteral HID_GRIDWIZARD_FINISH = u"EXTENSIONS_HID_GRIDWIZARD_FINISH"; inline constexpr OUStringLiteral HID_PROP_INPUT_REQUIRED = u"EXTENSIONS_HID_PROP_INPUT_REQUIRED"; inline constexpr OUStringLiteral HID_PROP_CONTROLSOURCE = u"EXTENSIONS_HID_PROP_CONTROLSOURCE"; @@ -293,7 +293,7 @@ inline constexpr OUStringLiteral HID_PROP_IMAGEPOSITION = u"EXTENSIONS_HID_PROP_ inline constexpr OUStringLiteral HID_PROP_NOLABEL = u"EXTENSIONS_HID_PROP_NOLABEL"; inline constexpr OUStringLiteral HID_PROP_WRITING_MODE = u"EXTENSIONS_HID_PROP_WRITING_MODE"; inline constexpr OUStringLiteral HID_PROP_ANCHOR_TYPE = u"EXTENSIONS_HID_PROP_ANCHOR_TYPE"; -inline constexpr OStringLiteral HID_FM_PROPDLG_TABCTR = "EXTENSIONS_HID_FM_PROPDLG_TABCTR"; +inline constexpr OUStringLiteral HID_FM_PROPDLG_TABCTR = u"EXTENSIONS_HID_FM_PROPDLG_TABCTR"; inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_GENERAL = u"EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL"; inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_DATA = u"EXTENSIONS_HID_FM_PROPDLG_TAB_DATA"; inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_EVT = u"EXTENSIONS_HID_FM_PROPDLG_TAB_EVT"; diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index ee36cee27ab1..4ea1f3dded48 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.cxx @@ -25,7 +25,7 @@ namespace abp using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - AddressBookSourcePage::AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pDialog, const OUString& rUIXMLDescription, const OString& rID) + AddressBookSourcePage::AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pDialog, const OUString& rUIXMLDescription, const OUString& rID) : AddressBookSourcePage_Base(pPage, pDialog, rUIXMLDescription, rID) , m_pDialog(pDialog) { diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 4d78533ad885..407713fab99d 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -37,7 +37,7 @@ namespace abp OAddressBookSourcePilot* m_pDialog; protected: - AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pController, const OUString& rUIXMLDescription, const OString& rID); + AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pController, const OUString& rUIXMLDescription, const OUString& rID); protected: // helper diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 0a5cba073f0b..1b04a34ceb9b 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -361,7 +361,7 @@ namespace abp std::unique_ptr<BuilderPage> OAddressBookSourcePilot::createPage(WizardState _nState) { - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); std::unique_ptr<vcl::OWizardPage> xRet; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 5e633e4dd98a..cba844932134 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -823,7 +823,7 @@ IMPL_LINK(BibGeneralPage, GainFocusHdl, weld::Widget&, rWidget, void) } template<class Target> void BibGeneralPage::AddControlWithError(const OUString& rColumnName, const OUString& rColumnUIName, - Target& rWidget, OUString& rErrorString, const OString& rHelpId) + Target& rWidget, OUString& rErrorString, const OUString& rHelpId) { rWidget.set_help_id(rHelpId); rWidget.connect_focus_in(LINK(this, BibGeneralPage, GainFocusHdl)); diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index b4d981955891..9708174ffa1f 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -127,7 +127,7 @@ class BibGeneralPage : public InterimItemWindow bool AddXControl(const OUString& rName, weld::ComboBox& rList); template<class Target> void AddControlWithError(const OUString& rColumnName, const OUString& rColumnUIName, - Target& rWidget, OUString& rErrorString, const OString& rHelpId); + Target& rWidget, OUString& rErrorString, const OUString& rHelpId); void SaveChanges(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index ca4971572eac..cee4d5fbb44a 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -424,7 +424,7 @@ sal_uInt16 BibToolBar::InsertFilterItem(const OUString& rMenuEntry) void BibToolBar::SelectFilterItem(sal_uInt16 nId) { - OString sId = OString::number(nId); + OUString sId = OUString::number(nId); xPopupMenu->set_active(sId, true); sSelMenuItem = sId; aQueryField = MnemonicGenerator::EraseAllMnemonicChars(xPopupMenu->get_label(sId)); @@ -521,7 +521,7 @@ IMPL_LINK_NOARG(BibToolBar, MenuHdl, ToolBox*, void) tools::Rectangle aRect(GetItemRect(nTBC_BT_AUTOFILTER)); weld::Window* pParent = weld::GetPopupParent(*this, aRect); - OString sId = xPopupMenu->popup_at_rect(pParent, aRect); + OUString sId = xPopupMenu->popup_at_rect(pParent, aRect); if (!sId.isEmpty()) { diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 3e97ec6f4702..d4e45b2e0b80 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -150,7 +150,7 @@ class BibToolBar: public ToolBox std::unique_ptr<weld::Builder> xBuilder; std::unique_ptr<weld::Menu> xPopupMenu; sal_uInt16 nMenuId; - OString sSelMenuItem; + OUString sSelMenuItem; OUString aQueryField; Link<void*,void> aLayoutManager; sal_Int16 nSymbolsSize; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 1a86cc70efd6..3aa003196730 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -343,7 +343,7 @@ namespace dbp lcl_fillEntries(*m_xTable, aQueryNames, BMP_QUERY, CommandType::QUERY); } - OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) + OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID) , m_pYes(nullptr) , m_pNo(nullptr) diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 11dc5ceb65d4..66115a14451c 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -65,7 +65,7 @@ namespace dbp weld::ComboBox* m_pList; public: - OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID); + OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID); virtual ~OMaybeListSelectionPage() override; protected: diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 13fa2980683a..95a3801573df 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -72,7 +72,7 @@ namespace dbp OAccessRegulator() { } }; - OControlWizardPage::OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) + OControlWizardPage::OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : OControlWizardPage_Base(pPage, pWizard, rUIXMLDescription, rID) , m_pDialog(pWizard) { diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 22e7feca1a5b..12138899f9dd 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -61,7 +61,7 @@ namespace dbp css::uno::Reference< css::sdbc::XConnection > getFormConnection() const; public: - OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID); + OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID); virtual ~OControlWizardPage() override; protected: diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 3cf1d03240b7..c084eda7b364 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -216,7 +216,7 @@ namespace dbp std::unique_ptr<BuilderPage> OGridWizard::createPage(WizardState _nState) { - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); switch (_nState) diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 774e6cd69d34..dc2c069e9f76 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -60,7 +60,7 @@ namespace dbp class OGridPage : public OControlWizardPage { public: - OGridPage(weld::Container* pPage, OGridWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) + OGridPage(weld::Container* pPage, OGridWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID) { } diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 04f7f68eda3d..3f88e3fc938f 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -60,7 +60,7 @@ namespace dbp std::unique_ptr<BuilderPage> OGroupBoxWizard::createPage(::vcl::WizardTypes::WizardState _nState) { - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); switch (_nState) diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 18fa12c7ffe5..73950ed36918 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -65,7 +65,7 @@ namespace dbp class OGBWPage : public OControlWizardPage { public: - OGBWPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) + OGBWPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID) { } diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index cccd7136ba64..886e7ff131e2 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -83,7 +83,7 @@ namespace dbp std::unique_ptr<BuilderPage> OListComboWizard::createPage(WizardState _nState) { - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); switch (_nState) diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 7ab6a8a21d0f..5e61296f89be 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -77,7 +77,7 @@ namespace dbp class OLCPage : public OControlWizardPage { public: - OLCPage(weld::Container* pPage, OListComboWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID) + OLCPage(weld::Container* pPage, OListComboWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID) { } diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 53a58966e25d..35314507e853 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -90,7 +90,7 @@ namespace pcr } } - void OBrowserLine::SetComponentHelpIds(const OString& rHelpId) + void OBrowserLine::SetComponentHelpIds(const OUString& rHelpId) { if (m_pControlWindow) m_pControlWindow->set_help_id(rHelpId); diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index f56370730716..dfde2969f41f 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -84,7 +84,7 @@ namespace pcr const OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds(const OString& rHelpId); + void SetComponentHelpIds(const OUString& rHelpId); void SetTitle(const OUString& rString ); void FullFillTitleString(); diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 0db6cc3c7522..5f9220a7961f 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -37,7 +37,7 @@ namespace pcr explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer); ~OBrowserPage(); - void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); } + void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); } OBrowserListBox& getListBox() { return *m_xListBox; } const OBrowserListBox& getListBox() const { return *m_xListBox; } diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index e7b7cb690d20..3be48abe41a2 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -35,7 +35,7 @@ namespace pcr m_xPropBox->setPageActivationHandler(LINK(this, OPropertyBrowserView, OnPageActivation)); } - IMPL_LINK(OPropertyBrowserView, OnPageActivation, const OString&, rNewPage, void) + IMPL_LINK(OPropertyBrowserView, OnPageActivation, const OUString&, rNewPage, void) { m_nActivePage = rNewPage.toUInt32(); m_aPageActivationHandler.Call(nullptr); diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 7a0711fb145c..d64039813757 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -48,7 +48,7 @@ namespace pcr css::awt::Size getMinimumSize() const; private: - DECL_LINK(OnPageActivation, const OString&, void); + DECL_LINK(OnPageActivation, const OUString&, void); }; } // namespace pcr diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 2392e51f355e..997986e0f536 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -556,7 +556,7 @@ namespace pcr delete pFontList; } - void ControlCharacterDialog::PageCreated(const OString& rId, SfxTabPage& rPage) + void ControlCharacterDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "font") diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index eaba29db0b9c..a5946719674c 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -59,7 +59,7 @@ namespace pcr std::vector< css::beans::NamedValue >& _out_properties ); protected: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; }; } // namespace pcr diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 4151e6827506..08da46ae8ae4 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -34,13 +34,13 @@ namespace pcr //= HelpIdUrl - OString HelpIdUrl::getHelpId( std::u16string_view _rHelpURL ) + OUString HelpIdUrl::getHelpId( std::u16string_view _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INetProtocol::Hid ) - return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return aHID.GetURLPath(); else - return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUString(_rHelpURL); } diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index f9ec2838cf16..a9705188906a 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -61,7 +61,7 @@ namespace pcr class HelpIdUrl { public: - static OString getHelpId( std::u16string_view _rHelpURL ); + static OUString getHelpId( std::u16string_view _rHelpURL ); static OUString getHelpURL( std::u16string_view ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index b0516fd90903..01a0395594f5 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1111,7 +1111,7 @@ namespace pcr { weld::Widget* m_pControlWindow = pTunnel->getWidget(); if (m_pControlWindow) - m_pControlWindow->set_buildable_name(m_pControlWindow->get_buildable_name() + "-" + _rDescriptor.DisplayName.toUtf8()); + m_pControlWindow->set_buildable_name(m_pControlWindow->get_buildable_name() + "-" + _rDescriptor.DisplayName); } } @@ -1178,7 +1178,7 @@ namespace pcr // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide // any category information of its own. In this case, we have a fallback ... m_aPageIds[ aDescriptor.Category ] = - getPropertyBox().AppendPage( aDescriptor.Category, OString() ); + getPropertyBox().AppendPage(aDescriptor.Category, {}); nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category ); } diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 45d2fb2bc7ce..1e026c5b5bb4 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -65,7 +65,7 @@ namespace pcr int nCount = m_xTabControl->get_n_pages(); for (int i = nCount - 1; i >= 0; --i) { - OString sID = m_xTabControl->get_page_ident(i); + OUString sID = m_xTabControl->get_page_ident(i); m_xTabControl->remove_page(sID); } @@ -116,12 +116,12 @@ namespace pcr return const_cast<OPropertyEditor*>(this)->getPage(rPageId); } - sal_uInt16 OPropertyEditor::AppendPage(const OUString& rText, const OString& rHelpId) + sal_uInt16 OPropertyEditor::AppendPage(const OUString& rText, const OUString& rHelpId) { // obtain a new id sal_uInt16 nId = m_nNextId++; // insert the id - OString sIdent = OString::number(nId); + OUString sIdent = OUString::number(nId); m_xTabControl->append_page(sIdent, rText); // create a new page @@ -140,7 +140,7 @@ namespace pcr return nId; } - void OPropertyEditor::SetHelpId( const OString& rHelpId ) + void OPropertyEditor::SetHelpId( const OUString& rHelpId ) { m_xTabControl->set_help_id(rHelpId); } @@ -152,13 +152,13 @@ namespace pcr return; m_aShownPages.erase(aPagePos); - OString sIdent(OString::number(nID)); + OUString sIdent(OUString::number(nID)); m_xTabControl->remove_page(sIdent); } void OPropertyEditor::SetPage(sal_uInt16 nId) { - m_xTabControl->set_current_page(OString::number(nId)); + m_xTabControl->set_current_page(OUString::number(nId)); } sal_uInt16 OPropertyEditor::GetCurPage() const @@ -290,7 +290,7 @@ namespace pcr { assert((m_aHiddenPages.find(nPageId) != m_aHiddenPages.end() || m_aShownPages.find(nPageId) != m_aShownPages.end()) && "page doesn't exist"); - OString sIdent(OString::number(nPageId)); + OUString sIdent(OUString::number(nPageId)); if (!bShow) { auto aPagePos = m_aShownPages.find(nPageId); @@ -347,12 +347,12 @@ namespace pcr return xControl; } - IMPL_LINK(OPropertyEditor, OnPageActivate, const OString&, rNewPage, void) + IMPL_LINK(OPropertyEditor, OnPageActivate, const OUString&, rNewPage, void) { m_aPageActivationHandler.Call(rNewPage); } - IMPL_LINK(OPropertyEditor, OnPageDeactivate, const OString&, rIdent, bool) + IMPL_LINK(OPropertyEditor, OnPageDeactivate, const OUString&, rIdent, bool) { // commit the data on the current (to-be-deactivated) tab page // (79404) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index fa0e3a0cd3ab..96199b31af4c 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -57,7 +57,7 @@ namespace pcr IPropertyLineListener* m_pListener; IPropertyControlObserver* m_pObserver; sal_uInt16 m_nNextId; - Link<const OString&,void> m_aPageActivationHandler; + Link<const OUString&,void> m_aPageActivationHandler; bool m_bHasHelpSection; MapStringToPageId m_aPropertyPageIds; @@ -75,8 +75,8 @@ namespace pcr bool HasHelpSection() const { return m_bHasHelpSection; } void SetHelpText( const OUString& _rHelpText ); - void SetHelpId( const OString& sHelpId ); - sal_uInt16 AppendPage( const OUString& r, const OString& _rHelpId ); + void SetHelpId( const OUString& sHelpId ); + sal_uInt16 AppendPage( const OUString& r, const OUString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage() const; @@ -95,7 +95,7 @@ namespace pcr void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); - void setPageActivationHandler(const Link<const OString&,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } + void setPageActivationHandler(const Link<const OUString&,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } Size get_preferred_size() const; @@ -122,8 +122,8 @@ namespace pcr void enableHelpSection( OBrowserPage& _rPage, const void* ); static void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString ); - DECL_LINK(OnPageDeactivate, const OString&, bool); - DECL_LINK(OnPageActivate, const OString&, void); + DECL_LINK(OnPageDeactivate, const OUString&, bool); + DECL_LINK(OnPageActivate, const OUString&, void); }; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index bc0463e8983e..3279581eedd5 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -283,7 +283,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(weld::Window* pParent, const Sequence< Property ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const { - SfxTabPage* pSecurityPage = GetTabPage("security"); + SfxTabPage* pSecurityPage = GetTabPage(u"security"); if (pSecurityPage) { return static_cast<ImpPDFTabSecurityPage*>(pSecurityPage); @@ -293,7 +293,7 @@ ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const ImpPDFTabOpnFtrPage * ImpPDFTabDialog::getOpenPage() const { - SfxTabPage* pOpenPage = GetTabPage("initialview"); + SfxTabPage* pOpenPage = GetTabPage(u"initialview"); if (pOpenPage) { return static_cast<ImpPDFTabOpnFtrPage*>(pOpenPage); @@ -303,7 +303,7 @@ ImpPDFTabOpnFtrPage * ImpPDFTabDialog::getOpenPage() const ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const { - SfxTabPage* pLinksPage = GetTabPage("links"); + SfxTabPage* pLinksPage = GetTabPage(u"links"); if (pLinksPage) { return static_cast<ImpPDFTabLinksPage*>(pLinksPage); @@ -314,7 +314,7 @@ ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const { - SfxTabPage* pGeneralPage = GetTabPage("general"); + SfxTabPage* pGeneralPage = GetTabPage(u"general"); if (pGeneralPage) { return static_cast<ImpPDFTabGeneralPage*>(pGeneralPage); @@ -387,7 +387,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog() maConfigI18N.WriteModifiedConfig(); } -void ImpPDFTabDialog::PageCreated(const OString& rId, SfxTabPage& rPage) +void ImpPDFTabDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) { if (rId == "general") static_cast<ImpPDFTabGeneralPage&>(rPage).SetFilterConfigItem(this); @@ -417,17 +417,17 @@ void ImpPDFTabDialog::PageCreated(const OString& rId, SfxTabPage& rPage) Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() { // updating the FilterData sequence and storing FilterData to configuration - if (ImpPDFTabGeneralPage* pPage = static_cast<ImpPDFTabGeneralPage*>(GetTabPage("general"))) + if (ImpPDFTabGeneralPage* pPage = static_cast<ImpPDFTabGeneralPage*>(GetTabPage(u"general"))) pPage->GetFilterConfigItem(this); - if (ImpPDFTabViewerPage* pPage = static_cast<ImpPDFTabViewerPage*>(GetTabPage("userinterface"))) + if (ImpPDFTabViewerPage* pPage = static_cast<ImpPDFTabViewerPage*>(GetTabPage(u"userinterface"))) pPage->GetFilterConfigItem(this); - if (ImpPDFTabOpnFtrPage* pPage = static_cast<ImpPDFTabOpnFtrPage*>(GetTabPage("initialview"))) + if (ImpPDFTabOpnFtrPage* pPage = static_cast<ImpPDFTabOpnFtrPage*>(GetTabPage(u"initialview"))) pPage->GetFilterConfigItem(this); - if (ImpPDFTabLinksPage* pPage = static_cast<ImpPDFTabLinksPage*>(GetTabPage("links"))) + if (ImpPDFTabLinksPage* pPage = static_cast<ImpPDFTabLinksPage*>(GetTabPage(u"links"))) pPage->GetFilterConfigItem(this); - if (ImpPDFTabSecurityPage* pPage = static_cast<ImpPDFTabSecurityPage*>( GetTabPage("security"))) + if (ImpPDFTabSecurityPage* pPage = static_cast<ImpPDFTabSecurityPage*>( GetTabPage(u"security"))) pPage->GetFilterConfigItem(this); - if (ImpPDFTabSigningPage* pPage = static_cast<ImpPDFTabSigningPage*>(GetTabPage("digitalsignatures"))) + if (ImpPDFTabSigningPage* pPage = static_cast<ImpPDFTabSigningPage*>(GetTabPage(u"digitalsignatures"))) pPage->GetFilterConfigItem(this); // prepare the items to be returned diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index cc6e46430f05..3690c9e61ff9 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -168,7 +168,7 @@ public: ImpPDFTabGeneralPage* getGeneralPage() const; private: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; }; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index d7f9df437656..0c105fd84126 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -68,7 +68,7 @@ bool XMLFilterTabDialog::onOk() mpXSLTPage->FillInfo( mpNewInfo.get() ); mpBasicPage->FillInfo( mpNewInfo.get() ); - OString sErrorPage; + OUString sErrorPage; TranslateId pErrorId; weld::Widget* pFocusWindow = nullptr; OUString aReplace1; diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 764cdba9d8f5..225cef3c7be0 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -44,7 +44,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const override {} virtual void initArgumentInfo() const override {} virtual OUString getSignature() const override { return OUString(); } - virtual OString getHelpId() const override { return ""; } + virtual OUString getHelpId() const override { return ""; } virtual bool isHidden() const override { return false; } virtual sal_uInt32 getParameterCount() const override { return 0; } virtual sal_uInt32 getVarArgsStart() const override { return 0; } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 2e4ffaf512dc..65301ac0450c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -141,9 +141,9 @@ public: const OUString m_aTitle2; FormulaHelper m_aFormulaHelper; - OString m_aEditHelpId; + OUString m_aEditHelpId; - OString m_aOldHelp; + OUString m_aOldHelp; bool m_bMakingTree; // in method of constructing tree bool m_bEditFlag; @@ -869,7 +869,7 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev) m_xFtEditName->set_label( m_pFuncDesc->getFunctionName() ); m_xFtEditName->show(); m_xParaWinBox->show(); - const OString aHelpId = m_pFuncDesc->getHelpId(); + const OUString aHelpId = m_pFuncDesc->getHelpId(); if ( !aHelpId.isEmpty() ) m_xMEdit->set_help_id(aHelpId); } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index d90bf9ca951b..3013b84c06b6 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -194,7 +194,7 @@ IMPL_LINK_NOARG(FuncPage, SelTreeViewHdl, weld::TreeView&, void) const IFunctionDescription* pDesc = GetFuncDesc(GetFunction()); if (pDesc) { - const OString sHelpId = pDesc->getHelpId(); + const OUString sHelpId = pDesc->getHelpId(); if (!sHelpId.isEmpty()) m_xLbFunction->set_help_id(sHelpId); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 6254dfc8a6a7..1e91b610ec0d 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -46,7 +46,7 @@ private: const IFunctionManager* m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - OString m_aHelpId; + OUString m_aHelpId; void impl_addFunctions(const IFunctionCategory* _pCategory); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 1eaba4d1982f..f09c0e51ec01 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -322,7 +322,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); m_xSlider->set_vpolicy(VclPolicyType::NEVER); m_xSlider->set_size_request(-1, -1); - OString sHelpId = pFuncDesc->getHelpId(); + OUString sHelpId = pFuncDesc->getHelpId(); m_xContainer->set_help_id(sHelpId); m_xEdArg1->GetWidget()->set_help_id(sHelpId); m_xEdArg2->GetWidget()->set_help_id(sHelpId); diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 3d06627dac24..62407da93252 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -182,20 +182,19 @@ namespace svt if (aHID.GetProtocol() == INetProtocol::Hid) sHelpID = aHID.GetURLPath(); - // URLs should always be UTF8 encoded and escaped - OString sID( OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) ); + // URLs should always be escaped if (IsFileViewWidget(pControl)) { // the file view "overrides" the SetHelpId - m_pFileView->set_help_id(sID); + m_pFileView->set_help_id(sHelpID); } else - pControl->set_help_id(sID); + pControl->set_help_id(sHelpID); } OUString OControlAccess::getHelpURL(weld::Widget const * pControl) const { - OString aHelpId = pControl->get_help_id(); + OUString aHelpId = pControl->get_help_id(); if (IsFileViewWidget(pControl)) { // the file view "overrides" the SetHelpId @@ -203,11 +202,10 @@ namespace svt } OUString sHelpURL; - OUString aTmp( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); - INetURLObject aHID( aTmp ); + INetURLObject aHID(aHelpId); if ( aHID.GetProtocol() == INetProtocol::NotValid ) sHelpURL = INET_HID_SCHEME; - sHelpURL += aTmp; + sHelpURL += aHelpId; return sHelpURL; } diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index ed3a0798e9e7..934126072d53 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -52,7 +52,7 @@ public: void SetDelEnabled( bool enabled ); void updateView( ); - void set_help_id(const OString& rHelpId) { mxImpl->set_help_id(rHelpId); } + void set_help_id(const OUString& rHelpId) { mxImpl->set_help_id(rHelpId); } private: diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index adaf756d3d8e..ae03c2774f38 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -124,7 +124,7 @@ RemoteFilesDialog::~RemoteFilesDialog() if( !m_sIniKey.isEmpty() ) { SvtViewOptions aDlgOpt( EViewType::Dialog, m_sIniKey ); - aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_UTF8)); + aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::All)); Size aSize(m_xDialog->get_size()); @@ -236,7 +236,7 @@ void RemoteFilesDialog::InitSize() if( !aDlgOpt.Exists() ) return; - m_xDialog->set_window_state(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_UTF8)); + m_xDialog->set_window_state(aDlgOpt.GetWindowState()); Any aUserData = aDlgOpt.GetUserItem( "UserData" ); OUString sCfgStr; @@ -566,9 +566,9 @@ IMPL_LINK_NOARG( RemoteFilesDialog, SelectServiceHdl, weld::ComboBox&, void ) } } -IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, const OString&, rIdent, void ) +IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, const OUString&, rIdent, void ) { - OString sIdent(rIdent); + OUString sIdent(rIdent); if( sIdent == "edit_service" && m_xServices_lb->get_count() > 0 ) { int nSelected = m_xServices_lb->get_active(); diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 3dfb4e1dc9aa..8c4fa0a4cbb3 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -161,7 +161,7 @@ private: void AddService(); DECL_LINK ( SelectServiceHdl, weld::ComboBox&, void ); - DECL_LINK ( EditServiceMenuHdl, const OString&, void ); + DECL_LINK ( EditServiceMenuHdl, const OUString&, void ); DECL_LINK( DoubleClickHdl, SvtFileView*, bool ); DECL_LINK( SelectHdl, SvtFileView*, void ); diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index ac8ea43b55cd..2568779b6bfe 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -193,8 +193,8 @@ public: void grab_focus() { mxTreeView->grab_focus(); } bool has_focus() const { return mxTreeView->has_focus(); } - void set_help_id(const OString& rHelpId) { mxTreeView->set_help_id(rHelpId); } - OString get_help_id() const { return mxTreeView->get_help_id(); } + void set_help_id(const OUString& rHelpId) { mxTreeView->set_help_id(rHelpId); } + OUString get_help_id() const { return mxTreeView->get_help_id(); } bool IsEditingActive() const { return mbEditing; } @@ -229,7 +229,7 @@ public: DECL_LINK(EditedEntryHdl, const IterString&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - void ExecuteContextMenuAction(std::string_view rSelectedPopentry); + void ExecuteContextMenuAction(std::u16string_view rSelectedPopentry); }; } @@ -570,18 +570,18 @@ IMPL_LINK(ViewTabListBox_Impl, CommandHdl, const CommandEvent&, rCEvt, bool) auto xContextMenu = xBuilder->weld_menu("menu"); xContextMenu->set_visible("delete", bEnableDelete); xContextMenu->set_visible("rename", bEnableRename); - OString sCommand(xContextMenu->popup_at_rect(mxTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); + OUString sCommand(xContextMenu->popup_at_rect(mxTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); ExecuteContextMenuAction(sCommand); } return true; } -void ViewTabListBox_Impl::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry) +void ViewTabListBox_Impl::ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry) { - if (rSelectedPopupEntry == "delete") + if (rSelectedPopupEntry == u"delete") DeleteEntries(); - else if (rSelectedPopupEntry == "rename") + else if (rSelectedPopupEntry == u"rename") { std::unique_ptr<weld::TreeIter> xEntry = mxTreeView->make_iterator(); if (mxTreeView->get_selected(xEntry.get())) @@ -914,12 +914,12 @@ bool SvtFileView::GetParentURL( OUString& rParentURL ) const return bRet; } -OString SvtFileView::get_help_id() const +OUString SvtFileView::get_help_id() const { return mpImpl->mxView->get_help_id(); } -void SvtFileView::set_help_id(const OString& rHelpId) +void SvtFileView::set_help_id(const OUString& rHelpId) { mpImpl->mxView->set_help_id(rHelpId); } diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index e2f132029de9..a19c2095507f 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -82,8 +82,8 @@ public: bool GetParentURL( OUString& _rParentURL ) const; void CreatedFolder( const OUString& rUrl, const OUString& rNewFolder ); - void set_help_id(const OString& rHelpId); - OString get_help_id() const; + void set_help_id(const OUString& rHelpId); + OUString get_help_id() const; void grab_focus(); bool has_focus() const; diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx index 20ab362971f4..f0ab32184a7e 100644 --- a/fpicker/source/office/fpdialogbase.hxx +++ b/fpicker/source/office/fpdialogbase.hxx @@ -59,7 +59,7 @@ inline constexpr OUStringLiteral FILEDIALOG_FILTER_ALL = u"*.*"; class SvtFileDialog_Base : public weld::GenericDialogController, public ::svt::IFilePickerController { public: - SvtFileDialog_Base(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) + SvtFileDialog_Base(weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID) : weld::GenericDialogController(pParent, rUIXMLDescription, rID) { } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index a023cd2c0d21..0536a87d411a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -467,7 +467,7 @@ SvtFileDialog::~SvtFileDialog() { // save window state SvtViewOptions aDlgOpt( EViewType::Dialog, m_xImpl->m_aIniKey ); - aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_UTF8)); + aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::All)); OUString sUserData = m_xFileView->GetConfigString(); aDlgOpt.SetUserItem( "UserData", Any( sUserData ) ); @@ -1783,7 +1783,7 @@ void SvtFileDialog::InitSize() if ( aDlgOpt.Exists() ) { - m_xDialog->set_window_state(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_UTF8)); + m_xDialog->set_window_state(aDlgOpt.GetWindowState()); Any aUserData = aDlgOpt.GetUserItem( "UserData"); OUString sCfgStr; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index e9e8e00491fa..5b2a67e38de5 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -101,7 +101,7 @@ void SvtUpButton_Impl::FillURLMenu() } } -IMPL_LINK(SvtUpButton_Impl, SelectHdl, const OString&, rId, void) +IMPL_LINK(SvtUpButton_Impl, SelectHdl, const OUString&, rId, void) { sal_uInt32 nId = rId.toUInt32(); if (nId) @@ -113,7 +113,7 @@ IMPL_LINK(SvtUpButton_Impl, SelectHdl, const OString&, rId, void) } } -IMPL_LINK_NOARG(SvtUpButton_Impl, ClickHdl, const OString&, void) +IMPL_LINK_NOARG(SvtUpButton_Impl, ClickHdl, const OUString&, void) { m_pDlg->PrevLevel_Impl(); } diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index caac91793c59..3a02dbbee641 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -86,7 +86,7 @@ public: std::unique_ptr<weld::Menu> xMenu, SvtFileDialog* pDlg); - void set_help_id(const OString& rHelpId) { m_xToolbar->set_help_id(rHelpId); } + void set_help_id(const OUString& rHelpId) { m_xToolbar->set_help_id(rHelpId); } void show() { m_xToolbar->show(); } void FillURLMenu(); @@ -95,8 +95,8 @@ public: private: - DECL_LINK(SelectHdl, const OString&, void); - DECL_LINK(ClickHdl, const OString&, void); + DECL_LINK(SelectHdl, const OUString&, void); + DECL_LINK(ClickHdl, const OUString&, void); }; class SvtURLBox; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index debd898c9b45..dc80fbcfa835 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -82,7 +82,7 @@ public: virtual bool IsItemVisible(ToolBoxItemId nId, const OUString& rCommandURL) = 0; virtual void Clear() = 0; virtual void SetName(const OUString& rName) = 0; - virtual void SetHelpId(const OString& rHelpId) = 0; + virtual void SetHelpId(const OUString& rHelpId) = 0; virtual bool WillUsePopupMode() = 0; virtual bool IsReallyVisible() = 0; virtual void SetIconSize(ToolBoxButtonSize eSize) = 0; diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 423a157f8be8..db6a7435ac14 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -124,9 +124,9 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, { nInsSepAfterPos += ( pHelpMenu->GetItemCount() - nItemCount ); if ( pHelpMenu->GetItemType( nInsSepAfterPos ) != MenuItemType::SEPARATOR ) - pHelpMenu->InsertSeparator(OString(), nInsSepAfterPos); + pHelpMenu->InsertSeparator({}, nInsSepAfterPos); } - pHelpMenu->InsertSeparator(OString(), nItemCount); + pHelpMenu->InsertSeparator({}, nItemCount); } } @@ -171,7 +171,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, if ( pAddonPopupMenu->GetItemCount() > 0 ) { - pMergeMenuBar->InsertItem( nId, aTitle, MenuItemBits::NONE, OString(), nInsertPos++ ); + pMergeMenuBar->InsertItem( nId, aTitle, MenuItemBits::NONE, {}, nInsertPos++); pMergeMenuBar->SetPopupMenu( nId, pAddonPopupMenu ); // Store the command URL into the VCL menu bar for later identification @@ -233,12 +233,12 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent // have already one before us nElements = 0; bInsertSeparator = false; - pCurrentMenu->InsertSeparator(OString(), nInsPos); + pCurrentMenu->InsertSeparator({}, nInsPos); nInsPos = AddonMenuManager::GetNextPos( nInsPos ); } sal_uInt16 nId = nUniqueMenuId++; - pCurrentMenu->InsertItem(nId, aTitle, MenuItemBits::NONE, OString(), nInsPos); + pCurrentMenu->InsertItem(nId, aTitle, MenuItemBits::NONE, {}, nInsPos); nInsPos = AddonMenuManager::GetNextPos( nInsPos ); ++nElements; diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 103a4bda7b57..995812dd4693 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -216,9 +216,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: if ( pWindow && pWindow->IsSystemWindow() ) { vcl::WindowDataMask const nMask = vcl::WindowDataMask::All & ~vcl::WindowDataMask::Minimized; - sWindowState = OStringToOUString( - static_cast<SystemWindow*>(pWindow.get())->GetWindowState(nMask), - RTL_TEXTENCODING_UTF8); + sWindowState = static_cast<SystemWindow*>(pWindow.get())->GetWindowState(nMask); } // <- SOLAR SAFE ------------------------ } @@ -256,9 +254,9 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere if (pWorkWindow->IsMinimized()) return; - OUString sOldWindowState = OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US ); + OUString sOldWindowState = pSystemWindow->GetWindowState(); if ( sOldWindowState != sWindowState ) - pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); + pSystemWindow->SetWindowState(sWindowState); // <- SOLAR SAFE ------------------------ } diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 1a67042bc46c..ccce1b3e8673 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -89,7 +89,7 @@ OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow ) ToolBox* pToolBox = dynamic_cast<ToolBox *>( pWindow ); if ( pToolBox ) { - aToolbarName = OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); + aToolbarName = pToolBox->GetHelpId(); sal_Int32 i = aToolbarName.lastIndexOf( ':' ); if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() )) aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index a01bc50fe582..0d56944a3b17 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1795,7 +1795,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw return; SystemWindow* pSystemWindow = static_cast<SystemWindow*>(pWindowCheck.get()); - pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); + pSystemWindow->SetWindowState(sWindowState); // <- SOLAR SAFE } } diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 1f974e77cd54..c05651664961 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -68,7 +68,7 @@ EditControl::EditControl(vcl::Window* pParent, EditToolbarController* pEditToolb , m_xWidget(m_xBuilder->weld_entry("entry")) , m_pEditToolbarController(pEditToolbarController) { - OString sEmpty; + OUString sEmpty; m_xWidget->set_help_id(sEmpty); m_xContainer->set_help_id(sEmpty); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 1fd8998f0460..827991f7226d 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -184,9 +184,7 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) if ( m_pToolbar ) { - OString sId = m_aCommandURL.toUtf8(); - - m_pToolbar->set_item_sensitive(sId, Event.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, Event.IsEnabled); bool bValue; OUString aStrValue; @@ -195,21 +193,21 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) if ( Event.State >>= bValue ) { // Boolean, treat it as checked/unchecked - m_pToolbar->set_item_active(sId, bValue); + m_pToolbar->set_item_active(m_aCommandURL, bValue); } else if ( Event.State >>= aStrValue ) { - m_pToolbar->set_item_label(sId, aStrValue); + m_pToolbar->set_item_label(m_aCommandURL, aStrValue); } else if ( aImageItem.PutValue( Event.State, 0 ) && aImageItem.IsMirrored() != m_bMirrored ) { - m_pToolbar->set_item_image_mirrored(sId, aImageItem.IsMirrored()); + m_pToolbar->set_item_image_mirrored(m_aCommandURL, aImageItem.IsMirrored()); auto xGraphic(vcl::CommandInfoProvider::GetXGraphicForCommand(m_aCommandURL, m_xFrame, m_pToolbar->get_icon_size())); - m_pToolbar->set_item_image(sId, xGraphic); + m_pToolbar->set_item_image(m_aCommandURL, xGraphic); m_bMirrored = !m_bMirrored; } else - m_pToolbar->set_item_active(sId, false); + m_pToolbar->set_item_active(m_aCommandURL, false); return; } @@ -394,12 +392,12 @@ void ImageOrientationController::statusChanged(const css::frame::FeatureStateEve { for (int i = 0, nCount = m_pToolbar->get_n_items(); i < nCount; ++i) { - OString aCommand = m_pToolbar->get_item_ident(i); - if (vcl::CommandInfoProvider::IsMirrored(OUString::fromUtf8(aCommand), getModuleName())) + OUString aCommand = m_pToolbar->get_item_ident(i); + if (vcl::CommandInfoProvider::IsMirrored(aCommand, getModuleName())) { m_pToolbar->set_item_image_mirrored(aCommand, m_bMirrored); auto xGraphic(vcl::CommandInfoProvider::GetXGraphicForCommand( - OUString::fromUtf8(aCommand), m_xFrame, m_pToolbar->get_icon_size())); + aCommand, m_xFrame, m_pToolbar->get_icon_size())); m_pToolbar->set_item_image(aCommand, xGraphic); } } diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index c5730d2ef3e9..eebf61aa7383 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -216,11 +216,11 @@ bool MenuBarMerger::MergeMenuItems( { if ( rMenuItem.aURL == SEPARATOR_STRING ) { - pMenu->InsertSeparator(OString(), nPos+nModIndex+nIndex); + pMenu->InsertSeparator({}, nPos + nModIndex + nIndex); } else { - pMenu->InsertItem(nItemId, rMenuItem.aTitle, MenuItemBits::NONE, OString(), nPos+nModIndex+nIndex); + pMenu->InsertItem(nItemId, rMenuItem.aTitle, MenuItemBits::NONE, {}, nPos + nModIndex + nIndex); pMenu->SetItemCommand( nItemId, rMenuItem.aURL ); if ( !rMenuItem.aSubMenu.empty() ) { diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 88c5f0292722..b04b9609e709 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -499,7 +499,7 @@ void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any > if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } updateImage(); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 723afeb09977..85fad251be05 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -287,7 +287,7 @@ public: m_pToolBar->SetText( rName ); } - virtual void SetHelpId(const OString& rHelpId) override + virtual void SetHelpId(const OUString& rHelpId) override { m_pToolBar->SetHelpId( rHelpId ); } @@ -383,8 +383,8 @@ IMPL_LINK_NOARG(VclToolBarManager, Click, ToolBox*, void) class WeldToolBarManager : public ToolBarManagerImpl { - DECL_LINK(Click, const OString&, void); - DECL_LINK(ToggleMenuHdl, const OString&, void); + DECL_LINK(Click, const OUString&, void); + DECL_LINK(ToggleMenuHdl, const OUString&, void); public: WeldToolBarManager(weld::Toolbar* pToolbar, @@ -417,16 +417,15 @@ public: const OUString& rLabel, ToolBoxItemBits /*nItemBits*/) override { - OString sId = OUStringToOString(rCommandURL, RTL_TEXTENCODING_UTF8); - m_aCommandToId[sId] = nId; - m_aIdToCommand[nId] = sId; - m_aCommandOrder.push_back(sId); + m_aCommandToId[rCommandURL] = nId; + m_aIdToCommand[nId] = rCommandURL; + m_aCommandOrder.push_back(rCommandURL); m_pWeldedToolBar->insert_item(m_aCommandOrder.size(), rCommandURL); - m_pWeldedToolBar->set_item_tooltip_text(sId, rTooltip); - m_pWeldedToolBar->set_item_label( sId, rLabel ); - m_pWeldedToolBar->set_item_sensitive( sId, true ); - m_pWeldedToolBar->set_item_active( sId, false ); + m_pWeldedToolBar->set_item_tooltip_text(rCommandURL, rTooltip); + m_pWeldedToolBar->set_item_label(rCommandURL, rLabel); + m_pWeldedToolBar->set_item_sensitive(rCommandURL, true); + m_pWeldedToolBar->set_item_active(rCommandURL, false); } virtual void InsertSeparator() override @@ -450,7 +449,7 @@ public: virtual OUString GetItemCommand(ToolBoxItemId nId) override { - return OStringToOUString(m_aIdToCommand[nId], RTL_TEXTENCODING_UTF8); + return m_aIdToCommand[nId]; } virtual sal_uInt16 GetItemCount() override @@ -462,21 +461,19 @@ public: virtual void HideItem(ToolBoxItemId /*nId*/, const OUString& rCommandURL) override { - OString sId = OUStringToOString(rCommandURL, RTL_TEXTENCODING_UTF8); - m_pWeldedToolBar->set_item_visible(sId, false); + m_pWeldedToolBar->set_item_visible(rCommandURL, false); } virtual bool IsItemVisible(ToolBoxItemId /*nId*/, const OUString& rCommandURL) override { - OString sId = OUStringToOString(rCommandURL, RTL_TEXTENCODING_UTF8); - return m_pWeldedToolBar->get_item_visible(sId); + return m_pWeldedToolBar->get_item_visible(rCommandURL); } virtual void Clear() override {} virtual void SetName(const OUString& /*rName*/) override {} - virtual void SetHelpId(const OString& /*rHelpId*/) override {} + virtual void SetHelpId(const OUString& /*rHelpId*/) override {} virtual bool WillUsePopupMode() override { return true; } @@ -501,8 +498,7 @@ public: const OUString& rCommandURL, const Image& rImage) override { - OString sId = OUStringToOString(rCommandURL, RTL_TEXTENCODING_UTF8); - m_pWeldedToolBar->set_item_image(sId, Graphic(rImage).GetXGraphic()); + m_pWeldedToolBar->set_item_image(rCommandURL, Graphic(rImage).GetXGraphic()); } virtual void UpdateSize() override {} @@ -514,18 +510,18 @@ private: weld::Builder* m_pBuilder; ToolBarManager* m_pManager; ToolBoxItemId m_nCurrentId; - std::map<const OString, ToolBoxItemId> m_aCommandToId; - std::map<ToolBoxItemId, OString> m_aIdToCommand; - std::vector<OString> m_aCommandOrder; + std::map<const OUString, ToolBoxItemId> m_aCommandToId; + std::map<ToolBoxItemId, OUString> m_aIdToCommand; + std::vector<OUString> m_aCommandOrder; }; -IMPL_LINK(WeldToolBarManager, Click, const OString&, rCommand, void) +IMPL_LINK(WeldToolBarManager, Click, const OUString&, rCommand, void) { m_nCurrentId = m_aCommandToId[rCommand]; m_pManager->OnClick(true); } -IMPL_LINK(WeldToolBarManager, ToggleMenuHdl, const OString&, rCommand, void) +IMPL_LINK(WeldToolBarManager, ToggleMenuHdl, const OUString&, rCommand, void) { m_nCurrentId = m_aCommandToId[rCommand]; m_pManager->OnDropdownClick(false); @@ -607,7 +603,7 @@ void ToolBarManager::Init() sal_Int32 idx = m_aResourceName.lastIndexOf('/'); idx++; // will become 0 if '/' not found: use full string std::u16string_view aToolbarName = m_aResourceName.subView( idx ); - OString aHelpIdAsString = ".HelpId:" + OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 ); + OUString aHelpIdAsString = ".HelpId:" + OUString::Concat(aToolbarName); m_pImpl->SetHelpId( aHelpIdAsString ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx index 38299e0faf60..7d687dfa61e5 100644 --- a/include/avmedia/MediaControlBase.hxx +++ b/include/avmedia/MediaControlBase.hxx @@ -63,7 +63,7 @@ protected: void UpdateTimeSlider( MediaItem const & aMediaItem ); void UpdateTimeField( MediaItem const & aMediaItem, double fTime ); void UpdatePlayState(const MediaItem& rMediaItem); - void SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem const & aItem, std::string_view rId); + void SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem const & aItem, std::u16string_view rId); void disposeWidgets(); }; diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index 28f293704364..121456b600cc 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -92,7 +92,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const = 0; virtual void initArgumentInfo() const = 0; virtual OUString getSignature() const = 0; - virtual OString getHelpId() const = 0; + virtual OUString getHelpId() const = 0; virtual bool isHidden() const = 0; // parameter diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index b753569efce6..9b74669b3f33 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -39,7 +39,7 @@ private: DECL_DLLPRIVATE_LINK(FocusChangeHdl, weld::Container&, void); public: - SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const OString& rDialogId); + SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const OUString& rDialogId); // dialog gets focus virtual void Activate() {} // dialog loses focus @@ -65,7 +65,7 @@ class SFX2_DLLPUBLIC SfxModelessDialogController : public SfxDialogController protected: SfxModelessDialogController(SfxBindings*, SfxChildWindow* pChildWin, - weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID); + weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID); public: virtual ~SfxModelessDialogController() override; @@ -87,7 +87,7 @@ class SFX2_DLLPUBLIC SfxOkDialogController : public SfxDialogController { public: SfxOkDialogController(weld::Widget* pParent, const OUString& rUIXMLDescription, - const OString& rID) + const OUString& rID) : SfxDialogController(pParent, rUIXMLDescription, rID) { } @@ -105,7 +105,7 @@ private: public: SfxSingleTabDialogController(weld::Widget* pParent, const SfxItemSet* pOptionsSet, const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"), - const OString& rID = OString("SingleTabDialog")); + const OUString& rID = OUString("SingleTabDialog")); weld::Container* get_content_area() { return m_xContainer.get(); } diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index f4118d44ceb6..bc482af2514f 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -64,7 +64,7 @@ public: void setClearClickHdl(const Link<SvxCharView*,void> &rLink); void setClearAllClickHdl(const Link<SvxCharView*,void> &rLink); - void ContextMenuSelect(std::string_view rIdent); + void ContextMenuSelect(std::u16string_view rIdent); }; #endif diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 68ad6ff509f9..57c2369233ef 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -62,7 +62,7 @@ struct SAL_DLLPUBLIC_RTTI SfxChildWinInfo { OUString aExtraString; OUString aModule; - OString aWinState; + OUString aWinState; Point aPos; Size aSize; SfxChildWindowFlags nFlags; diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx index 4da9fccd965c..de576e797ae1 100644 --- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx +++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx @@ -48,7 +48,7 @@ private: ObjectInspectorTreeHandler maObjectInspectorTreeHandler; DECL_DLLPRIVATE_LINK(DocumentModelTreeViewSelectionHandler, weld::TreeView&, void); - DECL_DLLPRIVATE_LINK(DomToolbarButtonClicked, const OString&, void); + DECL_DLLPRIVATE_LINK(DomToolbarButtonClicked, const OUString&, void); void updateSelection(); diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx index b6fa678de366..f4d460a2bf99 100644 --- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx +++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx @@ -84,12 +84,12 @@ public: DECL_LINK(PopupMenuHandler, const CommandEvent&, bool); // callback when a button is clicked on a toolbar - DECL_LINK(ToolbarButtonClicked, const OString&, void); + DECL_LINK(ToolbarButtonClicked, const OUString&, void); // callback when a page is entered or left on the notebook bar for // different categories - DECL_LINK(NotebookEnterPage, const OString&, void); - DECL_LINK(NotebookLeavePage, const OString&, bool); + DECL_LINK(NotebookEnterPage, const OUString&, void); + DECL_LINK(NotebookLeavePage, const OUString&, bool); DECL_LINK(HeaderBarClick, int, void); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 4d7487f554f4..81692a2fc96f 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -232,7 +232,7 @@ public: class SFX2_DLLPUBLIC SfxDocumentInfoDialog final : public SfxTabDialogController { - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: SfxDocumentInfoDialog(weld::Window* pParent, const SfxItemSet&); diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 886f4ae11f86..4054770002c9 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -81,7 +81,7 @@ public: SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent, - const OString& rID, const OUString& rUIXMLDescription ); + const OUString& rID, const OUString& rUIXMLDescription ); virtual ~SfxDockingWindow() override; virtual void dispose() override; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 4f3737eadf3f..675a8fb0182d 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -104,7 +104,7 @@ public: void SetCommandHandler(weld::Button& rBtn, const OUString& aCommand); private: - DECL_DLLPRIVATE_LINK(CloseHandler, const OString&, void); + DECL_DLLPRIVATE_LINK(CloseHandler, const OUString&, void); }; class SfxInfoBarContainerWindow final : public vcl::Window diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index e628e572c6f4..7962fba85b0b 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -202,10 +202,31 @@ public: SfxDisableFlags nDisableFlags; // DisableFlags that need to be // present, so that the Slot // can be enabled - const char* pUnoName; // UnoName for the Slots + OUString pUnoName; // UnoName for the Slots public: + template <size_t N> + SfxSlot(sal_uInt16 sId, SfxGroupId gId, SfxSlotMode flags, sal_uInt16 masterSlotId, + sal_uInt16 value, SfxExecFunc exec, SfxStateFunc state, const SfxType* type, + const SfxSlot* nextSlot, const SfxFormalArgument* firstArgDef, sal_uInt16 argDefCount, + SfxDisableFlags disableFlags, const char (&literal)[N]) + : nSlotId(sId) + , nGroupId(gId) + , nFlags(flags) + , nMasterSlotId(masterSlotId) + , nValue(value) + , fnExec(exec) + , fnState(state) + , pType(type) + , pNextSlot(nextSlot) + , pFirstArgDef(firstArgDef) + , nArgDefCount(argDefCount) + , nDisableFlags(disableFlags) + , pUnoName(literal) + { + } + SfxSlotKind GetKind() const; sal_uInt16 GetSlotId() const; SfxSlotMode GetMode() const; @@ -213,9 +234,8 @@ public: SfxGroupId GetGroupId() const; sal_uInt16 GetWhich( const SfxItemPool &rPool ) const; const SfxType* GetType() const { return pType; } - const char* GetUnoName() const { return pUnoName; } - SFX2_DLLPUBLIC OString GetCommand() const; - SFX2_DLLPUBLIC OUString GetCommandString() const; + const OUString& GetUnoName() const { return pUnoName; } + SFX2_DLLPUBLIC OUString GetCommand() const; sal_uInt16 GetFormalArgumentCount() const { return nArgDefCount; } const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 17205a5d4933..98c70787ca0e 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -105,13 +105,13 @@ public: m_xPassword2Box->set_label(i_rText); } void SetMinLen(sal_uInt16 Len); - void SetEditHelpId(const OString& rId) + void SetEditHelpId(const OUString& rId) { m_xPassword1ED->set_help_id(rId); } /* tdf#60874 we need a custom help ID for the Confirm field of the Protect Document window */ - void SetConfirmHelpId(const OString& rId) + void SetConfirmHelpId(const OUString& rId) { m_xConfirm1ED->set_help_id(rId); } diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 2fca42eef290..62e2f8013c3e 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -61,7 +61,7 @@ class SfxAbstractTabDialog : virtual public SfxAbstractDialog protected: virtual ~SfxAbstractTabDialog() override = default; public: - virtual void SetCurPageId( const OString &rName ) = 0; + virtual void SetCurPageId( const OUString &rName ) = 0; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& ) = 0; virtual void SetInputSet( const SfxItemSet* pInSet ) = 0; }; diff --git a/include/sfx2/sidebar/PanelLayout.hxx b/include/sfx2/sidebar/PanelLayout.hxx index 301159362437..3058c9d514dd 100644 --- a/include/sfx2/sidebar/PanelLayout.hxx +++ b/include/sfx2/sidebar/PanelLayout.hxx @@ -35,7 +35,7 @@ private: DECL_DLLPRIVATE_LINK(DumpAsPropertyTreeHdl, tools::JsonWriter&, void); public: - PanelLayout(weld::Widget* pParent, const OString& rID, const OUString& rUIXMLDescription); + PanelLayout(weld::Widget* pParent, const OUString& rID, const OUString& rUIXMLDescription); void SetPanel(sfx2::sidebar::Panel* pPanel); diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 208af98b2fc2..06e092bceec8 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -259,8 +259,8 @@ private: weld::Menu& rMainButton, weld::Menu& rSubMenu, const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; - DECL_DLLPRIVATE_LINK(OnMenuItemSelected, const OString&, void); - DECL_DLLPRIVATE_LINK(OnSubMenuItemSelected, const OString&, void); + DECL_DLLPRIVATE_LINK(OnMenuItemSelected, const OUString&, void); + DECL_DLLPRIVATE_LINK(OnSubMenuItemSelected, const OUString&, void); void BroadcastPropertyChange(); /** The close of the deck changes the width of the child window. diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 30da7852706f..6ef0fc9c3ddd 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -109,7 +109,7 @@ private: public: Item(TabBar& rTabBar); ~Item(); - DECL_LINK(HandleClick, const OString&, void); + DECL_LINK(HandleClick, const OUString&, void); std::unique_ptr<weld::Toolbar> mxButton; OUString msDeckId; ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor; diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 6fd7afde1f85..0cfd39a233a1 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -35,7 +35,7 @@ private: public: SfxStyleDialogController(weld::Window* pParent, - const OUString& rUIXMLDescription, const OString& rID, SfxStyleSheetBase&); + const OUString& rUIXMLDescription, const OUString& rID, SfxStyleSheetBase&); virtual ~SfxStyleDialogController() override; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 4cb77ccf5cf4..29f2bd600fe2 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -78,12 +78,12 @@ private: std::unique_ptr<SfxItemSet> m_pOutSet; std::unique_ptr<TabDlg_Impl> m_pImpl; WhichRangesContainer m_pRanges; - OString m_sAppPageId; + OUString m_sAppPageId; bool m_bStandardPushed; std::unique_ptr<SfxAllItemSet> m_xItemSet; - DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OString&, void); - DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool); + DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OUString&, void); + DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OUString&, bool); SAL_DLLPRIVATE void Start_Impl(); SAL_DLLPRIVATE void CreatePages(); SAL_DLLPRIVATE void setPreviewsToSamePlace(); @@ -91,15 +91,15 @@ private: protected: virtual short Ok(); virtual void RefreshInputSet(); - virtual SfxItemSet* CreateInputItemSet(const OString& rName); - virtual void PageCreated(const OString &rName, SfxTabPage &rPage); + virtual SfxItemSet* CreateInputItemSet(const OUString& rName); + virtual void PageCreated(const OUString &rName, SfxTabPage &rPage); - virtual void ActivatePage(const OString& rPage); - bool DeactivatePage(std::string_view aPage); + virtual void ActivatePage(const OUString& rPage); + bool DeactivatePage(std::u16string_view aPage); std::unique_ptr<SfxItemSet> m_xExampleSet; SfxItemSet* GetInputSetImpl(); - SfxTabPage* GetTabPage(std::string_view rPageId) const; + SfxTabPage* GetTabPage(std::u16string_view rPageId) const; /** prepare to leave the current page. Calls the DeactivatePage method of the current page, (if necessary), handles the item sets to copy. @@ -111,30 +111,30 @@ protected: */ void SavePosAndId(); public: - SfxTabDialogController(weld::Widget* pParent, const OUString& rUIXMLDescription, const OString& rID, + SfxTabDialogController(weld::Widget* pParent, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet * = nullptr, bool bEditFmt = false); virtual ~SfxTabDialogController() override; - void AddTabPage(const OString& rName, // Name of the label for the existing page in the notebook .ui + void AddTabPage(const OUString& rName, // Name of the label for the existing page in the notebook .ui CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc); // can be 0 - void AddTabPage(const OString& rName, // Name of the label for the existing page in the notebook .ui + void AddTabPage(const OUString& rName, // Name of the label for the existing page in the notebook .ui sal_uInt16 nPageCreateId); // Identifier of the Factory Method to create the page - void AddTabPage(const OString& rName, // Name of the label for the new page to create + void AddTabPage(const OUString& rName, // Name of the label for the new page to create const OUString& rLabel, // UI Label for the new page to create CreateTabPage pCreateFunc); // != 0 - void AddTabPage(const OString& rName, // Name of the label for the new page to create + void AddTabPage(const OUString& rName, // Name of the label for the new page to create const OUString& rLabel, // UI Label for the new page to create sal_uInt16 nPageCreateId); // Identifier of the Factory Method to create the page - void RemoveTabPage( const OString& rName ); // Name of the label for the page in the notebook .ui + void RemoveTabPage( const OUString& rName ); // Name of the label for the page in the notebook .ui - void SetCurPageId(const OString& rName); - void ShowPage(const OString& rName); // SetCurPageId + call Activate on it - OString GetCurPageId() const; + void SetCurPageId(const OUString& rName); + void ShowPage(const OUString& rName); // SetCurPageId + call Activate on it + OUString GetCurPageId() const; SfxTabPage* GetCurTabPage() const { return GetTabPage(GetCurPageId()); } // may provide local slots converted by Map @@ -164,10 +164,10 @@ public: void Applied() { m_xExampleSet->Put(*GetInputSetImpl()); } //screenshotting - std::vector<OString> getAllPageUIXMLDescriptions() const; - bool selectPageByUIXMLDescription(const OString& rUIXMLDescription); + std::vector<OUString> getAllPageUIXMLDescriptions() const; + bool selectPageByUIXMLDescription(const OUString& rUIXMLDescription); BitmapEx createScreenshot() const; - OString GetScreenshotId() const; + OUString GetScreenshotId() const; }; enum class DeactivateRC { @@ -191,12 +191,12 @@ private: const SfxItemSet* pSet; OUString aUserString; bool bHasExchangeSupport; - std::unordered_map<OString, css::uno::Any> maAdditionalProperties; + std::unordered_map<OUString, css::uno::Any> maAdditionalProperties; std::unique_ptr< TabPageImpl > pImpl; protected: - SfxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet); + SfxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet *rAttrSet); sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const { return pSet->GetPool()->GetWhich( nSlot, bDeep ); } @@ -255,13 +255,13 @@ public: const SfxItemSet* GetDialogExampleSet() const; - OString GetHelpId() const; - OString GetConfigId() const { return GetHelpId(); } + OUString GetHelpId() const; + OUString GetConfigId() const { return GetHelpId(); } bool IsVisible() const { return m_xContainer->get_visible(); } weld::Window* GetFrameWeld() const; - std::unordered_map<OString, css::uno::Any>& getAdditionalProperties() + std::unordered_map<OUString, css::uno::Any>& getAdditionalProperties() { return maAdditionalProperties; } diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 49d559152563..5aea4ec82a6f 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -65,8 +65,8 @@ protected: DECL_DLLPRIVATE_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); - DECL_DLLPRIVATE_LINK(MenuSelectHdl, const OString&, void); - void DefaultTemplateMenuSelectHdl(std::string_view rIdent); + DECL_DLLPRIVATE_LINK(MenuSelectHdl, const OUString&, void); + void DefaultTemplateMenuSelectHdl(std::u16string_view rIdent); DECL_DLLPRIVATE_LINK(OpenRegionHdl, void*, void); DECL_DLLPRIVATE_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); diff --git a/include/sfx2/templatedlglocalview.hxx b/include/sfx2/templatedlglocalview.hxx index 65b77ead1c9a..2d035c2cfec3 100644 --- a/include/sfx2/templatedlglocalview.hxx +++ b/include/sfx2/templatedlglocalview.hxx @@ -50,7 +50,7 @@ public: bool bShowCategoryInTooltip); private: - void ContextMenuSelectHdl(std::string_view rIdent); + void ContextMenuSelectHdl(std::u16string_view rIdent); void insertFilteredItems(); diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 020ad2ba37e6..9d44e54d7cf4 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -85,7 +85,7 @@ public: void showRegion (TemplateContainerItem const *pItem); - void ContextMenuSelectHdl(std::string_view rIdent); + void ContextMenuSelectHdl(std::u16string_view rIdent); TemplateContainerItem* getRegion(std::u16string_view sStr); diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx index 503b9bee10f2..8ed6671a66b0 100644 --- a/include/sfx2/weldutils.hxx +++ b/include/sfx2/weldutils.hxx @@ -37,8 +37,8 @@ private: weld::Builder* m_pBuilder; bool m_bSideBar; - DECL_DLLPRIVATE_LINK(SelectHdl, const OString&, void); - DECL_DLLPRIVATE_LINK(ToggleMenuHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(SelectHdl, const OUString&, void); + DECL_DLLPRIVATE_LINK(ToggleMenuHdl, const OUString&, void); DECL_DLLPRIVATE_LINK(ChangedIconSizeHandler, LinkParamNone*, void); void CreateController(const OUString& rCommand); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 2297c45a63a8..ba8f586bdf79 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -167,7 +167,7 @@ namespace svt class SVT_DLLPUBLIC ControlBase : public InterimItemWindow { public: - ControlBase(BrowserDataWin* pParent, const OUString& rUIXMLDescription, const OString& rID); + ControlBase(BrowserDataWin* pParent, const OUString& rUIXMLDescription, const OUString& rID); virtual void SetEditableReadOnly(bool bReadOnly); diff --git a/include/svtools/helpids.h b/include/svtools/helpids.h index d6b1da9e7623..3a8bd633865e 100644 --- a/include/svtools/helpids.h +++ b/include/svtools/helpids.h @@ -19,31 +19,31 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_FILEDLG_LINK_CB = "SVT_HID_FILEDLG_LINK_CB"; -inline constexpr OStringLiteral HID_FILEDLG_PREVIEW_CB = "SVT_HID_FILEDLG_PREVIEW_CB"; -inline constexpr OStringLiteral HID_FILEDLG_STANDARD = "SVT_HID_FILEDLG_STANDARD"; +inline constexpr OUStringLiteral HID_FILEDLG_LINK_CB = u"SVT_HID_FILEDLG_LINK_CB"; +inline constexpr OUStringLiteral HID_FILEDLG_PREVIEW_CB = u"SVT_HID_FILEDLG_PREVIEW_CB"; +inline constexpr OUStringLiteral HID_FILEDLG_STANDARD = u"SVT_HID_FILEDLG_STANDARD"; // help ids for the different modi of the file picker dialog -inline constexpr OStringLiteral HID_FILESAVE_LEVELUP = "SVT_HID_FILESAVE_LEVELUP"; -inline constexpr OStringLiteral HID_FILESAVE_CREATEDIRECTORY = "SVT_HID_FILESAVE_CREATEDIRECTORY"; -inline constexpr OStringLiteral HID_FILESAVE_FILEVIEW = "SVT_HID_FILESAVE_FILEVIEW"; -inline constexpr OStringLiteral HID_FILESAVE_TEMPLATE = "SVT_HID_FILESAVE_TEMPLATE"; -inline constexpr OStringLiteral HID_FILESAVE_FILEURL = "SVT_HID_FILESAVE_FILEURL"; -inline constexpr OStringLiteral HID_FILESAVE_FILETYPE = "SVT_HID_FILESAVE_FILETYPE"; -inline constexpr OStringLiteral HID_FILESAVE_DOSAVE = "SVT_HID_FILESAVE_DOSAVE"; -inline constexpr OStringLiteral HID_FILESAVE_AUTOEXTENSION = "SVT_HID_FILESAVE_AUTOEXTENSION"; -inline constexpr OStringLiteral HID_FILESAVE_SAVEWITHPASSWORD = "SVT_HID_FILESAVE_SAVEWITHPASSWORD"; -inline constexpr OStringLiteral HID_FILESAVE_CUSTOMIZEFILTER = "SVT_HID_FILESAVE_CUSTOMIZEFILTER"; -inline constexpr OStringLiteral HID_FILESAVE_SELECTION = "SVT_HID_FILESAVE_SELECTION"; -inline constexpr OStringLiteral HID_FILESAVE_DIALOG = "SVT_HID_FILESAVE_DIALOG"; -inline constexpr OStringLiteral HID_FILESAVE_DOPLAY = "SVT_HID_FILESAVE_DOPLAY"; +inline constexpr OUStringLiteral HID_FILESAVE_LEVELUP = u"SVT_HID_FILESAVE_LEVELUP"; +inline constexpr OUStringLiteral HID_FILESAVE_CREATEDIRECTORY = u"SVT_HID_FILESAVE_CREATEDIRECTORY"; +inline constexpr OUStringLiteral HID_FILESAVE_FILEVIEW = u"SVT_HID_FILESAVE_FILEVIEW"; +inline constexpr OUStringLiteral HID_FILESAVE_TEMPLATE = u"SVT_HID_FILESAVE_TEMPLATE"; +inline constexpr OUStringLiteral HID_FILESAVE_FILEURL = u"SVT_HID_FILESAVE_FILEURL"; +inline constexpr OUStringLiteral HID_FILESAVE_FILETYPE = u"SVT_HID_FILESAVE_FILETYPE"; +inline constexpr OUStringLiteral HID_FILESAVE_DOSAVE = u"SVT_HID_FILESAVE_DOSAVE"; +inline constexpr OUStringLiteral HID_FILESAVE_AUTOEXTENSION = u"SVT_HID_FILESAVE_AUTOEXTENSION"; +inline constexpr OUStringLiteral HID_FILESAVE_SAVEWITHPASSWORD = u"SVT_HID_FILESAVE_SAVEWITHPASSWORD"; +inline constexpr OUStringLiteral HID_FILESAVE_CUSTOMIZEFILTER = u"SVT_HID_FILESAVE_CUSTOMIZEFILTER"; +inline constexpr OUStringLiteral HID_FILESAVE_SELECTION = u"SVT_HID_FILESAVE_SELECTION"; +inline constexpr OUStringLiteral HID_FILESAVE_DIALOG = u"SVT_HID_FILESAVE_DIALOG"; +inline constexpr OUStringLiteral HID_FILESAVE_DOPLAY = u"SVT_HID_FILESAVE_DOPLAY"; -inline constexpr OStringLiteral HID_FILEOPEN_LEVELUP = "SVT_HID_FILEOPEN_LEVELUP"; -inline constexpr OStringLiteral HID_FILEOPEN_READONLY = "SVT_HID_FILEOPEN_READONLY"; -inline constexpr OStringLiteral HID_FILEOPEN_VERSION = "SVT_HID_FILEOPEN_VERSION"; -inline constexpr OStringLiteral HID_FILEOPEN_IMAGE_TEMPLATE = "SVT_HID_FILEOPEN_IMAGE_TEMPLATE"; -inline constexpr OStringLiteral HID_FILEOPEN_IMAGE_ANCHOR = "SVT_HID_FILEOPEN_IMAGE_ANCHOR"; +inline constexpr OUStringLiteral HID_FILEOPEN_LEVELUP = u"SVT_HID_FILEOPEN_LEVELUP"; +inline constexpr OUStringLiteral HID_FILEOPEN_READONLY = u"SVT_HID_FILEOPEN_READONLY"; +inline constexpr OUStringLiteral HID_FILEOPEN_VERSION = u"SVT_HID_FILEOPEN_VERSION"; +inline constexpr OUStringLiteral HID_FILEOPEN_IMAGE_TEMPLATE = u"SVT_HID_FILEOPEN_IMAGE_TEMPLATE"; +inline constexpr OUStringLiteral HID_FILEOPEN_IMAGE_ANCHOR = u"SVT_HID_FILEOPEN_IMAGE_ANCHOR"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 6e613072bd64..a4dcb5836228 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -76,7 +76,7 @@ public: OUString get_active_text() const { return m_xWidget->get_active_text(); } void grab_focus() { m_xWidget->grab_focus(); } void set_sensitive(bool bSensitive) { m_xWidget->set_sensitive(bSensitive); } - void set_help_id(const OString& rHelpId) { m_xWidget->set_help_id(rHelpId); } + void set_help_id(const OUString& rHelpId) { m_xWidget->set_help_id(rHelpId); } void select_entry_region(int nStartPos, int nEndPos) { m_xWidget->select_entry_region(nStartPos, nEndPos); } Size get_preferred_size() const { return m_xWidget->get_preferred_size(); } diff --git a/include/svtools/recorditemwindow.hxx b/include/svtools/recorditemwindow.hxx index a238148dd41f..63f46849c469 100644 --- a/include/svtools/recorditemwindow.hxx +++ b/include/svtools/recorditemwindow.hxx @@ -20,7 +20,7 @@ public: void set_text(const OUString& rText) { m_xWidget->set_text(rText); } void set_font(const vcl::Font& rFont) { m_xWidget->set_font(rFont); } - void set_help_id(const OString& rHelpId) { m_xWidget->set_help_id(rHelpId); } + void set_help_id(const OUString& rHelpId) { m_xWidget->set_help_id(rHelpId); } protected: std::unique_ptr<weld::Entry> m_xWidget; diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 51fe6f906556..f65687130e15 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -45,7 +45,7 @@ protected: public: WeldToolbarPopup(css::uno::Reference<css::frame::XFrame> xFrame, - weld::Widget* pParent, const OUString& rUIFile, const OString& rId); + weld::Widget* pParent, const OUString& rUIFile, const OUString& rId); virtual ~WeldToolbarPopup(); weld::Container* getTopLevel() { return m_xTopLevel.get(); } weld::Container* getContainer() { return m_xContainer.get(); } diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index ec608c830754..027a9248e687 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -32,7 +32,7 @@ private: Link<SvxPresetListBox*,void> maRenameHdl; Link<SvxPresetListBox*,void> maDeleteHdl; - void OnMenuItemSelected(std::string_view rIdent); + void OnMenuItemSelected(std::u16string_view rIdent); template< typename ListType, typename EntryType > void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index faf5aea9b7e1..6c84a53a0d9a 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -151,7 +151,7 @@ protected: // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; DECL_DLLPRIVATE_LINK(VscrollHdl, weld::ScrolledWindow&, void); - void ContextMenuSelect(std::string_view rIdent); + void ContextMenuSelect(std::u16string_view rIdent); void init(); tools::Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize) const; diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 2705833ee37d..e48fe4809729 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -85,7 +85,7 @@ public: void show() { m_xButton->show(); } void hide() { m_xButton->hide(); } void set_visible(bool bShow) { m_xButton->set_visible(bShow); } - void set_help_id(const OString& rHelpId) { m_xButton->set_help_id(rHelpId); } + void set_help_id(const OUString& rHelpId) { m_xButton->set_help_id(rHelpId); } void connect_focus_in(const Link<weld::Widget&, void>& rLink) { m_xButton->connect_focus_in(rLink); diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 4a0e951322ab..0a2e0a5ffeb8 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -56,14 +56,14 @@ private: weld::MenuButton* m_pMenuButton; // or weld::Toolbar* m_pToolbar; - OString m_aIdent; + OUString m_aIdent; // or SvxColorToolBoxControl* m_pControl; VclPtr<ToolBox> m_xToolBox; ToolBoxItemId m_nId; public: MenuOrToolMenuButton(weld::MenuButton* pMenuButton); - MenuOrToolMenuButton(weld::Toolbar* pToolbar, OString sIdent); + MenuOrToolMenuButton(weld::Toolbar* pToolbar, OUString sIdent); MenuOrToolMenuButton(SvxColorToolBoxControl* pControl, ToolBox* pToolbar, ToolBoxItemId nId); ~MenuOrToolMenuButton(); diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 84cf456cb58a..f852a4886bd7 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -138,7 +138,7 @@ protected: std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xContainer; public: - SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID); + SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID); virtual ~SvxTPage(); virtual void ActivatePage(); void Show() { m_xContainer->show(); } @@ -321,8 +321,8 @@ private: std::unique_ptr<SvxTPFilter> m_xTPFilter; std::unique_ptr<SvxTPView> m_xTPView; - DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OString&, void); - DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool); + DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OUString&, void); + DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OUString&, bool); public: SvxAcceptChgCtr(weld::Container* pParent); diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 75e51d276411..ffdce3797769 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -44,7 +44,7 @@ class SAL_WARN_UNUSED SvxTabPage : public SfxTabPage { public: - SvxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet &rAttrSet) + SvxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet &rAttrSet) : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet) { } diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 57ba3ccd8bbf..43d59ecb3ec1 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -66,7 +66,7 @@ protected: weld::Menu& rShowMenu); /** After executing the context menu for a column this method is called. */ - virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult); + virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult); // DropTargetHelper virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 7fe65fd452d0..c726382756e6 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -76,9 +76,9 @@ class SAL_WARN_UNUSED SvxFontWorkDialog final : public SfxDockingWindow SfxBindings& rBindings; Idle aInputIdle; - OString m_sLastStyleTbxId; - OString m_sLastAdjustTbxId; - OString m_sLastShadowTbxId; + OUString m_sLastStyleTbxId; + OUString m_sLastAdjustTbxId; + OUString m_sLastShadowTbxId; tools::Long nSaveShadowX; tools::Long nSaveShadowY; @@ -105,9 +105,9 @@ class SAL_WARN_UNUSED SvxFontWorkDialog final : public SfxDockingWindow friend class SvxFontWorkChildWindow; friend class SvxFontWorkControllerItem; - DECL_LINK( SelectStyleHdl_Impl, const OString&, void ); - DECL_LINK( SelectAdjustHdl_Impl, const OString&, void ); - DECL_LINK( SelectShadowHdl_Impl, const OString&, void ); + DECL_LINK( SelectStyleHdl_Impl, const OUString&, void ); + DECL_LINK( SelectAdjustHdl_Impl, const OUString&, void ); + DECL_LINK( SelectShadowHdl_Impl, const OUString&, void ); DECL_LINK( ModifyInputHdl_Impl, weld::MetricSpinButton&, void ); DECL_LINK( InputTimeoutHdl_Impl, Timer*, void ); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 54a99269cf7f..b8057fd61823 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -347,7 +347,7 @@ protected: virtual void PreExecuteRowContextMenu(weld::Menu& rMenu); /** After executing the context menu for a row this method is called. */ - virtual void PostExecuteRowContextMenu(const OString& rExecutionResult); + virtual void PostExecuteRowContextMenu(const OUString& rExecutionResult); /// @throws css::uno::RuntimeException void DataSourcePropertyChanged(const css::beans::PropertyChangeEvent& evt); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index e3586e290d7a..07a73b17b763 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -104,7 +104,7 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController std::unique_ptr<weld::Label> m_xStbStatus3; std::unique_ptr<weld::CustomWeld> m_xIMapWndWeld; - DECL_DLLPRIVATE_LINK( TbxClickHdl, const OString&, void ); + DECL_DLLPRIVATE_LINK( TbxClickHdl, const OUString&, void ); DECL_DLLPRIVATE_LINK( InfoHdl, IMapWindow&, void ); DECL_DLLPRIVATE_LINK( MousePosHdl, GraphCtrl*, void ); DECL_DLLPRIVATE_LINK( GraphSizeHdl, GraphCtrl*, void ); @@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController void URLModify(); void DoOpen(); bool DoSave(); - void SetActiveTool(std::string_view rId); + void SetActiveTool(std::u16string_view rId); public: diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 58b9e0a5c85b..486515f1822a 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -218,8 +218,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener tools::Long GetLeftMin() const; tools::Long GetRightMax() const; - void TabMenuSelect(std::string_view rIdent); - void MenuSelect(std::string_view ident); + void TabMenuSelect(std::u16string_view rIdent); + void MenuSelect(std::u16string_view ident); void PrepareProportional_Impl(RulerType); enum class UpdateType diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 214617b725af..75675ca140fa 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -159,7 +159,7 @@ protected: DECL_DLLPRIVATE_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void); DECL_DLLPRIVATE_LINK(ModifyTransSliderHdl, weld::Scale&, void); DECL_DLLPRIVATE_LINK(ClickImportBitmapHdl, weld::Button&, void); - DECL_DLLPRIVATE_LINK(ToolbarHdl_Impl, const OString&, void); + DECL_DLLPRIVATE_LINK(ToolbarHdl_Impl, const OUString&, void); void ImpUpdateTransparencies(); void SetTransparency(sal_uInt16 nVal); diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 3383884a807f..18891e0e2348 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -47,8 +47,8 @@ private: void InitStatus(XFillFloatTransparenceItem const* pGradientItem); void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol); DECL_LINK(ModifiedTrgrHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(Left_Click45_Impl, const OString&, void); - DECL_LINK(Right_Click45_Impl, const OString&, void); + DECL_LINK(Left_Click45_Impl, const OUString&, void); + DECL_LINK(Right_Click45_Impl, const OUString&, void); public: AreaTransparencyGradientPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index f5eef671635c..891ca7aa1804 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -127,7 +127,7 @@ private: void Initialize(); - DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OUString&, void); DECL_DLLPRIVATE_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void); DECL_DLLPRIVATE_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void); DECL_DLLPRIVATE_LINK(ChangeCapStyleHdl, weld::ComboBox&, void); diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index ded2d20c4e02..d361c6800dca 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -165,8 +165,8 @@ public: virtual void GetName( OUString& rName ) = 0; virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) = 0; virtual void SetCheckNameTooltipHdl( const Link<AbstractSvxNameDialog&,OUString>& rLink ) = 0; - virtual void SetEditHelpId(const OString&) = 0; - virtual void SetHelpId( const OString& ) = 0; + virtual void SetEditHelpId(const OUString&) = 0; + virtual void SetHelpId( const OUString& ) = 0; virtual void SetText( const OUString& rStr ) = 0; }; @@ -443,7 +443,7 @@ public: virtual std::shared_ptr<SvxAbstractNewTableDialog> CreateSvxNewTableDialog(weld::Window* pParent) = 0; - virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId) = 0; + virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId) = 0; }; #endif diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx index ae0a2a8c14e6..801eb80c7bf5 100644 --- a/include/test/screenshot_test.hxx +++ b/include/test/screenshot_test.hxx @@ -38,7 +38,7 @@ private: private: /// helpers - void implSaveScreenshot(const BitmapEx& rScreenshot, const OString& rScreenshotId); + void implSaveScreenshot(const BitmapEx& rScreenshot, const OUString& rScreenshotId); void saveScreenshot(VclAbstractDialog const& rDialog); void saveScreenshot(weld::Window& rDialog); diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index 273e38817c58..73c928efab69 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -160,8 +160,8 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions final @onerror An assertion is thrown in debug version. Otherwise we do nothing! *//*-*****************************************************************************************************/ - OString GetPageID() const; - void SetPageID(std::string_view rID); + OUString GetPageID() const; + void SetPageID(const OUString& rID); /*-**************************************************************************************************** @short use it to set/get the visual state of a window diff --git a/include/vcl/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index 4cf4dd4ebeca..8f7efc64e6e7 100644 --- a/include/vcl/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -40,7 +40,7 @@ protected: // remains inside the InterimItemWindow and cycles back to the first child // of this control on reaching pass the last child. This is suitable when // the Control is the toplevel control and has no siblings or parent - InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, + InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, bool bAllowCycleFocusOut = true, sal_uInt64 nLOKWindowId = 0); void InitControlBase(weld::Widget* pWidget); diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 9d61077a24c9..793d8cdd36a9 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -77,10 +77,10 @@ public: virtual bool StartExecuteAsync(AsyncContext &); // Screenshot interface - virtual std::vector<OString> getAllPageUIXMLDescriptions() const; - virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription); + virtual std::vector<OUString> getAllPageUIXMLDescriptions() const; + virtual bool selectPageByUIXMLDescription(const OUString& rUIXMLDescription); virtual BitmapEx createScreenshot() const; - virtual OString GetScreenshotId() const { return OString(); }; + virtual OUString GetScreenshotId() const { return {}; }; }; class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 2baa0f520f59..64538f81272e 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -56,8 +56,8 @@ namespace com::sun::star::frame { class XFrame; } struct ComboBoxTextItem { OUString m_sItem; - OString m_sId; - ComboBoxTextItem(OUString sItem, OString sId) + OUString m_sId; + ComboBoxTextItem(OUString sItem, OUString sId) : m_sItem(std::move(sItem)) , m_sId(std::move(sId)) { @@ -68,14 +68,14 @@ struct ComboBoxTextItem class VCL_DLLPUBLIC VclBuilder { public: - typedef std::map<OString, OUString> stringmap; - typedef std::map<OString, std::pair<OString, OString>> accelmap; + typedef std::map<OUString, OUString> stringmap; + typedef std::map<OUString, std::pair<OUString, OUString>> accelmap; /// These functions create a new widget with parent pParent and return it in rRet typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet, const VclPtr<vcl::Window> &pParent, stringmap &rVec); public: VclBuilder(vcl::Window* pParent, const OUString& sUIRootDir, const OUString& sUIFile, - OString sID = OString(), + OUString sID = {}, css::uno::Reference<css::frame::XFrame> xFrame = css::uno::Reference<css::frame::XFrame>(), bool bLegacy = true, @@ -84,15 +84,15 @@ public: ///releases references and disposes all children. void disposeBuilder(); //sID must exist and be of type T - template <typename T> T* get(VclPtr<T>& ret, const OString& sID); + template <typename T> T* get(VclPtr<T>& ret, const OUString& sID); //sID may not exist, but must be of type T if it does - template <typename T = vcl::Window> T* get(const OString& sID); + template <typename T = vcl::Window> T* get(const OUString& sID); vcl::Window* get_widget_root(); //sID may not exist - PopupMenu* get_menu(std::string_view sID); + PopupMenu* get_menu(std::u16string_view sID); //release ownership of pWindow, i.e. don't delete it void drop_ownership(const vcl::Window *pWindow); @@ -104,7 +104,7 @@ public: void setDeferredProperties(); /// return UI-File name (without '.ui') - const OString& getUIFile() const + const OUString& getUIFile() const { return m_sHelpRoot; } @@ -140,10 +140,10 @@ private: struct WinAndId { - OString m_sID; + OUString m_sID; VclPtr<vcl::Window> m_pWindow; PackingData m_aPackingData; - WinAndId(OString sId, vcl::Window *pWindow, bool bVertical) + WinAndId(OUString sId, vcl::Window *pWindow, bool bVertical) : m_sID(std::move(sId)) , m_pWindow(pWindow) , m_aPackingData(bVertical) @@ -154,17 +154,17 @@ private: struct MenuAndId { - OString m_sID; + OUString m_sID; VclPtr<Menu> m_pMenu; - MenuAndId(OString sId, Menu *pMenu); + MenuAndId(OUString sId, Menu *pMenu); }; std::vector<MenuAndId> m_aMenus; struct StringPair { - OString m_sID; - OString m_sValue; - StringPair(OString sId, OString sValue) + OUString m_sID; + OUString m_sValue; + StringPair(OUString sId, OUString sValue) : m_sID(std::move(sId)) , m_sValue(std::move(sValue)) { @@ -173,9 +173,9 @@ private: struct UStringPair { - OString m_sID; + OUString m_sID; OUString m_sValue; - UStringPair(OString sId, OUString sValue) + UStringPair(OUString sId, OUString sValue) : m_sID(std::move(sId)) , m_sValue(std::move(sValue)) { @@ -186,10 +186,10 @@ private: struct ButtonImageWidgetMap { - OString m_sID; + OUString m_sID; OUString m_sValue; bool m_bRadio; - ButtonImageWidgetMap(OString sId, OUString sValue, bool bRadio) + ButtonImageWidgetMap(OUString sId, OUString sValue, bool bRadio) : m_sID(std::move(sId)) , m_sValue(std::move(sValue)) , m_bRadio(bRadio) @@ -204,10 +204,10 @@ private: struct ComboBoxModelMap { - OString m_sID; + OUString m_sID; OUString m_sValue; sal_Int32 m_nActiveId; - ComboBoxModelMap(OString sId, OUString sValue, sal_Int32 nActiveId) + ComboBoxModelMap(OUString sId, OUString sValue, sal_Int32 nActiveId) : m_sID(std::move(sId)) , m_sValue(std::move(sValue)) , m_nActiveId(nActiveId) @@ -221,29 +221,29 @@ private: std::vector<row> m_aEntries; }; - const ListStore* get_model_by_name(const OString& sID) const; + const ListStore* get_model_by_name(const OUString& sID) const; void mungeModel(ListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId); void mungeModel(ComboBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId); void mungeModel(SvTabListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId); typedef stringmap TextBuffer; - const TextBuffer* get_buffer_by_name(const OString& sID) const; + const TextBuffer* get_buffer_by_name(const OUString& sID) const; static void mungeTextBuffer(VclMultiLineEdit &rTarget, const TextBuffer &rTextBuffer); typedef stringmap Adjustment; - const Adjustment* get_adjustment_by_name(const OString& sID) const; + const Adjustment* get_adjustment_by_name(const OUString& sID) const; static void mungeAdjustment(NumericFormatter &rTarget, const Adjustment &rAdjustment); static void mungeAdjustment(FormattedField &rTarget, const Adjustment &rAdjustment); static void mungeAdjustment(ScrollBar &rTarget, const Adjustment &rAdjustment); static void mungeAdjustment(Slider &rTarget, const Adjustment &rAdjustment); - typedef std::map<OString, int> ImageSizeMap; + typedef std::map<OUString, int> ImageSizeMap; struct SizeGroup { - std::vector<OString> m_aWidgets; + std::vector<OUString> m_aWidgets; stringmap m_aProperties; SizeGroup() {} }; @@ -256,17 +256,17 @@ private: std::vector<RadioButtonGroupMap> m_aGroupMaps; std::vector<ComboBoxModelMap> m_aModelMaps; - std::map<OString, ListStore> m_aModels; + std::map<OUString, ListStore> m_aModels; std::vector<TextBufferMap> m_aTextBufferMaps; - std::map<OString, TextBuffer> m_aTextBuffers; + std::map<OUString, TextBuffer> m_aTextBuffers; std::vector<WidgetAdjustmentMap> m_aNumericFormatterAdjustmentMaps; std::vector<WidgetAdjustmentMap> m_aFormattedFormatterAdjustmentMaps; std::vector<WidgetAdjustmentMap> m_aScrollAdjustmentMaps; std::vector<WidgetAdjustmentMap> m_aSliderAdjustmentMaps; - std::map<OString, Adjustment> m_aAdjustments; + std::map<OUString, Adjustment> m_aAdjustments; std::vector<ButtonImageWidgetMap> m_aButtonImageWidgetMaps; ImageSizeMap m_aImageSizeMap; @@ -292,8 +292,8 @@ private: ParserState(); }; - OString m_sID; - OString m_sHelpRoot; + OUString m_sID; + OUString m_sHelpRoot; ResHookProc m_pStringReplace; VclPtr<vcl::Window> m_pParent; bool m_bToplevelHasDeferredInit; @@ -302,8 +302,8 @@ private: bool m_bLegacy; std::unique_ptr<ParserState> m_pParserState; - vcl::Window *get_by_name(std::string_view sID); - void delete_by_name(const OString& sID); + vcl::Window *get_by_name(std::u16string_view sID); + void delete_by_name(const OUString& sID); class sortIntoBestTabTraversalOrder { @@ -322,25 +322,25 @@ private: private: VclPtr<vcl::Window> insertObject(vcl::Window *pParent, - const OString &rClass, const OString &rID, + const OUString &rClass, const OUString &rID, stringmap &rProps, stringmap &rPangoAttributes, stringmap &rAtkProps); VclPtr<vcl::Window> makeObject(vcl::Window *pParent, - const OString &rClass, const OString &rID, + const OUString &rClass, const OUString &rID, stringmap &rVec); - void connectNumericFormatterAdjustment(const OString &id, const OUString &rAdjustment); - void connectFormattedFormatterAdjustment(const OString &id, const OUString &rAdjustment); + void connectNumericFormatterAdjustment(const OUString &id, const OUString &rAdjustment); + void connectFormattedFormatterAdjustment(const OUString &id, const OUString &rAdjustment); static int getImageSize(const stringmap &rMap); - void extractGroup(const OString &id, stringmap &rVec); - void extractModel(const OString &id, stringmap &rVec); - void extractBuffer(const OString &id, stringmap &rVec); - static bool extractAdjustmentToMap(const OString &id, stringmap &rVec, std::vector<WidgetAdjustmentMap>& rAdjustmentMap); - void extractButtonImage(const OString &id, stringmap &rMap, bool bRadio); - void extractMnemonicWidget(const OString &id, stringmap &rMap); + void extractGroup(const OUString &id, stringmap &rVec); + void extractModel(const OUString &id, stringmap &rVec); + void extractBuffer(const OUString &id, stringmap &rVec); + static bool extractAdjustmentToMap(const OUString &id, stringmap &rVec, std::vector<WidgetAdjustmentMap>& rAdjustmentMap); + void extractButtonImage(const OUString &id, stringmap &rMap, bool bRadio); + void extractMnemonicWidget(const OUString &id, stringmap &rMap); // either pParent or pAtkProps must be set, pParent for a child of a widget, pAtkProps for // collecting the atk info for a GtkMenuItem @@ -348,7 +348,7 @@ private: VclPtr<vcl::Window> handleObject(vcl::Window *pParent, stringmap *pAtkProps, xmlreader::XmlReader &reader); void handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); static std::vector<vcl::EnumContext::Context> handleStyle(xmlreader::XmlReader &reader, int &nPriority); - static OString getStyleClass(xmlreader::XmlReader &reader); + static OUString getStyleClass(xmlreader::XmlReader &reader); void applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); void collectProperty(xmlreader::XmlReader &reader, stringmap &rVec) const; static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); @@ -359,8 +359,8 @@ private: void insertMenuObject( Menu *pParent, PopupMenu *pSubMenu, - const OString &rClass, - const OString &rID, + const OUString &rClass, + const OUString &rID, stringmap &rProps, stringmap &rAtkProps, accelmap &rAccels); @@ -368,10 +368,10 @@ private: void handleMenuChild(Menu *pParent, xmlreader::XmlReader &reader); void handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader); - void handleListStore(xmlreader::XmlReader &reader, const OString &rID, std::string_view rClass); - void handleRow(xmlreader::XmlReader &reader, const OString &rID); + void handleListStore(xmlreader::XmlReader &reader, const OUString &rID, std::u16string_view rClass); + void handleRow(xmlreader::XmlReader &reader, const OUString &rID); void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader); - VclPtr<Menu> handleMenu(xmlreader::XmlReader &reader, const OString &rID, bool bMenuBar); + VclPtr<Menu> handleMenu(xmlreader::XmlReader &reader, const OUString &rID, bool bMenuBar); std::vector<ComboBoxTextItem> handleItems(xmlreader::XmlReader &reader) const; void handleSizeGroup(xmlreader::XmlReader &reader); @@ -388,9 +388,9 @@ private: static vcl::Window* prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle); void cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap); - void set_response(std::string_view sID, short nResponse); + void set_response(std::u16string_view sID, short nResponse); - OString get_by_window(const vcl::Window *pWindow) const; + OUString get_by_window(const vcl::Window *pWindow) const; void delete_by_window(vcl::Window *pWindow); }; @@ -414,11 +414,11 @@ namespace BuilderUtils VCL_DLLPUBLIC void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); //Convert an accessibility role name to accessibility role number - VCL_DLLPUBLIC sal_Int16 getRoleFromName(const OString& roleName); + VCL_DLLPUBLIC sal_Int16 getRoleFromName(const OUString& roleName); } template <typename T> -inline T* VclBuilder::get(VclPtr<T>& ret, const OString& sID) +inline T* VclBuilder::get(VclPtr<T>& ret, const OUString& sID) { vcl::Window *w = get_by_name(sID); SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID << "\" not found in .ui"); @@ -432,7 +432,7 @@ inline T* VclBuilder::get(VclPtr<T>& ret, const OString& sID) //sID may not exist, but must be of type T if it does template <typename T> -inline T* VclBuilder::get(const OString& sID) +inline T* VclBuilder::get(const OUString& sID) { vcl::Window *w = get_by_name(sID); SAL_WARN_IF(w && !dynamic_cast<T*>(w), diff --git a/include/vcl/builderpage.hxx b/include/vcl/builderpage.hxx index e77cf47c443b..eddbd4787cc2 100644 --- a/include/vcl/builderpage.hxx +++ b/include/vcl/builderpage.hxx @@ -16,7 +16,7 @@ class VCL_DLLPUBLIC BuilderPage { public: BuilderPage(weld::Widget* pParent, weld::DialogController* pController, - const OUString& rUIXMLDescription, const OString& rID, bool bIsMobile = false); + const OUString& rUIXMLDescription, const OUString& rID, bool bIsMobile = false); virtual ~BuilderPage() COVERITY_NOEXCEPT_FALSE; /* The title of the page, in an Assistant the dialog may append this page title to the @@ -33,8 +33,8 @@ public: virtual void Activate(); virtual void Deactivate(); - void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); } - OString GetHelpId() const { return m_xContainer->get_help_id(); } + void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); } + OUString GetHelpId() const { return m_xContainer->get_help_id(); } protected: weld::DialogController* m_pDialogController; diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx index c43dc9df1c85..32c43db643a8 100644 --- a/include/vcl/customweld.hxx +++ b/include/vcl/customweld.hxx @@ -90,7 +90,7 @@ public: bool IsRTLEnabled() const { return m_pDrawingArea->get_direction(); } void ReleaseMouse() { m_pDrawingArea->grab_remove(); } void SetPointer(PointerStyle ePointerStyle) { m_pDrawingArea->set_cursor(ePointerStyle); } - void SetHelpId(const OString& rHelpId) { m_pDrawingArea->set_help_id(rHelpId); } + void SetHelpId(const OUString& rHelpId) { m_pDrawingArea->set_help_id(rHelpId); } void SetAccessibleName(const OUString& rName) { m_pDrawingArea->set_accessible_name(rName); } void SetInputContext(const InputContext& rInputContext) { @@ -162,7 +162,7 @@ private: DECL_DLLPRIVATE_LINK(DoDeleteSurrounding, const Selection&, bool); public: - CustomWeld(weld::Builder& rBuilder, const OString& rDrawingId, + CustomWeld(weld::Builder& rBuilder, const OUString& rDrawingId, CustomWidgetController& rWidgetController); void queue_draw() { m_xDrawingArea->queue_draw(); } void queue_draw_area(int x, int y, int width, int height) @@ -183,7 +183,7 @@ public: void set_visible(bool bVisible) { m_xDrawingArea->set_visible(bVisible); } void set_grid_left_attach(int nAttach) { m_xDrawingArea->set_grid_left_attach(nAttach); } int get_grid_left_attach() const { return m_xDrawingArea->get_grid_left_attach(); } - void set_help_id(const OString& rHelpId) { m_xDrawingArea->set_help_id(rHelpId); } + void set_help_id(const OUString& rHelpId) { m_xDrawingArea->set_help_id(rHelpId); } void set_tooltip_text(const OUString& rTip) { m_xDrawingArea->set_tooltip_text(rTip); } }; } diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index e6ce2b30830e..98b6e2bce8de 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -159,7 +159,7 @@ protected: SAL_DLLPRIVATE void DoInitialLayout(); - void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + void loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame); public: @@ -174,7 +174,7 @@ protected: DockingWindow( WindowType nType, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle"); public: DockingWindow(vcl::Window* pParent, WinBits nStyle, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle"); - DockingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + DockingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle", const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~DockingWindow() override; diff --git a/include/vcl/fieldvalues.hxx b/include/vcl/fieldvalues.hxx index 999f3e5fa355..220aef2e3b1a 100644 --- a/include/vcl/fieldvalues.hxx +++ b/include/vcl/fieldvalues.hxx @@ -33,7 +33,7 @@ class LocaleDataWrapper; namespace vcl { -VCL_DLLPUBLIC FieldUnit EnglishStringToMetric(std::string_view rEnglishMetricString); +VCL_DLLPUBLIC FieldUnit EnglishStringToMetric(std::u16string_view rEnglishMetricString); VCL_DLLPUBLIC bool TextToValue(const OUString& rStr, double& rValue, sal_Int64 nBaseValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper, diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx index 0c47066da9fa..c781f1ea1150 100644 --- a/include/vcl/jsdialog/executor.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -49,7 +49,7 @@ public: rIconView.signal_item_activated(); } - static void trigger_clicked(weld::Toolbar& rToolbar, const OString& rIdent) + static void trigger_clicked(weld::Toolbar& rToolbar, const OUString& rIdent) { rToolbar.signal_clicked(rIdent); } @@ -88,12 +88,12 @@ public: rArea.m_aCommandHdl.Call(rCmd); } - static void enter_page(weld::Notebook& rNotebook, const OString& rPage) + static void enter_page(weld::Notebook& rNotebook, const OUString& rPage) { rNotebook.m_aEnterPageHdl.Call(rPage); } - static void leave_page(weld::Notebook& rNotebook, const OString& rPage) + static void leave_page(weld::Notebook& rNotebook, const OUString& rPage) { rNotebook.m_aLeavePageHdl.Call(rPage); } @@ -102,15 +102,15 @@ public: namespace jsdialog { // type used to store key-value pairs to put in the generated messages -typedef std::unordered_map<std::string, OUString> ActionDataMap; +typedef std::unordered_map<OString, OUString> ActionDataMap; /// execute action on a widget -VCL_DLLPUBLIC bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, +VCL_DLLPUBLIC bool ExecuteAction(const OUString& nWindowId, const OUString& rWidget, StringMap& rData); /// send full update message to the client -VCL_DLLPUBLIC void SendFullUpdate(const std::string& nWindowId, const OString& rWidget); +VCL_DLLPUBLIC void SendFullUpdate(const OUString& nWindowId, const OUString& rWidget); /// send action message to the client -VCL_DLLPUBLIC void SendAction(const std::string& nWindowId, const OString& rWidget, +VCL_DLLPUBLIC void SendAction(const OUString& nWindowId, const OUString& rWidget, std::unique_ptr<ActionDataMap> pData); VCL_DLLPUBLIC StringMap jsonToStringMap(const char* pJSON); }; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index f5090b24eac2..995b0d952ff0 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -97,7 +97,7 @@ public: { return m_bVerticalContainer; } - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; protected: virtual sal_uInt16 getDefaultAccessibleRole() const override; @@ -213,7 +213,7 @@ public: , m_eLayoutStyle(VclButtonBoxStyle::Default) { } - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; protected: virtual Size calculateRequisition() const override; @@ -362,7 +362,7 @@ public: { return m_nColumnSpacing; } - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; }; class UNLESS_MERGELIBS(VCL_DLLPUBLIC) VclBin : public VclContainer @@ -460,7 +460,7 @@ public: virtual void dispose() override; virtual vcl::Window *get_child() override; virtual const vcl::Window *get_child() const override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; bool get_expanded() const; void set_expanded(bool bExpanded); void set_label(const OUString& rLabel); @@ -488,7 +488,7 @@ public: virtual void dispose() override; virtual vcl::Window *get_child() override; virtual const vcl::Window *get_child() const override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; bool HasVisibleBorder() const { return m_eDrawFrameStyle != DrawFrameStyle::NONE; } ScrollBar& getVertScrollBar() { return *m_pVScroll; } @@ -614,7 +614,7 @@ public: { return m_eMode; } - void set_property(const OString &rKey, const OUString &rValue); + void set_property(const OUString &rKey, const OUString &rValue); }; class VCL_DLLPUBLIC VclDrawingArea final : public Control diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index abad985775e4..c6bd47efba01 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -142,7 +142,7 @@ private: sal_uInt16 mnHighlightedItemPos; // for native menus: keeps track of the highlighted item MenuFlags nMenuFlags; sal_uInt16 nSelectedId; - OString sSelectedIdent; + OUString sSelectedIdent; // for output: sal_uInt16 nImgOrChkPos; @@ -194,7 +194,7 @@ protected: SAL_DLLPRIVATE MenuItemData* NbcInsertItem(sal_uInt16 nId, MenuItemBits nBits, const OUString& rStr, Menu* pMenu, - size_t nPos, const OString &rIdent); + size_t nPos, const OUString &rIdent); /// Close the 'pStartedFrom' menu window. virtual void ClosePopup(Menu* pMenu) = 0; @@ -229,18 +229,18 @@ public: void InsertItem(sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nItemBits = MenuItemBits::NONE, - const OString &rIdent = OString(), + const OUString &rIdent = {}, sal_uInt16 nPos = MENU_APPEND); void InsertItem(sal_uInt16 nItemId, const Image& rImage, MenuItemBits nItemBits = MenuItemBits::NONE, - const OString &rIdent = OString(), + const OUString &rIdent = {}, sal_uInt16 nPos = MENU_APPEND); void InsertItem(sal_uInt16 nItemId, const OUString& rString, const Image& rImage, MenuItemBits nItemBits = MenuItemBits::NONE, - const OString &rIdent = OString(), + const OUString &rIdent = {}, sal_uInt16 nPos = MENU_APPEND); - void InsertSeparator(const OString &rIdent = OString(), sal_uInt16 nPos = MENU_APPEND); + void InsertSeparator(const OUString &rIdent = {}, sal_uInt16 nPos = MENU_APPEND); void RemoveItem( sal_uInt16 nPos ); void Clear(); @@ -251,12 +251,12 @@ public: sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId(sal_uInt16 nPos) const; - sal_uInt16 GetItemId(std::string_view rIdent) const; + sal_uInt16 GetItemId(std::u16string_view rIdent) const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; - OString GetItemIdent(sal_uInt16 nItemId) const; + OUString GetItemIdent(sal_uInt16 nItemId) const; MenuItemType GetItemType( sal_uInt16 nPos ) const; sal_uInt16 GetCurItemId() const { return nSelectedId;} - OString const & GetCurItemIdent() const { return sSelectedIdent; } + OUString const & GetCurItemIdent() const { return sSelectedIdent; } void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; @@ -270,13 +270,13 @@ public: vcl::KeyCode GetAccelKey( sal_uInt16 nItemId ) const; void CheckItem( sal_uInt16 nItemId, bool bCheck = true ); - void CheckItem( std::string_view rIdent, bool bCheck = true ); + void CheckItem( std::u16string_view rIdent, bool bCheck = true ); bool IsItemChecked( sal_uInt16 nItemId ) const; virtual void SelectItem(sal_uInt16 nItemId) = 0; void EnableItem( sal_uInt16 nItemId, bool bEnable = true ); - void EnableItem(std::string_view rIdent, bool bEnable = true) + void EnableItem(std::u16string_view rIdent, bool bEnable = true) { EnableItem(GetItemId(rIdent), bEnable); } @@ -311,8 +311,8 @@ public: void SetHelpCommand( sal_uInt16 nItemId, const OUString& rString ); OUString GetHelpCommand( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); - OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OUString& rHelpId ); + OUString GetHelpId( sal_uInt16 nItemId ) const; void SetActivateHdl( const Link<Menu *, bool>& rLink ) { diff --git a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx index 87c843620c68..30ab04be2b6e 100644 --- a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx +++ b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx @@ -53,7 +53,7 @@ void MergeNotebookBarAddons(vcl::Window* pParent, const VclBuilder::customMakeWi const css::uno::Reference<css::frame::XFrame>& rFrame, const NotebookBarAddonsItem& aNotebookBarAddonsItem, VclBuilder::stringmap& rVec); -void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OString& sItemIdName, +void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OUString& sItemIdName, NotebookBarAddonsItem& aNotebookBarAddonsItem); }; diff --git a/include/vcl/notebookbar/notebookbar.hxx b/include/vcl/notebookbar/notebookbar.hxx index b93e3707fb7c..15186fce2cc3 100644 --- a/include/vcl/notebookbar/notebookbar.hxx +++ b/include/vcl/notebookbar/notebookbar.hxx @@ -28,7 +28,7 @@ class VCL_DLLPUBLIC NotebookBar final : public Control, public VclBuilderContain { friend class NotebookBarContextChangeEventListener; public: - NotebookBar(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + NotebookBar(Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame, const NotebookBarAddonsItem& aNotebookBarAddonsItem); virtual ~NotebookBar() override; diff --git a/include/vcl/roadmapwizard.hxx b/include/vcl/roadmapwizard.hxx index 6a55bacadfbc..be2eb5669e92 100644 --- a/include/vcl/roadmapwizard.hxx +++ b/include/vcl/roadmapwizard.hxx @@ -64,7 +64,7 @@ namespace vcl RoadmapWizardMachine(weld::Window* _pParent); virtual ~RoadmapWizardMachine( ) override; - void SetRoadmapHelpId( const OString& _rId ); + void SetRoadmapHelpId( const OUString& _rId ); // returns whether a given state is enabled bool isStateEnabled(WizardTypes::WizardState nState) const; @@ -174,7 +174,7 @@ namespace vcl virtual OUString getStateDisplayName(WizardTypes::WizardState nState) const; private: - DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, const OString&, bool ); + DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, const OUString&, bool ); /** updates the roadmap control to show the given path, as far as possible (modulo conflicts with other paths) diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 0ae1a68b8251..4e59481671fd 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -170,7 +170,7 @@ public: using Window::GetQuickHelpText; const OUString& GetQuickHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + void SetHelpId( sal_uInt16 nItemId, const OUString& rHelpId ); void StartProgressMode( const OUString& rText ); void SetProgressValue( sal_uInt16 nPercent ); diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index d370c6399f0e..7eee3693bab8 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -137,7 +137,7 @@ private: protected: // Single argument ctors shall be explicit. explicit SystemWindow(WindowType nType, const char* pIdleDebugName); - void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); + void loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); void SetWindowState(const vcl::WindowData& rData); @@ -176,8 +176,8 @@ public: void SetMaxOutputSizePixel( const Size& rSize ); const Size& GetMaxOutputSizePixel() const; - void SetWindowState(std::string_view rStr); - OString GetWindowState(vcl::WindowDataMask nMask = vcl::WindowDataMask::All) const; + void SetWindowState(std::u16string_view rStr); + OUString GetWindowState(vcl::WindowDataMask nMask = vcl::WindowDataMask::All) const; void SetMenuBar(MenuBar* pMenuBar); MenuBar* GetMenuBar() const { return mpMenuBar; } diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 40fdd54f285c..c6dc7f2fcb23 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -130,7 +130,7 @@ public: sal_uInt16 GetPageCount() const; sal_uInt16 GetPageId( sal_uInt16 nPos ) const; sal_uInt16 GetPageId(const Point& rPos) const; - sal_uInt16 GetPageId( const OString& rName ) const; + sal_uInt16 GetPageId( const OUString& rName ) const; void SetCurPageId(sal_uInt16 nPageId); sal_uInt16 GetCurPageId() const; @@ -146,8 +146,8 @@ public: void SetHelpText( sal_uInt16 nPageId, const OUString& rText ); const OUString& GetHelpText( sal_uInt16 nPageId ) const; - void SetPageName( sal_uInt16 nPageId, const OString& rName ) const; - OString GetPageName( sal_uInt16 nPageId ) const; + void SetPageName( sal_uInt16 nPageId, const OUString& rName ) const; + OUString GetPageName( sal_uInt16 nPageId ) const; void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; @@ -189,7 +189,7 @@ public: virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; }; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 055d82f1e722..e04cb3d1ae37 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -257,7 +257,7 @@ protected: public: ToolBox(vcl::Window* pParent, WinBits nStyle = 0); - ToolBox(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + ToolBox(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~ToolBox() override; virtual void dispose() override; @@ -410,7 +410,7 @@ public: void SetHelpText( ToolBoxItemId nItemId, const OUString& rText ); const OUString& GetHelpText( ToolBoxItemId nItemId ) const; - void SetHelpId( ToolBoxItemId nItemId, const OString& rHelpId ); + void SetHelpId( ToolBoxItemId nItemId, const OUString& rHelpId ); // window size according to current alignment, floating state and number of lines Size CalcWindowSizePixel(); diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 6785dfd7008c..017c4d06ac54 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -98,7 +98,7 @@ public: bool IsSmallSymbol() const; void SetSmallSymbol(); - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; /// Sets the button state according to the FeatureStateEvent emitted by a Uno state change. virtual void statusChanged(const css::frame::FeatureStateEvent& rEvent); @@ -166,7 +166,7 @@ public: Size CalcMinimumSize() const; virtual Size GetOptimalSize() const override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void ShowFocus(const tools::Rectangle& rRect) override; void setAction(bool bIsAction) @@ -366,7 +366,7 @@ public: void SetToggleHdl( const Link<CheckBox&,void>& rLink ) { maToggleHdl = rLink; } - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void ShowFocus(const tools::Rectangle& rRect) override; /// Button has additional stuff that we need to dump too. @@ -480,7 +480,7 @@ public: */ std::vector<VclPtr<RadioButton> > GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; /* * Group this RadioButton with another diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx index f5d8a10f1ced..c7628e7321ef 100644 --- a/include/vcl/toolkit/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -189,7 +189,7 @@ public: // the drop down window container ImplListBoxWindow* GetMainWindow() const; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual FactoryFunction GetUITestFactory() const override; diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx index 679c0232ea30..5e11d2f783b5 100644 --- a/include/vcl/toolkit/dialog.hxx +++ b/include/vcl/toolkit/dialog.hxx @@ -92,7 +92,7 @@ public: protected: explicit Dialog( WindowType nType ); - explicit Dialog( vcl::Window* pParent, std::u16string_view rID, const OUString& rUIXMLDescription); + explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; virtual void settingOptimalLayoutSize(Window *pBox) override; @@ -115,7 +115,7 @@ public: virtual void PixelInvalidate(const tools::Rectangle* pRectangle) override; virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; VclButtonBox* get_action_area() { return mpActionArea; } VclBox* get_content_area() { return mpContentArea; } diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx index 54fbf511afdf..181940b6fe79 100644 --- a/include/vcl/toolkit/edit.hxx +++ b/include/vcl/toolkit/edit.hxx @@ -233,7 +233,7 @@ public: virtual OUString GetSurroundingText() const override; virtual Selection GetSurroundingTextSelection() const override; virtual bool DeleteSurroundingText(const Selection& rSelection) override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; void SetTextFilter(TextFilter* pFilter) { mpFilterText = pFilter; } diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index c127f91ccbb4..71f1bd7033ca 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -229,7 +229,7 @@ public: void SetLast( sal_Int64 nNewLast, FieldUnit eInUnit ); sal_Int64 GetLast( FieldUnit eOutUnit ) const; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void dispose() override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 238d1cbdfafb..2b88e895184a 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -71,7 +71,7 @@ public: static Size getTextDimensions(Control const *pControl, const OUString &rTxt, tools::Long nMaxWidth); Size CalcMinimumSize(tools::Long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; void set_mnemonic_widget(vcl::Window *pWindow); vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -171,7 +171,7 @@ public: const Image& GetImage() const { return maImage; } const Image& GetModeImage( ) const { return maImage;} - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; static Image loadThemeImage(const OUString &rFileName); diff --git a/include/vcl/toolkit/fixedhyper.hxx b/include/vcl/toolkit/fixedhyper.hxx index 6abfa0ac3a2a..1c199d501ae3 100644 --- a/include/vcl/toolkit/fixedhyper.hxx +++ b/include/vcl/toolkit/fixedhyper.hxx @@ -89,7 +89,7 @@ public: */ virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; /** sets m_aClickHdl with rLink. diff --git a/include/vcl/toolkit/floatwin.hxx b/include/vcl/toolkit/floatwin.hxx index 6799ac884520..1d9692c434f4 100644 --- a/include/vcl/toolkit/floatwin.hxx +++ b/include/vcl/toolkit/floatwin.hxx @@ -107,7 +107,7 @@ public: public: explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle); - explicit FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + explicit FloatingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~FloatingWindow() override; virtual void dispose() override; diff --git a/include/vcl/toolkit/fmtfield.hxx b/include/vcl/toolkit/fmtfield.hxx index 56992ddb449a..34b7ea755707 100644 --- a/include/vcl/toolkit/fmtfield.hxx +++ b/include/vcl/toolkit/fmtfield.hxx @@ -41,7 +41,7 @@ public: virtual void Last() override; // Default Implementation: Current double is set to the first or last value - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; public: virtual void SetText( const OUString& rStr ) override; virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override; diff --git a/include/vcl/toolkit/lstbox.hxx b/include/vcl/toolkit/lstbox.hxx index 8890fb7ec931..197122c254d2 100644 --- a/include/vcl/toolkit/lstbox.hxx +++ b/include/vcl/toolkit/lstbox.hxx @@ -251,7 +251,7 @@ public: void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual FactoryFunction GetUITestFactory() const override; diff --git a/include/vcl/toolkit/menubtn.hxx b/include/vcl/toolkit/menubtn.hxx index ca77a48c9fec..dba8ec1a52c1 100644 --- a/include/vcl/toolkit/menubtn.hxx +++ b/include/vcl/toolkit/menubtn.hxx @@ -39,7 +39,7 @@ private: std::unique_ptr<Timer> mpMenuTimer; VclPtr<PopupMenu> mpMenu; VclPtr<Window> mpFloatingWindow; - OString msCurItemIdent; + OUString msCurItemIdent; sal_uInt16 mnCurItemId; bool mbDelayMenu; bool mbStartingMenu; @@ -84,7 +84,7 @@ public: void SetPopover(Window* pWindow); Window* GetPopover() { return mpFloatingWindow.get(); } - OString const & GetCurItemIdent() const { return msCurItemIdent; } + OUString const& GetCurItemIdent() const { return msCurItemIdent; } void SetActivateHdl( const Link<MenuButton *, void>& rLink ) { maActivateHdl = rLink; } void SetSelectHdl( const Link<MenuButton *, void>& rLink ) { maSelectHdl = rLink; } diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index 1d958e17ceea..0fd864f9d104 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -468,7 +468,7 @@ public: void set_min_width_in_chars(sal_Int32 nChars); - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; VCL_DLLPRIVATE void SetCollapsedNodeBmp( const Image& ); VCL_DLLPRIVATE void SetExpandedNodeBmp( const Image& ); diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx index fedcb80687c7..2ca010451907 100644 --- a/include/vcl/toolkit/vclmedit.hxx +++ b/include/vcl/toolkit/vclmedit.hxx @@ -165,7 +165,7 @@ public: virtual FactoryFunction GetUITestFactory() const override; - virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual bool set_property(const OUString &rKey, const OUString &rValue) override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; }; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 21d6fec1acc2..31ea29f455b6 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -152,7 +152,7 @@ public: virtual Size get_pixel_size(const OUString& rText) const = 0; // The name of the widget in the GtkBuilder UI definition used to construct it. - virtual OString get_buildable_name() const = 0; + virtual OUString get_buildable_name() const = 0; /* Typically there is no need to change the buildable name at runtime, changing the id in .ui file itself is preferred. @@ -161,7 +161,7 @@ public: different widgets, that were loaded from the same .ui, to unique names in order to distinguish between them */ - virtual void set_buildable_name(const OString& rName) = 0; + virtual void set_buildable_name(const OUString& rName) = 0; /* The help id of the widget used to identify help for this widget. @@ -172,8 +172,8 @@ public: The default can be overwritten with set_help_id */ - virtual OString get_help_id() const = 0; - virtual void set_help_id(const OString& rName) = 0; + virtual OUString get_help_id() const = 0; + virtual void set_help_id(const OUString& rName) = 0; virtual void set_grid_left_attach(int nAttach) = 0; virtual int get_grid_left_attach() const = 0; @@ -327,7 +327,7 @@ public: //iterate upwards through the hierarchy starting at this widgets parent, //calling func with their helpid until func returns true or we run out of //parents - virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) = 0; + virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) = 0; virtual OUString strip_mnemonic(const OUString& rLabel) const = 0; @@ -475,36 +475,36 @@ class VCL_DLLPUBLIC Notebook : virtual public Widget friend class ::LOKTrigger; protected: - Link<const OString&, bool> m_aLeavePageHdl; - Link<const OString&, void> m_aEnterPageHdl; + Link<const OUString&, bool> m_aLeavePageHdl; + Link<const OUString&, void> m_aEnterPageHdl; public: virtual int get_current_page() const = 0; - virtual int get_page_index(const OString& rIdent) const = 0; - virtual OString get_page_ident(int nPage) const = 0; - virtual OString get_current_page_ident() const = 0; + virtual int get_page_index(const OUString& rIdent) const = 0; + virtual OUString get_page_ident(int nPage) const = 0; + virtual OUString get_current_page_ident() const = 0; virtual void set_current_page(int nPage) = 0; - virtual void set_current_page(const OString& rIdent) = 0; - virtual void remove_page(const OString& rIdent) = 0; - virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) = 0; - void append_page(const OString& rIdent, const OUString& rLabel) + virtual void set_current_page(const OUString& rIdent) = 0; + virtual void remove_page(const OUString& rIdent) = 0; + virtual void insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) = 0; + void append_page(const OUString& rIdent, const OUString& rLabel) { insert_page(rIdent, rLabel, -1); } - virtual void set_tab_label_text(const OString& rIdent, const OUString& rLabel) = 0; - virtual OUString get_tab_label_text(const OString& rIdent) const = 0; + virtual void set_tab_label_text(const OUString& rIdent, const OUString& rLabel) = 0; + virtual OUString get_tab_label_text(const OUString& rIdent) const = 0; virtual void set_show_tabs(bool bShow) = 0; virtual int get_n_pages() const = 0; - virtual weld::Container* get_page(const OString& rIdent) const = 0; + virtual weld::Container* get_page(const OUString& rIdent) const = 0; - void connect_leave_page(const Link<const OString&, bool>& rLink) { m_aLeavePageHdl = rLink; } - void connect_enter_page(const Link<const OString&, void>& rLink) { m_aEnterPageHdl = rLink; } + void connect_leave_page(const Link<const OUString&, bool>& rLink) { m_aLeavePageHdl = rLink; } + void connect_enter_page(const Link<const OUString&, void>& rLink) { m_aEnterPageHdl = rLink; } }; class VCL_DLLPUBLIC ScreenShotEntry { public: - ScreenShotEntry(OString aHelpId, const basegfx::B2IRange& rB2IRange) + ScreenShotEntry(OUString aHelpId, const basegfx::B2IRange& rB2IRange) : msHelpId(std::move(aHelpId)) , maB2IRange(rB2IRange) { @@ -512,10 +512,10 @@ public: const basegfx::B2IRange& getB2IRange() const { return maB2IRange; } - const OString& GetHelpId() const { return msHelpId; } + const OUString& GetHelpId() const { return msHelpId; } private: - OString msHelpId; + OUString msHelpId; basegfx::B2IRange maB2IRange; }; @@ -558,8 +558,8 @@ public: virtual void change_default_widget(weld::Widget* pOld, weld::Widget* pNew) = 0; virtual bool is_default_widget(const weld::Widget* pCandidate) const = 0; - virtual void set_window_state(const OString& rStr) = 0; - virtual OString get_window_state(vcl::WindowDataMask nMask) const = 0; + virtual void set_window_state(const OUString& rStr) = 0; + virtual OUString get_window_state(vcl::WindowDataMask nMask) const = 0; virtual css::uno::Reference<css::awt::XWindow> GetXWindow() = 0; @@ -615,8 +615,7 @@ public: const std::function<void(sal_Int32)>& func) = 0; virtual void response(int response) = 0; - virtual void add_button(const OUString& rText, int response, const OString& rHelpId = OString()) - = 0; + virtual void add_button(const OUString& rText, int response, const OUString& rHelpId = {}) = 0; virtual void set_default_response(int response) = 0; virtual Button* weld_widget_for_response(int response) = 0; virtual Container* weld_content_area() = 0; @@ -642,30 +641,30 @@ public: class VCL_DLLPUBLIC Assistant : virtual public Dialog { - Link<const OString&, bool> m_aJumpPageHdl; + Link<const OUString&, bool> m_aJumpPageHdl; protected: - bool signal_jump_page(const OString& rIdent) { return m_aJumpPageHdl.Call(rIdent); } + bool signal_jump_page(const OUString& rIdent) { return m_aJumpPageHdl.Call(rIdent); } public: virtual int get_current_page() const = 0; virtual int get_n_pages() const = 0; - virtual OString get_page_ident(int nPage) const = 0; - virtual OString get_current_page_ident() const = 0; + virtual OUString get_page_ident(int nPage) const = 0; + virtual OUString get_current_page_ident() const = 0; virtual void set_current_page(int nPage) = 0; - virtual void set_current_page(const OString& rIdent) = 0; + virtual void set_current_page(const OUString& rIdent) = 0; // move the page rIdent to position nIndex - virtual void set_page_index(const OString& rIdent, int nIndex) = 0; - virtual void set_page_title(const OString& rIdent, const OUString& rTitle) = 0; - virtual OUString get_page_title(const OString& rIdent) const = 0; - virtual void set_page_sensitive(const OString& rIdent, bool bSensitive) = 0; - virtual weld::Container* append_page(const OString& rIdent) = 0; + virtual void set_page_index(const OUString& rIdent, int nIndex) = 0; + virtual void set_page_title(const OUString& rIdent, const OUString& rTitle) = 0; + virtual OUString get_page_title(const OUString& rIdent) const = 0; + virtual void set_page_sensitive(const OUString& rIdent, bool bSensitive) = 0; + virtual weld::Container* append_page(const OUString& rIdent) = 0; - virtual void set_page_side_help_id(const OString& rHelpId) = 0; + virtual void set_page_side_help_id(const OUString& rHelpId) = 0; virtual void set_page_side_image(const OUString& rImage) = 0; - void connect_jump_page(const Link<const OString&, bool>& rLink) { m_aJumpPageHdl = rLink; } + void connect_jump_page(const Link<const OUString&, bool>& rLink) { m_aJumpPageHdl = rLink; } }; inline OUString toId(const void* pValue) @@ -875,7 +874,7 @@ public: // create a virtual device compatible with the device passed in render_args wrt alpha virtual VclPtr<VirtualDevice> create_render_virtual_device() const = 0; // set a sub menu for a entry, only works with custom rendering - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) = 0; + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) = 0; // get the width needed to show the menu launcher in a custom row virtual int get_menu_button_width() const = 0; @@ -1583,13 +1582,13 @@ struct VCL_DLLPUBLIC TriStateEnabled class VCL_DLLPUBLIC MenuButton : virtual public ToggleButton { - Link<const OString&, void> m_aSelectHdl; + Link<const OUString&, void> m_aSelectHdl; protected: - void signal_selected(const OString& rIdent) { m_aSelectHdl.Call(rIdent); } + void signal_selected(const OUString& rIdent) { m_aSelectHdl.Call(rIdent); } public: - void connect_selected(const Link<const OString&, void>& rLink) { m_aSelectHdl = rLink; } + void connect_selected(const Link<const OUString&, void>& rLink) { m_aSelectHdl = rLink; } virtual void insert_item(int pos, const OUString& rId, const OUString& rStr, const OUString* pIconName, VirtualDevice* pImageSurface, @@ -1617,13 +1616,13 @@ public: } virtual void insert_separator(int pos, const OUString& rId) = 0; void append_separator(const OUString& rId) { insert_separator(-1, rId); } - virtual void remove_item(const OString& rId) = 0; + virtual void remove_item(const OUString& rId) = 0; virtual void clear() = 0; - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) = 0; - virtual void set_item_active(const OString& rIdent, bool bActive) = 0; - virtual void set_item_label(const OString& rIdent, const OUString& rLabel) = 0; - virtual OUString get_item_label(const OString& rIdent) const = 0; - virtual void set_item_visible(const OString& rIdent, bool bVisible) = 0; + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) = 0; + virtual void set_item_active(const OUString& rIdent, bool bActive) = 0; + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) = 0; + virtual OUString get_item_label(const OUString& rIdent) const = 0; + virtual void set_item_visible(const OUString& rIdent, bool bVisible) = 0; virtual void set_popover(weld::Widget* pPopover) = 0; }; @@ -2148,8 +2147,8 @@ public: { m_xSpinButton->connect_focus_out(rLink); } - OString get_buildable_name() const { return m_xSpinButton->get_buildable_name(); } - void set_help_id(const OString& rName) { m_xSpinButton->set_help_id(rName); } + OUString get_buildable_name() const { return m_xSpinButton->get_buildable_name(); } + void set_help_id(const OUString& rName) { m_xSpinButton->set_help_id(rName); } void set_position(int nCursorPos) { m_xSpinButton->set_position(nCursorPos); } // set the width of the underlying widget in characters, this setting is // invalidated when changing the units, range or digits, so to have effect @@ -2369,25 +2368,25 @@ enum class Placement class VCL_DLLPUBLIC Menu { - Link<const OString&, void> m_aActivateHdl; + Link<const OUString&, void> m_aActivateHdl; protected: - void signal_activate(const OString& rIdent) { m_aActivateHdl.Call(rIdent); } + void signal_activate(const OUString& rIdent) { m_aActivateHdl.Call(rIdent); } public: - virtual OString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, - Placement ePlace = Placement::Under) + virtual OUString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, + Placement ePlace = Placement::Under) = 0; - void connect_activate(const Link<const OString&, void>& rLink) { m_aActivateHdl = rLink; } + void connect_activate(const Link<const OUString&, void>& rLink) { m_aActivateHdl = rLink; } - virtual void set_sensitive(const OString& rIdent, bool bSensitive) = 0; - virtual bool get_sensitive(const OString& rIdent) const = 0; - virtual void set_label(const OString& rIdent, const OUString& rLabel) = 0; - virtual OUString get_label(const OString& rIdent) const = 0; - virtual void set_active(const OString& rIdent, bool bActive) = 0; - virtual bool get_active(const OString& rIdent) const = 0; - virtual void set_visible(const OString& rIdent, bool bVisible) = 0; + virtual void set_sensitive(const OUString& rIdent, bool bSensitive) = 0; + virtual bool get_sensitive(const OUString& rIdent) const = 0; + virtual void set_label(const OUString& rIdent, const OUString& rLabel) = 0; + virtual OUString get_label(const OUString& rIdent) const = 0; + virtual void set_active(const OUString& rIdent, bool bActive) = 0; + virtual bool get_active(const OUString& rIdent) const = 0; + virtual void set_visible(const OUString& rIdent, bool bVisible) = 0; virtual void insert(int pos, const OUString& rId, const OUString& rStr, const OUString* pIconName, VirtualDevice* pImageSurface, @@ -2395,7 +2394,7 @@ public: TriState eCheckRadioFalse) = 0; - virtual void remove(const OString& rId) = 0; + virtual void remove(const OUString& rId) = 0; virtual void clear() = 0; @@ -2426,7 +2425,7 @@ public: // return the number of toplevel nodes virtual int n_children() const = 0; - virtual OString get_id(int pos) const = 0; + virtual OUString get_id(int pos) const = 0; virtual ~Menu() {} }; @@ -2454,45 +2453,45 @@ public: class VCL_DLLPUBLIC Toolbar : virtual public Widget { - Link<const OString&, void> m_aClickHdl; - Link<const OString&, void> m_aToggleMenuHdl; + Link<const OUString&, void> m_aClickHdl; + Link<const OUString&, void> m_aToggleMenuHdl; protected: friend class ::LOKTrigger; - void signal_clicked(const OString& rIdent) { m_aClickHdl.Call(rIdent); } - void signal_toggle_menu(const OString& rIdent) { m_aToggleMenuHdl.Call(rIdent); } + void signal_clicked(const OUString& rIdent) { m_aClickHdl.Call(rIdent); } + void signal_toggle_menu(const OUString& rIdent) { m_aToggleMenuHdl.Call(rIdent); } public: - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) = 0; - virtual bool get_item_sensitive(const OString& rIdent) const = 0; - virtual void set_item_active(const OString& rIdent, bool bActive) = 0; - virtual bool get_item_active(const OString& rIdent) const = 0; - virtual void set_menu_item_active(const OString& rIdent, bool bActive) = 0; - virtual bool get_menu_item_active(const OString& rIdent) const = 0; - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) = 0; - virtual void set_item_popover(const OString& rIdent, weld::Widget* pPopover) = 0; - virtual void set_item_visible(const OString& rIdent, bool bVisible) = 0; - virtual void set_item_help_id(const OString& rIdent, const OString& rHelpId) = 0; - virtual bool get_item_visible(const OString& rIdent) const = 0; - virtual void set_item_label(const OString& rIdent, const OUString& rLabel) = 0; - virtual OUString get_item_label(const OString& rIdent) const = 0; - virtual void set_item_tooltip_text(const OString& rIdent, const OUString& rTip) = 0; - virtual OUString get_item_tooltip_text(const OString& rIdent) const = 0; - virtual void set_item_icon_name(const OString& rIdent, const OUString& rIconName) = 0; - virtual void set_item_image_mirrored(const OString& rIdent, bool bMirrored) = 0; - virtual void set_item_image(const OString& rIdent, + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) = 0; + virtual bool get_item_sensitive(const OUString& rIdent) const = 0; + virtual void set_item_active(const OUString& rIdent, bool bActive) = 0; + virtual bool get_item_active(const OUString& rIdent) const = 0; + virtual void set_menu_item_active(const OUString& rIdent, bool bActive) = 0; + virtual bool get_menu_item_active(const OUString& rIdent) const = 0; + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) = 0; + virtual void set_item_popover(const OUString& rIdent, weld::Widget* pPopover) = 0; + virtual void set_item_visible(const OUString& rIdent, bool bVisible) = 0; + virtual void set_item_help_id(const OUString& rIdent, const OUString& rHelpId) = 0; + virtual bool get_item_visible(const OUString& rIdent) const = 0; + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) = 0; + virtual OUString get_item_label(const OUString& rIdent) const = 0; + virtual void set_item_tooltip_text(const OUString& rIdent, const OUString& rTip) = 0; + virtual OUString get_item_tooltip_text(const OUString& rIdent) const = 0; + virtual void set_item_icon_name(const OUString& rIdent, const OUString& rIconName) = 0; + virtual void set_item_image_mirrored(const OUString& rIdent, bool bMirrored) = 0; + virtual void set_item_image(const OUString& rIdent, const css::uno::Reference<css::graphic::XGraphic>& rIcon) = 0; - virtual void set_item_image(const OString& rIdent, VirtualDevice* pDevice) = 0; + virtual void set_item_image(const OUString& rIdent, VirtualDevice* pDevice) = 0; virtual void insert_item(int pos, const OUString& rId) = 0; virtual void insert_separator(int pos, const OUString& rId) = 0; void append_separator(const OUString& rId) { insert_separator(-1, rId); } virtual int get_n_items() const = 0; - virtual OString get_item_ident(int nIndex) const = 0; - virtual void set_item_ident(int nIndex, const OString& rIdent) = 0; + virtual OUString get_item_ident(int nIndex) const = 0; + virtual void set_item_ident(int nIndex, const OUString& rIdent) = 0; virtual void set_item_label(int nIndex, const OUString& rLabel) = 0; virtual void set_item_image(int nIndex, const css::uno::Reference<css::graphic::XGraphic>& rIcon) @@ -2509,8 +2508,11 @@ public: // is dropped at rPoint virtual int get_drop_index(const Point& rPoint) const = 0; - void connect_clicked(const Link<const OString&, void>& rLink) { m_aClickHdl = rLink; } - void connect_menu_toggled(const Link<const OString&, void>& rLink) { m_aToggleMenuHdl = rLink; } + void connect_clicked(const Link<const OUString&, void>& rLink) { m_aClickHdl = rLink; } + void connect_menu_toggled(const Link<const OUString&, void>& rLink) + { + m_aToggleMenuHdl = rLink; + } }; class VCL_DLLPUBLIC Scrollbar : virtual public Widget @@ -2557,57 +2559,57 @@ public: class VCL_DLLPUBLIC Builder { public: - virtual std::unique_ptr<MessageDialog> weld_message_dialog(const OString& id) = 0; - virtual std::unique_ptr<Dialog> weld_dialog(const OString& id) = 0; - virtual std::unique_ptr<Assistant> weld_assistant(const OString& id) = 0; - virtual std::unique_ptr<Widget> weld_widget(const OString& id) = 0; - virtual std::unique_ptr<Container> weld_container(const OString& id) = 0; - virtual std::unique_ptr<Box> weld_box(const OString& id) = 0; - virtual std::unique_ptr<Paned> weld_paned(const OString& id) = 0; - virtual std::unique_ptr<Button> weld_button(const OString& id) = 0; - virtual std::unique_ptr<MenuButton> weld_menu_button(const OString& id) = 0; - virtual std::unique_ptr<MenuToggleButton> weld_menu_toggle_button(const OString& id) = 0; - virtual std::unique_ptr<Frame> weld_frame(const OString& id) = 0; + virtual std::unique_ptr<MessageDialog> weld_message_dialog(const OUString& id) = 0; + virtual std::unique_ptr<Dialog> weld_dialog(const OUString& id) = 0; + virtual std::unique_ptr<Assistant> weld_assistant(const OUString& id) = 0; + virtual std::unique_ptr<Widget> weld_widget(const OUString& id) = 0; + virtual std::unique_ptr<Container> weld_container(const OUString& id) = 0; + virtual std::unique_ptr<Box> weld_box(const OUString& id) = 0; + virtual std::unique_ptr<Paned> weld_paned(const OUString& id) = 0; + virtual std::unique_ptr<Button> weld_button(const OUString& id) = 0; + virtual std::unique_ptr<MenuButton> weld_menu_button(const OUString& id) = 0; + virtual std::unique_ptr<MenuToggleButton> weld_menu_toggle_button(const OUString& id) = 0; + virtual std::unique_ptr<Frame> weld_frame(const OUString& id) = 0; /* bUserManagedScrolling of true means that the automatic scrolling of the window is disabled and the owner must specifically listen to adjustment changes and react appropriately to them. */ - virtual std::unique_ptr<ScrolledWindow> weld_scrolled_window(const OString& id, + virtual std::unique_ptr<ScrolledWindow> weld_scrolled_window(const OUString& id, bool bUserManagedScrolling = false) = 0; - virtual std::unique_ptr<Notebook> weld_notebook(const OString& id) = 0; - virtual std::unique_ptr<ToggleButton> weld_toggle_button(const OString& id) = 0; - virtual std::unique_ptr<RadioButton> weld_radio_button(const OString& id) = 0; - virtual std::unique_ptr<CheckButton> weld_check_button(const OString& id) = 0; - virtual std::unique_ptr<LinkButton> weld_link_button(const OString& id) = 0; - virtual std::unique_ptr<SpinButton> weld_spin_button(const OString& id) = 0; - virtual std::unique_ptr<MetricSpinButton> weld_metric_spin_button(const OString& id, + virtual std::unique_ptr<Notebook> weld_notebook(const OUString& id) = 0; + virtual std::unique_ptr<ToggleButton> weld_toggle_button(const OUString& id) = 0; + virtual std::unique_ptr<RadioButton> weld_radio_button(const OUString& id) = 0; + virtual std::unique_ptr<CheckButton> weld_check_button(const OUString& id) = 0; + virtual std::unique_ptr<LinkButton> weld_link_button(const OUString& id) = 0; + virtual std::unique_ptr<SpinButton> weld_spin_button(const OUString& id) = 0; + virtual std::unique_ptr<MetricSpinButton> weld_metric_spin_button(const OUString& id, FieldUnit eUnit) = 0; - virtual std::unique_ptr<FormattedSpinButton> weld_formatted_spin_button(const OString& id) = 0; - virtual std::unique_ptr<ComboBox> weld_combo_box(const OString& id) = 0; - virtual std::unique_ptr<TreeView> weld_tree_view(const OString& id) = 0; - virtual std::unique_ptr<IconView> weld_icon_view(const OString& id) = 0; - virtual std::unique_ptr<Label> weld_label(const OString& id) = 0; - virtual std::unique_ptr<TextView> weld_text_view(const OString& id) = 0; - virtual std::unique_ptr<Expander> weld_expander(const OString& id) = 0; - virtual std::unique_ptr<Entry> weld_entry(const OString& id) = 0; - virtual std::unique_ptr<Scale> weld_scale(const OString& id) = 0; - virtual std::unique_ptr<ProgressBar> weld_progress_bar(const OString& id) = 0; - virtual std::unique_ptr<Spinner> weld_spinner(const OString& id) = 0; - virtual std::unique_ptr<Image> weld_image(const OString& id) = 0; - virtual std::unique_ptr<Calendar> weld_calendar(const OString& id) = 0; + virtual std::unique_ptr<FormattedSpinButton> weld_formatted_spin_button(const OUString& id) = 0; + virtual std::unique_ptr<ComboBox> weld_combo_box(const OUString& id) = 0; + virtual std::unique_ptr<TreeView> weld_tree_view(const OUString& id) = 0; + virtual std::unique_ptr<IconView> weld_icon_view(const OUString& id) = 0; + virtual std::unique_ptr<Label> weld_label(const OUString& id) = 0; + virtual std::unique_ptr<TextView> weld_text_view(const OUString& id) = 0; + virtual std::unique_ptr<Expander> weld_expander(const OUString& id) = 0; + virtual std::unique_ptr<Entry> weld_entry(const OUString& id) = 0; + virtual std::unique_ptr<Scale> weld_scale(const OUString& id) = 0; + virtual std::unique_ptr<ProgressBar> weld_progress_bar(const OUString& id) = 0; + virtual std::unique_ptr<Spinner> weld_spinner(const OUString& id) = 0; + virtual std::unique_ptr<Image> weld_image(const OUString& id) = 0; + virtual std::unique_ptr<Calendar> weld_calendar(const OUString& id) = 0; virtual std::unique_ptr<DrawingArea> - weld_drawing_area(const OString& id, const a11yref& rA11yImpl = nullptr, + weld_drawing_area(const OUString& id, const a11yref& rA11yImpl = nullptr, FactoryFunction pUITestFactoryFunction = nullptr, void* pUserData = nullptr) = 0; - virtual std::unique_ptr<EntryTreeView> weld_entry_tree_view(const OString& containerid, - const OString& entryid, - const OString& treeviewid) + virtual std::unique_ptr<EntryTreeView> weld_entry_tree_view(const OUString& containerid, + const OUString& entryid, + const OUString& treeviewid) = 0; - virtual std::unique_ptr<Menu> weld_menu(const OString& id) = 0; - virtual std::unique_ptr<Popover> weld_popover(const OString& id) = 0; - virtual std::unique_ptr<Toolbar> weld_toolbar(const OString& id) = 0; - virtual std::unique_ptr<Scrollbar> weld_scrollbar(const OString& id) = 0; + virtual std::unique_ptr<Menu> weld_menu(const OUString& id) = 0; + virtual std::unique_ptr<Popover> weld_popover(const OUString& id) = 0; + virtual std::unique_ptr<Toolbar> weld_toolbar(const OUString& id) = 0; + virtual std::unique_ptr<Scrollbar> weld_scrollbar(const OUString& id) = 0; virtual std::unique_ptr<SizeGroup> create_size_group() = 0; /* return a Dialog suitable to take a screenshot of containing the contents of the .ui file. @@ -2632,8 +2634,8 @@ public: const std::function<void(sal_Int32)>&); void set_title(const OUString& rTitle) { getDialog()->set_title(rTitle); } OUString get_title() const { return getConstDialog()->get_title(); } - void set_help_id(const OString& rHelpId) { getDialog()->set_help_id(rHelpId); } - OString get_help_id() const { return getConstDialog()->get_help_id(); } + void set_help_id(const OUString& rHelpId) { getDialog()->set_help_id(rHelpId); } + OUString get_help_id() const { return getConstDialog()->get_help_id(); } void response(int nResponse) { getDialog()->response(nResponse); } virtual ~DialogController() COVERITY_NOEXCEPT_FALSE; }; @@ -2646,7 +2648,7 @@ protected: public: GenericDialogController(weld::Widget* pParent, const OUString& rUIFile, - const OString& rDialogId, bool bMobile = false); + const OUString& rDialogId, bool bMobile = false); virtual Dialog* getDialog() override; virtual ~GenericDialogController() COVERITY_NOEXCEPT_FALSE override; }; @@ -2672,7 +2674,7 @@ public: explicitly exist in the ui description, but is only implied. */ MessageDialogController(weld::Widget* pParent, const OUString& rUIFile, - const OString& rDialogId, const OString& rRelocateId = OString()); + const OUString& rDialogId, const OUString& rRelocateId = {}); virtual Dialog* getDialog() override; virtual ~MessageDialogController() override; void set_primary_text(const OUString& rText) { m_xDialog->set_primary_text(rText); } @@ -2689,7 +2691,7 @@ protected: std::unique_ptr<weld::Assistant> m_xAssistant; public: - AssistantController(weld::Widget* pParent, const OUString& rUIFile, const OString& rDialogId); + AssistantController(weld::Widget* pParent, const OUString& rUIFile, const OUString& rDialogId); virtual Dialog* getDialog() override; virtual ~AssistantController() override; }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 29c60ae722e5..2a94c3bd414c 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1056,8 +1056,8 @@ public: void SetQuickHelpText( const OUString& rHelpText ); const OUString& GetQuickHelpText() const; - void SetHelpId( const OString& ); - const OString& GetHelpId() const; + void SetHelpId( const OUString& ); + const OUString& GetHelpId() const; sal_uInt16 GetChildCount() const; vcl::Window* GetChild( sal_uInt16 nChild ) const; @@ -1384,14 +1384,14 @@ public: * * @return false if property is unknown */ - virtual bool set_property(const OString &rKey, const OUString &rValue); + virtual bool set_property(const OUString &rKey, const OUString &rValue); /* * Sets a font attribute * * @return false if attribute is unknown */ - bool set_font_attribute(const OString &rKey, std::u16string_view rValue); + bool set_font_attribute(const OUString &rKey, std::u16string_view rValue); /* * Adds this widget to the xGroup VclSizeGroup diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx index ed3cbf1a7f6e..527e3661e9ce 100644 --- a/include/vcl/windowstate.hxx +++ b/include/vcl/windowstate.hxx @@ -80,10 +80,10 @@ public: , mnMaximizedHeight(0) { } - WindowData(std::string_view rStr); + WindowData(std::u16string_view rStr); // serialize values to a string (the original WindowState representation) - OString toStr() const; + OUString toStr() const; void setState(WindowState nState) { m_nState = nState; } WindowState state() const { return m_nState; } diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx index a29b03a38062..3a3e6061a7c1 100644 --- a/include/vcl/wizardmachine.hxx +++ b/include/vcl/wizardmachine.hxx @@ -79,7 +79,7 @@ namespace vcl class VCL_DLLPUBLIC OWizardPage : public BuilderPage, public IWizardPageController { public: - OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID); + OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID); virtual ~OWizardPage() override; // IWizardPageController overridables @@ -302,8 +302,8 @@ namespace vcl */ void getStateHistory(std::vector<WizardTypes::WizardState>& out_rHistory); - virtual OString getPageIdentForState(WizardTypes::WizardState nState) const; - virtual WizardTypes::WizardState getStateFromPageIdent(const OString& rIdent) const; + virtual OUString getPageIdentForState(WizardTypes::WizardState nState) const; + virtual WizardTypes::WizardState getStateFromPageIdent(const OUString& rIdent) const; public: class AccessGuard diff --git a/reportdesign/inc/helpids.h b/reportdesign/inc/helpids.h index 219d967228c0..94374c834105 100644 --- a/reportdesign/inc/helpids.h +++ b/reportdesign/inc/helpids.h @@ -27,59 +27,59 @@ inline constexpr OUStringLiteral UID_RPT_PROP_CHARTTYPE_DLG = u"REPORTDESIGN_UID inline constexpr OUStringLiteral UID_RPT_PROP_DLG_LINKFIELDS = u"REPORTDESIGN_UID_RPT_PROP_DLG_LINKFIELDS"; #define UID_RPT_RPT_APP_VIEW "REPORTDESIGN_UID_RPT_RPT_APP_VIEW" -inline constexpr OStringLiteral UID_RPT_REPORTWINDOW = "REPORTDESIGN_UID_RPT_REPORTWINDOW"; -inline constexpr OStringLiteral HID_REPORTSECTION = "REPORTDESIGN_HID_REPORTSECTION"; -inline constexpr OStringLiteral HID_RPT_FIELDEXPRESSION = "REPORTDESIGN_HID_RPT_FIELDEXPRESSION"; -inline constexpr OStringLiteral HID_RPT_FIELD_SEL = "REPORTDESIGN_HID_RPT_FIELD_SEL"; +inline constexpr OUStringLiteral UID_RPT_REPORTWINDOW = u"REPORTDESIGN_UID_RPT_REPORTWINDOW"; +inline constexpr OUStringLiteral HID_REPORTSECTION = u"REPORTDESIGN_HID_REPORTSECTION"; +inline constexpr OUStringLiteral HID_RPT_FIELDEXPRESSION = u"REPORTDESIGN_HID_RPT_FIELDEXPRESSION"; +inline constexpr OUStringLiteral HID_RPT_FIELD_SEL = u"REPORTDESIGN_HID_RPT_FIELD_SEL"; #define HID_RPT_FIELD_SEL_WIN "REPORTDESIGN_HID_RPT_FIELD_SEL_WIN" -inline constexpr OStringLiteral HID_RPT_PROPDLG_TAB_GENERAL = "REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL"; -inline constexpr OStringLiteral HID_RPT_PROPDLG_TAB_DATA = "REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA"; +inline constexpr OUStringLiteral HID_RPT_PROPDLG_TAB_GENERAL = u"REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL"; +inline constexpr OUStringLiteral HID_RPT_PROPDLG_TAB_DATA = u"REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA"; -inline constexpr OStringLiteral HID_RPT_PROP_FORCENEWPAGE = "REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE"; -inline constexpr OStringLiteral HID_RPT_PROP_NEWROWORCOL = "REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL"; -inline constexpr OStringLiteral HID_RPT_PROP_KEEPTOGETHER = "REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER"; -inline constexpr OStringLiteral HID_RPT_PROP_CANGROW = "REPORTDESIGN_HID_RPT_PROP_CANGROW"; -inline constexpr OStringLiteral HID_RPT_PROP_CANSHRINK = "REPORTDESIGN_HID_RPT_PROP_CANSHRINK"; -inline constexpr OStringLiteral HID_RPT_PROP_REPEATSECTION = "REPORTDESIGN_HID_RPT_PROP_REPEATSECTION"; -inline constexpr OStringLiteral HID_RPT_PROP_FORMULALIST = "REPORTDESIGN_HID_RPT_PROP_FORMULALIST"; -inline constexpr OStringLiteral HID_RPT_PROP_SCOPE = "REPORTDESIGN_HID_RPT_PROP_SCOPE"; -inline constexpr OStringLiteral HID_RPT_PROP_TYPE = "REPORTDESIGN_HID_RPT_PROP_TYPE"; -inline constexpr OStringLiteral HID_RPT_PROP_MASTERFIELDS = "REPORTDESIGN_HID_RPT_PROP_MASTERFIELDS"; -inline constexpr OStringLiteral HID_RPT_PROP_DETAILFIELDS = "REPORTDESIGN_HID_RPT_PROP_DETAILFIELDS"; -inline constexpr OStringLiteral HID_RPT_PROP_AREA = "REPORTDESIGN_HID_RPT_PROP_AREA"; -inline constexpr OStringLiteral HID_RPT_PROP_MIMETYPE = "REPORTDESIGN_HID_RPT_PROP_MIMETYPE"; +inline constexpr OUStringLiteral HID_RPT_PROP_FORCENEWPAGE = u"REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE"; +inline constexpr OUStringLiteral HID_RPT_PROP_NEWROWORCOL = u"REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL"; +inline constexpr OUStringLiteral HID_RPT_PROP_KEEPTOGETHER = u"REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER"; +inline constexpr OUStringLiteral HID_RPT_PROP_CANGROW = u"REPORTDESIGN_HID_RPT_PROP_CANGROW"; +inline constexpr OUStringLiteral HID_RPT_PROP_CANSHRINK = u"REPORTDESIGN_HID_RPT_PROP_CANSHRINK"; +inline constexpr OUStringLiteral HID_RPT_PROP_REPEATSECTION = u"REPORTDESIGN_HID_RPT_PROP_REPEATSECTION"; +inline constexpr OUStringLiteral HID_RPT_PROP_FORMULALIST = u"REPORTDESIGN_HID_RPT_PROP_FORMULALIST"; +inline constexpr OUStringLiteral HID_RPT_PROP_SCOPE = u"REPORTDESIGN_HID_RPT_PROP_SCOPE"; +inline constexpr OUStringLiteral HID_RPT_PROP_TYPE = u"REPORTDESIGN_HID_RPT_PROP_TYPE"; +inline constexpr OUStringLiteral HID_RPT_PROP_MASTERFIELDS = u"REPORTDESIGN_HID_RPT_PROP_MASTERFIELDS"; +inline constexpr OUStringLiteral HID_RPT_PROP_DETAILFIELDS = u"REPORTDESIGN_HID_RPT_PROP_DETAILFIELDS"; +inline constexpr OUStringLiteral HID_RPT_PROP_AREA = u"REPORTDESIGN_HID_RPT_PROP_AREA"; +inline constexpr OUStringLiteral HID_RPT_PROP_MIMETYPE = u"REPORTDESIGN_HID_RPT_PROP_MIMETYPE"; // free // free -inline constexpr OStringLiteral HID_RPT_PROP_PRINTREPEATEDVALUES = "REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES"; -inline constexpr OStringLiteral HID_RPT_PROP_CONDITIONALPRINTEXPRESSION = "REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION"; -inline constexpr OStringLiteral HID_RPT_PROP_VERTICALALIGN = "REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN"; -inline constexpr OStringLiteral HID_RPT_PROP_STARTNEWCOLUMN = "REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN"; -inline constexpr OStringLiteral HID_RPT_PROP_RESETPAGENUMBER = "REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER"; -inline constexpr OStringLiteral HID_RPT_PROP_PARAADJUST = "REPORTDESIGN_HID_RPT_PROP_PARAADJUST"; -inline constexpr OStringLiteral HID_RPT_PROP_PRINTWHENGROUPCHANGE = "REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE"; -inline constexpr OStringLiteral HID_RPT_PROP_CHARTTYPE = "REPORTDESIGN_HID_RPT_PROP_CHARTTYPE"; +inline constexpr OUStringLiteral HID_RPT_PROP_PRINTREPEATEDVALUES = u"REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES"; +inline constexpr OUStringLiteral HID_RPT_PROP_CONDITIONALPRINTEXPRESSION = u"REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION"; +inline constexpr OUStringLiteral HID_RPT_PROP_VERTICALALIGN = u"REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN"; +inline constexpr OUStringLiteral HID_RPT_PROP_STARTNEWCOLUMN = u"REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN"; +inline constexpr OUStringLiteral HID_RPT_PROP_RESETPAGENUMBER = u"REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER"; +inline constexpr OUStringLiteral HID_RPT_PROP_PARAADJUST = u"REPORTDESIGN_HID_RPT_PROP_PARAADJUST"; +inline constexpr OUStringLiteral HID_RPT_PROP_PRINTWHENGROUPCHANGE = u"REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE"; +inline constexpr OUStringLiteral HID_RPT_PROP_CHARTTYPE = u"REPORTDESIGN_HID_RPT_PROP_CHARTTYPE"; // free // free -inline constexpr OStringLiteral HID_RPT_PROP_VISIBLE = "REPORTDESIGN_HID_RPT_PROP_VISIBLE"; -inline constexpr OStringLiteral HID_RPT_PROP_GROUPKEEPTOGETHER = "REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER"; -inline constexpr OStringLiteral HID_RPT_PROP_PAGEHEADEROPTION = "REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION"; -inline constexpr OStringLiteral HID_RPT_PROP_PAGEFOOTEROPTION = "REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION"; -inline constexpr OStringLiteral HID_RPT_PROP_PREVIEW_COUNT = "REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT"; -inline constexpr OStringLiteral HID_RPT_PROP_DATAFIELD = "REPORTDESIGN_HID_RPT_PROP_DATAFIELD"; -inline constexpr OStringLiteral HID_RPT_PROP_BACKCOLOR = "REPORTDESIGN_HID_RPT_PROP_BACKCOLOR"; -inline constexpr OStringLiteral HID_RPT_PROP_RPT_POSITIONX = "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX"; -inline constexpr OStringLiteral HID_RPT_PROP_RPT_POSITIONY = "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY"; -inline constexpr OStringLiteral HID_RPT_PROP_RPT_WIDTH = "REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH"; -inline constexpr OStringLiteral HID_RPT_PROP_RPT_HEIGHT = "REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT"; -inline constexpr OStringLiteral HID_RPT_PROP_RPT_AUTOGROW = "REPORTDESIGN_HID_RPT_PROP_RPT_AUTOGROW"; -inline constexpr OStringLiteral HID_RPT_PROP_DEEPTRAVERSING = "REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING"; -inline constexpr OStringLiteral HID_RPT_PROP_PREEVALUATED = "REPORTDESIGN_HID_RPT_PROP_PREEVALUATED"; -inline constexpr OStringLiteral HID_REPORT_NAVIGATOR_TREE = "REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE"; -inline constexpr OStringLiteral HID_RPT_PROP_FORMULA = "REPORTDESIGN_HID_RPT_PROP_FORMULA"; -inline constexpr OStringLiteral HID_RPT_PROP_INITIALFORMULA = "REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA"; -inline constexpr OStringLiteral HID_RPT_PROP_RPT_FONT = "REPORTDESIGN_HID_RPT_PROP_RPT_FONT"; -inline constexpr OStringLiteral HID_RPT_PROP_PRESERVEIRI = "REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI"; -inline constexpr OStringLiteral HID_RPT_PROP_BACKTRANSPARENT = "REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT"; -inline constexpr OStringLiteral HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT = "REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT"; +inline constexpr OUStringLiteral HID_RPT_PROP_VISIBLE = u"REPORTDESIGN_HID_RPT_PROP_VISIBLE"; +inline constexpr OUStringLiteral HID_RPT_PROP_GROUPKEEPTOGETHER = u"REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER"; +inline constexpr OUStringLiteral HID_RPT_PROP_PAGEHEADEROPTION = u"REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION"; +inline constexpr OUStringLiteral HID_RPT_PROP_PAGEFOOTEROPTION = u"REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION"; +inline constexpr OUStringLiteral HID_RPT_PROP_PREVIEW_COUNT = u"REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT"; +inline constexpr OUStringLiteral HID_RPT_PROP_DATAFIELD = u"REPORTDESIGN_HID_RPT_PROP_DATAFIELD"; +inline constexpr OUStringLiteral HID_RPT_PROP_BACKCOLOR = u"REPORTDESIGN_HID_RPT_PROP_BACKCOLOR"; +inline constexpr OUStringLiteral HID_RPT_PROP_RPT_POSITIONX = u"REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX"; +inline constexpr OUStringLiteral HID_RPT_PROP_RPT_POSITIONY = u"REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY"; +inline constexpr OUStringLiteral HID_RPT_PROP_RPT_WIDTH = u"REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH"; +inline constexpr OUStringLiteral HID_RPT_PROP_RPT_HEIGHT = u"REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT"; +inline constexpr OUStringLiteral HID_RPT_PROP_RPT_AUTOGROW = u"REPORTDESIGN_HID_RPT_PROP_RPT_AUTOGROW"; +inline constexpr OUStringLiteral HID_RPT_PROP_DEEPTRAVERSING = u"REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING"; +inline constexpr OUStringLiteral HID_RPT_PROP_PREEVALUATED = u"REPORTDESIGN_HID_RPT_PROP_PREEVALUATED"; +inline constexpr OUStringLiteral HID_REPORT_NAVIGATOR_TREE = u"REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE"; +inline constexpr OUStringLiteral HID_RPT_PROP_FORMULA = u"REPORTDESIGN_HID_RPT_PROP_FORMULA"; +inline constexpr OUStringLiteral HID_RPT_PROP_INITIALFORMULA = u"REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA"; +inline constexpr OUStringLiteral HID_RPT_PROP_RPT_FONT = u"REPORTDESIGN_HID_RPT_PROP_RPT_FONT"; +inline constexpr OUStringLiteral HID_RPT_PROP_PRESERVEIRI = u"REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI"; +inline constexpr OUStringLiteral HID_RPT_PROP_BACKTRANSPARENT = u"REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT"; +inline constexpr OUStringLiteral HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT = u"REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 6ae0ccabebf1..631a7f7d9015 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -188,7 +188,7 @@ void OAddFieldWindow::Update() // ListBox loeschen m_xListBox->clear(); m_aListBoxData.clear(); - const OString aIds[] = { "up", "down" }; + const OUString aIds[] = { "up", "down" }; for (size_t j = 0; j< std::size(aIds); ++j) m_xActions->set_item_sensitive(aIds[j], false); @@ -319,7 +319,7 @@ IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl, weld::TreeView&, bool ) return true; } -IMPL_LINK(OAddFieldWindow, OnSortAction, const OString&, rCurItem, void) +IMPL_LINK(OAddFieldWindow, OnSortAction, const OUString&, rCurItem, void) { if (rCurItem == "insert") { @@ -327,7 +327,7 @@ IMPL_LINK(OAddFieldWindow, OnSortAction, const OString&, rCurItem, void) return; } - const OString aIds[] = { "up", "down" }; + const OUString aIds[] = { "up", "down" }; if (rCurItem == "delete") { diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 456a9dfd6a3d..59a72ff6c2dc 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -128,19 +128,19 @@ Condition::Condition(weld::Container* pParent, weld::Window* pDialog, ICondition ConditionalExpressionFactory::getKnownConditionalExpressions( m_aConditionalExpressions ); } -sal_uInt16 Condition::mapToolbarItemToSlotId(std::string_view rItemId) +sal_uInt16 Condition::mapToolbarItemToSlotId(std::u16string_view rItemId) { - if (rItemId == "bold") + if (rItemId == u"bold") return SID_ATTR_CHAR_WEIGHT; - if (rItemId == "italic") + if (rItemId == u"italic") return SID_ATTR_CHAR_POSTURE; - if (rItemId == "underline") + if (rItemId == u"underline") return SID_ATTR_CHAR_UNDERLINE; - if (rItemId == "background") + if (rItemId == u"background") return SID_BACKGROUND_COLOR; - if (rItemId == "foreground") + if (rItemId == u"foreground") return SID_ATTR_CHAR_COLOR2; - if (rItemId == "fontdialog") + if (rItemId == u"fontdialog") return SID_CHAR_DLG; return 0; } @@ -180,7 +180,7 @@ void Condition::SetForegroundDropdownClick() } -IMPL_LINK(Condition, OnFormatAction, const OString&, rIdent, void) +IMPL_LINK(Condition, OnFormatAction, const OUString&, rIdent, void) { ApplyCommand(mapToolbarItemToSlotId(rIdent), NamedColor(COL_AUTO, "#" + COL_AUTO.AsRGBHexString())); @@ -304,7 +304,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >& void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat >& _xReportControlFormat) { - OString aItems[] = { "bold", "italic", "underline", "fontdialog" }; + OUString aItems[] = { "bold", "italic", "underline", "fontdialog" }; OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!"); if ( !_xReportControlFormat.is() ) diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 2e25d343d1b9..91bb52e5a231 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -103,7 +103,7 @@ namespace rptui void SetBackgroundDropdownClick(); void SetForegroundDropdownClick(); - DECL_LINK( OnFormatAction, const OString&, void ); + DECL_LINK( OnFormatAction, const OUString&, void ); DECL_LINK( OnConditionAction, weld::Button&, void ); public: @@ -141,7 +141,7 @@ namespace rptui ::rptui::OReportController& getController() const { return m_rController; } - static sal_uInt16 mapToolbarItemToSlotId(std::string_view rItemId); + static sal_uInt16 mapToolbarItemToSlotId(std::u16string_view rItemId); css::uno::Reference<css::awt::XWindow> GetXWindow() const { return m_pDialog->GetXWindow(); } diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index b3ce1bbfcfcb..9cad568ec62a 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -88,7 +88,7 @@ FormulaDialog::~FormulaDialog() if ( m_xAddField ) { SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN ); - aDlgOpt.SetWindowState(OStringToOUString(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::Pos | vcl::WindowDataMask::State | vcl::WindowDataMask::Minimized), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::Pos | vcl::WindowDataMask::State | vcl::WindowDataMask::Minimized)); if (m_xAddField->getDialog()->get_visible()) m_xAddField->response(RET_CANCEL); @@ -213,7 +213,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN ); if ( aDlgOpt.Exists() ) { - m_xAddField->getDialog()->set_window_state(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_xAddField->getDialog()->set_window_state(aDlgOpt.GetWindowState()); } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 1f14651d1487..38697ca12861 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -971,7 +971,7 @@ IMPL_LINK_NOARG(OGroupsSortingDialog, OnWidgetFocusLost, weld::Widget&, void) } } -IMPL_LINK(OGroupsSortingDialog, OnFormatAction, const OString&, rCommand, void) +IMPL_LINK(OGroupsSortingDialog, OnFormatAction, const OUString&, rCommand, void) { if ( !m_xFieldExpression ) return; diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 24a4e253b849..af7696c2fe6c 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -238,19 +238,19 @@ NavigatorTree::~NavigatorTree() namespace { - sal_uInt16 mapIdent(std::string_view rIdent) + sal_uInt16 mapIdent(std::u16string_view rIdent) { - if (rIdent == "sorting") + if (rIdent == u"sorting") return SID_SORTINGANDGROUPING; - else if (rIdent == "page") + else if (rIdent == u"page") return SID_PAGEHEADERFOOTER; - else if (rIdent == "report") + else if (rIdent == u"report") return SID_REPORTHEADERFOOTER; - else if (rIdent == "function") + else if (rIdent == u"function") return SID_RPT_NEW_FUNCTION; - else if (rIdent == "properties") + else if (rIdent == u"properties") return SID_SHOW_PROPERTYBROWSER; - else if (rIdent == "delete") + else if (rIdent == u"delete") return SID_DELETE; return 0; } @@ -276,7 +276,7 @@ IMPL_LINK(NavigatorTree, CommandHdl, const CommandEvent&, rEvt, bool) std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xTreeView.get(), "modules/dbreport/ui/navigatormenu.ui")); std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu")); - const OString aIds[] = { "sorting", "page", "report", "function", "properties", "delete" }; + const OUString aIds[] = { "sorting", "page", "report", "function", "properties", "delete" }; for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i) { sal_uInt16 nSId = mapIdent(aIds[i]); @@ -295,7 +295,7 @@ IMPL_LINK(NavigatorTree, CommandHdl, const CommandEvent&, rEvt, bool) // the point that was clicked on ::Point aWhere(rEvt.GetMousePosPixel()); - OString sCurItemIdent = xContextMenu->popup_at_rect(m_xTreeView.get(), tools::Rectangle(aWhere, Size(1,1))); + OUString sCurItemIdent = xContextMenu->popup_at_rect(m_xTreeView.get(), tools::Rectangle(aWhere, Size(1,1))); if (!sCurItemIdent.isEmpty()) { sal_uInt16 nId = mapIdent(sCurItemIdent); diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index c4fb41c465b4..7e99ba19d4e5 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -34,7 +34,7 @@ namespace rptui ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog) : SfxTabDialogController(pParent, "modules/dbreport/ui/" + - rDialog.toAsciiLowerCase() + ".ui", rDialog.toUtf8(), pAttr) + rDialog.toAsciiLowerCase() + ".ui", rDialog, pAttr) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -63,7 +63,7 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, c RemoveTabPage("asianlayout"); } -void ORptPageDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void ORptPageDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "background") diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index c5d8eb603d94..17b6e9169bd1 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -67,7 +67,7 @@ class OAddFieldWindow : public weld::GenericDialogController DECL_LINK( OnDoubleClickHdl, weld::TreeView&, bool ); DECL_LINK( OnSelectHdl, weld::TreeView&, void ); DECL_LINK( DragBeginHdl, bool&, bool ); - DECL_LINK( OnSortAction, const OString&, void ); + DECL_LINK( OnSortAction, const OUString&, void ); DECL_LINK( FocusChangeHdl, weld::Container&, void ); void addToList(const css::uno::Sequence<OUString>& rEntries); diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 2ce34368783e..2d9fbed18cbd 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -70,7 +70,7 @@ public: virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const override ; virtual void initArgumentInfo() const override; virtual OUString getSignature() const override ; - virtual OString getHelpId() const override ; + virtual OUString getHelpId() const override ; virtual bool isHidden() const override; virtual sal_uInt32 getParameterCount() const override ; virtual sal_uInt32 getVarArgsStart() const override; diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 0418ee1d9abb..932791c022b9 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -75,7 +75,7 @@ private: DECL_LINK( OnControlFocusGot, LinkParamNone*, void ); DECL_LINK( LBChangeHdl, weld::ComboBox&, void ); - DECL_LINK( OnFormatAction, const OString&, void ); + DECL_LINK( OnFormatAction, const OUString&, void ); /** returns the groups @return the groups which now have to check which one changes diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 0e40bd0c64e6..7b680840b16a 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -36,7 +36,7 @@ private: public: ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const OUString& rDialog); - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; }; } // namespace rptui diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index c5ea24a82287..4b8c46b98a68 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -53,7 +53,7 @@ namespace rptui // IPropertyInfoService static sal_Int32 getPropertyId(const OUString& _rName); static OUString getPropertyTranslation(sal_Int32 _nId); - static OString getPropertyHelpId(sal_Int32 _nId); + static OUString getPropertyHelpId(sal_Int32 _nId); static PropUIFlags getPropertyUIFlags(sal_Int32 _nId); static void getExcludeProperties(::std::vector< css::beans::Property >& _rExcludeProperties,const css::uno::Reference< css::inspection::XPropertyHandler >& _xFormComponentHandler); @@ -84,7 +84,7 @@ namespace rptui class HelpIdUrl { public: - static OUString getHelpURL( std::string_view _sHelpId ); + static OUString getHelpURL( std::u16string_view _sHelpId ); }; diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 51edab1410ea..04404de5fdda 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -30,11 +30,10 @@ namespace rptui { - OUString HelpIdUrl::getHelpURL( std::string_view sHelpId ) + OUString HelpIdUrl::getHelpURL( std::u16string_view sHelpId ) { - OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); - DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INetProtocol::NotValid, "Wrong HelpId!" ); - return INET_HID_SCHEME + aTmp; + DBG_ASSERT( INetURLObject(sHelpId).GetProtocol() == INetProtocol::NotValid, "Wrong HelpId!" ); + return INET_HID_SCHEME + sHelpId; } using namespace com::sun::star::uno; @@ -161,7 +160,7 @@ namespace rptui { const char* programmaticName; TranslateId uiNameResId; - OString helpId; + OUString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA }, diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index fe8c5bae2527..954e7ee2141b 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -41,7 +41,7 @@ namespace rptui { OUString sName; OUString sTranslation; - OString sHelpId; + OUString sHelpId; sal_Int32 nId; PropUIFlags nUIFlags; @@ -49,13 +49,13 @@ namespace rptui OUString aName, sal_Int32 _nId, OUString aTranslation, - OString _sHelpId, + OUString _sHelpId, PropUIFlags _nUIFlags); }; OPropertyInfoImpl::OPropertyInfoImpl(OUString _aName, sal_Int32 _nId, - OUString aString, OString sHid, PropUIFlags _nUIFlags) + OUString aString, OUString sHid, PropUIFlags _nUIFlags) :sName(std::move(_aName)) ,sTranslation(std::move(aString)) ,sHelpId(std::move(sHid)) @@ -157,10 +157,10 @@ namespace rptui } - OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) + OUString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return pInfo ? pInfo->sHelpId : OString(); + return pInfo ? pInfo->sHelpId : OUString(); } diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index e1b8768c60c4..363242a34457 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -191,9 +191,9 @@ OUString FunctionDescription::getSignature() const return m_xFunctionDescription->getSignature(); } -OString FunctionDescription::getHelpId() const +OUString FunctionDescription::getHelpId() const { - return OString(); + return {}; } bool FunctionDescription::isHidden() const diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 84d8dad1429f..e1d7fce1435f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -136,7 +136,7 @@ void ODesignView::dispose() if ( m_xAddField ) { SvtViewOptions aDlgOpt( EViewType::Window, UID_RPT_RPT_APP_VIEW ); - aDlgOpt.SetWindowState(OStringToOUString(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(m_xAddField->getDialog()->get_window_state(vcl::WindowDataMask::All)); if (m_xAddField->getDialog()->get_visible()) m_xAddField->response(RET_CANCEL); @@ -145,8 +145,8 @@ void ODesignView::dispose() } if ( m_xReportExplorer ) { - SvtViewOptions aDlgOpt(EViewType::Window, OStringToOUString(m_xReportExplorer->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetWindowState(OStringToOUString(m_xReportExplorer->getDialog()->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_ASCII_US)); + SvtViewOptions aDlgOpt(EViewType::Window, m_xReportExplorer->get_help_id()); + aDlgOpt.SetWindowState(m_xReportExplorer->getDialog()->get_window_state(vcl::WindowDataMask::All)); if (m_xReportExplorer->getDialog()->get_visible()) m_xReportExplorer->response(RET_CANCEL); @@ -475,9 +475,9 @@ void ODesignView::toggleReportExplorer() { OReportController& rReportController = getController(); m_xReportExplorer = std::make_shared<ONavigator>(GetFrameWeld(), rReportController); - SvtViewOptions aDlgOpt(EViewType::Window, OStringToOUString(m_xReportExplorer->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Window, m_xReportExplorer->get_help_id()); if ( aDlgOpt.Exists() ) - m_xReportExplorer->getDialog()->set_window_state(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_xReportExplorer->getDialog()->set_window_state(aDlgOpt.GetWindowState()); } if (!m_xReportExplorer->getDialog()->get_visible()) @@ -515,7 +515,7 @@ void ODesignView::toggleAddField() m_xAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); SvtViewOptions aDlgOpt( EViewType::Window, UID_RPT_RPT_APP_VIEW ); if ( aDlgOpt.Exists() ) - m_xAddField->getDialog()->set_window_state(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_xAddField->getDialog()->set_window_state(aDlgOpt.GetWindowState()); m_xAddField->Update(); } if (!m_xAddField->getDialog()->get_visible()) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d2dcb5037467..4fa68d296b17 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -297,8 +297,8 @@ void OReportController::disposing() } if ( m_xGroupsFloater ) { - SvtViewOptions aDlgOpt(EViewType::Window, OStringToOUString(m_xGroupsFloater->get_help_id(), RTL_TEXTENCODING_UTF8)); - aDlgOpt.SetWindowState(OStringToOUString(m_xGroupsFloater->getDialog()->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_ASCII_US)); + SvtViewOptions aDlgOpt(EViewType::Window, m_xGroupsFloater->get_help_id()); + aDlgOpt.SetWindowState(m_xGroupsFloater->getDialog()->get_window_state(vcl::WindowDataMask::All)); if (m_xGroupsFloater->getDialog()->get_visible()) m_xGroupsFloater->response(RET_CANCEL); m_xGroupsFloater.reset(); @@ -2542,9 +2542,9 @@ void OReportController::openSortingAndGroupingDialog() if (!m_xGroupsFloater) { m_xGroupsFloater = std::make_shared<OGroupsSortingDialog>(getFrameWeld(), !isEditable(), this); - SvtViewOptions aDlgOpt(EViewType::Window, OStringToOUString(m_xGroupsFloater->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Window, m_xGroupsFloater->get_help_id()); if ( aDlgOpt.Exists() ) - m_xGroupsFloater->getDialog()->set_window_state(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_xGroupsFloater->getDialog()->set_window_state(aDlgOpt.GetWindowState()); } if (isUiVisible()) { diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index 2ae05aa31585..67e24e2c16a6 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -98,14 +98,14 @@ private: pArgDescs; tools::Long nCallerPos; sal_uInt16 nCategory; - OString sHelpId; + OUString sHelpId; mutable ::std::vector< LocalizedName > maCompNames; mutable bool bCompInitialized; public: ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, OUString aDesc, - sal_uInt16 nCat, OString , + sal_uInt16 nCat, OUString , css::uno::Reference< css::reflection::XIdlMethod> aFunc, css::uno::Any aO, tools::Long nAC, const ScAddInArgDesc* pAD, @@ -125,7 +125,7 @@ public: tools::Long GetCallerPos() const { return nCallerPos; } const OUString& GetDescription() const { return aDescription; } sal_uInt16 GetCategory() const { return nCategory; } - const OString& GetHelpId() const { return sHelpId; } + const OUString& GetHelpId() const { return sHelpId; } const ::std::vector< LocalizedName >& GetCompNames() const; bool GetExcelName( const LanguageTag& rDestLang, OUString& rRetExcelName, diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 01829417e485..49b718dbd1ae 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -96,7 +96,7 @@ public: @return help id of the function */ - virtual OString getHelpId() const override ; + virtual OUString getHelpId() const override ; /** Returns whether function is hidden and not offered in the Function Wizard unless used in an expression. @@ -223,7 +223,7 @@ public: sal_uInt16 nArgCount; /**< All parameter count, suppressed and unsuppressed */ sal_uInt16 nVarArgsStart; /**< Start of variable arguments, for numbering */ sal_uInt16 nVarArgsLimit; /**< Limit maximum of (variable) arguments, for numbering */ - OString sHelpId; /**< HelpId of function */ + OUString sHelpId; /**< HelpId of function */ bool bIncomplete :1; /**< Incomplete argument info (set for add-in info from configuration) */ bool mbHidden :1; /**< Whether function is hidden */ }; diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index c320a0f94bd0..06c4c788da9d 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -19,579 +19,579 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_INSWIN_POS = "SC_HID_INSWIN_POS"; -inline constexpr OStringLiteral HID_INSWIN_CALC = "SC_HID_INSWIN_CALC"; -inline constexpr OStringLiteral HID_INSWIN_CANCEL = "SC_HID_INSWIN_CANCEL"; -inline constexpr OStringLiteral HID_INSWIN_OK = "SC_HID_INSWIN_OK"; -inline constexpr OStringLiteral HID_INSWIN_SUMME = "SC_HID_INSWIN_SUMME"; -inline constexpr OStringLiteral HID_INSWIN_FUNC = "SC_HID_INSWIN_FUNC"; -inline constexpr OStringLiteral HID_INSWIN_INPUT = "SC_HID_INSWIN_INPUT"; +inline constexpr OUStringLiteral HID_INSWIN_POS = u"SC_HID_INSWIN_POS"; +inline constexpr OUStringLiteral HID_INSWIN_CALC = u"SC_HID_INSWIN_CALC"; +inline constexpr OUStringLiteral HID_INSWIN_CANCEL = u"SC_HID_INSWIN_CANCEL"; +inline constexpr OUStringLiteral HID_INSWIN_OK = u"SC_HID_INSWIN_OK"; +inline constexpr OUStringLiteral HID_INSWIN_SUMME = u"SC_HID_INSWIN_SUMME"; +inline constexpr OUStringLiteral HID_INSWIN_FUNC = u"SC_HID_INSWIN_FUNC"; +inline constexpr OUStringLiteral HID_INSWIN_INPUT = u"SC_HID_INSWIN_INPUT"; // Help IDs for document window ---------------------------------------------- -inline constexpr OStringLiteral HID_SC_WIN_GRIDWIN = "SC_HID_SC_WIN_GRIDWIN"; -inline constexpr OStringLiteral HID_SC_WIN_PREVIEW = "SC_HID_SC_WIN_PREVIEW"; +inline constexpr OUStringLiteral HID_SC_WIN_GRIDWIN = u"SC_HID_SC_WIN_GRIDWIN"; +inline constexpr OUStringLiteral HID_SC_WIN_PREVIEW = u"SC_HID_SC_WIN_PREVIEW"; -inline constexpr OStringLiteral HID_SC_HEADER_EDIT = "SC_HID_SC_HEADER_EDIT"; -inline constexpr OStringLiteral HID_SC_FOOTER_EDIT = "SC_HID_SC_FOOTER_EDIT"; +inline constexpr OUStringLiteral HID_SC_HEADER_EDIT = u"SC_HID_SC_HEADER_EDIT"; +inline constexpr OUStringLiteral HID_SC_FOOTER_EDIT = u"SC_HID_SC_FOOTER_EDIT"; -inline constexpr OStringLiteral HID_SC_SCENWIN_TOP = "SC_HID_SC_SCENWIN_TOP"; -inline constexpr OStringLiteral HID_SC_SCENWIN_BOTTOM = "SC_HID_SC_SCENWIN_BOTTOM"; +inline constexpr OUStringLiteral HID_SC_SCENWIN_TOP = u"SC_HID_SC_SCENWIN_TOP"; +inline constexpr OUStringLiteral HID_SC_SCENWIN_BOTTOM = u"SC_HID_SC_SCENWIN_BOTTOM"; -inline constexpr OStringLiteral HID_SC_INPUTWIN = "SC_HID_SC_INPUTWIN"; +inline constexpr OUStringLiteral HID_SC_INPUTWIN = u"SC_HID_SC_INPUTWIN"; -inline constexpr OStringLiteral HID_SC_RENAME_NAME = "SC_HID_SC_RENAME_NAME"; -inline constexpr OStringLiteral HID_SC_APPEND_NAME = "SC_HID_SC_APPEND_NAME"; +inline constexpr OUStringLiteral HID_SC_RENAME_NAME = u"SC_HID_SC_RENAME_NAME"; +inline constexpr OUStringLiteral HID_SC_APPEND_NAME = u"SC_HID_SC_APPEND_NAME"; -inline constexpr OStringLiteral HID_SC_ADD_AUTOFMT = "SC_HID_SC_ADD_AUTOFMT"; -inline constexpr OStringLiteral HID_SC_AUTOFMT_NAME = "SC_HID_SC_AUTOFMT_NAME"; +inline constexpr OUStringLiteral HID_SC_ADD_AUTOFMT = u"SC_HID_SC_ADD_AUTOFMT"; +inline constexpr OUStringLiteral HID_SC_AUTOFMT_NAME = u"SC_HID_SC_AUTOFMT_NAME"; // wrong group - HID_SC_DLG_START is full -inline constexpr OStringLiteral HID_SC_REN_AFMT_NAME = "SC_HID_SC_REN_AFMT_NAME"; +inline constexpr OUStringLiteral HID_SC_REN_AFMT_NAME = u"SC_HID_SC_REN_AFMT_NAME"; -inline constexpr OStringLiteral HID_CHG_PROTECT = "SC_HID_CHG_PROTECT"; +inline constexpr OUStringLiteral HID_CHG_PROTECT = u"SC_HID_CHG_PROTECT"; -inline constexpr OStringLiteral HID_SC_REN_AFMT_DLG = "SC_HID_SC_REN_AFMT_DLG"; +inline constexpr OUStringLiteral HID_SC_REN_AFMT_DLG = u"SC_HID_SC_REN_AFMT_DLG"; // Help IDs for Submenus (max.50) -------------------------------------------- -inline constexpr OStringLiteral HID_PASSWD_TABLE = "SC_HID_PASSWD_TABLE"; -inline constexpr OStringLiteral HID_PASSWD_DOC = "SC_HID_PASSWD_DOC"; -inline constexpr OStringLiteral HID_PASSWD_DOC_CONFIRM = "SC_HID_PASSWD_DOC_CONFIRM"; +inline constexpr OUStringLiteral HID_PASSWD_TABLE = u"SC_HID_PASSWD_TABLE"; +inline constexpr OUStringLiteral HID_PASSWD_DOC = u"SC_HID_PASSWD_DOC"; +inline constexpr OUStringLiteral HID_PASSWD_DOC_CONFIRM = u"SC_HID_PASSWD_DOC_CONFIRM"; // Other help IDs (max.70) --------------------------------------------------- -inline constexpr OStringLiteral HID_SELECTTABLES = "SC_HID_SELECTTABLES"; -inline constexpr OStringLiteral HID_GOTOTABLE = "SC_HID_GOTOTABLE"; -inline constexpr OStringLiteral HID_GOTOTABLEMASK = "SC_HID_GOTOTABLEMASK"; +inline constexpr OUStringLiteral HID_SELECTTABLES = u"SC_HID_SELECTTABLES"; +inline constexpr OUStringLiteral HID_GOTOTABLE = u"SC_HID_GOTOTABLE"; +inline constexpr OUStringLiteral HID_GOTOTABLEMASK = u"SC_HID_GOTOTABLEMASK"; // Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" -#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" -#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" -#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" -#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" -#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" -#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" -#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" -#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" -#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" -#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" -#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" -#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" -#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" -#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" -#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" -#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" -#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" -#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" -#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" -#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" -#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" -#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" -#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" -#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" -#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" -#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" -#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" -#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" -#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" -#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" -#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" -#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" -#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" -#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" -#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" -#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" -#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" -#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" -#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" -#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" -#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" -#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" -#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" -#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" -#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" -#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" -#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" -#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" -#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" -#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" -#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" -#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" -#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" -#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" -#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" -#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" -#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" -#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" -#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" -#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" -#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" -#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" -#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" -#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" -#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" -#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" -#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" -#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" -#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" -#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" -#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" -#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" -#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" -#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" -#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" -#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" -#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" -#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" -#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" -#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" -#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" -#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" -#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" -#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" -#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" -#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" -#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" -#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" -#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" -#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" -#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" -#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" -#define HID_AAI_FUNC_IMTAN "SC_HID_AAI_FUNC_IMTAN" -#define HID_AAI_FUNC_IMSEC "SC_HID_AAI_FUNC_IMSEC" -#define HID_AAI_FUNC_IMCSC "SC_HID_AAI_FUNC_IMCSC" -#define HID_AAI_FUNC_IMCOT "SC_HID_AAI_FUNC_IMCOT" -#define HID_AAI_FUNC_IMSINH "SC_HID_AAI_FUNC_IMSINH" -#define HID_AAI_FUNC_IMCOSH "SC_HID_AAI_FUNC_IMCOSH" -#define HID_AAI_FUNC_IMSECH "SC_HID_AAI_FUNC_IMSECH" -#define HID_AAI_FUNC_IMCSCH "SC_HID_AAI_FUNC_IMCSCH" - -#define HID_UPDATE_LINK_WARNING "cui/ui/baselinksdialog/UPDATE_NOW" +inline constexpr OUStringLiteral HID_AAI_FUNC_WORKDAY = u"SC_HID_AAI_FUNC_WORKDAY"; +inline constexpr OUStringLiteral HID_AAI_FUNC_YEARFRAC = u"SC_HID_AAI_FUNC_YEARFRAC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_EDATE = u"SC_HID_AAI_FUNC_EDATE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_WEEKNUM = u"SC_HID_AAI_FUNC_WEEKNUM"; +inline constexpr OUStringLiteral HID_AAI_FUNC_EOMONTH = u"SC_HID_AAI_FUNC_EOMONTH"; +inline constexpr OUStringLiteral HID_AAI_FUNC_NETWORKDAYS = u"SC_HID_AAI_FUNC_NETWORKDAYS"; +inline constexpr OUStringLiteral HID_AAI_FUNC_AMORDEGRC = u"SC_HID_AAI_FUNC_AMORDEGRC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_AMORLINC = u"SC_HID_AAI_FUNC_AMORLINC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ACCRINT = u"SC_HID_AAI_FUNC_ACCRINT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ACCRINTM = u"SC_HID_AAI_FUNC_ACCRINTM"; +inline constexpr OUStringLiteral HID_AAI_FUNC_RECEIVED = u"SC_HID_AAI_FUNC_RECEIVED"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DISC = u"SC_HID_AAI_FUNC_DISC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DURATION = u"SC_HID_AAI_FUNC_DURATION"; +inline constexpr OUStringLiteral HID_AAI_FUNC_EFFECT = u"SC_HID_AAI_FUNC_EFFECT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_CUMPRINC = u"SC_HID_AAI_FUNC_CUMPRINC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_CUMIPMT = u"SC_HID_AAI_FUNC_CUMIPMT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_PRICE = u"SC_HID_AAI_FUNC_PRICE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_PRICEDISC = u"SC_HID_AAI_FUNC_PRICEDISC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_PRICEMAT = u"SC_HID_AAI_FUNC_PRICEMAT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_MDURATION = u"SC_HID_AAI_FUNC_MDURATION"; +inline constexpr OUStringLiteral HID_AAI_FUNC_NOMINAL = u"SC_HID_AAI_FUNC_NOMINAL"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DOLLARFR = u"SC_HID_AAI_FUNC_DOLLARFR"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DOLLARDE = u"SC_HID_AAI_FUNC_DOLLARDE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_YIELD = u"SC_HID_AAI_FUNC_YIELD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_YIELDDISC = u"SC_HID_AAI_FUNC_YIELDDISC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_YIELDMAT = u"SC_HID_AAI_FUNC_YIELDMAT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_TBILLEQ = u"SC_HID_AAI_FUNC_TBILLEQ"; +inline constexpr OUStringLiteral HID_AAI_FUNC_TBILLPRICE = u"SC_HID_AAI_FUNC_TBILLPRICE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_TBILLYIELD = u"SC_HID_AAI_FUNC_TBILLYIELD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ODDFPRICE = u"SC_HID_AAI_FUNC_ODDFPRICE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ODDFYIELD = u"SC_HID_AAI_FUNC_ODDFYIELD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ODDLPRICE = u"SC_HID_AAI_FUNC_ODDLPRICE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ODDLYIELD = u"SC_HID_AAI_FUNC_ODDLYIELD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_XIRR = u"SC_HID_AAI_FUNC_XIRR"; +inline constexpr OUStringLiteral HID_AAI_FUNC_XNPV = u"SC_HID_AAI_FUNC_XNPV"; +inline constexpr OUStringLiteral HID_AAI_FUNC_INTRATE = u"SC_HID_AAI_FUNC_INTRATE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COUPNCD = u"SC_HID_AAI_FUNC_COUPNCD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COUPDAYS = u"SC_HID_AAI_FUNC_COUPDAYS"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COUPDAYSNC = u"SC_HID_AAI_FUNC_COUPDAYSNC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COUPDAYBS = u"SC_HID_AAI_FUNC_COUPDAYBS"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COUPPCD = u"SC_HID_AAI_FUNC_COUPPCD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COUPNUM = u"SC_HID_AAI_FUNC_COUPNUM"; +inline constexpr OUStringLiteral HID_AAI_FUNC_FVSCHEDULE = u"SC_HID_AAI_FUNC_FVSCHEDULE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ISEVEN = u"SC_HID_AAI_FUNC_ISEVEN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ISODD = u"SC_HID_AAI_FUNC_ISODD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_GCD = u"SC_HID_AAI_FUNC_GCD"; +inline constexpr OUStringLiteral HID_AAI_FUNC_LCM = u"SC_HID_AAI_FUNC_LCM"; +inline constexpr OUStringLiteral HID_AAI_FUNC_MULTINOMIAL = u"SC_HID_AAI_FUNC_MULTINOMIAL"; +inline constexpr OUStringLiteral HID_AAI_FUNC_SERIESSUM = u"SC_HID_AAI_FUNC_SERIESSUM"; +inline constexpr OUStringLiteral HID_AAI_FUNC_QUOTIENT = u"SC_HID_AAI_FUNC_QUOTIENT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_MROUND = u"SC_HID_AAI_FUNC_MROUND"; +inline constexpr OUStringLiteral HID_AAI_FUNC_SQRTPI = u"SC_HID_AAI_FUNC_SQRTPI"; +inline constexpr OUStringLiteral HID_AAI_FUNC_RANDBETWEEN = u"SC_HID_AAI_FUNC_RANDBETWEEN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BESSELI = u"SC_HID_AAI_FUNC_BESSELI"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BESSELJ = u"SC_HID_AAI_FUNC_BESSELJ"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BESSELK = u"SC_HID_AAI_FUNC_BESSELK"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BESSELY = u"SC_HID_AAI_FUNC_BESSELY"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BIN2DEC = u"SC_HID_AAI_FUNC_BIN2DEC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BIN2HEX = u"SC_HID_AAI_FUNC_BIN2HEX"; +inline constexpr OUStringLiteral HID_AAI_FUNC_BIN2OCT = u"SC_HID_AAI_FUNC_BIN2OCT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DELTA = u"SC_HID_AAI_FUNC_DELTA"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DEC2BIN = u"SC_HID_AAI_FUNC_DEC2BIN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DEC2HEX = u"SC_HID_AAI_FUNC_DEC2HEX"; +inline constexpr OUStringLiteral HID_AAI_FUNC_DEC2OCT = u"SC_HID_AAI_FUNC_DEC2OCT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ERF = u"SC_HID_AAI_FUNC_ERF"; +inline constexpr OUStringLiteral HID_AAI_FUNC_ERFC = u"SC_HID_AAI_FUNC_ERFC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_GESTEP = u"SC_HID_AAI_FUNC_GESTEP"; +inline constexpr OUStringLiteral HID_AAI_FUNC_HEX2BIN = u"SC_HID_AAI_FUNC_HEX2BIN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_HEX2DEC = u"SC_HID_AAI_FUNC_HEX2DEC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_HEX2OCT = u"SC_HID_AAI_FUNC_HEX2OCT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMABS = u"SC_HID_AAI_FUNC_IMABS"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMAGINARY = u"SC_HID_AAI_FUNC_IMAGINARY"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMPOWER = u"SC_HID_AAI_FUNC_IMPOWER"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMARGUMENT = u"SC_HID_AAI_FUNC_IMARGUMENT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMCOS = u"SC_HID_AAI_FUNC_IMCOS"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMDIV = u"SC_HID_AAI_FUNC_IMDIV"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMEXP = u"SC_HID_AAI_FUNC_IMEXP"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMCONJUGATE = u"SC_HID_AAI_FUNC_IMCONJUGATE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMLN = u"SC_HID_AAI_FUNC_IMLN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMLOG10 = u"SC_HID_AAI_FUNC_IMLOG10"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMLOG2 = u"SC_HID_AAI_FUNC_IMLOG2"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMPRODUCT = u"SC_HID_AAI_FUNC_IMPRODUCT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMREAL = u"SC_HID_AAI_FUNC_IMREAL"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSIN = u"SC_HID_AAI_FUNC_IMSIN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSUB = u"SC_HID_AAI_FUNC_IMSUB"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSUM = u"SC_HID_AAI_FUNC_IMSUM"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSQRT = u"SC_HID_AAI_FUNC_IMSQRT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_COMPLEX = u"SC_HID_AAI_FUNC_COMPLEX"; +inline constexpr OUStringLiteral HID_AAI_FUNC_OCT2BIN = u"SC_HID_AAI_FUNC_OCT2BIN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_OCT2DEZ = u"SC_HID_AAI_FUNC_OCT2DEZ"; +inline constexpr OUStringLiteral HID_AAI_FUNC_OCT2HEX = u"SC_HID_AAI_FUNC_OCT2HEX"; +inline constexpr OUStringLiteral HID_AAI_FUNC_CONVERT = u"SC_HID_AAI_FUNC_CONVERT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_FACTDOUBLE = u"SC_HID_AAI_FUNC_FACTDOUBLE"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMTAN = u"SC_HID_AAI_FUNC_IMTAN"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSEC = u"SC_HID_AAI_FUNC_IMSEC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMCSC = u"SC_HID_AAI_FUNC_IMCSC"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMCOT = u"SC_HID_AAI_FUNC_IMCOT"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSINH = u"SC_HID_AAI_FUNC_IMSINH"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMCOSH = u"SC_HID_AAI_FUNC_IMCOSH"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMSECH = u"SC_HID_AAI_FUNC_IMSECH"; +inline constexpr OUStringLiteral HID_AAI_FUNC_IMCSCH = u"SC_HID_AAI_FUNC_IMCSCH"; + +inline constexpr OUStringLiteral HID_UPDATE_LINK_WARNING = u"cui/ui/baselinksdialog/UPDATE_NOW"; // DateFunc Addin Functions (max.20) ----------------------------------------- -#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" -#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" -#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" -#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" -#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" -#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" -#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" +inline constexpr OUStringLiteral HID_DAI_FUNC_DAYSINMONTH = u"SC_HID_DAI_FUNC_DAYSINMONTH"; +inline constexpr OUStringLiteral HID_DAI_FUNC_DAYSINYEAR = u"SC_HID_DAI_FUNC_DAYSINYEAR"; +inline constexpr OUStringLiteral HID_DAI_FUNC_WEEKSINYEAR = u"SC_HID_DAI_FUNC_WEEKSINYEAR"; +inline constexpr OUStringLiteral HID_DAI_FUNC_DIFFMONTHS = u"SC_HID_DAI_FUNC_DIFFMONTHS"; +inline constexpr OUStringLiteral HID_DAI_FUNC_DIFFWEEKS = u"SC_HID_DAI_FUNC_DIFFWEEKS"; +inline constexpr OUStringLiteral HID_DAI_FUNC_DIFFYEARS = u"SC_HID_DAI_FUNC_DIFFYEARS"; +inline constexpr OUStringLiteral HID_DAI_FUNC_ROT13 = u"SC_HID_DAI_FUNC_ROT13"; // PricingFunc Addin Functions ----------------------------------------- -#define HID_PAI_FUNC_OPT_BARRIER "SC_HID_PAI_FUNC_OPT_BARRIER" -#define HID_PAI_FUNC_OPT_TOUCH "SC_HID_PAI_FUNC_OPT_TOUCH" -#define HID_PAI_FUNC_OPT_PROB_HIT "SC_HID_PAI_FUNC_OPT_PROB_HIT" -#define HID_PAI_FUNC_OPT_PROB_INMONEY "SC_HID_PAI_FUNC_OPT_PROB_INMONEY" +inline constexpr OUStringLiteral HID_PAI_FUNC_OPT_BARRIER = u"SC_HID_PAI_FUNC_OPT_BARRIER"; +inline constexpr OUStringLiteral HID_PAI_FUNC_OPT_TOUCH = u"SC_HID_PAI_FUNC_OPT_TOUCH"; +inline constexpr OUStringLiteral HID_PAI_FUNC_OPT_PROB_HIT = u"SC_HID_PAI_FUNC_OPT_PROB_HIT"; +inline constexpr OUStringLiteral HID_PAI_FUNC_OPT_PROB_INMONEY = u"SC_HID_PAI_FUNC_OPT_PROB_INMONEY"; // End help IDs ------------------------------------------------------------ -#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" -#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" -#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" -#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" -#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" -#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" -#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" -#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" -#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" -#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" -#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" -#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" - -#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" -#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" -#define HID_FUNC_TAG "SC_HID_FUNC_TAG" -#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" -#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" -#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" -#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" -#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" -#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" -#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" -#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" -#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" -#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" -#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" -#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" -#define HID_FUNC_DATEDIF "SC_HID_FUNC_DATEDIF" -#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" -#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" -#define HID_FUNC_ISOWEEKNUM "SC_HID_FUNC_ISOWEEKNUM" - -#define HID_FUNC_BW "SC_HID_FUNC_BW" -#define HID_FUNC_ZW "SC_HID_FUNC_ZW" -#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" -#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" -#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" -#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" -#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" -#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" -#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" -#define HID_FUNC_DIA "SC_HID_FUNC_DIA" -#define HID_FUNC_LIA "SC_HID_FUNC_LIA" -#define HID_FUNC_GDA "SC_HID_FUNC_GDA" -#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" -#define HID_FUNC_VDB "SC_HID_FUNC_VDB" -#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" -#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" -#define HID_FUNC_NBW "SC_HID_FUNC_NBW" -#define HID_FUNC_IKV "SC_HID_FUNC_IKV" -#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" -#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" -#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" -#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" - -#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" -#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" -#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" -#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" -#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" -#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" -#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" -#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" -#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" -#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" -#define HID_FUNC_N "SC_HID_FUNC_N" -#define HID_FUNC_NV "SC_HID_FUNC_NV" -#define HID_FUNC_TYP "SC_HID_FUNC_TYP" -#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" -#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" -#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" -#define HID_FUNC_INFO "SC_HID_FUNC_INFO" - -#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" -#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" -#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" -#define HID_FUNC_WENN "SC_HID_FUNC_WENN" -#define HID_FUNC_IFERROR "SC_HID_FUNC_IFERROR" -#define HID_FUNC_IFNA "SC_HID_FUNC_IFNA" -#define HID_FUNC_ODER "SC_HID_FUNC_ODER" -#define HID_FUNC_UND "SC_HID_FUNC_UND" -#define HID_FUNC_XOR "SC_HID_FUNC_XOR" - -#define HID_FUNC_ABS "SC_HID_FUNC_ABS" -#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" -#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" -#define HID_FUNC_PI "SC_HID_FUNC_PI" -#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" -#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" -#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" -#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" -#define HID_FUNC_AVERAGEIF "SC_HID_FUNC_AVERAGEIF" -#define HID_FUNC_SUMIFS "SC_HID_FUNC_SUMIFS" -#define HID_FUNC_AVERAGEIFS "SC_HID_FUNC_AVERAGEIFS" -#define HID_FUNC_COUNTIFS "SC_HID_FUNC_COUNTIFS" -#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" -#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" -#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" -#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" -#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" -#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" -#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" -#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" -#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" -#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" -#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" -#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" -#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" -#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" -#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" -#define HID_FUNC_COS "SC_HID_FUNC_COS" -#define HID_FUNC_SIN "SC_HID_FUNC_SIN" -#define HID_FUNC_COT "SC_HID_FUNC_COT" -#define HID_FUNC_TAN "SC_HID_FUNC_TAN" -#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" -#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" -#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" -#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" -#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" -#define HID_FUNC_COSECANT "SC_HID_FUNC_COSECANT" -#define HID_FUNC_SECANT "SC_HID_FUNC_SECANT" -#define HID_FUNC_SECANTHYP "SC_HID_FUNC_SECANTHYP" -#define HID_FUNC_COSECANTHYP "SC_HID_FUNC_COSECANTHYP" -#define HID_FUNC_DEG "SC_HID_FUNC_DEG" -#define HID_FUNC_RAD "SC_HID_FUNC_RAD" -#define HID_FUNC_EXP "SC_HID_FUNC_EXP" -#define HID_FUNC_LOG "SC_HID_FUNC_LOG" -#define HID_FUNC_LN "SC_HID_FUNC_LN" -#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" -#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" -#define HID_FUNC_REST "SC_HID_FUNC_REST" -#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" -#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" -#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" -#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" -#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" -#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" -#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" -#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" -#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" -#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" -#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" -#define HID_FUNC_GGT "SC_HID_FUNC_GGT" -#define HID_FUNC_KGV "SC_HID_FUNC_KGV" -#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" -#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" - -#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" -#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" -#define HID_FUNC_MDET "SC_HID_FUNC_MDET" -#define HID_FUNC_MINV "SC_HID_FUNC_MINV" -#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" -#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" -#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" -#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" -#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" -#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" -#define HID_FUNC_RGP "SC_HID_FUNC_RGP" -#define HID_FUNC_RKP "SC_HID_FUNC_RKP" -#define HID_FUNC_TREND "SC_HID_FUNC_TREND" -#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" - -#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" -#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" -#define HID_FUNC_MAX "SC_HID_FUNC_MAX" -#define HID_FUNC_MIN "SC_HID_FUNC_MIN" -#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" -#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" -#define HID_FUNC_STABW "SC_HID_FUNC_STABW" -#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" -#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" -#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" -#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" -#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" -#define HID_FUNC_SKEWP "SC_HID_FUNC_SKEWP" -#define HID_FUNC_KURT "SC_HID_FUNC_KURT" -#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" -#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" -#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" -#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" -#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" -#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" -#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" -#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" -#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" -#define HID_FUNC_RANG "SC_HID_FUNC_RANG" -#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" -#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" -#define HID_FUNC_B "SC_HID_FUNC_B" -#define HID_FUNC_PHI "SC_HID_FUNC_PHI" -#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" -#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" -#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" -#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" -#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" -#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" -#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" -#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" -#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" -#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" -#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" -#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" -#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" -#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" -#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" -#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" -#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" -#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" -#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" -#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" -#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" -#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" -#define HID_FUNC_TINV "SC_HID_FUNC_TINV" -#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" -#define HID_FUNC_FINV "SC_HID_FUNC_FINV" -#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" -#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" -#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" -#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" -#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" -#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" -#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" -#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" -#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" -#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" -#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" -#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" -#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" -#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" -#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" -#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" -#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" -#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" -#define HID_FUNC_MINA "SC_HID_FUNC_MINA" -#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" -#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" -#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" -#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" -#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" -#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" -#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" -#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" -#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" - -#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" -#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" -#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" -#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" -#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" -#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" -#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" -#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" -#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" -#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" -#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" -#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" -#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" -#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" -#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" -#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" -#define HID_FUNC_DDE "SC_HID_FUNC_DDE" -#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" -#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" -#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" -#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" - -#define HID_FUNC_CODE "SC_HID_FUNC_CODE" -#define HID_FUNC_DM "SC_HID_FUNC_DM" -#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" -#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" -#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" -#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" -#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" -#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" -#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" -#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" -#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" -#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" -#define HID_FUNC_WERT "SC_HID_FUNC_WERT" -#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" -#define HID_FUNC_T "SC_HID_FUNC_T" -#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" -#define HID_FUNC_FEST "SC_HID_FUNC_FEST" -#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" -#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" -#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" -#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" -#define HID_FUNC_LENB "SC_HID_FUNC_LENB" -#define HID_FUNC_RIGHTB "SC_HID_FUNC_RIGHTB" -#define HID_FUNC_LEFTB "SC_HID_FUNC_LEFTB" -#define HID_FUNC_MIDB "SC_HID_FUNC_MIDB" -#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" -#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" -#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" -#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" -#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" -#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" -#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" -#define HID_FUNC_JIS "SC_HID_FUNC_JIS" -#define HID_FUNC_ASC "SC_HID_FUNC_ASC" -#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" -#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" -#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" -#define HID_FUNC_BITAND "SC_HID_FUNC_BITAND" -#define HID_FUNC_BITOR "SC_HID_FUNC_BITOR" -#define HID_FUNC_BITXOR "SC_HID_FUNC_BITXOR" -#define HID_FUNC_BITLSHIFT "SC_HID_FUNC_BITLSHIFT" -#define HID_FUNC_BITRSHIFT "SC_HID_FUNC_BITRSHIFT" -#define HID_FUNC_FILTERXML "SC_HID_FUNC_FILTERXML" -#define HID_FUNC_WEBSERVICE "SC_HID_FUNC_WEBSERVICE" -#define HID_FUNC_ENCODEURL "SC_HID_FUNC_ENCODEURL" -#define HID_FUNC_COLOR "SC_HID_FUNC_COLOR" -#define HID_FUNC_COVARIANCE_P "SC_HID_FUNC_COVARIANCE_P" -#define HID_FUNC_COVARIANCE_S "SC_HID_FUNC_COVARIANCE_S" -#define HID_FUNC_ST_DEV_P_MS "SC_HID_FUNC_ST_DEV_P_MS" -#define HID_FUNC_ST_DEV_S "SC_HID_FUNC_ST_DEV_S" -#define HID_FUNC_VAR_P_MS "SC_HID_FUNC_VAR_P_MS" -#define HID_FUNC_VAR_S "SC_HID_FUNC_VAR_S" -#define HID_FUNC_BETADIST_MS "SC_HID_FUNC_BETADIST_MS" -#define HID_FUNC_BETAINV_MS "SC_HID_FUNC_BETAINV_MS" -#define HID_FUNC_BINOM_DIST_MS "SC_HID_FUNC_BINOM_DIST_MS" -#define HID_FUNC_BINOM_INV_MS "SC_HID_FUNC_BINOM_INV_MS" -#define HID_FUNC_CHIINV_MS "SC_HID_FUNC_CHIINV_MS" -#define HID_FUNC_CHIVERT_MS "SC_HID_FUNC_CHIVERT_MS" -#define HID_FUNC_CHITEST_MS "SC_HID_FUNC_CHITEST_MS" -#define HID_FUNC_CHISQDIST_MS "SC_HID_FUNC_CHISQDIST_MS" -#define HID_FUNC_CHISQINV_MS "SC_HID_FUNC_CHISQINV_MS" -#define HID_FUNC_CONFIDENCE_N "SC_HID_FUNC_CONFIDENCE_N" -#define HID_FUNC_CONFIDENCE_T "SC_HID_FUNC_CONFIDENCE_T" -#define HID_FUNC_F_DIST_LT "SC_HID_FUNC_F_DIST_LT" -#define HID_FUNC_F_DIST_RT "SC_HID_FUNC_F_DIST_RT" -#define HID_FUNC_F_INV_LT "SC_HID_FUNC_F_INV_LT" -#define HID_FUNC_F_INV_RT "SC_HID_FUNC_F_INV_RT" -#define HID_FUNC_F_TEST_MS "SC_HID_FUNC_F_TEST_MS" -#define HID_FUNC_EXP_DIST_MS "SC_HID_FUNC_EXP_DIST_MS" -#define HID_FUNC_HYP_GEOM_DIST_MS "SC_HID_FUNC_HYP_GEOM_DIST_MS" -#define HID_FUNC_POISSON_DIST_MS "SC_HID_FUNC_POISSON_DIST_MS" -#define HID_FUNC_WEIBULL_DIST_MS "SC_HID_FUNC_WEIBULL_DIST_MS" -#define HID_FUNC_GAMMADIST_MS "SC_HID_FUNC_GAMMADIST_MS" -#define HID_FUNC_GAMMAINV_MS "SC_HID_FUNC_GAMMAINV_MS" -#define HID_FUNC_GAMMALN_MS "SC_HID_FUNC_GAMMALN_MS" -#define HID_FUNC_LOGNORMDIST_MS "SC_HID_FUNC_LOGNORMDIST_MS" -#define HID_FUNC_NORMDIST_MS "SC_HID_FUNC_NORMDIST_MS" -#define HID_FUNC_NORMINV_MS "SC_HID_FUNC_NORMINV_MS" -#define HID_FUNC_STD_NORMDIST_MS "SC_HID_FUNC_STD_NORMDIST_MS" -#define HID_FUNC_STD_NORMINV_MS "SC_HID_FUNC_STD_NORMINV_MS" -#define HID_FUNC_TDIST_2T "SC_HID_FUNC_TDIST_2T" -#define HID_FUNC_TDIST_MS "SC_HID_FUNC_TDIST_MS" -#define HID_FUNC_TDIST_RT "SC_HID_FUNC_TDIST_RT" -#define HID_FUNC_TINV_2T "SC_HID_FUNC_TINV_2T" -#define HID_FUNC_TINV_MS "SC_HID_FUNC_TINV_MS" -#define HID_FUNC_TTEST_MS "SC_HID_FUNC_TTEST_MS" -#define HID_FUNC_PERCENTILE_EXC "SC_HID_FUNC_PERCENTILE_EXC" -#define HID_FUNC_PERCENTILE_INC "SC_HID_FUNC_PERCENTILE_INC" -#define HID_FUNC_PERCENTRANK_EXC "SC_HID_FUNC_PERCENTRANK_EXC" -#define HID_FUNC_PERCENTRANK_INC "SC_HID_FUNC_PERCENTRANK_INC" -#define HID_FUNC_QUARTILE_INC "SC_HID_FUNC_QUARTILE_INC" -#define HID_FUNC_QUARTILE_EXC "SC_HID_FUNC_QUARTILE_EXC" -#define HID_FUNC_RANK_EQ "SC_HID_FUNC_RANK_EQ" -#define HID_FUNC_RANK_AVG "SC_HID_FUNC_RANK_AVG" -#define HID_FUNC_MODAL_VALUE_MS "SC_HID_FUNC_MODAL_VALUE_MS" -#define HID_FUNC_MODAL_VALUE_MULTI "SC_HID_FUNC_MODAL_VALUE_MULTI" -#define HID_FUNC_NEGBINOMDIST_MS "SC_HID_FUNC_NEGBINOMDIST_MS" -#define HID_FUNC_Z_TEST_MS "SC_HID_FUNC_Z_TEST_MS" -#define HID_FUNC_CEIL_MS "SC_HID_FUNC_CEIL_MS" -#define HID_FUNC_CEIL_PRECISE "SC_HID_FUNC_CEIL_PRECISE" -#define HID_FUNC_CEIL_ISO "SC_HID_FUNC_CEIL_ISO" -#define HID_FUNC_FLOOR_MS "SC_HID_FUNC_FLOOR_MS" -#define HID_FUNC_NETWORKDAYS "SC_HID_FUNC_NETWORKDAYS" -#define HID_FUNC_NETWORKDAYS_MS "SC_HID_FUNC_NETWORKDAYS_MS" -#define HID_FUNC_WORKDAY_MS "SC_HID_FUNC_WORKDAY_MS" -#define HID_FUNC_ERF_MS "SC_HID_FUNC_ERF_MS" -#define HID_FUNC_ERFC_MS "SC_HID_FUNC_ERFC_MS" -#define HID_FUNC_AGGREGATE "SC_HID_FUNC_AGGREGATE" -#define HID_FUNC_ERROR_TYPE_ODF "SC_HID_FUNC_ERROR_TYPE_ODF" -#define HID_FUNC_CEIL_MATH "SC_HID_FUNC_CEIL_MATH" -#define HID_FUNC_FLOOR_MATH "SC_HID_FUNC_FLOOR_MATH" -#define HID_FUNC_FLOOR_PRECISE "SC_HID_FUNC_FLOOR_PRECISE" -#define HID_FUNC_RAWSUBTRACT "SC_HID_FUNC_RAWSUBTRACT" -#define HID_FUNC_WEEKNUM_OOO "SC_HID_FUNC_WEEKNUM_OOO" -#define HID_FUNC_FORECAST_ETS_ADD "SC_HID_FUNC_FORECAST_ETS_ADD" -#define HID_FUNC_FORECAST_ETS_MUL "SC_HID_FUNC_FORECAST_ETS_MUL" -#define HID_FUNC_FORECAST_ETS_PIA "SC_HID_FUNC_FORECAST_ETS_PIA" -#define HID_FUNC_FORECAST_ETS_PIM "SC_HID_FUNC_FORECAST_ETS_PIM" -#define HID_FUNC_FORECAST_ETS_SEA "SC_HID_FUNC_FORECAST_ETS_SEA" -#define HID_FUNC_FORECAST_ETS_STA "SC_HID_FUNC_FORECAST_ETS_STA" -#define HID_FUNC_FORECAST_ETS_STM "SC_HID_FUNC_FORECAST_ETS_STM" -#define HID_FUNC_FORECAST_LIN "SC_HID_FUNC_FORECAST_LIN" -#define HID_FUNC_CONCAT_MS "SC_HID_FUNC_CONCAT_MS" -#define HID_FUNC_TEXTJOIN_MS "SC_HID_FUNC_TEXTJOIN_MS" -#define HID_FUNC_IFS_MS "SC_HID_FUNC_IFS_MS" -#define HID_FUNC_SWITCH_MS "SC_HID_FUNC_SWITCH_MS" -#define HID_FUNC_MINIFS_MS "SC_HID_FUNC_MINIFS_MS" -#define HID_FUNC_MAXIFS_MS "SC_HID_FUNC_MAXIFS_MS" -#define HID_FUNC_ROUNDSIG "SC_HID_FUNC_ROUNDSIG" -#define HID_FUNC_REPLACEB "SC_HID_FUNC_REPLACEB" -#define HID_FUNC_FINDB "SC_HID_FUNC_FINDB" -#define HID_FUNC_SEARCHB "SC_HID_FUNC_SEARCHB" -#define HID_FUNC_REGEX "SC_HID_FUNC_REGEX" -#define HID_FUNC_FOURIER "SC_HID_FUNC_FOURIER" -#define HID_FUNC_RAND_NV "SC_HID_FUNC_RAND_NV" -#define HID_FUNC_RANDBETWEEN_NV "SC_HID_FUNC_RANDBETWEEN_NV" +inline constexpr OUStringLiteral HID_FUNC_DBANZAHL = u"SC_HID_FUNC_DBANZAHL"; +inline constexpr OUStringLiteral HID_FUNC_DBANZAHL2 = u"SC_HID_FUNC_DBANZAHL2"; +inline constexpr OUStringLiteral HID_FUNC_DBMITTELWERT = u"SC_HID_FUNC_DBMITTELWERT"; +inline constexpr OUStringLiteral HID_FUNC_DBAUSZUG = u"SC_HID_FUNC_DBAUSZUG"; +inline constexpr OUStringLiteral HID_FUNC_DBMAX = u"SC_HID_FUNC_DBMAX"; +inline constexpr OUStringLiteral HID_FUNC_DBMIN = u"SC_HID_FUNC_DBMIN"; +inline constexpr OUStringLiteral HID_FUNC_DBPRODUKT = u"SC_HID_FUNC_DBPRODUKT"; +inline constexpr OUStringLiteral HID_FUNC_DBSTDABW = u"SC_HID_FUNC_DBSTDABW"; +inline constexpr OUStringLiteral HID_FUNC_DBSTDABWN = u"SC_HID_FUNC_DBSTDABWN"; +inline constexpr OUStringLiteral HID_FUNC_DBSUMME = u"SC_HID_FUNC_DBSUMME"; +inline constexpr OUStringLiteral HID_FUNC_DBVARIANZ = u"SC_HID_FUNC_DBVARIANZ"; +inline constexpr OUStringLiteral HID_FUNC_DBVARIANZEN = u"SC_HID_FUNC_DBVARIANZEN"; + +inline constexpr OUStringLiteral HID_FUNC_DATUM = u"SC_HID_FUNC_DATUM"; +inline constexpr OUStringLiteral HID_FUNC_DATWERT = u"SC_HID_FUNC_DATWERT"; +inline constexpr OUStringLiteral HID_FUNC_TAG = u"SC_HID_FUNC_TAG"; +inline constexpr OUStringLiteral HID_FUNC_TAGE360 = u"SC_HID_FUNC_TAGE360"; +inline constexpr OUStringLiteral HID_FUNC_STUNDE = u"SC_HID_FUNC_STUNDE"; +inline constexpr OUStringLiteral HID_FUNC_MINUTE = u"SC_HID_FUNC_MINUTE"; +inline constexpr OUStringLiteral HID_FUNC_MONAT = u"SC_HID_FUNC_MONAT"; +inline constexpr OUStringLiteral HID_FUNC_JETZT = u"SC_HID_FUNC_JETZT"; +inline constexpr OUStringLiteral HID_FUNC_SEKUNDE = u"SC_HID_FUNC_SEKUNDE"; +inline constexpr OUStringLiteral HID_FUNC_ZEIT = u"SC_HID_FUNC_ZEIT"; +inline constexpr OUStringLiteral HID_FUNC_ZEITWERT = u"SC_HID_FUNC_ZEITWERT"; +inline constexpr OUStringLiteral HID_FUNC_HEUTE = u"SC_HID_FUNC_HEUTE"; +inline constexpr OUStringLiteral HID_FUNC_WOCHENTAG = u"SC_HID_FUNC_WOCHENTAG"; +inline constexpr OUStringLiteral HID_FUNC_JAHR = u"SC_HID_FUNC_JAHR"; +inline constexpr OUStringLiteral HID_FUNC_TAGE = u"SC_HID_FUNC_TAGE"; +inline constexpr OUStringLiteral HID_FUNC_DATEDIF = u"SC_HID_FUNC_DATEDIF"; +inline constexpr OUStringLiteral HID_FUNC_KALENDERWOCHE = u"SC_HID_FUNC_KALENDERWOCHE"; +inline constexpr OUStringLiteral HID_FUNC_OSTERSONNTAG = u"SC_HID_FUNC_OSTERSONNTAG"; +inline constexpr OUStringLiteral HID_FUNC_ISOWEEKNUM = u"SC_HID_FUNC_ISOWEEKNUM"; + +inline constexpr OUStringLiteral HID_FUNC_BW = u"SC_HID_FUNC_BW"; +inline constexpr OUStringLiteral HID_FUNC_ZW = u"SC_HID_FUNC_ZW"; +inline constexpr OUStringLiteral HID_FUNC_ZZR = u"SC_HID_FUNC_ZZR"; +inline constexpr OUStringLiteral HID_FUNC_RMZ = u"SC_HID_FUNC_RMZ"; +inline constexpr OUStringLiteral HID_FUNC_ZINS = u"SC_HID_FUNC_ZINS"; +inline constexpr OUStringLiteral HID_FUNC_ZINSZ = u"SC_HID_FUNC_ZINSZ"; +inline constexpr OUStringLiteral HID_FUNC_KAPZ = u"SC_HID_FUNC_KAPZ"; +inline constexpr OUStringLiteral HID_FUNC_KUMKAPITAL = u"SC_HID_FUNC_KUMKAPITAL"; +inline constexpr OUStringLiteral HID_FUNC_KUMZINSZ = u"SC_HID_FUNC_KUMZINSZ"; +inline constexpr OUStringLiteral HID_FUNC_DIA = u"SC_HID_FUNC_DIA"; +inline constexpr OUStringLiteral HID_FUNC_LIA = u"SC_HID_FUNC_LIA"; +inline constexpr OUStringLiteral HID_FUNC_GDA = u"SC_HID_FUNC_GDA"; +inline constexpr OUStringLiteral HID_FUNC_GDA2 = u"SC_HID_FUNC_GDA2"; +inline constexpr OUStringLiteral HID_FUNC_VDB = u"SC_HID_FUNC_VDB"; +inline constexpr OUStringLiteral HID_FUNC_EFFEKTIV = u"SC_HID_FUNC_EFFEKTIV"; +inline constexpr OUStringLiteral HID_FUNC_NOMINAL = u"SC_HID_FUNC_NOMINAL"; +inline constexpr OUStringLiteral HID_FUNC_NBW = u"SC_HID_FUNC_NBW"; +inline constexpr OUStringLiteral HID_FUNC_IKV = u"SC_HID_FUNC_IKV"; +inline constexpr OUStringLiteral HID_FUNC_LAUFZEIT = u"SC_HID_FUNC_LAUFZEIT"; +inline constexpr OUStringLiteral HID_FUNC_ZGZ = u"SC_HID_FUNC_ZGZ"; +inline constexpr OUStringLiteral HID_FUNC_QIKV = u"SC_HID_FUNC_QIKV"; +inline constexpr OUStringLiteral HID_FUNC_ISPMT = u"SC_HID_FUNC_ISPMT"; + +inline constexpr OUStringLiteral HID_FUNC_ISTBEZUG = u"SC_HID_FUNC_ISTBEZUG"; +inline constexpr OUStringLiteral HID_FUNC_ISTFEHL = u"SC_HID_FUNC_ISTFEHL"; +inline constexpr OUStringLiteral HID_FUNC_ISTFEHLER = u"SC_HID_FUNC_ISTFEHLER"; +inline constexpr OUStringLiteral HID_FUNC_ISTLEER = u"SC_HID_FUNC_ISTLEER"; +inline constexpr OUStringLiteral HID_FUNC_ISTLOG = u"SC_HID_FUNC_ISTLOG"; +inline constexpr OUStringLiteral HID_FUNC_ISTNV = u"SC_HID_FUNC_ISTNV"; +inline constexpr OUStringLiteral HID_FUNC_ISTKTEXT = u"SC_HID_FUNC_ISTKTEXT"; +inline constexpr OUStringLiteral HID_FUNC_ISTTEXT = u"SC_HID_FUNC_ISTTEXT"; +inline constexpr OUStringLiteral HID_FUNC_ISTZAHL = u"SC_HID_FUNC_ISTZAHL"; +inline constexpr OUStringLiteral HID_FUNC_ISTFORMEL = u"SC_HID_FUNC_ISTFORMEL"; +inline constexpr OUStringLiteral HID_FUNC_N = u"SC_HID_FUNC_N"; +inline constexpr OUStringLiteral HID_FUNC_NV = u"SC_HID_FUNC_NV"; +inline constexpr OUStringLiteral HID_FUNC_TYP = u"SC_HID_FUNC_TYP"; +inline constexpr OUStringLiteral HID_FUNC_AKTUELL = u"SC_HID_FUNC_AKTUELL"; +inline constexpr OUStringLiteral HID_FUNC_FORMEL = u"SC_HID_FUNC_FORMEL"; +inline constexpr OUStringLiteral HID_FUNC_ZELLE = u"SC_HID_FUNC_ZELLE"; +inline constexpr OUStringLiteral HID_FUNC_INFO = u"SC_HID_FUNC_INFO"; + +inline constexpr OUStringLiteral HID_FUNC_FALSCH = u"SC_HID_FUNC_FALSCH"; +inline constexpr OUStringLiteral HID_FUNC_NICHT = u"SC_HID_FUNC_NICHT"; +inline constexpr OUStringLiteral HID_FUNC_WAHR = u"SC_HID_FUNC_WAHR"; +inline constexpr OUStringLiteral HID_FUNC_WENN = u"SC_HID_FUNC_WENN"; +inline constexpr OUStringLiteral HID_FUNC_IFERROR = u"SC_HID_FUNC_IFERROR"; +inline constexpr OUStringLiteral HID_FUNC_IFNA = u"SC_HID_FUNC_IFNA"; +inline constexpr OUStringLiteral HID_FUNC_ODER = u"SC_HID_FUNC_ODER"; +inline constexpr OUStringLiteral HID_FUNC_UND = u"SC_HID_FUNC_UND"; +inline constexpr OUStringLiteral HID_FUNC_XOR = u"SC_HID_FUNC_XOR"; + +inline constexpr OUStringLiteral HID_FUNC_ABS = u"SC_HID_FUNC_ABS"; +inline constexpr OUStringLiteral HID_FUNC_POTENZ = u"SC_HID_FUNC_POTENZ"; +inline constexpr OUStringLiteral HID_FUNC_ANZAHLLEEREZELLEN = u"SC_HID_FUNC_ANZAHLLEEREZELLEN"; +inline constexpr OUStringLiteral HID_FUNC_PI = u"SC_HID_FUNC_PI"; +inline constexpr OUStringLiteral HID_FUNC_SUMME = u"SC_HID_FUNC_SUMME"; +inline constexpr OUStringLiteral HID_FUNC_QUADRATESUMME = u"SC_HID_FUNC_QUADRATESUMME"; +inline constexpr OUStringLiteral HID_FUNC_PRODUKT = u"SC_HID_FUNC_PRODUKT"; +inline constexpr OUStringLiteral HID_FUNC_SUMMEWENN = u"SC_HID_FUNC_SUMMEWENN"; +inline constexpr OUStringLiteral HID_FUNC_AVERAGEIF = u"SC_HID_FUNC_AVERAGEIF"; +inline constexpr OUStringLiteral HID_FUNC_SUMIFS = u"SC_HID_FUNC_SUMIFS"; +inline constexpr OUStringLiteral HID_FUNC_AVERAGEIFS = u"SC_HID_FUNC_AVERAGEIFS"; +inline constexpr OUStringLiteral HID_FUNC_COUNTIFS = u"SC_HID_FUNC_COUNTIFS"; +inline constexpr OUStringLiteral HID_FUNC_ZAEHLENWENN = u"SC_HID_FUNC_ZAEHLENWENN"; +inline constexpr OUStringLiteral HID_FUNC_WURZEL = u"SC_HID_FUNC_WURZEL"; +inline constexpr OUStringLiteral HID_FUNC_ZUFALLSZAHL = u"SC_HID_FUNC_ZUFALLSZAHL"; +inline constexpr OUStringLiteral HID_FUNC_ISTGERADE = u"SC_HID_FUNC_ISTGERADE"; +inline constexpr OUStringLiteral HID_FUNC_ISTUNGERADE = u"SC_HID_FUNC_ISTUNGERADE"; +inline constexpr OUStringLiteral HID_FUNC_KOMBINATIONEN = u"SC_HID_FUNC_KOMBINATIONEN"; +inline constexpr OUStringLiteral HID_FUNC_KOMBINATIONEN2 = u"SC_HID_FUNC_KOMBINATIONEN2"; +inline constexpr OUStringLiteral HID_FUNC_ARCCOS = u"SC_HID_FUNC_ARCCOS"; +inline constexpr OUStringLiteral HID_FUNC_ARCSIN = u"SC_HID_FUNC_ARCSIN"; +inline constexpr OUStringLiteral HID_FUNC_ARCOSHYP = u"SC_HID_FUNC_ARCOSHYP"; +inline constexpr OUStringLiteral HID_FUNC_ARSINHYP = u"SC_HID_FUNC_ARSINHYP"; +inline constexpr OUStringLiteral HID_FUNC_ARCCOT = u"SC_HID_FUNC_ARCCOT"; +inline constexpr OUStringLiteral HID_FUNC_ARCTAN = u"SC_HID_FUNC_ARCTAN"; +inline constexpr OUStringLiteral HID_FUNC_ARCOTHYP = u"SC_HID_FUNC_ARCOTHYP"; +inline constexpr OUStringLiteral HID_FUNC_ARTANHYP = u"SC_HID_FUNC_ARTANHYP"; +inline constexpr OUStringLiteral HID_FUNC_COS = u"SC_HID_FUNC_COS"; +inline constexpr OUStringLiteral HID_FUNC_SIN = u"SC_HID_FUNC_SIN"; +inline constexpr OUStringLiteral HID_FUNC_COT = u"SC_HID_FUNC_COT"; +inline constexpr OUStringLiteral HID_FUNC_TAN = u"SC_HID_FUNC_TAN"; +inline constexpr OUStringLiteral HID_FUNC_COSHYP = u"SC_HID_FUNC_COSHYP"; +inline constexpr OUStringLiteral HID_FUNC_SINHYP = u"SC_HID_FUNC_SINHYP"; +inline constexpr OUStringLiteral HID_FUNC_COTHYP = u"SC_HID_FUNC_COTHYP"; +inline constexpr OUStringLiteral HID_FUNC_TANHYP = u"SC_HID_FUNC_TANHYP"; +inline constexpr OUStringLiteral HID_FUNC_ARCTAN2 = u"SC_HID_FUNC_ARCTAN2"; +inline constexpr OUStringLiteral HID_FUNC_COSECANT = u"SC_HID_FUNC_COSECANT"; +inline constexpr OUStringLiteral HID_FUNC_SECANT = u"SC_HID_FUNC_SECANT"; +inline constexpr OUStringLiteral HID_FUNC_SECANTHYP = u"SC_HID_FUNC_SECANTHYP"; +inline constexpr OUStringLiteral HID_FUNC_COSECANTHYP = u"SC_HID_FUNC_COSECANTHYP"; +inline constexpr OUStringLiteral HID_FUNC_DEG = u"SC_HID_FUNC_DEG"; +inline constexpr OUStringLiteral HID_FUNC_RAD = u"SC_HID_FUNC_RAD"; +inline constexpr OUStringLiteral HID_FUNC_EXP = u"SC_HID_FUNC_EXP"; +inline constexpr OUStringLiteral HID_FUNC_LOG = u"SC_HID_FUNC_LOG"; +inline constexpr OUStringLiteral HID_FUNC_LN = u"SC_HID_FUNC_LN"; +inline constexpr OUStringLiteral HID_FUNC_LOG10 = u"SC_HID_FUNC_LOG10"; +inline constexpr OUStringLiteral HID_FUNC_FAKULTAET = u"SC_HID_FUNC_FAKULTAET"; +inline constexpr OUStringLiteral HID_FUNC_REST = u"SC_HID_FUNC_REST"; +inline constexpr OUStringLiteral HID_FUNC_VORZEICHEN = u"SC_HID_FUNC_VORZEICHEN"; +inline constexpr OUStringLiteral HID_FUNC_TEILERGEBNIS = u"SC_HID_FUNC_TEILERGEBNIS"; +inline constexpr OUStringLiteral HID_FUNC_GANZZAHL = u"SC_HID_FUNC_GANZZAHL"; +inline constexpr OUStringLiteral HID_FUNC_KUERZEN = u"SC_HID_FUNC_KUERZEN"; +inline constexpr OUStringLiteral HID_FUNC_RUNDEN = u"SC_HID_FUNC_RUNDEN"; +inline constexpr OUStringLiteral HID_FUNC_AUFRUNDEN = u"SC_HID_FUNC_AUFRUNDEN"; +inline constexpr OUStringLiteral HID_FUNC_ABRUNDEN = u"SC_HID_FUNC_ABRUNDEN"; +inline constexpr OUStringLiteral HID_FUNC_GERADE = u"SC_HID_FUNC_GERADE"; +inline constexpr OUStringLiteral HID_FUNC_UNGERADE = u"SC_HID_FUNC_UNGERADE"; +inline constexpr OUStringLiteral HID_FUNC_OBERGRENZE = u"SC_HID_FUNC_OBERGRENZE"; +inline constexpr OUStringLiteral HID_FUNC_UNTERGRENZE = u"SC_HID_FUNC_UNTERGRENZE"; +inline constexpr OUStringLiteral HID_FUNC_GGT = u"SC_HID_FUNC_GGT"; +inline constexpr OUStringLiteral HID_FUNC_KGV = u"SC_HID_FUNC_KGV"; +inline constexpr OUStringLiteral HID_FUNC_UMRECHNEN = u"SC_HID_FUNC_UMRECHNEN"; +inline constexpr OUStringLiteral HID_FUNC_EUROCONVERT = u"SC_HID_FUNC_EUROCONVERT"; + +inline constexpr OUStringLiteral HID_FUNC_MTRANS = u"SC_HID_FUNC_MTRANS"; +inline constexpr OUStringLiteral HID_FUNC_MMULT = u"SC_HID_FUNC_MMULT"; +inline constexpr OUStringLiteral HID_FUNC_MDET = u"SC_HID_FUNC_MDET"; +inline constexpr OUStringLiteral HID_FUNC_MINV = u"SC_HID_FUNC_MINV"; +inline constexpr OUStringLiteral HID_FUNC_EINHEITSMATRIX = u"SC_HID_FUNC_EINHEITSMATRIX"; +inline constexpr OUStringLiteral HID_FUNC_SUMMENPRODUKT = u"SC_HID_FUNC_SUMMENPRODUKT"; +inline constexpr OUStringLiteral HID_FUNC_SUMMEX2MY2 = u"SC_HID_FUNC_SUMMEX2MY2"; +inline constexpr OUStringLiteral HID_FUNC_SUMMEX2PY2 = u"SC_HID_FUNC_SUMMEX2PY2"; +inline constexpr OUStringLiteral HID_FUNC_SUMMEXMY2 = u"SC_HID_FUNC_SUMMEXMY2"; +inline constexpr OUStringLiteral HID_FUNC_HAEUFIGKEIT = u"SC_HID_FUNC_HAEUFIGKEIT"; +inline constexpr OUStringLiteral HID_FUNC_RGP = u"SC_HID_FUNC_RGP"; +inline constexpr OUStringLiteral HID_FUNC_RKP = u"SC_HID_FUNC_RKP"; +inline constexpr OUStringLiteral HID_FUNC_TREND = u"SC_HID_FUNC_TREND"; +inline constexpr OUStringLiteral HID_FUNC_VARIATION = u"SC_HID_FUNC_VARIATION"; + +inline constexpr OUStringLiteral HID_FUNC_ANZAHL = u"SC_HID_FUNC_ANZAHL"; +inline constexpr OUStringLiteral HID_FUNC_ANZAHL2 = u"SC_HID_FUNC_ANZAHL2"; +inline constexpr OUStringLiteral HID_FUNC_MAX = u"SC_HID_FUNC_MAX"; +inline constexpr OUStringLiteral HID_FUNC_MIN = u"SC_HID_FUNC_MIN"; +inline constexpr OUStringLiteral HID_FUNC_VARIANZ = u"SC_HID_FUNC_VARIANZ"; +inline constexpr OUStringLiteral HID_FUNC_VARIANZEN = u"SC_HID_FUNC_VARIANZEN"; +inline constexpr OUStringLiteral HID_FUNC_STABW = u"SC_HID_FUNC_STABW"; +inline constexpr OUStringLiteral HID_FUNC_STABWN = u"SC_HID_FUNC_STABWN"; +inline constexpr OUStringLiteral HID_FUNC_MITTELWERT = u"SC_HID_FUNC_MITTELWERT"; +inline constexpr OUStringLiteral HID_FUNC_SUMQUADABW = u"SC_HID_FUNC_SUMQUADABW"; +inline constexpr OUStringLiteral HID_FUNC_MITTELABW = u"SC_HID_FUNC_MITTELABW"; +inline constexpr OUStringLiteral HID_FUNC_SCHIEFE = u"SC_HID_FUNC_SCHIEFE"; +inline constexpr OUStringLiteral HID_FUNC_SKEWP = u"SC_HID_FUNC_SKEWP"; +inline constexpr OUStringLiteral HID_FUNC_KURT = u"SC_HID_FUNC_KURT"; +inline constexpr OUStringLiteral HID_FUNC_GEOMITTEL = u"SC_HID_FUNC_GEOMITTEL"; +inline constexpr OUStringLiteral HID_FUNC_HARMITTEL = u"SC_HID_FUNC_HARMITTEL"; +inline constexpr OUStringLiteral HID_FUNC_MODALWERT = u"SC_HID_FUNC_MODALWERT"; +inline constexpr OUStringLiteral HID_FUNC_MEDIAN = u"SC_HID_FUNC_MEDIAN"; +inline constexpr OUStringLiteral HID_FUNC_QUANTIL = u"SC_HID_FUNC_QUANTIL"; +inline constexpr OUStringLiteral HID_FUNC_QUARTILE = u"SC_HID_FUNC_QUARTILE"; +inline constexpr OUStringLiteral HID_FUNC_KGROESSTE = u"SC_HID_FUNC_KGROESSTE"; +inline constexpr OUStringLiteral HID_FUNC_KKLEINSTE = u"SC_HID_FUNC_KKLEINSTE"; +inline constexpr OUStringLiteral HID_FUNC_QUANTILSRANG = u"SC_HID_FUNC_QUANTILSRANG"; +inline constexpr OUStringLiteral HID_FUNC_RANG = u"SC_HID_FUNC_RANG"; +inline constexpr OUStringLiteral HID_FUNC_GESTUTZTMITTEL = u"SC_HID_FUNC_GESTUTZTMITTEL"; +inline constexpr OUStringLiteral HID_FUNC_WAHRSCHBEREICH = u"SC_HID_FUNC_WAHRSCHBEREICH"; +inline constexpr OUStringLiteral HID_FUNC_B = u"SC_HID_FUNC_B"; +inline constexpr OUStringLiteral HID_FUNC_PHI = u"SC_HID_FUNC_PHI"; +inline constexpr OUStringLiteral HID_FUNC_GAUSS = u"SC_HID_FUNC_GAUSS"; +inline constexpr OUStringLiteral HID_FUNC_FISHER = u"SC_HID_FUNC_FISHER"; +inline constexpr OUStringLiteral HID_FUNC_FISHERINV = u"SC_HID_FUNC_FISHERINV"; +inline constexpr OUStringLiteral HID_FUNC_BINOMVERT = u"SC_HID_FUNC_BINOMVERT"; +inline constexpr OUStringLiteral HID_FUNC_NEGBINOMVERT = u"SC_HID_FUNC_NEGBINOMVERT"; +inline constexpr OUStringLiteral HID_FUNC_KRITBINOM = u"SC_HID_FUNC_KRITBINOM"; +inline constexpr OUStringLiteral HID_FUNC_POISSON = u"SC_HID_FUNC_POISSON"; +inline constexpr OUStringLiteral HID_FUNC_NORMVERT = u"SC_HID_FUNC_NORMVERT"; +inline constexpr OUStringLiteral HID_FUNC_NORMINV = u"SC_HID_FUNC_NORMINV"; +inline constexpr OUStringLiteral HID_FUNC_STANDNORMVERT = u"SC_HID_FUNC_STANDNORMVERT"; +inline constexpr OUStringLiteral HID_FUNC_STANDNORMINV = u"SC_HID_FUNC_STANDNORMINV"; +inline constexpr OUStringLiteral HID_FUNC_LOGNORMVERT = u"SC_HID_FUNC_LOGNORMVERT"; +inline constexpr OUStringLiteral HID_FUNC_LOGINV = u"SC_HID_FUNC_LOGINV"; +inline constexpr OUStringLiteral HID_FUNC_EXPONVERT = u"SC_HID_FUNC_EXPONVERT"; +inline constexpr OUStringLiteral HID_FUNC_GAMMAVERT = u"SC_HID_FUNC_GAMMAVERT"; +inline constexpr OUStringLiteral HID_FUNC_GAMMAINV = u"SC_HID_FUNC_GAMMAINV"; +inline constexpr OUStringLiteral HID_FUNC_GAMMALN = u"SC_HID_FUNC_GAMMALN"; +inline constexpr OUStringLiteral HID_FUNC_BETAVERT = u"SC_HID_FUNC_BETAVERT"; +inline constexpr OUStringLiteral HID_FUNC_BETAINV = u"SC_HID_FUNC_BETAINV"; +inline constexpr OUStringLiteral HID_FUNC_WEIBULL = u"SC_HID_FUNC_WEIBULL"; +inline constexpr OUStringLiteral HID_FUNC_HYPGEOMVERT = u"SC_HID_FUNC_HYPGEOMVERT"; +inline constexpr OUStringLiteral HID_FUNC_TVERT = u"SC_HID_FUNC_TVERT"; +inline constexpr OUStringLiteral HID_FUNC_TINV = u"SC_HID_FUNC_TINV"; +inline constexpr OUStringLiteral HID_FUNC_FVERT = u"SC_HID_FUNC_FVERT"; +inline constexpr OUStringLiteral HID_FUNC_FINV = u"SC_HID_FUNC_FINV"; +inline constexpr OUStringLiteral HID_FUNC_CHIVERT = u"SC_HID_FUNC_CHIVERT"; +inline constexpr OUStringLiteral HID_FUNC_CHIINV = u"SC_HID_FUNC_CHIINV"; +inline constexpr OUStringLiteral HID_FUNC_STANDARDISIERUNG = u"SC_HID_FUNC_STANDARDISIERUNG"; +inline constexpr OUStringLiteral HID_FUNC_VARIATIONEN = u"SC_HID_FUNC_VARIATIONEN"; +inline constexpr OUStringLiteral HID_FUNC_VARIATIONEN2 = u"SC_HID_FUNC_VARIATIONEN2"; +inline constexpr OUStringLiteral HID_FUNC_KONFIDENZ = u"SC_HID_FUNC_KONFIDENZ"; +inline constexpr OUStringLiteral HID_FUNC_GTEST = u"SC_HID_FUNC_GTEST"; +inline constexpr OUStringLiteral HID_FUNC_CHITEST = u"SC_HID_FUNC_CHITEST"; +inline constexpr OUStringLiteral HID_FUNC_FTEST = u"SC_HID_FUNC_FTEST"; +inline constexpr OUStringLiteral HID_FUNC_TTEST = u"SC_HID_FUNC_TTEST"; +inline constexpr OUStringLiteral HID_FUNC_BESTIMMTHEITSMASS = u"SC_HID_FUNC_BESTIMMTHEITSMASS"; +inline constexpr OUStringLiteral HID_FUNC_ACHSENABSCHNITT = u"SC_HID_FUNC_ACHSENABSCHNITT"; +inline constexpr OUStringLiteral HID_FUNC_STEIGUNG = u"SC_HID_FUNC_STEIGUNG"; +inline constexpr OUStringLiteral HID_FUNC_STFEHLERYX = u"SC_HID_FUNC_STFEHLERYX"; +inline constexpr OUStringLiteral HID_FUNC_PEARSON = u"SC_HID_FUNC_PEARSON"; +inline constexpr OUStringLiteral HID_FUNC_KORREL = u"SC_HID_FUNC_KORREL"; +inline constexpr OUStringLiteral HID_FUNC_KOVAR = u"SC_HID_FUNC_KOVAR"; +inline constexpr OUStringLiteral HID_FUNC_SCHAETZER = u"SC_HID_FUNC_SCHAETZER"; +inline constexpr OUStringLiteral HID_FUNC_MINA = u"SC_HID_FUNC_MINA"; +inline constexpr OUStringLiteral HID_FUNC_MAXA = u"SC_HID_FUNC_MAXA"; +inline constexpr OUStringLiteral HID_FUNC_MITTELWERTA = u"SC_HID_FUNC_MITTELWERTA"; +inline constexpr OUStringLiteral HID_FUNC_STABWA = u"SC_HID_FUNC_STABWA"; +inline constexpr OUStringLiteral HID_FUNC_STABWNA = u"SC_HID_FUNC_STABWNA"; +inline constexpr OUStringLiteral HID_FUNC_VARIANZA = u"SC_HID_FUNC_VARIANZA"; +inline constexpr OUStringLiteral HID_FUNC_VARIANZENA = u"SC_HID_FUNC_VARIANZENA"; +inline constexpr OUStringLiteral HID_FUNC_CHISQDIST = u"SC_HID_FUNC_CHISQDIST"; +inline constexpr OUStringLiteral HID_FUNC_CHISQINV = u"SC_HID_FUNC_CHISQINV"; +inline constexpr OUStringLiteral HID_FUNC_GAMMA = u"SC_HID_FUNC_GAMMA"; + +inline constexpr OUStringLiteral HID_FUNC_ADRESSE = u"SC_HID_FUNC_ADRESSE"; +inline constexpr OUStringLiteral HID_FUNC_BEREICHE = u"SC_HID_FUNC_BEREICHE"; +inline constexpr OUStringLiteral HID_FUNC_WAHL = u"SC_HID_FUNC_WAHL"; +inline constexpr OUStringLiteral HID_FUNC_SPALTE = u"SC_HID_FUNC_SPALTE"; +inline constexpr OUStringLiteral HID_FUNC_ZEILE = u"SC_HID_FUNC_ZEILE"; +inline constexpr OUStringLiteral HID_FUNC_SPALTEN = u"SC_HID_FUNC_SPALTEN"; +inline constexpr OUStringLiteral HID_FUNC_ZEILEN = u"SC_HID_FUNC_ZEILEN"; +inline constexpr OUStringLiteral HID_FUNC_WVERWEIS = u"SC_HID_FUNC_WVERWEIS"; +inline constexpr OUStringLiteral HID_FUNC_SVERWEIS = u"SC_HID_FUNC_SVERWEIS"; +inline constexpr OUStringLiteral HID_FUNC_INDEX = u"SC_HID_FUNC_INDEX"; +inline constexpr OUStringLiteral HID_FUNC_INDIREKT = u"SC_HID_FUNC_INDIREKT"; +inline constexpr OUStringLiteral HID_FUNC_VERWEIS = u"SC_HID_FUNC_VERWEIS"; +inline constexpr OUStringLiteral HID_FUNC_VERGLEICH = u"SC_HID_FUNC_VERGLEICH"; +inline constexpr OUStringLiteral HID_FUNC_VERSCHIEBUNG = u"SC_HID_FUNC_VERSCHIEBUNG"; +inline constexpr OUStringLiteral HID_FUNC_FEHLERTYP = u"SC_HID_FUNC_FEHLERTYP"; +inline constexpr OUStringLiteral HID_FUNC_VORLAGE = u"SC_HID_FUNC_VORLAGE"; +inline constexpr OUStringLiteral HID_FUNC_DDE = u"SC_HID_FUNC_DDE"; +inline constexpr OUStringLiteral HID_FUNC_TABELLE = u"SC_HID_FUNC_TABELLE"; +inline constexpr OUStringLiteral HID_FUNC_TABELLEN = u"SC_HID_FUNC_TABELLEN"; +inline constexpr OUStringLiteral HID_FUNC_HYPERLINK = u"SC_HID_FUNC_HYPERLINK"; +inline constexpr OUStringLiteral HID_FUNC_GETPIVOTDATA = u"SC_HID_FUNC_GETPIVOTDATA"; + +inline constexpr OUStringLiteral HID_FUNC_CODE = u"SC_HID_FUNC_CODE"; +inline constexpr OUStringLiteral HID_FUNC_DM = u"SC_HID_FUNC_DM"; +inline constexpr OUStringLiteral HID_FUNC_ZEICHEN = u"SC_HID_FUNC_ZEICHEN"; +inline constexpr OUStringLiteral HID_FUNC_SAEUBERN = u"SC_HID_FUNC_SAEUBERN"; +inline constexpr OUStringLiteral HID_FUNC_VERKETTEN = u"SC_HID_FUNC_VERKETTEN"; +inline constexpr OUStringLiteral HID_FUNC_IDENTISCH = u"SC_HID_FUNC_IDENTISCH"; +inline constexpr OUStringLiteral HID_FUNC_FINDEN = u"SC_HID_FUNC_FINDEN"; +inline constexpr OUStringLiteral HID_FUNC_SUCHEN = u"SC_HID_FUNC_SUCHEN"; +inline constexpr OUStringLiteral HID_FUNC_GLAETTEN = u"SC_HID_FUNC_GLAETTEN"; +inline constexpr OUStringLiteral HID_FUNC_GROSS2 = u"SC_HID_FUNC_GROSS2"; +inline constexpr OUStringLiteral HID_FUNC_GROSS = u"SC_HID_FUNC_GROSS"; +inline constexpr OUStringLiteral HID_FUNC_KLEIN = u"SC_HID_FUNC_KLEIN"; +inline constexpr OUStringLiteral HID_FUNC_WERT = u"SC_HID_FUNC_WERT"; +inline constexpr OUStringLiteral HID_FUNC_TEXT = u"SC_HID_FUNC_TEXT"; +inline constexpr OUStringLiteral HID_FUNC_T = u"SC_HID_FUNC_T"; +inline constexpr OUStringLiteral HID_FUNC_ERSETZEN = u"SC_HID_FUNC_ERSETZEN"; +inline constexpr OUStringLiteral HID_FUNC_FEST = u"SC_HID_FUNC_FEST"; +inline constexpr OUStringLiteral HID_FUNC_LAENGE = u"SC_HID_FUNC_LAENGE"; +inline constexpr OUStringLiteral HID_FUNC_LINKS = u"SC_HID_FUNC_LINKS"; +inline constexpr OUStringLiteral HID_FUNC_RECHTS = u"SC_HID_FUNC_RECHTS"; +inline constexpr OUStringLiteral HID_FUNC_TEIL = u"SC_HID_FUNC_TEIL"; +inline constexpr OUStringLiteral HID_FUNC_LENB = u"SC_HID_FUNC_LENB"; +inline constexpr OUStringLiteral HID_FUNC_RIGHTB = u"SC_HID_FUNC_RIGHTB"; +inline constexpr OUStringLiteral HID_FUNC_LEFTB = u"SC_HID_FUNC_LEFTB"; +inline constexpr OUStringLiteral HID_FUNC_MIDB = u"SC_HID_FUNC_MIDB"; +inline constexpr OUStringLiteral HID_FUNC_WIEDERHOLEN = u"SC_HID_FUNC_WIEDERHOLEN"; +inline constexpr OUStringLiteral HID_FUNC_WECHSELN = u"SC_HID_FUNC_WECHSELN"; +inline constexpr OUStringLiteral HID_FUNC_BASIS = u"SC_HID_FUNC_BASIS"; +inline constexpr OUStringLiteral HID_FUNC_DEZIMAL = u"SC_HID_FUNC_DEZIMAL"; +inline constexpr OUStringLiteral HID_FUNC_ROEMISCH = u"SC_HID_FUNC_ROEMISCH"; +inline constexpr OUStringLiteral HID_FUNC_ARABISCH = u"SC_HID_FUNC_ARABISCH"; +inline constexpr OUStringLiteral HID_FUNC_BAHTTEXT = u"SC_HID_FUNC_BAHTTEXT"; +inline constexpr OUStringLiteral HID_FUNC_JIS = u"SC_HID_FUNC_JIS"; +inline constexpr OUStringLiteral HID_FUNC_ASC = u"SC_HID_FUNC_ASC"; +inline constexpr OUStringLiteral HID_FUNC_UNICODE = u"SC_HID_FUNC_UNICODE"; +inline constexpr OUStringLiteral HID_FUNC_UNICHAR = u"SC_HID_FUNC_UNICHAR"; +inline constexpr OUStringLiteral HID_FUNC_NUMBERVALUE = u"SC_HID_FUNC_NUMBERVALUE"; +inline constexpr OUStringLiteral HID_FUNC_BITAND = u"SC_HID_FUNC_BITAND"; +inline constexpr OUStringLiteral HID_FUNC_BITOR = u"SC_HID_FUNC_BITOR"; +inline constexpr OUStringLiteral HID_FUNC_BITXOR = u"SC_HID_FUNC_BITXOR"; +inline constexpr OUStringLiteral HID_FUNC_BITLSHIFT = u"SC_HID_FUNC_BITLSHIFT"; +inline constexpr OUStringLiteral HID_FUNC_BITRSHIFT = u"SC_HID_FUNC_BITRSHIFT"; +inline constexpr OUStringLiteral HID_FUNC_FILTERXML = u"SC_HID_FUNC_FILTERXML"; +inline constexpr OUStringLiteral HID_FUNC_WEBSERVICE = u"SC_HID_FUNC_WEBSERVICE"; +inline constexpr OUStringLiteral HID_FUNC_ENCODEURL = u"SC_HID_FUNC_ENCODEURL"; +inline constexpr OUStringLiteral HID_FUNC_COLOR = u"SC_HID_FUNC_COLOR"; +inline constexpr OUStringLiteral HID_FUNC_COVARIANCE_P = u"SC_HID_FUNC_COVARIANCE_P"; +inline constexpr OUStringLiteral HID_FUNC_COVARIANCE_S = u"SC_HID_FUNC_COVARIANCE_S"; +inline constexpr OUStringLiteral HID_FUNC_ST_DEV_P_MS = u"SC_HID_FUNC_ST_DEV_P_MS"; +inline constexpr OUStringLiteral HID_FUNC_ST_DEV_S = u"SC_HID_FUNC_ST_DEV_S"; +inline constexpr OUStringLiteral HID_FUNC_VAR_P_MS = u"SC_HID_FUNC_VAR_P_MS"; +inline constexpr OUStringLiteral HID_FUNC_VAR_S = u"SC_HID_FUNC_VAR_S"; +inline constexpr OUStringLiteral HID_FUNC_BETADIST_MS = u"SC_HID_FUNC_BETADIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_BETAINV_MS = u"SC_HID_FUNC_BETAINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_BINOM_DIST_MS = u"SC_HID_FUNC_BINOM_DIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_BINOM_INV_MS = u"SC_HID_FUNC_BINOM_INV_MS"; +inline constexpr OUStringLiteral HID_FUNC_CHIINV_MS = u"SC_HID_FUNC_CHIINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_CHIVERT_MS = u"SC_HID_FUNC_CHIVERT_MS"; +inline constexpr OUStringLiteral HID_FUNC_CHITEST_MS = u"SC_HID_FUNC_CHITEST_MS"; +inline constexpr OUStringLiteral HID_FUNC_CHISQDIST_MS = u"SC_HID_FUNC_CHISQDIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_CHISQINV_MS = u"SC_HID_FUNC_CHISQINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_CONFIDENCE_N = u"SC_HID_FUNC_CONFIDENCE_N"; +inline constexpr OUStringLiteral HID_FUNC_CONFIDENCE_T = u"SC_HID_FUNC_CONFIDENCE_T"; +inline constexpr OUStringLiteral HID_FUNC_F_DIST_LT = u"SC_HID_FUNC_F_DIST_LT"; +inline constexpr OUStringLiteral HID_FUNC_F_DIST_RT = u"SC_HID_FUNC_F_DIST_RT"; +inline constexpr OUStringLiteral HID_FUNC_F_INV_LT = u"SC_HID_FUNC_F_INV_LT"; +inline constexpr OUStringLiteral HID_FUNC_F_INV_RT = u"SC_HID_FUNC_F_INV_RT"; +inline constexpr OUStringLiteral HID_FUNC_F_TEST_MS = u"SC_HID_FUNC_F_TEST_MS"; +inline constexpr OUStringLiteral HID_FUNC_EXP_DIST_MS = u"SC_HID_FUNC_EXP_DIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_HYP_GEOM_DIST_MS = u"SC_HID_FUNC_HYP_GEOM_DIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_POISSON_DIST_MS = u"SC_HID_FUNC_POISSON_DIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_WEIBULL_DIST_MS = u"SC_HID_FUNC_WEIBULL_DIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_GAMMADIST_MS = u"SC_HID_FUNC_GAMMADIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_GAMMAINV_MS = u"SC_HID_FUNC_GAMMAINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_GAMMALN_MS = u"SC_HID_FUNC_GAMMALN_MS"; +inline constexpr OUStringLiteral HID_FUNC_LOGNORMDIST_MS = u"SC_HID_FUNC_LOGNORMDIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_NORMDIST_MS = u"SC_HID_FUNC_NORMDIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_NORMINV_MS = u"SC_HID_FUNC_NORMINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_STD_NORMDIST_MS = u"SC_HID_FUNC_STD_NORMDIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_STD_NORMINV_MS = u"SC_HID_FUNC_STD_NORMINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_TDIST_2T = u"SC_HID_FUNC_TDIST_2T"; +inline constexpr OUStringLiteral HID_FUNC_TDIST_MS = u"SC_HID_FUNC_TDIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_TDIST_RT = u"SC_HID_FUNC_TDIST_RT"; +inline constexpr OUStringLiteral HID_FUNC_TINV_2T = u"SC_HID_FUNC_TINV_2T"; +inline constexpr OUStringLiteral HID_FUNC_TINV_MS = u"SC_HID_FUNC_TINV_MS"; +inline constexpr OUStringLiteral HID_FUNC_TTEST_MS = u"SC_HID_FUNC_TTEST_MS"; +inline constexpr OUStringLiteral HID_FUNC_PERCENTILE_EXC = u"SC_HID_FUNC_PERCENTILE_EXC"; +inline constexpr OUStringLiteral HID_FUNC_PERCENTILE_INC = u"SC_HID_FUNC_PERCENTILE_INC"; +inline constexpr OUStringLiteral HID_FUNC_PERCENTRANK_EXC = u"SC_HID_FUNC_PERCENTRANK_EXC"; +inline constexpr OUStringLiteral HID_FUNC_PERCENTRANK_INC = u"SC_HID_FUNC_PERCENTRANK_INC"; +inline constexpr OUStringLiteral HID_FUNC_QUARTILE_INC = u"SC_HID_FUNC_QUARTILE_INC"; +inline constexpr OUStringLiteral HID_FUNC_QUARTILE_EXC = u"SC_HID_FUNC_QUARTILE_EXC"; +inline constexpr OUStringLiteral HID_FUNC_RANK_EQ = u"SC_HID_FUNC_RANK_EQ"; +inline constexpr OUStringLiteral HID_FUNC_RANK_AVG = u"SC_HID_FUNC_RANK_AVG"; +inline constexpr OUStringLiteral HID_FUNC_MODAL_VALUE_MS = u"SC_HID_FUNC_MODAL_VALUE_MS"; +inline constexpr OUStringLiteral HID_FUNC_MODAL_VALUE_MULTI = u"SC_HID_FUNC_MODAL_VALUE_MULTI"; +inline constexpr OUStringLiteral HID_FUNC_NEGBINOMDIST_MS = u"SC_HID_FUNC_NEGBINOMDIST_MS"; +inline constexpr OUStringLiteral HID_FUNC_Z_TEST_MS = u"SC_HID_FUNC_Z_TEST_MS"; +inline constexpr OUStringLiteral HID_FUNC_CEIL_MS = u"SC_HID_FUNC_CEIL_MS"; +inline constexpr OUStringLiteral HID_FUNC_CEIL_PRECISE = u"SC_HID_FUNC_CEIL_PRECISE"; +inline constexpr OUStringLiteral HID_FUNC_CEIL_ISO = u"SC_HID_FUNC_CEIL_ISO"; +inline constexpr OUStringLiteral HID_FUNC_FLOOR_MS = u"SC_HID_FUNC_FLOOR_MS"; +inline constexpr OUStringLiteral HID_FUNC_NETWORKDAYS = u"SC_HID_FUNC_NETWORKDAYS"; +inline constexpr OUStringLiteral HID_FUNC_NETWORKDAYS_MS = u"SC_HID_FUNC_NETWORKDAYS_MS"; +inline constexpr OUStringLiteral HID_FUNC_WORKDAY_MS = u"SC_HID_FUNC_WORKDAY_MS"; +inline constexpr OUStringLiteral HID_FUNC_ERF_MS = u"SC_HID_FUNC_ERF_MS"; +inline constexpr OUStringLiteral HID_FUNC_ERFC_MS = u"SC_HID_FUNC_ERFC_MS"; +inline constexpr OUStringLiteral HID_FUNC_AGGREGATE = u"SC_HID_FUNC_AGGREGATE"; +inline constexpr OUStringLiteral HID_FUNC_ERROR_TYPE_ODF = u"SC_HID_FUNC_ERROR_TYPE_ODF"; +inline constexpr OUStringLiteral HID_FUNC_CEIL_MATH = u"SC_HID_FUNC_CEIL_MATH"; +inline constexpr OUStringLiteral HID_FUNC_FLOOR_MATH = u"SC_HID_FUNC_FLOOR_MATH"; +inline constexpr OUStringLiteral HID_FUNC_FLOOR_PRECISE = u"SC_HID_FUNC_FLOOR_PRECISE"; +inline constexpr OUStringLiteral HID_FUNC_RAWSUBTRACT = u"SC_HID_FUNC_RAWSUBTRACT"; +inline constexpr OUStringLiteral HID_FUNC_WEEKNUM_OOO = u"SC_HID_FUNC_WEEKNUM_OOO"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_ADD = u"SC_HID_FUNC_FORECAST_ETS_ADD"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_MUL = u"SC_HID_FUNC_FORECAST_ETS_MUL"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_PIA = u"SC_HID_FUNC_FORECAST_ETS_PIA"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_PIM = u"SC_HID_FUNC_FORECAST_ETS_PIM"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_SEA = u"SC_HID_FUNC_FORECAST_ETS_SEA"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_STA = u"SC_HID_FUNC_FORECAST_ETS_STA"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_ETS_STM = u"SC_HID_FUNC_FORECAST_ETS_STM"; +inline constexpr OUStringLiteral HID_FUNC_FORECAST_LIN = u"SC_HID_FUNC_FORECAST_LIN"; +inline constexpr OUStringLiteral HID_FUNC_CONCAT_MS = u"SC_HID_FUNC_CONCAT_MS"; +inline constexpr OUStringLiteral HID_FUNC_TEXTJOIN_MS = u"SC_HID_FUNC_TEXTJOIN_MS"; +inline constexpr OUStringLiteral HID_FUNC_IFS_MS = u"SC_HID_FUNC_IFS_MS"; +inline constexpr OUStringLiteral HID_FUNC_SWITCH_MS = u"SC_HID_FUNC_SWITCH_MS"; +inline constexpr OUStringLiteral HID_FUNC_MINIFS_MS = u"SC_HID_FUNC_MINIFS_MS"; +inline constexpr OUStringLiteral HID_FUNC_MAXIFS_MS = u"SC_HID_FUNC_MAXIFS_MS"; +inline constexpr OUStringLiteral HID_FUNC_ROUNDSIG = u"SC_HID_FUNC_ROUNDSIG"; +inline constexpr OUStringLiteral HID_FUNC_REPLACEB = u"SC_HID_FUNC_REPLACEB"; +inline constexpr OUStringLiteral HID_FUNC_FINDB = u"SC_HID_FUNC_FINDB"; +inline constexpr OUStringLiteral HID_FUNC_SEARCHB = u"SC_HID_FUNC_SEARCHB"; +inline constexpr OUStringLiteral HID_FUNC_REGEX = u"SC_HID_FUNC_REGEX"; +inline constexpr OUStringLiteral HID_FUNC_FOURIER = u"SC_HID_FUNC_FOURIER"; +inline constexpr OUStringLiteral HID_FUNC_RAND_NV = u"SC_HID_FUNC_RAND_NV"; +inline constexpr OUStringLiteral HID_FUNC_RANDBETWEEN_NV = u"SC_HID_FUNC_RANDBETWEEN_NV"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 1868964e9bd0..a06a435e7d5e 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -55,7 +55,7 @@ public: virtual ~ScAsyncTabController() = default; virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) = 0; virtual const SfxItemSet* GetOutputItemSet() const = 0; - virtual void SetCurPageId( const OString &rName ) = 0; + virtual void SetCurPageId( const OUString &rName ) = 0; }; class AbstractScImportAsciiDlg : public VclAbstractDialog @@ -351,7 +351,7 @@ protected: virtual ~AbstractScShowTabDlg() override = default; public: virtual void Insert( const OUString& rString, bool bSelected ) = 0; - virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0; + virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OUString& nDlgHelpId, const OUString& nLbHelpId ) = 0; virtual std::vector<sal_Int32> GetSelectedRows() const = 0; virtual OUString GetEntry(sal_Int32 nPos) const = 0; }; @@ -404,7 +404,7 @@ protected: public: virtual void Insert( const OUString& rString, bool bSelected ) = 0; virtual void SetDescription(const OUString& rTitle, const OUString& rEntryLabel, const OUString& rListLabel, - const OString& rDlgHelpId, const OString& rEnHelpId, const OString& rLbHelpId) = 0; + const OUString& rDlgHelpId, const OUString& rEnHelpId, const OUString& rLbHelpId) = 0; virtual OUString GetSelectedEntry() const = 0; }; @@ -473,7 +473,7 @@ public: virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Widget* pParent) = 0; virtual VclPtr<AbstractScMetricInputDlg> CreateScMetricInputDlg(weld::Window* pParent, - const OString& sDialogName, + const OUString& sDialogName, tools::Long nCurrent, tools::Long nDefault, FieldUnit eFUnit, @@ -524,8 +524,8 @@ public: const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, - const OString& rHelpId, - const OString& rEditHelpId) = 0; + const OUString& rHelpId, + const OUString& rEditHelpId) = 0; virtual VclPtr<AbstractScTabBgColorDlg> CreateScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle, //Dialog Title diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 93e5e8c77f35..e1fafe145d53 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -74,7 +74,7 @@ struct ScFuncDescCore /* * Help ID, HID_FUNC_... */ - const char* pHelpId; + OUString pHelpId; /* * Number of parameters. VAR_ARGS if variable number, or * VAR_ARGS+number if number of fixed parameters and variable @@ -333,7 +333,7 @@ void ScFuncDesc::initArgumentInfo() const } } -OString ScFuncDesc::getHelpId() const +OUString ScFuncDesc::getHelpId() const { return sHelpId; } diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 82967ecf971d..1130cb844d58 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -39,7 +39,7 @@ public: void SetServiceName( std::u16string_view rServiceName ); /** @return The help ID of the function with given built-in name or 0 if not found. */ - OString GetHelpId( const OUString& rFuncName ) const; + OUString GetHelpId( const OUString& rFuncName ) const; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 99f8061df3d2..c16f8f3e6f5e 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -70,7 +70,7 @@ using namespace com::sun::star; ScUnoAddInFuncData::ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, OUString aDesc, - sal_uInt16 nCat, OString sHelp, + sal_uInt16 nCat, OUString sHelp, uno::Reference<reflection::XIdlMethod> xFunc, uno::Any aO, tools::Long nAC, const ScAddInArgDesc* pAD, @@ -528,7 +528,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + OUString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference<reflection::XIdlMethod> xFunc; // remains empty uno::Any aObject; // also empty @@ -862,7 +862,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& sal_uInt16 nCategory = lcl_GetCategory( xAddIn->getProgrammaticCategoryName( aFuncU ) ); - OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + OUString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); OUString aLocalName; try diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index 92c5fb4f7950..9a7cd9213749 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -24,7 +24,7 @@ struct ScUnoAddInHelpId { const char* pFuncName; - const char* sHelpId; + OUString sHelpId; }; // Help IDs for Analysis AddIn. MUST BE SORTED for binary search. @@ -183,10 +183,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( std::u16string_view rServiceName nArrayCount = nSize / sizeof( ScUnoAddInHelpId ); } -OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const +OUString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const { if( !pCurrHelpIds || !nArrayCount ) - return OString(); + return {}; const ScUnoAddInHelpId* pFirst = pCurrHelpIds; const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1; @@ -203,7 +203,7 @@ OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const pFirst = pMiddle + 1; } - return OString(); + return {}; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 03abe07d6575..685b9e91ea4f 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -534,7 +534,7 @@ class MessageWithCheck : public weld::MessageDialogController private: std::unique_ptr<weld::CheckButton> m_xWarningOnBox; public: - MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OString& rDialogId) + MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OUString& rDialogId) : MessageDialogController(pParent, rUIFile, rDialogId, "ask") , m_xWarningOnBox(m_xBuilder->weld_check_button("ask")) { diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index 4345b816bb96..f58b61570342 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -43,7 +43,7 @@ ScMatrixComparisonGenerator::ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, weld::Window* pParent, ScViewData& rViewData, const OUString& rUiXmlDescription, - const OString& rID) + const OUString& rID) : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, rViewData, rUiXmlDescription, rID) {} diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index 7447ebf9a35a..15521dd1e1ef 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -48,7 +48,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OString& rID) + weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OUString& rID) : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent, rUIXMLDescription, rID) , mxInputRangeLabel(m_xBuilder->weld_label("input-range-label")) , mxInputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("input-range-edit"))) diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 3c0f7ce98b56..8c45f4b2df24 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -20,7 +20,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OString& rID) + weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OUString& rID) : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent, rUIXMLDescription, rID) , mxVariable1RangeLabel(m_xBuilder->weld_label("variable1-range-label")) , mxVariable1RangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("variable1-range-edit"))) diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index f01c2e987b63..c8bb9fc0b727 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1804,7 +1804,7 @@ void ScInputHandler::LOKSendFormulabarUpdate(EditView* pActiveView, (*pData)["selection"] = aSelection; sal_uInt64 nCurrentShellId = reinterpret_cast<sal_uInt64>(pActiveViewSh); - std::string sWindowId = std::to_string(nCurrentShellId) + "formulabar"; + OUString sWindowId = OUString::number(nCurrentShellId) + "formulabar"; jsdialog::SendAction(sWindowId, "sc_input_window", std::move(pData)); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index c5cc7a334262..a85baa1ccca4 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1000,7 +1000,7 @@ void ScInputBarGroup::DecrementVerticalSize() } } -void ScInputWindow::MenuHdl(std::string_view command) +void ScInputWindow::MenuHdl(std::u16string_view command) { if (command.empty()) return; @@ -1008,47 +1008,47 @@ void ScInputWindow::MenuHdl(std::string_view command) bool bSubTotal = false; bool bRangeFinder = false; OpCode eCode = ocSum; - if ( command == "sum" ) + if ( command == u"sum" ) { eCode = ocSum; } - else if ( command == "average" ) + else if ( command == u"average" ) { eCode = ocAverage; } - else if ( command == "max" ) + else if ( command == u"max" ) { eCode = ocMax; } - else if ( command == "min" ) + else if ( command == u"min" ) { eCode = ocMin; } - else if ( command == "count" ) + else if ( command == u"count" ) { eCode = ocCount; } - else if ( command == "counta" ) + else if ( command == u"counta" ) { eCode = ocCount2; } - else if ( command == "product" ) + else if ( command == u"product" ) { eCode = ocProduct; } - else if (command == "stdev") + else if (command == u"stdev") { eCode = ocStDev; } - else if (command == "stdevp") + else if (command == u"stdevp") { eCode = ocStDevP; } - else if (command == "var") + else if (command == u"var") { eCode = ocVar; } - else if (command == "varp") + else if (command == u"varp") { eCode = ocVarP; } diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 4e13eae6dea4..ad0a82542c3e 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -69,7 +69,7 @@ ScAttrDlg::~ScAttrDlg() { } -void ScAttrDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage) +void ScAttrDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index d0db6f84505a..26db05f15bf2 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -154,7 +154,7 @@ BitmapEx AbstractScDataFormDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScDataFormDlg_Impl::GetScreenshotId() const +OUString AbstractScDataFormDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -220,7 +220,7 @@ BitmapEx AbstractScMoveTableDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScMoveTableDlg_Impl::GetScreenshotId() const +OUString AbstractScMoveTableDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -345,7 +345,7 @@ BitmapEx AbstractScImportAsciiDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScImportAsciiDlg_Impl::GetScreenshotId() const +OUString AbstractScImportAsciiDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -376,7 +376,7 @@ BitmapEx AbstractScColRowLabelDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScColRowLabelDlg_Impl::GetScreenshotId() const +OUString AbstractScColRowLabelDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -392,7 +392,7 @@ BitmapEx AbstractScDataPilotDatabaseDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScDataPilotDatabaseDlg_Impl::GetScreenshotId() const +OUString AbstractScDataPilotDatabaseDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -428,7 +428,7 @@ BitmapEx AbstractScDataPilotSourceTypeDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScDataPilotSourceTypeDlg_Impl::GetScreenshotId() const +OUString AbstractScDataPilotSourceTypeDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -469,7 +469,7 @@ BitmapEx AbstractScDeleteCellDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScDeleteCellDlg_Impl::GetScreenshotId() const +OUString AbstractScDeleteCellDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -490,7 +490,7 @@ BitmapEx AbstractScDeleteContentsDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScDeleteContentsDlg_Impl::GetScreenshotId() const +OUString AbstractScDeleteContentsDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -606,7 +606,7 @@ BitmapEx AbstractScInsertContentsDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScInsertContentsDlg_Impl::GetScreenshotId() const +OUString AbstractScInsertContentsDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -652,7 +652,7 @@ BitmapEx AbstractScInsertTableDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScInsertTableDlg_Impl::GetScreenshotId() const +OUString AbstractScInsertTableDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -765,7 +765,7 @@ BitmapEx AbstractScNameCreateDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScNameCreateDlg_Impl::GetScreenshotId() const +OUString AbstractScNameCreateDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -849,7 +849,7 @@ void AbstractScShowTabDlg_Impl::Insert( const OUString& rString, bool bSelected void AbstractScShowTabDlg_Impl::SetDescription( const OUString& rTitle, const OUString& rFixedText, - const OString& sDlgHelpId, const OString& sLbHelpId ) + const OUString& sDlgHelpId, const OUString& sLbHelpId ) { m_xDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } @@ -871,7 +871,7 @@ void AbstractScGoToTabDlg_Impl::Insert( const OUString& rString, bool bSelected void AbstractScGoToTabDlg_Impl::SetDescription( const OUString& rTitle, const OUString& rEntryLabel, const OUString& rListLabel, - const OString& rDlgHelpId, const OString& rEnHelpId, const OString& rLbHelpId ) + const OUString& rDlgHelpId, const OUString& rEnHelpId, const OUString& rLbHelpId ) { m_xDlg->SetDescription( rTitle, rEntryLabel, rListLabel, rDlgHelpId, rEnHelpId, rLbHelpId ); } @@ -897,7 +897,7 @@ BitmapEx AbstractScStringInputDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScStringInputDlg_Impl::GetScreenshotId() const +OUString AbstractScStringInputDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -913,7 +913,7 @@ BitmapEx AbstractScTabBgColorDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScTabBgColorDlg_Impl::GetScreenshotId() const +OUString AbstractScTabBgColorDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -949,7 +949,7 @@ BitmapEx AbstractScTextImportOptionsDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractScTextImportOptionsDlg_Impl::GetScreenshotId() const +OUString AbstractScTextImportOptionsDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -964,7 +964,7 @@ bool ScAbstractTabController_Impl::StartExecuteAsync(AsyncContext &rCtx) return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn); } -void ScAbstractTabController_Impl::SetCurPageId( const OString &rName ) +void ScAbstractTabController_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -990,12 +990,12 @@ void ScAbstractTabController_Impl::SetText( const OUString& rStr ) m_xDlg->set_title(rStr); } -std::vector<OString> ScAbstractTabController_Impl::getAllPageUIXMLDescriptions() const +std::vector<OUString> ScAbstractTabController_Impl::getAllPageUIXMLDescriptions() const { return m_xDlg->getAllPageUIXMLDescriptions(); } -bool ScAbstractTabController_Impl::selectPageByUIXMLDescription(const OString& rUIXMLDescription) +bool ScAbstractTabController_Impl::selectPageByUIXMLDescription(const OUString& rUIXMLDescription) { return m_xDlg->selectPageByUIXMLDescription(rUIXMLDescription); } @@ -1005,7 +1005,7 @@ BitmapEx ScAbstractTabController_Impl::createScreenshot() const return m_xDlg->createScreenshot(); } -OString ScAbstractTabController_Impl::GetScreenshotId() const +OUString ScAbstractTabController_Impl::GetScreenshotId() const { return m_xDlg->GetScreenshotId(); } @@ -1015,7 +1015,7 @@ bool ScAsyncTabController_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContex return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn); } -void ScAsyncTabController_Impl::SetCurPageId( const OString &rName ) +void ScAsyncTabController_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -1146,7 +1146,7 @@ VclPtr<AbstractScLinkedAreaDlg> ScAbstractDialogFactory_Impl::CreateScLinkedArea } VclPtr<AbstractScMetricInputDlg> ScAbstractDialogFactory_Impl::CreateScMetricInputDlg(weld::Window* pParent, - const OString& sDialogName, + const OUString& sDialogName, tools::Long nCurrent, tools::Long nDefault, FieldUnit eFUnit, @@ -1231,8 +1231,8 @@ VclPtr<AbstractScGoToTabDlg> ScAbstractDialogFactory_Impl::CreateScGoToTabDlg(we } VclPtr<AbstractScStringInputDlg> ScAbstractDialogFactory_Impl::CreateScStringInputDlg(weld::Window* pParent, - const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OString& rHelpId, - const OString& rEditHelpId) + const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OUString& rHelpId, + const OUString& rEditHelpId) { return VclPtr<AbstractScStringInputDlg_Impl>::Create(std::make_unique<ScStringInputDlg>(pParent, rTitle, rEditTitle, rDefault, rHelpId, rEditHelpId)); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 855abeecf1c8..434b84df3d7c 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -68,7 +68,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg @@ -98,7 +98,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDlg @@ -131,7 +131,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg @@ -152,7 +152,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg @@ -186,7 +186,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; //for dataform @@ -202,7 +202,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg @@ -219,7 +219,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg @@ -289,7 +289,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg @@ -311,7 +311,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg @@ -378,7 +378,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg @@ -394,7 +394,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg @@ -516,7 +516,7 @@ public: virtual short Execute() override; virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override; virtual void Insert( const OUString& rString, bool bSelected ) override; - virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId) override; + virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OUString& sDlgHelpId, const OUString& sLbHelpId) override; virtual OUString GetEntry(sal_Int32 nPos) const override; virtual std::vector<sal_Int32> GetSelectedRows() const override; }; @@ -533,7 +533,7 @@ public: virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override; virtual void Insert( const OUString& rString, bool bSelected ) override; virtual void SetDescription(const OUString& rTitle, const OUString& rEntryLabel, const OUString& rListLabel, - const OString& rDlgHelpId, const OString& rEnHelpId, const OString& rLbHelpId) override; + const OUString& rDlgHelpId, const OUString& rEnHelpId, const OUString& rLbHelpId) override; virtual OUString GetSelectedEntry() const override; }; @@ -561,7 +561,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg @@ -577,7 +577,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg @@ -608,7 +608,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class ScAbstractTabController_Impl : public SfxAbstractTabDialog @@ -621,17 +621,17 @@ public: } virtual short Execute() override; virtual bool StartExecuteAsync(AsyncContext &rCtx) override; - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; virtual void SetText( const OUString& rStr ) override; // screenshotting - virtual std::vector<OString> getAllPageUIXMLDescriptions() const override; - virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override; + virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override; + virtual bool selectPageByUIXMLDescription(const OUString& rUIXMLDescription) override; virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class ScAsyncTabController_Impl : public ScAsyncTabController @@ -644,7 +644,7 @@ public: } virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override; virtual const SfxItemSet* GetOutputItemSet() const override; - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; }; //AbstractDialogFactory_Impl implementations @@ -714,7 +714,7 @@ public: virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Widget* pParent) override; virtual VclPtr<AbstractScMetricInputDlg> CreateScMetricInputDlg(weld::Window* pParent, - const OString& sDialogName, + const OUString& sDialogName, tools::Long nCurrent, tools::Long nDefault, FieldUnit eFUnit, @@ -765,8 +765,8 @@ public: const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, - const OString& rHelpId, - const OString& rEditHelpId) override; + const OUString& rHelpId, + const OUString& rEditHelpId) override; virtual VclPtr<AbstractScTabBgColorDlg> CreateScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle, //Dialog Title diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 7506f7e56231..a89d852e6de0 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -663,7 +663,7 @@ IMPL_LINK(ScCheckListMenuControl, CommandHdl, const CommandEvent&, rCEvt, bool) mxContextMenu->set_sensitive("less", mnCheckListVisibleRows > 4); mxContextMenu->set_sensitive("more", mnCheckListVisibleRows < 42); - OString sCommand = mxContextMenu->popup_at_rect(mpChecks, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sCommand = mxContextMenu->popup_at_rect(mpChecks, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (sCommand.isEmpty()) return true; diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 149a20e48a79..ade0cede7cef 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -82,7 +82,7 @@ void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) mxFtCondNr->set_label(sLabel); // tdf#124412: uitest - mxFtCondition->set_buildable_name(sLabel.toUtf8()); + mxFtCondition->set_buildable_name(sLabel); } void ScCondFrmtEntry::Select() diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index d4a2980a6dfa..31e16ab8c08c 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -102,7 +102,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog"); if (aDlgOpt.Exists()) - m_xDialog->set_window_state(aDlgOpt.GetWindowState().toUtf8()); + m_xDialog->set_window_state(aDlgOpt.GetWindowState()); UpdateButtonSensitivity(); } @@ -111,9 +111,7 @@ ScCondFormatManagerDlg::~ScCondFormatManagerDlg() { // tdf#101285 - Remember position of dialog SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog"); - OString sWindowState - = m_xDialog->get_window_state(vcl::WindowDataMask::Pos); - aDlgOpt.SetWindowState(OUString::fromUtf8(sWindowState)); + aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::Pos)); } std::unique_ptr<ScConditionalFormatList> ScCondFormatManagerDlg::GetConditionalFormatList() diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 16b7ca61e35f..f81e510fdae7 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -626,7 +626,7 @@ void ScCsvGrid::ScrollVertRel( ScMoveMode eDir ) void ScCsvGrid::ExecutePopup( const Point& rPos ) { - OString sItemId = mxPopup->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1, 1))); + OUString sItemId = mxPopup->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1, 1))); if (!sItemId.isEmpty()) // empty = cancelled Execute(CSVCMD_SETCOLUMNTYPE, sItemId.toInt32()); } diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 7e8397415018..0e9f05870a16 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -71,7 +71,7 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) if ( m_aSortKeyItems.size() > 0 ) { pSortKeyItem->m_xLbSort->set_buildable_name( - pSortKeyItem->m_xLbSort->get_buildable_name() + OString::number(m_aSortKeyItems.size() + 1)); + pSortKeyItem->m_xLbSort->get_buildable_name() + OUString::number(m_aSortKeyItems.size() + 1)); } } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 01431c8156c6..b7e5b9bc4a3f 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -64,8 +64,8 @@ ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage, weld::DialogControl Init(); // UI tests - mxLbGroup->set_buildable_name(mxLbGroup->get_buildable_name() + OString::number(rTabNumber)); - mxLbColumns->set_buildable_name(mxLbColumns->get_buildable_name() + OString::number(rTabNumber)); + mxLbGroup->set_buildable_name(mxLbGroup->get_buildable_name() + OUString::number(rTabNumber)); + mxLbColumns->set_buildable_name(mxLbColumns->get_buildable_name() + OUString::number(rTabNumber)); } ScTpSubTotalGroup::~ScTpSubTotalGroup() diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index b817d2db4308..f5d10cfe67ab 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -437,7 +437,7 @@ class MessageWithCheck : public weld::MessageDialogController private: std::unique_ptr<weld::CheckButton> m_xWarningOnBox; public: - MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OString& rDialogId) + MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OUString& rDialogId) : MessageDialogController(pParent, rUIFile, rDialogId, "ask") , m_xWarningOnBox(m_xBuilder->weld_check_button("ask")) { diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 49e248672ab2..66ab24b9e76f 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -260,7 +260,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg( - pFact->CreateInsertObjectDialog( rViewShell.GetFrameWeld(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommandString(), + pFact->CreateInsertObjectDialog( rViewShell.GetFrameWeld(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommand(), xStorage, &aServerLst )); if ( pDlg ) { diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index 058b9611a758..ab1e51d7a9b4 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -21,7 +21,7 @@ public: ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, weld::Window* pParent, ScViewData& rViewData, - const OUString& rUiXmlDescription, const OString& rID); + const OUString& rUiXmlDescription, const OUString& rID); virtual ~ScMatrixComparisonGenerator() override; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 2de05951b3ab..e831772c8451 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -26,7 +26,7 @@ public: SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, - const OString& rID); + const OUString& rID); virtual ~ScStatisticsInputOutputDialog() override; diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 3b1d5e46781f..150a57420913 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -25,7 +25,7 @@ public: ScStatisticsTwoVariableDialog( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, ScViewData& rViewData, - const OUString& rUIXMLDescription, const OString& rID); + const OUString& rUIXMLDescription, const OUString& rID); virtual ~ScStatisticsTwoVariableDialog() override; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 9109974a8295..ad3feac803a6 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -141,13 +141,13 @@ struct ScRefHdlrControllerImpl : public TBase, public ScRefHandler { enum { UNKNOWN_SLOTID = 0U, SLOTID = UNKNOWN_SLOTID }; - ScRefHdlrControllerImpl(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet* pArg, SfxBindings *pB) + ScRefHdlrControllerImpl(weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet* pArg, SfxBindings *pB) : TBase(pParent, rUIXMLDescription, rID, pArg) , ScRefHandler(*static_cast<TBase*>(this), pB, bBindRef) { } - ScRefHdlrControllerImpl(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) + ScRefHdlrControllerImpl(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID) : TBase(pB, pCW, pParent, rUIXMLDescription, rID) , ScRefHandler(*static_cast<TBase*>(this), pB, bBindRef) { @@ -156,7 +156,7 @@ struct ScRefHdlrControllerImpl : public TBase, public ScRefHandler struct ScAnyRefDlgController : ScRefHdlrControllerImpl<SfxModelessDialogController> { - ScAnyRefDlgController(SfxBindings* rt1, SfxChildWindow* rt2, weld::Window* rt3, const OUString& rt4, const OString& rt5) + ScAnyRefDlgController(SfxBindings* rt1, SfxChildWindow* rt2, weld::Window* rt3, const OUString& rt4, const OUString& rt5) : ScRefHdlrControllerImpl<SfxModelessDialogController>(rt1, rt2, rt3, rt4, rt5) { } diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 67b9aa25a68b..1f4268481f35 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -34,7 +34,7 @@ public: virtual ~ScAttrDlg() override; protected: - virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/gototabdlg.hxx b/sc/source/ui/inc/gototabdlg.hxx index 827f56b17760..1bbd5ed9761e 100644 --- a/sc/source/ui/inc/gototabdlg.hxx +++ b/sc/source/ui/inc/gototabdlg.hxx @@ -31,8 +31,8 @@ public: /** Sets dialog title, label texts and help IDs. */ void SetDescription(const OUString& rTitle, const OUString& rEntryLabel, - const OUString& rListLabel, const OString& rDlgHelpId, - const OString& rEnHelpId, const OString& rLbHelpId); + const OUString& rListLabel, const OUString& rDlgHelpId, + const OUString& rEnHelpId, const OUString& rLbHelpId); /** Inserts a string into the weld::TreeView. */ void Insert(const OUString& rString, bool bSelected); diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 61d02f9c6f5c..6bec2d995858 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -32,9 +32,9 @@ class ScHFEditDlg : public SfxTabDialogController protected: ScHFEditDlg(weld::Window* pParent, const SfxItemSet& rCoreSet, std::u16string_view rPageStyle, - const OUString& rUIXMLDescription, const OString& rID); + const OUString& rUIXMLDescription, const OUString& rID); public: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; }; class ScHFEditHeaderDlg : public ScHFEditDlg diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index f0f69e948843..500ab23eb790 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -336,7 +336,7 @@ public: void NotifyLOKClient(); - void MenuHdl(std::string_view command); + void MenuHdl(std::u16string_view command); DECL_LINK( DropdownClickHdl, ToolBox*, void ); void AutoSum( bool& bRangeFinder, bool& bSubTotal, OpCode eCode ); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index fc4163a55e1d..1b3edfca9382 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -25,7 +25,7 @@ class ScMetricInputDlg : public weld::GenericDialogController { public: ScMetricInputDlg( weld::Window* pParent, - const OString& sDialogName, + const OUString& sDialogName, tools::Long nCurrent, tools::Long nDefault, FieldUnit eFUnit, diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 95de25f267da..5a1ae392e403 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -129,9 +129,9 @@ private: DECL_LINK(DocumentSelectHdl, weld::ComboBox&, void); DECL_LINK(ExecuteRowHdl, weld::Entry&, bool); DECL_LINK(ExecuteColHdl, weld::Entry&, bool); - DECL_LINK(ToolBoxSelectHdl, const OString&, void); - DECL_LINK(ToolBoxDropdownClickHdl, const OString&, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(ToolBoxSelectHdl, const OUString&, void); + DECL_LINK(ToolBoxDropdownClickHdl, const OUString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); DECL_LINK(FormatRowOutputHdl, weld::SpinButton&, void); DECL_LINK(ParseRowInputHdl, int*, bool); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 79e1077d425f..18c4f97f8caa 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -110,7 +110,7 @@ private: DECL_LINK( ListHdl_Impl, weld::ComboBox&, void); DECL_LINK( ListToggleHdl_Impl, weld::ComboBox&, void); DECL_LINK( ClickHdl, weld::Button&, void ); - DECL_LINK( MenuHdl, const OString&, void ); + DECL_LINK( MenuHdl, const OUString&, void ); }; class ScFirstHeaderEditPage : public ScHFEditPage diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 9a1bb23edb05..448a938ba724 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -35,7 +35,7 @@ public: /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription(const OUString& rTitle, const OUString& rFixedText, - const OString& nDlgHelpId, const OString& nLbHelpId); + const OUString& nDlgHelpId, const OUString& nLbHelpId); /** Inserts a string into the weld::TreeView. */ void Insert(const OUString& rString, bool bSelected); diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 6b1490349b47..6602a5563dd6 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -32,7 +32,7 @@ public: const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, - const OString& sHelpId, const OString& sEditHelpId); + const OUString& sHelpId, const OUString& sEditHelpId); OUString GetInputString() const { diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 736849ef963d..2fe13111c61b 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -32,7 +32,7 @@ public: bool bPage); protected: - virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override; virtual void RefreshInputSet() override; private: @@ -47,7 +47,7 @@ public: SdrView* pView); protected: - virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override; virtual void RefreshInputSet() override; private: diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index e87b6355198c..a670c4429d53 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -360,7 +360,7 @@ public: static void UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage); + void ExecuteCellFormatDlg( SfxRequest& rReq, const OUString &rTabPage); bool GetFunction( OUString& rFuncStr, FormulaError nErrCode ); diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 0bffe3a242c3..61cdfdb170ff 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -28,7 +28,7 @@ class ScCharDlg : public SfxTabDialogController private: const SfxObjectShell& rDocShell; - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell, @@ -38,7 +38,7 @@ public: class ScParagraphDlg : public SfxTabDialogController { private: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr); diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 618cfb23f1c0..c8ed4447c400 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -150,7 +150,7 @@ class ScValidationDlg typedef ScRefHdlrControllerImpl<SfxTabDialogController, false> ScValidationDlgBase; ScTabViewShell * m_pTabVwSh; - OString m_sValuePageId; + OUString m_sValuePageId; bool m_bOwnRefHdlr:1; bool m_bRefInputting:1; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 3ff295276ab3..957661186906 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1600,7 +1600,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const CommandEvent&, rCEvt, bool) int nSortedCol = rTreeView.get_sort_column(); for (sal_Int32 i = 0; i < 5; ++i) - m_xSortMenu->set_active("calcsort" + OString::number(i), i == nSortedCol); + m_xSortMenu->set_active("calcsort" + OUString::number(i), i == nSortedCol); m_xPopup->set_sensitive("calcedit", false); @@ -1615,7 +1615,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const CommandEvent&, rCEvt, bool) } } - OString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) { diff --git a/sc/source/ui/miscdlgs/gototabdlg.cxx b/sc/source/ui/miscdlgs/gototabdlg.cxx index e38e671009ee..c817e506d6a6 100644 --- a/sc/source/ui/miscdlgs/gototabdlg.cxx +++ b/sc/source/ui/miscdlgs/gototabdlg.cxx @@ -28,8 +28,8 @@ ScGoToTabDlg::ScGoToTabDlg(weld::Window* pParent) ScGoToTabDlg::~ScGoToTabDlg() {} void ScGoToTabDlg::SetDescription(const OUString& rTitle, const OUString& rEntryLabel, - const OUString& rListLabel, const OString& rDlgHelpId, - const OString& rEnHelpId, const OString& rLbHelpId) + const OUString& rListLabel, const OUString& rDlgHelpId, + const OUString& rEnHelpId, const OUString& rLbHelpId) { m_xDialog->set_title(rTitle); m_xFrameMask->set_label(rEntryLabel); diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 839cc4f74a16..f200dbccba2c 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -28,8 +28,8 @@ ScGroupDlg::ScGroupDlg(weld::Window* pParent, bool bUngroup, bool bRows) OUString("modules/scalc/ui/groupdialog.ui") , bUngroup ? - OString("UngroupDialog") : - OString("GroupDialog")) + OUString("UngroupDialog") : + OUString("GroupDialog")) , m_xBtnRows(m_xBuilder->weld_radio_button("rows")) , m_xBtnCols(m_xBuilder->weld_radio_button("cols")) { diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 7f234131fb33..a203a3710d09 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -22,7 +22,7 @@ #include <mtrindlg.hxx> ScMetricInputDlg::ScMetricInputDlg( weld::Window* pParent, - const OString& sDialogName, + const OUString& sDialogName, tools::Long nCurrent, tools::Long nDefault, FieldUnit eFUnit, @@ -30,8 +30,7 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window* pParent, tools::Long nMaximum, tools::Long nMinimum) - : GenericDialogController(pParent, "modules/scalc/ui/" + OStringToOUString( - sDialogName.toAsciiLowerCase(), RTL_TEXTENCODING_UTF8) + ".ui", sDialogName) + : GenericDialogController(pParent, "modules/scalc/ui/" + sDialogName.toAsciiLowerCase() + ".ui", sDialogName) , m_xEdValue(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM)) , m_xBtnDefVal(m_xBuilder->weld_check_button("default")) { diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index cf0c10918890..23dc981e6a08 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -34,7 +34,7 @@ ScShowTabDlg::ScShowTabDlg(weld::Window* pParent) ScShowTabDlg::~ScShowTabDlg() {} void ScShowTabDlg::SetDescription(const OUString& rTitle, const OUString& rFixedText, - const OString& rDlgHelpId, const OString& sLbHelpId) + const OUString& rDlgHelpId, const OUString& sLbHelpId) { m_xDialog->set_title(rTitle); m_xFrame->set_label(rFixedText); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index 61ba77534401..18112a69347e 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -25,7 +25,7 @@ ScStringInputDlg::ScStringInputDlg(weld::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, - const OString& rHelpId, const OString& rEditHelpId) + const OUString& rHelpId, const OUString& rEditHelpId) : GenericDialogController(pParent, "modules/scalc/ui/inputstringdialog.ui", "InputStringDialog") , m_xLabel(m_xBuilder->weld_label("description_label")) diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 40a84a626a4f..04c4db957db8 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -44,7 +44,7 @@ ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxOb RemoveTabPage("background"); } -void ScCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "font") @@ -79,7 +79,7 @@ ScParagraphDlg::ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } -void ScParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void ScParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "labelTP_TABULATOR") { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 35ae45751c81..3b405d9449f6 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -596,9 +596,9 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) if (bHiddenDoc) sActive = sId; } - xDocMenu->set_active(sActive.toUtf8(), true); + xDocMenu->set_active(sActive, true); - OString sIdent = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))); + OUString sIdent = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))); if (sIdent == "hyperlink") pParentWindow->SetDropMode(0); else if (sIdent == "link") diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index a5816dc7c045..92a6c5f6c94a 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -188,7 +188,7 @@ IMPL_LINK(ScNavigatorDlg, DocumentSelectHdl, weld::ComboBox&, rListBox, void) m_xLbEntries->SelectDoc(aDocName); } -IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OString&, rSelId, void) +IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OUString&, rSelId, void) { // Switch the mode? if (rSelId == "contents" || rSelId == "scenarios") @@ -231,7 +231,7 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OString&, rSelId, void) } } -IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OString&, rCommand, void) +IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OUString&, rCommand, void) { if (!m_xTbxCmd2->get_menu_item_active(rCommand)) return; @@ -255,13 +255,13 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OString&, rCommand, voi } } -IMPL_LINK(ScNavigatorDlg, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(ScNavigatorDlg, MenuSelectHdl, const OUString&, rIdent, void) { - if (rIdent == "hyperlink") + if (rIdent == u"hyperlink") SetDropMode(0); - else if (rIdent == "link") + else if (rIdent == u"link") SetDropMode(1); - else if (rIdent == "copy") + else if (rIdent == u"copy") SetDropMode(2); } diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 3bbc6309ccd5..5ca601d2e64c 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -127,7 +127,7 @@ IMPL_LINK(ScScenarioWindow, ContextMenuHdl, const CommandEvent&, rCEvt, bool) { std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xLbScenario.get(), "modules/scalc/ui/scenariomenu.ui")); std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu")); - OString sIdent(xPopup->popup_at_rect(m_xLbScenario.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); + OUString sIdent(xPopup->popup_at_rect(m_xLbScenario.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); if (sIdent == "delete") DeleteScenario(); else if (sIdent == "edit") diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index b4e111b9c3c3..6b873e8f5760 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -33,7 +33,7 @@ ScHFEditDlg::ScHFEditDlg(weld::Window* pParent, const SfxItemSet& rCoreSet, std::u16string_view rPageStyle, const OUString& rUIXMLDescription, - const OString& rID) + const OUString& rID) : SfxTabDialogController(pParent, rUIXMLDescription, rID, &rCoreSet) { eNumType = rCoreSet.Get(ATTR_PAGE).GetNumType(); @@ -253,7 +253,7 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( } } -void ScHFEditDlg::PageCreated(const OString& /* rId */, SfxTabPage& rPage) +void ScHFEditDlg::PageCreated(const OUString& /* rId */, SfxTabPage& rPage) { // Can only be a ScHFEditPage... diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index a4c7a1387868..46687884e376 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -753,7 +753,7 @@ IMPL_LINK( ScHFEditPage, ClickHdl, weld::Button&, rBtn, void ) m_pEditFocus->GrabFocus(); } -IMPL_LINK(ScHFEditPage, MenuHdl, const OString&, rSelectedId, void) +IMPL_LINK(ScHFEditPage, MenuHdl, const OUString&, rSelectedId, void) { if (!m_pEditFocus) return; diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index d09b8a5ca7be..a8f9dc148f28 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -36,8 +36,8 @@ using namespace css; using namespace css::uno; -constexpr OStringLiteral SETBORDERSTYLE = "SetBorderStyle"; -constexpr OStringLiteral LINESTYLE = "LineStyle"; +constexpr OUStringLiteral SETBORDERSTYLE = u"SetBorderStyle"; +constexpr OUStringLiteral LINESTYLE = u"LineStyle"; // namespace open @@ -140,12 +140,12 @@ void CellAppearancePropertyPanel::Initialize() mxTBLineColor->set_sensitive(false); } -IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, const OString&, void) +IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, const OUString&, void) { mxTBCellBorder->set_menu_item_active(SETBORDERSTYLE, !mxTBCellBorder->get_menu_item_active(SETBORDERSTYLE)); } -IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderMenuHdl, const OString&, void) +IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderMenuHdl, const OUString&, void) { if (!mxTBCellBorder->get_menu_item_active(SETBORDERSTYLE)) return; @@ -157,12 +157,12 @@ IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderMenuHdl, const OString mxCellBorderPopoverContainer->getPopover()->GrabFocus(); } -IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, const OString&, void) +IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, const OUString&, void) { mxTBLineStyle->set_menu_item_active(LINESTYLE, !mxTBLineStyle->get_menu_item_active(LINESTYLE)); } -IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleMenuHdl, const OString&, void) +IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleMenuHdl, const OUString&, void) { if (!mxTBLineStyle->get_menu_item_active(LINESTYLE)) return; diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 412cd37e107a..8ee0212399e8 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -131,10 +131,10 @@ private: vcl::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK(TbxCellBorderSelectHdl, const OString&, void); - DECL_LINK(TbxCellBorderMenuHdl, const OString&, void); - DECL_LINK(TbxLineStyleSelectHdl, const OString&, void); - DECL_LINK(TbxLineStyleMenuHdl, const OString&, void); + DECL_LINK(TbxCellBorderSelectHdl, const OUString&, void); + DECL_LINK(TbxCellBorderMenuHdl, const OUString&, void); + DECL_LINK(TbxLineStyleSelectHdl, const OUString&, void); + DECL_LINK(TbxLineStyleMenuHdl, const OUString&, void); void Initialize(); void SetStyleIcon(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 6749588b9166..1c75a4a9ae34 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -38,7 +38,7 @@ namespace sc::sidebar { #define FRM_VALID_OUTER 0x0f #define FRM_VALID_ALL 0xff -CellBorderStylePopup::CellBorderStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher) +CellBorderStylePopup::CellBorderStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher) : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatingborderstyle.ui", "FloatingBorderStyle") , maToolButton(pParent, rId) , mpDispatcher(pDispatcher) @@ -69,7 +69,7 @@ void CellBorderStylePopup::Initialize() mxTBBorder4->connect_clicked ( LINK(this, CellBorderStylePopup, TB4SelectHdl) ); } -IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OString&, rId, void) +IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OUString&, rId, void) { SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER ); @@ -128,7 +128,7 @@ IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OString&, rId, void) maToolButton.set_inactive(); } -IMPL_LINK(CellBorderStylePopup, TB2and3SelectHdl, const OString&, rId, void) +IMPL_LINK(CellBorderStylePopup, TB2and3SelectHdl, const OUString&, rId, void) { if (rId == "diagup") { @@ -215,7 +215,7 @@ IMPL_LINK(CellBorderStylePopup, TB2and3SelectHdl, const OString&, rId, void) maToolButton.set_inactive(); } -IMPL_LINK(CellBorderStylePopup, TB4SelectHdl, const OString&, rId, void) +IMPL_LINK(CellBorderStylePopup, TB4SelectHdl, const OUString&, rId, void) { SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER ); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index f6ae6891b868..95b6cb9b442d 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -37,12 +37,12 @@ private: void Initialize(); - DECL_LINK(TB1SelectHdl, const OString&, void); - DECL_LINK(TB2and3SelectHdl, const OString&, void); - DECL_LINK(TB4SelectHdl, const OString&, void); + DECL_LINK(TB1SelectHdl, const OUString&, void); + DECL_LINK(TB2and3SelectHdl, const OUString&, void); + DECL_LINK(TB4SelectHdl, const OUString&, void); public: - CellBorderStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher); + CellBorderStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher); virtual void GrabFocus() override; virtual ~CellBorderStylePopup() override; }; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 5c27ee5a51b1..b6510ffa393d 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -32,7 +32,7 @@ namespace sc::sidebar { -CellLineStylePopup::CellLineStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher) +CellLineStylePopup::CellLineStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher) : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatinglinestyle.ui", "FloatingLineStyle") , maToolButton(pParent, rId) , mpDispatcher(pDispatcher) diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 8bb9ba89c8ce..0955592e4998 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -43,7 +43,7 @@ private: DECL_LINK(PBClickHdl, weld::Button&, void); public: - CellLineStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher); + CellLineStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher); void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); virtual void GrabFocus() override; virtual ~CellLineStylePopup() override; diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 206d852cf46a..b86d61b9598c 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -47,8 +47,8 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent, OUString("modules/scalc/ui/pagetemplatedialog.ui") : OUString("modules/scalc/ui/paratemplatedialog.ui"), bPage ? - OString("PageTemplateDialog") : - OString("ParaTemplateDialog"), + OUString("PageTemplateDialog") : + OUString("ParaTemplateDialog"), rStyleBase ) , m_bPage(bPage) { @@ -80,7 +80,7 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent, } } -void ScStyleDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage) +void ScStyleDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) { if (m_bPage) { @@ -162,7 +162,7 @@ ScDrawStyleDlg::ScDrawStyleDlg(weld::Window* pParent, SfxStyleSheetBase& rStyleB RemoveTabPage("asiantypo"); } -void ScDrawStyleDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage) +void ScDrawStyleDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SdrModel& rModel = mpView->GetModel(); diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index efecef8cd22f..bbd5c26eff12 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -112,10 +112,10 @@ IMPL_LINK(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void) OUString sId = OUString::number(nId); xPopup->append_radio(sId, aString); if (nId == nCurPageId) - xPopup->set_active(sId.toUtf8(), true); + xPopup->set_active(sId, true); } - OString sIdent(xPopup->popup_at_rect(pPopupParent, aRect)); + OUString sIdent(xPopup->popup_at_rect(pPopupParent, aRect)); if (!sIdent.isEmpty()) SwitchToPageId(sIdent.toUInt32()); } diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 9bcf40828ba6..a3eb7bd5403d 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -525,7 +525,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) } // while ( nWitch ) } -void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName) +void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OUString &rName) { ScDocument& rDoc = GetViewData().GetDocument(); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index e3845529c569..4c4415fb1f4c 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -386,7 +386,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) OUString aErrMsg ( ScResId( STR_INVALIDTABNAME ) ); OUString aName; OUString aDlgTitle; - OString sHelpId; + OUString sHelpId; switch ( nSlot ) { diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 18e898ee7333..bb9233441553 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -19,44 +19,44 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_SDDRAWVIEWSHELL = "SD_HID_SDDRAWVIEWSHELL"; -inline constexpr OStringLiteral HID_SDGRAPHICVIEWSHELL = "SD_HID_SDGRAPHICVIEWSHELL"; -inline constexpr OStringLiteral HID_SDOUTLINEVIEWSHELL = "SD_HID_SDOUTLINEVIEWSHELL"; +inline constexpr OUStringLiteral HID_SDDRAWVIEWSHELL = u"SD_HID_SDDRAWVIEWSHELL"; +inline constexpr OUStringLiteral HID_SDGRAPHICVIEWSHELL = u"SD_HID_SDGRAPHICVIEWSHELL"; +inline constexpr OUStringLiteral HID_SDOUTLINEVIEWSHELL = u"SD_HID_SDOUTLINEVIEWSHELL"; -inline constexpr OStringLiteral HID_SD_WIN_PRESENTATION = "SD_HID_SD_WIN_PRESENTATION"; +inline constexpr OUStringLiteral HID_SD_WIN_PRESENTATION = u"SD_HID_SD_WIN_PRESENTATION"; -#define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1" -#define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2" -#define HID_SD_HTMLEXPORT_PAGE3 "SD_HID_SD_HTMLEXPORT_PAGE3" -#define HID_SD_HTMLEXPORT_PAGE4 "SD_HID_SD_HTMLEXPORT_PAGE4" -#define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5" -#define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6" +inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE1 = u"SD_HID_SD_HTMLEXPORT_PAGE1"; +inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE2 = u"SD_HID_SD_HTMLEXPORT_PAGE2"; +inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE3 = u"SD_HID_SD_HTMLEXPORT_PAGE3"; +inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE4 = u"SD_HID_SD_HTMLEXPORT_PAGE4"; +inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE5 = u"SD_HID_SD_HTMLEXPORT_PAGE5"; +inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE6 = u"SD_HID_SD_HTMLEXPORT_PAGE6"; -inline constexpr OStringLiteral HID_SD_TABBAR_PAGES = "SD_HID_SD_TABBAR_PAGES"; -inline constexpr OStringLiteral HID_SD_TABBAR_LAYERS = "SD_HID_SD_TABBAR_LAYERS"; +inline constexpr OUStringLiteral HID_SD_TABBAR_PAGES = u"SD_HID_SD_TABBAR_PAGES"; +inline constexpr OUStringLiteral HID_SD_TABBAR_LAYERS = u"SD_HID_SD_TABBAR_LAYERS"; -inline constexpr OStringLiteral HID_SD_NAMEDIALOG_OBJECT = "SD_HID_SD_NAMEDIALOG_OBJECT"; -inline constexpr OStringLiteral HID_SD_NAMEDIALOG_PAGE = "SD_HID_SD_NAMEDIALOG_PAGE"; -inline constexpr OStringLiteral HID_SD_NAMEDIALOG_LINEEND = "SD_HID_SD_NAMEDIALOG_LINEEND"; +inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_OBJECT = u"SD_HID_SD_NAMEDIALOG_OBJECT"; +inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_PAGE = u"SD_HID_SD_NAMEDIALOG_PAGE"; +inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_LINEEND = u"SD_HID_SD_NAMEDIALOG_LINEEND"; -inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_CURRENT = "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"; -inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_RECENT = "SD_HID_SD_TASK_PANE_PREVIEW_RECENT"; -inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_ALL = "SD_HID_SD_TASK_PANE_PREVIEW_ALL"; -inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_LAYOUTS = "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"; +inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_CURRENT = u"SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"; +inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_RECENT = u"SD_HID_SD_TASK_PANE_PREVIEW_RECENT"; +inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_ALL = u"SD_HID_SD_TASK_PANE_PREVIEW_ALL"; +inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_LAYOUTS = u"SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"; +inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"; -inline constexpr OStringLiteral HID_SD_RULER_HORIZONTAL = "SD_HID_SD_RULER_HORIZONTAL"; -inline constexpr OStringLiteral HID_SD_RULER_VERTICAL = "SD_HID_SD_RULER_VERTICAL"; +inline constexpr OUStringLiteral HID_SD_RULER_HORIZONTAL = u"SD_HID_SD_RULER_HORIZONTAL"; +inline constexpr OUStringLiteral HID_SD_RULER_VERTICAL = u"SD_HID_SD_RULER_VERTICAL"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 9428325cdca0..84c1a6ff8e2e 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -99,7 +99,7 @@ protected: virtual ~AbstractSdInsertLayerDlg() override = default; public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; - virtual void SetHelpId( const OString& rHelpId ) = 0; + virtual void SetHelpId( const OUString& rHelpId ) = 0; }; class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index 829e5d50a73c..6c79485bb31a 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -18,9 +18,9 @@ */ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral CMD_SID_HANDOUT_MASTER_MODE = ".uno:HandoutMode"; -inline constexpr OStringLiteral CMD_SID_NOTES_MODE = ".uno:NotesMode"; +inline constexpr OUStringLiteral CMD_SID_HANDOUT_MASTER_MODE = u".uno:HandoutMode"; +inline constexpr OUStringLiteral CMD_SID_NOTES_MODE = u".uno:NotesMode"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 257021d96dc9..9fbaec3840aa 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -58,7 +58,7 @@ const sal_uInt16 nMagic = sal_uInt16(0x1977); constexpr OUStringLiteral KEY_QUALITY = u"JPG-EXPORT-QUALITY"; // The Help-IDs of the pages -const char* const aPageHelpIds[NOOFPAGES] = +constexpr rtl::OUStringConstExpr aPageHelpIds[NOOFPAGES] = { HID_SD_HTMLEXPORT_PAGE1, HID_SD_HTMLEXPORT_PAGE2, diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 41d7685798d4..e12e6ea123e7 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -329,7 +329,7 @@ public: virtual Any getValue() override; virtual void setValue( const Any& rValue, const OUString& ) override; - DECL_LINK(implMenuSelectHdl, const OString& rIdent, void); + DECL_LINK(implMenuSelectHdl, const OUString& rIdent, void); private: Link<LinkParamNone*,void> maModifyHdl; @@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SdCharHeightPropertyBox, EditModifyHdl, weld::MetricSpinButton&, maModifyHdl.Call(nullptr); } -IMPL_LINK(SdCharHeightPropertyBox, implMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SdCharHeightPropertyBox, implMenuSelectHdl, const OUString&, rIdent, void) { sal_Int32 nValue = rIdent.toInt32(); mxMetric->set_value(nValue, FieldUnit::PERCENT); @@ -396,7 +396,7 @@ public: virtual Any getValue() override; virtual void setValue( const Any& rValue, const OUString& rPresetId ) override; - DECL_LINK(implMenuSelectHdl, const OString&, void); + DECL_LINK(implMenuSelectHdl, const OUString&, void); DECL_LINK(implModifyHdl, weld::MetricSpinButton&, void); void updateMenu(); @@ -439,7 +439,7 @@ void SdTransparencyPropertyBox::updateMenu() { sal_Int64 nValue = mxMetric->get_value(FieldUnit::PERCENT); for (sal_uInt16 i = 25; i < 101; i += 25) - mxControl->set_item_active(OString::number(i), nValue == i); + mxControl->set_item_active(OUString::number(i), nValue == i); } IMPL_LINK_NOARG(SdTransparencyPropertyBox, implModifyHdl, weld::MetricSpinButton&, void) @@ -448,7 +448,7 @@ IMPL_LINK_NOARG(SdTransparencyPropertyBox, implModifyHdl, weld::MetricSpinButton maModifyHdl.Call(nullptr); } -IMPL_LINK(SdTransparencyPropertyBox, implMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SdTransparencyPropertyBox, implMenuSelectHdl, const OUString&, rIdent, void) { auto nValue = rIdent.toInt32(); if (nValue != mxMetric->get_value(FieldUnit::PERCENT)) @@ -485,7 +485,7 @@ public: virtual Any getValue() override; virtual void setValue( const Any& rValue, const OUString& ) override; - DECL_LINK(implMenuSelectHdl, const OString&, void); + DECL_LINK(implMenuSelectHdl, const OUString&, void); DECL_LINK(implModifyHdl, weld::MetricSpinButton&, void); void updateMenu(); @@ -538,7 +538,7 @@ IMPL_LINK_NOARG(SdRotationPropertyBox, implModifyHdl, weld::MetricSpinButton&, v maModifyHdl.Call(nullptr); } -IMPL_LINK(SdRotationPropertyBox, implMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SdRotationPropertyBox, implMenuSelectHdl, const OUString&, rIdent, void) { auto nValue = mxMetric->get_value(FieldUnit::DEGREE); bool bDirection = nValue >= 0; @@ -588,7 +588,7 @@ public: virtual Any getValue() override; virtual void setValue( const Any& rValue, const OUString& ) override; - DECL_LINK(implMenuSelectHdl, const OString&, void); + DECL_LINK(implMenuSelectHdl, const OUString&, void); DECL_LINK(implModifyHdl, weld::MetricSpinButton&, void); void updateMenu(); @@ -641,7 +641,7 @@ IMPL_LINK_NOARG(SdScalePropertyBox, implModifyHdl, weld::MetricSpinButton&, void maModifyHdl.Call(nullptr); } -IMPL_LINK(SdScalePropertyBox, implMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SdScalePropertyBox, implMenuSelectHdl, const OUString&, rIdent, void) { auto nValue = mxMetric->get_value(FieldUnit::PERCENT); @@ -770,7 +770,7 @@ public: virtual Any getValue() override; virtual void setValue( const Any& rValue, const OUString& ) override; - DECL_LINK(implMenuSelectHdl, const OString&, void); + DECL_LINK(implMenuSelectHdl, const OUString&, void); void update(); @@ -819,7 +819,7 @@ void SdFontStylePropertyBox::update() mxEdit->set_font(aFont); } -IMPL_LINK(SdFontStylePropertyBox, implMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SdFontStylePropertyBox, implMenuSelectHdl, const OUString&, rIdent, void) { if (rIdent == "bold") { @@ -1942,7 +1942,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, weld::ComboBox&, updateControlStates(); } -CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OString& rPage) +CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OUString& rPage) : GenericDialogController(pParent, "modules/simpress/ui/customanimationproperties.ui", "CustomAnimationProperties") , mxSet(std::move(pSet)) , mxTabControl(m_xBuilder->weld_notebook("tabcontrol")) diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index b8a8abcff00a..34101fbc1f29 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -118,7 +118,7 @@ class STLPropertySet; class CustomAnimationDialog : public weld::GenericDialogController { public: - CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OString& Page); + CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OUString& Page); virtual ~CustomAnimationDialog() override; STLPropertySet* getResultSet(); diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 43d48f05aeb4..0128f210eb77 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -1209,14 +1209,14 @@ IMPL_LINK(CustomAnimationList, CommandHdl, const CommandEvent&, rCEvt, bool) xMenu->set_sensitive("options", nEntries == 1); xMenu->set_sensitive("timing", nEntries == 1); - OString sCommand = xMenu->popup_at_rect(mxTreeView.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sCommand = xMenu->popup_at_rect(mxTreeView.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) ExecuteContextMenuAction(sCommand); return true; } -void CustomAnimationList::ExecuteContextMenuAction(const OString& rIdent) +void CustomAnimationList::ExecuteContextMenuAction(const OUString& rIdent) { mpController->onContextMenu(rIdent); } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 6578f3eb3c27..2276fa91b3aa 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -851,7 +851,7 @@ void CustomAnimationPane::onDoubleClick() showOptions(); } -void CustomAnimationPane::onContextMenu(const OString &rIdent) +void CustomAnimationPane::onContextMenu(const OUString &rIdent) { if (rIdent == "onclick") onChangeStart( EffectNodeType::ON_CLICK ); @@ -1606,7 +1606,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST } } -void CustomAnimationPane::showOptions(const OString& rPage) +void CustomAnimationPane::showOptions(const OUString& rPage) { std::unique_ptr<STLPropertySet> xSet = createSelectionSet(); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 6c1210575915..dd6290206966 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -297,7 +297,7 @@ void AnnotationWindow::InitControls() mxTextControl->GrabFocus(); } -IMPL_LINK(AnnotationWindow, MenuItemSelectedHdl, const OString&, rIdent, void) +IMPL_LINK(AnnotationWindow, MenuItemSelectedHdl, const OUString&, rIdent, void) { SfxDispatcher* pDispatcher = mpDocShell->GetViewShell()->GetViewFrame()->GetDispatcher(); if (!pDispatcher) diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 558cc61651a6..a150ebf1c8cd 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -92,7 +92,7 @@ private: std::unique_ptr<weld::MenuButton> mxMenuButton; DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); - DECL_LINK(MenuItemSelectedHdl, const OString&, void); + DECL_LINK(MenuItemSelectedHdl, const OUString&, void); void FillMenuButton(); void InitControls(); diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx index 90ccbc78150e..84667f41cebb 100644 --- a/sd/source/ui/app/scalectrl.cxx +++ b/sd/source/ui/app/scalectrl.cxx @@ -87,7 +87,7 @@ void SdScaleControl::Command(const CommandEvent& rCEvt) ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1)); weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect); - OString sResult = xPopup->popup_at_rect(pParent, aRect); + OUString sResult = xPopup->popup_at_rect(pParent, aRect); if (sResult.isEmpty()) return; diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 4aafd2848a3a..a303817eeb18 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -84,7 +84,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) aDateField.SetFormat( SvxDateFormat::F ); // Dienstag, 13.Februar 1996 m_xPopup->append_radio(OUString::number(nID++), aDateField.GetFormatted(*pNumberFormatter, eLanguage)); - m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pDateField->GetFormat() ) + 1), true); // - 2 + 3 ! + m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pDateField->GetFormat() ) + 1), true); // - 2 + 3 ! } else if( auto pTimeField = dynamic_cast< const SvxExtTimeField *>( m_pField ) ) { @@ -117,7 +117,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) //SvxTimeFormat::HH12_MM_SS_AMPM, // 01:49:38 PM //SvxTimeFormat::HH12_MM_SS_00_AMPM // 01:49:38.78 PM - m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pTimeField->GetFormat() ) + 1), true); // - 2 + 3 ! + m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pTimeField->GetFormat() ) + 1), true); // - 2 + 3 ! } else if( auto pFileField = dynamic_cast< const SvxExtFileField *>( m_pField ) ) { @@ -133,7 +133,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FILEFORMAT_PATH)); m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FILEFORMAT_NAME)); - m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pFileField->GetFormat() ) + 3), true); + m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pFileField->GetFormat() ) + 3), true); } else if( auto pAuthorField = dynamic_cast< const SvxAuthorField *>( m_pField ) ) { @@ -149,13 +149,13 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) aAuthorField.SetFormat( static_cast<SvxAuthorFormat>(i) ); m_xPopup->append_radio(OUString::number(nID++), aAuthorField.GetFormatted()); } - m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pAuthorField->GetFormat() ) + 3), true); + m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pAuthorField->GetFormat() ) + 3), true); } } void SdFieldPopup::Execute(weld::Window* pParent, const tools::Rectangle& rRect) { - OString sIdent = m_xPopup->popup_at_rect(pParent, rRect); + OUString sIdent = m_xPopup->popup_at_rect(pParent, rRect); if (sIdent.isEmpty()) return; @@ -169,7 +169,7 @@ void SdFieldPopup::Execute(weld::Window* pParent, const tools::Rectangle& rRect) int nCount = m_xPopup->n_children(); for (int i = 3; i < nCount; i++) m_xPopup->set_active( - OString::number(i), sIdent == std::string_view(OString::number(i))); + OUString::number(i), sIdent == std::u16string_view(OUString::number(i))); } } @@ -196,7 +196,7 @@ SvxFieldData* SdFieldPopup::GetField() for( i = 3; i < nCount; i++ ) { - if (m_xPopup->get_active(OString::number(i))) + if (m_xPopup->get_active(OUString::number(i))) break; } eFormat = static_cast<SvxDateFormat>( i - 1 ); @@ -228,7 +228,7 @@ SvxFieldData* SdFieldPopup::GetField() for( i = 3; i < nCount; i++ ) { - if (m_xPopup->get_active(OString::number(i))) + if (m_xPopup->get_active(OUString::number(i))) break; } eFormat = static_cast<SvxTimeFormat>( i - 1 ); @@ -261,7 +261,7 @@ SvxFieldData* SdFieldPopup::GetField() for( i = 3; i < nCount; i++ ) { - if (m_xPopup->get_active(OString::number(i))) + if (m_xPopup->get_active(OUString::number(i))) break; } eFormat = static_cast<SvxFileFormat>( i - 3 ); @@ -297,7 +297,7 @@ SvxFieldData* SdFieldPopup::GetField() for( i = 3; i < nCount; i++ ) { - if (m_xPopup->get_active(OString::number(i))) + if (m_xPopup->get_active(OUString::number(i))) break; } eFormat = static_cast<SvxAuthorFormat>( i - 3 ); diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 1f645bf66ee1..c8a8da9e5027 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -94,7 +94,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1)); weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect); - OString sResult = xPopup->popup_at_rect(pParent, aRect); + OUString sResult = xPopup->popup_at_rect(pParent, aRect); if (!sResult.isEmpty()) { sal_uInt16 nCurrId = sResult.toUInt32(); diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 763d0b25435f..95f7d68a576e 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -783,14 +783,14 @@ IMPL_LINK(SvxBulletAndPositionDlg, BulRelSizeHdl_Impl, weld::MetricSpinButton&, SetModified(); } -IMPL_LINK(SvxBulletAndPositionDlg, GraphicHdl_Impl, const OString&, rIdent, void) +IMPL_LINK(SvxBulletAndPositionDlg, GraphicHdl_Impl, const OUString&, rIdent, void) { OUString aGrfName; Size aSize; bool bSucc(false); SvxOpenGraphicDialog aGrfDlg(SdResId(RID_SVXSTR_EDIT_GRAPHIC), p_Window); - OString sNumber; + OUString sNumber; if (rIdent.startsWith("gallery", &sNumber)) { auto idx = sNumber.toUInt32(); diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 8870d1186753..77e411aaedc2 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -30,7 +30,7 @@ namespace sd { static SfxSlot aLeftImpressPaneShellSlots_Impl[] = { - { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, nullptr } + { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" } }; SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell) @@ -54,7 +54,7 @@ LeftImpressPaneShell::~LeftImpressPaneShell() static SfxSlot aLeftDrawPaneShellSlots_Impl[] = { - { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, nullptr } + { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" } }; SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 2a48b1c0e3d6..9abb892e037c 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -386,7 +386,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickRbtHdl, weld::Toggleable&, void) IMPL_LINK(AnimationWindow, ClickHelpHdl, weld::Button&, rButton, void) { if (Help* pHelp = Application::GetHelp()) - pHelp->Start(OUString::fromUtf8(m_xContainer->get_help_id()), &rButton); + pHelp->Start(m_xContainer->get_help_id(), &rButton); } IMPL_LINK( AnimationWindow, ClickGetObjectHdl, weld::Button&, rBtn, void ) diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 1fa8c2dab768..fd6e9a36fa6a 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -71,7 +71,7 @@ CopyDlg::CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* CopyDlg::~CopyDlg() { - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); OUString sStr = OUString::number(m_xNumFldCopies->get_value()) + OUStringChar(TOKEN) + OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + @@ -107,7 +107,7 @@ void CopyDlg::Reset() m_xMtrFldHeight->set_range(-nRectHeight, nPageHeight, FieldUnit::MM_100TH); OUString aStr; - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem"); diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index df1b24179915..074f5d7d1301 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -44,7 +44,7 @@ SdCharDlg::SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, AddTabPage("RID_SVXPAGE_BKG", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); } -void SdCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SdCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "RID_SVXPAGE_CHAR_NAME") diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 41c00efa8afa..edc867785b63 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -125,7 +125,7 @@ OutlineBulletDlg::~OutlineBulletDlg() { } -void OutlineBulletDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void OutlineBulletDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (!m_pSdView) return; diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index e3bc5978bd8c..ecc452dca022 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -79,7 +79,7 @@ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const } } -void SdPageDlg::PageCreated(const OString& rId, SfxTabPage& rPage) +void SdPageDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "RID_SVXPAGE_PAGE") diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 0c0786d3eebb..8401ec38cd6e 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -225,7 +225,7 @@ HeaderFooterDialog::~HeaderFooterDialog() { } -IMPL_LINK(HeaderFooterDialog, ActivatePageHdl, const OString&, rIdent, void) +IMPL_LINK(HeaderFooterDialog, ActivatePageHdl, const OUString&, rIdent, void) { mxPBApply->set_visible(rIdent == "slides"); mxPBApply->set_sensitive(mpCurrentPage != nullptr); @@ -256,14 +256,14 @@ short HeaderFooterDialog::run() void HeaderFooterDialog::ApplyToAll() { - OString tabId = mxTabCtrl->get_current_page_ident(); + OUString tabId = mxTabCtrl->get_current_page_ident(); apply(true, tabId == "slides"); m_xDialog->response(RET_OK); } void HeaderFooterDialog::Apply() { - OString tabId = mxTabCtrl->get_current_page_ident(); + OUString tabId = mxTabCtrl->get_current_page_ident(); apply(false, tabId == "slides"); m_xDialog->response(RET_OK); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index cdc2db1f5a81..ff0bc85d9b85 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -249,20 +249,20 @@ IMPL_LINK(SdNavigatorWin, CommandHdl, const CommandEvent&, rCEvt, bool) std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(&rTreeView, "modules/sdraw/ui/navigatorcontextmenu.ui")); std::unique_ptr<weld::Menu> xPop = xBuilder->weld_menu("navmenu"); - OString sCommand = xPop->popup_at_rect(&rTreeView, + OUString sCommand = xPop->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) ExecuteContextMenuAction(sCommand); return true; } -void SdNavigatorWin::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry) +void SdNavigatorWin::ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry) { - if (rSelectedPopupEntry == "rename") + if (rSelectedPopupEntry == u"rename") GetObjects().start_editing(); } -IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OString&, rCommand, void) +IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OUString&, rCommand, void) { PageJump ePage = PAGE_NONE; @@ -287,7 +287,7 @@ IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OString&, rCommand, void) } } -IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OString&, rCommand, void) +IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OUString&, rCommand, void) { if (!mxToolbox->get_menu_item_active(rCommand)) return; @@ -297,12 +297,12 @@ IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OString&, rCommand, voi NavDocInfo* pInfo = GetDocInfo(); if( ( pInfo && !pInfo->HasName() ) || !mxTlbObjects->IsLinkableSelected() ) { - mxDragModeMenu->set_sensitive(OString::number(NAVIGATOR_DRAGTYPE_LINK), false); - mxDragModeMenu->set_sensitive(OString::number(NAVIGATOR_DRAGTYPE_URL), false); + mxDragModeMenu->set_sensitive(OUString::number(NAVIGATOR_DRAGTYPE_LINK), false); + mxDragModeMenu->set_sensitive(OUString::number(NAVIGATOR_DRAGTYPE_URL), false); meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED; } - mxDragModeMenu->set_active(OString::number(meDragType), true); + mxDragModeMenu->set_active(OUString::number(meDragType), true); } else if (rCommand == "shapes") { @@ -475,7 +475,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, weld::ComboBox&, void) /** * Set DrageType and set image accordingly to it. */ -IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OUString&, rIdent, void) { sal_uInt32 nMenuId = rIdent.toUInt32(); @@ -498,7 +498,7 @@ IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OString&, rIdent, void) mxTlbObjects->set_selection_mode(SelectionMode::Multiple); } -IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, const OString&, rIdent, void ) +IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, const OUString&, rIdent, void ) { bool bShowAllShapes(mxTlbObjects->GetShowAllShapes()); if (rIdent == "named") diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index be9df558e50d..66ac46643195 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -156,7 +156,7 @@ SdParagraphDlg::SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } -void SdParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SdParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "labelTP_PARA_STD") diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 869f13c837d4..7ae551983b42 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -209,7 +209,7 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() { } -void SdPresLayoutTemplateDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SdPresLayoutTemplateDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(aInputSet.GetPool())); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index c526df75d44f..b07c75cb71c7 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -61,7 +61,7 @@ BitmapEx SdAbstractGenericDialog_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString SdAbstractGenericDialog_Impl::GetScreenshotId() const +OUString SdAbstractGenericDialog_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -167,7 +167,7 @@ BitmapEx AbstractHeaderFooterDialog_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractHeaderFooterDialog_Impl::GetScreenshotId() const +OUString AbstractHeaderFooterDialog_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -198,7 +198,7 @@ BitmapEx AbstractBreakDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractBreakDlg_Impl::GetScreenshotId() const +OUString AbstractBreakDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -219,7 +219,7 @@ BitmapEx AbstractMasterLayoutDialog_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractMasterLayoutDialog_Impl::GetScreenshotId() const +OUString AbstractMasterLayoutDialog_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -235,7 +235,7 @@ BitmapEx AbstractCopyDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractCopyDlg_Impl::GetScreenshotId() const +OUString AbstractCopyDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -251,7 +251,7 @@ BitmapEx AbstractSdCustomShowDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdCustomShowDlg_Impl::GetScreenshotId() const +OUString AbstractSdCustomShowDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -261,7 +261,7 @@ short SdAbstractTabController_Impl::Execute() return m_xDlg->run(); } -void SdAbstractTabController_Impl::SetCurPageId( const OString &rName ) +void SdAbstractTabController_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -298,12 +298,12 @@ BitmapEx SdAbstractTabController_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString SdAbstractTabController_Impl::GetScreenshotId() const +OUString SdAbstractTabController_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } -void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName ) +void AbstractBulletDialog_Impl::SetCurPageId( const OUString& rName ) { m_xDlg->SetCurPageId( rName ); } @@ -334,12 +334,12 @@ BitmapEx AbstractBulletDialog_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractBulletDialog_Impl::GetScreenshotId() const +OUString AbstractBulletDialog_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } -void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OString& rName ) +void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OUString& rName ) { m_xDlg->SetCurPageId( rName ); } @@ -370,7 +370,7 @@ BitmapEx SdPresLayoutTemplateDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString SdPresLayoutTemplateDlg_Impl::GetScreenshotId() const +OUString SdPresLayoutTemplateDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -391,7 +391,7 @@ BitmapEx AbstractSdModifyFieldDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdModifyFieldDlg_Impl::GetScreenshotId() const +OUString AbstractSdModifyFieldDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -427,7 +427,7 @@ BitmapEx AbstractSdSnapLineDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdSnapLineDlg_Impl::GetScreenshotId() const +OUString AbstractSdSnapLineDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -437,7 +437,7 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) m_xDlg->GetAttr(rOutAttrs); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OUString& rHelpId ) { m_xDlg->set_help_id(rHelpId); } @@ -448,7 +448,7 @@ BitmapEx AbstractSdInsertLayerDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdInsertLayerDlg_Impl::GetScreenshotId() const +OUString AbstractSdInsertLayerDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -474,7 +474,7 @@ BitmapEx AbstractSdInsertPagesObjsDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdInsertPagesObjsDlg_Impl::GetScreenshotId() const +OUString AbstractSdInsertPagesObjsDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -505,7 +505,7 @@ BitmapEx AbstractMorphDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractMorphDlg_Impl::GetScreenshotId() const +OUString AbstractMorphDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -521,7 +521,7 @@ BitmapEx AbstractSdStartPresDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdStartPresDlg_Impl::GetScreenshotId() const +OUString AbstractSdStartPresDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -537,7 +537,7 @@ BitmapEx AbstractSdPresLayoutDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdPresLayoutDlg_Impl::GetScreenshotId() const +OUString AbstractSdPresLayoutDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -563,7 +563,7 @@ BitmapEx AbstractSdVectorizeDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdVectorizeDlg_Impl::GetScreenshotId() const +OUString AbstractSdVectorizeDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } @@ -579,7 +579,7 @@ BitmapEx AbstractSdPublishingDlg_Impl::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString AbstractSdPublishingDlg_Impl::GetScreenshotId() const +OUString AbstractSdPublishingDlg_Impl::GetScreenshotId() const { return m_xDlg->get_help_id(); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 8da5c74ddc8d..b9dd75226841 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -77,7 +77,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractMasterLayoutDialog_Impl : public VclAbstractDialog @@ -90,7 +90,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractBreakDlg_Impl : public VclAbstractDialog @@ -103,7 +103,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractCopyDlg_Impl : public AbstractCopyDlg @@ -120,7 +120,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg @@ -137,7 +137,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class SdAbstractTabController_Impl : public SfxAbstractTabDialog @@ -150,7 +150,7 @@ public: } virtual short Execute() override; virtual bool StartExecuteAsync(AsyncContext &rCtx) override; - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -158,7 +158,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog @@ -171,7 +171,7 @@ public: } virtual short Execute() override; virtual bool StartExecuteAsync(AsyncContext &rCtx) override; - virtual void SetCurPageId( const OString& rName ) override; + virtual void SetCurPageId( const OUString& rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -179,7 +179,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog @@ -192,7 +192,7 @@ public: } virtual short Execute() override; virtual bool StartExecuteAsync(AsyncContext &rCtx) override; - virtual void SetCurPageId( const OString& rName ) override; + virtual void SetCurPageId( const OUString& rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -200,7 +200,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg @@ -218,7 +218,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg @@ -239,7 +239,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg @@ -253,11 +253,11 @@ public: } virtual short Execute() override; virtual void GetAttr( SfxItemSet& rOutAttrs ) override ; - virtual void SetHelpId( const OString& rHelpId ) override ; + virtual void SetHelpId( const OUString& rHelpId ) override ; // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg @@ -276,7 +276,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractMorphDlg_Impl : public AbstractMorphDlg @@ -296,7 +296,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg @@ -313,7 +313,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg @@ -330,7 +330,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class SdAbstractSfxDialog_Impl : public SfxAbstractDialog @@ -361,7 +361,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg @@ -378,7 +378,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog @@ -395,7 +395,7 @@ public: // screenshotting virtual BitmapEx createScreenshot() const override; - virtual OString GetScreenshotId() const override; + virtual OUString GetScreenshotId() const override; }; //AbstractDialogFactory_Impl implementations diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index e5db39e68ed6..70930be48f0e 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -75,7 +75,7 @@ SdTabTemplateDlg::SdTabTemplateDlg(weld::Window* pParent, RemoveTabPage("asiantypo"); } -void SdTabTemplateDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SdTabTemplateDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "line") diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index a00cb453d6b0..64b266f42060 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -469,7 +469,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg( - pFact->CreateInsertObjectDialog( mpViewShell->GetFrameWeld(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(), + pFact->CreateInsertObjectDialog( mpViewShell->GetFrameWeld(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand(), xStorage, &aServerLst )); pDlg->Execute(); bCreateNew = pDlg->IsCreateNew(); diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 90f940487cb7..35a35412bce0 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -118,7 +118,7 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(LevelHdl_Impl, weld::TreeView&, void); DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void); - DECL_LINK(GraphicHdl_Impl, const OString&, void); + DECL_LINK(GraphicHdl_Impl, const OUString&, void); DECL_LINK(BulletHdl_Impl, weld::Button&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); diff --git a/sd/source/ui/inc/CustomAnimationList.hxx b/sd/source/ui/inc/CustomAnimationList.hxx index ca9673fd7772..fe35f5ae919b 100644 --- a/sd/source/ui/inc/CustomAnimationList.hxx +++ b/sd/source/ui/inc/CustomAnimationList.hxx @@ -40,7 +40,7 @@ class ICustomAnimationListController public: virtual void onSelect() = 0; virtual void onDoubleClick() = 0; - virtual void onContextMenu(const OString &rIdent) = 0; + virtual void onContextMenu(const OUString &rIdent) = 0; virtual void onDragNDropComplete( std::vector< CustomAnimationEffectPtr > pEffectsDragged, CustomAnimationEffectPtr pEffectInsertBefore ) = 0; virtual ~ICustomAnimationListController() {} }; @@ -139,7 +139,7 @@ private: DECL_STATIC_LINK(CustomAnimationList, CustomRenderHdl, weld::TreeView::render_args, void); DECL_STATIC_LINK(CustomAnimationList, CustomGetSizeHdl, weld::TreeView::get_size_args, Size); - void ExecuteContextMenuAction(const OString& rSelectedPopupEntry); + void ExecuteContextMenuAction(const OUString& rSelectedPopupEntry); /** appends the given effect to the list*/ void append( CustomAnimationEffectPtr pEffect ); diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx b/sd/source/ui/inc/CustomAnimationPane.hxx index 5e2d69658f77..9896b45f6653 100644 --- a/sd/source/ui/inc/CustomAnimationPane.hxx +++ b/sd/source/ui/inc/CustomAnimationPane.hxx @@ -72,7 +72,7 @@ public: // ICustomAnimationListController virtual void onSelect() override; virtual void onDoubleClick() override; - virtual void onContextMenu(const OString& rIdent) override; + virtual void onContextMenu(const OUString& rIdent) override; virtual void onDragNDropComplete( std::vector< CustomAnimationEffectPtr > pEffectsDragged, CustomAnimationEffectPtr pEffectInsertBefore ) override; void addUndo(); @@ -87,7 +87,7 @@ private: void updateControls(); void updateMotionPathTags(); - void showOptions(const OString& sPage = OString()); + void showOptions(const OUString& sPage = {}); void moveSelection( bool bUp ); void onPreview( bool bForcePreview ); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 512d45f9a103..88f401e617d3 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -37,7 +37,7 @@ public: const SfxItemSet* GetBulletOutputItemSet() const; protected: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; private: SfxItemSet m_aInputSet; diff --git a/sd/source/ui/inc/TableDesignPane.hxx b/sd/source/ui/inc/TableDesignPane.hxx index 2ab94204b7ff..33fe87006f4a 100644 --- a/sd/source/ui/inc/TableDesignPane.hxx +++ b/sd/source/ui/inc/TableDesignPane.hxx @@ -79,7 +79,7 @@ public: void CloneStyle(); void ResetStyle(); void DeleteStyle(); - void EditStyle(std::string_view rCommand); + void EditStyle(const OUString& rCommand); private: void addListener(); diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 36c2aa6f84a7..c9e11994af7c 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -55,7 +55,7 @@ private: ::rtl::Reference<ViewTabBar> mpViewTabBar; int mnAllocatedWidth; - DECL_LINK(ActivatePageHdl, const OString&, void); + DECL_LINK(ActivatePageHdl, const OUString&, void); DECL_LINK(NotebookSizeAllocHdl, const Size&, void); }; diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index 36e791a093fa..dd12c321eb6a 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -32,7 +32,7 @@ class SdCharDlg : public SfxTabDialogController private: const SfxObjectShell& rDocShell; - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 718ccf0c614b..abe75ff1092e 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -42,7 +42,7 @@ public: SdPageDlg(SfxObjectShell const * pDocSh, weld::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage, bool bIsImpressDoc, bool bIsImpressMaster); - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index e794712d3572..0b96d0348b70 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -33,7 +33,7 @@ class HeaderFooterTabPage; class HeaderFooterDialog : public weld::GenericDialogController { private: - DECL_LINK( ActivatePageHdl, const OString&, void ); + DECL_LINK( ActivatePageHdl, const OUString&, void ); DECL_LINK( ClickApplyToAllHdl, weld::Button&, void ); DECL_LINK( ClickApplyHdl, weld::Button&, void ); DECL_LINK( ClickCancelHdl, weld::Button&, void ); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index fdcc1f2cf3ab..7246c1012d4d 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -151,19 +151,19 @@ private: static OUString GetDragTypeSdBmpId(NavigatorDragType eDT); NavDocInfo* GetDocInfo(); - DECL_DLLPRIVATE_LINK( SelectToolboxHdl, const OString&, void ); - DECL_DLLPRIVATE_LINK( DropdownClickToolBoxHdl, const OString&, void ); + DECL_DLLPRIVATE_LINK( SelectToolboxHdl, const OUString&, void ); + DECL_DLLPRIVATE_LINK( DropdownClickToolBoxHdl, const OUString&, void ); DECL_DLLPRIVATE_LINK( ClickObjectHdl, weld::TreeView&, bool ); DECL_DLLPRIVATE_LINK( SelectDocumentHdl, weld::ComboBox&, void ); - DECL_DLLPRIVATE_LINK( MenuSelectHdl, const OString&, void ); - DECL_DLLPRIVATE_LINK( ShapeFilterCallback, const OString&, void ); + DECL_DLLPRIVATE_LINK( MenuSelectHdl, const OUString&, void ); + DECL_DLLPRIVATE_LINK( ShapeFilterCallback, const OUString&, void ); DECL_DLLPRIVATE_LINK( KeyInputHdl, const KeyEvent&, bool ); DECL_DLLPRIVATE_STATIC_LINK(SdNavigatorWin, MouseReleaseHdl, const MouseEvent&, bool); DECL_LINK(CommandHdl, const CommandEvent&, bool); void SetDragImage(); - void ExecuteContextMenuAction(std::string_view rSelectedPopupEntry); + void ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry); public: //when object is marked , fresh the corresponding entry tree . diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 30304d8002bf..cbdfda101969 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -27,7 +27,7 @@ class SdParagraphDlg : public SfxTabDialogController { private: - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index efd50e4f7206..ea1ef022b882 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -46,7 +46,7 @@ private: PresentationObjects ePO; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; // for mapping with the new SvxNumBulletItem SfxItemSet aInputSet; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index d32388d7bdc4..4e24fb992904 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -43,7 +43,7 @@ private: XDashListRef pDashList; XLineEndListRef pLineEndList; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; virtual void RefreshInputSet() override; public: diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 269099edd0c1..e0e1c6a07cbe 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -189,7 +189,7 @@ void CurrentMasterPagesSelector::UpdateSelection() } } -void CurrentMasterPagesSelector::ExecuteCommand(const OString &rIdent) +void CurrentMasterPagesSelector::ExecuteCommand(const OUString &rIdent) { if (rIdent == "delete") { diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index cd7c2773421d..5b2ad3114e2c 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -64,7 +64,7 @@ protected: virtual OUString GetContextMenuUIFile() const override; virtual void ProcessPopupMenu(weld::Menu& rMenu) override; - virtual void ExecuteCommand(const OString &rIdent) override; + virtual void ExecuteCommand(const OUString &rIdent) override; private: virtual void LateInit() override; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index b0aab2f227ed..aa7bc7b3e9b7 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -609,16 +609,16 @@ IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler, const OUString&, void) InvalidateContent(); } -void LayoutMenu::OnMenuItemSelected(std::string_view ident) +void LayoutMenu::OnMenuItemSelected(std::u16string_view ident) { if (ident.empty()) return; - if (ident == "apply") + if (ident == u"apply") { AssignLayoutToSelectedSlides(GetSelectedAutoLayout()); } - else if (ident == "insert") + else if (ident == u"insert") { // Add arguments to this slot and forward it to the main view // shell. diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index d24b7386e0b8..0b1f7b451211 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -149,7 +149,7 @@ private: DECL_LINK(ClickHandler, ValueSet*, void); DECL_LINK(StateChangeHandler, const OUString&, void); DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void); - void OnMenuItemSelected(std::string_view ident); + void OnMenuItemSelected(std::u16string_view ident); }; } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index ac66cf362593..5be2e73cd091 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -48,7 +48,7 @@ namespace sd::sidebar { /** menu entry that is executed as default action when the left mouse button is clicked over a master page. */ -constexpr OStringLiteral gsDefaultClickAction = "applyselect"; +constexpr OUStringLiteral gsDefaultClickAction = u"applyselect"; MasterPagesSelector::MasterPagesSelector ( weld::Widget* pParent, @@ -57,7 +57,7 @@ MasterPagesSelector::MasterPagesSelector ( std::shared_ptr<MasterPageContainer> pContainer, css::uno::Reference<css::ui::XSidebar> xSidebar, const OUString& rUIFileName, - const OString& rValueSetName) + const OUString& rValueSetName) : PanelLayout( pParent, "MasterPagePanel", rUIFileName ), mpContainer(std::move(pContainer)), mxPreviewValueSet(new PreviewValueSet), @@ -212,7 +212,7 @@ void MasterPagesSelector::ProcessPopupMenu(weld::Menu& rMenu) rMenu.set_sensitive("large", false); } -void MasterPagesSelector::ExecuteCommand(const OString &rIdent) +void MasterPagesSelector::ExecuteCommand(const OUString &rIdent) { if (rIdent == "applyall") { @@ -537,7 +537,7 @@ void MasterPagesSelector::ClearPageSet() mxPreviewValueSet->Clear(); } -void MasterPagesSelector::SetHelpId( const OString& aId ) +void MasterPagesSelector::SetHelpId( const OUString& aId ) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 5709bd6d4482..f0a540bade1b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -53,7 +53,7 @@ public: std::shared_ptr<MasterPageContainer> pContainer, css::uno::Reference<css::ui::XSidebar> xSidebar, const OUString& rUIFileName, - const OString& rValueSetName); + const OUString& rValueSetName); virtual ~MasterPagesSelector() override; virtual void LateInit(); @@ -66,7 +66,7 @@ public: */ void ClearPageSet(); - void SetHelpId( const OString& aId ); + void SetHelpId( const OUString& aId ); /** Mark the preview that belongs to the given index as not up-to-date anymore with respect to page content or preview size. @@ -151,7 +151,7 @@ protected: virtual OUString GetContextMenuUIFile() const; virtual void ProcessPopupMenu(weld::Menu& rMenu); - virtual void ExecuteCommand(const OString& rIdent); + virtual void ExecuteCommand(const OUString& rIdent); private: css::uno::Reference<css::ui::XSidebar> mxSidebar; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 4648ac379b20..73517ff87c0e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2004,7 +2004,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) OUString sId(OUString::number(CM_SLIDES + nPageNumber)); xPageMenu->append_check(sId, pPage->GetName()); if (nPageNumber == nCurrentSlideNumber) - xPageMenu->set_active(sId.toUtf8(), true); + xPageMenu->set_active(sId, true); } } } @@ -2048,7 +2048,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) } if (nWidth == mdUserPaintStrokeWidth) - xWidthMenu->set_active(OString::number(nWidth), true); + xWidthMenu->set_active(OUString::number(nWidth), true); } ::tools::Rectangle aRect(maPopupMousePos, Size(1,1)); @@ -2062,31 +2062,31 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) resume(); } -void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId) +void SlideshowImpl::ContextMenuSelectHdl(std::u16string_view rMenuId) { - if (rMenuId == "prev") + if (rMenuId == u"prev") { gotoPreviousSlide(); mbWasPaused = false; } - else if(rMenuId == "next") + else if(rMenuId == u"next") { gotoNextSlide(); mbWasPaused = false; } - else if (rMenuId == "first") + else if (rMenuId == u"first") { gotoFirstSlide(); mbWasPaused = false; } - else if (rMenuId == "last") + else if (rMenuId == u"last") { gotoLastSlide(); mbWasPaused = false; } - else if (rMenuId == "black" || rMenuId == "white") + else if (rMenuId == u"black" || rMenuId == u"white") { - const Color aBlankColor(rMenuId == "white" ? COL_WHITE : COL_BLACK); + const Color aBlankColor(rMenuId == u"white" ? COL_WHITE : COL_BLACK); if( mbWasPaused ) { if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK ) @@ -2106,7 +2106,7 @@ void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId) mbWasPaused = true; } } - else if (rMenuId == "color") + else if (rMenuId == u"color") { //Open a color picker based on SvColorDialog ::Color aColor( ColorTransparency, mnUserPaintColor ); @@ -2120,42 +2120,42 @@ void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId) } mbWasPaused = false; } - else if (rMenuId == "4") + else if (rMenuId == u"4") { setPenWidth(4.0); mbWasPaused = false; } - else if (rMenuId == "100") + else if (rMenuId == u"100") { setPenWidth(100.0); mbWasPaused = false; } - else if (rMenuId == "150") + else if (rMenuId == u"150") { setPenWidth(150.0); mbWasPaused = false; } - else if (rMenuId == "200") + else if (rMenuId == u"200") { setPenWidth(200.0); mbWasPaused = false; } - else if (rMenuId == "400") + else if (rMenuId == u"400") { setPenWidth(400.0); mbWasPaused = false; } - else if (rMenuId == "erase") + else if (rMenuId == u"erase") { setEraseAllInk(true); mbWasPaused = false; } - else if (rMenuId == "pen") + else if (rMenuId == u"pen") { setUsePen(!mbUsePen); mbWasPaused = false; } - else if (rMenuId == "edit") + else if (rMenuId == u"edit") { // When in autoplay mode (pps/ppsx), offer editing of the presentation // Turn autostart off, else Impress will close when exiting the Presentation @@ -2169,7 +2169,7 @@ void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId) } endPresentation(); } - else if (rMenuId == "end") + else if (rMenuId == u"end") { // in case the user cancels the presentation, switch to current slide // in edit mode diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 284744799475..27c755318c8d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -242,7 +242,7 @@ private: DECL_LINK( updateHdl, Timer *, void ); DECL_LINK( ReadyForNextInputHdl, Timer *, void ); DECL_LINK( endPresentationHdl, void*, void ); - void ContextMenuSelectHdl(std::string_view rIdent); + void ContextMenuSelectHdl(std::u16string_view rIdent); DECL_LINK( ContextMenuHdl, void*, void ); DECL_LINK( deactivateHdl, Timer *, void ); DECL_LINK( EventListenerHdl, VclSimpleEvent&, void ); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index dad8d2c0fec3..216cf09b3b59 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -87,14 +87,14 @@ const sal_Int32 nCellHeight = 7; // one pixel is shared with the next cell! const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreviewColumns - 1); const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1); -const std::string_view gPropNames[CB_COUNT] = +const std::u16string_view gPropNames[CB_COUNT] = { - "UseFirstRowStyle", - "UseLastRowStyle", - "UseBandingRowStyle", - "UseFirstColumnStyle", - "UseLastColumnStyle", - "UseBandingColumnStyle" + u"UseFirstRowStyle", + u"UseLastRowStyle", + u"UseBandingRowStyle", + u"UseFirstColumnStyle", + u"UseLastColumnStyle", + u"UseBandingColumnStyle" }; constexpr std::u16string_view aTableStyleBaseName = u"table"; @@ -114,7 +114,7 @@ TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBa for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i) { - m_aCheckBoxes[i] = rBuilder.weld_check_button(OString(gPropNames[i].data(), gPropNames[i].size())); + m_aCheckBoxes[i] = rBuilder.weld_check_button(OUString(gPropNames[i])); m_aCheckBoxes[i]->connect_toggled(LINK(this, TableDesignWidget, implCheckBoxHdl)); } @@ -193,7 +193,7 @@ IMPL_LINK(TableDesignWidget, implContextMenuHandler, const Point*, pPoint, void) m_xValueSet->SelectItem(nClickedItemId); Point aPosition = pPoint ? *pPoint : m_xValueSet->GetItemRect(nClickedItemId).Center(); - OString aCommand = m_xMenu->popup_at_rect(m_xValueSet->GetDrawingArea(), ::tools::Rectangle(aPosition, Size(1,1))); + OUString aCommand = m_xMenu->popup_at_rect(m_xValueSet->GetDrawingArea(), ::tools::Rectangle(aPosition, Size(1,1))); if (aCommand == "new") InsertStyle(); @@ -352,12 +352,12 @@ void TableDesignWidget::DeleteStyle() } } -void TableDesignWidget::EditStyle(std::string_view rCommand) +void TableDesignWidget::EditStyle(const OUString& rCommand) { try { Reference<XNameReplace> xTableStyle(mxTableFamily->getByIndex(m_xValueSet->GetSelectedItemId() - 1), UNO_QUERY_THROW); - Reference<XStyle> xCellStyle(xTableStyle->getByName(OUString::fromUtf8(rCommand)), UNO_QUERY_THROW); + Reference<XStyle> xCellStyle(xTableStyle->getByName(rCommand), UNO_QUERY_THROW); rtl::Reference xStyleSheet = static_cast<SdStyleSheet*>(xCellStyle.get()); bool bUserDefined = xStyleSheet->IsEditable(); @@ -390,9 +390,9 @@ void TableDesignWidget::EditStyle(std::string_view rCommand) if (!bUserDefined) { Reference<XNamed> xNamed(xTableStyle, UNO_QUERY_THROW); - const OUString aStyleName(getNewStyleName(mxCellFamily, Concat2View(xNamed->getName() + "-" + OUString::fromUtf8(rCommand)))); + const OUString aStyleName(getNewStyleName(mxCellFamily, Concat2View(xNamed->getName() + "-" + rCommand))); mxCellFamily->insertByName(aStyleName, Any(xCellStyle)); - xTableStyle->replaceByName(OUString::fromUtf8(rCommand), Any(xCellStyle)); + xTableStyle->replaceByName(rCommand, Any(xCellStyle)); } SfxItemSet aNewSet(*pDlg->GetOutputItemSet()); @@ -649,7 +649,7 @@ void TableDesignWidget::updateControls() bool bUse = gDefaults[i]; if( bHasTable ) try { - mxSelectedTable->getPropertyValue( OUString::createFromAscii(gPropNames[i]) ) >>= bUse; + mxSelectedTable->getPropertyValue( OUString(gPropNames[i]) ) >>= bUse; } catch( Exception& ) { diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 99b78f27c31f..099a333ae5d2 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -315,7 +315,7 @@ int ViewTabBar::GetHeight() const // set each page width-request to the size it takes to fit the notebook allocation for (int nIndex = 1, nPageCount = rNotebook.get_n_pages(); nIndex <= nPageCount; ++nIndex) { - OString sIdent(OString::number(nIndex)); + OUString sIdent(OUString::number(nIndex)); weld::Container* pContainer = rNotebook.get_page(sIdent); pContainer->set_size_request(nPageWidth, -1); } @@ -450,7 +450,7 @@ void ViewTabBar::UpdateTabBarButtons() int nIndex = 1; for (const auto& rTab : maTabBarButtons) { - OString sIdent(OString::number(nIndex)); + OUString sIdent(OUString::number(nIndex)); // Create a new tab when there are not enough. if (nPageCount < nIndex) rNotebook.append_page(sIdent, rTab.ButtonLabel); @@ -472,7 +472,7 @@ void ViewTabBar::UpdateTabBarButtons() // Delete tabs that are no longer used. for (; nIndex<=nPageCount; ++nIndex) - rNotebook.remove_page(OString::number(nIndex)); + rNotebook.remove_page(OUString::number(nIndex)); int nWidthReq = rNotebook.get_preferred_size().Width(); // The excess width over the page request that the notebook uses we will @@ -520,7 +520,7 @@ IMPL_LINK(TabBarControl, NotebookSizeAllocHdl, const Size&, rSize, void) mnAllocatedWidth = rSize.Width(); } -IMPL_LINK(TabBarControl, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(TabBarControl, ActivatePageHdl, const OUString&, rPage, void) { if (!mpViewTabBar->ActivatePage(mxTabControl->get_page_index(rPage))) { diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 68aaf2662fb5..773970a41b05 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -312,7 +312,7 @@ OUString OptimizerDialog::getStateDisplayName(vcl::WizardTypes::WizardState nSta std::unique_ptr<BuilderPage> OptimizerDialog::createPage(vcl::WizardTypes::WizardState nState) { - OString sIdent(OString::number(nState)); + OUString sIdent(OUString::number(nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); std::unique_ptr<vcl::OWizardPage> xRet; diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx index 308a0c8f999a..15dc3c5ec68e 100644 --- a/sfx2/inc/sidebar/PanelTitleBar.hxx +++ b/sfx2/inc/sidebar/PanelTitleBar.hxx @@ -60,7 +60,7 @@ private: css::uno::Reference<css::frame::XToolbarController> mxController; Panel* mpPanel; - OString msIdent; + OUString msIdent; OUString msMoreOptionsCommand; }; diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index 1f589508db18..2cd7224bda12 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -59,7 +59,7 @@ protected: virtual void HandleToolBoxItemClick() = 0; - DECL_LINK(SelectionHandler, const OString&, void); + DECL_LINK(SelectionHandler, const OUString&, void); private: void SetBackground(); diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index d3f64e1d4f34..0ac4f59d88d1 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -205,7 +205,7 @@ Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfi if ( pSfxSlot->GetMode() & nMode ) { frame::DispatchInformation aCmdInfo; - aCmdInfo.Command = ".uno:" + OUString::createFromAscii(pSfxSlot->GetUnoName()); + aCmdInfo.Command = pSfxSlot->GetCommand(); aCmdInfo.GroupId = nCommandGroup; aCmdVector.push_back( aCmdInfo ); } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 5ccfd3c6a597..7b233434dc57 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1703,7 +1703,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - OUString aCmd = OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); + OUString aCmd = GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName(); Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); Sequence < beans::PropertyValue > aSeq; if ( rReq.GetArgs() ) @@ -1723,7 +1723,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< frame::XDispatchProvider > xProv = text::ModuleDispatcher::create( xContext ); - OUString aCmd = OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); + OUString aCmd = GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName(); Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); Sequence < beans::PropertyValue > aSeq; if ( rReq.GetArgs() ) diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 26f0e336a9f2..e4443b7f46fc 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -202,7 +202,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert const beans::PropertyValue& rProp = pPropsVal[0]; const OUString& rName = rProp.Name; - if ( nCount == 1 && rName == OUString( pSlot->pUnoName, strlen( pSlot->pUnoName ), RTL_TEXTENCODING_UTF8 ) ) + if ( nCount == 1 && rName == pSlot->pUnoName ) { // there is only one parameter and its name matches the name of the property, // so it's either a simple property or a complex property in one single UNO struct @@ -242,8 +242,8 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert for ( nSub=0; nSub<nSubCount; nSub++ ) { // search sub item by name - OString aStr = OString::Concat(pSlot->pUnoName) + "." + pType->aAttrib[nSub].pName; - if ( rPropValue.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) ) + OUString aStr = pSlot->pUnoName + "." + OUString::createFromAscii(pType->aAttrib[nSub].pName); + if ( rPropValue.Name == aStr ) { sal_uInt8 nSubId = static_cast<sal_uInt8>(static_cast<sal_Int8>(pType->aAttrib[nSub].nAID)); if ( bConvertTwips ) @@ -884,7 +884,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else { // transform parameter "OptionsPageURL" of slot "OptionsTreeDialog" - if ( "OptionsTreeDialog" == OUString( pSlot->pUnoName, strlen(pSlot->pUnoName), RTL_TEXTENCODING_UTF8 ) ) + if ( "OptionsTreeDialog" == pSlot->pUnoName ) { auto pProp = std::find_if(rArgs.begin(), rArgs.end(), [](const PropertyValue& rProp) { return rProp.Name == "OptionsPageURL"; }); @@ -1299,7 +1299,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b sal_uInt16 nSubCount = pType->nAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = OUString::createFromAscii(pSlot->pUnoName) ; + pValue[nActProp].Name = pSlot->pUnoName; if ( !pItem->QueryValue( pValue[nActProp].Value ) ) { SAL_WARN( "sfx", "Item not convertible: " << nSlotId ); @@ -1315,7 +1315,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b nSubId |= CONVERT_TWIPS; DBG_ASSERT(( pType->aAttrib[n-1].nAID ) <= 127, "Member ID out of range" ); - pValue[nActProp].Name = OUString::createFromAscii( pSlot->pUnoName ) + + pValue[nActProp].Name = pSlot->pUnoName + "." + OUString::createFromAscii( pType->aAttrib[n-1].pName ); if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index a9c94152d383..1fe6c39a7a03 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -286,7 +286,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) if (!rInfo.aModule.isEmpty()) sName = rInfo.aModule + "/" + sName; SvtViewOptions aWinOpt(EViewType::Window, sName); - aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); + aWinOpt.SetWindowState(rInfo.aWinState); css::uno::Sequence < css::beans::NamedValue > aSeq { { "Data", css::uno::Any(aWinData) } }; @@ -371,7 +371,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI aSeq[0].Value >>= aTmp; OUString aWinData( aTmp ); - rInfo.aWinState = OUStringToOString(xWinOpt->GetWindowState(), RTL_TEXTENCODING_UTF8); + rInfo.aWinState = xWinOpt->GetWindowState(); if ( aWinData.isEmpty() ) return; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index dcd710e16704..aae69dff4db2 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -314,7 +314,7 @@ OUString ContentTabPage_Impl::GetSelectedEntry() const // class HelpTabPage_Impl ------------------------------------------------ HelpTabPage_Impl::HelpTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* pIdxWin, - const OString& rID, const OUString& rUIXMLDescription) + const OUString& rID, const OUString& rUIXMLDescription) : BuilderPage(pParent, nullptr, rUIXMLDescription, rID) , m_pIdxWin(pIdxWin) { @@ -1080,11 +1080,11 @@ bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) // class BookmarksTabPage_Impl ------------------------------------------- -void BookmarksTabPage_Impl::DoAction(std::string_view rAction) +void BookmarksTabPage_Impl::DoAction(std::u16string_view rAction) { - if (rAction == "display") + if (rAction == u"display") aDoubleClickHdl.Call(nullptr); - else if (rAction == "rename") + else if (rAction == u"rename") { sal_Int32 nPos = m_xBookmarksBox->get_selected_index(); if (nPos != -1) @@ -1101,7 +1101,7 @@ void BookmarksTabPage_Impl::DoAction(std::string_view rAction) } } } - else if (rAction == "delete") + else if (rAction == u"delete") { sal_Int32 nPos = m_xBookmarksBox->get_selected_index(); if (nPos != -1) @@ -1126,7 +1126,7 @@ IMPL_LINK(BookmarksTabPage_Impl, CommandHdl, const CommandEvent&, rCEvt, bool) std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xBookmarksBox.get(), "sfx/ui/bookmarkmenu.ui")); std::unique_ptr<weld::Menu> xMenu = xBuilder->weld_menu("menu"); - OString sIdent = xMenu->popup_at_rect(m_xBookmarksBox.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sIdent = xMenu->popup_at_rect(m_xBookmarksBox.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sIdent.isEmpty()) DoAction(sIdent); return true; @@ -1138,7 +1138,7 @@ IMPL_LINK(BookmarksTabPage_Impl, KeyInputHdl, const KeyEvent&, rKEvt, bool) sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); if (KEY_DELETE == nCode && m_xBookmarksBox->n_children() > 0) { - DoAction("delete"); + DoAction(u"delete"); bHandled = true; } return bHandled; @@ -1268,7 +1268,7 @@ void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, bool bAddToHi LeaveWait(); } -IMPL_LINK(SfxHelpIndexWindow_Impl, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(SfxHelpIndexWindow_Impl, ActivatePageHdl, const OUString&, rPage, void) { GetPage(rPage)->Activate(); } @@ -1289,11 +1289,11 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent, w GetSearchPage(); GetBookmarksPage(); - OString sPageId("index"); + OUString sPageId("index"); SvtViewOptions aViewOpt( EViewType::TabDialog, CONFIGNAME_INDEXWIN ); if ( aViewOpt.Exists() ) { - OString sSavedPageId = aViewOpt.GetPageID(); + OUString sSavedPageId = aViewOpt.GetPageID(); if (m_xTabCtrl->get_page_index(sSavedPageId) != -1) sPageId = sSavedPageId; } @@ -1363,17 +1363,17 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory() } } -HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetPage(std::string_view rName) +HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetPage(std::u16string_view rName) { HelpTabPage_Impl* pPage = nullptr; - if (rName == "contents") + if (rName == u"contents") pPage = GetContentPage(); - else if (rName == "index") + else if (rName == u"index") pPage = GetIndexPage(); - else if (rName == "find") + else if (rName == u"find") pPage = GetSearchPage(); - else if (rName == "bookmarks") + else if (rName == u"bookmarks") pPage = GetBookmarksPage(); assert(pPage && "SfxHelpIndexWindow_Impl::GetCurrentPage(): no current page"); @@ -1414,7 +1414,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, void) if( !bIndex) bIndex = xIPage->HasKeywordIgnoreCase(); // then set index or search page as current. - OString sPageId = bIndex ? "index" : "find"; + OUString sPageId = bIndex ? OUString("index") : OUString("find"); if (sPageId != m_xTabCtrl->get_current_page_ident()) m_xTabCtrl->set_current_page(sPageId); @@ -1462,7 +1462,7 @@ OUString SfxHelpIndexWindow_Impl::GetSelectedEntry() const { OUString sRet; - OString sName(m_xTabCtrl->get_current_page_ident()); + OUString sName(m_xTabCtrl->get_current_page_ident()); if (sName == "contents") { @@ -1512,7 +1512,7 @@ void SfxHelpIndexWindow_Impl::ClearSearchPage() void SfxHelpIndexWindow_Impl::GrabFocusBack() { - OString sName(m_xTabCtrl->get_current_page_ident()); + OUString sName(m_xTabCtrl->get_current_page_ident()); if (sName == "contents" && xCPage) xCPage->SetFocusOnBox(); @@ -1527,7 +1527,7 @@ void SfxHelpIndexWindow_Impl::GrabFocusBack() bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const { bool bRet = false; - OString sName(m_xTabCtrl->get_current_page_ident()); + OUString sName(m_xTabCtrl->get_current_page_ident()); if (sName == "index" && xIPage) bRet = xIPage->HasFocusOnEdit(); else if (sName == "find" && xSPage) @@ -1538,7 +1538,7 @@ bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const OUString SfxHelpIndexWindow_Impl::GetSearchText() const { OUString sRet; - OString sName(m_xTabCtrl->get_current_page_ident()); + OUString sName(m_xTabCtrl->get_current_page_ident()); if (sName == "find" && xSPage) sRet = xSPage->GetSearchText(); return sRet; @@ -1547,7 +1547,7 @@ OUString SfxHelpIndexWindow_Impl::GetSearchText() const bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const { bool bRet = false; - OString sName(m_xTabCtrl->get_current_page_ident()); + OUString sName(m_xTabCtrl->get_current_page_ident()); if (sName == "find" && xSPage) bRet = xSPage->IsFullWordSearch(); return bRet; @@ -1562,7 +1562,7 @@ void SfxHelpIndexWindow_Impl::OpenKeyword( const OUString& rKeyword ) void SfxHelpIndexWindow_Impl::SelectExecutableEntry() { - OString sName(m_xTabCtrl->get_current_page_ident()); + OUString sName(m_xTabCtrl->get_current_page_ident()); if (sName == "index" && xIPage ) xIPage->SelectExecutableEntry(); } @@ -2293,7 +2293,7 @@ void SfxHelpWindow_Impl::ShowStartPage() loadHelpContent(SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), u"/start", u"")); } -IMPL_LINK(SfxHelpWindow_Impl, SelectHdl, const OString&, rCurItem, void) +IMPL_LINK(SfxHelpWindow_Impl, SelectHdl, const OUString&, rCurItem, void) { bGrabFocusToToolBox = pTextWin->GetToolBox().has_focus(); DoAction(rCurItem); @@ -2483,7 +2483,7 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( ( rKeyCode.IsMod2() && ( KEY_LEFT == nKey || KEY_RIGHT == nKey ) ) || ( !rKeyCode.GetModifier() && KEY_BACKSPACE == nKey && !xIndexWin->HasFocusOnEdit() ) ) { - DoAction( rKeyCode.GetCode() == KEY_RIGHT ? "forward" : "backward" ); + DoAction( rKeyCode.GetCode() == KEY_RIGHT ? u"forward" : u"backward" ); bHandled = true; } else if ( rKeyCode.IsMod1() && ( KEY_F4 == nKey || KEY_W == nKey ) ) @@ -2522,43 +2522,43 @@ void SfxHelpWindow_Impl::SetHelpURL( std::u16string_view rURL ) SetFactory( aObj.GetHost() ); } -void SfxHelpWindow_Impl::DoAction(std::string_view rActionId) +void SfxHelpWindow_Impl::DoAction(std::u16string_view rActionId) { - if (rActionId == "index") + if (rActionId == u"index") { bIndex = !bIndex; MakeLayout(); pTextWin->ToggleIndex( bIndex ); } - else if (rActionId == "start") + else if (rActionId == u"start") { ShowStartPage(); } - else if (rActionId == "backward" || rActionId == "forward") + else if (rActionId == u"backward" || rActionId == u"forward") { URL aURL; aURL.Complete = ".uno:Backward"; - if (rActionId == "forward") + if (rActionId == u"forward") aURL.Complete = ".uno:Forward"; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict(aURL); pHelpInterceptor->dispatch( aURL, Sequence < PropertyValue >() ); } - else if (rActionId == "searchdialog") + else if (rActionId == u"searchdialog") { pTextWin->DoSearch(); } - else if (rActionId == "print" || rActionId == "sourceview" || rActionId == "copy" || rActionId == "selectionmode") + else if (rActionId == u"print" || rActionId == u"sourceview" || rActionId == u"copy" || rActionId == u"selectionmode") { Reference < XDispatchProvider > xProv = pTextWin->getFrame(); if ( xProv.is() ) { URL aURL; - if (rActionId == "print") + if (rActionId == u"print") aURL.Complete = ".uno:Print"; - else if (rActionId == "sourceview") + else if (rActionId == u"sourceview") aURL.Complete = ".uno:SourceView"; - else if (rActionId == "copy") + else if (rActionId == u"copy") aURL.Complete = ".uno:Copy"; else // rActionId == "selectionmode" aURL.Complete = ".uno:SelectTextMode"; @@ -2569,7 +2569,7 @@ void SfxHelpWindow_Impl::DoAction(std::string_view rActionId) xDisp->dispatch( aURL, Sequence < PropertyValue >() ); } } - else if (rActionId == "bookmarks") + else if (rActionId == u"bookmarks") { OUString aURL = pHelpInterceptor->GetCurrentURL(); if ( !aURL.isEmpty() ) diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 9d5a5e42209a..08f2b8a20e23 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -52,7 +52,7 @@ protected: public: HelpTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, - const OString& rID, const OUString& rUIXMLDescription); + const OUString& rID, const OUString& rUIXMLDescription); virtual ~HelpTabPage_Impl() override; }; @@ -201,7 +201,7 @@ private: DECL_LINK(CommandHdl, const CommandEvent&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - void DoAction(std::string_view rAction); + void DoAction(std::u16string_view rAction); public: BookmarksTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* pIdxWin); @@ -243,14 +243,14 @@ private: void Initialize(); void SetActiveFactory(); - HelpTabPage_Impl* GetPage(std::string_view ); + HelpTabPage_Impl* GetPage(std::u16string_view ); inline ContentTabPage_Impl* GetContentPage(); inline IndexTabPage_Impl* GetIndexPage(); inline SearchTabPage_Impl* GetSearchPage(); inline BookmarksTabPage_Impl* GetBookmarksPage(); - DECL_LINK(ActivatePageHdl, const OString&, void); + DECL_LINK(ActivatePageHdl, const OUString&, void); DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(InitHdl, Timer *, void); DECL_LINK(SelectFactoryHdl, Timer *, void); @@ -398,7 +398,7 @@ public: const css::uno::Reference < css::frame::XFrame2 >& getFrame() const { return xFrame; } - void SetSelectHdl(const Link<const OString&, void>& rLink) { xToolBox->connect_clicked(rLink); } + void SetSelectHdl(const Link<const OUString&, void>& rLink) { xToolBox->connect_clicked(rLink); } void ToggleIndex( bool bOn ); void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ); void SetPageStyleHeaderOff() const; @@ -449,7 +449,7 @@ friend class SfxHelpIndexWindow_Impl; void ShowStartPage(); void Split(); - DECL_LINK(SelectHdl, const OString&, void); + DECL_LINK(SelectHdl, const OUString&, void); DECL_LINK(OpenHdl, LinkParamNone*, void); DECL_LINK(SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void); DECL_LINK(ChangeHdl, HelpListener_Impl&, void); @@ -469,7 +469,7 @@ public: void SetFactory( const OUString& rFactory ); void SetHelpURL( std::u16string_view rURL ); - void DoAction(std::string_view rAction); + void DoAction(std::u16string_view rAction); void CloseWindow(); weld::Container* GetContainer() { return m_xHelpTextWindow.get(); } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index d49c76e822a8..72124835a410 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -588,7 +588,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p OUString sRealCommand = vcl::CommandInfoProvider::GetRealCommandForCommand(aProperties); OUString sHelpText = SfxHelp_Impl::GetHelpText( sRealCommand.isEmpty() ? aCommandURL : sRealCommand, sModuleName ); - OString aNewHelpId; + OUString aNewHelpId; if (pWindow && sHelpText.isEmpty()) { @@ -597,7 +597,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p while ( pParent ) { aNewHelpId = pParent->GetHelpId(); - sHelpText = SfxHelp_Impl::GetHelpText( OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8), sModuleName ); + sHelpText = SfxHelp_Impl::GetHelpText( aNewHelpId, sModuleName ); if (!sHelpText.isEmpty()) pParent = nullptr; else @@ -615,8 +615,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p sModuleName + ": " + aCommandURL; if ( !aNewHelpId.isEmpty() ) { - sHelpText += " - " + - OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8); + sHelpText += " - " + aNewHelpId; } } @@ -630,7 +629,7 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, const weld::Widget* p OUString sRealCommand = vcl::CommandInfoProvider::GetRealCommandForCommand(aProperties); OUString sHelpText = SfxHelp_Impl::GetHelpText( sRealCommand.isEmpty() ? aCommandURL : sRealCommand, sModuleName ); - OString aNewHelpId; + OUString aNewHelpId; if (pWidget && sHelpText.isEmpty()) { @@ -639,7 +638,7 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, const weld::Widget* p while (xParent) { aNewHelpId = xParent->get_help_id(); - sHelpText = SfxHelp_Impl::GetHelpText( OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8), sModuleName ); + sHelpText = SfxHelp_Impl::GetHelpText( aNewHelpId, sModuleName ); if (!sHelpText.isEmpty()) xParent.reset(); else @@ -657,8 +656,7 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, const weld::Widget* p sModuleName + ": " + aCommandURL; if ( !aNewHelpId.isEmpty() ) { - sHelpText += " - " + - OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8); + sHelpText += " - " + aNewHelpId; } } @@ -1079,8 +1077,8 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow) vcl::Window* pParent = pWindow->GetParent(); while ( pParent ) { - OString aHelpId = pParent->GetHelpId(); - aHelpURL = CreateHelpURL( OStringToOUString(aHelpId, RTL_TEXTENCODING_UTF8), aHelpModuleName ); + OUString aHelpId = pParent->GetHelpId(); + aHelpURL = CreateHelpURL( aHelpId, aHelpModuleName ); if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { @@ -1253,10 +1251,10 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt { bool bUseFinalFallback = true; // no help found -> try ids of parents. - pWidget->help_hierarchy_foreach([&aHelpModuleName, &aHelpURL, &bUseFinalFallback](const OString& rHelpId){ + pWidget->help_hierarchy_foreach([&aHelpModuleName, &aHelpURL, &bUseFinalFallback](const OUString& rHelpId){ if (rHelpId.isEmpty()) return false; - aHelpURL = CreateHelpURL( OStringToOUString(rHelpId, RTL_TEXTENCODING_UTF8), aHelpModuleName); + aHelpURL = CreateHelpURL(rHelpId, aHelpModuleName); bool bFinished = !SfxContentHelper::IsHelpErrorDocument(aHelpURL); if (bFinished) bUseFinalFallback = false; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 5eb19de835ca..629ad3aa41df 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1513,13 +1513,13 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, std::unique_ptr<SfxPoolI if ( xDisp.is() || !pCache ) { const SfxSlot* pSlot = SfxSlotPool::GetSlotPool( pDispatcher->GetFrame() ).GetSlot( nSlot ); - if ( !pSlot || !pSlot->pUnoName ) + if ( !pSlot || pSlot->pUnoName.isEmpty() ) return SfxItemState::DISABLED; css::util::URL aURL; OUString aCmd( ".uno:" ); aURL.Protocol = aCmd; - aURL.Path = OUString::createFromAscii(pSlot->GetUnoName()); + aURL.Path = pSlot->GetUnoName(); aCmd += aURL.Path; aURL.Complete = aCmd; aURL.Main = aCmd; diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index 39f473ce47b9..f0c687082c9a 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -118,11 +118,11 @@ void SvxCharView::createContextMenu() Invalidate(); } -void SvxCharView::ContextMenuSelect(std::string_view rMenuId) +void SvxCharView::ContextMenuSelect(std::u16string_view rMenuId) { - if (rMenuId == "clearchar") + if (rMenuId == u"clearchar") maClearClickHdl.Call(this); - else if (rMenuId == "clearallchar") + else if (rMenuId == u"clearallchar") maClearAllClickHdl.Call(this); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 8cd0ec2c2fb3..f9b8ac53ea66 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1749,7 +1749,7 @@ boost::property_tree::ptree fillPopupMenu(Menu* pMenu) { const SfxSlot *pSlot = SFX_SLOTPOOL().GetSlot(nItemId); if (pSlot) - aCommandURL = pSlot->GetCommandString(); + aCommandURL = pSlot->GetCommand(); } const OUString aItemText = pMenu->GetItemText(nItemId); diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index c6ed821c1874..27a3d0abdd07 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -43,14 +43,9 @@ sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const return nMasterSlotId; } -OString SfxSlot::GetCommand() const +OUString SfxSlot::GetCommand() const { - return OString::Concat(".uno:") + pUnoName; -} - -OUString SfxSlot::GetCommandString() const -{ - return OStringToOUString(GetCommand(), RTL_TEXTENCODING_UTF8); + return ".uno:" + pUnoName; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 5938b68f0b8d..ed4393fa45d3 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -209,8 +209,7 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const for ( sal_uInt16 n=0; n<nCount; n++ ) { - if ( (pSlots+n)->pUnoName && - aCommand.compareToIgnoreAsciiCaseAscii( (pSlots+n)->GetUnoName() ) == 0 ) + if ( aCommand.equalsIgnoreAsciiCase( (pSlots+n)->GetUnoName() ) ) return pSlots+n; } diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 802fc3b34c9e..9279b5dceb5a 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -332,7 +332,7 @@ void SfxRequest_Impl::Record if(!xRecorder.is()) return; - OUString aCmd = ".uno:" + OUString::createFromAscii( pSlot->GetUnoName() ); + OUString aCmd = pSlot->GetCommand(); uno::Reference< container::XIndexReplace > xReplace( xRecorder, uno::UNO_QUERY ); if ( xReplace.is() && aCmd == ".uno:InsertText" ) @@ -573,10 +573,10 @@ void SfxRequest::Done_Impl // recordable? // new Recording uses UnoName! - SAL_WARN_IF( !pImpl->pSlot->pUnoName, "sfx", "Recording not exported slot: " + SAL_WARN_IF( pImpl->pSlot->pUnoName.isEmpty(), "sfx", "Recording not exported slot: " << pImpl->pSlot->GetSlotId() ); - if ( !pImpl->pSlot->pUnoName ) // playing it safe + if ( pImpl->pSlot->pUnoName.isEmpty() ) // playing it safe return; // often required values diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index cf1e8092371b..5bbeb01d92cd 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -565,21 +565,15 @@ void SfxShell::SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >& if (nSlotId > SID_VERB_END) break; - SfxSlot *pNewSlot = new SfxSlot; - pNewSlot->nSlotId = nSlotId; - pNewSlot->nGroupId = SfxGroupId::NONE; - - // Verb slots must be executed asynchronously, so that they can be - // destroyed while executing. - pNewSlot->nFlags = SfxSlotMode::ASYNCHRON | SfxSlotMode::CONTAINER; - pNewSlot->nMasterSlotId = 0; - pNewSlot->nValue = 0; - pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec); - pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState); - pNewSlot->pType = nullptr; // HACK(SFX_TYPE(SfxVoidItem)) ??? - pNewSlot->nArgDefCount = 0; - pNewSlot->pFirstArgDef = nullptr; - pNewSlot->pUnoName = nullptr; + SfxSlot* pNewSlot = new SfxSlot( + nSlotId, SfxGroupId::NONE, + // Verb slots must be executed asynchronously, so that they can be + // destroyed while executing. + SfxSlotMode::ASYNCHRON | SfxSlotMode::CONTAINER, + 0, 0, + SFX_STUB_PTR(SfxShell, VerbExec), SFX_STUB_PTR(SfxShell, VerbState), + nullptr, // HACK(SFX_TYPE(SfxVoidItem)) ??? + nullptr, nullptr, 0, SfxDisableFlags::NONE, ""); if (!pImpl->aSlotArr.empty()) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index ee20d38c5d81..03f1daa5a370 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -242,7 +242,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons // get the slot - even if it is disabled on the dispatcher pSlot = SfxSlotPool::GetSlotPool( rDispat.GetFrame() ).GetSlot( nId ); - if ( !pSlot || !pSlot->pUnoName ) + if ( !pSlot || pSlot->pUnoName.isEmpty() ) { bSlotDirty = false; bCtrlDirty = true; @@ -253,7 +253,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons css::util::URL aURL; OUString aCmd = ".uno:"; aURL.Protocol = aCmd; - aURL.Path = OUString::createFromAscii( pSlot->GetUnoName() ); + aURL.Path = pSlot->GetUnoName(); aCmd += aURL.Path; aURL.Complete = aCmd; aURL.Main = aCmd; diff --git a/sfx2/source/control/templatedlglocalview.cxx b/sfx2/source/control/templatedlglocalview.cxx index 6aefe5d5acf2..b469ea716dc8 100644 --- a/sfx2/source/control/templatedlglocalview.cxx +++ b/sfx2/source/control/templatedlglocalview.cxx @@ -136,13 +136,13 @@ void TemplateDlgLocalView::createContextMenu(const bool bIsDefault, const bool b mxTreeView.get(), tools::Rectangle(maPosition, Size(1, 1)))); } -void TemplateDlgLocalView::ContextMenuSelectHdl(std::string_view rIdent) +void TemplateDlgLocalView::ContextMenuSelectHdl(std::u16string_view rIdent) { - if (rIdent == "open") + if (rIdent == u"open") maOpenTemplateHdl.Call(maSelectedItem); - else if (rIdent == "edit") + else if (rIdent == u"edit") maEditTemplateHdl.Call(maSelectedItem); - else if (rIdent == "rename") + else if (rIdent == u"rename") { InputDialog aTitleEditDlg(GetDrawingArea(), SfxResId(STR_RENAME_TEMPLATE)); aTitleEditDlg.set_title(SfxResId(STR_WINDOW_TITLE_RENAME_TEMPLATE)); @@ -178,7 +178,7 @@ void TemplateDlgLocalView::ContextMenuSelectHdl(std::string_view rIdent) ListView::rename(OUString::number(maSelectedItem->mnId), maSelectedItem->maTitle); } } - else if (rIdent == "delete") + else if (rIdent == u"delete") { std::unique_ptr<weld::MessageDialog> xQueryDlg(Application::CreateMessageDialog( GetDrawingArea(), VclMessageType::Question, VclButtonsType::YesNo, @@ -189,16 +189,16 @@ void TemplateDlgLocalView::ContextMenuSelectHdl(std::string_view rIdent) maDeleteTemplateHdl.Call(maSelectedItem); reload(); } - else if (rIdent == "default") + else if (rIdent == u"default") { maDefaultTemplateHdl.Call(maSelectedItem); ListView::refreshDefaultColumn(); } - else if (rIdent == "move") + else if (rIdent == u"move") { maMoveTemplateHdl.Call(maSelectedItem); } - else if (rIdent == "export") + else if (rIdent == u"export") { maExportTemplateHdl.Call(maSelectedItem); } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index a223b62e128a..bd5fd7f649c2 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -193,13 +193,13 @@ TemplateContainerItem* TemplateLocalView::getRegion(std::u16string_view rName) return nullptr; } -void TemplateLocalView::ContextMenuSelectHdl(std::string_view rIdent) +void TemplateLocalView::ContextMenuSelectHdl(std::u16string_view rIdent) { - if (rIdent == "open") + if (rIdent == u"open") maOpenTemplateHdl.Call(maSelectedItem); - else if (rIdent == "edit") + else if (rIdent == u"edit") maEditTemplateHdl.Call(maSelectedItem); - else if (rIdent == "rename") + else if (rIdent == u"rename") { InputDialog aTitleEditDlg(GetDrawingArea(), SfxResId(STR_RENAME_TEMPLATE)); OUString sOldTitle = maSelectedItem->getTitle(); @@ -233,7 +233,7 @@ void TemplateLocalView::ContextMenuSelectHdl(std::string_view rIdent) maSelectedItem->setTitle(sNewTitle); } } - else if (rIdent == "delete") + else if (rIdent == u"delete") { std::unique_ptr<weld::MessageDialog> xQueryDlg(Application::CreateMessageDialog(GetDrawingArea(), VclMessageType::Question, VclButtonsType::YesNo, SfxResId(STR_QMSG_SEL_TEMPLATE_DELETE))); @@ -243,7 +243,7 @@ void TemplateLocalView::ContextMenuSelectHdl(std::string_view rIdent) maDeleteTemplateHdl.Call(maSelectedItem); reload(); } - else if (rIdent == "default") + else if (rIdent == u"default") maDefaultTemplateHdl.Call(maSelectedItem); } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 346528d4b0d9..e329e746881e 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -335,9 +335,9 @@ SfxDispatchController_Impl::SfxDispatchController_Impl( , bMasterSlave( false ) , bVisible( true ) { - if ( aDispatchURL.Protocol == "slot:" && pSlot->pUnoName ) + if ( aDispatchURL.Protocol == "slot:" && !pSlot->pUnoName.isEmpty() ) { - aDispatchURL.Complete = ".uno:" + OUString::createFromAscii(pSlot->pUnoName); + aDispatchURL.Complete = pSlot->GetCommand(); Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aDispatchURL ); } @@ -655,7 +655,7 @@ void SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, sal_Int32 nIndex = lNewArgs.getLength(); lNewArgs.realloc( nIndex+1 ); auto plNewArgs = lNewArgs.getArray(); - plNewArgs[nIndex].Name = OUString::createFromAscii( pSlot->pUnoName ); + plNewArgs[nIndex].Name = pSlot->pUnoName; plNewArgs[nIndex].Value <<= SfxDispatchController_Impl::getSlaveCommand( aDispatchURL ); } diff --git a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx index de0950a7edaf..0095e3396cf8 100644 --- a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx +++ b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx @@ -69,7 +69,8 @@ IMPL_LINK(DevelopmentToolDockingWindow, DocumentModelTreeViewSelectionHandler, w maObjectInspectorTreeHandler.introspect(xObject); } -IMPL_LINK(DevelopmentToolDockingWindow, DomToolbarButtonClicked, const OString&, rSelectionId, void) +IMPL_LINK(DevelopmentToolDockingWindow, DomToolbarButtonClicked, const OUString&, rSelectionId, + void) { if (rSelectionId == "dom_refresh_button") { diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx index 53d4d8b08bab..d99fa2388f99 100644 --- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx +++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx @@ -1113,7 +1113,7 @@ IMPL_LINK(ObjectInspectorTreeHandler, PopupMenuHandler, const CommandEvent&, rCo mpObjectInspectorWidgets->mpPropertiesTreeView.get(), "sfx/ui/devtoolsmenu.ui")); std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("inspect_menu")); - OString sCommand( + OUString sCommand( xMenu->popup_at_rect(mpObjectInspectorWidgets->mpPropertiesTreeView.get(), tools::Rectangle(rCommandEvent.GetMousePosPixel(), Size(1, 1)))); @@ -1126,7 +1126,7 @@ IMPL_LINK(ObjectInspectorTreeHandler, PopupMenuHandler, const CommandEvent&, rCo return true; } -IMPL_LINK(ObjectInspectorTreeHandler, ToolbarButtonClicked, const OString&, rSelectionId, void) +IMPL_LINK(ObjectInspectorTreeHandler, ToolbarButtonClicked, const OUString&, rSelectionId, void) { if (rSelectionId == "inspect") { @@ -1153,7 +1153,7 @@ IMPL_LINK(ObjectInspectorTreeHandler, ToolbarButtonClicked, const OString&, rSel } } -IMPL_LINK(ObjectInspectorTreeHandler, NotebookEnterPage, const OString&, rPageId, void) +IMPL_LINK(ObjectInspectorTreeHandler, NotebookEnterPage, const OUString&, rPageId, void) { uno::Any aAny = maInspectionStack.back(); if (!aAny.hasValue()) @@ -1190,7 +1190,7 @@ IMPL_LINK(ObjectInspectorTreeHandler, NotebookEnterPage, const OString&, rPageId } } -IMPL_LINK(ObjectInspectorTreeHandler, NotebookLeavePage, const OString&, rPageId, bool) +IMPL_LINK(ObjectInspectorTreeHandler, NotebookLeavePage, const OUString&, rPageId, bool) { if (rPageId == "object_inspector_interfaces_tab") { diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx index c34bdf1e2aa1..be63cb5c6e31 100644 --- a/sfx2/source/dialog/StyleList.cxx +++ b/sfx2/source/dialog/StyleList.cxx @@ -94,7 +94,7 @@ public: StyleList::StyleList(weld::Builder* pBuilder, SfxBindings* pBindings, SfxCommonTemplateDialog_Impl* Parent, weld::Container* pC, - OString treeviewname, OString flatviewname) + OUString treeviewname, OUString flatviewname) : m_bHierarchical(false) , m_bAllowReParentDrop(false) , m_bNewByExampleDisabled(false) @@ -289,7 +289,7 @@ void StyleList::FilterSelect(sal_uInt16 nActFilter, bool bsetFilter) IMPL_LINK(StyleList, SetFamily, sal_uInt16, nId, void) { if (m_nActFamily != 0xFFFF) - m_pParentDialog->CheckItem(OString::number(m_nActFamily), false); + m_pParentDialog->CheckItem(OUString::number(m_nActFamily), false); m_nActFamily = nId; if (nId != 0xFFFF) { @@ -1339,12 +1339,12 @@ void StyleList::ShowMenu(const CommandEvent& rCEvt) { CreateContextMenu(); weld::TreeView* pTreeView = m_xTreeBox->get_visible() ? m_xTreeBox.get() : m_xFmtLb.get(); - OString sCommand( + OUString sCommand( mxMenu->popup_at_rect(pTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); MenuSelect(sCommand); } -void StyleList::MenuSelect(const OString& rIdent) +void StyleList::MenuSelect(const OUString& rIdent) { sLastItemIdent = rIdent; if (sLastItemIdent.isEmpty()) @@ -1670,7 +1670,7 @@ void StyleList::Update() // current region not within the allowed region or default if (m_nActFamily == 0xffff || nullptr == (pItem = m_pFamilyState[m_nActFamily - 1].get())) { - m_pParentDialog->CheckItem(OString::number(m_nActFamily), false); + m_pParentDialog->CheckItem(OUString::number(m_nActFamily), false); const size_t nFamilyCount = m_xStyleFamilies->size(); size_t n; for (n = 0; n < nFamilyCount; n++) @@ -1685,7 +1685,7 @@ void StyleList::Update() else if (bDocChanged) { // other DocShell -> all new - m_pParentDialog->CheckItem(OString::number(m_nActFamily)); + m_pParentDialog->CheckItem(OUString::number(m_nActFamily)); m_nActFilter = static_cast<sal_uInt16>(m_aLoadFactoryStyleFilter.Call(pDocShell)); m_pParentDialog->IsUpdate(*this); if (0xffff == m_nActFilter) @@ -1704,7 +1704,7 @@ void StyleList::Update() else { // other filters for automatic - m_pParentDialog->CheckItem(OString::number(m_nActFamily)); + m_pParentDialog->CheckItem(OUString::number(m_nActFamily)); const SfxStyleFamilyItem* pStyleItem = GetFamilyItem(); if (pStyleItem && SfxStyleSearchBits::Auto == pStyleItem->GetFilterList()[m_nActFilter].nFlags diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index d7889dd87913..fbae5e1af221 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -210,7 +210,7 @@ BackingWindow::BackingWindow(vcl::Window* i_pParent) IMPL_LINK(BackingWindow, ClickHelpHdl, weld::Button&, rButton, void) { if (Help* pHelp = Application::GetHelp()) - pHelp->Start(OUString::fromUtf8(m_xContainer->get_help_id()), &rButton); + pHelp->Start(m_xContainer->get_help_id(), &rButton); } BackingWindow::~BackingWindow() @@ -643,7 +643,7 @@ IMPL_LINK( BackingWindow, ClickHdl, weld::Button&, rButton, void ) } } -IMPL_LINK (BackingWindow, MenuSelectHdl, const OString&, rId, void) +IMPL_LINK (BackingWindow, MenuSelectHdl, const OUString&, rId, void) { if (rId == "clear_all") { diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 2bd2e04e87a1..af31e250d723 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -94,7 +94,7 @@ class BackingWindow : public InterimItemWindow DECL_LINK(FilterHdl, weld::ComboBox&, void); DECL_LINK(ClickHdl, weld::Button&, void); DECL_LINK(ClickHelpHdl, weld::Button&, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); DECL_LINK(ExtLinkClickHdl, weld::Button&, void); DECL_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index ab976093025a..285c3b5b526e 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -38,7 +38,7 @@ constexpr OUStringLiteral USERITEM_NAME = u"UserItem"; class SfxModelessDialog_Impl : public SfxListener { public: - OString aWinState; + OUString aWinState; SfxChildWindow* pMgr; bool bClosing; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -74,7 +74,7 @@ void SfxModelessDialogController::Initialize(SfxChildWinInfo const *pInfo) SfxModelessDialogController::SfxModelessDialogController(SfxBindings* pBindinx, SfxChildWindow *pCW, weld::Window *pParent, const OUString& rUIXMLDescription, - const OString& rID) + const OUString& rID) : SfxDialogController(pParent, rUIXMLDescription, rID) { Init(pBindinx, pCW); @@ -201,7 +201,7 @@ void SfxModelessDialogController::Close() } SfxDialogController::SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, - const OString& rDialogId) + const OUString& rDialogId) : GenericDialogController(pParent, rUIFile, rDialogId, comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() @@ -223,7 +223,7 @@ IMPL_STATIC_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*, vcl::I } SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget *pParent, const SfxItemSet* pSet, - const OUString& rUIXMLDescription, const OString& rID) + const OUString& rUIXMLDescription, const OUString& rID) : SfxOkDialogController(pParent, rUIXMLDescription, rID) , m_pInputSet(pSet) , m_xContainer(m_xDialog->weld_content_area()) @@ -250,7 +250,7 @@ void SfxSingleTabDialogController::SetTabPage(std::unique_ptr<SfxTabPage> xTabPa return; // First obtain the user data, only then Reset() - OUString sConfigId = OStringToOUString(m_xSfxPage->GetConfigId(), RTL_TEXTENCODING_UTF8); + OUString sConfigId = m_xSfxPage->GetConfigId(); SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); OUString sUserData; @@ -266,7 +266,7 @@ void SfxSingleTabDialogController::SetTabPage(std::unique_ptr<SfxTabPage> xTabPa m_xDialog->set_title(sTitle); // Dialog receives the HelpId of TabPage if there is any - OString sHelpId(m_xSfxPage->GetHelpId()); + OUString sHelpId(m_xSfxPage->GetHelpId()); if (!sHelpId.isEmpty()) m_xDialog->set_help_id(sHelpId); } @@ -309,8 +309,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialogController, OKHdl_Impl, weld::Button&, void) m_xSfxPage->FillUserData(); OUString sData(m_xSfxPage->GetUserData()); - OUString sConfigId = OStringToOUString(m_xSfxPage->GetConfigId(), - RTL_TEXTENCODING_UTF8); + OUString sConfigId = m_xSfxPage->GetConfigId(); SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); aPageOpt.SetUserItem( USERITEM_NAME, Any( sData ) ); m_xDialog->response(RET_OK); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 3067229b96eb..ece02823fd37 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1211,7 +1211,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog(weld::Window* pParent, const SfxIte RemoveTabPage("security"); } -void SfxDocumentInfoDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SfxDocumentInfoDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "general") static_cast<SfxDocumentPage&>(rPage).EnableUseUserData(); @@ -1568,13 +1568,13 @@ void CustomPropertiesWindow::CreateNewLine() // for ui-testing. Distinguish the elements in the lines sal_uInt16 nSize = m_aCustomPropertiesLines.size(); pNewLine->m_xNameBox->set_buildable_name( - pNewLine->m_xNameBox->get_buildable_name() + OString::number(nSize)); + pNewLine->m_xNameBox->get_buildable_name() + OUString::number(nSize)); pNewLine->m_xTypeBox->set_buildable_name( - pNewLine->m_xTypeBox->get_buildable_name() + OString::number(nSize)); + pNewLine->m_xTypeBox->get_buildable_name() + OUString::number(nSize)); pNewLine->m_xValueEdit->set_buildable_name( - pNewLine->m_xValueEdit->get_buildable_name() + OString::number(nSize)); + pNewLine->m_xValueEdit->get_buildable_name() + OUString::number(nSize)); pNewLine->m_xRemoveButton->set_buildable_name( - pNewLine->m_xRemoveButton->get_buildable_name() + OString::number(nSize)); + pNewLine->m_xRemoveButton->get_buildable_name() + OUString::number(nSize)); } pNewLine->DoTypeHdl(*pNewLine->m_xTypeBox); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index ce37aa53ec8d..dcf50ee5d304 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -389,7 +389,7 @@ friend class SfxDockingWindow; sal_uInt16 nDockPos; bool bNewLine; bool bDockingPrevented; - OString aWinState; + OUString aWinState; explicit SfxDockingWindow_Impl(SfxDockingWindow *pBase); SfxChildAlignment GetLastAlignment() const @@ -760,7 +760,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, required because the docking is implemented in Sfx through SfxChildWindows. */ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) + vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) : ResizableDockingWindow(pParent) , pBindings(pBindinx) , pMgr(pCW) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 541d26a9ae29..1cab715a79ff 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -211,7 +211,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve { //!!! todo: cache the help strings (here or TRA) - OString sHelpId; + OUString sHelpId; // mapping from element id -> help id switch ( aEvent.ElementId ) { @@ -274,7 +274,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - aHelpText = pHelp->GetHelpText(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), static_cast<weld::Widget*>(nullptr)); + aHelpText = pHelp->GetHelpText(sHelpId, static_cast<weld::Widget*>(nullptr)); return aHelpText; } diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 3eeb41b98e32..5bcb8b7e9a69 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -340,7 +340,7 @@ void SfxInfoBarWindow::Update(const OUString& sPrimaryMessage, const OUString& s Invalidate(); } -IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, const OString&, void) +IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, const OUString&, void) { static_cast<SfxInfoBarContainerWindow*>(GetParent())->removeInfoBar(this); } diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 786a6401a62b..2384e2471fb0 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -33,7 +33,7 @@ SfxStyleDialogController::SfxStyleDialogController ( weld::Window* pParent, // Parent - const OUString& rUIXMLDescription, const OString& rID, + const OUString& rUIXMLDescription, const OUString& rID, SfxStyleSheetBase& rStyle // stylesheet to be processed ) : SfxTabDialogController(pParent, rUIXMLDescription, rID, &rStyle.GetItemSet(), true) @@ -86,7 +86,7 @@ short SfxStyleDialogController::Ok() */ IMPL_LINK_NOARG(SfxStyleDialogController, CancelHdl, weld::Button&, void) { - SfxTabPage* pPage = GetTabPage("organizer"); + SfxTabPage* pPage = GetTabPage(u"organizer"); const SfxItemSet* pInSet = GetInputSetImpl(); SfxWhichIter aIter(*pInSet); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index beb0ebc73518..ce79cfd2d676 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -55,14 +55,14 @@ namespace { struct Data_Impl { - OString sId; // The ID + OUString sId; // The ID CreateTabPage fnCreatePage; // Pointer to Factory GetTabPageRanges fnGetRanges; // Pointer to Ranges-Function std::unique_ptr<SfxTabPage> xTabPage; // The TabPage itself bool bRefresh; // Flag: Page must be re-initialized // Constructor - Data_Impl( const OString& rId, CreateTabPage fnPage, + Data_Impl( const OUString& rId, CreateTabPage fnPage, GetTabPageRanges fnRanges ) : sId ( rId ), @@ -106,7 +106,7 @@ struct TabDlg_Impl } }; -static Data_Impl* Find( const SfxTabDlgData_Impl& rArr, std::string_view rId, sal_uInt16* pPos = nullptr) +static Data_Impl* Find( const SfxTabDlgData_Impl& rArr, std::u16string_view rId, sal_uInt16* pPos = nullptr) { const sal_uInt16 nCount = rArr.size(); @@ -137,7 +137,7 @@ css::uno::Reference< css::frame::XFrame > SfxTabPage::GetFrame() const return css::uno::Reference< css::frame::XFrame >(); } -SfxTabPage::SfxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet) +SfxTabPage::SfxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet *rAttrSet) : BuilderPage(pPage, pController, rUIXMLDescription, rID, comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone()) @@ -286,11 +286,11 @@ SfxOkDialogController* SfxTabPage::GetDialogController() const return pImpl->mpSfxDialogController; } -OString SfxTabPage::GetHelpId() const +OUString SfxTabPage::GetHelpId() const { if (m_xContainer) return m_xContainer->get_help_id(); - return OString(); + return {}; } weld::Window* SfxTabPage::GetFrameWeld() const @@ -310,7 +310,7 @@ const SfxItemSet* SfxTabPage::GetDialogExampleSet() const SfxTabDialogController::SfxTabDialogController ( weld::Widget* pParent, // Parent Window - const OUString& rUIXMLDescription, const OString& rID, // Dialog .ui path, Dialog Name + const OUString& rUIXMLDescription, const OUString& rID, // Dialog .ui path, Dialog Name const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand bool bEditFmt // when yes -> additional Button for standard @@ -509,12 +509,12 @@ IMPL_LINK_NOARG(SfxTabDialogController, BaseFmtHdl, weld::Button&, void) pDataObject->xTabPage->pImpl->mbStandard = true; } -IMPL_LINK(SfxTabDialogController, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(SfxTabDialogController, ActivatePageHdl, const OUString&, rPage, void) { ActivatePage(rPage); } -void SfxTabDialogController::ActivatePage(const OString& rPage) +void SfxTabDialogController::ActivatePage(const OUString& rPage) /* [Description] Handler that is called by StarView for switching to a different page. @@ -548,12 +548,12 @@ void SfxTabDialogController::ActivatePage(const OString& rPage) m_xResetBtn->show(); } -IMPL_LINK(SfxTabDialogController, DeactivatePageHdl, const OString&, rPage, bool) +IMPL_LINK(SfxTabDialogController, DeactivatePageHdl, const OUString&, rPage, bool) { return DeactivatePage(rPage); } -bool SfxTabDialogController::DeactivatePage(std::string_view aPage) +bool SfxTabDialogController::DeactivatePage(std::u16string_view aPage) /* [Description] Handler that is called by StarView before leaving a page. @@ -626,7 +626,7 @@ bool SfxTabDialogController::DeactivatePage(std::string_view aPage) bool SfxTabDialogController::PrepareLeaveCurrentPage() { - const OString sId = m_xTabCtrl->get_current_page_ident(); + const OUString sId = m_xTabCtrl->get_current_page_ident(); Data_Impl* pDataObject = Find(m_pImpl->aData, sId); DBG_ASSERT( pDataObject, "Id not known" ); SfxTabPage* pPage = pDataObject ? pDataObject->xTabPage.get() : nullptr; @@ -725,9 +725,7 @@ SfxTabDialogController::~SfxTabDialogController() if ( !aPageData.isEmpty() ) { // save settings of all pages (user data) - OUString sConfigId = OStringToOUString(elem->xTabPage->GetConfigId(), - RTL_TEXTENCODING_UTF8); - SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); + SvtViewOptions aPageOpt(EViewType::TabPage, elem->xTabPage->GetConfigId()); aPageOpt.SetUserItem( USERITEM_NAME, Any( aPageData ) ); } @@ -821,7 +819,7 @@ void SfxTabDialogController::PageCreated */ ( - const OString&, // Id of the created page + const OUString&, // Id of the created page SfxTabPage& // Reference to the created page ) { @@ -830,7 +828,7 @@ void SfxTabDialogController::PageCreated void SfxTabDialogController::SavePosAndId() { // save settings (screen position and current page) - SvtViewOptions aDlgOpt(EViewType::TabDialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::TabDialog, m_xDialog->get_help_id()); aDlgOpt.SetPageID(m_xTabCtrl->get_current_page_ident()); } @@ -838,14 +836,14 @@ void SfxTabDialogController::SavePosAndId() Adds a page to the dialog. The Name must correspond to an entry in the TabControl in the dialog .ui */ -void SfxTabDialogController::AddTabPage(const OString &rName /* Page ID */, +void SfxTabDialogController::AddTabPage(const OUString &rName /* Page ID */, CreateTabPage pCreateFunc /* Pointer to the Factory Method */, GetTabPageRanges pRangesFunc /* Pointer to the Method for querying Ranges onDemand */) { m_pImpl->aData.push_back(new Data_Impl(rName, pCreateFunc, pRangesFunc)); } -void SfxTabDialogController::AddTabPage(const OString &rName /* Page ID */, +void SfxTabDialogController::AddTabPage(const OUString &rName /* Page ID */, sal_uInt16 nPageCreateId /* Identifier of the Factory Method to create the page */) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -860,7 +858,7 @@ void SfxTabDialogController::AddTabPage(const OString &rName /* Page ID */, counterpart in the TabControl in the resource of the dialogue. */ -void SfxTabDialogController::AddTabPage(const OString &rName, /* Page ID */ +void SfxTabDialogController::AddTabPage(const OUString &rName, /* Page ID */ const OUString& rRiderText, CreateTabPage pCreateFunc /* Pointer to the Factory Method */) { @@ -869,7 +867,7 @@ void SfxTabDialogController::AddTabPage(const OString &rName, /* Page ID */ AddTabPage(rName, pCreateFunc, nullptr); } -void SfxTabDialogController::AddTabPage(const OString &rName, const OUString& rRiderText, +void SfxTabDialogController::AddTabPage(const OUString &rName, const OUString& rRiderText, sal_uInt16 nPageCreateId /* Identifier of the Factory Method to create the page */) { assert(!m_xTabCtrl->get_page(rName) && "Double Page-Ids in the Tabpage"); @@ -882,7 +880,7 @@ void SfxTabDialogController::AddTabPage(const OString &rName, const OUString& rR Default implementation of the virtual Method. This is called when pages create their sets onDemand. */ -SfxItemSet* SfxTabDialogController::CreateInputItemSet(const OString&) +SfxItemSet* SfxTabDialogController::CreateInputItemSet(const OUString&) { SAL_WARN( "sfx.dialog", "CreateInputItemSet not implemented" ); m_xItemSet = std::make_unique<SfxAllItemSet>(SfxGetpApp()->GetPool()); @@ -901,8 +899,7 @@ void SfxTabDialogController::CreatePages() else pDataObject->xTabPage = (pDataObject->fnCreatePage)(pPage, this, CreateInputItemSet(pDataObject->sId)); pDataObject->xTabPage->SetDialogController(this); - OUString sConfigId = OStringToOUString(pDataObject->xTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8); - SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); + SvtViewOptions aPageOpt(EViewType::TabPage, pDataObject->xTabPage->GetConfigId()); OUString sUserData; Any aUserItem = aPageOpt.GetUserItem(USERITEM_NAME); OUString aTemp; @@ -948,7 +945,7 @@ void SfxTabDialogController::setPreviewsToSamePlace() m_xSizeGroup->add_widget(rGrid.get()); } -void SfxTabDialogController::RemoveTabPage(const OString& rId) +void SfxTabDialogController::RemoveTabPage(const OUString& rId) /* [Description] @@ -969,9 +966,7 @@ void SfxTabDialogController::RemoveTabPage(const OString& rId) if ( !aPageData.isEmpty() ) { // save settings of this page (user data) - OUString sConfigId = OStringToOUString(pDataObject->xTabPage->GetConfigId(), - RTL_TEXTENCODING_UTF8); - SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId); + SvtViewOptions aPageOpt(EViewType::TabPage, pDataObject->xTabPage->GetConfigId()); aPageOpt.SetUserItem( USERITEM_NAME, Any( aPageData ) ); } @@ -1000,7 +995,7 @@ void SfxTabDialogController::Start_Impl() // something that the sort dialog in calc depends on if (m_sAppPageId.isEmpty()) { - SvtViewOptions aDlgOpt(EViewType::TabDialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::TabDialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) m_xTabCtrl->set_current_page(aDlgOpt.GetPageID()); } @@ -1010,7 +1005,7 @@ void SfxTabDialogController::Start_Impl() m_pImpl->bStarted = true; } -void SfxTabDialogController::SetCurPageId(const OString& rIdent) +void SfxTabDialogController::SetCurPageId(const OUString& rIdent) { m_sAppPageId = rIdent; m_xTabCtrl->set_current_page(m_sAppPageId); @@ -1020,13 +1015,13 @@ void SfxTabDialogController::SetCurPageId(const OString& rIdent) The TabPage is activated with the specified Id. */ -void SfxTabDialogController::ShowPage(const OString& rIdent) +void SfxTabDialogController::ShowPage(const OUString& rIdent) { SetCurPageId(rIdent); ActivatePage(rIdent); } -OString SfxTabDialogController::GetCurPageId() const +OUString SfxTabDialogController::GetCurPageId() const { return m_xTabCtrl->get_current_page_ident(); } @@ -1085,7 +1080,7 @@ void SfxTabDialogController::RemoveStandardButton() m_xBaseFmtBtn->hide(); } -SfxTabPage* SfxTabDialogController::GetTabPage(std::string_view rPageId) const +SfxTabPage* SfxTabDialogController::GetTabPage(std::u16string_view rPageId) const /* [Description] @@ -1124,17 +1119,17 @@ bool SfxTabDialogController::Apply() return bApplied; } -std::vector<OString> SfxTabDialogController::getAllPageUIXMLDescriptions() const +std::vector<OUString> SfxTabDialogController::getAllPageUIXMLDescriptions() const { int nPages = m_xTabCtrl->get_n_pages(); - std::vector<OString> aRet; + std::vector<OUString> aRet; aRet.reserve(nPages); for (int i = 0; i < nPages; ++i) aRet.push_back(m_xTabCtrl->get_page_ident(i)); return aRet; } -bool SfxTabDialogController::selectPageByUIXMLDescription(const OString& rUIXMLDescription) +bool SfxTabDialogController::selectPageByUIXMLDescription(const OUString& rUIXMLDescription) { ShowPage(rUIXMLDescription); return m_xTabCtrl->get_current_page_ident() == rUIXMLDescription; @@ -1152,14 +1147,14 @@ BitmapEx SfxTabDialogController::createScreenshot() const return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel()); } -OString SfxTabDialogController::GetScreenshotId() const +OUString SfxTabDialogController::GetScreenshotId() const { - const OString sId = m_xTabCtrl->get_current_page_ident(); + const OUString sId = m_xTabCtrl->get_current_page_ident(); Data_Impl* pDataObject = Find(m_pImpl->aData, sId); SfxTabPage* pPage = pDataObject ? pDataObject->xTabPage.get() : nullptr; if (pPage) { - OString sHelpId(pPage->GetHelpId()); + OUString sHelpId(pPage->GetHelpId()); if (!sHelpId.isEmpty()) return sHelpId; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index a0cc25da07c4..9001ee0740e1 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -271,7 +271,7 @@ IMPL_LINK(SfxCommonTemplateDialog_Impl, UpdateStyles_Hdl, StyleFlags, nFlags, vo if (nFlags & StyleFlags::UpdateFamily) // Update view type list (Hierarchical, All, etc. { - CheckItem(OString::number(nActFamily)); // check Button in Toolbox + CheckItem(OUString::number(nActFamily)); // check Button in Toolbox mxFilterLb->freeze(); mxFilterLb->clear(); @@ -522,13 +522,13 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry, StyleList&, b assert((0 < nEntry && nEntry <= MAX_FAMILIES) || 0xffff == nEntry); if( nEntry != nActFamily || bPreviewRefresh ) { - CheckItem(OString::number(nActFamily), false); + CheckItem(OUString::number(nActFamily), false); nActFamily = nEntry; m_aStyleList.FamilySelect(nEntry); } } -void SfxCommonTemplateDialog_Impl::ActionSelect(const OString& rEntry, StyleList& rStyleList) +void SfxCommonTemplateDialog_Impl::ActionSelect(const OUString& rEntry, StyleList& rStyleList) { if (rEntry == "watercan") { @@ -715,13 +715,13 @@ void SfxTemplateDialog_Impl::Initialize() void SfxTemplateDialog_Impl::EnableFamilyItem(sal_uInt16 nId, bool bEnable) { - m_xActionTbL->set_item_sensitive(OString::number(nId), bEnable); + m_xActionTbL->set_item_sensitive(OUString::number(nId), bEnable); } // Insert element into dropdown filter "Frame Styles", "List Styles", etc. void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId, const SfxStyleFamilyItem &rItem) { - OString sHelpId; + OUString sHelpId; switch( rItem.GetFamily() ) { case SfxStyleFamily::Char: sHelpId = ".uno:CharStyle"; break; @@ -733,7 +733,7 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId, const SfxStyleFami default: OSL_FAIL("unknown StyleFamily"); break; } - OString sId(OString::number(nId)); + OUString sId(OUString::number(nId)); m_xActionTbL->set_item_visible(sId, true); m_xActionTbL->set_item_icon_name(sId, rItem.GetImage()); m_xActionTbL->set_item_tooltip_text(sId, rItem.GetText()); @@ -763,14 +763,14 @@ SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl() m_xActionTbR.reset(); } -void SfxTemplateDialog_Impl::EnableItem(const OString& rMesId, bool bCheck) +void SfxTemplateDialog_Impl::EnableItem(const OUString& rMesId, bool bCheck) { if (rMesId == "watercan" && !bCheck && IsCheckedItem("watercan")) Execute_Impl(SID_STYLE_WATERCAN, "", "", 0, m_aStyleList); m_xActionTbR->set_item_sensitive(rMesId, bCheck); } -void SfxTemplateDialog_Impl::CheckItem(const OString &rMesId, bool bCheck) +void SfxTemplateDialog_Impl::CheckItem(const OUString &rMesId, bool bCheck) { if (rMesId == "watercan") { @@ -781,19 +781,19 @@ void SfxTemplateDialog_Impl::CheckItem(const OString &rMesId, bool bCheck) m_xActionTbL->set_item_active(rMesId, bCheck); } -bool SfxTemplateDialog_Impl::IsCheckedItem(const OString& rMesId) +bool SfxTemplateDialog_Impl::IsCheckedItem(const OUString& rMesId) { if (rMesId == "watercan") return m_xActionTbR->get_item_active("watercan"); return m_xActionTbL->get_item_active(rMesId); } -IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, const OString&, rEntry, void) +IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, const OUString&, rEntry, void) { FamilySelect(rEntry.toUInt32(), m_aStyleList); } -IMPL_LINK(SfxTemplateDialog_Impl, ToolBoxRSelect, const OString&, rEntry, void) +IMPL_LINK(SfxTemplateDialog_Impl, ToolBoxRSelect, const OUString&, rEntry, void) { if (rEntry == "newmenu") m_xActionTbR->set_menu_item_active(rEntry, !m_xActionTbR->get_menu_item_active(rEntry)); @@ -819,7 +819,7 @@ void SfxTemplateDialog_Impl::FillToolMenu() m_xToolMenu->append("load", sLabel); } -IMPL_LINK(SfxTemplateDialog_Impl, ToolMenuSelectHdl, const OString&, rMenuId, void) +IMPL_LINK(SfxTemplateDialog_Impl, ToolMenuSelectHdl, const OUString&, rMenuId, void) { if (rMenuId.isEmpty()) return; @@ -865,7 +865,7 @@ sal_Int8 SfxTemplateDialog_Impl::AcceptToolbarDrop(const AcceptDropEvent& rEvt, if (nIndex >= m_nActionTbLVisible) nIndex = m_nActionTbLVisible - 1; - OString sIdent = m_xActionTbL->get_item_ident(nIndex); + OUString sIdent = m_xActionTbL->get_item_ident(nIndex); if (!sIdent.isEmpty() && !m_xActionTbL->get_item_active(sIdent)) ToolBoxLSelect(sIdent); diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx index 6e438a90bd1b..5e61849c079a 100644 --- a/sfx2/source/doc/autoredactdialog.cxx +++ b/sfx2/source/doc/autoredactdialog.cxx @@ -534,8 +534,7 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* pParent) { // Can be used to remember the last set of redaction targets? OUString sExtraData; - SvtViewOptions aDlgOpt(EViewType::Dialog, - OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { @@ -586,8 +585,7 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog() if (m_aTableTargets.empty()) { // Clear the dialog data - SvtViewOptions aDlgOpt(EViewType::Dialog, - OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); aDlgOpt.Delete(); return; } @@ -612,8 +610,7 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog() OUString sUserDataStr(OUString::fromUtf8(aStream.str().c_str())); // Store the dialog data - SvtViewOptions aDlgOpt(EViewType::Dialog, - OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); aDlgOpt.SetUserItem("UserItem", css::uno::Any(sUserDataStr)); if (!m_bTargetsCopied) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index a6922befcc95..a9bba4f0fc2d 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -271,7 +271,7 @@ SfxNewFileDialog::SfxNewFileDialog(weld::Window *pParent, SfxNewFileDialogMode n } OUString sExtraData; - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem"); @@ -307,7 +307,7 @@ SfxNewFileDialog::SfxNewFileDialog(weld::Window *pParent, SfxNewFileDialogMode n SfxNewFileDialog::~SfxNewFileDialog() { - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); aDlgOpt.SetUserItem("UserItem", css::uno::Any(m_xMoreBt->get_expanded() ? OUString("Y") : OUString("N"))); } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 1a0356279c4d..2d7b0c31ef6e 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1045,7 +1045,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } xHelper->GUIStoreModel( GetModel(), - OUString::createFromAscii( pSlot->GetUnoName() ), + pSlot->GetUnoName(), aDispatchArgs, bPreselectPassword, GetDocumentSignatureState(), diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 84797484d3a3..73f0a3137d7e 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3586,10 +3586,7 @@ static void ConvertSlotsToCommands( SfxObjectShell const * pDoc, Reference< cont const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( nSlot ); if ( pSlot ) { - OUStringBuffer aStrBuf( ".uno:" ); - aStrBuf.appendAscii( pSlot->GetUnoName() ); - - aCommand = aStrBuf.makeStringAndClear(); + aCommand = pSlot->GetCommand(); aSeqPropValue.getArray()[nIndex].Value <<= aCommand; rToolbarDefinition->replaceByIndex( i, Any( aSeqPropValue )); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 6bbb7988e726..dec37dd0c406 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -58,16 +58,16 @@ constexpr OUStringLiteral TM_SETTING_LASTFOLDER = u"LastFolder"; constexpr OUStringLiteral TM_SETTING_LASTAPPLICATION = u"LastApplication"; constexpr OUStringLiteral TM_SETTING_VIEWMODE = u"ViewMode"; -#define MNI_ACTION_NEW_FOLDER "new" -#define MNI_ACTION_RENAME_FOLDER "rename" -#define MNI_ACTION_DELETE_FOLDER "delete" -#define MNI_ACTION_DEFAULT "default" -#define MNI_ACTION_DEFAULT_WRITER "default_writer" -#define MNI_ACTION_DEFAULT_CALC "default_calc" -#define MNI_ACTION_DEFAULT_IMPRESS "default_impress" -#define MNI_ACTION_DEFAULT_DRAW "default_draw" -#define MNI_ACTION_IMPORT "import_template" -#define MNI_ACTION_EXTENSIONS "extensions" +constexpr OUStringLiteral MNI_ACTION_NEW_FOLDER = u"new"; +constexpr OUStringLiteral MNI_ACTION_RENAME_FOLDER = u"rename"; +constexpr OUStringLiteral MNI_ACTION_DELETE_FOLDER = u"delete"; +constexpr OUStringLiteral MNI_ACTION_DEFAULT = u"default"; +constexpr OUStringLiteral MNI_ACTION_DEFAULT_WRITER = u"default_writer"; +constexpr OUStringLiteral MNI_ACTION_DEFAULT_CALC = u"default_calc"; +constexpr OUStringLiteral MNI_ACTION_DEFAULT_IMPRESS = u"default_impress"; +constexpr OUStringLiteral MNI_ACTION_DEFAULT_DRAW = u"default_draw"; +constexpr OUStringLiteral MNI_ACTION_IMPORT = u"import_template"; +constexpr OUStringLiteral MNI_ACTION_EXTENSIONS = u"extensions"; #define MNI_ALL_APPLICATIONS 0 #define MNI_WRITER 1 #define MNI_CALC 2 @@ -508,7 +508,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem OnTemplateState(pItem); } -IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, const OUString&, rIdent, void) { if (rIdent == MNI_ACTION_NEW_FOLDER) OnCategoryNew(); @@ -532,7 +532,7 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, const OString&, rIdent, void) ExtensionsActionHdl(); } -void SfxTemplateManagerDlg::DefaultTemplateMenuSelectHdl(std::string_view rIdent) +void SfxTemplateManagerDlg::DefaultTemplateMenuSelectHdl(std::u16string_view rIdent) { SvtModuleOptions aModOpt; OUString aFactoryURL; 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<Idle> 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 <rtl/string.hxx> +#include <rtl/ustring.hxx> -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; diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 5473aa95f001..05a82dd2003f 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -310,7 +310,7 @@ sal_Int32 PlacePanels ( if (comphelper::LibreOfficeKit::isActive()) { sal_uInt64 nShellId = reinterpret_cast<sal_uInt64>(SfxViewShell::Current()); - jsdialog::SendFullUpdate(std::to_string(nShellId) + "sidebar", "Panel"); + jsdialog::SendFullUpdate(OUString::number(nShellId) + "sidebar", "Panel"); } return nY; diff --git a/sfx2/source/sidebar/PanelLayout.cxx b/sfx2/source/sidebar/PanelLayout.cxx index ef80cb3d26f5..afe018db8a93 100644 --- a/sfx2/source/sidebar/PanelLayout.cxx +++ b/sfx2/source/sidebar/PanelLayout.cxx @@ -17,7 +17,7 @@ using namespace sfx2::sidebar; -PanelLayout::PanelLayout(weld::Widget* pParent, const OString& rID, const OUString& rUIXMLDescription) +PanelLayout::PanelLayout(weld::Widget* pParent, const OUString& rID, const OUString& rUIXMLDescription) : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription, false, reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))) , m_xContainer(m_xBuilder->weld_container(rID)) , m_pPanel(nullptr) diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 50d6e6abb58a..8fa401f4074e 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -90,7 +90,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, if (msMoreOptionsCommand.isEmpty()) return; - msIdent = msMoreOptionsCommand.toUtf8(); + msIdent = msMoreOptionsCommand; mxToolBox->set_item_ident(0, msIdent); Reference<lang::XComponent> xComponent(mxController, UNO_QUERY); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 3546297df79c..703c5020635a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1092,8 +1092,8 @@ void SidebarController::PopulatePopupMenus(weld::Menu& rMenu, weld::Menu& rCusto sal_Int32 nIndex (0); for (const auto& rItem : rMenuData) { - OString sIdent("select" + OString::number(nIndex)); - rMenu.insert(nIndex, OUString::fromUtf8(sIdent), rItem.msDisplayName, + OUString sIdent("select" + OUString::number(nIndex)); + rMenu.insert(nIndex, sIdent, rItem.msDisplayName, nullptr, nullptr, nullptr, TRISTATE_FALSE); rMenu.set_active(sIdent, rItem.mbIsCurrentDeck); rMenu.set_sensitive(sIdent, rItem.mbIsEnabled && rItem.mbIsActive); @@ -1103,15 +1103,15 @@ void SidebarController::PopulatePopupMenus(weld::Menu& rMenu, weld::Menu& rCusto if (rItem.mbIsCurrentDeck) { // Don't allow the currently visible deck to be disabled. - OString sSubIdent("nocustomize" + OString::number(nIndex)); - rCustomizationMenu.insert(nIndex, OUString::fromUtf8(sSubIdent), rItem.msDisplayName, + OUString sSubIdent("nocustomize" + OUString::number(nIndex)); + rCustomizationMenu.insert(nIndex, sSubIdent, rItem.msDisplayName, nullptr, nullptr, nullptr, TRISTATE_FALSE); rCustomizationMenu.set_active(sSubIdent, true); } else { - OString sSubIdent("customize" + OString::number(nIndex)); - rCustomizationMenu.insert(nIndex, OUString::fromUtf8(sSubIdent), rItem.msDisplayName, + OUString sSubIdent("customize" + OUString::number(nIndex)); + rCustomizationMenu.insert(nIndex, sSubIdent, rItem.msDisplayName, nullptr, nullptr, nullptr, TRISTATE_TRUE); rCustomizationMenu.set_active(sSubIdent, rItem.mbIsEnabled && rItem.mbIsActive); } @@ -1138,7 +1138,7 @@ void SidebarController::PopulatePopupMenus(weld::Menu& rMenu, weld::Menu& rCusto rMenu.set_visible("customization", !comphelper::LibreOfficeKit::isActive()); } -IMPL_LINK(SidebarController, OnMenuItemSelected, const OString&, rCurItemId, void) +IMPL_LINK(SidebarController, OnMenuItemSelected, const OUString&, rCurItemId, void) { if (rCurItemId == "unlocktaskpanel") { @@ -1171,7 +1171,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, const OString&, rCurItemId, voi { try { - OString sNumber; + OUString sNumber; if (rCurItemId.startsWith("select", &sNumber)) { RequestOpenDeck(); @@ -1185,7 +1185,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, const OString&, rCurItemId, voi } } -IMPL_LINK(SidebarController, OnSubMenuItemSelected, const OString&, rCurItemId, void) +IMPL_LINK(SidebarController, OnSubMenuItemSelected, const OUString&, rCurItemId, void) { if (rCurItemId == "restoredefault") mpTabBar->RestoreHideFlags(); @@ -1193,7 +1193,7 @@ IMPL_LINK(SidebarController, OnSubMenuItemSelected, const OString&, rCurItemId, { try { - OString sNumber; + OUString sNumber; if (rCurItemId.startsWith("customize", &sNumber)) { mpTabBar->ToggleHideFlag(sNumber.toInt32()); diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 6b77096898c7..9d92d24cd93a 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -267,7 +267,7 @@ TabBar::Item::~Item() mrTabBar.GetContainer()->move(mxButton.get(), nullptr); } -IMPL_LINK_NOARG(TabBar::Item, HandleClick, const OString&, void) +IMPL_LINK_NOARG(TabBar::Item, HandleClick, const OUString&, void) { // tdf#143146 copy the functor and arg before calling // GrabFocusToDocument which may destroy this object @@ -363,13 +363,13 @@ IMPL_LINK_NOARG(TabBar, OnToolboxClicked, weld::Toggleable&, void) for (int i = mxMainMenu->n_children() - 1; i >= 0; --i) { - OString sIdent = mxMainMenu->get_id(i); + OUString sIdent = mxMainMenu->get_id(i); if (sIdent.startsWith("select")) mxMainMenu->remove(sIdent); } for (int i = mxSubMenu->n_children() - 1; i >= 0; --i) { - OString sIdent = mxSubMenu->get_id(i); + OUString sIdent = mxSubMenu->get_id(i); if (sIdent.indexOf("customize") != -1) mxSubMenu->remove(sIdent); } diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index dd00d42175b9..edab6d58b811 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -70,7 +70,7 @@ void TitleBar::SetIcon(const css::uno::Reference<css::graphic::XGraphic>& rIcon) mxAddonImage->set_visible(rIcon.is()); } -IMPL_LINK_NOARG(TitleBar, SelectionHandler, const OString&, void) +IMPL_LINK_NOARG(TitleBar, SelectionHandler, const OUString&, void) { HandleToolBoxItemClick(); } diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index d1b1ed58b905..e9d8512fa832 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -104,7 +104,7 @@ rtl::Reference<svt::StatusbarController> SfxStatusBarControllerFactory( sal_uInt16 nSlotId = pSlot->GetSlotId(); if ( nSlotId > 0 ) { - OString aCmd = OString::Concat(".uno:") + pSlot->GetUnoName(); + OUString aCmd = pSlot->GetCommand(); pStatusBar->SetHelpId( nSlotId, aCmd ); return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); } diff --git a/sfx2/source/toolbox/weldutils.cxx b/sfx2/source/toolbox/weldutils.cxx index eff86b0b857f..a20c9a9a21e7 100644 --- a/sfx2/source/toolbox/weldutils.cxx +++ b/sfx2/source/toolbox/weldutils.cxx @@ -91,12 +91,12 @@ ToolbarUnoDispatcher::ToolbarUnoDispatcher(weld::Toolbar& rToolbar, weld::Builde for (int i = 0, nItems = rToolbar.get_n_items(); i < nItems; ++i) { - OString sIdent(rToolbar.get_item_ident(i)); + OUString sIdent(rToolbar.get_item_ident(i)); if (!sIdent.startsWith(".uno:")) continue; - OUString sCommand = OUString::fromUtf8(sIdent); + OUString sCommand = sIdent; if (bRTL && lcl_RTLizeCommandURL(sCommand)) - rToolbar.set_item_ident(i, sCommand.toUtf8()); + rToolbar.set_item_ident(i, sCommand); auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(sCommand, aModuleName); OUString aLabel(vcl::CommandInfoProvider::GetLabelForCommand(aProperties)); @@ -135,19 +135,19 @@ ToolbarUnoDispatcher::GetControllerForCommand(const OUString& rCommand) const return css::uno::Reference<css::frame::XToolbarController>(); } -IMPL_LINK(ToolbarUnoDispatcher, SelectHdl, const OString&, rCommand, void) +IMPL_LINK(ToolbarUnoDispatcher, SelectHdl, const OUString&, rCommand, void) { css::uno::Reference<css::frame::XToolbarController> xController( - GetControllerForCommand(OUString::fromUtf8(rCommand))); + GetControllerForCommand(rCommand)); if (xController.is()) xController->execute(0); } -IMPL_LINK(ToolbarUnoDispatcher, ToggleMenuHdl, const OString&, rCommand, void) +IMPL_LINK(ToolbarUnoDispatcher, ToggleMenuHdl, const OUString&, rCommand, void) { css::uno::Reference<css::frame::XToolbarController> xController( - GetControllerForCommand(OUString::fromUtf8(rCommand))); + GetControllerForCommand(rCommand)); if (xController.is()) xController->click(); @@ -160,9 +160,8 @@ IMPL_LINK_NOARG(ToolbarUnoDispatcher, ChangedIconSizeHandler, LinkParamNone*, vo for (int i = 0, nItems = m_pToolbar->get_n_items(); i < nItems; ++i) { - OString sIdent(m_pToolbar->get_item_ident(i)); - auto xImage(vcl::CommandInfoProvider::GetXGraphicForCommand(OUString::fromUtf8(sIdent), - m_xFrame, eSize)); + OUString sIdent(m_pToolbar->get_item_ident(i)); + auto xImage(vcl::CommandInfoProvider::GetXGraphicForCommand(sIdent, m_xFrame, eSize)); m_pToolbar->set_item_image(sIdent, xImage); } @@ -197,7 +196,7 @@ void ToolbarUnoDispatcher::dispose() } m_xImageController->dispose(); - m_pToolbar->connect_clicked(Link<const OString&, void>()); + m_pToolbar->connect_clicked(Link<const OUString&, void>()); m_pToolbar = nullptr; m_pBuilder = nullptr; } diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 6cf26ca47433..6fb0d844fd47 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -526,10 +526,9 @@ namespace { const SfxSlot* pSlot = SfxSlotPool::GetSlotPool(pShell->GetFrame()).GetSlot(nWhich); if (pSlot) { - const char* pName = pSlot->GetUnoName(); - if (pName) + if (!pSlot->GetUnoName().isEmpty()) { - return ".uno:" + OStringToOUString(pName, RTL_TEXTENCODING_ASCII_US); + return pSlot->GetCommand(); } } } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 9dc38304b95a..5d8973fa41e5 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1092,7 +1092,7 @@ uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfi if ( pSfxSlot->GetMode() & nMode ) { frame::DispatchInformation aCmdInfo; - aCmdInfo.Command = ".uno:" + OUString::createFromAscii( pSfxSlot->GetUnoName() ); + aCmdInfo.Command = pSfxSlot->GetCommand(); aCmdInfo.GroupId = nCommandGroup; aCmdVector.push_back( aCmdInfo ); } diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index fee12d9a5130..a595917d450d 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -141,7 +141,7 @@ class SmFontTypeDialog final : public weld::GenericDialogController std::unique_ptr<weld::MenuButton> m_xMenuButton; std::unique_ptr<weld::Button> m_xDefaultButton; - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); DECL_LINK(DefaultButtonClickHdl, weld::Button&, void); public: @@ -205,7 +205,7 @@ class SmDistanceDialog final : public weld::GenericDialogController bool bScaleAllBrackets; DECL_LINK(GetFocusHdl, weld::Widget&, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); DECL_LINK(DefaultButtonClickHdl, weld::Button&, void); DECL_LINK(CheckBoxClickHdl, weld::Toggleable&, void); diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h index 59489e57ac0d..195ccfb570a9 100644 --- a/starmath/inc/helpids.h +++ b/starmath/inc/helpids.h @@ -19,36 +19,36 @@ #pragma once -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_SMA_WIN_DOCUMENT = "STARMATH_HID_SMA_WIN_DOCUMENT"; -inline constexpr OStringLiteral HID_SMA_COMMAND_WIN_EDIT = "STARMATH_HID_SMA_COMMAND_WIN_EDIT"; +inline constexpr OUStringLiteral HID_SMA_WIN_DOCUMENT = u"STARMATH_HID_SMA_WIN_DOCUMENT"; +inline constexpr OUStringLiteral HID_SMA_COMMAND_WIN_EDIT = u"STARMATH_HID_SMA_COMMAND_WIN_EDIT"; -inline constexpr OStringLiteral HID_SMA_COMMAND_WIN = "STARMATH_HID_SMA_COMMAND_WIN"; +inline constexpr OUStringLiteral HID_SMA_COMMAND_WIN = u"STARMATH_HID_SMA_COMMAND_WIN"; -#define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST" -#define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST" -#define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST" -#define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST" -#define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST" -#define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST" -#define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST" -#define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH" -#define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH" -#define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST" -#define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST" -#define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT" -#define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST" -#define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST" -#define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST" -#define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST" -#define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST" -#define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT" -#define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST" -#define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST" -#define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST" -#define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" -#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" -#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" +inline constexpr OUStringLiteral HID_SMA_DEFAULT_DIST = u"STARMATH_HID_SMA_DEFAULT_DIST"; +inline constexpr OUStringLiteral HID_SMA_LINE_DIST = u"STARMATH_HID_SMA_LINE_DIST"; +inline constexpr OUStringLiteral HID_SMA_ROOT_DIST = u"STARMATH_HID_SMA_ROOT_DIST"; +inline constexpr OUStringLiteral HID_SMA_SUP_DIST = u"STARMATH_HID_SMA_SUP_DIST"; +inline constexpr OUStringLiteral HID_SMA_SUB_DIST = u"STARMATH_HID_SMA_SUB_DIST"; +inline constexpr OUStringLiteral HID_SMA_NUMERATOR_DIST = u"STARMATH_HID_SMA_NUMERATOR_DIST"; +inline constexpr OUStringLiteral HID_SMA_DENOMINATOR_DIST = u"STARMATH_HID_SMA_DENOMINATOR_DIST"; +inline constexpr OUStringLiteral HID_SMA_FRACLINE_EXCWIDTH = u"STARMATH_HID_SMA_FRACLINE_EXCWIDTH"; +inline constexpr OUStringLiteral HID_SMA_FRACLINE_LINEWIDTH = u"STARMATH_HID_SMA_FRACLINE_LINEWIDTH"; +inline constexpr OUStringLiteral HID_SMA_UPPERLIMIT_DIST = u"STARMATH_HID_SMA_UPPERLIMIT_DIST"; +inline constexpr OUStringLiteral HID_SMA_LOWERLIMIT_DIST = u"STARMATH_HID_SMA_LOWERLIMIT_DIST"; +inline constexpr OUStringLiteral HID_SMA_BRACKET_EXCHEIGHT = u"STARMATH_HID_SMA_BRACKET_EXCHEIGHT"; +inline constexpr OUStringLiteral HID_SMA_BRACKET_DIST = u"STARMATH_HID_SMA_BRACKET_DIST"; +inline constexpr OUStringLiteral HID_SMA_MATRIXROW_DIST = u"STARMATH_HID_SMA_MATRIXROW_DIST"; +inline constexpr OUStringLiteral HID_SMA_MATRIXCOL_DIST = u"STARMATH_HID_SMA_MATRIXCOL_DIST"; +inline constexpr OUStringLiteral HID_SMA_ATTRIBUT_DIST = u"STARMATH_HID_SMA_ATTRIBUT_DIST"; +inline constexpr OUStringLiteral HID_SMA_INTERATTRIBUT_DIST = u"STARMATH_HID_SMA_INTERATTRIBUT_DIST"; +inline constexpr OUStringLiteral HID_SMA_OPERATOR_EXCHEIGHT = u"STARMATH_HID_SMA_OPERATOR_EXCHEIGHT"; +inline constexpr OUStringLiteral HID_SMA_OPERATOR_DIST = u"STARMATH_HID_SMA_OPERATOR_DIST"; +inline constexpr OUStringLiteral HID_SMA_LEFTBORDER_DIST = u"STARMATH_HID_SMA_LEFTBORDER_DIST"; +inline constexpr OUStringLiteral HID_SMA_RIGHTBORDER_DIST = u"STARMATH_HID_SMA_RIGHTBORDER_DIST"; +inline constexpr OUStringLiteral HID_SMA_UPPERBORDER_DIST = u"STARMATH_HID_SMA_UPPERBORDER_DIST"; +inline constexpr OUStringLiteral HID_SMA_LOWERBORDER_DIST = u"STARMATH_HID_SMA_LOWERBORDER_DIST"; +inline constexpr OUStringLiteral HID_SMA_BRACKET_EXCHEIGHT2 = u"STARMATH_HID_SMA_BRACKET_EXCHEIGHT2"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 19d5b4352b1b..76dd40a13268 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -423,7 +423,7 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const rFormat.RequestApplyChanges(); } -IMPL_LINK(SmFontTypeDialog, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SmFontTypeDialog, MenuSelectHdl, const OUString&, rIdent, void) { SmFontPickListBox *pActiveListBox; @@ -582,19 +582,19 @@ const FieldMinMax pMinMaxData[10][4] = SmCategoryDesc::SmCategoryDesc(weld::Builder& rBuilder, sal_uInt16 nCategoryIdx) { ++nCategoryIdx; - std::unique_ptr<weld::Label> xTitle(rBuilder.weld_label(OString::number(nCategoryIdx)+"title")); + std::unique_ptr<weld::Label> xTitle(rBuilder.weld_label(OUString::number(nCategoryIdx)+"title")); if (xTitle) { Name = xTitle->get_label(); } for (int i = 0; i < 4; ++i) { - std::unique_ptr<weld::Label> xLabel(rBuilder.weld_label(OString::number(nCategoryIdx)+"label"+OString::number(i+1))); + std::unique_ptr<weld::Label> xLabel(rBuilder.weld_label(OUString::number(nCategoryIdx)+"label"+OUString::number(i+1))); if (xLabel) { Strings[i] = xLabel->get_label(); - Graphics[i] = rBuilder.weld_widget(OString::number(nCategoryIdx)+"image"+OString::number(i+1)); + Graphics[i] = rBuilder.weld_widget(OUString::number(nCategoryIdx)+"image"+OUString::number(i+1)); } else { @@ -637,7 +637,7 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, weld::Widget&, rControl, void ) m_pCurrentImage->show(); } -IMPL_LINK(SmDistanceDialog, MenuSelectHdl, const OString&, rId, void) +IMPL_LINK(SmDistanceDialog, MenuSelectHdl, const OUString&, rId, void) { assert(rId.startsWith("menuitem")); SetCategory(rId.replaceFirst("menuitem", "").toInt32() - 1); @@ -672,17 +672,18 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) // array to convert category- and metricfield-number in help ids. // 0 is used in case of unused combinations. assert(NOCATEGORIES == 10 && "Sm : array doesn't fit into the number of categories"); - static const char * aCatMf2Hid[10][4] = + static constexpr OUStringLiteral EMPTY(u""); + static constexpr rtl::OUStringConstExpr aCatMf2Hid[10][4] = { - { HID_SMA_DEFAULT_DIST, HID_SMA_LINE_DIST, HID_SMA_ROOT_DIST, nullptr }, - { HID_SMA_SUP_DIST, HID_SMA_SUB_DIST , nullptr, nullptr }, - { HID_SMA_NUMERATOR_DIST, HID_SMA_DENOMINATOR_DIST, nullptr, nullptr }, - { HID_SMA_FRACLINE_EXCWIDTH, HID_SMA_FRACLINE_LINEWIDTH, nullptr, nullptr }, - { HID_SMA_UPPERLIMIT_DIST, HID_SMA_LOWERLIMIT_DIST, nullptr, nullptr }, - { HID_SMA_BRACKET_EXCHEIGHT, HID_SMA_BRACKET_DIST, nullptr, HID_SMA_BRACKET_EXCHEIGHT2 }, - { HID_SMA_MATRIXROW_DIST, HID_SMA_MATRIXCOL_DIST, nullptr, nullptr }, - { HID_SMA_ATTRIBUT_DIST, HID_SMA_INTERATTRIBUT_DIST, nullptr, nullptr }, - { HID_SMA_OPERATOR_EXCHEIGHT, HID_SMA_OPERATOR_DIST, nullptr, nullptr }, + { HID_SMA_DEFAULT_DIST, HID_SMA_LINE_DIST, HID_SMA_ROOT_DIST, EMPTY }, + { HID_SMA_SUP_DIST, HID_SMA_SUB_DIST , EMPTY, EMPTY }, + { HID_SMA_NUMERATOR_DIST, HID_SMA_DENOMINATOR_DIST, EMPTY, EMPTY }, + { HID_SMA_FRACLINE_EXCWIDTH, HID_SMA_FRACLINE_LINEWIDTH, EMPTY, EMPTY }, + { HID_SMA_UPPERLIMIT_DIST, HID_SMA_LOWERLIMIT_DIST, EMPTY, EMPTY }, + { HID_SMA_BRACKET_EXCHEIGHT, HID_SMA_BRACKET_DIST, EMPTY, HID_SMA_BRACKET_EXCHEIGHT2 }, + { HID_SMA_MATRIXROW_DIST, HID_SMA_MATRIXCOL_DIST, EMPTY, EMPTY }, + { HID_SMA_ATTRIBUT_DIST, HID_SMA_INTERATTRIBUT_DIST, EMPTY, EMPTY }, + { HID_SMA_OPERATOR_EXCHEIGHT, HID_SMA_OPERATOR_DIST, EMPTY, EMPTY }, { HID_SMA_LEFTBORDER_DIST, HID_SMA_RIGHTBORDER_DIST, HID_SMA_UPPERBORDER_DIST, HID_SMA_LOWERBORDER_DIST } }; @@ -710,7 +711,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) if (nActiveCategory == 5) bScaleAllBrackets = m_xCheckBox1->get_active(); - m_xMenuButton->set_item_active("menuitem" + OString::number(nActiveCategory + 1), false); + m_xMenuButton->set_item_active("menuitem" + OUString::number(nActiveCategory + 1), false); } // activation/deactivation of the associated controls depending on the chosen category @@ -722,7 +723,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) // To determine which Controls should be active, the existence // of an associated HelpID is checked - bActive = aCatMf2Hid[nCategory][i] != nullptr; + bActive = !aCatMf2Hid[nCategory][i].asView().empty(); pFT->set_visible(bActive); pFT->set_sensitive(bActive); @@ -769,7 +770,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) m_xMetricField4->set_sensitive( bChecked ); } - m_xMenuButton->set_item_active("menuitem" + OString::number(nCategory + 1), true); + m_xMenuButton->set_item_active("menuitem" + OUString::number(nCategory + 1), true); m_xFrame->set_label(m_xCategories[nCategory]->GetName()); nActiveCategory = nCategory; diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index b0a2ad1bbcc3..dc86194576e2 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -343,7 +343,7 @@ namespace svt CallModifyHdls(); } - ControlBase::ControlBase(BrowserDataWin* pParent, const OUString& rUIXMLDescription, const OString& rID) + ControlBase::ControlBase(BrowserDataWin* pParent, const OUString& rUIXMLDescription, const OUString& rID) : InterimItemWindow(pParent, rUIXMLDescription, rID) { } diff --git a/svtools/source/control/scrolladaptor.cxx b/svtools/source/control/scrolladaptor.cxx index 64799a15e96d..6d01e9d414d7 100644 --- a/svtools/source/control/scrolladaptor.cxx +++ b/svtools/source/control/scrolladaptor.cxx @@ -21,7 +21,8 @@ ScrollAdaptor::ScrollAdaptor(vcl::Window* pWin, bool bHoriz) : InterimItemWindow(pWin, "svt/ui/scrollbars.ui", "ScrollBars") - , m_xScrollBar(m_xBuilder->weld_scrollbar(bHoriz ? "horizontal" : "vertical")) + , m_xScrollBar( + m_xBuilder->weld_scrollbar(bHoriz ? OUString("horizontal") : OUString("vertical"))) , m_bHori(bHoriz) { m_xScrollBar->show(); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index f72fbd2540cb..92519ad356ad 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -106,7 +106,7 @@ void InterimToolbarPopup::EndPopupMode() WeldToolbarPopup::WeldToolbarPopup(css::uno::Reference<css::frame::XFrame> xFrame, weld::Widget* pParent, const OUString& rUIFile, - const OString& rId) + const OUString& rId) : m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) , m_xTopLevel(m_xBuilder->weld_popover(rId)) , m_xContainer(m_xBuilder->weld_container("container")) diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index bafed3e98d56..76bce45c8de3 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -154,7 +154,7 @@ void ValueSet::ImplDeleteItems() void ValueSet::Select() { - collectUIInformation(OStringToOUString(GetDrawingArea()->get_buildable_name(),RTL_TEXTENCODING_UTF8) , OStringToOUString(GetDrawingArea()->get_help_id(),RTL_TEXTENCODING_UTF8) , OUString::number(GetSelectedItemId())); + collectUIInformation(GetDrawingArea()->get_buildable_name() , GetDrawingArea()->get_help_id() , OUString::number(GetSelectedItemId())); maSelectHdl.Call( this ); } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 4e26d912b219..3564b56166f5 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -504,9 +504,9 @@ void AssignmentPersistentData::ImplCommit() for (sal_Int32 column=0; column<2; ++column) { // the label - m_pImpl->pFieldLabels[row * 2 + column] = m_xBuilder->weld_label("label" + OString::number(row * 2 + column)); + m_pImpl->pFieldLabels[row * 2 + column] = m_xBuilder->weld_label("label" + OUString::number(row * 2 + column)); // the listbox - m_pImpl->pFields[row * 2 + column] = m_xBuilder->weld_combo_box("box" + OString::number(row * 2 + column)); + m_pImpl->pFields[row * 2 + column] = m_xBuilder->weld_combo_box("box" + OUString::number(row * 2 + column)); m_pImpl->pFields[row * 2 + column]->connect_changed(LINK(this, AddressBookSourceDialog, OnFieldSelect)); } } diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 83419b4d92b9..41c8510c5f04 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -187,9 +187,8 @@ void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEve if (m_pToolbar) { - OString sId = m_aCommandURL.toUtf8(); - m_pToolbar->set_item_active(sId, bValue); - m_pToolbar->set_item_sensitive(sId, rEvent.IsEnabled); + m_pToolbar->set_item_active(m_aCommandURL, bValue); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); return; } @@ -248,7 +247,7 @@ void SAL_CALL PopupWindowController::click() { if (m_pToolbar) { - if (m_pToolbar->get_menu_item_active(m_aCommandURL.toUtf8())) + if (m_pToolbar->get_menu_item_active(m_aCommandURL)) createPopupWindow(); else mxPopoverContainer->unsetPopover(); @@ -260,7 +259,7 @@ void SAL_CALL PopupWindowController::click() void PopupWindowController::EndPopupMode() { if (m_pToolbar) - m_pToolbar->set_menu_item_active(m_aCommandURL.toUtf8(), false); + m_pToolbar->set_menu_item_active(m_aCommandURL, false); else if (mxInterimPopover) mxInterimPopover->EndPopupMode(); } diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index d7680893f40a..4ec742a24add 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -141,15 +141,13 @@ namespace { { } - OUString lcl_getHelpURL( std::string_view sHelpId ) + OUString lcl_getHelpURL( std::u16string_view sHelpId ) { OUStringBuffer aBuffer; - OUString aTmp( - OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ); - INetURLObject aHID( aTmp ); + INetURLObject aHID(sHelpId); if ( aHID.GetProtocol() == INetProtocol::NotValid ) aBuffer.append( INET_HID_SCHEME ); - aBuffer.append( aTmp ); + aBuffer.append(sHelpId); return aBuffer.makeStringAndClear(); } @@ -235,13 +233,13 @@ namespace { m_bInitialized = true; } - OString lcl_getHelpId( std::u16string_view _rHelpURL ) + OUString lcl_getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INetProtocol::Hid ) - return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return aHID.GetURLPath(); else - return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return _rHelpURL; } std::unique_ptr<weld::DialogController> Wizard::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 4b93f09eadbe..d9cbca5874dd 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -83,12 +83,12 @@ namespace svt::uno return WizardShell_Base::run(); } - OString WizardShell::getPageIdentForState(WizardState nState) const + OUString WizardShell::getPageIdentForState(WizardState nState) const { - return OString::number(impl_stateToPageId(nState)); + return OUString::number(impl_stateToPageId(nState)); } - WizardState WizardShell::getStateFromPageIdent(const OString& rIdent) const + WizardState WizardShell::getStateFromPageIdent(const OUString& rIdent) const { return impl_pageIdToState(rIdent.toInt32()); } @@ -197,7 +197,7 @@ namespace svt::uno sal_Int16 nPageId = impl_stateToPageId(i_nState); - OString sIdent(OString::number(nPageId)); + OUString sIdent(OUString::number(nPageId)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); auto xPage = std::make_unique<EmptyPage>(pPageContainer, this); diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 90e7269a18b2..eb2e8150bc7f 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -106,8 +106,8 @@ namespace svt::uno PWizardPageController impl_getController(BuilderPage* i_pPage) const; - virtual OString getPageIdentForState(WizardState nState) const override; - virtual WizardState getStateFromPageIdent(const OString& rIdent) const override; + virtual OUString getPageIdentForState(WizardState nState) const override; + virtual WizardState getStateFromPageIdent(const OUString& rIdent) const override; // prevent outside access to some base class members using WizardShell_Base::skip; diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 2cf8609ed32b..9cfb5c7148d1 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -150,7 +150,7 @@ public: static css::uno::Reference< css::frame::XFrame > GetFrame(); const css::uno::Reference< css::util::XURLTransformer >& GetURLTransformer() const { return m_xTransformer; } - void Execute(std::string_view rIdent); + void Execute(std::u16string_view rIdent); void DispatchAdd(const css::uno::Reference<css::frame::XDispatch> &rxDispatch, const css::util::URL &rURL); diff --git a/svx/inc/helpids.h b/svx/inc/helpids.h index 625cc4304059..0fb3e2740feb 100644 --- a/svx/inc/helpids.h +++ b/svx/inc/helpids.h @@ -19,47 +19,47 @@ #ifndef INCLUDED_SVX_INC_HELPIDS_H #define INCLUDED_SVX_INC_HELPIDS_H -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_BMPMASK_CTL_QCOL_1 = "SVX_HID_BMPMASK_CTL_QCOL_1"; -inline constexpr OStringLiteral HID_COLOR_CTL_COLORS = "SVX_HID_COLOR_CTL_COLORS"; -inline constexpr OStringLiteral HID_CTRL3D_HSCROLL = "SVX_HID_CTRL3D_HSCROLL"; -inline constexpr OStringLiteral HID_CTRL3D_SWITCHER = "SVX_HID_CTRL3D_SWITCHER"; -inline constexpr OStringLiteral HID_CTRL3D_VSCROLL = "SVX_HID_CTRL3D_VSCROLL"; -inline constexpr OStringLiteral HID_CTRL_COLOR = "SVX_HID_CTRL_COLOR"; -inline constexpr OStringLiteral HID_GALLERY_ICONVIEW = "SVX_HID_GALLERY_ICONVIEW"; -inline constexpr OStringLiteral HID_GALLERY_LISTVIEW = "SVX_HID_GALLERY_LISTVIEW"; -inline constexpr OStringLiteral HID_GALLERY_NEWTHEME = "SVX_HID_GALLERY_NEWTHEME"; -inline constexpr OStringLiteral HID_GALLERY_THEMELIST = "SVX_HID_GALLERY_THEMELIST"; -inline constexpr OStringLiteral HID_GALLERY_WINDOW = "SVX_HID_GALLERY_WINDOW"; -inline constexpr OStringLiteral HID_POPUP_COLOR = "SVX_HID_POPUP_COLOR"; -inline constexpr OStringLiteral HID_POPUP_COLOR_CTRL = "SVX_HID_POPUP_COLOR_CTRL"; -inline constexpr OStringLiteral HID_POPUP_FRAME = "SVX_HID_POPUP_FRAME"; -inline constexpr OStringLiteral HID_POPUP_LINE = "SVX_HID_POPUP_LINE"; -inline constexpr OStringLiteral HID_POPUP_LINEEND = "SVX_HID_POPUP_LINEEND"; -inline constexpr OStringLiteral HID_POPUP_LINEEND_CTRL = "SVX_HID_POPUP_LINEEND_CTRL"; -inline constexpr OStringLiteral HID_STYLE_LISTBOX = "SVX_HID_STYLE_LISTBOX"; -inline constexpr OStringLiteral HID_VALUESET_EXTRUSION_LIGHTING = "SVX_HID_VALUESET_EXTRUSION_LIGHTING"; -inline constexpr OStringLiteral HID_UNDERLINE_BTN = "SVX_HID_UNDERLINE_BTN"; -inline constexpr OStringLiteral HID_SPACING_MB_KERN = "SVX_HID_SPACING_MB_KERN"; +inline constexpr OUStringLiteral HID_BMPMASK_CTL_QCOL_1 = u"SVX_HID_BMPMASK_CTL_QCOL_1"; +inline constexpr OUStringLiteral HID_COLOR_CTL_COLORS = u"SVX_HID_COLOR_CTL_COLORS"; +inline constexpr OUStringLiteral HID_CTRL3D_HSCROLL = u"SVX_HID_CTRL3D_HSCROLL"; +inline constexpr OUStringLiteral HID_CTRL3D_SWITCHER = u"SVX_HID_CTRL3D_SWITCHER"; +inline constexpr OUStringLiteral HID_CTRL3D_VSCROLL = u"SVX_HID_CTRL3D_VSCROLL"; +inline constexpr OUStringLiteral HID_CTRL_COLOR = u"SVX_HID_CTRL_COLOR"; +inline constexpr OUStringLiteral HID_GALLERY_ICONVIEW = u"SVX_HID_GALLERY_ICONVIEW"; +inline constexpr OUStringLiteral HID_GALLERY_LISTVIEW = u"SVX_HID_GALLERY_LISTVIEW"; +inline constexpr OUStringLiteral HID_GALLERY_NEWTHEME = u"SVX_HID_GALLERY_NEWTHEME"; +inline constexpr OUStringLiteral HID_GALLERY_THEMELIST = u"SVX_HID_GALLERY_THEMELIST"; +inline constexpr OUStringLiteral HID_GALLERY_WINDOW = u"SVX_HID_GALLERY_WINDOW"; +inline constexpr OUStringLiteral HID_POPUP_COLOR = u"SVX_HID_POPUP_COLOR"; +inline constexpr OUStringLiteral HID_POPUP_COLOR_CTRL = u"SVX_HID_POPUP_COLOR_CTRL"; +inline constexpr OUStringLiteral HID_POPUP_FRAME = u"SVX_HID_POPUP_FRAME"; +inline constexpr OUStringLiteral HID_POPUP_LINE = u"SVX_HID_POPUP_LINE"; +inline constexpr OUStringLiteral HID_POPUP_LINEEND = u"SVX_HID_POPUP_LINEEND"; +inline constexpr OUStringLiteral HID_POPUP_LINEEND_CTRL = u"SVX_HID_POPUP_LINEEND_CTRL"; +inline constexpr OUStringLiteral HID_STYLE_LISTBOX = u"SVX_HID_STYLE_LISTBOX"; +inline constexpr OUStringLiteral HID_VALUESET_EXTRUSION_LIGHTING = u"SVX_HID_VALUESET_EXTRUSION_LIGHTING"; +inline constexpr OUStringLiteral HID_UNDERLINE_BTN = u"SVX_HID_UNDERLINE_BTN"; +inline constexpr OUStringLiteral HID_SPACING_MB_KERN = u"SVX_HID_SPACING_MB_KERN"; -inline constexpr OStringLiteral HID_FORM_NAVIGATOR = "SVX_HID_FORM_NAVIGATOR"; -inline constexpr OStringLiteral HID_FORM_NAVIGATOR_WIN = "SVX_HID_FORM_NAVIGATOR_WIN"; -inline constexpr OStringLiteral HID_FIELD_SEL = "SVX_HID_FIELD_SEL"; -inline constexpr OStringLiteral HID_FIELD_SEL_WIN = "SVX_HID_FIELD_SEL_WIN"; -inline constexpr OStringLiteral HID_FILTER_NAVIGATOR = "SVX_HID_FILTER_NAVIGATOR"; -inline constexpr OStringLiteral HID_FILTER_NAVIGATOR_WIN = "SVX_HID_FILTER_NAVIGATOR_WIN"; -inline constexpr OStringLiteral HID_GRID_TRAVEL_FIRST = "SVX_HID_GRID_TRAVEL_FIRST"; -inline constexpr OStringLiteral HID_GRID_TRAVEL_PREV = "SVX_HID_GRID_TRAVEL_PREV"; -inline constexpr OStringLiteral HID_GRID_TRAVEL_NEXT = "SVX_HID_GRID_TRAVEL_NEXT"; -inline constexpr OStringLiteral HID_GRID_TRAVEL_LAST = "SVX_HID_GRID_TRAVEL_LAST"; -inline constexpr OStringLiteral HID_GRID_TRAVEL_NEW = "SVX_HID_GRID_TRAVEL_NEW"; -inline constexpr OStringLiteral HID_GRID_TRAVEL_ABSOLUTE = "SVX_HID_GRID_TRAVEL_ABSOLUTE"; -inline constexpr OStringLiteral HID_GRID_NUMBEROFRECORDS = "SVX_HID_GRID_NUMBEROFRECORDS"; +inline constexpr OUStringLiteral HID_FORM_NAVIGATOR = u"SVX_HID_FORM_NAVIGATOR"; +inline constexpr OUStringLiteral HID_FORM_NAVIGATOR_WIN = u"SVX_HID_FORM_NAVIGATOR_WIN"; +inline constexpr OUStringLiteral HID_FIELD_SEL = u"SVX_HID_FIELD_SEL"; +inline constexpr OUStringLiteral HID_FIELD_SEL_WIN = u"SVX_HID_FIELD_SEL_WIN"; +inline constexpr OUStringLiteral HID_FILTER_NAVIGATOR = u"SVX_HID_FILTER_NAVIGATOR"; +inline constexpr OUStringLiteral HID_FILTER_NAVIGATOR_WIN = u"SVX_HID_FILTER_NAVIGATOR_WIN"; +inline constexpr OUStringLiteral HID_GRID_TRAVEL_FIRST = u"SVX_HID_GRID_TRAVEL_FIRST"; +inline constexpr OUStringLiteral HID_GRID_TRAVEL_PREV = u"SVX_HID_GRID_TRAVEL_PREV"; +inline constexpr OUStringLiteral HID_GRID_TRAVEL_NEXT = u"SVX_HID_GRID_TRAVEL_NEXT"; +inline constexpr OUStringLiteral HID_GRID_TRAVEL_LAST = u"SVX_HID_GRID_TRAVEL_LAST"; +inline constexpr OUStringLiteral HID_GRID_TRAVEL_NEW = u"SVX_HID_GRID_TRAVEL_NEW"; +inline constexpr OUStringLiteral HID_GRID_TRAVEL_ABSOLUTE = u"SVX_HID_GRID_TRAVEL_ABSOLUTE"; +inline constexpr OUStringLiteral HID_GRID_NUMBEROFRECORDS = u"SVX_HID_GRID_NUMBEROFRECORDS"; // Help IDs for Manage Track Changes -inline constexpr OStringLiteral HID_REDLINE_CTRL_VIEW = "SVX_HID_REDLINE_CTRL_VIEW"; -inline constexpr OStringLiteral HID_REDLINE_CTRL_FILTER = "SVX_HID_REDLINE_CTRL_FILTER"; +inline constexpr OUStringLiteral HID_REDLINE_CTRL_VIEW = u"SVX_HID_REDLINE_CTRL_VIEW"; +inline constexpr OUStringLiteral HID_REDLINE_CTRL_FILTER = u"SVX_HID_REDLINE_CTRL_FILTER"; #endif diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx index d496a6921fab..81aa1c9c12fb 100644 --- a/svx/inc/tbxcolorupdate.hxx +++ b/svx/inc/tbxcolorupdate.hxx @@ -116,11 +116,11 @@ namespace svx class ToolboxButtonColorUpdater final : public ToolboxButtonColorUpdaterBase { public: - ToolboxButtonColorUpdater(sal_uInt16 nSlotId, const OString& rTbxBtnId, weld::Toolbar* ptrTbx, bool bWideButton, + ToolboxButtonColorUpdater(sal_uInt16 nSlotId, const OUString& rTbxBtnId, weld::Toolbar* ptrTbx, bool bWideButton, const OUString& rCommandLabel, const css::uno::Reference<css::frame::XFrame>& rFrame); private: - OString msBtnId; + OUString msBtnId; weld::Toolbar* mpTbx; virtual void SetQuickHelpText(const OUString& rText) override; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 8f296cc9f7c1..ba11eeacd1da 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -171,7 +171,7 @@ public: void SetExecState( bool bState ) { bExecState = bState; } bool IsExecReady() const { return bExecState; } - DECL_LINK( PipetteHdl, const OString&, void ); + DECL_LINK( PipetteHdl, const OUString&, void ); DECL_LINK( CbxHdl, weld::Toggleable&, void); DECL_LINK( CbxTransHdl, weld::Toggleable&, void ); DECL_LINK( FocusLbHdl, weld::Widget&, void ); @@ -189,7 +189,7 @@ MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : { } -IMPL_LINK( MaskData, PipetteHdl, const OString&, rId, void ) +IMPL_LINK( MaskData, PipetteHdl, const OUString&, rId, void ) { SfxBoolItem aBItem( SID_BMPMASK_PIPETTE, pMask->m_xTbxPipette->get_item_active(rId) ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index a7089208f808..ec122e3b1373 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -350,7 +350,7 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicL // Click handler for ToolBox -IMPL_LINK(SvxSuperContourDlg, Tbx1ClickHdl, const OString&, rId, void) +IMPL_LINK(SvxSuperContourDlg, Tbx1ClickHdl, const OUString&, rId, void) { if (rId == "TBI_APPLY") { @@ -456,18 +456,18 @@ IMPL_LINK(SvxSuperContourDlg, Tbx1ClickHdl, const OString&, rId, void) m_xContourWnd->QueueIdleUpdate(); } -void SvxSuperContourDlg::SetActiveTool(std::string_view rId) +void SvxSuperContourDlg::SetActiveTool(std::u16string_view rId) { - m_xTbx1->set_item_active("TBI_SELECT", rId == "TBI_SELECT"); - m_xTbx1->set_item_active("TBI_RECT", rId == "TBI_RECT"); - m_xTbx1->set_item_active("TBI_CIRCLE", rId == "TBI_CIRCLE"); - m_xTbx1->set_item_active("TBI_POLY", rId == "TBI_POLY"); + m_xTbx1->set_item_active("TBI_SELECT", rId == u"TBI_SELECT"); + m_xTbx1->set_item_active("TBI_RECT", rId == u"TBI_RECT"); + m_xTbx1->set_item_active("TBI_CIRCLE", rId == u"TBI_CIRCLE"); + m_xTbx1->set_item_active("TBI_POLY", rId == u"TBI_POLY"); } -void SvxSuperContourDlg::SetActivePoly(std::string_view rId) +void SvxSuperContourDlg::SetActivePoly(std::u16string_view rId) { - m_xTbx1->set_item_active("TBI_POLYMOVE", rId == "TBI_POLYMOVE"); - m_xTbx1->set_item_active("TBI_POLYINSERT", rId == "TBI_POLYINSERT"); + m_xTbx1->set_item_active("TBI_POLYMOVE", rId == u"TBI_POLYMOVE"); + m_xTbx1->set_item_active("TBI_POLYINSERT", rId == u"TBI_POLYINSERT"); } IMPL_LINK( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) @@ -575,10 +575,10 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) switch( pWnd->GetPolyEditMode() ) { case SID_BEZIER_MOVE: - SetActivePoly("TBI_POLYMOVE"); + SetActivePoly(u"TBI_POLYMOVE"); break; case SID_BEZIER_INSERT: - SetActivePoly("TBI_POLYINSERT"); + SetActivePoly(u"TBI_POLYINSERT"); break; default: break; @@ -587,7 +587,7 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) else { m_xTbx1->set_item_active("TBI_POLYEDIT", false); - SetActivePoly("TBI_POLYMOVE"); + SetActivePoly(u"TBI_POLYMOVE"); pWnd->SetPolyEditMode( 0 ); } } diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 7b74eab65aa3..bb15cb1efc1f 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -238,19 +238,19 @@ void SvxShowCharSet::createContextMenu() Invalidate(); } -void SvxShowCharSet::ContextMenuSelect(std::string_view rIdent) +void SvxShowCharSet::ContextMenuSelect(std::u16string_view rIdent) { sal_UCS4 cChar = GetSelectCharacter(); OUString aOUStr(&cChar, 1); - if (rIdent == "insert") + if (rIdent == u"insert") aDoubleClkHdl.Call(this); - else if (rIdent == "add" || rIdent == "remove") + else if (rIdent == u"add" || rIdent == u"remove") { updateFavCharacterList(aOUStr, mxVirDev->GetFont().GetFamilyName()); aFavClickHdl.Call(this); } - else if (rIdent == "copy") + else if (rIdent == u"copy") CopyToClipboard(aOUStr); } diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 1c7e10959758..2bf5aca4d1e8 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -89,7 +89,7 @@ class SvxSuperContourDlg std::unique_ptr<weld::CustomWeld> m_xStbStatusColorWeld; std::unique_ptr<weld::CustomWeld> m_xContourWndWeld; - DECL_LINK( Tbx1ClickHdl, const OString&, void ); + DECL_LINK( Tbx1ClickHdl, const OUString&, void ); DECL_LINK( MousePosHdl, GraphCtrl*, void ); DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); DECL_LINK( UpdateHdl, Timer *, void ); @@ -100,8 +100,8 @@ class SvxSuperContourDlg DECL_LINK( WorkplaceClickHdl, ContourWindow&, void ); DECL_LINK( CancelHdl, weld::Button&, void ); - void SetActiveTool(std::string_view rId); - void SetActivePoly(std::string_view rId); + void SetActiveTool(std::u16string_view rId); + void SetActivePoly(std::u16string_view rId); SfxBindings& GetBindings() { return *mpBindings; } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 88d869a446f2..6df9dbd2834b 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -450,7 +450,7 @@ IMPL_LINK( SvxTPView, PbClickHdl, weld::Button&, rPushB, void) } } -SvxTPage::SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID) +SvxTPage::SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID) : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) , m_xContainer(m_xBuilder->weld_container(rID)) { @@ -976,7 +976,7 @@ void SvxAcceptChgCtr::ShowFilterPage() m_xTabCtrl->set_current_page("filter"); } -IMPL_LINK(SvxAcceptChgCtr, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(SvxAcceptChgCtr, ActivatePageHdl, const OUString&, rPage, void) { if (rPage == "filter") { @@ -990,7 +990,7 @@ IMPL_LINK(SvxAcceptChgCtr, ActivatePageHdl, const OString&, rPage, void) } } -IMPL_LINK(SvxAcceptChgCtr, DeactivatePageHdl, const OString&, rPage, bool) +IMPL_LINK(SvxAcceptChgCtr, DeactivatePageHdl, const OUString&, rPage, bool) { if (rPage == "filter") m_xTPFilter->DeactivatePage(); diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index af1f25649c14..15740a27037f 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -315,7 +315,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) { if ( pItem ) { - OString sId = "off"; + OUString sId = "off"; switch ( pItem->GetValue() ) { @@ -355,7 +355,7 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) { if ( pItem ) { - OString sId; + OUString sId; m_xTbxAdjust->set_sensitive(true); m_xMtrFldDistance->set_sensitive(true); @@ -441,7 +441,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, { if ( pItem ) { - OString sId; + OUString sId; m_xTbxShadow->set_sensitive(true); @@ -599,7 +599,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } } -IMPL_LINK(SvxFontWorkDialog, SelectStyleHdl_Impl, const OString&, rId, void) +IMPL_LINK(SvxFontWorkDialog, SelectStyleHdl_Impl, const OUString&, rId, void) { // Execute this block when a different toolbox item has been clicked or // when the off item has been clicked. The later is necessary to @@ -627,7 +627,7 @@ IMPL_LINK(SvxFontWorkDialog, SelectStyleHdl_Impl, const OString&, rId, void) m_sLastStyleTbxId = rId; } -IMPL_LINK(SvxFontWorkDialog, SelectAdjustHdl_Impl, const OString&, rId, void) +IMPL_LINK(SvxFontWorkDialog, SelectAdjustHdl_Impl, const OUString&, rId, void) { if (rId == "orientation") { @@ -654,7 +654,7 @@ IMPL_LINK(SvxFontWorkDialog, SelectAdjustHdl_Impl, const OString&, rId, void) } } -IMPL_LINK(SvxFontWorkDialog, SelectShadowHdl_Impl, const OString&, rId, void) +IMPL_LINK(SvxFontWorkDialog, SelectShadowHdl_Impl, const OUString&, rId, void) { if (rId == "contour") { diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 3caa47824c8e..a90e731450dd 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -148,7 +148,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, weld::Windo m_xCbbTarget->connect_focus_out( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) ); m_xTbxIMapDlg1->connect_clicked( LINK( this, SvxIMapDlg, TbxClickHdl ) ); - OString sSelect("TBI_SELECT"); + OUString sSelect("TBI_SELECT"); m_xTbxIMapDlg1->set_item_active(sSelect, true); TbxClickHdl(sSelect); @@ -267,7 +267,7 @@ void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap, // Click-handler for ToolBox -IMPL_LINK(SvxIMapDlg, TbxClickHdl, const OString&, rNewItemId, void) +IMPL_LINK(SvxIMapDlg, TbxClickHdl, const OUString&, rNewItemId, void) { if (rNewItemId == "TBI_APPLY") { @@ -466,28 +466,28 @@ bool SvxIMapDlg::DoSave() return bRet; } -void SvxIMapDlg::SetActiveTool(std::string_view rId) +void SvxIMapDlg::SetActiveTool(std::u16string_view rId) { - m_xTbxIMapDlg1->set_item_active("TBI_SELECT", rId == "TBI_SELECT"); - m_xTbxIMapDlg1->set_item_active("TBI_RECT", rId == "TBI_RECT"); - m_xTbxIMapDlg1->set_item_active("TBI_CIRCLE", rId == "TBI_CIRCLE"); - m_xTbxIMapDlg1->set_item_active("TBI_POLY", rId == "TBI_POLY"); - m_xTbxIMapDlg1->set_item_active("TBI_FREEPOLY", rId == "TBI_FREEPOLY"); + m_xTbxIMapDlg1->set_item_active("TBI_SELECT", rId == u"TBI_SELECT"); + m_xTbxIMapDlg1->set_item_active("TBI_RECT", rId == u"TBI_RECT"); + m_xTbxIMapDlg1->set_item_active("TBI_CIRCLE", rId == u"TBI_CIRCLE"); + m_xTbxIMapDlg1->set_item_active("TBI_POLY", rId == u"TBI_POLY"); + m_xTbxIMapDlg1->set_item_active("TBI_FREEPOLY", rId == u"TBI_FREEPOLY"); - m_xTbxIMapDlg1->set_item_active("TBI_POLYINSERT", rId == "TBI_POLYINSERT"); + m_xTbxIMapDlg1->set_item_active("TBI_POLYINSERT", rId == u"TBI_POLYINSERT"); m_xTbxIMapDlg1->set_item_active("TBI_POLYDELETE", false); - bool bMove = rId == "TBI_POLYMOVE" - || ( rId == "TBI_POLYEDIT" + bool bMove = rId == u"TBI_POLYMOVE" + || ( rId == u"TBI_POLYEDIT" && !m_xTbxIMapDlg1->get_item_active("TBI_POLYINSERT") && !m_xTbxIMapDlg1->get_item_active("TBI_POLYDELETE") ); m_xTbxIMapDlg1->set_item_active("TBI_POLYMOVE", bMove ); - bool bEditMode = ( rId == "TBI_POLYEDIT" ) - || ( rId == "TBI_POLYMOVE") - || ( rId == "TBI_POLYINSERT") - || ( rId == "TBI_POLYDELETE" ); + bool bEditMode = ( rId == u"TBI_POLYEDIT" ) + || ( rId == u"TBI_POLYMOVE") + || ( rId == u"TBI_POLYINSERT") + || ( rId == u"TBI_POLYDELETE" ); m_xTbxIMapDlg1->set_item_active("TBI_POLYEDIT", bEditMode); } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 97fd5d3be3a8..45ad2a9e9e26 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -709,7 +709,7 @@ void IMapWindow::DoPropertyDialog() UpdateInfo( true ); } -void IMapWindow::MenuSelectHdl(const OString& rId) +void IMapWindow::MenuSelectHdl(const OUString& rId) { if (rId == "url") DoPropertyDialog(); diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 7c41f290039c..fee372a25f1a 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -91,7 +91,7 @@ class IMapWindow final : public GraphCtrl std::unique_ptr<IMapDropTargetHelper> mxDropTargetHelper; std::unique_ptr<weld::Menu> mxPopupMenu; - void MenuSelectHdl(const OString& rId); + void MenuSelectHdl(const OUString& rId); // GraphCtrl virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 671afa9f6737..2211f09a20e1 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3267,7 +3267,7 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) } } -void SvxRuler::MenuSelect(std::string_view ident) +void SvxRuler::MenuSelect(std::u16string_view ident) { if (ident.empty()) return; @@ -3275,7 +3275,7 @@ void SvxRuler::MenuSelect(std::string_view ident) SetUnit(vcl::EnglishStringToMetric(ident)); } -void SvxRuler::TabMenuSelect(std::string_view rIdent) +void SvxRuler::TabMenuSelect(std::u16string_view rIdent) { if (rIdent.empty()) return; @@ -3337,8 +3337,8 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) Color aFillColor(xDev->GetSettings().GetStyleSettings().GetShadowColor()); DrawTab(*xDev, aFillColor, aPt, nStyle); - OString sId(OString::number(i + 1)); - xMenu->insert(-1, OUString::fromUtf8(sId), SvxResId(RID_SVXSTR_RULER_TAB[i]), + OUString sId(OUString::number(i + 1)); + xMenu->insert(-1, sId, SvxResId(RID_SVXSTR_RULER_TAB[i]), nullptr, xDev.get(), nullptr, TRISTATE_TRUE); xMenu->set_active(sId, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle); } @@ -3352,7 +3352,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) bool bReduceMetric = bool(nFlags & SvxRulerSupportFlags::REDUCED_METRIC); for ( sal_uInt16 i = nCount; i; --i ) { - OString sIdent = xMenu->get_id(i - 1); + OUString sIdent = xMenu->get_id(i - 1); FieldUnit eMenuUnit = vcl::EnglishStringToMetric(sIdent); xMenu->set_active(sIdent, eMenuUnit == eUnit); if( bReduceMetric ) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index abb05fc5a209..8e86ca7ee858 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -96,9 +96,9 @@ struct FmGridHeaderData Reference< XInterface > xDroppedResultSet; }; -static void InsertMenuItem(weld::Menu& rMenu, int nMenuPos, std::string_view id, const OUString& rText, const OUString& rImgId) +static void InsertMenuItem(weld::Menu& rMenu, int nMenuPos, const OUString& id, const OUString& rText, const OUString& rImgId) { - rMenu.insert(nMenuPos, OUString::fromUtf8(id), rText, &rImgId, nullptr, nullptr, TRISTATE_INDET); + rMenu.insert(nMenuPos, id, rText, &rImgId, nullptr, nullptr, TRISTATE_INDET); } FmGridHeader::FmGridHeader( BrowseBox* pParent, WinBits nWinBits) @@ -407,7 +407,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) Reference< XPropertySet > xCol, xSecondCol; // Create Column based on type, default textfield - std::vector<OString> aPossibleTypes; + std::vector<OUString> aPossibleTypes; std::vector<OUString> aImgResId; std::vector<TranslateId> aStrResId; @@ -503,14 +503,14 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) bool bDateNTimeCol = false; if (!aPossibleTypes.empty()) { - OString sPreferredType = aPossibleTypes[0]; + OUString sPreferredType = aPossibleTypes[0]; if ((m_pImpl->nDropAction == DND_ACTION_LINK) && (aPossibleTypes.size() > 1)) { std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, "svx/ui/colsmenu.ui")); std::unique_ptr<weld::Menu> xTypeMenu(xBuilder->weld_menu("insertmenu")); int nMenuPos = 0; - std::vector<OString>::const_iterator iter; + std::vector<OUString>::const_iterator iter; std::vector<TranslateId>::const_iterator striter; std::vector<OUString>::const_iterator imgiter; for (iter = aPossibleTypes.begin(), imgiter = aImgResId.begin(), striter = aStrResId.begin(); @@ -521,7 +521,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) ::tools::Rectangle aRect(m_pImpl->aDropPosPixel, Size(1,1)); weld::Window* pParent = weld::GetPopupParent(*this, aRect); - OString sResult = xTypeMenu->popup_at_rect(pParent, aRect); + OUString sResult = xTypeMenu->popup_at_rect(pParent, aRect); if (!sResult.isEmpty()) sPreferredType = sResult; } @@ -534,7 +534,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) if (bDateNTimeCol) sPreferredType = nColCount ? FM_COL_DATEFIELD : FM_COL_TIMEFIELD; - sFieldService = OUString::fromUtf8(sPreferredType); + sFieldService = sPreferredType; Reference< XPropertySet > xThisRoundCol; if ( !sFieldService.isEmpty() ) xThisRoundCol = xFactory->createColumn(sFieldService); @@ -815,7 +815,7 @@ enum InspectorAction { eOpenInspector, eCloseInspector, eUpdateInspector, eNone } -void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult) +void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult) { Reference< css::container::XIndexContainer > xCols(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns()); sal_uInt16 nPos = GetModelColumnPos(nColId); @@ -1030,7 +1030,7 @@ void FmGridHeader::triggerColumnContextMenu( const ::Point& _rPreferredPos ) // execute the menu ::tools::Rectangle aRect(_rPreferredPos, Size(1,1)); weld::Window* pParent = weld::GetPopupParent(*this, aRect); - OString sResult = xContextMenu->popup_at_rect(pParent, aRect); + OUString sResult = xContextMenu->popup_at_rect(pParent, aRect); // let derivatives handle the result PostExecuteColumnContextMenu(nColId, *xContextMenu, sResult); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index f78f6bb2100f..5fe9c608bbbd 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1836,7 +1836,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) INetURLObject aHID( sHelpURL ); if ( aHID.GetProtocol() == INetProtocol::Hid ) sHelpURL = aHID.GetURLPath(); - pGrid->SetHelpId( OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + pGrid->SetHelpId( sHelpURL ); } else if ( PropertyName == FM_PROP_DISPLAYSYNCHRON ) { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 3488e211f266..fce266d26a6c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2424,7 +2424,7 @@ void DbGridControl::PreExecuteRowContextMenu(weld::Menu& rMenu) rMenu.set_visible("undo", bCanUndo); } -void DbGridControl::PostExecuteRowContextMenu(const OString& rExecutionResult) +void DbGridControl::PostExecuteRowContextMenu(const OUString& rExecutionResult) { if (rExecutionResult == "delete") { diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 635e55cdf2ab..cfacfa948fbe 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -173,7 +173,7 @@ namespace svxform for (const auto& rRemove : m_aRemovedMenuEntries) m_xMenu->remove(rRemove); EnableMenuItems(); - OString sCommand = m_xMenu->popup_at_rect(m_xItemList.get(), tools::Rectangle(aPos, Size(1,1))); + OUString sCommand = m_xMenu->popup_at_rect(m_xItemList.get(), tools::Rectangle(aPos, Size(1,1))); if (!sCommand.isEmpty()) DoMenuAction(sCommand); m_xMenu.reset(); @@ -248,7 +248,7 @@ namespace svxform m_pParent->move(m_xContainer.get(), nullptr); } - IMPL_LINK(XFormsPage, TbxSelectHdl, const OString&, rIdent, void) + IMPL_LINK(XFormsPage, TbxSelectHdl, const OUString&, rIdent, void) { DoToolBoxAction(rIdent); } @@ -387,13 +387,13 @@ namespace svxform } } - bool XFormsPage::DoToolBoxAction(std::string_view rToolBoxID) + bool XFormsPage::DoToolBoxAction(std::u16string_view rToolBoxID) { bool bHandled = false; bool bIsDocModified = false; m_pNaviWin->DisableNotify( true ); - if (rToolBoxID == "additem" || rToolBoxID == "addelement" || rToolBoxID == "addattribute") + if (rToolBoxID == u"additem" || rToolBoxID == u"addelement" || rToolBoxID == u"addattribute") { bHandled = true; Reference< css::xforms::XModel > xModel( m_xUIHelper, UNO_QUERY ); @@ -444,7 +444,7 @@ namespace svxform DBG_ASSERT( pParentNode, "XFormsPage::DoToolBoxAction(): no parent node" ); xParentNode = pParentNode->m_xNode; Reference< css::xml::dom::XNode > xNewNode; - if (rToolBoxID == "addelement") + if (rToolBoxID == u"addelement") { try { @@ -486,7 +486,7 @@ namespace svxform if ( xNewNode.is() ) xPNode = xNewNode->getParentNode(); // attributes don't have parents in the DOM model - DBG_ASSERT( rToolBoxID == "addattribute" + DBG_ASSERT( rToolBoxID == u"addattribute" || xPNode.is(), "XFormsPage::DoToolboxAction(): node not added" ); } catch ( Exception const & ) @@ -574,7 +574,7 @@ namespace svxform } } } - else if (rToolBoxID == "edit") + else if (rToolBoxID == u"edit") { bHandled = true; @@ -670,7 +670,7 @@ namespace svxform } } } - else if (rToolBoxID == "delete") + else if (rToolBoxID == u"delete") { bHandled = true; if ( DGTInstance == m_eGroup && !m_sInstanceURL.isEmpty() ) @@ -972,7 +972,7 @@ namespace svxform sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); if (nCode == KEY_DELETE) - bHandled = DoMenuAction("delete"); + bHandled = DoMenuAction(u"delete"); return bHandled; } @@ -1169,12 +1169,12 @@ namespace svxform return sRet; } - bool XFormsPage::DoMenuAction(std::string_view rMenuID) + bool XFormsPage::DoMenuAction(std::u16string_view rMenuID) { return DoToolBoxAction(rMenuID); } - void XFormsPage::SetMenuEntrySensitive(const OString& rIdent, bool bSensitive) + void XFormsPage::SetMenuEntrySensitive(const OUString& rIdent, bool bSensitive) { if (m_aRemovedMenuEntries.find(rIdent) != m_aRemovedMenuEntries.end()) return; @@ -1288,7 +1288,7 @@ namespace svxform { // handler m_xModelsBox->connect_changed( LINK( this, DataNavigatorWindow, ModelSelectListBoxHdl ) ); - Link<const OString&, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl ); + Link<const OUString&, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl ); m_xModelBtn->connect_selected(aLink1); m_xInstanceBtn->connect_selected(aLink1); Link<weld::Toggleable&,void> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl ); @@ -1299,11 +1299,11 @@ namespace svxform m_aUpdateTimer.SetInvokeHandler( LINK( this, DataNavigatorWindow, UpdateHdl ) ); // init tabcontrol - OString sPageId("instance"); + OUString sPageId("instance"); SvtViewOptions aViewOpt( EViewType::TabDialog, CFGNAME_DATANAVIGATOR ); if ( aViewOpt.Exists() ) { - OString sNewPageId = aViewOpt.GetPageID(); + OUString sNewPageId = aViewOpt.GetPageID(); if (m_xTabCtrl->get_page_index(sNewPageId) != -1) sPageId = sNewPageId; aViewOpt.GetUserItem(CFGNAME_SHOWDETAILS) >>= m_bShowDetails; @@ -1371,7 +1371,7 @@ namespace svxform } } - IMPL_LINK(DataNavigatorWindow, MenuSelectHdl, const OString&, rIdent, void) + IMPL_LINK(DataNavigatorWindow, MenuSelectHdl, const OUString&, rIdent, void) { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; @@ -1528,7 +1528,7 @@ namespace svxform AddInstanceDialog aDlg(GetFrameWeld(), false); if (aDlg.run() == RET_OK) { - OString sPageId = GetNewPageId(); // ModelSelectHdl will cause a page of this id to be created + OUString sPageId = GetNewPageId(); // ModelSelectHdl will cause a page of this id to be created OUString sName = aDlg.GetName(); if (sName.isEmpty()) @@ -1560,7 +1560,7 @@ namespace svxform } else if (rIdent == "instancesedit") { - OString sIdent = GetCurrentPage(); + OUString sIdent = GetCurrentPage(); XFormsPage* pPage = GetPage(sIdent); if ( pPage ) { @@ -1595,7 +1595,7 @@ namespace svxform } else if (rIdent == "instancesremove") { - OString sIdent = GetCurrentPage(); + OUString sIdent = GetCurrentPage(); XFormsPage* pPage = GetPage(sIdent); if (pPage) { @@ -1661,16 +1661,16 @@ namespace svxform SetDocModified(); } - bool DataNavigatorWindow::IsAdditionalPage(std::string_view rIdent) + bool DataNavigatorWindow::IsAdditionalPage(std::u16string_view rIdent) { - return o3tl::starts_with(rIdent, "additional"); + return o3tl::starts_with(rIdent, u"additional"); } IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, weld::Toggleable&, rBtn, void ) { if (m_xInstanceBtn.get() == &rBtn) { - OString sIdent(m_xTabCtrl->get_current_page_ident()); + OUString sIdent(m_xTabCtrl->get_current_page_ident()); bool bIsInstPage = (IsAdditionalPage(sIdent) || sIdent == "instance"); m_xInstanceBtn->set_item_sensitive( "instancesedit", bIsInstPage ); m_xInstanceBtn->set_item_sensitive( "instancesremove", @@ -1688,7 +1688,7 @@ namespace svxform } } - IMPL_LINK(DataNavigatorWindow, ActivatePageHdl, const OString&, rIdent, void) + IMPL_LINK(DataNavigatorWindow, ActivatePageHdl, const OUString&, rIdent, void) { XFormsPage* pPage = GetPage(rIdent); if (!pPage) @@ -1702,7 +1702,7 @@ namespace svxform ModelSelectHdl( nullptr ); } - XFormsPage* DataNavigatorWindow::GetPage(const OString& rCurId) + XFormsPage* DataNavigatorWindow::GetPage(const OUString& rCurId) { XFormsPage* pPage = nullptr; if (rCurId == "submissions") @@ -1739,7 +1739,7 @@ namespace svxform return pPage; } - OString DataNavigatorWindow::GetCurrentPage() const + OUString DataNavigatorWindow::GetCurrentPage() const { return m_xTabCtrl->get_current_page_ident(); } @@ -1798,7 +1798,7 @@ namespace svxform } } - void DataNavigatorWindow::SetPageModel(const OString& rIdent) + void DataNavigatorWindow::SetPageModel(const OUString& rIdent) { OUString sModel(m_xModelsBox->get_active_text()); try @@ -1913,7 +1913,7 @@ namespace svxform if (pProp != _xPropSeq.end()) pProp->Value >>= sInstName; - OString sPageId = GetNewPageId(); + OUString sPageId = GetNewPageId(); if ( sInstName.isEmpty() ) { SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" ); @@ -1927,15 +1927,15 @@ namespace svxform return m_xTabCtrl->get_page_ident(0) == "instance"; } - OString DataNavigatorWindow::GetNewPageId() const + OUString DataNavigatorWindow::GetNewPageId() const { int nMax = 0; int nCount = m_xTabCtrl->get_n_pages(); for (int i = 0; i < nCount; ++i) { - OString sIdent = m_xTabCtrl->get_page_ident(i); - OString sNumber; + OUString sIdent = m_xTabCtrl->get_page_ident(i); + OUString sNumber; if (!sIdent.startsWith("additional", &sNumber)) continue; int nPageId = sNumber.toInt32(); @@ -1943,7 +1943,7 @@ namespace svxform nMax = nPageId; } - return "additional" + OString::number(nMax + 1); + return "additional" + OUString::number(nMax + 1); } void DataNavigatorWindow::SetDocModified() diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 5ee5224494cd..7ac5dc4d7982 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1526,7 +1526,7 @@ IMPL_LINK(FmFilterNavigator, PopupMenuHdl, const CommandEvent&, rEvt, bool) xContextMenu->remove("isnotnull"); } - OString sIdent = xContextMenu->popup_at_rect(m_xTreeView.get(), tools::Rectangle(aWhere, ::Size(1, 1))); + OUString sIdent = xContextMenu->popup_at_rect(m_xTreeView.get(), tools::Rectangle(aWhere, ::Size(1, 1))); if (sIdent == "edit") { m_xTreeView->start_editing(*xClicked); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 11ffc6bf57c7..aa15fc1bce07 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -986,7 +986,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWhich ); else { - if (!GetImpl()->canConvertCurrentSelectionToControl_Lock("ConvertToFixed")) + if (!GetImpl()->canConvertCurrentSelectionToControl_Lock(u"ConvertToFixed")) // if it cannot be converted to a fixed text, it is no single control rSet.DisableItem( nWhich ); } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f2e9e4ec021b..607c7055472e 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -179,28 +179,28 @@ const sal_Int16 SelObjectSlotMap[] = // slots depending on the SelObject // the following arrays must be consistent, i.e., corresponding entries should // be at the same relative position within their respective arrays -static const char* aConvertSlots[] = -{ - "ConvertToEdit", - "ConvertToButton", - "ConvertToFixed", - "ConvertToList", - "ConvertToCheckBox", - "ConvertToRadio", - "ConvertToGroup", - "ConvertToCombo", - "ConvertToImageBtn", - "ConvertToFileControl", - "ConvertToDate", - "ConvertToTime", - "ConvertToNumeric", - "ConvertToCurrency", - "ConvertToPattern", - "ConvertToImageControl", - "ConvertToFormatted", - "ConvertToScrollBar", - "ConvertToSpinButton", - "ConvertToNavigationBar" +static std::u16string_view aConvertSlots[] = +{ + u"ConvertToEdit", + u"ConvertToButton", + u"ConvertToFixed", + u"ConvertToList", + u"ConvertToCheckBox", + u"ConvertToRadio", + u"ConvertToGroup", + u"ConvertToCombo", + u"ConvertToImageBtn", + u"ConvertToFileControl", + u"ConvertToDate", + u"ConvertToTime", + u"ConvertToNumeric", + u"ConvertToCurrency", + u"ConvertToPattern", + u"ConvertToImageControl", + u"ConvertToFormatted", + u"ConvertToScrollBar", + u"ConvertToSpinButton", + u"ConvertToNavigationBar" }; constexpr rtl::OUStringConstExpr aImgIds[] = @@ -1012,24 +1012,24 @@ void FmXFormShell::GetConversionMenu_Lock(weld::Menu& rNewMenu) for (size_t i = 0; i < SAL_N_ELEMENTS(aConvertSlots); ++i) { // the corresponding image at it - rNewMenu.append(OUString::createFromAscii(aConvertSlots[i]), SvxResId(RID_SVXSW_CONVERTMENU[i]), aImgIds[i]); + rNewMenu.append(OUString(aConvertSlots[i]), SvxResId(RID_SVXSW_CONVERTMENU[i]), aImgIds[i]); } } -OString FmXFormShell::SlotToIdent(sal_uInt16 nSlot) +OUString FmXFormShell::SlotToIdent(sal_uInt16 nSlot) { static_assert(SAL_N_ELEMENTS(SelObjectSlotMap) >= SAL_N_ELEMENTS(aConvertSlots)); for (size_t i = 0; i < SAL_N_ELEMENTS(aConvertSlots); ++i) { if (nSlot == SelObjectSlotMap[i]) - return aConvertSlots[i]; + return OUString(aConvertSlots[i]); } - return OString(); + return {}; } -bool FmXFormShell::isControlConversionSlot(std::string_view rIdent) +bool FmXFormShell::isControlConversionSlot(std::u16string_view rIdent) { for (const auto& rConvertSlot : aConvertSlots) if (rIdent == rConvertSlot) @@ -1037,7 +1037,7 @@ bool FmXFormShell::isControlConversionSlot(std::string_view rIdent) return false; } -void FmXFormShell::executeControlConversionSlot_Lock(std::string_view rIdent) +void FmXFormShell::executeControlConversionSlot_Lock(std::u16string_view rIdent) { OSL_PRECOND( canConvertCurrentSelectionToControl_Lock(rIdent), "FmXFormShell::executeControlConversionSlot: illegal call!" ); InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin(); @@ -1047,7 +1047,7 @@ void FmXFormShell::executeControlConversionSlot_Lock(std::string_view rIdent) executeControlConversionSlot_Lock(Reference<XFormComponent>(*aSelectedElement, UNO_QUERY), rIdent); } -bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormComponent>& _rxObject, std::string_view rIdent) +bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormComponent>& _rxObject, std::u16string_view rIdent) { if (impl_checkDisposed_Lock()) return false; @@ -1246,7 +1246,7 @@ bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormCompon return false; } -bool FmXFormShell::canConvertCurrentSelectionToControl_Lock(std::string_view rIdent) +bool FmXFormShell::canConvertCurrentSelectionToControl_Lock(std::u16string_view rIdent) { if ( m_aCurrentSelection.empty() ) return false; @@ -1288,7 +1288,7 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection_Lock(weld::Men for (int i = 0, nCount = rMenu.n_children(); i < nCount; ++i) { // the context is already of a type that corresponds to the entry -> disable - OString sIdent(aConvertSlots[i]); + OUString sIdent(aConvertSlots[i]); rMenu.set_sensitive(sIdent, canConvertCurrentSelectionToControl_Lock(sIdent)); } } diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 87744df0e5cf..cc1d511aa627 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -40,7 +40,7 @@ namespace svx AddTabPage("position", RID_SVXPAGE_CHAR_POSITION); } - void TextControlCharAttribDialog::PageCreated(const OString& rId, SfxTabPage& rPage) + void TextControlCharAttribDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 3cfbff3b920d..25b5e42ca879 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -407,15 +407,13 @@ namespace svx OUString lcl_getUnoSlotName( SfxSlotId _nSlotId ) { - OUString sSlotUnoName; - SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); - const char* pAsciiUnoName = nullptr; + OUString sUnoName; if ( pSlot ) { - pAsciiUnoName = pSlot->GetUnoName(); + sUnoName = pSlot->GetCommand(); } else { @@ -423,22 +421,18 @@ namespace svx // we nevertheless need to transport via UNO mechanisms, so we need a name switch ( _nSlotId ) { - case SID_ATTR_PARA_HANGPUNCTUATION: pAsciiUnoName = "AllowHangingPunctuation"; break; - case SID_ATTR_PARA_FORBIDDEN_RULES: pAsciiUnoName = "ApplyForbiddenCharacterRules"; break; - case SID_ATTR_PARA_SCRIPTSPACE: pAsciiUnoName = "UseScriptSpacing"; break; + case SID_ATTR_PARA_HANGPUNCTUATION: sUnoName = ".uno:AllowHangingPunctuation"; break; + case SID_ATTR_PARA_FORBIDDEN_RULES: sUnoName = ".uno:ApplyForbiddenCharacterRules"; break; + case SID_ATTR_PARA_SCRIPTSPACE: sUnoName = ".uno:UseScriptSpacing"; break; } } - if ( pAsciiUnoName ) - { - sSlotUnoName = ".uno:" + OUString::createFromAscii( pAsciiUnoName ); - } - else + if (sUnoName.isEmpty()) { SAL_WARN( "svx", "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name! " "(slot id: " << _nSlotId << ")"); } - return sSlotUnoName; + return sUnoName; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b42210122010..bf860ce7198d 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -452,7 +452,7 @@ namespace svxform xContextMenu->set_active("controlfocus", pFormModel->GetAutoControlFocus()); } - OString sIdent = xContextMenu->popup_at_rect(m_xTreeView.get(), tools::Rectangle(ptWhere, ::Size(1, 1))); + OUString sIdent = xContextMenu->popup_at_rect(m_xTreeView.get(), tools::Rectangle(ptWhere, ::Size(1, 1))); if (sIdent == "form") { OUString aStr(SvxResId(RID_STR_FORM)); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 85f0f8c69657..7054bf0f1aaa 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -129,7 +129,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa } } -void GalleryBrowser1::ImplGetExecuteVector(std::vector<OString>& o_aExec) +void GalleryBrowser1::ImplGetExecuteVector(std::vector<OUString>& o_aExec) { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); @@ -238,9 +238,9 @@ void GalleryBrowser1::EndThemePropertiesDlgHdl(sal_Int32 nResult) ImplEndGalleryThemeProperties(false, nResult); } -void GalleryBrowser1::ImplExecute(std::string_view rIdent) +void GalleryBrowser1::ImplExecute(std::u16string_view rIdent) { - if (rIdent == "update") + if (rIdent == u"update") { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); @@ -250,14 +250,14 @@ void GalleryBrowser1::ImplExecute(std::string_view rIdent) aActualizeProgress->Execute(); mpGallery->ReleaseTheme( pTheme, *this ); } - else if (rIdent == "delete") + else if (rIdent == u"delete") { std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(mxThemes.get(), "svx/ui/querydeletethemedialog.ui")); std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteThemeDialog")); if (xQuery->run() == RET_YES) mpGallery->RemoveTheme( mxThemes->get_selected_text() ); } - else if (rIdent == "rename") + else if (rIdent == u"rename") { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); const OUString aOldName( pTheme->GetName() ); @@ -284,7 +284,7 @@ void GalleryBrowser1::ImplExecute(std::string_view rIdent) } mpGallery->ReleaseTheme( pTheme, *this ); } - else if (rIdent == "assign") + else if (rIdent == u"assign") { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); @@ -299,7 +299,7 @@ void GalleryBrowser1::ImplExecute(std::string_view rIdent) mpGallery->ReleaseTheme( pTheme, *this ); } - else if (rIdent == "properties") + else if (rIdent == u"properties") { ImplGalleryThemeProperties( GetSelectedTheme(), false ); } @@ -373,9 +373,9 @@ IMPL_LINK(GalleryBrowser1, KeyInputHdl, const KeyEvent&, rKEvt, bool) { bool bRet = false; - std::vector<OString> aExecVector; + std::vector<OUString> aExecVector; ImplGetExecuteVector(aExecVector); - OString sExecuteIdent; + OUString sExecuteIdent; bool bMod1 = rKEvt.GetKeyCode().IsMod1(); switch( rKEvt.GetKeyCode().GetCode() ) @@ -438,7 +438,7 @@ IMPL_LINK(GalleryBrowser1, PopupMenuHdl, const CommandEvent&, rCEvt, bool) if (rCEvt.GetCommand() != CommandEventId::ContextMenu) return false; - std::vector<OString> aExecVector; + std::vector<OUString> aExecVector; ImplGetExecuteVector(aExecVector); if (aExecVector.empty()) @@ -453,7 +453,7 @@ IMPL_LINK(GalleryBrowser1, PopupMenuHdl, const CommandEvent&, rCEvt, bool) xMenu->set_visible("assign", std::find( aExecVector.begin(), aExecVector.end(), "assign" ) != aExecVector.end()); xMenu->set_visible("properties", std::find( aExecVector.begin(), aExecVector.end(), "properties" ) != aExecVector.end()); - OString sCommand(xMenu->popup_at_rect(mxThemes.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); + OUString sCommand(xMenu->popup_at_rect(mxThemes.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); ImplExecute(sCommand); return true; diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 22381b9b8848..ffe05c942b49 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -59,8 +59,8 @@ private: void ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); static void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ); - void ImplGetExecuteVector(std::vector<OString>& o_aExec); - void ImplExecute(std::string_view rIdent); + void ImplGetExecuteVector(std::vector<OUString>& o_aExec); + void ImplExecute(std::u16string_view rIdent); void ImplGalleryThemeProperties( std::u16string_view rThemeName, bool bCreateNew ); void EndNewThemePropertiesDlgHdl(sal_Int32 nResult); void EndThemePropertiesDlgHdl(sal_Int32 nResult); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index f2732757d161..52c05515237d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -113,7 +113,7 @@ private: static void Execute( const CommandInfo &rCmdInfo, const css::uno::Sequence< css::beans::PropertyValue > &rArguments ); - void MenuSelectHdl(std::string_view rIdent); + void MenuSelectHdl(std::u16string_view rIdent); void BackgroundMenuSelectHdl(sal_uInt16 nId); public: GalleryThemePopup(weld::Widget* pParent, @@ -287,7 +287,7 @@ void GalleryThemePopup::ExecutePopup(weld::Widget* pParent, const ::Point &rPos) MenuSelectHdl(mxPopupMenu->popup_at_rect(pParent, tools::Rectangle(rPos, Size(1,1)))); } -void GalleryThemePopup::MenuSelectHdl(std::string_view rIdent) +void GalleryThemePopup::MenuSelectHdl(std::u16string_view rIdent) { if (rIdent.empty()) return; @@ -299,7 +299,7 @@ void GalleryThemePopup::MenuSelectHdl(std::string_view rIdent) return; } - if (rIdent == "add") + if (rIdent == u"add") { const CommandInfoMap::const_iterator it = m_aCommandInfo.find( SID_GALLERY_FORMATS ); if (it != m_aCommandInfo.end()) @@ -526,7 +526,7 @@ bool GalleryBrowser2::KeyInput(const KeyEvent& rKEvt) if (!ViewBoxHasFocus() && nItemId && mpCurTheme) { - OString sExecuteIdent; + OUString sExecuteIdent; INetURLObject aURL; mpCurTheme->GetURL( nItemId - 1, aURL ); @@ -1086,7 +1086,7 @@ void GalleryBrowser2::DispatchAdd( pInfo.release(); } -void GalleryBrowser2::Execute(std::string_view rIdent) +void GalleryBrowser2::Execute(std::u16string_view rIdent) { Point aSelPos; const sal_uInt32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos ); @@ -1096,9 +1096,9 @@ void GalleryBrowser2::Execute(std::string_view rIdent) mnCurActionPos = nItemId - 1; - if (rIdent == "preview") + if (rIdent == u"preview") SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode ); - else if (rIdent == "delete") + else if (rIdent == u"delete") { if (!mpCurTheme->IsReadOnly()) { @@ -1110,7 +1110,7 @@ void GalleryBrowser2::Execute(std::string_view rIdent) } } } - else if (rIdent == "title") + else if (rIdent == u"title") { std::unique_ptr<SgaObject> pObj = mpCurTheme->AcquireObject( mnCurActionPos ); @@ -1135,11 +1135,11 @@ void GalleryBrowser2::Execute(std::string_view rIdent) } } } - else if (rIdent == "copy") + else if (rIdent == u"copy") { mpCurTheme->CopyToClipboard(*GetViewWindow(), mnCurActionPos); } - else if (rIdent == "paste") + else if (rIdent == u"paste") { if( !mpCurTheme->IsReadOnly() ) { diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index fe26bd27b407..2b5f58086569 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -189,7 +189,7 @@ namespace svxform std::unique_ptr<weld::TreeView> m_xItemList; std::unique_ptr<weld::TreeIter> m_xScratchIter; - o3tl::sorted_vector<OString> m_aRemovedMenuEntries; + o3tl::sorted_vector<OUString> m_aRemovedMenuEntries; DataTreeDropTarget m_aDropHelper; @@ -207,14 +207,14 @@ namespace svxform OUString m_sInstanceURL; bool m_bLinkOnce; - DECL_LINK(TbxSelectHdl, const OString&, void); + DECL_LINK(TbxSelectHdl, const OUString&, void); DECL_LINK(ItemSelectHdl, weld::TreeView&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(PopupMenuHdl, const CommandEvent&, bool); void AddChildren(const weld::TreeIter* _pParent, const css::uno::Reference< css::xml::dom::XNode >& _xNode); - bool DoToolBoxAction(std::string_view rToolBoxID); + bool DoToolBoxAction(std::u16string_view rToolBoxID); void AddEntry(std::unique_ptr<ItemNode> _pNewNode, bool _bIsElement, weld::TreeIter* pRet = nullptr); void AddEntry(const css::uno::Reference< css::beans::XPropertySet >& _rPropSet, weld::TreeIter* pRet = nullptr); void EditEntry( const css::uno::Reference< css::beans::XPropertySet >& _rPropSet ); @@ -224,7 +224,7 @@ namespace svxform void DeleteAndClearTree(); - void SetMenuEntrySensitive(const OString& rIdent, bool bSensitive); + void SetMenuEntrySensitive(const OUString& rIdent, bool bSensitive); public: XFormsPage(weld::Container* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup); @@ -235,7 +235,7 @@ namespace svxform void ClearModel(); OUString LoadInstance(const css::uno::Sequence< css::beans::PropertyValue >& _xPropSeq); - bool DoMenuAction(std::string_view rMenuID); + bool DoMenuAction(std::u16string_view rMenuID); void EnableMenuItems(); void SelectFirstEntry(); @@ -287,22 +287,22 @@ namespace svxform m_xFrameModel; DECL_LINK( ModelSelectListBoxHdl, weld::ComboBox&, void ); - DECL_LINK( MenuSelectHdl, const OString&, void ); + DECL_LINK( MenuSelectHdl, const OUString&, void ); DECL_LINK( MenuActivateHdl, weld::Toggleable&, void ); - DECL_LINK( ActivatePageHdl, const OString&, void); + DECL_LINK( ActivatePageHdl, const OUString&, void); DECL_LINK( UpdateHdl, Timer *, void); void ModelSelectHdl(const weld::ComboBox*); - OString GetCurrentPage() const; - XFormsPage* GetPage(const OString& rCurId); + OUString GetCurrentPage() const; + XFormsPage* GetPage(const OUString& rCurId); void LoadModels(); - void SetPageModel(const OString& rCurId); + void SetPageModel(const OUString& rCurId); void ClearAllPageModels( bool bClearPages ); void InitPages(); void CreateInstancePage( const css::uno::Sequence< css::beans::PropertyValue >& _xPropSeq ); bool HasFirstInstancePage() const; - OString GetNewPageId() const; + OUString GetNewPageId() const; - static bool IsAdditionalPage(std::string_view rIdent); + static bool IsAdditionalPage(std::u16string_view rIdent); public: DataNavigatorWindow(vcl::Window* pParent, weld::Builder& rBuilder, SfxBindings const * pBindings); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 90952243ca5d..7720e5f019a3 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -414,17 +414,17 @@ public: SAL_DLLPRIVATE static void GetConversionMenu_Lock(weld::Menu& rMenu); /// checks whether a given control conversion slot can be applied to the current selection - SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl_Lock(std::string_view rIdent); + SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl_Lock(std::u16string_view rIdent); /// enables or disables all conversion slots in a menu, according to the current selection SAL_DLLPRIVATE void checkControlConversionSlotsForCurrentSelection_Lock(weld::Menu& rMenu); /// executes a control conversion slot for a given object - SAL_DLLPRIVATE bool executeControlConversionSlot_Lock(const css::uno::Reference< css::form::XFormComponent >& _rxObject, std::string_view rIdent); + SAL_DLLPRIVATE bool executeControlConversionSlot_Lock(const css::uno::Reference< css::form::XFormComponent >& _rxObject, std::u16string_view rIdent); /** executes a control conversion slot for the current selection @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/> */ - SAL_DLLPRIVATE void executeControlConversionSlot_Lock(std::string_view rIdent); + SAL_DLLPRIVATE void executeControlConversionSlot_Lock(std::u16string_view rIdent); /// checks whether the given slot id denotes a control conversion slot - SAL_DLLPRIVATE static bool isControlConversionSlot(std::string_view rIdent); + SAL_DLLPRIVATE static bool isControlConversionSlot(std::u16string_view rIdent); SAL_DLLPRIVATE void ExecuteTextAttribute_Lock(SfxRequest& _rReq); SAL_DLLPRIVATE void GetTextAttributeState_Lock(SfxItemSet& _rSet); @@ -519,7 +519,7 @@ public: */ SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState ) const; - SAL_DLLPRIVATE static OString SlotToIdent(sal_uInt16 nSlot); + SAL_DLLPRIVATE static OUString SlotToIdent(sal_uInt16 nSlot); private: DECL_DLLPRIVATE_LINK( OnLoadForms_Lock, void*, void ); diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 056aeff51349..c525f1fd0012 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -35,7 +35,7 @@ namespace svx TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, SvxFontListItem aFontList); private: - virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override; }; class TextControlParaAttribDialog final : public SfxTabDialogController diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 1633561a5b8d..70b2620565bf 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -78,7 +78,7 @@ void SvxClipBoardControl::CreatePopupWindow() ::tools::Rectangle aRect(rBox.GetItemRect(nId)); weld::Window* pParent = weld::GetPopupParent(rBox, aRect); - OString sResult = xPopup->popup_at_rect(pParent, aRect); + OUString sResult = xPopup->popup_at_rect(pParent, aRect); rBox.SetItemDown( nId, false ); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 33c5382d805b..fcb6dad3e2ea 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -37,7 +37,7 @@ using namespace css; using namespace css::uno; -constexpr OStringLiteral SIDEBARGRADIENT = "sidebargradient"; +constexpr OUStringLiteral SIDEBARGRADIENT = u"sidebargradient"; namespace svx::sidebar { @@ -180,7 +180,7 @@ void AreaPropertyPanelBase::Initialize() mxBmpImport->connect_clicked( LINK(this, AreaPropertyPanelBase, ClickImportBitmapHdl)); } -IMPL_LINK_NOARG(AreaPropertyPanelBase, ToolbarHdl_Impl, const OString&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ToolbarHdl_Impl, const OUString&, void) { mxBTNGradient->set_menu_item_active(SIDEBARGRADIENT, !mxBTNGradient->get_menu_item_active(SIDEBARGRADIENT)); } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 4cbfa7b3581e..8e1f50ba65a0 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -150,7 +150,7 @@ IMPL_LINK_NOARG(AreaTransparencyGradientPopup, ModifiedTrgrHdl_Impl, weld::Metri ExecuteValueModify( nStartCol, nEndCol ); } -IMPL_LINK_NOARG(AreaTransparencyGradientPopup, Left_Click45_Impl, const OString&, void) +IMPL_LINK_NOARG(AreaTransparencyGradientPopup, Left_Click45_Impl, const OUString&, void) { sal_uInt8 nStartCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(mxMtrTrgrStartValue->get_value(FieldUnit::PERCENT)) * 255) / 100); sal_uInt8 nEndCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(mxMtrTrgrEndValue->get_value(FieldUnit::PERCENT)) * 255) / 100); @@ -162,7 +162,7 @@ IMPL_LINK_NOARG(AreaTransparencyGradientPopup, Left_Click45_Impl, const OString& ExecuteValueModify(nStartCol, nEndCol); } -IMPL_LINK_NOARG(AreaTransparencyGradientPopup, Right_Click45_Impl, const OString&, void) +IMPL_LINK_NOARG(AreaTransparencyGradientPopup, Right_Click45_Impl, const OUString&, void) { sal_uInt8 nStartCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(mxMtrTrgrStartValue->get_value(FieldUnit::PERCENT)) * 255) / 100); sal_uInt8 nEndCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(mxMtrTrgrEndValue->get_value(FieldUnit::PERCENT)) * 255) / 100); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 4edf0d5c5ef9..49f970e1a2ec 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -31,7 +31,7 @@ using namespace css; using namespace css::uno; -constexpr OStringLiteral SELECTWIDTH = "SelectWidth"; +constexpr OUStringLiteral SELECTWIDTH = u"SelectWidth"; namespace svx::sidebar { @@ -377,7 +377,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeCapStyleHdl, weld::ComboBox&, void) setLineCap(pItem.get()); } -IMPL_LINK_NOARG(LinePropertyPanelBase, ToolboxWidthSelectHdl, const OString&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ToolboxWidthSelectHdl, const OUString&, void) { mxTBWidth->set_menu_item_active(SELECTWIDTH, !mxTBWidth->get_menu_item_active(SELECTWIDTH)); } diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx index b23c612ffe83..4027e16ec730 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx @@ -132,7 +132,7 @@ IMPL_LINK_NOARG( MediaPlaybackPanel, TimeoutHdl, Timer*, void) mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX); } -IMPL_LINK( MediaPlaybackPanel, PlayToolBoxSelectHdl, const OString&, rId, void) +IMPL_LINK( MediaPlaybackPanel, PlayToolBoxSelectHdl, const OUString&, rId, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx index 95f3d6eaa6d4..b85f387920e9 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx @@ -67,7 +67,7 @@ private: const sal_uInt16 /*nSId*/, boost::property_tree::ptree& /*rState*/) override {}; - DECL_LINK(PlayToolBoxSelectHdl, const OString&, void); + DECL_LINK(PlayToolBoxSelectHdl, const OUString&, void); DECL_LINK(VolumeSlideHdl, weld::Scale&, void); DECL_LINK(SeekHdl, weld::Scale&, void); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index d8e4278406ce..c6476185a6ee 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -39,7 +39,7 @@ void SvxLineSpacingToolBoxControl::initialize(const css::uno::Sequence<css::uno: if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; @@ -53,8 +53,8 @@ void SAL_CALL SvxLineSpacingToolBoxControl::execute(sal_Int16 /*KeyModifier*/) if (m_pToolbar) { // Toggle the popup also when toolbutton is activated - const OString aId(m_aCommandURL.toUtf8()); - m_pToolbar->set_menu_item_active(aId, !m_pToolbar->get_menu_item_active(aId)); + m_pToolbar->set_menu_item_active(m_aCommandURL, + !m_pToolbar->get_menu_item_active(m_aCommandURL)); } else { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 6721b11ba0a9..c89d1b0b95a6 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -795,7 +795,7 @@ void PosSizePropertyPanel::GetControlState(const sal_uInt16 nSID, boost::propert { OUString sValue = Application::GetSettings().GetNeutralLocaleDataWrapper(). getNum(pControl->get_value(pControl->get_unit()), pControl->get_digits(), false, false); - rState.put(pControl->get_buildable_name().getStr(), sValue.toUtf8().getStr()); + rState.put(pControl->get_buildable_name().toUtf8().getStr(), sValue.toUtf8().getStr()); } } diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index a8eef9000c02..62a1a6e36962 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -35,7 +35,7 @@ void TextCharacterSpacingPopup::initialize(const css::uno::Sequence<css::uno::An if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 75529f297baf..befa2b80dcc3 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -37,7 +37,7 @@ void TextUnderlinePopup::initialize(const css::uno::Sequence<css::uno::Any>& rAr if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 76105b844028..6de95543914f 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -101,41 +101,41 @@ class FunctionPopup_Impl std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Menu> m_xMenu; sal_uInt32 m_nSelected; - static sal_uInt16 id_to_function(std::string_view rIdent); - static OString function_to_id(sal_uInt16 nFunc); + static sal_uInt16 id_to_function(std::u16string_view rIdent); + static OUString function_to_id(sal_uInt16 nFunc); public: explicit FunctionPopup_Impl(sal_uInt32 nCheckEncoded); - OString Execute(weld::Window* pParent, const tools::Rectangle& rRect) + OUString Execute(weld::Window* pParent, const tools::Rectangle& rRect) { return m_xMenu->popup_at_rect(pParent, rRect); } - sal_uInt32 GetSelected(std::string_view curident) const; + sal_uInt32 GetSelected(std::u16string_view curident) const; }; } -sal_uInt16 FunctionPopup_Impl::id_to_function(std::string_view rIdent) +sal_uInt16 FunctionPopup_Impl::id_to_function(std::u16string_view rIdent) { - if (rIdent == "avg") + if (rIdent == u"avg") return PSZ_FUNC_AVG; - else if (rIdent == "counta") + else if (rIdent == u"counta") return PSZ_FUNC_COUNT2; - else if (rIdent == "count") + else if (rIdent == u"count") return PSZ_FUNC_COUNT; - else if (rIdent == "max") + else if (rIdent == u"max") return PSZ_FUNC_MAX; - else if (rIdent == "min") + else if (rIdent == u"min") return PSZ_FUNC_MIN; - else if (rIdent == "sum") + else if (rIdent == u"sum") return PSZ_FUNC_SUM; - else if (rIdent == "selection") + else if (rIdent == u"selection") return PSZ_FUNC_SELECTION_COUNT; - else if (rIdent == "none") + else if (rIdent == u"none") return PSZ_FUNC_NONE; return 0; } -OString FunctionPopup_Impl::function_to_id(sal_uInt16 nFunc) +OUString FunctionPopup_Impl::function_to_id(sal_uInt16 nFunc) { switch (nFunc) { @@ -156,7 +156,7 @@ OString FunctionPopup_Impl::function_to_id(sal_uInt16 nFunc) case PSZ_FUNC_NONE: return "none"; } - return OString(); + return {}; } FunctionPopup_Impl::FunctionPopup_Impl(sal_uInt32 nCheckEncoded) @@ -169,7 +169,7 @@ FunctionPopup_Impl::FunctionPopup_Impl(sal_uInt32 nCheckEncoded) m_xMenu->set_active(function_to_id(nCheck), true); } -sal_uInt32 FunctionPopup_Impl::GetSelected(std::string_view curident) const +sal_uInt32 FunctionPopup_Impl::GetSelected(std::u16string_view curident) const { sal_uInt32 nSelected = m_nSelected; sal_uInt16 nCurItemId = id_to_function(curident); @@ -401,7 +401,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1,1)); weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect); FunctionPopup_Impl aMenu(nSelect); - OString sIdent = aMenu.Execute(pParent, aRect); + OUString sIdent = aMenu.Execute(pParent, aRect); if (!sIdent.isEmpty()) { nSelect = aMenu.GetSelected(sIdent); diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 8c32f3ed842a..9287bd51aa44 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -50,36 +50,36 @@ class SelectionTypePopup weld::Window* m_pPopupParent; std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Menu> m_xMenu; - static OString state_to_id(sal_uInt16 nState); + static OUString state_to_id(sal_uInt16 nState); public: SelectionTypePopup(weld::Window* pPopupParent, sal_uInt16 nCurrent); OUString GetItemTextForState(sal_uInt16 nState) { return m_xMenu->get_label(state_to_id(nState)); } - OString popup_at_rect(const tools::Rectangle& rRect) + OUString popup_at_rect(const tools::Rectangle& rRect) { return m_xMenu->popup_at_rect(m_pPopupParent, rRect); } - void HideSelectionType(const OString& rIdent) + void HideSelectionType(const OUString& rIdent) { m_xMenu->remove(rIdent); } - static sal_uInt16 id_to_state(std::string_view ident); + static sal_uInt16 id_to_state(std::u16string_view ident); }; } -sal_uInt16 SelectionTypePopup::id_to_state(std::string_view ident) +sal_uInt16 SelectionTypePopup::id_to_state(std::u16string_view ident) { - if (ident == "block") + if (ident == u"block") return 3; - else if (ident == "adding") + else if (ident == u"adding") return 2; - else if (ident == "extending") + else if (ident == u"extending") return 1; else // fall through return 0; } -OString SelectionTypePopup::state_to_id(sal_uInt16 nState) +OUString SelectionTypePopup::state_to_id(sal_uInt16 nState) { switch (nState) { @@ -149,7 +149,7 @@ bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) aPop.HideSelectionType("block"); } - OString sIdent = aPop.popup_at_rect(aRect); + OUString sIdent = aPop.popup_at_rect(aRect); if (!sIdent.isEmpty()) { sal_uInt16 nNewState = SelectionTypePopup::id_to_state(sIdent); diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 57cf99bbde7c..001ba0ec1e3b 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -49,9 +49,9 @@ class ZoomPopup_Impl public: ZoomPopup_Impl(weld::Window* pPopupParent, sal_uInt16 nZ, SvxZoomEnableFlags nValueSet); - sal_uInt16 GetZoom(std::string_view ident) const; + sal_uInt16 GetZoom(std::u16string_view ident) const; - OString popup_at_rect(const tools::Rectangle& rRect) + OUString popup_at_rect(const tools::Rectangle& rRect) { return m_xMenu->popup_at_rect(m_pPopupParent, rRect); } @@ -87,21 +87,21 @@ ZoomPopup_Impl::ZoomPopup_Impl(weld::Window* pPopupParent, sal_uInt16 nZ, SvxZoo m_xMenu->set_sensitive("width", false); } -sal_uInt16 ZoomPopup_Impl::GetZoom(std::string_view ident) const +sal_uInt16 ZoomPopup_Impl::GetZoom(std::u16string_view ident) const { sal_uInt16 nRet = nZoom; - if (ident == "200") + if (ident == u"200") nRet = 200; - else if (ident == "150") + else if (ident == u"150") nRet = 150; - else if (ident == "100") + else if (ident == u"100") nRet = 100; - else if (ident == "75") + else if (ident == u"75") nRet = 75; - else if (ident == "50") + else if (ident == u"50") nRet = 50; - else if (ident == "optimal" || ident == "width" || ident == "page") + else if (ident == u"optimal" || ident == u"width" || ident == u"page") nRet = 0; return nRet; @@ -166,7 +166,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt ) weld::Window* pPopupParent = weld::GetPopupParent(GetStatusBar(), aRect); ZoomPopup_Impl aPop(pPopupParent, nZoom, nValueSet); - OString sIdent = aPop.popup_at_rect(aRect); + OUString sIdent = aPop.popup_at_rect(aRect); if (!sIdent.isEmpty() && (nZoom != aPop.GetZoom(sIdent) || !nZoom)) { nZoom = aPop.GetZoom(sIdent); diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index 8f5dfea0b2c8..ff2f959d3406 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -130,8 +130,8 @@ bool StylesPreviewWindow_Base::Command(const CommandEvent& rEvent) std::unique_ptr<weld::Builder> xBuilder( Application::CreateBuilder(m_xStylesView.get(), "svx/ui/stylemenu.ui")); std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); - OString rIdent = xMenu->popup_at_rect(m_xStylesView.get(), - tools::Rectangle(rEvent.GetMousePosPixel(), Size(1, 1))); + OUString rIdent = xMenu->popup_at_rect(m_xStylesView.get(), + tools::Rectangle(rEvent.GetMousePosPixel(), Size(1, 1))); if (rIdent == "update" || rIdent == "edit") { css::uno::Sequence<css::beans::PropertyValue> aArgs(0); diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index 5cda71a8cfa7..bbbfa7363452 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -101,11 +101,11 @@ void SvxPresetListBox::FillPresetListBox(XPatternList& pList, sal_uInt32 nStartI FillPresetListBoxImpl<XPatternList, XBitmapEntry>(pList, nStartIndex); } -void SvxPresetListBox::OnMenuItemSelected(std::string_view rIdent) +void SvxPresetListBox::OnMenuItemSelected(std::u16string_view rIdent) { - if (rIdent == "rename") + if (rIdent == u"rename") maRenameHdl.Call(this); - else if (rIdent == "delete") + else if (rIdent == u"delete") maDeleteHdl.Call(this); } diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 1a8636380921..e1a55a112346 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -199,7 +199,7 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); return; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index b08698c03921..8011aa0c07bf 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -433,7 +433,7 @@ void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< cs if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; @@ -753,7 +753,7 @@ void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Seque if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 6c723b36dbf9..56669429c727 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -210,7 +210,7 @@ ImplGrafControl::ImplGrafControl( SetBackground( Wallpaper() ); // transparent background - mxField->set_help_id(OUStringToOString(rCmd, RTL_TEXTENCODING_UTF8)); + mxField->set_help_id(rCmd); mxField->get_widget().connect_key_press(LINK(this, ImplGrafControl, KeyInputHdl)); mxField->connect_value_changed(LINK(this, ImplGrafControl, ValueChangedHdl)); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 8f628876f2c4..24b89e8ed648 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -245,7 +245,7 @@ void SvxUndoRedoControl::initialize( const css::uno::Sequence< css::uno::Any >& if (pToolBox) pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWN | pToolBox->GetItemBits(nId)); if (m_pToolbar) - aDefaultTooltip = m_pToolbar->get_item_tooltip_text(m_aCommandURL.toUtf8()); + aDefaultTooltip = m_pToolbar->get_item_tooltip_text(m_aCommandURL); else aDefaultTooltip = pToolBox->GetQuickHelpText(nId); } @@ -281,7 +281,7 @@ void SAL_CALL SvxUndoRedoControl::statusChanged(const css::frame::FeatureStateEv if (!rEvent.IsEnabled) { if (m_pToolbar) - m_pToolbar->set_item_tooltip_text(m_aCommandURL.toUtf8(), aDefaultTooltip); + m_pToolbar->set_item_tooltip_text(m_aCommandURL, aDefaultTooltip); else pToolBox->SetQuickHelpText(nId, aDefaultTooltip); return; @@ -291,7 +291,7 @@ void SAL_CALL SvxUndoRedoControl::statusChanged(const css::frame::FeatureStateEv if (rEvent.State >>= aQuickHelpText) { if (m_pToolbar) - m_pToolbar->set_item_tooltip_text(m_aCommandURL.toUtf8(), aQuickHelpText); + m_pToolbar->set_item_tooltip_text(m_aCommandURL, aQuickHelpText); else pToolBox->SetQuickHelpText(nId, aQuickHelpText); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 9fcaeb22b919..3be0d011c6ce 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -76,12 +76,10 @@ void SAL_CALL SvxLineStyleToolBoxControl::statusChanged( const frame::FeatureSta if (!getToolboxId(nId, &pToolBox) && !m_pToolbar) return; - OString sId(m_aCommandURL.toUtf8()); - if ( rEvent.FeatureURL.Complete == m_aCommandURL ) { if (m_pToolbar) - m_pToolbar->set_item_sensitive(sId, rEvent.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); else pToolBox->EnableItem( nId, rEvent.IsEnabled ); } @@ -109,7 +107,7 @@ void SAL_CALL SvxLineStyleToolBoxControl::statusChanged( const frame::FeatureSta if (m_pToolbar) { Graphic aGraf(aEmpty); - m_pToolbar->set_item_image(sId, aGraf.GetXGraphic()); + m_pToolbar->set_item_image(m_aCommandURL, aGraf.GetXGraphic()); } else pToolBox->SetItemImage(nId, Image(aEmpty)); @@ -120,7 +118,7 @@ void SAL_CALL SvxLineStyleToolBoxControl::statusChanged( const frame::FeatureSta if (m_pToolbar) { Graphic aGraf(xList->GetBitmapForUISolidLine()); - m_pToolbar->set_item_image(sId, aGraf.GetXGraphic()); + m_pToolbar->set_item_image(m_aCommandURL, aGraf.GetXGraphic()); } else pToolBox->SetItemImage(nId, Image(xList->GetBitmapForUISolidLine())); @@ -129,7 +127,7 @@ void SAL_CALL SvxLineStyleToolBoxControl::statusChanged( const frame::FeatureSta if (m_pToolbar) { Graphic aGraf(xList->GetUiBitmap(nIndex - 2)); - m_pToolbar->set_item_image(sId, aGraf.GetXGraphic()); + m_pToolbar->set_item_image(m_aCommandURL, aGraf.GetXGraphic()); } else pToolBox->SetItemImage(nId, Image(xList->GetUiBitmap(nIndex - 2))); @@ -144,8 +142,7 @@ void SAL_CALL SvxLineStyleToolBoxControl::execute(sal_Int16 /*KeyModifier*/) if (m_pToolbar) { // Toggle the popup also when toolbutton is activated - const OString aId(m_aCommandURL.toUtf8()); - m_pToolbar->set_menu_item_active(aId, !m_pToolbar->get_menu_item_active(aId)); + m_pToolbar->set_menu_item_active(m_aCommandURL, !m_pToolbar->get_menu_item_active(m_aCommandURL)); } else { @@ -161,7 +158,7 @@ void SvxLineStyleToolBoxControl::initialize( const css::uno::Sequence<css::uno:: if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; @@ -450,8 +447,7 @@ void SAL_CALL SvxLineEndToolBoxControl::execute(sal_Int16 /*KeyModifier*/) if (m_pToolbar) { // Toggle the popup also when toolbutton is activated - const OString aId(m_aCommandURL.toUtf8()); - m_pToolbar->set_menu_item_active(aId, !m_pToolbar->get_menu_item_active(aId)); + m_pToolbar->set_menu_item_active(m_aCommandURL, !m_pToolbar->get_menu_item_active(m_aCommandURL)); } else { @@ -467,7 +463,7 @@ void SvxLineEndToolBoxControl::initialize( const css::uno::Sequence<css::uno::An if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b3a5229e6c10..0ed31c52804b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -248,7 +248,7 @@ protected: static Color TestColorsVisible(const Color &FontCol, const Color &BackCol); void UserDrawEntry(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const tools::Rectangle& rTextRect, const OUString &rStyleName, const std::vector<ScriptInfo>& rScriptChanges); void SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 nItem, const tools::Rectangle& rRect, std::u16string_view rStyleName, bool bIsNotSelected); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); DECL_STATIC_LINK(SvxStyleBox_Base, ShowMoreHdl, void*, void); }; @@ -934,7 +934,7 @@ void SvxStyleBox_Base::ReleaseFocus() m_xFrame->getContainerWindow()->setFocus(); } -IMPL_LINK(SvxStyleBox_Base, MenuSelectHdl, const OString&, rMenuIdent, void) +IMPL_LINK(SvxStyleBox_Base, MenuSelectHdl, const OUString&, rMenuIdent, void) { if (m_nLastItemWithMenu < 0 || m_nLastItemWithMenu >= m_xWidget->get_count()) return; @@ -1355,11 +1355,11 @@ void SvxStyleBox_Base::SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 if (!bIsNotSelected) { if (nItem == 0 || nItem == m_xWidget->get_count() - 1) - m_xWidget->set_item_menu(OString::number(nItem), nullptr); + m_xWidget->set_item_menu(OUString::number(nItem), nullptr); else { m_nLastItemWithMenu = nItem; - m_xWidget->set_item_menu(OString::number(nItem), m_xMenu.get()); + m_xWidget->set_item_menu(OUString::number(nItem), m_xMenu.get()); } } @@ -3308,7 +3308,7 @@ void SvxStyleToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& SolarMutexGuard aGuard; if (m_pToolbar) - m_pToolbar->set_item_sensitive(m_aCommandURL.toUtf8(), rEvent.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); else { ToolBox* pToolBox = nullptr; @@ -3404,7 +3404,7 @@ void SvxFontNameToolBoxControl::statusChanged( const css::frame::FeatureStateEve m_pBox->statusChanged_Impl(rEvent); if (m_pToolbar) - m_pToolbar->set_item_sensitive(m_aCommandURL.toUtf8(), rEvent.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); else { ToolBox* pToolBox = nullptr; @@ -3537,13 +3537,11 @@ void SvxColorToolBoxControl::initialize( const css::uno::Sequence<css::uno::Any> auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(getCommandURL(), getModuleName()); OUString aCommandLabel = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); - OString aId(m_aCommandURL.toUtf8()); - if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(aId, mxPopoverContainer->getTopLevel()); - m_xBtnUpdater.reset(new svx::ToolboxButtonColorUpdater(m_nSlotId, aId, m_pToolbar, !m_bSplitButton, aCommandLabel, m_xFrame)); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); + m_xBtnUpdater.reset(new svx::ToolboxButtonColorUpdater(m_nSlotId, m_aCommandURL, m_pToolbar, !m_bSplitButton, aCommandLabel, m_xFrame)); return; } @@ -3610,15 +3608,13 @@ std::unique_ptr<WeldToolbarPopup> SvxColorToolBoxControl::weldPopupWindow() { EnsurePaletteManager(); - const OString aId(m_aCommandURL.toUtf8()); - auto xPopover = std::make_unique<ColorWindow>( m_aCommandURL, m_xPaletteManager, m_aColorStatus, m_nSlotId, m_xFrame, - MenuOrToolMenuButton(m_pToolbar, aId), + MenuOrToolMenuButton(m_pToolbar, m_aCommandURL), [this] { return GetParentFrame(); }, m_aColorSelectFunction); @@ -3677,7 +3673,7 @@ void SvxColorToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& if ( rEvent.FeatureURL.Complete == m_aCommandURL ) { if (m_pToolbar) - m_pToolbar->set_item_sensitive(m_aCommandURL.toUtf8(), rEvent.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); else pToolBox->EnableItem( nId, rEvent.IsEnabled ); } @@ -3691,7 +3687,7 @@ void SvxColorToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& else if ( rEvent.State >>= bValue ) { if (m_pToolbar) - m_pToolbar->set_item_active(m_aCommandURL.toUtf8(), bValue); + m_pToolbar->set_item_active(m_aCommandURL, bValue); else if (pToolBox) pToolBox->CheckItem( nId, bValue ); } @@ -3704,8 +3700,7 @@ void SvxColorToolBoxControl::execute(sal_Int16 /*nSelectModifier*/) if (m_pToolbar) { // Toggle the popup also when toolbutton is activated - const OString aId(m_aCommandURL.toUtf8()); - m_pToolbar->set_menu_item_active(aId, !m_pToolbar->get_menu_item_active(aId)); + m_pToolbar->set_menu_item_active(m_aCommandURL, !m_pToolbar->get_menu_item_active(m_aCommandURL)); } else { @@ -3785,8 +3780,7 @@ void SAL_CALL SvxFrameToolBoxControl::execute(sal_Int16 /*KeyModifier*/) if (m_pToolbar) { // Toggle the popup also when toolbutton is activated - const OString aId(m_aCommandURL.toUtf8()); - m_pToolbar->set_menu_item_active(aId, !m_pToolbar->get_menu_item_active(aId)); + m_pToolbar->set_menu_item_active(m_aCommandURL, !m_pToolbar->get_menu_item_active(m_aCommandURL)); } else { @@ -3802,7 +3796,7 @@ void SvxFrameToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); } ToolBox* pToolBox = nullptr; @@ -4010,7 +4004,7 @@ void SvxCurrencyToolBoxControl::initialize( const css::uno::Sequence< css::uno:: if (m_pToolbar) { mxPopoverContainer.reset(new ToolbarPopupContainer(m_pToolbar)); - m_pToolbar->set_item_popover(m_aCommandURL.toUtf8(), mxPopoverContainer->getTopLevel()); + m_pToolbar->set_item_popover(m_aCommandURL, mxPopoverContainer->getTopLevel()); return; } @@ -4446,7 +4440,7 @@ MenuOrToolMenuButton::MenuOrToolMenuButton(weld::MenuButton* pMenuButton) { } -MenuOrToolMenuButton::MenuOrToolMenuButton(weld::Toolbar* pToolbar, OString aIdent) +MenuOrToolMenuButton::MenuOrToolMenuButton(weld::Toolbar* pToolbar, OUString aIdent) : m_pMenuButton(nullptr) , m_pToolbar(pToolbar) , m_aIdent(std::move(aIdent)) diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 6c235adc39c2..dfdb431dc504 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -413,7 +413,7 @@ void SAL_CALL FontHeightToolBoxControl::statusChanged( } if (m_pToolbar) - m_pToolbar->set_item_sensitive(m_aCommandURL.toUtf8(), rEvent.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); else { ToolBox* pToolBox = nullptr; diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 4e438c3ede9c..22eabc2b71b8 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -248,9 +248,9 @@ namespace svx return sColorName; } - ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(sal_uInt16 nSlotId, const OString& rTbxBtnId, weld::Toolbar* ptrTbx, bool bWideButton, + ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(sal_uInt16 nSlotId, const OUString& rTbxBtnId, weld::Toolbar* ptrTbx, bool bWideButton, const OUString& rCommandLabel, const css::uno::Reference<css::frame::XFrame>& rFrame) - : ToolboxButtonColorUpdaterBase(bWideButton, rCommandLabel, OUString::fromUtf8(rTbxBtnId), rFrame) + : ToolboxButtonColorUpdaterBase(bWideButton, rCommandLabel, rTbxBtnId, rFrame) , msBtnId(rTbxBtnId) , mpTbx(ptrTbx) { diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index d15a276fe1bc..480f3ccf3f71 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -80,7 +80,7 @@ void SAL_CALL SvxVertCTLTextTbxCtrl::initialize(const css::uno::Sequence<css::un if (m_pToolbar) { - m_bVisible = m_pToolbar->get_item_visible(m_aCommandURL.toUtf8()); + m_bVisible = m_pToolbar->get_item_visible(m_aCommandURL); return; } @@ -114,9 +114,8 @@ void SAL_CALL SvxVertCTLTextTbxCtrl::statusChanged(const css::frame::FeatureStat if (m_pToolbar) { - OString sId = m_aCommandURL.toUtf8(); - m_pToolbar->set_item_active(sId, bValue); - m_pToolbar->set_item_sensitive(sId, rEvent.IsEnabled); + m_pToolbar->set_item_active(m_aCommandURL, bValue); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); } if (bVclToolBox) @@ -130,7 +129,7 @@ void SAL_CALL SvxVertCTLTextTbxCtrl::statusChanged(const css::frame::FeatureStat if (m_pToolbar) { - m_pToolbar->set_item_visible(m_aCommandURL.toUtf8(), bEnabled); + m_pToolbar->set_item_visible(m_aCommandURL, bEnabled); return; } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 7c56a6609e4d..5b0b18c8f12a 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star::uno; // we enter something which never occurs here (hopefully).) static SfxSlot aExtrusionBarSlots_Impl[] = { - { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, nullptr } + { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" } }; SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell) diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 03c8f42c7a34..97991e47818c 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -178,7 +178,7 @@ static void SetFontWorkShapeTypeState( SdrView const * pSdrView, SfxItemSet& rSe // we enter something which never occurs here (hopefully).) static SfxSlot aFontworkBarSlots_Impl[] = { - { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, nullptr } + { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" } }; SFX_IMPL_INTERFACE(FontworkBar, SfxShell) diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index e3d6e509d216..8499c392516a 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -220,7 +220,7 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin final : public InterimItemWindow DECL_DLLPRIVATE_LINK(ScrollHdl, weld::ScrolledWindow&, void); DECL_DLLPRIVATE_LINK(DeleteHdl, void*, void); DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void); - DECL_DLLPRIVATE_LINK(SelectHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(SelectHdl, const OUString&, void); DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_DLLPRIVATE_LINK(MouseMoveHdl, const MouseEvent&, bool); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 890c2c48ed67..e5f86c271cd2 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -134,7 +134,7 @@ class SW_DLLPUBLIC SwDocShell const SfxStyleFamily nFamily, SfxStyleSearchBits nMask, const bool bNew, - const OString& sPageId, + const OUString& sPageId, SwWrtShell* pActShell, SfxRequest* pRequest = nullptr, sal_uInt16 nSlot = 0); @@ -268,7 +268,7 @@ public: void FormatPage( weld::Window* pDialogParent, const OUString& rPage, - const OString& rPageId, + const OUString& rPageId, SwWrtShell& rActShell, SfxRequest* pRequest = nullptr); diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h index 78f52fd436ea..90906bf66729 100644 --- a/sw/inc/helpids.h +++ b/sw/inc/helpids.h @@ -20,70 +20,71 @@ #ifndef INCLUDED_SW_INC_HELPIDS_H #define INCLUDED_SW_INC_HELPIDS_H -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> -inline constexpr OStringLiteral HID_EDIT_WIN = "SW_HID_EDIT_WIN"; +inline constexpr OUStringLiteral HID_EDIT_WIN = u"SW_HID_EDIT_WIN"; -inline constexpr OStringLiteral HID_PAGEPREVIEW = "SW_HID_PAGEPREVIEW"; -inline constexpr OStringLiteral HID_SOURCE_EDITWIN = "SW_HID_SOURCE_EDITWIN"; +inline constexpr OUStringLiteral HID_PAGEPREVIEW = u"SW_HID_PAGEPREVIEW"; +inline constexpr OUStringLiteral HID_SOURCE_EDITWIN = u"SW_HID_SOURCE_EDITWIN"; // Dialog Help-IDs -inline constexpr OStringLiteral HID_NAVIGATOR_TREELIST = "SW_HID_NAVIGATOR_TREELIST"; -inline constexpr OStringLiteral HID_NAVIGATOR_TOOLBOX = "SW_HID_NAVIGATOR_TOOLBOX"; -inline constexpr OStringLiteral HID_NAVIGATOR_LISTBOX = "SW_HID_NAVIGATOR_LISTBOX"; -inline constexpr OStringLiteral HID_NAVIGATOR_GLOBAL_TOOLBOX = "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX"; -inline constexpr OStringLiteral HID_NAVIGATOR_GLOB_TREELIST = "SW_HID_NAVIGATOR_GLOB_TREELIST"; +inline constexpr OUStringLiteral HID_NAVIGATOR_TREELIST = u"SW_HID_NAVIGATOR_TREELIST"; +inline constexpr OUStringLiteral HID_NAVIGATOR_TOOLBOX = u"SW_HID_NAVIGATOR_TOOLBOX"; +inline constexpr OUStringLiteral HID_NAVIGATOR_LISTBOX = u"SW_HID_NAVIGATOR_LISTBOX"; +inline constexpr OUStringLiteral HID_NAVIGATOR_GLOBAL_TOOLBOX = u"SW_HID_NAVIGATOR_GLOBAL_TOOLBOX"; +inline constexpr OUStringLiteral HID_NAVIGATOR_GLOB_TREELIST = u"SW_HID_NAVIGATOR_GLOB_TREELIST"; // TabPage Help-IDs -inline constexpr OStringLiteral HID_LINGU_AUTOCORR = "SW_HID_LINGU_AUTOCORR"; -inline constexpr OStringLiteral HID_LINGU_REPLACE = "SW_HID_LINGU_REPLACE"; -inline constexpr OStringLiteral HID_LINGU_IGNORE_SELECTION = "SW_HID_LINGU_IGNORE_SELECTION"; // grammar check context menu +inline constexpr OUStringLiteral HID_LINGU_AUTOCORR = u"SW_HID_LINGU_AUTOCORR"; +inline constexpr OUStringLiteral HID_LINGU_REPLACE = u"SW_HID_LINGU_REPLACE"; +inline constexpr OUStringLiteral HID_LINGU_IGNORE_SELECTION = u"SW_HID_LINGU_IGNORE_SELECTION"; // grammar check context menu // More Help-IDs -inline constexpr OStringLiteral HID_EDIT_FORMULA = "SW_HID_EDIT_FORMULA"; - -#define HID_AUTH_FIELD_IDENTIFIER "SW_HID_AUTH_FIELD_IDENTIFIER" -#define HID_AUTH_FIELD_AUTHORITY_TYPE "SW_HID_AUTH_FIELD_AUTHORITY_TYPE" -#define HID_AUTH_FIELD_ADDRESS "SW_HID_AUTH_FIELD_ADDRESS" -#define HID_AUTH_FIELD_ANNOTE "SW_HID_AUTH_FIELD_ANNOTE" -#define HID_AUTH_FIELD_AUTHOR "SW_HID_AUTH_FIELD_AUTHOR" -#define HID_AUTH_FIELD_BOOKTITLE "SW_HID_AUTH_FIELD_BOOKTITLE" -#define HID_AUTH_FIELD_CHAPTER "SW_HID_AUTH_FIELD_CHAPTER" -#define HID_AUTH_FIELD_EDITION "SW_HID_AUTH_FIELD_EDITION" -#define HID_AUTH_FIELD_EDITOR "SW_HID_AUTH_FIELD_EDITOR" -#define HID_AUTH_FIELD_HOWPUBLISHED "SW_HID_AUTH_FIELD_HOWPUBLISHED" -#define HID_AUTH_FIELD_INSTITUTION "SW_HID_AUTH_FIELD_INSTITUTION" -#define HID_AUTH_FIELD_JOURNAL "SW_HID_AUTH_FIELD_JOURNAL" -#define HID_AUTH_FIELD_MONTH "SW_HID_AUTH_FIELD_MONTH" -#define HID_AUTH_FIELD_NOTE "SW_HID_AUTH_FIELD_NOTE" -#define HID_AUTH_FIELD_NUMBER "SW_HID_AUTH_FIELD_NUMBER" -#define HID_AUTH_FIELD_ORGANIZATIONS "SW_HID_AUTH_FIELD_ORGANIZATIONS" -#define HID_AUTH_FIELD_PAGES "SW_HID_AUTH_FIELD_PAGES" -#define HID_AUTH_FIELD_PUBLISHER "SW_HID_AUTH_FIELD_PUBLISHER" -#define HID_AUTH_FIELD_SCHOOL "SW_HID_AUTH_FIELD_SCHOOL" -#define HID_AUTH_FIELD_SERIES "SW_HID_AUTH_FIELD_SERIES" -#define HID_AUTH_FIELD_TITLE "SW_HID_AUTH_FIELD_TITLE" -#define HID_AUTH_FIELD_REPORT_TYPE "SW_HID_AUTH_FIELD_REPORT_TYPE" -#define HID_AUTH_FIELD_VOLUME "SW_HID_AUTH_FIELD_VOLUME" -#define HID_AUTH_FIELD_YEAR "SW_HID_AUTH_FIELD_YEAR" -#define HID_AUTH_FIELD_URL "SW_HID_AUTH_FIELD_URL" -#define HID_AUTH_FIELD_CUSTOM1 "SW_HID_AUTH_FIELD_CUSTOM1" -#define HID_AUTH_FIELD_CUSTOM2 "SW_HID_AUTH_FIELD_CUSTOM2" -#define HID_AUTH_FIELD_CUSTOM3 "SW_HID_AUTH_FIELD_CUSTOM3" -#define HID_AUTH_FIELD_CUSTOM4 "SW_HID_AUTH_FIELD_CUSTOM4" -#define HID_AUTH_FIELD_CUSTOM5 "SW_HID_AUTH_FIELD_CUSTOM5" -#define HID_AUTH_FIELD_ISBN "SW_HID_AUTH_FIELD_ISBN" -#define HID_AUTH_FIELD_LOCAL_URL "SW_HID_AUTH_FIELD_LOCAL_URL" -#define HID_AUTH_FIELD_TARGET_URL "SW_HID_AUTH_FIELD_TARGET_URL" -#define HID_AUTH_FIELD_USE_TARGET_URL "SW_HID_AUTH_FIELD_USE_TARGET_URL" - -inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE = "SW_HID_BUSINESS_FMT_PAGE"; -inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_CONT = "SW_HID_BUSINESS_FMT_PAGE_CONT"; -inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_SHEET = "SW_HID_BUSINESS_FMT_PAGE_SHEET"; -inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_BRAND = "SW_HID_BUSINESS_FMT_PAGE_BRAND"; -inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_TYPE = "SW_HID_BUSINESS_FMT_PAGE_TYPE"; +inline constexpr OUStringLiteral HID_EDIT_FORMULA = u"SW_HID_EDIT_FORMULA"; + +inline constexpr OUStringLiteral HID_AUTH_FIELD_IDENTIFIER = u"SW_HID_AUTH_FIELD_IDENTIFIER"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_AUTHORITY_TYPE = u"SW_HID_AUTH_FIELD_AUTHORITY_TYPE"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_ADDRESS = u"SW_HID_AUTH_FIELD_ADDRESS"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_ANNOTE = u"SW_HID_AUTH_FIELD_ANNOTE"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_AUTHOR = u"SW_HID_AUTH_FIELD_AUTHOR"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_BOOKTITLE = u"SW_HID_AUTH_FIELD_BOOKTITLE"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_CHAPTER = u"SW_HID_AUTH_FIELD_CHAPTER"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_EDITION = u"SW_HID_AUTH_FIELD_EDITION"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_EDITOR = u"SW_HID_AUTH_FIELD_EDITOR"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_HOWPUBLISHED = u"SW_HID_AUTH_FIELD_HOWPUBLISHED"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_INSTITUTION = u"SW_HID_AUTH_FIELD_INSTITUTION"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_JOURNAL = u"SW_HID_AUTH_FIELD_JOURNAL"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_MONTH = u"SW_HID_AUTH_FIELD_MONTH"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_NOTE = u"SW_HID_AUTH_FIELD_NOTE"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_NUMBER = u"SW_HID_AUTH_FIELD_NUMBER"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_ORGANIZATIONS = u"SW_HID_AUTH_FIELD_ORGANIZATIONS"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_PAGES = u"SW_HID_AUTH_FIELD_PAGES"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_PUBLISHER = u"SW_HID_AUTH_FIELD_PUBLISHER"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_SCHOOL = u"SW_HID_AUTH_FIELD_SCHOOL"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_SERIES = u"SW_HID_AUTH_FIELD_SERIES"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_TITLE = u"SW_HID_AUTH_FIELD_TITLE"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_REPORT_TYPE = u"SW_HID_AUTH_FIELD_REPORT_TYPE"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_VOLUME = u"SW_HID_AUTH_FIELD_VOLUME"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_YEAR = u"SW_HID_AUTH_FIELD_YEAR"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_URL = u"SW_HID_AUTH_FIELD_URL"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_CUSTOM1 = u"SW_HID_AUTH_FIELD_CUSTOM1"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_CUSTOM2 = u"SW_HID_AUTH_FIELD_CUSTOM2"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_CUSTOM3 = u"SW_HID_AUTH_FIELD_CUSTOM3"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_CUSTOM4 = u"SW_HID_AUTH_FIELD_CUSTOM4"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_CUSTOM5 = u"SW_HID_AUTH_FIELD_CUSTOM5"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_ISBN = u"SW_HID_AUTH_FIELD_ISBN"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_LOCAL_URL = u"SW_HID_AUTH_FIELD_LOCAL_URL"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_TARGET_URL = u"SW_HID_AUTH_FIELD_TARGET_URL"; +inline constexpr OUStringLiteral HID_AUTH_FIELD_USE_TARGET_URL + = u"SW_HID_AUTH_FIELD_USE_TARGET_URL"; + +inline constexpr OUStringLiteral HID_BUSINESS_FMT_PAGE = u"SW_HID_BUSINESS_FMT_PAGE"; +inline constexpr OUStringLiteral HID_BUSINESS_FMT_PAGE_CONT = u"SW_HID_BUSINESS_FMT_PAGE_CONT"; +inline constexpr OUStringLiteral HID_BUSINESS_FMT_PAGE_SHEET = u"SW_HID_BUSINESS_FMT_PAGE_SHEET"; +inline constexpr OUStringLiteral HID_BUSINESS_FMT_PAGE_BRAND = u"SW_HID_BUSINESS_FMT_PAGE_BRAND"; +inline constexpr OUStringLiteral HID_BUSINESS_FMT_PAGE_TYPE = u"SW_HID_BUSINESS_FMT_PAGE_TYPE"; #define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK" #define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL" #define HID_SEND_MASTER_CTRL_LISTBOX_FILTER "SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER" @@ -100,20 +101,20 @@ inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_TYPE = "SW_HID_BUSINESS_FM #define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION" #define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE" -inline constexpr OStringLiteral HID_PVIEW_ZOOM_LB = "SW_HID_PVIEW_ZOOM_LB"; +inline constexpr OUStringLiteral HID_PVIEW_ZOOM_LB = u"SW_HID_PVIEW_ZOOM_LB"; -inline constexpr OStringLiteral HID_MM_NEXT_PAGE = "SW_HID_MM_NEXT_PAGE"; -inline constexpr OStringLiteral HID_MM_PREV_PAGE = "SW_HID_MM_PREV_PAGE"; -inline constexpr OStringLiteral HID_MM_ADDBLOCK_ELEMENTS = "SW_HID_MM_ADDBLOCK_ELEMENTS"; -inline constexpr OStringLiteral HID_MM_ADDBLOCK_INSERT = "SW_HID_MM_ADDBLOCK_INSERT"; -inline constexpr OStringLiteral HID_MM_ADDBLOCK_REMOVE = "SW_HID_MM_ADDBLOCK_REMOVE"; -inline constexpr OStringLiteral HID_MM_ADDBLOCK_DRAG = "SW_HID_MM_ADDBLOCK_DRAG"; -inline constexpr OStringLiteral HID_MM_ADDBLOCK_PREVIEW = "SW_HID_MM_ADDBLOCK_PREVIEW"; -inline constexpr OStringLiteral HID_MM_ADDBLOCK_MOVEBUTTONS = "SW_HID_MM_ADDBLOCK_MOVEBUTTONS"; +inline constexpr OUStringLiteral HID_MM_NEXT_PAGE = u"SW_HID_MM_NEXT_PAGE"; +inline constexpr OUStringLiteral HID_MM_PREV_PAGE = u"SW_HID_MM_PREV_PAGE"; +inline constexpr OUStringLiteral HID_MM_ADDBLOCK_ELEMENTS = u"SW_HID_MM_ADDBLOCK_ELEMENTS"; +inline constexpr OUStringLiteral HID_MM_ADDBLOCK_INSERT = u"SW_HID_MM_ADDBLOCK_INSERT"; +inline constexpr OUStringLiteral HID_MM_ADDBLOCK_REMOVE = u"SW_HID_MM_ADDBLOCK_REMOVE"; +inline constexpr OUStringLiteral HID_MM_ADDBLOCK_DRAG = u"SW_HID_MM_ADDBLOCK_DRAG"; +inline constexpr OUStringLiteral HID_MM_ADDBLOCK_PREVIEW = u"SW_HID_MM_ADDBLOCK_PREVIEW"; +inline constexpr OUStringLiteral HID_MM_ADDBLOCK_MOVEBUTTONS = u"SW_HID_MM_ADDBLOCK_MOVEBUTTONS"; -inline constexpr OStringLiteral HID_TBX_FORMULA_CALC = "SW_HID_TBX_FORMULA_CALC"; -inline constexpr OStringLiteral HID_TBX_FORMULA_CANCEL = "SW_HID_TBX_FORMULA_CANCEL"; -inline constexpr OStringLiteral HID_TBX_FORMULA_APPLY = "SW_HID_TBX_FORMULA_APPLY"; +inline constexpr OUStringLiteral HID_TBX_FORMULA_CALC = u"SW_HID_TBX_FORMULA_CALC"; +inline constexpr OUStringLiteral HID_TBX_FORMULA_CANCEL = u"SW_HID_TBX_FORMULA_CANCEL"; +inline constexpr OUStringLiteral HID_TBX_FORMULA_APPLY = u"SW_HID_TBX_FORMULA_APPLY"; #endif diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 9c27f098eb29..cbe4cd9aaf80 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -114,7 +114,7 @@ public: virtual OUString GetFontName() = 0; virtual bool IsEndNote() = 0; virtual OUString GetStr() = 0; - virtual void SetHelpId( const OString& sHelpId ) = 0; + virtual void SetHelpId( const OUString& sHelpId ) = 0; virtual void SetText( const OUString& rStr ) = 0; }; @@ -458,7 +458,7 @@ public: SwView& rVw, const SfxItemSet& rCoreSet, bool bDraw, - const OString& sDefPage = OString() ) = 0; + const OUString& sDefPage = {}) = 0; virtual VclPtr<VclAbstractDialog> CreateSwAutoMarkDialog(weld::Window *pParent, SwWrtShell &rSh) = 0; @@ -492,14 +492,14 @@ public: SfxViewFrame& rFrame, weld::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrame = true, - const OString& sDefPage = OString()) = 0; + const OUString& sDefPage = {}) = 0; /// @param nSlot /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. /// Currently used, if nRegion == SfxStyleFamily::Page in order to activate certain dialog pane virtual VclPtr<SfxAbstractApplyTabDialog> CreateTemplateDialog(weld::Window* pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, bool bNew) = 0; virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame& rViewFrame, diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 227814045ad5..add0d98789b6 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -843,8 +843,8 @@ CPPUNIT_TEST_FIXTURE(Test, testSpellmenuRedline) // Make sure that if we show the spellcheck popup menu (for the current // document, which contains redlines), then the last two entries will be // always 'go to next/previous change'. - CPPUNIT_ASSERT_EQUAL(OString("next"), rMenu.GetItemIdent(rMenu.GetItemId(rMenu.GetItemCount() - 2))); - CPPUNIT_ASSERT_EQUAL(OString("prev"), rMenu.GetItemIdent(rMenu.GetItemId(rMenu.GetItemCount() - 1))); + CPPUNIT_ASSERT_EQUAL(OUString("next"), rMenu.GetItemIdent(rMenu.GetItemId(rMenu.GetItemCount() - 2))); + CPPUNIT_ASSERT_EQUAL(OUString("prev"), rMenu.GetItemIdent(rMenu.GetItemId(rMenu.GetItemCount() - 1))); } CPPUNIT_TEST_FIXTURE(Test, testTdf107776) diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index cd62cef9e81e..ece33852d7bb 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -98,7 +98,7 @@ SwCharDlg::~SwCharDlg() } // set FontList -void SwCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SwCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "font") diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index f439b346d698..f28acc46bc87 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -45,7 +45,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent, sal_uInt8 nDialogMode, const OUString *pTitle, bool bDraw, - const OString& sDefPage) + const OUString& sDefPage) : SfxTabDialogController(pParent, "modules/swriter/ui/paradialog.ui", "ParagraphPropertiesDialog", @@ -146,7 +146,7 @@ SwParaDlg::~SwParaDlg() { } -void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage) +void SwParaDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) { SwWrtShell& rSh = m_rView.GetWrtShell(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index d5b9ffd68652..e80e75678c79 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -154,7 +154,7 @@ void SwCustomizeAddressListDialog::UpdateButtons() } SwAddRenameEntryDialog::SwAddRenameEntryDialog( - weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, + weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, const std::vector< OUString >& rCSVHeader) : SfxDialogController(pParent, rUIXMLDescription, rID) , m_rCSVHeader(rCSVHeader) diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 107d7b8554fe..a683ccb8290f 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -58,7 +58,7 @@ class SwAddRenameEntryDialog : public SfxDialogController DECL_LINK(ModifyHdl_Impl, weld::Entry&, void); protected: SwAddRenameEntryDialog(weld::Window* pParent, const OUString& rUIXMLDescription, - const OString& rID, const std::vector< OUString >& rCSVHeader); + const OUString& rID, const std::vector< OUString >& rCSVHeader); public: void SetFieldName(const OUString& rName) { m_xFieldNameED->set_text(rName); } diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index c98462dac378..634e984f2e30 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -86,7 +86,7 @@ SwMailMergeWizard::~SwMailMergeWizard() std::unique_ptr<BuilderPage> SwMailMergeWizard::createPage(WizardState _nState) { - OString sIdent(OString::number(_nState)); + OUString sIdent(OUString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); std::unique_ptr<vcl::OWizardPage> xRet; @@ -237,7 +237,7 @@ void SwMailMergeWizard::UpdateRoadmap() case MM_ADDRESSBLOCKPAGE: bEnable = !m_bDocumentLoad && bEnableOutputTypePage; // update page title for email vs letter - m_xAssistant->set_page_title(OString::number(MM_ADDRESSBLOCKPAGE), getStateDisplayName(MM_ADDRESSBLOCKPAGE)); + m_xAssistant->set_page_title(OUString::number(MM_ADDRESSBLOCKPAGE), getStateDisplayName(MM_ADDRESSBLOCKPAGE)); break; case MM_GREETINGSPAGE: bEnable = !m_bDocumentLoad && bEnableOutputTypePage && diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 61f17c2f1f1b..f7c17f18c4ca 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -167,7 +167,7 @@ class SwSendQueryBox_Impl : public SwMessageAndEditDialog bool m_bIsEmptyAllowed; DECL_LINK( ModifyHdl, weld::Entry&, void); public: - SwSendQueryBox_Impl(weld::Window* pParent, const OString& rID, + SwSendQueryBox_Impl(weld::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); void SetValue(const OUString& rSet) @@ -209,7 +209,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, weld::Entry&, rEdit, void) m_xOKPB->set_sensitive(!rEdit.get_text().isEmpty()); } -SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window* pParent, const OString& rID, +SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) : SwMessageAndEditDialog(pParent, rID, rUIXMLDescription) , m_bIsEmptyAllowed(true) diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 6975cc72df8c..2dab8cda2397 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -72,7 +72,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, SwAsciiOptions aOpt; { - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem"); @@ -266,7 +266,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, SwAsciiFilterDlg::~SwAsciiFilterDlg() { - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); aDlgOpt.SetUserItem("UserItem", uno::Any(m_sExtraData)); } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 9b00fa7ee676..694813bbb51a 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -322,7 +322,7 @@ short AbstractAuthMarkFloatDlg_Impl::Execute() return m_xDlg->run(); } -void AbstractTabController_Impl::SetCurPageId( const OString &rName ) +void AbstractTabController_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -475,7 +475,7 @@ bool AbstractDropDownFieldDialog_Impl::NextButtonPressed() const return m_xDlg->NextButtonPressed(); } -void AbstractSwLabDlg_Impl::SetCurPageId( const OString &rName ) +void AbstractSwLabDlg_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -530,7 +530,7 @@ std::unique_ptr<SwTableAutoFormat> AbstractSwAutoFormatDlg_Impl::FillAutoFormatO return m_xDlg->FillAutoFormatOfIndex(); } -void AbstractSwFieldDlg_Impl::SetCurPageId( const OString &rName ) +void AbstractSwFieldDlg_Impl::SetCurPageId( const OUString &rName ) { m_xDlg->SetCurPageId( rName ); } @@ -652,7 +652,7 @@ OUString AbstractInsFootNoteDlg_Impl::GetStr() return m_xDlg->GetStr(); } -void AbstractInsFootNoteDlg_Impl::SetHelpId(const OString& rHelpId) +void AbstractInsFootNoteDlg_Impl::SetHelpId(const OUString& rHelpId) { m_xDlg->set_help_id(rHelpId); } @@ -1012,7 +1012,7 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod () VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwParaDlg(weld::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, bool bDraw , - const OString& sDefPage) + const OUString& sDefPage) { return VclPtr<AbstractTabController_Impl>::Create(std::make_shared<SwParaDlg>(pParent, rVw, rCoreSet, DLG_STD, nullptr, bDraw, sDefPage)); } @@ -1112,7 +1112,7 @@ VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateFrameTabDialog( SfxViewFrame& rFrame, weld::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrame, - const OString& sDefPage ) + const OUString& sDefPage ) { return VclPtr<AbstractTabController_Impl>::Create(std::make_shared<SwFrameDlg>(rFrame, pParent, rCoreSet, bNewFrame, rDialogType, false/*bFormat*/, sDefPage, nullptr)); } @@ -1121,7 +1121,7 @@ VclPtr<SfxAbstractApplyTabDialog> SwAbstractDialogFactory_Impl::CreateTemplateDi weld::Window *pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, bool bNew ) { diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index d31e212accf4..8fee741ff96b 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -288,7 +288,7 @@ public: } virtual short Execute() override; virtual bool StartExecuteAsync(AsyncContext &rCtx) override; - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -381,7 +381,7 @@ public: { } virtual short Execute() override; - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -427,7 +427,7 @@ public: } virtual short Execute() override; virtual bool StartExecuteAsync(AsyncContext &rCtx) override; - virtual void SetCurPageId( const OString &rName ) override; + virtual void SetCurPageId( const OUString &rName ) override; virtual const SfxItemSet* GetOutputItemSet() const override; virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override; virtual void SetInputSet( const SfxItemSet* pInSet ) override; @@ -528,7 +528,7 @@ public: virtual bool IsEndNote() override; virtual OUString GetStr() override; //from class Window - virtual void SetHelpId( const OString& sHelpId ) override; + virtual void SetHelpId( const OUString& sHelpId ) override; virtual void SetText( const OUString& rStr ) override; }; @@ -756,7 +756,7 @@ public: SwView& rVw, const SfxItemSet& rCoreSet, bool bDraw, - const OString& sDefPage = OString()) override; + const OUString& sDefPage = {}) override; virtual VclPtr<VclAbstractDialog> CreateSwAutoMarkDialog(weld::Window *pParent, SwWrtShell &rSh) override; virtual VclPtr<AbstractSwSelGlossaryDlg> CreateSwSelGlossaryDlg(weld::Window *pParent, const OUString &rShortName) override; @@ -786,12 +786,12 @@ public: SfxViewFrame& rFrame, weld::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrame = true, - const OString& sDefPage = OString()) override; + const OUString& sDefPage = {}) override; virtual VclPtr<SfxAbstractApplyTabDialog> CreateTemplateDialog( weld::Window *pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, bool bNew) override; virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame& rViewFrame, diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx index d244dd7b8392..abdf16bf4da1 100644 --- a/sw/source/ui/dialog/swmessdialog.cxx +++ b/sw/source/ui/dialog/swmessdialog.cxx @@ -9,7 +9,7 @@ #include <swmessdialog.hxx> -SwMessageAndEditDialog::SwMessageAndEditDialog(weld::Window* pParent, const OString& rID, +SwMessageAndEditDialog::SwMessageAndEditDialog(weld::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) : MessageDialogController(pParent, rUIXMLDescription, rID, "grid") , m_xEdit(m_xBuilder->weld_entry("edit")) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b2cd48f5c346..13bbc9ba6fc2 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1391,7 +1391,7 @@ SwInsertSectionTabDialog::~SwInsertSectionTabDialog() { } -void SwInsertSectionTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SwInsertSectionTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "section") static_cast<SwInsertSectionTabPage&>(rPage).SetWrtShell(m_rWrtSh); @@ -2037,7 +2037,7 @@ SwSectionPropertyTabDialog::~SwSectionPropertyTabDialog() { } -void SwSectionPropertyTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SwSectionPropertyTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "background") { diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 8250bdf8379c..ebf99363cd56 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -159,17 +159,17 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, weld::MetricSpinButton&, rEdit, void ) } } -IMPL_LINK(SwEnvFormatPage, AddrEditHdl, const OString&, rIdent, void) +IMPL_LINK(SwEnvFormatPage, AddrEditHdl, const OUString&, rIdent, void) { Edit(rIdent, false); } -IMPL_LINK(SwEnvFormatPage, SendEditHdl, const OString&, rIdent, void) +IMPL_LINK(SwEnvFormatPage, SendEditHdl, const OUString&, rIdent, void) { Edit(rIdent, true); } -void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender) +void SwEnvFormatPage::Edit(std::u16string_view rIdent, bool bSender) { SwWrtShell* pSh = GetParentSwEnvDlg()->m_pSh; OSL_ENSURE(pSh, "Shell missing"); @@ -178,7 +178,7 @@ void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender) bSender ? RES_POOLCOLL_SEND_ADDRESS : RES_POOLCOLL_ENVELOPE_ADDRESS)); OSL_ENSURE(pColl, "Text collection missing"); - if (o3tl::starts_with(rIdent, "character")) + if (o3tl::starts_with(rIdent, u"character")) { SfxItemSet *pCollSet = GetCollItemSet(pColl, bSender); @@ -197,7 +197,7 @@ void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender) pCollSet->Put(aOutputSet); } } - else if (o3tl::starts_with(rIdent, "paragraph")) + else if (o3tl::starts_with(rIdent, u"paragraph")) { SfxItemSet *pCollSet = GetCollItemSet(pColl, bSender); diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index bdc42de6b55f..8b1405492cd8 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -45,15 +45,15 @@ class SwEnvFormatPage : public SfxTabPage std::unique_ptr<weld::CustomWeld> m_xPreview; DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); - DECL_LINK(AddrEditHdl, const OString&, void); - DECL_LINK(SendEditHdl, const OString&, void); + DECL_LINK(AddrEditHdl, const OUString&, void); + DECL_LINK(SendEditHdl, const OUString&, void); DECL_LINK(FormatHdl, weld::ComboBox&, void); void SetMinMax(); SfxItemSet* GetCollItemSet(SwTextFormatColl const* pColl, bool bSender); - void Edit(std::string_view rIdent, bool bSender); + void Edit(std::u16string_view rIdent, bool bSender); SwEnvDlg* GetParentSwEnvDlg() { return m_pDialog; } diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 2a690d5113c7..ddffac09a61a 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -140,7 +140,7 @@ SwEnvDlg::~SwEnvDlg() m_pSenderSet.reset(); } -void SwEnvDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SwEnvDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "printer") { diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 5f0bc799d4e1..8e9a3c3effc6 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -72,7 +72,7 @@ void SwLabDlg::ReplaceGroup_( const OUString &rMake ) m_aLstGroup = rMake; } -void SwLabDlg::PageCreated(const OString &rId, SfxTabPage &rPage) +void SwLabDlg::PageCreated(const OUString &rId, SfxTabPage &rPage) { if (rId == "labels") { diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index dfdd77f5db66..93202d2802d5 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; // note: pAttrSet may be null if the dialog is restored on startup SwFieldPage::SwFieldPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, - const OString& rID, const SfxItemSet *pAttrSet) + const OUString& rID, const SfxItemSet *pAttrSet) : SfxTabPage(pPage, pController, rUIXMLDescription, rID, pAttrSet) , m_pCurField(nullptr) , m_pWrtShell(nullptr) diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 9c0cecf5a86d..fbfa8cf2ba53 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -72,7 +72,7 @@ protected: public: SwFieldPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, - const OString& rID, const SfxItemSet *pAttrSet); + const OUString& rID, const SfxItemSet *pAttrSet); virtual ~SwFieldPage() override; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 487bfa8cc0c2..93e0e1f761af 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -127,13 +127,13 @@ void SwFieldDlg::Close() void SwFieldDlg::Initialize(SfxChildWinInfo const *pInfo) { - OString aWinState = pInfo->aWinState; + OUString aWinState = pInfo->aWinState; if (aWinState.isEmpty()) return; m_xDialog->set_window_state(aWinState); } -SfxItemSet* SwFieldDlg::CreateInputItemSet(const OString& rID) +SfxItemSet* SwFieldDlg::CreateInputItemSet(const OUString& rID) { SwDocShell *const pDocSh(static_cast<SwDocShell*>(SfxObjectShell::Current())); if (rID == "docinfo" && pDocSh) // might not have a shell if the dialog is restored on startup @@ -196,22 +196,22 @@ void SwFieldDlg::ReInitDlg() || !rSh.HasReadonlySel()) && !SwCursorShell::PosInsideInputField(*rSh.GetCursor()->GetPoint())); - ReInitTabPage("document"); - ReInitTabPage("variables"); - ReInitTabPage("docinfo"); + ReInitTabPage(u"document"); + ReInitTabPage(u"variables"); + ReInitTabPage(u"docinfo"); if (!m_bHtmlMode) { - ReInitTabPage("ref"); - ReInitTabPage("functions"); - ReInitTabPage("database"); + ReInitTabPage(u"ref"); + ReInitTabPage(u"functions"); + ReInitTabPage(u"database"); } m_pChildWin->SetOldDocShell(pDocSh); } // newly initialise TabPage after Doc-Switch -void SwFieldDlg::ReInitTabPage(std::string_view rPageId, bool bOnlyActivate) +void SwFieldDlg::ReInitTabPage(std::u16string_view rPageId, bool bOnlyActivate) { SwFieldPage* pPage = static_cast<SwFieldPage*>(GetTabPage(rPageId)); if (pPage) @@ -232,12 +232,12 @@ void SwFieldDlg::Activate() && !SwCursorShell::PosInsideInputField(*rSh.GetCursor()->GetPoint())); - ReInitTabPage("variables", true); + ReInitTabPage(u"variables", true); if( !bHtmlMode ) { - ReInitTabPage("ref", true); - ReInitTabPage("functions", true); + ReInitTabPage(u"ref", true); + ReInitTabPage(u"functions", true); } } @@ -267,7 +267,7 @@ void SwFieldDlg::ActivateDatabasePage() #if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS m_bDataBaseMode = true; ShowPage("database"); - SfxTabPage* pDBPage = GetTabPage("database"); + SfxTabPage* pDBPage = GetTabPage(u"database"); if( pDBPage ) { static_cast<SwFieldDBPage*>(pDBPage)->ActivateMailMergeAddress(); @@ -286,7 +286,7 @@ void SwFieldDlg::ShowReferencePage() ShowPage("ref"); } -void SwFieldDlg::PageCreated(const OString& rId, SfxTabPage& rPage) +void SwFieldDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) { #if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS if (rId != "database") diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 4f64f86de238..497a8d40e10a 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -63,13 +63,13 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, bool bNew) : SfxStyleDialogController(pParent, "modules/swriter/ui/templatedialog" + OUString::number(static_cast<sal_uInt16>(nRegion)) + ".ui", - "TemplateDialog" + OString::number(static_cast<sal_uInt16>(nRegion)), + "TemplateDialog" + OUString::number(static_cast<sal_uInt16>(nRegion)), rBase) , m_nType(nRegion) , m_pWrtShell(pActShell) @@ -267,7 +267,7 @@ void SwTemplateDlgController::RefreshInputSet() pInSet->SetParent( &GetStyleSheet().GetItemSet() ); } -void SwTemplateDlgController::PageCreated(const OString& rId, SfxTabPage &rPage ) +void SwTemplateDlgController::PageCreated(const OUString& rId, SfxTabPage &rPage ) { // set style's and metric's names OUString sNumCharFormat, sBulletCharFormat; diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index b7124046d617..0eaf29dfe6db 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -47,11 +47,11 @@ SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame, bool bNewFrame, const OUString& sResType, bool bFormat, - const OString& sDefPage, + const OUString& sDefPage, const OUString* pStr) : SfxTabDialogController(pParent, "modules/swriter/ui/" + sResType.toAsciiLowerCase() + ".ui", - sResType.toUtf8(), &rCoreSet, pStr != nullptr) + sResType, &rCoreSet, pStr != nullptr) , m_bFormat(bFormat) , m_bNew(bNewFrame) , m_rSet(rCoreSet) @@ -123,7 +123,7 @@ SwFrameDlg::~SwFrameDlg() { } -void SwFrameDlg::PageCreated(const OString& rId, SfxTabPage &rPage) +void SwFrameDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "type") diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index ce234a14f293..1de0e701ff88 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -292,7 +292,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() SW_MOD()->GetModuleConfig()->SetShowIndexPreview(m_xShowExampleCB->get_active()); } -void SwMultiTOXTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) +void SwMultiTOXTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "background") { @@ -1474,7 +1474,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, MenuEnableHdl, weld::Toggleable&, void) m_xAutoMarkPB->set_item_sensitive("edit", !m_sAutoMarkURL.isEmpty()); } -IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, const OString&, rIdent, void) +IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, const OUString&, rIdent, void) { const OUString sSaveAutoMarkURL = m_sAutoMarkURL; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 9b1004ee526f..7bab5d5728af 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1115,7 +1115,7 @@ public: struct TextInfo { ToxAuthorityField nToxField; - const char* pHelpId; + const OUString pHelpId; }; } @@ -1185,7 +1185,7 @@ SwAuthorMarkPane::SwAuthorMarkPane(weld::DialogController &rDialog, weld::Builde , m_xTitleFI(rBuilder.weld_label("title")) , m_xEntryED(rBuilder.weld_entry("entryed")) , m_xEntryLB(rBuilder.weld_combo_box("entrylb")) - , m_xActionBT(rBuilder.weld_button(m_bNewEntry ? OString("insert") : OString("modify"))) + , m_xActionBT(rBuilder.weld_button(m_bNewEntry ? OUString("insert") : OUString("modify"))) , m_xCloseBT(rBuilder.weld_button("close")) , m_xCreateEntryPB(rBuilder.weld_button("new")) , m_xEditEntryPB(rBuilder.weld_button("edit")) diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 959ceacad2d5..4eafb8c1264a 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -424,7 +424,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS, // restore dialog size SvtViewOptions aDlgOpt(EViewType::Dialog, "BookmarkDialog"); if (aDlgOpt.Exists()) - m_xDialog->set_window_state(aDlgOpt.GetWindowState().toUtf8()); + m_xDialog->set_window_state(aDlgOpt.GetWindowState()); if (pSelected) { @@ -443,8 +443,8 @@ SwInsertBookmarkDlg::~SwInsertBookmarkDlg() { // tdf#146261 - Remember size of bookmark dialog SvtViewOptions aDlgOpt(EViewType::Dialog, "BookmarkDialog"); - OString sWindowState = m_xDialog->get_window_state(vcl::WindowDataMask::PosSize); - aDlgOpt.SetWindowState(OUString::fromUtf8(sWindowState)); + OUString sWindowState = m_xDialog->get_window_state(vcl::WindowDataMask::PosSize); + aDlgOpt.SetWindowState(sWindowState); } IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, nColumn, void) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 576cb1521d1b..0fbe3b7c6ff7 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -47,7 +47,7 @@ SwFootNoteOptionDlg::SwFootNoteOptionDlg(weld::Window *pParent, SwWrtShell &rS) AddTabPage("endnotes", SwEndNoteOptionPage::Create, nullptr); } -void SwFootNoteOptionDlg::PageCreated(const OString& /*rId*/, SfxTabPage &rPage) +void SwFootNoteOptionDlg::PageCreated(const OUString& /*rId*/, SfxTabPage &rPage) { static_cast<SwEndNoteOptionPage&>(rPage).SetShell(m_rSh); } @@ -55,10 +55,10 @@ void SwFootNoteOptionDlg::PageCreated(const OString& /*rId*/, SfxTabPage &rPage) IMPL_LINK(SwFootNoteOptionDlg, OkHdl, weld::Button&, rBtn, void) { SfxItemSetFixed<1, 1> aDummySet(m_rSh.GetAttrPool()); - SfxTabPage *pPage = GetTabPage("footnotes"); + SfxTabPage *pPage = GetTabPage(u"footnotes"); if ( pPage ) pPage->FillItemSet( &aDummySet ); - pPage = GetTabPage("endnotes"); + pPage = GetTabPage(u"endnotes"); if ( pPage ) pPage->FillItemSet( &aDummySet ); SfxTabDialogController::OkHdl(rBtn); @@ -68,7 +68,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogCon const SfxItemSet &rSet) : SfxTabPage(pPage, pController, bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), - bEN ? OString("EndnotePage") : OString("FootnotePage"), + bEN ? OUString("EndnotePage") : OUString("FootnotePage"), &rSet) , m_pSh(nullptr) , m_bPosDoc(false) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 71b97a6e8ac0..12145f1e74ed 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -544,7 +544,7 @@ IMPL_LINK_NOARG( SwGlossaryDlg, EnableHdl, weld::Toggleable&, void ) m_xEditBtn->set_item_visible("import", bIsGroup && !m_bIsOld && !m_pGlossaryHdl->IsReadOnly() ); } -IMPL_LINK(SwGlossaryDlg, MenuHdl, const OString&, rItemIdent, void) +IMPL_LINK(SwGlossaryDlg, MenuHdl, const OUString&, rItemIdent, void) { if (rItemIdent == "edit") { diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 137b6db9f015..15848bf98c4b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -890,7 +890,7 @@ SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog() { } -void SwSvxNumBulletTabDialog::PageCreated(const OString& rPageId, SfxTabPage& rPage) +void SwSvxNumBulletTabDialog::PageCreated(const OUString& rPageId, SfxTabPage& rPage) { // set styles' names and metric OUString sNumCharFormat, sBulletCharFormat; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1d4e3888f250..d72a003db02e 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -196,7 +196,7 @@ SwOutlineTabDialog::~SwOutlineTabDialog() { } -void SwOutlineTabDialog::PageCreated(const OString& rPageId, SfxTabPage& rPage) +void SwOutlineTabDialog::PageCreated(const OUString& rPageId, SfxTabPage& rPage) { if (rPageId == "position") { @@ -227,11 +227,11 @@ IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl, weld::Toggleable&, void) const SwNumRulesWithName *pRules = m_pChapterNumRules->GetRules(i); if (!pRules) continue; - m_xMenuButton->set_item_label("form" + OString::number(i + 1), pRules->GetName()); + m_xMenuButton->set_item_label("form" + OUString::number(i + 1), pRules->GetName()); } } -IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const OUString&, rIdent, void) { sal_uInt8 nLevelNo = 0; @@ -271,7 +271,7 @@ IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const OString&, rIdent, void) const OUString aName(aDlg.GetName()); m_pChapterNumRules->ApplyNumRules( SwNumRulesWithName( *m_xNumRule, aName ), aDlg.GetCurEntryPos() ); - m_xMenuButton->set_item_label("form" + OString::number(aDlg.GetCurEntryPos() + 1), aName); + m_xMenuButton->set_item_label("form" + OUString::number(aDlg.GetCurEntryPos() + 1), aName); } return; } @@ -283,7 +283,7 @@ IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const OString&, rIdent, void) { pRules->ResetNumRule(m_rWrtSh, *m_xNumRule); m_xNumRule->SetRuleType( OUTLINE_RULE ); - SfxTabPage* pOutlinePage = GetTabPage("numbering"); + SfxTabPage* pOutlinePage = GetTabPage(u"numbering"); assert(pOutlinePage); static_cast<SwOutlineSettingsTabPage*>(pOutlinePage)->SetNumRule(m_xNumRule.get()); } diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 0d2f2672b397..8bc8baf755cc 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -32,7 +32,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(weld::Window *pParent) m_xImplDlg.reset(new SwRedlineAcceptDlg(m_xDialog, m_xBuilder.get(), m_xContentArea.get(), true)); - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem"); @@ -49,7 +49,7 @@ SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() OUString sExtraData; m_xImplDlg->FillInfo(sExtraData); - SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); aDlgOpt.SetUserItem("UserItem", css::uno::Any(sExtraData)); m_xDialog->set_modal(false); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 661eb4a97404..11894c448686 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1227,7 +1227,7 @@ SwTableTabDlg::SwTableTabDlg(weld::Window* pParent, const SfxItemSet* pItemSet, AddTabPage("borders", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), nullptr); } -void SwTableTabDlg::PageCreated(const OString& rId, SfxTabPage& rPage) +void SwTableTabDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "background") diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index cd1e3dcde925..17422ef65920 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -321,7 +321,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) if (sName.isEmpty() && m_xBasePool) sName = SfxStyleDialogController::GenerateUnusedName(*m_xBasePool, nFamily); - Edit(rReq.GetFrameWeld(), sName, sParent, nFamily, nMask, true, OString(), nullptr, &rReq, nSlot); + Edit(rReq.GetFrameWeld(), sName, sParent, nFamily, nMask, true, {}, nullptr, &rReq, nSlot); } break; @@ -492,7 +492,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) switch(nSlot) { case SID_STYLE_EDIT: - Edit(rReq.GetFrameWeld(), aParam, OUString(), nFamily, nMask, false, OString(), pActShell); + Edit(rReq.GetFrameWeld(), aParam, {}, nFamily, nMask, false, {}, pActShell); break; case SID_STYLE_DELETE: Delete(aParam, nFamily); @@ -759,7 +759,7 @@ void SwDocShell::Edit( const SfxStyleFamily nFamily, SfxStyleSearchBits nMask, const bool bNew, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, SfxRequest* pReq, sal_uInt16 nSlot) @@ -1650,7 +1650,7 @@ void SwDocShell::LoadStyles_( SfxObjectShell& rSource, bool bPreserveCurrentDocu void SwDocShell::FormatPage( weld::Window* pDialogParent, const OUString& rPage, - const OString& rPageId, + const OUString& rPageId, SwWrtShell& rActShell, SfxRequest* pRequest) { diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index fe0143d8c3c3..975e9a02895b 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -30,7 +30,7 @@ namespace sw::annotation { -IMPL_LINK(SwAnnotationWin, SelectHdl, const OString&, rIdent, void) +IMPL_LINK(SwAnnotationWin, SelectHdl, const OUString&, rIdent, void) { if (rIdent.isEmpty()) return; diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index e5c0c202a4eb..6fb7aac7458f 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -202,7 +202,7 @@ void SwFrameControlsManager::SetContentControlAliasButton(SwContentControl* pCon } SwFrameMenuButtonBase::SwFrameMenuButtonBase(SwEditWin* pEditWin, const SwFrame* pFrame, - const OUString& rUIXMLDescription, const OString& rID) + const OUString& rUIXMLDescription, const OUString& rID) : InterimItemWindow(pEditWin, rUIXMLDescription, rID) , m_pEditWin(pEditWin) , m_pFrame(pFrame) diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index b4fe2f58e3bb..431de9e5e183 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -480,19 +480,19 @@ bool SwHeaderFooterWin::IsEmptyHeaderFooter( ) const return bResult; } -void SwHeaderFooterWin::ExecuteCommand(std::string_view rIdent) +void SwHeaderFooterWin::ExecuteCommand(std::u16string_view rIdent) { SwView& rView = m_pEditWin->GetView(); SwWrtShell& rSh = rView.GetWrtShell(); const SwPageFrame* pPageFrame = SwFrameMenuButtonBase::GetPageFrame(m_pFrame); const OUString& rStyleName = pPageFrame->GetPageDesc()->GetName(); - if (rIdent == "edit") + if (rIdent == u"edit") { - OString sPageId = m_bIsHeader ? OString("header") : OString("footer"); + OUString sPageId = m_bIsHeader ? OUString("header") : OUString("footer"); rView.GetDocShell()->FormatPage(rView.GetFrameWeld(), rStyleName, sPageId, rSh); } - else if (rIdent == "borderback") + else if (rIdent == u"borderback") { const SwPageDesc* pDesc = pPageFrame->GetPageDesc(); const SwFrameFormat& rMaster = pDesc->GetMaster(); @@ -527,18 +527,18 @@ void SwHeaderFooterWin::ExecuteCommand(std::string_view rIdent) rView.GetDocShell()->SetModified(); } } - else if (rIdent == "delete") + else if (rIdent == u"delete") { rSh.ChangeHeaderOrFooter( rStyleName, m_bIsHeader, false, true ); // warning: "this" may be disposed now rSh.GetWin()->GrabFocusToDocument(); } - else if (rIdent == "insert_pagenumber") + else if (rIdent == u"insert_pagenumber") { SfxViewFrame& rVFrame = rSh.GetView().GetViewFrame(); rVFrame.GetBindings().Execute(FN_INSERT_FLD_PGNUMBER); } - else if (rIdent == "insert_pagecount") + else if (rIdent == u"insert_pagecount") { SfxViewFrame& rVFrame = rSh.GetView().GetViewFrame(); rVFrame.GetBindings().Execute(FN_INSERT_FLD_PGCOUNT); @@ -564,7 +564,7 @@ IMPL_LINK_NOARG(SwHeaderFooterWin, ClickHdl, weld::Button&, void) PaintButton(); } -IMPL_LINK(SwHeaderFooterWin, SelectHdl, const OString&, rIdent, void) +IMPL_LINK(SwHeaderFooterWin, SelectHdl, const OUString&, rIdent, void) { ExecuteCommand(rIdent); } diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 398dfd2987b9..561dd56a2503 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -263,7 +263,7 @@ static SvxBreak lcl_GetBreakItem(const SwContentFrame* pCnt) return eBreak; } -IMPL_LINK(SwPageBreakWin, SelectHdl, const OString&, rIdent, void) +IMPL_LINK(SwPageBreakWin, SelectHdl, const OUString&, rIdent, void) { SwFrameControlPtr pFrameControl = m_pEditWin->GetFrameControlsManager().GetControl(FrameControlType::PageBreak, m_pFrame); @@ -275,7 +275,7 @@ IMPL_LINK(SwPageBreakWin, SelectHdl, const OString&, rIdent, void) Fade( false ); } -void SwBreakDashedLine::execute(std::string_view rIdent) +void SwBreakDashedLine::execute(std::u16string_view rIdent) { const SwPageFrame* pPageFrame = SwFrameMenuButtonBase::GetPageFrame(m_pFrame); // Is there a PageBefore break on this page? @@ -292,7 +292,7 @@ void SwBreakDashedLine::execute(std::string_view rIdent) ePrevBreak = lcl_GetBreakItem( pPrevCnt ); } - if (pCnt && rIdent == "edit") + if (pCnt && rIdent == u"edit") { SwWrtShell& rSh = m_pEditWin->GetView().GetWrtShell(); bool bOldLock = rSh.IsViewLocked(); @@ -334,7 +334,7 @@ void SwBreakDashedLine::execute(std::string_view rIdent) rSh.LockView( bOldLock ); m_pEditWin->GrabFocus( ); } - else if (pCnt && rIdent == "delete") + else if (pCnt && rIdent == u"delete") { SwContentNode& rNd = pCnt->IsTextFrame() ? *static_cast<SwTextFrame*>(pCnt)->GetTextNodeFirst() diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index ed568562587f..02b4b1ebe7d9 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -77,29 +77,29 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher con SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/readonlymenu.ui", "") - , m_xMenu(m_aBuilder.get_menu("menu")) - , m_nReadonlyOpenurl(m_xMenu->GetItemId("openurl")) - , m_nReadonlyOpendoc(m_xMenu->GetItemId("opendoc")) - , m_nReadonlyEditdoc(m_xMenu->GetItemId("edit")) - , m_nReadonlySelectionMode(m_xMenu->GetItemId("selection")) - , m_nReadonlyReload(m_xMenu->GetItemId("reload")) - , m_nReadonlyReloadFrame(m_xMenu->GetItemId("reloadframe")) - , m_nReadonlySourceview(m_xMenu->GetItemId("html")) - , m_nReadonlyBrowseBackward(m_xMenu->GetItemId("backward")) - , m_nReadonlyBrowseForward(m_xMenu->GetItemId("forward")) - , m_nReadonlySaveGraphic(m_xMenu->GetItemId("savegraphic")) - , m_nReadonlyGraphictogallery(m_xMenu->GetItemId("graphictogallery")) - , m_nReadonlyTogallerylink(m_xMenu->GetItemId("graphicaslink")) - , m_nReadonlyTogallerycopy(m_xMenu->GetItemId("graphicascopy")) - , m_nReadonlySaveBackground(m_xMenu->GetItemId("savebackground")) - , m_nReadonlyBackgroundtogallery(m_xMenu->GetItemId("backgroundtogallery")) - , m_nReadonlyBackgroundTogallerylink(m_xMenu->GetItemId("backaslink")) - , m_nReadonlyBackgroundTogallerycopy(m_xMenu->GetItemId("backascopy")) - , m_nReadonlyCopylink(m_xMenu->GetItemId("copylink")) - , m_nReadonlyLoadGraphic(m_xMenu->GetItemId("loadgraphic")) - , m_nReadonlyGraphicoff(m_xMenu->GetItemId("imagesoff")) - , m_nReadonlyFullscreen(m_xMenu->GetItemId("fullscreen")) - , m_nReadonlyCopy(m_xMenu->GetItemId("copy")) + , m_xMenu(m_aBuilder.get_menu(u"menu")) + , m_nReadonlyOpenurl(m_xMenu->GetItemId(u"openurl")) + , m_nReadonlyOpendoc(m_xMenu->GetItemId(u"opendoc")) + , m_nReadonlyEditdoc(m_xMenu->GetItemId(u"edit")) + , m_nReadonlySelectionMode(m_xMenu->GetItemId(u"selection")) + , m_nReadonlyReload(m_xMenu->GetItemId(u"reload")) + , m_nReadonlyReloadFrame(m_xMenu->GetItemId(u"reloadframe")) + , m_nReadonlySourceview(m_xMenu->GetItemId(u"html")) + , m_nReadonlyBrowseBackward(m_xMenu->GetItemId(u"backward")) + , m_nReadonlyBrowseForward(m_xMenu->GetItemId(u"forward")) + , m_nReadonlySaveGraphic(m_xMenu->GetItemId(u"savegraphic")) + , m_nReadonlyGraphictogallery(m_xMenu->GetItemId(u"graphictogallery")) + , m_nReadonlyTogallerylink(m_xMenu->GetItemId(u"graphicaslink")) + , m_nReadonlyTogallerycopy(m_xMenu->GetItemId(u"graphicascopy")) + , m_nReadonlySaveBackground(m_xMenu->GetItemId(u"savebackground")) + , m_nReadonlyBackgroundtogallery(m_xMenu->GetItemId(u"backgroundtogallery")) + , m_nReadonlyBackgroundTogallerylink(m_xMenu->GetItemId(u"backaslink")) + , m_nReadonlyBackgroundTogallerycopy(m_xMenu->GetItemId(u"backascopy")) + , m_nReadonlyCopylink(m_xMenu->GetItemId(u"copylink")) + , m_nReadonlyLoadGraphic(m_xMenu->GetItemId(u"loadgraphic")) + , m_nReadonlyGraphicoff(m_xMenu->GetItemId(u"imagesoff")) + , m_nReadonlyFullscreen(m_xMenu->GetItemId(u"fullscreen")) + , m_nReadonlyCopy(m_xMenu->GetItemId(u"copy")) , m_rView(rV) , m_xBrushItem(std::make_unique<SvxBrushItem>(RES_BACKGROUND)) { diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index 4ab1d61b0303..7bdc9ff6bb8b 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -68,7 +68,7 @@ protected: public: SwFrameMenuButtonBase(SwEditWin* pEditWin, const SwFrame* pFrame, - const OUString& rUIXMLDescription, const OString& rID); + const OUString& rUIXMLDescription, const OUString& rID); virtual const SwFrame* GetFrame() override { return m_pFrame; } virtual SwEditWin* GetEditWin() override { return m_pEditWin; } diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index acd41f451860..723056eded67 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -86,12 +86,12 @@ public: bool IsEmptyHeaderFooter( ) const; - void ExecuteCommand(std::string_view rIdent); + void ExecuteCommand(std::u16string_view rIdent); private: DECL_LINK(FadeHandler, Timer *, void); DECL_LINK(ClickHdl, weld::Button&, void); - DECL_LINK(SelectHdl, const OString&, void); + DECL_LINK(SelectHdl, const OUString&, void); void PaintButton(); }; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 6d9a98ec37a5..ea59e8273be6 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -50,7 +50,7 @@ public: virtual bool Contains(const Point &rDocPt) const override; virtual void SetReadonly(bool bReadonly) override; - void execute(std::string_view rIdent); + void execute(std::u16string_view rIdent); virtual FactoryFunction GetUITestFactory() const override; @@ -84,7 +84,7 @@ private: DECL_LINK( FadeHandler, Timer *, void ); /// Hide the button when the menu is toggled closed, e.g by clicking outside DECL_LINK(ToggleHdl, weld::Toggleable&, void); - DECL_LINK(SelectHdl, const OString&, void); + DECL_LINK(SelectHdl, const OUString&, void); void PaintButton(); }; diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index d07344046903..cf37a9496af8 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -37,7 +37,7 @@ public: virtual ~SwCharDlg() override; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; }; class SwCharURLPage final : public SfxTabPage diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index ec11b8872939..fddf1f00ddde 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -61,8 +61,8 @@ public: void hide() { m_xControl->hide(); } weld::Entry& get_widget() { return *m_xControl; } - OString get_buildable_name() const { return m_xControl->get_buildable_name(); } - void set_buildable_name(const OString& rId) { m_xControl->set_buildable_name(rId); } + OUString get_buildable_name() const { return m_xControl->get_buildable_name(); } + void set_buildable_name(const OUString& rId) { m_xControl->set_buildable_name(rId); } void ShowBrackets(bool bShow) { m_bBrackets = bShow; } bool GetBrackets() const { return m_bBrackets; } diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 8aed949f732f..587f1ce19c29 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -176,7 +176,7 @@ class SwContentTree final : public SfxListener void GotoContent(const SwContent* pCnt); - void ExecuteContextMenuAction(const OString& rSelectedPopupEntry); + void ExecuteContextMenuAction(const OUString& rSelectedPopupEntry); void DeleteOutlineSelections(); void CopyOutlineSelections(); @@ -245,7 +245,7 @@ public: void SetContentTypeTracking(ContentTypeId eCntTypeId, bool bSet); /** Execute commands of the Navigator */ - void ExecCommand(std::string_view rCmd, bool bModifier); + void ExecCommand(std::u16string_view rCmd, bool bModifier); void ShowTree(); void HideTree(); @@ -383,7 +383,7 @@ public: void MoveSelectionTo(const weld::TreeIter* pDropTarget); - void TbxMenuHdl(std::string_view rCommand, weld::Menu& rMenu); + void TbxMenuHdl(std::u16string_view rCommand, weld::Menu& rMenu); void InsertRegion( const SwGlblDocContent* pCont, const OUString* pFileName = nullptr ); void EditContent(const SwGlblDocContent* pCont ); @@ -391,13 +391,13 @@ public: void ShowTree(); void HideTree(); - void ExecCommand(std::string_view rCmd); + void ExecCommand(std::u16string_view rCmd); void Display(bool bOnlyUpdateUserData = false); bool Update(bool bHard); - void ExecuteContextMenuAction(std::string_view rSelectedPopupEntry); + void ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry); const SwWrtShell* GetActiveWrtShell() const {return m_pActiveShell;} diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index f8151db112af..8bc5d1851d23 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -27,7 +27,7 @@ class SwFootNoteOptionDlg final : public SfxTabDialogController { SwWrtShell& m_rSh; - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; DECL_LINK(OkHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 6a527b46c206..302184f83b87 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -71,7 +71,7 @@ class SwEnvDlg final : public SfxTabDialogController std::unique_ptr<weld::Button> m_xModify; - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; virtual short Ok() override; public: diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index b7bda89f9d62..0db155b3d54b 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -39,10 +39,10 @@ class SwFieldDlg final : public SfxTabDialogController bool m_bClosing; std::unique_ptr<SfxItemSet> mxInputItemSet; - virtual SfxItemSet* CreateInputItemSet(const OString& rId) override; - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual SfxItemSet* CreateInputItemSet(const OUString& rId) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; - void ReInitTabPage(std::string_view rPageId, + void ReInitTabPage(std::u16string_view rPageId, bool bOnlyActivate = false); public: diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index 438279a2a2da..425bed5fcb77 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -34,7 +34,7 @@ class SwFrameDlg final : public SfxTabDialogController OUString m_sDlgType; SwWrtShell* m_pWrtShell; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: SwFrameDlg(const SfxViewFrame& rFrame, weld::Window* pParent, @@ -42,7 +42,7 @@ public: bool bNewFrame, const OUString& sResType, bool bFormat, - const OString& sDefPage = OString(), + const OUString& sDefPage = {}, const OUString* pFormatStr = nullptr); virtual ~SwFrameDlg() override; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index ba6d82a5fc3e..b93925f344d1 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -86,7 +86,7 @@ class SwGlossaryDlg final : public SfxDialogController DECL_LINK( NameModify, weld::Entry&, void ); DECL_LINK( NameDoubleClick, weld::TreeView&, bool ); DECL_LINK( GrpSelect, weld::TreeView&, void ); - DECL_LINK( MenuHdl, const OString&, void ); + DECL_LINK( MenuHdl, const OUString&, void ); DECL_LINK( EnableHdl, weld::Toggleable&, void ); DECL_LINK( BibHdl, weld::Button&, void ); DECL_LINK( InsertHdl, weld::Button&, void ); diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 4d7d205cc01f..05d181a88623 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -171,7 +171,7 @@ friend class InputEdit; virtual void Resize() override; virtual void Click() override; - void MenuHdl(std::string_view command); + void MenuHdl(std::u16string_view command); DECL_LINK( DropdownClickHdl, ToolBox*, void ); void ApplyFormula(); void CancelFormula(); diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index fabaad57bc2a..825767726bd1 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -44,7 +44,7 @@ class SwLabDlg final : public SfxTabDialogController bool m_bLabel; void ReplaceGroup_( const OUString &rMake ); - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: SwLabDlg(weld::Window* pParent, const SfxItemSet& rSet, diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 9e91e9f1d86f..5b9862101254 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -100,14 +100,14 @@ class SwNavigationPI final : public PanelLayout void FillBox(); DECL_LINK( DocListBoxSelectHdl, weld::ComboBox&, void ); - DECL_LINK( ToolBoxSelectHdl, const OString&, void ); - DECL_LINK( ToolBoxClickHdl, const OString&, void ); - DECL_LINK( ToolBox5DropdownClickHdl, const OString&, void ); - DECL_LINK( ToolBox6DropdownClickHdl, const OString&, void ); + DECL_LINK( ToolBoxSelectHdl, const OUString&, void ); + DECL_LINK( ToolBoxClickHdl, const OUString&, void ); + DECL_LINK( ToolBox5DropdownClickHdl, const OUString&, void ); + DECL_LINK( ToolBox6DropdownClickHdl, const OUString&, void ); DECL_LINK( DoneLink, SfxPoolItem const *, void ); - DECL_LINK( DropModeMenuSelectHdl, const OString&, void ); - DECL_LINK( HeadingsMenuSelectHdl, const OString&, void ); - DECL_LINK( GlobalMenuSelectHdl, const OString&, void ); + DECL_LINK( DropModeMenuSelectHdl, const OUString&, void ); + DECL_LINK( HeadingsMenuSelectHdl, const OUString&, void ); + DECL_LINK( GlobalMenuSelectHdl, const OUString&, void ); DECL_LINK( ChangePageHdl, Timer*, void ); DECL_LINK( PageEditModifyHdl, weld::SpinButton&, void ); DECL_LINK( EditActionHdl, weld::Entry&, bool ); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 4290edcaaef4..c849198b86ec 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -122,7 +122,7 @@ class SwSvxNumBulletTabDialog final : public SfxTabDialogController SwWrtShell& m_rWrtSh; virtual short Ok() override; - virtual void PageCreated(const OString& rPageId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rPage) override; DECL_LINK(RemoveNumberingHdl, weld::Button&, void); std::unique_ptr<weld::ComboBox> m_xDummyCombo; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 6cd4415969bc..95f527a6f275 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -98,8 +98,8 @@ public: void set_sensitive(bool bSensitive) { mxControl->set_sensitive(bSensitive); } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { mxControl->connect_changed(rLink); } - OString get_buildable_name() const { return mxControl->get_buildable_name(); } - void set_buildable_name(const OString& rId){ mxControl->set_buildable_name(rId); } + OUString get_buildable_name() const { return mxControl->get_buildable_name(); } + void set_buildable_name(const OUString& rId){ mxControl->set_buildable_name(rId); } }; class SW_DLLPUBLIC SwNumFormatTreeView final : public SwNumFormatBase @@ -132,8 +132,8 @@ public: void set_visible(bool bVisible) { mxControl->set_visible(bVisible); } void select(int nPos) { mxControl->select(nPos); } void connect_row_activated(const Link<weld::TreeView&, bool>& rLink) { mxControl->connect_row_activated(rLink); } - OString get_buildable_name() const { return mxControl->get_buildable_name(); } - void set_buildable_name(const OString& rId){ mxControl->set_buildable_name(rId); } + OUString get_buildable_name() const { return mxControl->get_buildable_name(); } + void set_buildable_name(const OUString& rId){ mxControl->set_buildable_name(rId); } }; #endif diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 2b5e6f079f16..acb81b00f2bf 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -47,9 +47,9 @@ class SwOutlineTabDialog final : public SfxTabDialogController DECL_LINK(CancelHdl, weld::Button&, void); DECL_LINK(FormHdl, weld::Toggleable&, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(MenuSelectHdl, const OUString&, void); - virtual void PageCreated(const OString& rPageId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rPageId, SfxTabPage& rPage) override; virtual short Ok() override; public: diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 8cd22491cc3a..410b9d6db8a7 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -230,7 +230,7 @@ class SwInsertSectionTabDialog final : public SfxTabDialogController SwWrtShell& m_rWrtSh; std::unique_ptr<SwSectionData> m_pSectionData; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; virtual short Ok() override; public: SwInsertSectionTabDialog(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); @@ -244,7 +244,7 @@ class SwSectionPropertyTabDialog final : public SfxTabDialogController { SwWrtShell& m_rWrtSh; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; public: SwSectionPropertyTabDialog(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog() override; diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx index 0c95e5e6a4b6..14c4d8a51089 100644 --- a/sw/source/uibase/inc/swmessdialog.hxx +++ b/sw/source/uibase/inc/swmessdialog.hxx @@ -18,7 +18,7 @@ protected: std::unique_ptr<weld::Entry> m_xEdit; std::unique_ptr<weld::Button> m_xOKPB; public: - SwMessageAndEditDialog(weld::Window* pParent, const OString& rID, + SwMessageAndEditDialog(weld::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); }; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 7a9d30fcd94b..103f65e7cb93 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -94,7 +94,7 @@ public: bool bGlobal); virtual ~SwMultiTOXTabDialog() override; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; SwForm* GetForm(CurTOXType eType); @@ -194,7 +194,7 @@ class SwTOXSelectTabPage final : public SfxTabPage DECL_LINK(TOXTypeHdl, weld::ComboBox&, void ); DECL_LINK(AddStylesHdl, weld::Button&, void ); DECL_LINK(MenuEnableHdl, weld::Toggleable&, void); - DECL_LINK(MenuExecuteHdl, const OString&, void); + DECL_LINK(MenuExecuteHdl, const OUString&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(const weld::ComboBox*); DECL_LINK(CheckBoxHdl, weld::Toggleable&, void ); diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index c6887dc9d57b..cc270d4c8143 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -28,7 +28,7 @@ class SwParaDlg final : public SfxTabDialogController SwView& m_rView; bool m_bDrawParaDlg; - void PageCreated(const OString& rId, SfxTabPage& rPage) override; + void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: SwParaDlg(weld::Window *pParent, @@ -37,7 +37,7 @@ public: sal_uInt8 nDialogMode, const OUString *pCollName, bool bDraw = false, - const OString& sDefPage = OString()); + const OUString& sDefPage = {}); virtual ~SwParaDlg() override; }; diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index ccf2fa12d22c..41d9673a7488 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -29,7 +29,7 @@ class SwTableTabDlg final : public SfxTabDialogController { SwWrtShell* m_pShell; - virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override; public: SwTableTabDlg(weld::Window* pParent, const SfxItemSet* pItemSet, SwWrtShell* pSh); diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index 62e1753e4a46..8135e5a74669 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -40,13 +40,13 @@ public: SwTemplateDlgController(weld::Window* pParent, SfxStyleSheetBase& rBase, SfxStyleFamily nRegion, - const OString& sPage, + const OUString& sPage, SwWrtShell* pActShell, bool bNew); virtual void RefreshInputSet() override; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override; virtual short Ok() override; }; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 347962572694..cda9ec73fcd5 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwOneExampleFrame final : public weld::CustomWidgetController bool m_bIsInitialized; DECL_DLLPRIVATE_LINK( TimeoutHdl, Timer*, void ); - void PopupHdl(std::string_view rId); + void PopupHdl(std::u16string_view rId); SAL_DLLPRIVATE void CreateControl(); SAL_DLLPRIVATE void DisposeControl(); diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 2c402cf44bb3..80e32a4cdb30 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -199,19 +199,19 @@ SwSpellPopup::SwSpellPopup( uno::Reference< linguistic2::XSpellAlternatives > xAlt, const OUString &rParaText) : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/spellmenu.ui", "") - , m_xPopupMenu(m_aBuilder.get_menu("menu")) - , m_nIgnoreWordId(m_xPopupMenu->GetItemId("ignoreall")) - , m_nAddMenuId(m_xPopupMenu->GetItemId("addmenu")) - , m_nAddId(m_xPopupMenu->GetItemId("add")) - , m_nSpellDialogId(m_xPopupMenu->GetItemId("spelldialog")) - , m_nCorrectMenuId(m_xPopupMenu->GetItemId("correctmenu")) - , m_nCorrectDialogId(m_xPopupMenu->GetItemId("correctdialog")) - , m_nLangSelectionMenuId(m_xPopupMenu->GetItemId("langselection")) - , m_nLangParaMenuId(m_xPopupMenu->GetItemId("langpara")) - , m_nRedlineAcceptId(m_xPopupMenu->GetItemId("accept")) - , m_nRedlineRejectId(m_xPopupMenu->GetItemId("reject")) - , m_nRedlineNextId(m_xPopupMenu->GetItemId("next")) - , m_nRedlinePrevId(m_xPopupMenu->GetItemId("prev")) + , m_xPopupMenu(m_aBuilder.get_menu(u"menu")) + , m_nIgnoreWordId(m_xPopupMenu->GetItemId(u"ignoreall")) + , m_nAddMenuId(m_xPopupMenu->GetItemId(u"addmenu")) + , m_nAddId(m_xPopupMenu->GetItemId(u"add")) + , m_nSpellDialogId(m_xPopupMenu->GetItemId(u"spelldialog")) + , m_nCorrectMenuId(m_xPopupMenu->GetItemId(u"correctmenu")) + , m_nCorrectDialogId(m_xPopupMenu->GetItemId(u"correctdialog")) + , m_nLangSelectionMenuId(m_xPopupMenu->GetItemId(u"langselection")) + , m_nLangParaMenuId(m_xPopupMenu->GetItemId(u"langpara")) + , m_nRedlineAcceptId(m_xPopupMenu->GetItemId(u"accept")) + , m_nRedlineRejectId(m_xPopupMenu->GetItemId(u"reject")) + , m_nRedlineNextId(m_xPopupMenu->GetItemId(u"next")) + , m_nRedlinePrevId(m_xPopupMenu->GetItemId(u"prev")) , m_pSh( pWrtSh ) , m_xSpellAlt(std::move(xAlt)) , m_bGrammarResults(false) @@ -250,14 +250,14 @@ SwSpellPopup::SwSpellPopup( } } - m_xPopupMenu->InsertSeparator(OString(), 0); + m_xPopupMenu->InsertSeparator({}, 0); bEnable = true; sal_uInt16 nAutoCorrItemId = MN_AUTOCORR_START; sal_uInt16 nItemId = MN_SUGGESTION_START; for (sal_uInt16 i = 0; i < nStringCount; ++i) { const OUString aEntry = aSuggestions[ i ]; - m_xPopupMenu->InsertItem(nItemId, aEntry, MenuItemBits::NONE, OString(), i); + m_xPopupMenu->InsertItem(nItemId, aEntry, MenuItemBits::NONE, {}, i); m_xPopupMenu->SetHelpId(nItemId, HID_LINGU_REPLACE); if (!aSuggestionImageUrl.isEmpty()) m_xPopupMenu->SetItemImage(nItemId, aImage); @@ -286,7 +286,7 @@ SwSpellPopup::SwSpellPopup( sal_uInt16 nItemPos = m_xPopupMenu->GetItemPos(m_nIgnoreWordId); OUString aIgnoreSelection( SwResId( STR_IGNORE_SELECTION ) ); - m_xPopupMenu->InsertItem(MN_IGNORE_SELECTION, aIgnoreSelection, MenuItemBits::NONE, OString(), nItemPos); + m_xPopupMenu->InsertItem(MN_IGNORE_SELECTION, aIgnoreSelection, MenuItemBits::NONE, {}, nItemPos); m_xPopupMenu->SetHelpId(MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION); m_xPopupMenu->EnableItem(m_nCorrectMenuId, bEnable); @@ -411,19 +411,19 @@ SwSpellPopup::SwSpellPopup( const uno::Sequence< OUString > &rSuggestions, const OUString &rParaText ) : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/spellmenu.ui", "") - , m_xPopupMenu(m_aBuilder.get_menu("menu")) - , m_nIgnoreWordId(m_xPopupMenu->GetItemId("ignoreall")) - , m_nAddMenuId(m_xPopupMenu->GetItemId("addmenu")) - , m_nAddId(m_xPopupMenu->GetItemId("add")) - , m_nSpellDialogId(m_xPopupMenu->GetItemId("spelldialog")) - , m_nCorrectMenuId(m_xPopupMenu->GetItemId("correctmenu")) - , m_nCorrectDialogId(m_xPopupMenu->GetItemId("correctdialog")) - , m_nLangSelectionMenuId(m_xPopupMenu->GetItemId("langselection")) - , m_nLangParaMenuId(m_xPopupMenu->GetItemId("langpara")) - , m_nRedlineAcceptId(m_xPopupMenu->GetItemId("accept")) - , m_nRedlineRejectId(m_xPopupMenu->GetItemId("reject")) - , m_nRedlineNextId(m_xPopupMenu->GetItemId("next")) - , m_nRedlinePrevId(m_xPopupMenu->GetItemId("prev")) + , m_xPopupMenu(m_aBuilder.get_menu(u"menu")) + , m_nIgnoreWordId(m_xPopupMenu->GetItemId(u"ignoreall")) + , m_nAddMenuId(m_xPopupMenu->GetItemId(u"addmenu")) + , m_nAddId(m_xPopupMenu->GetItemId(u"add")) + , m_nSpellDialogId(m_xPopupMenu->GetItemId(u"spelldialog")) + , m_nCorrectMenuId(m_xPopupMenu->GetItemId(u"correctmenu")) + , m_nCorrectDialogId(m_xPopupMenu->GetItemId(u"correctdialog")) + , m_nLangSelectionMenuId(m_xPopupMenu->GetItemId(u"langselection")) + , m_nLangParaMenuId(m_xPopupMenu->GetItemId(u"langpara")) + , m_nRedlineAcceptId(m_xPopupMenu->GetItemId(u"accept")) + , m_nRedlineRejectId(m_xPopupMenu->GetItemId(u"reject")) + , m_nRedlineNextId(m_xPopupMenu->GetItemId(u"next")) + , m_nRedlinePrevId(m_xPopupMenu->GetItemId(u"prev")) , m_pSh(pWrtSh) , m_bGrammarResults(true) { @@ -432,8 +432,8 @@ SwSpellPopup::SwSpellPopup( sal_uInt16 nPos = 0; OUString aMessageText( rResult.aErrors[ nErrorInResult ].aShortComment ); - m_xPopupMenu->InsertSeparator(OString(), nPos++); - m_xPopupMenu->InsertItem(MN_SHORT_COMMENT, aMessageText, MenuItemBits::NOSELECT, OString(), nPos++); + m_xPopupMenu->InsertSeparator({}, nPos++); + m_xPopupMenu->InsertItem(MN_SHORT_COMMENT, aMessageText, MenuItemBits::NOSELECT, {}, nPos++); if (bUseImagesInMenus) m_xPopupMenu->SetItemImage(MN_SHORT_COMMENT, Image(StockImage::Yes, BMP_INFO_16)); @@ -453,12 +453,12 @@ SwSpellPopup::SwSpellPopup( if ( !m_sExplanationLink.isEmpty( ) ) { - m_xPopupMenu->InsertItem(MN_EXPLANATION_LINK, SwResId(STR_EXPLANATION_LINK), MenuItemBits::TEXT | MenuItemBits::HELP, OString(), nPos++); + m_xPopupMenu->InsertItem(MN_EXPLANATION_LINK, SwResId(STR_EXPLANATION_LINK), MenuItemBits::TEXT | MenuItemBits::HELP, {}, nPos++); } m_xPopupMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics); - m_xPopupMenu->InsertSeparator(OString(), nPos++); + m_xPopupMenu->InsertSeparator({}, nPos++); if ( rSuggestions.hasElements() ) // suggestions available... { Image aImage; @@ -477,14 +477,14 @@ SwSpellPopup::SwSpellPopup( sal_uInt16 nItemId = MN_SUGGESTION_START; for (const OUString& aEntry : std::as_const(rSuggestions)) { - m_xPopupMenu->InsertItem(nItemId, aEntry, MenuItemBits::NONE, OString(), nPos++); + m_xPopupMenu->InsertItem(nItemId, aEntry, MenuItemBits::NONE, {}, nPos++); m_xPopupMenu->SetHelpId(nItemId, HID_LINGU_REPLACE); if (!aSuggestionImageUrl.isEmpty()) m_xPopupMenu->SetItemImage(nItemId, aImage); ++nItemId; } - m_xPopupMenu->InsertSeparator(OString(), nPos++); + m_xPopupMenu->InsertSeparator({}, nPos++); } uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame().GetFrame().GetFrameInterface(); @@ -495,7 +495,7 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->SetItemText(m_nSpellDialogId, vcl::CommandInfoProvider::GetPopupLabelForCommand(aCommandProperties)); sal_uInt16 nItemPos = m_xPopupMenu->GetItemPos(m_nIgnoreWordId); - m_xPopupMenu->InsertItem(MN_IGNORE_SELECTION, aIgnoreSelection, MenuItemBits::NONE, OString(), nItemPos); + m_xPopupMenu->InsertItem(MN_IGNORE_SELECTION, aIgnoreSelection, MenuItemBits::NONE, {}, nItemPos); m_xPopupMenu->SetHelpId(MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION); m_xPopupMenu->EnableItem(m_nCorrectMenuId, false); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 3b587ec2d9a0..cf49bb1885d6 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -1288,9 +1288,9 @@ IMPL_LINK(SwRedlineAcceptDlg, CommandHdl, const CommandEvent&, rCEvt, bool) if (nColumn == -1) nColumn = 4; for (sal_Int32 i = 0; i < 5; ++i) - m_xSortMenu->set_active("writersort" + OString::number(i), i == nColumn); + m_xSortMenu->set_active(u"writersort" + OUString::number(i), i == nColumn); - OString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (sCommand == "writeredit") { diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 9a5c12707991..2adddb87cd33 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -292,10 +292,10 @@ void SwInputWindow::ShowWin() } } -void SwInputWindow::MenuHdl(std::string_view command) +void SwInputWindow::MenuHdl(std::u16string_view command) { if (!command.empty()) - mxEdit->replace_selection(OUString::fromUtf8(command) + " "); + mxEdit->replace_selection(OUString::Concat(command) + " "); } IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl, ToolBox *, void) diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 840b94b73442..eed488a72c46 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -854,7 +854,7 @@ void SAL_CALL PrevNextScrollToolboxController::statusChanged( const css::frame:: if (rEvent.FeatureURL.Path == "NavElement") { if (m_pToolbar) - m_pToolbar->set_item_tooltip_text(m_aCommandURL.toUtf8(), lcl_GetScrollToolTip(meType != PrevNextScrollToolboxController::PREVIOUS)); + m_pToolbar->set_item_tooltip_text(m_aCommandURL, lcl_GetScrollToolTip(meType != PrevNextScrollToolboxController::PREVIOUS)); else { ToolBox* pToolBox = nullptr; @@ -866,7 +866,7 @@ void SAL_CALL PrevNextScrollToolboxController::statusChanged( const css::frame:: else if (rEvent.FeatureURL.Path == "ScrollToPrevious" || rEvent.FeatureURL.Path == "ScrollToNext") { if (m_pToolbar) - m_pToolbar->set_item_sensitive(m_aCommandURL.toUtf8(), rEvent.IsEnabled); + m_pToolbar->set_item_sensitive(m_aCommandURL, rEvent.IsEnabled); else { ToolBox* pToolBox = nullptr; diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 112cf98d3095..4901123f2ba4 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -483,7 +483,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) } else if (pItem) { - pDlg->SetCurPageId(OUStringToOString(pItem->GetValue(), RTL_TEXTENCODING_UTF8)); + pDlg->SetCurPageId(pItem->GetValue()); } sal_uInt16 nRet = pDlg->Execute(); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index c4154b00de7e..df4dac954495 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2897,7 +2897,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) // for example disable header SwView& rTempView = GetView(); - OString sPageId; + OUString sPageId; switch (nSlot) { case FN_FORMAT_PAGE_COLUMN_DLG: @@ -2908,7 +2908,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) break; case FN_FORMAT_PAGE_DLG: if (pItem) - sPageId = OUStringToOString(static_cast<const SfxStringItem*>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8); + sPageId = static_cast<const SfxStringItem*>(pItem)->GetValue(); break; } rTempView.GetDocShell()->FormatPage(rReq.GetFrameWeld(), rPageDesc.GetName(), sPageId, rSh, &rReq); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 7de388835094..9042e7f1be33 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -361,7 +361,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) } else if (pItem) { - pDlg->SetCurPageId(OUStringToOString(pItem->GetValue(), RTL_TEXTENCODING_UTF8)); + pDlg->SetCurPageId(pItem->GetValue()); } sal_uInt16 nRet = pDlg->Execute(); diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index ec2ea5b63e7f..2b10c0d9261d 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -509,10 +509,10 @@ void SwFrameShell::Execute(SfxRequest &rReq) const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() ); aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) ); - OString sDefPage; + OUString sDefPage; const SfxStringItem* pDlgItem; if(pArgs && (pDlgItem = pArgs->GetItemIfSet(FN_FORMAT_FRAME_DLG, false))) - sDefPage = OUStringToOString(pDlgItem->GetValue(), RTL_TEXTENCODING_UTF8); + sDefPage = pDlgItem->GetValue(); aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame().GetFrame())); FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebView*>( &GetView()) != nullptr ); diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 4090a89bcaa5..f57a68383360 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -629,7 +629,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if (pDlg) { if (pItem) - pDlg->SetCurPageId(OUStringToOString(static_cast<const SfxStringItem *>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8)); + pDlg->SetCurPageId(static_cast<const SfxStringItem *>(pItem)->GetValue()); auto pRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index d765b62f9328..4f1ace85cbcb 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -186,7 +186,7 @@ static void sw_CharDialog(SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot, { const SfxStringItem* pItem = (*pReq).GetArg<SfxStringItem>(FN_PARAM_1); if (pItem) - pDlg->SetCurPageId(OUStringToOString(pItem->GetValue(), RTL_TEXTENCODING_UTF8)); + pDlg->SetCurPageId(pItem->GetValue()); } } @@ -1520,9 +1520,9 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( bUseDialog && GetActiveView() ) { - OString sDefPage; + OUString sDefPage; if (pItem) - sDefPage = OUStringToOString(static_cast<const SfxStringItem*>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8); + sDefPage = static_cast<const SfxStringItem*>(pItem)->GetValue(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); pDlg.reset(pFact->CreateSwParaDlg(GetView().GetFrameWeld(), GetView(), aCoreSet, false, sDefPage)); diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index bfa252217087..412f603dcb32 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -195,7 +195,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxNumBulletTabDialog(pParent, &aSet, GetShell())); const SfxStringItem* pPageItem = rReq.GetArg<SfxStringItem>(FN_PARAM_1); if ( pPageItem ) - pDlg->SetCurPageId( OUStringToOString( pPageItem->GetValue(), RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetCurPageId( pPageItem->GetValue() ); auto pRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more diff --git a/sw/source/uibase/uitest/uiobject.cxx b/sw/source/uibase/uitest/uiobject.cxx index 7f0430d271d1..097769e3704f 100644 --- a/sw/source/uibase/uitest/uiobject.cxx +++ b/sw/source/uibase/uitest/uiobject.cxx @@ -229,7 +229,7 @@ void PageBreakUIObject::execute(const OUString& rAction, const StringMap& rParameters) { if (rAction == "DELETE" || rAction == "EDIT") - mxPageBreakUIObject->execute(rAction.toAsciiLowerCase().toUtf8()); + mxPageBreakUIObject->execute(rAction.toAsciiLowerCase()); else WindowUIObject::execute(rAction, rParameters); } diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index a4f1def14629..4599d8386b93 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -728,7 +728,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c if ( aHID.GetProtocol() != INetProtocol::Hid ) throw IllegalArgumentException (); - m_pView->GetEditWin().SetHelpId( OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); + m_pView->GetEditWin().SetHelpId( aHID.GetURLPath() ); } break; case HANDLE_VIEWSET_HORI_RULER_METRIC: @@ -903,7 +903,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u bBool = false; SwEditWin &rEditWin = m_pView->GetEditWin(); - OUString sHelpURL = INET_HID_SCHEME + OUString::fromUtf8( rEditWin.GetHelpId() ); + OUString sHelpURL = INET_HID_SCHEME + rEditWin.GetHelpId(); rValue <<= sHelpURL; } break; diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index 4cd9029fd339..f7460b15d3e7 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -99,7 +99,7 @@ void SwBookmarkControl::Command( const CommandEvent& rCEvt ) } ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1)); weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect); - OString sResult = xPopup->popup_at_rect(pParent, aRect); + OUString sResult = xPopup->popup_at_rect(pParent, aRect); if (!sResult.isEmpty()) { SfxUInt16Item aBookmark( FN_STAT_BOOKMARK, aBookmarkIdx[sResult.toUInt32()] ); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f4bac8aca9cc..806b207d4d1a 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1400,7 +1400,7 @@ static bool lcl_InsertExpandCollapseAllItem(const weld::TreeView& rContentTree, { if (rContentTree.iter_has_child(rEntry) || rContentTree.get_children_on_demand(rEntry)) { - rPop.set_label(OString::number(800), IsAllExpanded(rContentTree, rEntry) ? SwResId(STR_COLLAPSEALL) : SwResId(STR_EXPANDALL)); + rPop.set_label(OUString::number(800), IsAllExpanded(rContentTree, rEntry) ? SwResId(STR_COLLAPSEALL) : SwResId(STR_EXPANDALL)); return false; } return true; @@ -1408,9 +1408,9 @@ static bool lcl_InsertExpandCollapseAllItem(const weld::TreeView& rContentTree, static void lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, const weld::TreeView& rContentTree, const weld::TreeIter& rEntry, weld::Menu& rPop) { - rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), false); - rPop.set_sensitive(OString::number(HIDE_OUTLINE_CONTENT_VISIBILITY), false); - rPop.set_sensitive(OString::number(SHOW_OUTLINE_CONTENT_VISIBILITY), false); + rPop.set_sensitive(OUString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), false); + rPop.set_sensitive(OUString::number(HIDE_OUTLINE_CONTENT_VISIBILITY), false); + rPop.set_sensitive(OUString::number(SHOW_OUTLINE_CONTENT_VISIBILITY), false); // todo: multi selection if (rContentTree.count_selected_rows() > 1) @@ -1423,7 +1423,7 @@ static void lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, cons if (pSh->GetViewOptions()->IsTreatSubOutlineLevelsAsContent()) { if (!bIsRoot) - rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), true); + rPop.set_sensitive(OUString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), true); return; } } @@ -1522,11 +1522,11 @@ static void lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, cons break; // mixed so no need to continue } - rPop.set_sensitive(OString::number(HIDE_OUTLINE_CONTENT_VISIBILITY), bHasUnfolded); - rPop.set_sensitive(OString::number(SHOW_OUTLINE_CONTENT_VISIBILITY), bHasFolded); + rPop.set_sensitive(OUString::number(HIDE_OUTLINE_CONTENT_VISIBILITY), bHasUnfolded); + rPop.set_sensitive(OUString::number(SHOW_OUTLINE_CONTENT_VISIBILITY), bHasFolded); } - rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), !bIsRoot); + rPop.set_sensitive(OUString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), !bIsRoot); } IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) @@ -1569,15 +1569,15 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) for(int i = 1; i <= 3; ++i) xSubPopOutlineTracking->append_radio(OUString::number(i + 10), m_aContextStrings[IDX_STR_OUTLINE_TRACKING + i]); - xSubPopOutlineTracking->set_active(OString::number(10 + m_nOutlineTracking), true); + xSubPopOutlineTracking->set_active(OUString::number(10 + m_nOutlineTracking), true); for (int i = 1; i <= MAXLEVEL; ++i) xSubPop1->append_radio(OUString::number(i + 100), OUString::number(i)); - xSubPop1->set_active(OString::number(100 + m_nOutlineLevel), true); + xSubPop1->set_active(OUString::number(100 + m_nOutlineLevel), true); for (int i=0; i < 3; ++i) xSubPop2->append_radio(OUString::number(i + 201), m_aContextStrings[IDX_STR_HYPERLINK + i]); - xSubPop2->set_active(OString::number(201 + static_cast<int>(GetParentWindow()->GetRegionDropMode())), true); + xSubPop2->set_active(OUString::number(201 + static_cast<int>(GetParentWindow()->GetRegionDropMode())), true); // Insert the list of the open files { @@ -1590,7 +1590,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) IDX_STR_INACTIVE] + ")"; xSubPop3->append_radio(OUString::number(nId), sInsert); if (State::CONSTANT == m_eState && m_pActiveShell == &pView->GetWrtShell()) - xSubPop3->set_active(OString::number(nId), true); + xSubPop3->set_active(OUString::number(nId), true); pView = SwModule::GetNextView(pView); nId++; } @@ -1604,9 +1604,9 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) xSubPop3->append_radio(OUString::number(nId), sHiddenEntry); } if (State::ACTIVE == m_eState) - xSubPop3->set_active(OString::number(--nId), true); + xSubPop3->set_active(OUString::number(--nId), true); else if (State::HIDDEN == m_eState) - xSubPop3->set_active(OString::number(nId), true); + xSubPop3->set_active(OUString::number(nId), true); } std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator()); @@ -1675,7 +1675,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) xPop->set_active("sort", pType->GetSortType()); } - OString aIdent; + OUString aIdent; switch (nContentType) { case ContentTypeId::TABLE: @@ -1836,7 +1836,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) if (!pBase->IsTOXBaseInReadonly()) bRemoveEditEntry = false; - xPop->set_active(OString::number(405), SwEditShell::IsTOXBaseReadonly(*pBase)); + xPop->set_active(OUString::number(405), SwEditShell::IsTOXBaseReadonly(*pBase)); } else if(ContentTypeId::TABLE == nContentType) { @@ -1846,8 +1846,8 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) bool bFull = false; OUString sTableName = weld::fromId<SwContent*>(m_xTreeView->get_id(*xEntry))->GetName(); bool bProt = m_pActiveShell->HasTableAnyProtection( &sTableName, &bFull ); - xPop->set_sensitive(OString::number(403), !bFull); - xPop->set_sensitive(OString::number(404), bProt); + xPop->set_sensitive(OUString::number(403), !bFull); + xPop->set_sensitive(OUString::number(404), bProt); } else if(ContentTypeId::REGION == nContentType) { @@ -1892,30 +1892,30 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) } if (bRemoveToggleExpandEntry) - xPop->remove(OString::number(800)); + xPop->remove(OUString::number(800)); if (bRemoveGotoEntry) - xPop->remove(OString::number(900)); + xPop->remove(OUString::number(900)); if (bRemoveSelectEntry) - xPop->remove(OString::number(805)); + xPop->remove(OUString::number(805)); if (bRemoveChapterEntries) { - xPop->remove(OString::number(801)); - xPop->remove(OString::number(802)); - xPop->remove(OString::number(803)); - xPop->remove(OString::number(804)); + xPop->remove(OUString::number(801)); + xPop->remove(OUString::number(802)); + xPop->remove(OUString::number(803)); + xPop->remove(OUString::number(804)); } if (bRemoveSendOutlineEntry) - xPop->remove(OString::number(700)); + xPop->remove(OUString::number(700)); if (bRemovePostItEntries) { - xPop->remove(OString::number(600)); - xPop->remove(OString::number(601)); - xPop->remove(OString::number(602)); + xPop->remove(OUString::number(600)); + xPop->remove(OUString::number(601)); + xPop->remove(OUString::number(602)); } if (bRemoveDeleteChapterEntry) @@ -1958,20 +1958,20 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) bRemoveDeleteFieldEntry; if (bRemoveRenameEntry) - xPop->remove(OString::number(502)); + xPop->remove(OUString::number(502)); if (bRemoveIndexEntries) { - xPop->remove(OString::number(401)); - xPop->remove(OString::number(402)); - xPop->remove(OString::number(405)); + xPop->remove(OUString::number(401)); + xPop->remove(OUString::number(402)); + xPop->remove(OUString::number(405)); } if (bRemoveUnprotectEntry) - xPop->remove(OString::number(404)); + xPop->remove(OUString::number(404)); if (bRemoveEditEntry) - xPop->remove(OString::number(403)); + xPop->remove(OUString::number(403)); if (bRemoveToggleExpandEntry && bRemoveSendOutlineEntry) @@ -1995,19 +1995,19 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) if (!bOutline) { xSubPop1.reset(); - xPop->remove(OString::number(1)); // outline level menu + xPop->remove(OUString::number(1)); // outline level menu } if (!bOutline || State::HIDDEN == m_eState) { xSubPopOutlineTracking.reset(); - xPop->remove(OString::number(4)); // outline tracking menu + xPop->remove(OUString::number(4)); // outline tracking menu } if (!bOutline || State::HIDDEN == m_eState || !m_pActiveShell->GetViewOptions()->IsShowOutlineContentVisibilityButton() || m_pActiveShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount() == 0) { xSubPopOutlineContent.reset(); - xPop->remove(OString::number(5)); // outline folding menu + xPop->remove(OUString::number(5)); // outline folding menu xPop->remove("separator3"); } @@ -2058,7 +2058,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) } xPop->set_sensitive("collapseallcategories", bSetSensitiveCollapseAllCategories); - OString sCommand = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sCommand = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) ExecuteContextMenuAction(sCommand); @@ -3220,14 +3220,14 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint) } } -void SwContentTree::ExecCommand(std::string_view rCmd, bool bOutlineWithChildren) +void SwContentTree::ExecCommand(std::u16string_view rCmd, bool bOutlineWithChildren) { MakeAllOutlineContentTemporarilyVisible a(GetWrtShell()->GetDoc()); - const bool bUp = rCmd == "chapterup"; - const bool bUpDown = bUp || rCmd == "chapterdown"; - const bool bLeft = rCmd == "promote"; - const bool bLeftRight = bLeft || rCmd == "demote"; + const bool bUp = rCmd == u"chapterup"; + const bool bUpDown = bUp || rCmd == u"chapterdown"; + const bool bLeft = rCmd == u"promote"; + const bool bLeftRight = bLeft || rCmd == u"demote"; if (!bUpDown && !bLeftRight) return; if (GetWrtShell()->GetView().GetDocShell()->IsReadOnly() || @@ -4436,13 +4436,13 @@ IMPL_LINK(SwContentTree, KeyInputHdl, const KeyEvent&, rEvent, bool) else if (aCode.IsMod1()) { if (aCode.GetCode() == KEY_LEFT) - ExecCommand("promote", !aCode.IsShift()); + ExecCommand(u"promote", !aCode.IsShift()); else if (aCode.GetCode() == KEY_RIGHT) - ExecCommand("demote", !aCode.IsShift()); + ExecCommand(u"demote", !aCode.IsShift()); else if (aCode.GetCode() == KEY_UP) - ExecCommand("chapterup", !aCode.IsShift()); + ExecCommand(u"chapterup", !aCode.IsShift()); else if (aCode.GetCode() == KEY_DOWN) - ExecCommand("chapterdown", !aCode.IsShift()); + ExecCommand(u"chapterdown", !aCode.IsShift()); else if (aCode.GetCode() == KEY_C) CopyOutlineSelections(); else @@ -4556,7 +4556,7 @@ IMPL_LINK(SwContentTree, QueryTooltipHdl, const weld::TreeIter&, rEntry, OUStrin return sEntry; } -void SwContentTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry) +void SwContentTree::ExecuteContextMenuAction(const OUString& rSelectedPopupEntry) { if (rSelectedPopupEntry == "copy") { @@ -4576,7 +4576,7 @@ void SwContentTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry) } { - std::map<OString, ContentTypeId> mPopupEntryToContentTypeId + std::map<OUString, ContentTypeId> mPopupEntryToContentTypeId { {"tabletracking", ContentTypeId::TABLE}, {"frametracking", ContentTypeId::FRAME}, @@ -4755,16 +4755,16 @@ void SwContentTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry) ExpandOrCollapseAll(*m_xTreeView, *xFirst); break; case 801: - ExecCommand("chapterup", true); + ExecCommand(u"chapterup", true); break; case 802: - ExecCommand("chapterdown", true); + ExecCommand(u"chapterdown", true); break; case 803: - ExecCommand("promote", true); + ExecCommand(u"promote", true); break; case 804: - ExecCommand("demote", true); + ExecCommand(u"demote", true); break; case 805: // select document content { diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index d59a0ccfdc4a..9ce80bf0f3fe 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -290,7 +290,7 @@ IMPL_LINK(SwGlobalTree, CommandHdl, const CommandEvent&, rCEvt, bool) xPopup->set_sensitive("editcontent", bool(nEnableFlags & MenuEnableFlags::Edit)); xPopup->set_sensitive("deleteentry", bool(nEnableFlags & MenuEnableFlags::Delete)); - OString sCommand = xPopup->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); + OUString sCommand = xPopup->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) ExecuteContextMenuAction(sCommand); @@ -299,17 +299,17 @@ IMPL_LINK(SwGlobalTree, CommandHdl, const CommandEvent&, rCEvt, bool) return bPop; } -void SwGlobalTree::TbxMenuHdl(std::string_view rCommand, weld::Menu& rMenu) +void SwGlobalTree::TbxMenuHdl(std::u16string_view rCommand, weld::Menu& rMenu) { const MenuEnableFlags nEnableFlags = GetEnableFlags(); - if (rCommand == "insert") + if (rCommand == u"insert") { rMenu.set_sensitive("insertindex", bool(nEnableFlags & MenuEnableFlags::InsertIdx)); rMenu.set_sensitive("insertfile", bool(nEnableFlags & MenuEnableFlags::InsertFile)); rMenu.set_sensitive("insertnewfile", bool(nEnableFlags & MenuEnableFlags::InsertFile)); rMenu.set_sensitive("inserttext", bool(nEnableFlags & MenuEnableFlags::InsertText)); } - else if (rCommand == "update") + else if (rCommand == u"update") { rMenu.set_sensitive("updatesel", bool(nEnableFlags & MenuEnableFlags::UpdateSel)); } @@ -568,7 +568,7 @@ void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) } } -void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry) +void SwGlobalTree::ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry) { bool bUpdateHard = false; @@ -582,7 +582,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry oContCopy.emplace(pCont->GetDocPos()); SfxDispatcher& rDispatch = *m_pActiveShell->GetView().GetViewFrame().GetDispatcher(); sal_uInt16 nSlot = 0; - if (rSelectedPopupEntry == "updatesel") + if (rSelectedPopupEntry == u"updatesel") { // Two passes: first update the areas, then the directories. m_xTreeView->selected_foreach([this](weld::TreeIter& rSelEntry){ @@ -603,20 +603,20 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry bUpdateHard = true; } - else if (rSelectedPopupEntry == "updateindex") + else if (rSelectedPopupEntry == u"updateindex") { nSlot = FN_UPDATE_TOX; bUpdateHard = true; } - else if (rSelectedPopupEntry == "updatelinks" || rSelectedPopupEntry == "updateall") + else if (rSelectedPopupEntry == u"updatelinks" || rSelectedPopupEntry == u"updateall") { m_pActiveShell->GetLinkManager().UpdateAllLinks(true, false, nullptr); - if (rSelectedPopupEntry == "updateall") + if (rSelectedPopupEntry == u"updateall") nSlot = FN_UPDATE_TOX; pCont = nullptr; bUpdateHard = true; } - else if (rSelectedPopupEntry == "editcontent") + else if (rSelectedPopupEntry == u"editcontent") { OSL_ENSURE(pCont, "edit without entry ? " ); if (pCont) @@ -624,7 +624,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry EditContent(pCont); } } - else if (rSelectedPopupEntry == "editlink") + else if (rSelectedPopupEntry == u"editlink") { OSL_ENSURE(pCont, "edit without entry ? " ); if (pCont) @@ -635,7 +635,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry { &aName }); } } - else if (rSelectedPopupEntry == "deleteentry") + else if (rSelectedPopupEntry == u"deleteentry") { // If several entries selected, then after each delete the array // must be refilled. So you do not have to remember anything, @@ -657,7 +657,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry m_pActiveShell->EndAction(); pCont = nullptr; } - else if (rSelectedPopupEntry == "insertindex") + else if (rSelectedPopupEntry == u"insertindex") { if(oContCopy) { @@ -688,13 +688,13 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry pCont = nullptr; } } - else if (rSelectedPopupEntry == "insertfile") + else if (rSelectedPopupEntry == u"insertfile") { m_oDocContent = std::move(oContCopy); InsertRegion( &*m_oDocContent ); pCont = nullptr; } - else if (rSelectedPopupEntry == "insertnewfile") + else if (rSelectedPopupEntry == u"insertnewfile") { SfxViewFrame& rGlobFrame = m_pActiveShell->GetView().GetViewFrame(); SwGlobalFrameListener_Impl aFrameListener(rGlobFrame); @@ -753,7 +753,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry } } } - else if (rSelectedPopupEntry == "inserttext") + else if (rSelectedPopupEntry == u"inserttext") { if (pCont) m_pActiveShell->InsertGlobalDocContent(*pCont); @@ -764,7 +764,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry } m_pActiveShell->GetView().GetEditWin().GrabFocus(); } - else if (rSelectedPopupEntry == "update") + else if (rSelectedPopupEntry == u"update") pCont = nullptr; if (pCont) @@ -839,12 +839,12 @@ void SwGlobalTree::HideTree() m_xTreeView->hide(); } -void SwGlobalTree::ExecCommand(std::string_view rCmd) +void SwGlobalTree::ExecCommand(std::u16string_view rCmd) { int nEntry = m_xTreeView->get_selected_index(); if (nEntry == -1) return; - if (rCmd == "edit") + if (rCmd == u"edit") { const SwGlblDocContent* pCont = weld::fromId<const SwGlblDocContent*>( m_xTreeView->get_id(nEntry)); @@ -857,13 +857,13 @@ void SwGlobalTree::ExecCommand(std::string_view rCmd) bool bMove = false; int nSource = nEntry; int nDest = nSource; - if (rCmd == "movedown") + if (rCmd == u"movedown") { int nEntryCount = m_xTreeView->n_children(); bMove = nEntryCount > nSource + 1; nDest+= 2; } - else if (rCmd == "moveup") + else if (rCmd == u"moveup") { bMove = 0 != nSource; nDest--; diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index c09fd2dce2b6..e609aa539e4c 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -191,7 +191,7 @@ void SwNavigationPI::UsePage() } // Select handler of the toolboxes -IMPL_LINK(SwNavigationPI, ToolBoxSelectHdl, const OString&, rCommand, void) +IMPL_LINK(SwNavigationPI, ToolBoxSelectHdl, const OUString&, rCommand, void) { SwView *pView = GetCreateView(); if (!pView) @@ -330,7 +330,7 @@ IMPL_LINK(SwNavigationPI, ToolBoxSelectHdl, const OString&, rCommand, void) } // Click handler of the toolboxes -IMPL_LINK(SwNavigationPI, ToolBoxClickHdl, const OString&, rCommand, void) +IMPL_LINK(SwNavigationPI, ToolBoxClickHdl, const OUString&, rCommand, void) { if (!m_xGlobalToolBox->get_menu_item_active(rCommand)) return; @@ -341,7 +341,7 @@ IMPL_LINK(SwNavigationPI, ToolBoxClickHdl, const OString&, rCommand, void) m_xGlobalTree->TbxMenuHdl(rCommand, *m_xInsertMenu); } -IMPL_LINK(SwNavigationPI, ToolBox6DropdownClickHdl, const OString&, rCommand, void) +IMPL_LINK(SwNavigationPI, ToolBox6DropdownClickHdl, const OUString&, rCommand, void) { if (!m_xContent6ToolBox->get_menu_item_active(rCommand)) return; @@ -363,7 +363,7 @@ IMPL_LINK(SwNavigationPI, ToolBox6DropdownClickHdl, const OString&, rCommand, vo } } -IMPL_LINK(SwNavigationPI, DropModeMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SwNavigationPI, DropModeMenuSelectHdl, const OUString&, rIdent, void) { if (rIdent == "hyperlink") SetRegionDropMode(RegionMode::NONE); @@ -373,18 +373,18 @@ IMPL_LINK(SwNavigationPI, DropModeMenuSelectHdl, const OString&, rIdent, void) SetRegionDropMode(RegionMode::EMBEDDED); } -IMPL_LINK(SwNavigationPI, GlobalMenuSelectHdl, const OString&, rIdent, void) +IMPL_LINK(SwNavigationPI, GlobalMenuSelectHdl, const OUString&, rIdent, void) { m_xGlobalTree->ExecuteContextMenuAction(rIdent); } -IMPL_LINK(SwNavigationPI, ToolBox5DropdownClickHdl, const OString&, rCommand, void) +IMPL_LINK(SwNavigationPI, ToolBox5DropdownClickHdl, const OUString&, rCommand, void) { if (!m_xContent5ToolBox->get_menu_item_active(rCommand)) return; if (rCommand == "headings") - m_xHeadingsMenu->set_active(OString::number(m_xContentTree->GetOutlineLevel()), true); + m_xHeadingsMenu->set_active(OUString::number(m_xContentTree->GetOutlineLevel()), true); } // Action-Handler Edit: @@ -631,7 +631,7 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent, m_xGlobalTree->set_selection_mode(SelectionMode::Multiple); // Handler - Link<const OString&, void> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl); + Link<const OUString&, void> aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl); m_xContent1ToolBox->connect_clicked(aLk); m_xContent3ToolBox->connect_clicked(aLk); m_xContent5ToolBox->connect_clicked(aLk); @@ -833,7 +833,7 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) } } -IMPL_LINK( SwNavigationPI, HeadingsMenuSelectHdl, const OString&, rMenuId, void ) +IMPL_LINK( SwNavigationPI, HeadingsMenuSelectHdl, const OUString&, rMenuId, void ) { if (!rMenuId.isEmpty()) m_xContentTree->SetOutlineLevel(rMenuId.toUInt32()); diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index b1d5d373f65f..647bdcd92b94 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -101,7 +101,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1)); weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect); - OString sResult = xPopup->popup_at_rect(pParent, aRect); + OUString sResult = xPopup->popup_at_rect(pParent, aRect); if (!sResult.isEmpty()) { sal_uInt32 nCurrId = sResult.toUInt32(); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 74f47fc2aa8b..c647a6177015 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -483,7 +483,7 @@ bool SwOneExampleFrame::CreatePopup(const Point& rPt) { OUString sTemp = unicode::formatPercent(nZoomValues[i], Application::GetSettings().GetUILanguageTag()); - OString sIdent = "zoom" + OString::number(nZoomValues[i]); + OUString sIdent = "zoom" + OUString::number(nZoomValues[i]); xPop->set_label(sIdent, sTemp); if (nZoom == nZoomValues[i]) xPop->set_active(sIdent, true); @@ -494,10 +494,10 @@ bool SwOneExampleFrame::CreatePopup(const Point& rPt) return true; } -void SwOneExampleFrame::PopupHdl(std::string_view rId) +void SwOneExampleFrame::PopupHdl(std::u16string_view rId) { - std::string_view sZoomValue; - if (o3tl::starts_with(rId, "zoom", &sZoomValue)) + std::u16string_view sZoomValue; + if (o3tl::starts_with(rId, u"zoom", &sZoomValue)) { sal_Int16 nZoom = o3tl::toInt32(sZoomValue); uno::Reference< view::XViewSettingsSupplier > xSettings(m_xController, uno::UNO_QUERY); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 8b480bdabb39..95f625aa49c9 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -442,10 +442,10 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName { SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool(); const SfxSlot* pSlot = pSlotPool->GetSlot(nSlotId); - OString aCmd = OString::Concat(".uno:") + pSlot->GetUnoName(); + OUString aCmd = pSlot->GetCommand(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg(pFact->CreateInsertObjectDialog(GetFrameWeld(mxDoc->GetDocShell()), - OUString::fromUtf8( aCmd ), xStor, &aServerList)); + aCmd, xStor, &aServerList)); if (pDlg) { pDlg->Execute(); diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index fdd172f29a68..e699072f37ac 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -24,15 +24,15 @@ namespace { - void splitHelpId( const OString& rHelpId, OUString& rDirname, OUString &rBasename ) + void splitHelpId( const OUString& rHelpId, OUString& rDirname, OUString &rBasename ) { sal_Int32 nIndex = rHelpId.lastIndexOf( '/' ); if( nIndex > 0 ) - rDirname = OStringToOUString( rHelpId.subView( 0, nIndex ), RTL_TEXTENCODING_UTF8 ); + rDirname = rHelpId.subView( 0, nIndex ); if( rHelpId.getLength() > nIndex+1 ) - rBasename= OStringToOUString( rHelpId.subView( nIndex+1 ), RTL_TEXTENCODING_UTF8 ); + rBasename = rHelpId.subView( nIndex+1 ); } } @@ -71,7 +71,7 @@ void ScreenshotTest::setUp() } } -void ScreenshotTest::implSaveScreenshot(const BitmapEx& rScreenshot, const OString& rScreenshotId) +void ScreenshotTest::implSaveScreenshot(const BitmapEx& rScreenshot, const OUString& rScreenshotId) { OUString aDirname, aBasename; splitHelpId(rScreenshotId, aDirname, aBasename); @@ -102,7 +102,7 @@ void ScreenshotTest::saveScreenshot(VclAbstractDialog const & rDialog) if (!aScreenshot.IsEmpty()) { - const OString aScreenshotId = rDialog.GetScreenshotId(); + const OUString aScreenshotId = rDialog.GetScreenshotId(); if (!aScreenshotId.isEmpty()) { @@ -118,7 +118,7 @@ void ScreenshotTest::saveScreenshot(weld::Window& rDialog) if (!aScreenshot.IsEmpty()) { - const OString aScreenshotId = rDialog.get_help_id(); + const OUString aScreenshotId = rDialog.get_help_id(); assert(!aScreenshotId.isEmpty()); implSaveScreenshot(aScreenshot, aScreenshotId); } @@ -138,7 +138,7 @@ VclPtr<VclAbstractDialog> ScreenshotTest::createDialogByName(const OString& rNam void ScreenshotTest::dumpDialogToPath(VclAbstractDialog& rDialog) { - const std::vector<OString> aPageDescriptions(rDialog.getAllPageUIXMLDescriptions()); + const std::vector<OUString> aPageDescriptions(rDialog.getAllPageUIXMLDescriptions()); if (!aPageDescriptions.empty()) { @@ -171,14 +171,14 @@ void ScreenshotTest::dumpDialogToPath(weld::Builder& rBuilder) { for (int i = 0; i < nPages; ++i) { - OString sIdent(xTabCtrl->get_page_ident(i)); + OUString sIdent(xTabCtrl->get_page_ident(i)); xTabCtrl->set_current_page(sIdent); if (xTabCtrl->get_current_page_ident() == sIdent) { - OString sOrigHelpId(xDialog->get_help_id()); + OUString sOrigHelpId(xDialog->get_help_id()); // skip empty pages weld::Container* pPage = xTabCtrl->get_page(sIdent); - OString sBuildableName(pPage->get_buildable_name()); + OUString sBuildableName(pPage->get_buildable_name()); if (!sBuildableName.isEmpty() && !sBuildableName.startsWith("__")) xDialog->set_help_id(pPage->get_help_id()); saveScreenshot(*xDialog); diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 52edfb5caa49..f8c662ae2480 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -282,7 +282,7 @@ void VCLXMenu::insertItem( std::unique_lock aGuard( maMutex ); if ( mpMenu ) - mpMenu->InsertItem(nItemId, aText, static_cast<MenuItemBits>(nItemStyle), OString(), nPos); + mpMenu->InsertItem(nItemId, aText, static_cast<MenuItemBits>(nItemStyle), {}, nPos); } void VCLXMenu::removeItem( @@ -430,7 +430,7 @@ void VCLXMenu::insertSeparator( std::unique_lock aGuard( maMutex ); if ( mpMenu ) - mpMenu->InsertSeparator(OString(), nPos); + mpMenu->InsertSeparator({}, nPos); } void VCLXMenu::setDefaultItem( diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index f3985bc12df5..1c7dcf5990b1 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1532,9 +1532,9 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& { INetURLObject aHelpURL( aURL ); if ( aHelpURL.GetProtocol() == INetProtocol::Hid ) - pWindow->SetHelpId( OUStringToOString( aHelpURL.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); + pWindow->SetHelpId( aHelpURL.GetURLPath() ); else - pWindow->SetHelpId( OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); + pWindow->SetHelpId( aURL ); } } break; @@ -2042,10 +2042,7 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName ) } break; case BASEPROPERTY_HELPURL: - { - OUString aHelpId( OStringToOUString( GetWindow()->GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); - aProp <<= aHelpId; - } + aProp <<= GetWindow()->GetHelpId(); break; case BASEPROPERTY_FONTDESCRIPTOR: { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 8fc6dc0277db..abe8c9057b00 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2236,7 +2236,7 @@ void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) SolarMutexGuard aGuard; VclPtr< vcl::Window > pWindow = GetWindow(); if ( pWindow ) - pWindow->SetHelpId( OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); + pWindow->SetHelpId( rId ); } void VCLXDialog::setTitle( const OUString& Title ) diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index f62cce6a7182..dc257ca9b471 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -187,7 +187,7 @@ void SvtViewOptions::SetWindowState( const OUString& sState ) // public method -OString SvtViewOptions::GetPageID() const +OUString SvtViewOptions::GetPageID() const { // Safe impossible cases. // These call isn't allowed for dialogs, tab-pages or windows! @@ -207,13 +207,13 @@ OString SvtViewOptions::GetPageID() const TOOLS_WARN_EXCEPTION("unotools", "Unexpected exception"); } - return sID.toUtf8(); + return sID; } // public method -void SvtViewOptions::SetPageID(std::string_view rID) +void SvtViewOptions::SetPageID(const OUString& rID) { // Safe impossible cases. // These call isn't allowed for dialogs, tab-pages or windows! @@ -224,7 +224,7 @@ void SvtViewOptions::SetPageID(std::string_view rID) css::uno::Reference< css::beans::XPropertySet > xNode( impl_getSetNode(m_sViewName, true), css::uno::UNO_QUERY_THROW); - xNode->setPropertyValue(PROPERTY_PAGEID, css::uno::Any(OUString::fromUtf8(rID))); + xNode->setPropertyValue(PROPERTY_PAGEID, css::uno::Any(rID)); ::comphelper::ConfigurationHelper::flush(m_xRoot); } catch(const css::uno::Exception&) diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 3df8ed8caf4c..8232620decbb 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -85,13 +85,13 @@ void LoginDialog::SetRequest() OUString aRequest; if (m_xAccountFT->get_visible() && !m_realm.isEmpty()) { - std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ? "wrongloginrealm" : "loginrealm")); + std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ? OUString("wrongloginrealm") : OUString("loginrealm"))); aRequest = xText->get_label(); aRequest = aRequest.replaceAll("%2", m_realm); } else { - std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ? "wrongrequestinfo" : "requestinfo")); + std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ? OUString("wrongrequestinfo") : OUString("requestinfo"))); aRequest = xText->get_label(); } aRequest = aRequest.replaceAll("%1", m_server); diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index ac638e70eae5..10f0fd4da787 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -47,7 +47,7 @@ namespace vcl class ILibreOfficeKitNotifier; } -typedef std::map<OString, weld::Widget*> WidgetMap; +typedef std::map<OUString, weld::Widget*> WidgetMap; namespace jsdialog { @@ -110,7 +110,7 @@ class JSDialogNotifyIdle final : public Idle VclPtr<vcl::Window> m_aNotifierWindow; // used to generate JSON VclPtr<vcl::Window> m_aContentWindow; - std::string m_sTypeOfJSON; + const OUString& m_sTypeOfJSON; std::string m_LastNotificationMessage; bool m_bForce; @@ -119,7 +119,7 @@ class JSDialogNotifyIdle final : public Idle public: JSDialogNotifyIdle(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow, - std::string sTypeOfJSON); + const OUString& sTypeOfJSON); void Invoke() override; @@ -154,7 +154,7 @@ public: { } JSDialogSender(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow, - std::string sTypeOfJSON) + const OUString& sTypeOfJSON) : m_bCanClose(true) { initializeSender(aNotifierWindow, aContentWindow, sTypeOfJSON); @@ -173,7 +173,7 @@ public: protected: void initializeSender(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow, - std::string sTypeOfJSON) + const OUString& sTypeOfJSON) { mpIdleNotify.reset(new JSDialogNotifyIdle(aNotifierWindow, aContentWindow, sTypeOfJSON)); } @@ -218,8 +218,8 @@ class JSInstanceBuilder final : public SalInstanceBuilder, public JSDialogSender /// used in case of tab pages where dialog is not a direct top level VclPtr<vcl::Window> m_aParentDialog; VclPtr<vcl::Window> m_aContentWindow; - std::list<std::string> m_aRememberedWidgets; - std::string m_sTypeOfJSON; + std::list<OUString> m_aRememberedWidgets; + OUString m_sTypeOfJSON; bool m_bHasTopLevelDialog; bool m_bIsNotebookbar; /// used to detect when we have to send Full Update in container handler @@ -233,22 +233,22 @@ class JSInstanceBuilder final : public SalInstanceBuilder, public JSDialogSender friend class JSDialog; friend class JSAssistant; - friend VCL_DLLPUBLIC bool jsdialog::ExecuteAction(const std::string& nWindowId, - const OString& rWidget, StringMap& rData); - friend VCL_DLLPUBLIC void jsdialog::SendFullUpdate(const std::string& nWindowId, - const OString& rWidget); - friend VCL_DLLPUBLIC void jsdialog::SendAction(const std::string& nWindowId, - const OString& rWidget, + friend VCL_DLLPUBLIC bool jsdialog::ExecuteAction(const OUString& nWindowId, + const OUString& rWidget, StringMap& rData); + friend VCL_DLLPUBLIC void jsdialog::SendFullUpdate(const OUString& nWindowId, + const OUString& rWidget); + friend VCL_DLLPUBLIC void jsdialog::SendAction(const OUString& nWindowId, + const OUString& rWidget, std::unique_ptr<jsdialog::ActionDataMap> pData); - static std::map<std::string, WidgetMap>& GetLOKWeldWidgetsMap(); - static void InsertWindowToMap(const std::string& nWindowId); - void RememberWidget(OString id, weld::Widget* pWidget); - static void RememberWidget(const std::string& nWindowId, const OString& id, + static std::map<OUString, WidgetMap>& GetLOKWeldWidgetsMap(); + static void InsertWindowToMap(const OUString& nWindowId); + void RememberWidget(OUString id, weld::Widget* pWidget); + static void RememberWidget(const OUString& nWindowId, const OUString& id, weld::Widget* pWidget); - static weld::Widget* FindWeldWidgetsMap(const std::string& nWindowId, const OString& rWidget); + static weld::Widget* FindWeldWidgetsMap(const OUString& nWindowId, const OUString& rWidget); - std::string getMapIdFromWindowId() const; + OUString getMapIdFromWindowId() const; public: /// used for dialogs or popups @@ -283,54 +283,54 @@ public: sal_uInt64 nLOKWindowId); virtual ~JSInstanceBuilder() override; - virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OString& id) override; - virtual std::unique_ptr<weld::Dialog> weld_dialog(const OString& id) override; - virtual std::unique_ptr<weld::Assistant> weld_assistant(const OString& id) override; - virtual std::unique_ptr<weld::Container> weld_container(const OString& id) override; - virtual std::unique_ptr<weld::Label> weld_label(const OString& id) override; - virtual std::unique_ptr<weld::Button> weld_button(const OString& id) override; - virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OString& id) override; - virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OString& id) override; - virtual std::unique_ptr<weld::Entry> weld_entry(const OString& id) override; - virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OString& id) override; - virtual std::unique_ptr<weld::Notebook> weld_notebook(const OString& id) override; - virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OString& id) override; - virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OString& id) override; + virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OUString& id) override; + virtual std::unique_ptr<weld::Dialog> weld_dialog(const OUString& id) override; + virtual std::unique_ptr<weld::Assistant> weld_assistant(const OUString& id) override; + virtual std::unique_ptr<weld::Container> weld_container(const OUString& id) override; + virtual std::unique_ptr<weld::Label> weld_label(const OUString& id) override; + virtual std::unique_ptr<weld::Button> weld_button(const OUString& id) override; + virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OUString& id) override; + virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OUString& id) override; + virtual std::unique_ptr<weld::Entry> weld_entry(const OUString& id) override; + virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OUString& id) override; + virtual std::unique_ptr<weld::Notebook> weld_notebook(const OUString& id) override; + virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OUString& id) override; + virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OUString& id) override; virtual std::unique_ptr<weld::DrawingArea> - weld_drawing_area(const OString& id, const a11yref& rA11yImpl = nullptr, + weld_drawing_area(const OUString& id, const a11yref& rA11yImpl = nullptr, FactoryFunction pUITestFactoryFunction = nullptr, void* pUserData = nullptr) override; - virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OString& id) override; - virtual std::unique_ptr<weld::TextView> weld_text_view(const OString& id) override; - virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OString& id) override; - virtual std::unique_ptr<weld::Expander> weld_expander(const OString& id) override; - virtual std::unique_ptr<weld::IconView> weld_icon_view(const OString& id) override; + virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OUString& id) override; + virtual std::unique_ptr<weld::TextView> weld_text_view(const OUString& id) override; + virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OUString& id) override; + virtual std::unique_ptr<weld::Expander> weld_expander(const OUString& id) override; + virtual std::unique_ptr<weld::IconView> weld_icon_view(const OUString& id) override; virtual std::unique_ptr<weld::ScrolledWindow> - weld_scrolled_window(const OString& id, bool bUserManagedScrolling = false) override; - virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OString& id) override; - virtual std::unique_ptr<weld::Frame> weld_frame(const OString& id) override; - virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OString& id) override; - virtual std::unique_ptr<weld::Popover> weld_popover(const OString& id) override; - virtual std::unique_ptr<weld::Box> weld_box(const OString& id) override; - virtual std::unique_ptr<weld::Widget> weld_widget(const OString& id) override; - virtual std::unique_ptr<weld::Image> weld_image(const OString& id) override; + weld_scrolled_window(const OUString& id, bool bUserManagedScrolling = false) override; + virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OUString& id) override; + virtual std::unique_ptr<weld::Frame> weld_frame(const OUString& id) override; + virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OUString& id) override; + virtual std::unique_ptr<weld::Popover> weld_popover(const OUString& id) override; + virtual std::unique_ptr<weld::Box> weld_box(const OUString& id) override; + virtual std::unique_ptr<weld::Widget> weld_widget(const OUString& id) override; + virtual std::unique_ptr<weld::Image> weld_image(const OUString& id) override; static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage, const vcl::ILibreOfficeKitNotifier* pNotifier = nullptr); - static void AddChildWidget(const std::string& nWindowId, const OString& id, + static void AddChildWidget(const OUString& nWindowId, const OUString& id, weld::Widget* pWidget); - static void RemoveWindowWidget(const std::string& nWindowId); + static void RemoveWindowWidget(const OUString& nWindowId); // we need to remember original popup window to close it properly (its handled by vcl) - static void RememberPopup(const std::string& nWindowId, VclPtr<vcl::Window> pWidget); - static void ForgetPopup(const std::string& nWindowId); - static vcl::Window* FindPopup(const std::string& nWindowId); + static void RememberPopup(const OUString& nWindowId, VclPtr<vcl::Window> pWidget); + static void ForgetPopup(const OUString& nWindowId); + static vcl::Window* FindPopup(const OUString& nWindowId); private: - const std::string& GetTypeOfJSON() const; + const OUString& GetTypeOfJSON() const; VclPtr<vcl::Window>& GetContentWindow(); VclPtr<vcl::Window>& GetNotifierWindow(); }; @@ -489,7 +489,7 @@ public: m_pSender->sendClosePopup(nWindowId); } - virtual void set_buildable_name(const OString& rName) override + virtual void set_buildable_name(const OUString& rName) override { SalInstanceWidget::set_buildable_name(rName); assert(false); // we remember old name in GetLOKWeldWidgetsMap() @@ -516,7 +516,7 @@ public: bool bTakeOwnership); virtual void set_current_page(int nPage) override; - virtual void set_current_page(const OString& rIdent) override; + virtual void set_current_page(const OUString& rIdent) override; virtual void response(int response) override; virtual weld::Button* weld_widget_for_response(int response) override; }; @@ -619,8 +619,8 @@ public: JSNotebook(JSDialogSender* pSender, ::TabControl* pControl, SalInstanceBuilder* pBuilder, bool bTakeOwnership); - virtual void remove_page(const OString& rIdent) override; - virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override; + virtual void remove_page(const OUString& rIdent) override; + virtual void insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) override; }; class JSSpinButton final : public JSWidget<SalInstanceSpinButton, ::FormattedField> @@ -639,7 +639,7 @@ class JSMessageDialog final : public JSWidget<SalInstanceMessageDialog, ::Messag std::unique_ptr<JSButton> m_pCancel; // used for message dialogs created using static functions - std::string m_sWindowId; + OUString m_sWindowId; DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(CancelHdl, weld::Button&, void); @@ -695,9 +695,9 @@ public: JSToolbar(JSDialogSender* pSender, ::ToolBox* pToolbox, SalInstanceBuilder* pBuilder, bool bTakeOwnership); - virtual void set_menu_item_active(const OString& rIdent, bool bActive) override; - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) override; - virtual void set_item_icon_name(const OString& rIdent, const OUString& rIconName) override; + virtual void set_menu_item_active(const OUString& rIdent, bool bActive) override; + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) override; + virtual void set_item_icon_name(const OUString& rIdent, const OUString& rIconName) override; }; class JSTextView final : public JSWidget<SalInstanceTextView, ::VclMultiLineEdit> diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx index dee6e712b2bc..9c265c057078 100644 --- a/vcl/inc/messagedialog.hxx +++ b/vcl/inc/messagedialog.hxx @@ -42,7 +42,7 @@ private: public: MessageDialog(vcl::Window* pParent, OUString aMessage, VclMessageType eMessageType, VclButtonsType eButtonsType); - virtual bool set_property(const OString& rKey, const OUString& rValue) override; + virtual bool set_property(const OUString& rKey, const OUString& rValue) override; OUString const& get_primary_text() const; OUString const& get_secondary_text() const; void set_primary_text(const OUString& rPrimaryString); diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index c5665b28dd0c..bd462ad56ccd 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -47,96 +47,96 @@ public: const css::uno::Reference<css::frame::XFrame>& rFrame = css::uno::Reference<css::frame::XFrame>()); - virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OString& id) override; + virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OUString& id) override; - virtual std::unique_ptr<weld::Dialog> weld_dialog(const OString& id) override; + virtual std::unique_ptr<weld::Dialog> weld_dialog(const OUString& id) override; - virtual std::unique_ptr<weld::Assistant> weld_assistant(const OString& id) override; + virtual std::unique_ptr<weld::Assistant> weld_assistant(const OUString& id) override; virtual std::unique_ptr<weld::Window> create_screenshot_window() override; - virtual std::unique_ptr<weld::Widget> weld_widget(const OString& id) override; + virtual std::unique_ptr<weld::Widget> weld_widget(const OUString& id) override; - virtual std::unique_ptr<weld::Container> weld_container(const OString& id) override; + virtual std::unique_ptr<weld::Container> weld_container(const OUString& id) override; - virtual std::unique_ptr<weld::Box> weld_box(const OString& id) override; + virtual std::unique_ptr<weld::Box> weld_box(const OUString& id) override; - virtual std::unique_ptr<weld::Paned> weld_paned(const OString& id) override; + virtual std::unique_ptr<weld::Paned> weld_paned(const OUString& id) override; - virtual std::unique_ptr<weld::Frame> weld_frame(const OString& id) override; + virtual std::unique_ptr<weld::Frame> weld_frame(const OUString& id) override; virtual std::unique_ptr<weld::ScrolledWindow> - weld_scrolled_window(const OString& id, bool bUserManagedScrolling = false) override; + weld_scrolled_window(const OUString& id, bool bUserManagedScrolling = false) override; - virtual std::unique_ptr<weld::Notebook> weld_notebook(const OString& id) override; + virtual std::unique_ptr<weld::Notebook> weld_notebook(const OUString& id) override; - virtual std::unique_ptr<weld::Button> weld_button(const OString& id) override; + virtual std::unique_ptr<weld::Button> weld_button(const OUString& id) override; - virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OString& id) override; + virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OUString& id) override; virtual std::unique_ptr<weld::MenuToggleButton> - weld_menu_toggle_button(const OString& id) override; + weld_menu_toggle_button(const OUString& id) override; - virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OString& id) override; + virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OUString& id) override; - virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OString& id) override; + virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OUString& id) override; - virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OString& id) override; + virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OUString& id) override; - virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OString& id) override; + virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OUString& id) override; - virtual std::unique_ptr<weld::Scale> weld_scale(const OString& id) override; + virtual std::unique_ptr<weld::Scale> weld_scale(const OUString& id) override; - virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OString& id) override; + virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OUString& id) override; - virtual std::unique_ptr<weld::Spinner> weld_spinner(const OString& id) override; + virtual std::unique_ptr<weld::Spinner> weld_spinner(const OUString& id) override; - virtual std::unique_ptr<weld::Image> weld_image(const OString& id) override; + virtual std::unique_ptr<weld::Image> weld_image(const OUString& id) override; - virtual std::unique_ptr<weld::Calendar> weld_calendar(const OString& id) override; + virtual std::unique_ptr<weld::Calendar> weld_calendar(const OUString& id) override; - virtual std::unique_ptr<weld::Entry> weld_entry(const OString& id) override; + virtual std::unique_ptr<weld::Entry> weld_entry(const OUString& id) override; - virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OString& id) override; + virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OUString& id) override; virtual std::unique_ptr<weld::MetricSpinButton> - weld_metric_spin_button(const OString& id, FieldUnit eUnit) override; + weld_metric_spin_button(const OUString& id, FieldUnit eUnit) override; virtual std::unique_ptr<weld::FormattedSpinButton> - weld_formatted_spin_button(const OString& id) override; + weld_formatted_spin_button(const OUString& id) override; - virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OString& id) override; + virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OUString& id) override; virtual std::unique_ptr<weld::EntryTreeView> - weld_entry_tree_view(const OString& containerid, const OString& entryid, - const OString& treeviewid) override; + weld_entry_tree_view(const OUString& containerid, const OUString& entryid, + const OUString& treeviewid) override; - virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OString& id) override; + virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OUString& id) override; - virtual std::unique_ptr<weld::IconView> weld_icon_view(const OString& id) override; + virtual std::unique_ptr<weld::IconView> weld_icon_view(const OUString& id) override; - virtual std::unique_ptr<weld::Label> weld_label(const OString& id) override; + virtual std::unique_ptr<weld::Label> weld_label(const OUString& id) override; - virtual std::unique_ptr<weld::TextView> weld_text_view(const OString& id) override; + virtual std::unique_ptr<weld::TextView> weld_text_view(const OUString& id) override; - virtual std::unique_ptr<weld::Expander> weld_expander(const OString& id) override; + virtual std::unique_ptr<weld::Expander> weld_expander(const OUString& id) override; virtual std::unique_ptr<weld::DrawingArea> - weld_drawing_area(const OString& id, const a11yref& rA11yImpl = nullptr, + weld_drawing_area(const OUString& id, const a11yref& rA11yImpl = nullptr, FactoryFunction pUITestFactoryFunction = nullptr, void* pUserData = nullptr) override; - virtual std::unique_ptr<weld::Menu> weld_menu(const OString& id) override; + virtual std::unique_ptr<weld::Menu> weld_menu(const OUString& id) override; - virtual std::unique_ptr<weld::Popover> weld_popover(const OString& id) override; + virtual std::unique_ptr<weld::Popover> weld_popover(const OUString& id) override; - virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OString& id) override; + virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OUString& id) override; - virtual std::unique_ptr<weld::Scrollbar> weld_scrollbar(const OString& id) override; + virtual std::unique_ptr<weld::Scrollbar> weld_scrollbar(const OUString& id) override; virtual std::unique_ptr<weld::SizeGroup> create_size_group() override; - OString get_current_page_help_id() const; + OUString get_current_page_help_id() const; virtual ~SalInstanceBuilder() override; }; @@ -153,23 +153,23 @@ private: public: SalInstanceMenu(PopupMenu* pMenu, bool bTakeOwnership); - virtual OString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, - weld::Placement ePlace = weld::Placement::Under) override; - virtual void set_sensitive(const OString& rIdent, bool bSensitive) override; - virtual bool get_sensitive(const OString& rIdent) const override; - virtual void set_active(const OString& rIdent, bool bActive) override; - virtual bool get_active(const OString& rIdent) const override; - virtual void set_label(const OString& rIdent, const OUString& rLabel) override; - virtual OUString get_label(const OString& rIdent) const override; - virtual void set_visible(const OString& rIdent, bool bShow) override; + virtual OUString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, + weld::Placement ePlace = weld::Placement::Under) override; + virtual void set_sensitive(const OUString& rIdent, bool bSensitive) override; + virtual bool get_sensitive(const OUString& rIdent) const override; + virtual void set_active(const OUString& rIdent, bool bActive) override; + virtual bool get_active(const OUString& rIdent) const override; + virtual void set_label(const OUString& rIdent, const OUString& rLabel) override; + virtual OUString get_label(const OUString& rIdent) const override; + virtual void set_visible(const OUString& rIdent, bool bShow) override; virtual void clear() override; virtual void insert(int pos, const OUString& rId, const OUString& rStr, const OUString* pIconName, VirtualDevice* pImageSurface, const css::uno::Reference<css::graphic::XGraphic>& rImage, TriState eCheckRadioFalse) override; virtual void insert_separator(int pos, const OUString& rId) override; - virtual void remove(const OString& rId) override; - virtual OString get_id(int pos) const override; + virtual void remove(const OUString& rId) override; + virtual OUString get_id(int pos) const override; virtual int n_children() const override; PopupMenu* getMenu() const; virtual ~SalInstanceMenu() override; @@ -258,13 +258,13 @@ public: virtual vcl::Font get_font() override; - virtual OString get_buildable_name() const override; + virtual OUString get_buildable_name() const override; - virtual void set_buildable_name(const OString& rId) override; + virtual void set_buildable_name(const OUString& rId) override; - virtual void set_help_id(const OString& rId) override; + virtual void set_help_id(const OUString& rId) override; - virtual OString get_help_id() const override; + virtual OUString get_help_id() const override; virtual void set_grid_left_attach(int nAttach) override; @@ -369,7 +369,7 @@ public: virtual void queue_resize() override; - virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) override; + virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) override; virtual OUString strip_mnemonic(const OUString& rLabel) const override; @@ -490,9 +490,9 @@ public: virtual bool is_default_widget(const weld::Widget* pCandidate) const override; - virtual void set_window_state(const OString& rStr) override; + virtual void set_window_state(const OUString& rStr) override; - virtual OString get_window_state(vcl::WindowDataMask nMask) const override; + virtual OUString get_window_state(vcl::WindowDataMask nMask) const override; virtual SystemEnvData get_system_data() const override; @@ -540,7 +540,7 @@ public: virtual void response(int nResponse) override; virtual void add_button(const OUString& rText, int nResponse, - const OString& rHelpId = OString()) override; + const OUString& rHelpId = {}) override; virtual void set_modal(bool bModal) override; @@ -565,7 +565,7 @@ private: std::vector<VclPtr<VclGrid>> m_aAddedGrids; Idle m_aUpdateRoadmapIdle; - int find_page(std::string_view rIdent) const; + int find_page(std::u16string_view rIdent) const; int find_id(int nId) const; DECL_LINK(OnRoadmapItemSelected, LinkParamNone*, void); @@ -576,16 +576,16 @@ public: bool bTakeOwnership); virtual int get_current_page() const override; virtual int get_n_pages() const override; - virtual OString get_page_ident(int nPage) const override; - virtual OString get_current_page_ident() const override; + virtual OUString get_page_ident(int nPage) const override; + virtual OUString get_current_page_ident() const override; virtual void set_current_page(int nPage) override; - virtual void set_current_page(const OString& rIdent) override; - virtual void set_page_index(const OString& rIdent, int nNewIndex) override; - virtual weld::Container* append_page(const OString& rIdent) override; - virtual OUString get_page_title(const OString& rIdent) const override; - virtual void set_page_title(const OString& rIdent, const OUString& rTitle) override; - virtual void set_page_sensitive(const OString& rIdent, bool bSensitive) override; - virtual void set_page_side_help_id(const OString& rHelpId) override; + virtual void set_current_page(const OUString& rIdent) override; + virtual void set_page_index(const OUString& rIdent, int nNewIndex) override; + virtual weld::Container* append_page(const OUString& rIdent) override; + virtual OUString get_page_title(const OUString& rIdent) const override; + virtual void set_page_title(const OUString& rIdent, const OUString& rTitle) override; + virtual void set_page_sensitive(const OUString& rIdent, bool bSensitive) override; + virtual void set_page_side_help_id(const OUString& rHelpId) override; virtual void set_page_side_image(const OUString& rImage) override; weld::Button* weld_widget_for_response(int nResponse) override; @@ -896,7 +896,7 @@ public: return xRet; } - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) override + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) override { SalInstanceMenu* pInstanceMenu = dynamic_cast<SalInstanceMenu*>(pMenu); @@ -908,7 +908,7 @@ public: m_xMenuButton->SetPopupMenu(pPopup); m_xMenuButton->Show(pPopup != nullptr); - m_sMenuButtonRow = OUString::fromUtf8(rIdent); + m_sMenuButtonRow = rIdent; } int get_menu_button_width() const override @@ -1157,7 +1157,7 @@ class SalInstanceNotebook : public SalInstanceWidget, public virtual weld::Noteb private: VclPtr<TabControl> m_xNotebook; mutable std::vector<std::shared_ptr<SalInstanceContainer>> m_aPages; - std::map<OString, std::pair<VclPtr<TabPage>, VclPtr<VclGrid>>> m_aAddedPages; + std::map<OUString, std::pair<VclPtr<TabPage>, VclPtr<VclGrid>>> m_aAddedPages; DECL_LINK(DeactivatePageHdl, TabControl*, bool); DECL_LINK(ActivatePageHdl, TabControl*, void); @@ -1167,27 +1167,27 @@ public: virtual int get_current_page() const override; - virtual int get_page_index(const OString& rIdent) const override; + virtual int get_page_index(const OUString& rIdent) const override; - virtual OString get_page_ident(int nPage) const override; + virtual OUString get_page_ident(int nPage) const override; - virtual OString get_current_page_ident() const override; + virtual OUString get_current_page_ident() const override; - virtual weld::Container* get_page(const OString& rIdent) const override; + virtual weld::Container* get_page(const OUString& rIdent) const override; virtual void set_current_page(int nPage) override; - virtual void set_current_page(const OString& rIdent) override; + virtual void set_current_page(const OUString& rIdent) override; - virtual void remove_page(const OString& rIdent) override; + virtual void remove_page(const OUString& rIdent) override; - virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override; + virtual void insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) override; virtual int get_n_pages() const override; - virtual OUString get_tab_label_text(const OString& rIdent) const override; + virtual OUString get_tab_label_text(const OUString& rIdent) const override; - virtual void set_tab_label_text(const OString& rIdent, const OUString& rText) override; + virtual void set_tab_label_text(const OUString& rIdent, const OUString& rText) override; virtual void set_show_tabs(bool bShow) override; @@ -1350,7 +1350,7 @@ protected: std::map<ToolBoxItemId, VclPtr<vcl::Window>> m_aFloats; std::map<ToolBoxItemId, VclPtr<PopupMenu>> m_aMenus; - OString m_sStartShowIdent; + OUString m_sStartShowIdent; DECL_LINK(ClickHdl, ToolBox*, void); DECL_LINK(DropdownClick, ToolBox*, void); @@ -1359,27 +1359,27 @@ protected: public: SalInstanceToolbar(ToolBox* pToolBox, SalInstanceBuilder* pBuilder, bool bTakeOwnership); - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) override; + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) override; - virtual bool get_item_sensitive(const OString& rIdent) const override; + virtual bool get_item_sensitive(const OUString& rIdent) const override; - virtual void set_item_visible(const OString& rIdent, bool bVisible) override; + virtual void set_item_visible(const OUString& rIdent, bool bVisible) override; - virtual void set_item_help_id(const OString& rIdent, const OString& rHelpId) override; + virtual void set_item_help_id(const OUString& rIdent, const OUString& rHelpId) override; - virtual bool get_item_visible(const OString& rIdent) const override; + virtual bool get_item_visible(const OUString& rIdent) const override; - virtual void set_item_active(const OString& rIdent, bool bActive) override; + virtual void set_item_active(const OUString& rIdent, bool bActive) override; - virtual bool get_item_active(const OString& rIdent) const override; + virtual bool get_item_active(const OUString& rIdent) const override; - void set_menu_item_active(const OString& rIdent, bool bActive) override; + void set_menu_item_active(const OUString& rIdent, bool bActive) override; - bool get_menu_item_active(const OString& rIdent) const override; + bool get_menu_item_active(const OUString& rIdent) const override; - virtual void set_item_popover(const OString& rIdent, weld::Widget* pPopover) override; + virtual void set_item_popover(const OUString& rIdent, weld::Widget* pPopover) override; - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) override; + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) override; virtual void insert_item(int pos, const OUString& rId) override; @@ -1387,33 +1387,33 @@ public: virtual int get_n_items() const override; - virtual OString get_item_ident(int nIndex) const override; + virtual OUString get_item_ident(int nIndex) const override; - virtual void set_item_ident(int nIndex, const OString& rIdent) override; + virtual void set_item_ident(int nIndex, const OUString& rIdent) override; virtual void set_item_label(int nIndex, const OUString& rLabel) override; - virtual OUString get_item_label(const OString& rIdent) const override; + virtual OUString get_item_label(const OUString& rIdent) const override; - virtual void set_item_label(const OString& rIdent, const OUString& rLabel) override; + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) override; - virtual void set_item_icon_name(const OString& rIdent, const OUString& rIconName) override; + virtual void set_item_icon_name(const OUString& rIdent, const OUString& rIconName) override; - virtual void set_item_image_mirrored(const OString& rIdent, bool bMirrored) override; + virtual void set_item_image_mirrored(const OUString& rIdent, bool bMirrored) override; - virtual void set_item_image(const OString& rIdent, + virtual void set_item_image(const OUString& rIdent, const css::uno::Reference<css::graphic::XGraphic>& rIcon) override; - virtual void set_item_image(const OString& rIdent, VirtualDevice* pDevice) override; + virtual void set_item_image(const OUString& rIdent, VirtualDevice* pDevice) override; virtual void set_item_image(int nIndex, const css::uno::Reference<css::graphic::XGraphic>& rIcon) override; virtual void set_item_tooltip_text(int nIndex, const OUString& rTip) override; - virtual void set_item_tooltip_text(const OString& rIdent, const OUString& rTip) override; + virtual void set_item_tooltip_text(const OUString& rIdent, const OUString& rTip) override; - virtual OUString get_item_tooltip_text(const OString& rIdent) const override; + virtual OUString get_item_tooltip_text(const OUString& rIdent) const override; virtual vcl::ImageType get_icon_size() const override; @@ -2043,19 +2043,19 @@ public: virtual void insert_separator(int pos, const OUString& rId) override; - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) override; + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) override; - virtual void remove_item(const OString& rId) override; + virtual void remove_item(const OUString& rId) override; virtual void clear() override; - virtual void set_item_active(const OString& rIdent, bool bActive) override; + virtual void set_item_active(const OUString& rIdent, bool bActive) override; - virtual void set_item_label(const OString& rIdent, const OUString& rText) override; + virtual void set_item_label(const OUString& rIdent, const OUString& rText) override; - virtual OUString get_item_label(const OString& rIdent) const override; + virtual OUString get_item_label(const OUString& rIdent) const override; - virtual void set_item_visible(const OString& rIdent, bool bShow) override; + virtual void set_item_visible(const OUString& rIdent, bool bShow) override; virtual void set_popover(weld::Widget* pPopover) override; diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 3dd481de6f01..d467226f4ab7 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -44,7 +44,7 @@ struct ImplToolItem OUString maQuickHelpText; OUString maHelpText; OUString maCommandStr; - OString maHelpId; + OUString maHelpId; tools::Rectangle maRect; tools::Rectangle maCalcRect; /// Widget layout may request size; set it as the minimal size (like, the item will always have at least this size). diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 8aaf5baea5e5..b39d5dc1aacf 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -193,8 +193,8 @@ inline GdkGLContext* surface_create_gl_context(GdkSurface* pSurface) #endif } -void set_buildable_id(GtkBuildable* pWidget, const OString& rId); -OString get_buildable_id(GtkBuildable* pWidget); +void set_buildable_id(GtkBuildable* pWidget, const OUString& rId); +OUString get_buildable_id(GtkBuildable* pWidget); void container_remove(GtkWidget* pContainer, GtkWidget* pChild); void container_add(GtkWidget* pContainer, GtkWidget* pChild); @@ -203,7 +203,7 @@ void container_add(GtkWidget* pContainer, GtkWidget* pChild); typedef GtkClipboard GdkClipboard; #endif -int getButtonPriority(std::string_view rType); +int getButtonPriority(std::u16string_view rType); class GtkSalTimer final : public SalTimer { diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx index 2575fc4ebe9b..850e34476496 100644 --- a/vcl/inc/verticaltabctrl.hxx +++ b/vcl/inc/verticaltabctrl.hxx @@ -34,7 +34,7 @@ class VerticalTabControl final : public VclHBox VclPtr<VclVBox> m_xBox; std::vector<std::unique_ptr<VerticalTabPageData>> maPageList; - OString m_sCurrentPageId; + OUString m_sCurrentPageId; Link<VerticalTabControl*, void> m_aActivateHdl; Link<VerticalTabControl*, bool> m_aDeactivateHdl; @@ -44,7 +44,7 @@ class VerticalTabControl final : public VclHBox void ActivatePage(); bool DeactivatePage(); - VerticalTabPageData* GetPageData(std::string_view rId) const; + VerticalTabPageData* GetPageData(std::u16string_view rId) const; VerticalTabPageData* GetPageData(const SvxIconChoiceCtrlEntry* pEntry) const; public: @@ -54,15 +54,15 @@ public: sal_uInt16 GetPageCount() const { return m_xChooser->GetEntryCount(); } - const OString& GetCurPageId() const { return m_sCurrentPageId; } - void SetCurPageId(const OString& rId); + const OUString& GetCurPageId() const { return m_sCurrentPageId; } + void SetCurPageId(const OUString& rId); - sal_uInt16 GetPagePos(std::string_view rPageId) const; - const OString& GetPageId(sal_uInt16 nIndex) const; - VclPtr<vcl::Window> GetPage(std::string_view rPageId) const; + sal_uInt16 GetPagePos(std::u16string_view rPageId) const; + const OUString& GetPageId(sal_uInt16 nIndex) const; + VclPtr<vcl::Window> GetPage(std::u16string_view rPageId) const; - void RemovePage(std::string_view rPageId); - void InsertPage(const OString& rPageId, const OUString& rLabel, const Image& rImage, + void RemovePage(std::u16string_view rPageId); + void InsertPage(const OUString& rPageId, const OUString& rLabel, const Image& rImage, const OUString& rTooltip, VclPtr<vcl::Window> xPage, int nPos = -1); void SetActivatePageHdl(const Link<VerticalTabControl*, void>& rLink) @@ -74,8 +74,8 @@ public: m_aDeactivateHdl = rLink; } - OUString GetPageText(std::string_view rPageId) const; - void SetPageText(std::string_view rPageId, const OUString& rText); + OUString GetPageText(std::u16string_view rPageId) const; + void SetPageText(std::u16string_view rPageId, const OUString& rText); vcl::Window* GetPageParent() { return m_xBox.get(); } diff --git a/vcl/inc/window.h b/vcl/inc/window.h index af3e7538df44..7e821174b9e7 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -275,7 +275,7 @@ public: tools::Long mnY; tools::Long mnAbsScreenX; Point maPos; - OString maHelpId; + OUString maHelpId; OUString maHelpText; OUString maQuickHelpText; OUString maID; diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index 1fd0f9bad41e..4416ed2e5891 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -132,7 +132,7 @@ namespace vcl void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } - void SetRoadmapHelpId( const OString& _rId ); + void SetRoadmapHelpId( const OUString& _rId ); void SetRoadmapBitmap( const BitmapEx& maBitmap ); void InsertRoadmapItem(int nIndex, const OUString& rLabel, int nId, bool bEnabled); diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index 326bf35aaa90..9c81aa767be5 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -35,14 +35,14 @@ StringMap jsonToStringMap(const char* pJSON) return aArgs; } -void SendFullUpdate(const std::string& nWindowId, const OString& rWidget) +void SendFullUpdate(const OUString& nWindowId, const OUString& rWidget) { weld::Widget* pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, rWidget); if (auto pJSWidget = dynamic_cast<BaseJSWidget*>(pWidget)) pJSWidget->sendFullUpdate(); } -void SendAction(const std::string& nWindowId, const OString& rWidget, +void SendAction(const OUString& nWindowId, const OUString& rWidget, std::unique_ptr<ActionDataMap> pData) { weld::Widget* pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, rWidget); @@ -50,7 +50,7 @@ void SendAction(const std::string& nWindowId, const OString& rWidget, pJSWidget->sendAction(std::move(pData)); } -bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringMap& rData) +bool ExecuteAction(const OUString& nWindowId, const OUString& rWidget, StringMap& rData) { weld::Widget* pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, rWidget); @@ -91,7 +91,7 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM { sal_Int32 page = o3tl::toInt32(rData["data"]); - OString aCurrentPage = pNotebook->get_current_page_ident(); + OUString aCurrentPage = pNotebook->get_current_page_ident(); LOKTrigger::leave_page(*pNotebook, aCurrentPage); pNotebook->set_current_page(page); LOKTrigger::enter_page(*pNotebook, pNotebook->get_page_ident(page)); @@ -326,27 +326,24 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM { if (sAction == "click") { - LOKTrigger::trigger_clicked( - *pToolbar, OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US)); + LOKTrigger::trigger_clicked(*pToolbar, rData["data"]); return true; } else if (sAction == "togglemenu") { - OString sId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); + const OUString& sId = rData["data"]; bool bIsActive = pToolbar->get_menu_item_active(sId); pToolbar->set_menu_item_active(sId, !bIsActive); return true; } else if (sAction == "closemenu") { - OString sId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - pToolbar->set_menu_item_active(sId, false); + pToolbar->set_menu_item_active(rData["data"], false); return true; } else if (sAction == "openmenu") { - OString sId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); - pToolbar->set_menu_item_active(sId, true); + pToolbar->set_menu_item_active(rData["data"], true); return true; } } diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index c33107c34570..7397952ade2c 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -28,10 +28,10 @@ #include <cppuhelper/supportsservice.hxx> #include <wizdlg.hxx> -static std::map<std::string, vcl::Window*>& GetLOKPopupsMap() +static std::map<OUString, vcl::Window*>& GetLOKPopupsMap() { // Map to remember the LOKWindowId <-> vcl popup binding. - static std::map<std::string, vcl::Window*> s_aLOKPopupsMap; + static std::map<OUString, vcl::Window*> s_aLOKPopupsMap; return s_aLOKPopupsMap; } @@ -54,11 +54,12 @@ void response_help(vcl::Window* pWindow) } JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr<vcl::Window> aNotifierWindow, - VclPtr<vcl::Window> aContentWindow, std::string sTypeOfJSON) + VclPtr<vcl::Window> aContentWindow, + const OUString& sTypeOfJSON) : Idle("JSDialog notify") , m_aNotifierWindow(std::move(aNotifierWindow)) , m_aContentWindow(std::move(aContentWindow)) - , m_sTypeOfJSON(std::move(sTypeOfJSON)) + , m_sTypeOfJSON(sTypeOfJSON) , m_bForce(false) { SetPriority(TaskPriority::POST_PAINT); @@ -194,7 +195,7 @@ JSDialogNotifyIdle::generateActionMessage(VclPtr<vcl::Window> pWindow, aJsonWriter->put("control_id", pWindow->get_id()); for (auto it = pData->begin(); it != pData->end(); it++) - aJsonWriter->put(it->first.c_str(), it->second); + aJsonWriter->put(it->first.getStr(), it->second); } return aJsonWriter; @@ -490,13 +491,13 @@ void JSDropTarget::fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEn } } -std::string JSInstanceBuilder::getMapIdFromWindowId() const +OUString JSInstanceBuilder::getMapIdFromWindowId() const { if (m_sTypeOfJSON == "sidebar" || m_sTypeOfJSON == "notebookbar" || m_sTypeOfJSON == "formulabar") - return std::to_string(m_nWindowId) + m_sTypeOfJSON; + return OUString::number(m_nWindowId) + m_sTypeOfJSON; else - return std::to_string(m_nWindowId); + return OUString::number(m_nWindowId); } // used for dialogs @@ -697,23 +698,23 @@ JSInstanceBuilder::~JSInstanceBuilder() if (it != GetLOKWeldWidgetsMap().end()) { std::for_each(m_aRememberedWidgets.begin(), m_aRememberedWidgets.end(), - [it](std::string& sId) { it->second.erase(sId.c_str()); }); + [it](const OUString& sId) { it->second.erase(sId); }); } } - GetLOKPopupsMap().erase(std::to_string(m_nWindowId)); + GetLOKPopupsMap().erase(OUString::number(m_nWindowId)); } -std::map<std::string, WidgetMap>& JSInstanceBuilder::GetLOKWeldWidgetsMap() +std::map<OUString, WidgetMap>& JSInstanceBuilder::GetLOKWeldWidgetsMap() { // Map to remember the LOKWindowId <-> weld widgets binding. - static std::map<std::string, WidgetMap> s_aLOKWeldBuildersMap; + static std::map<OUString, WidgetMap> s_aLOKWeldBuildersMap; return s_aLOKWeldBuildersMap; } -weld::Widget* JSInstanceBuilder::FindWeldWidgetsMap(const std::string& nWindowId, - const OString& rWidget) +weld::Widget* JSInstanceBuilder::FindWeldWidgetsMap(const OUString& nWindowId, + const OUString& rWidget) { const auto it = GetLOKWeldWidgetsMap().find(nWindowId); @@ -727,15 +728,15 @@ weld::Widget* JSInstanceBuilder::FindWeldWidgetsMap(const std::string& nWindowId return nullptr; } -void JSInstanceBuilder::InsertWindowToMap(const std::string& nWindowId) +void JSInstanceBuilder::InsertWindowToMap(const OUString& nWindowId) { WidgetMap map; auto it = GetLOKWeldWidgetsMap().find(nWindowId); if (it == GetLOKWeldWidgetsMap().end()) - GetLOKWeldWidgetsMap().insert(std::map<std::string, WidgetMap>::value_type(nWindowId, map)); + GetLOKWeldWidgetsMap().insert({ nWindowId, map }); } -void JSInstanceBuilder::RememberWidget(OString sId, weld::Widget* pWidget) +void JSInstanceBuilder::RememberWidget(OUString sId, weld::Widget* pWidget) { // do not use the same id for two widgets inside one builder // exception is sidebar where we base our full invalidation on that "Panel" id sharing @@ -750,7 +751,7 @@ void JSInstanceBuilder::RememberWidget(OString sId, weld::Widget* pWidget) { unsigned long long int nIndex = nNotRepeatIndex++; // found duplicated it -> add some number to the id and apply to the widget - sId = sId + OString::number(nIndex); + sId = sId + OUString::number(nIndex); SalInstanceWidget* pSalWidget = dynamic_cast<SalInstanceWidget*>(pWidget); assert(pSalWidget && "can only be a SalInstanceWidget"); vcl::Window* pVclWidget = pSalWidget->getWidget(); @@ -760,10 +761,10 @@ void JSInstanceBuilder::RememberWidget(OString sId, weld::Widget* pWidget) } RememberWidget(getMapIdFromWindowId(), sId, pWidget); - m_aRememberedWidgets.push_back(sId.getStr()); + m_aRememberedWidgets.push_back(sId); } -void JSInstanceBuilder::RememberWidget(const std::string& nWindowId, const OString& id, +void JSInstanceBuilder::RememberWidget(const OUString& nWindowId, const OUString& id, weld::Widget* pWidget) { auto it = GetLOKWeldWidgetsMap().find(nWindowId); @@ -774,7 +775,7 @@ void JSInstanceBuilder::RememberWidget(const std::string& nWindowId, const OStri } } -void JSInstanceBuilder::AddChildWidget(const std::string& nWindowId, const OString& id, +void JSInstanceBuilder::AddChildWidget(const OUString& nWindowId, const OUString& id, weld::Widget* pWidget) { auto it = GetLOKWeldWidgetsMap().find(nWindowId); @@ -785,7 +786,7 @@ void JSInstanceBuilder::AddChildWidget(const std::string& nWindowId, const OStri } } -void JSInstanceBuilder::RemoveWindowWidget(const std::string& nWindowId) +void JSInstanceBuilder::RemoveWindowWidget(const OUString& nWindowId) { auto it = JSInstanceBuilder::GetLOKWeldWidgetsMap().find(nWindowId); if (it != JSInstanceBuilder::GetLOKWeldWidgetsMap().end()) @@ -794,19 +795,19 @@ void JSInstanceBuilder::RemoveWindowWidget(const std::string& nWindowId) } } -void JSInstanceBuilder::RememberPopup(const std::string& nWindowId, VclPtr<vcl::Window> pWidget) +void JSInstanceBuilder::RememberPopup(const OUString& nWindowId, VclPtr<vcl::Window> pWidget) { GetLOKPopupsMap()[nWindowId] = pWidget; } -void JSInstanceBuilder::ForgetPopup(const std::string& nWindowId) +void JSInstanceBuilder::ForgetPopup(const OUString& nWindowId) { auto it = GetLOKPopupsMap().find(nWindowId); if (it != GetLOKPopupsMap().end()) GetLOKPopupsMap().erase(it); } -vcl::Window* JSInstanceBuilder::FindPopup(const std::string& nWindowId) +vcl::Window* JSInstanceBuilder::FindPopup(const OUString& nWindowId) { const auto it = GetLOKPopupsMap().find(nWindowId); @@ -816,7 +817,7 @@ vcl::Window* JSInstanceBuilder::FindPopup(const std::string& nWindowId) return nullptr; } -const std::string& JSInstanceBuilder::GetTypeOfJSON() const { return m_sTypeOfJSON; } +const OUString& JSInstanceBuilder::GetTypeOfJSON() const { return m_sTypeOfJSON; } VclPtr<vcl::Window>& JSInstanceBuilder::GetContentWindow() { @@ -831,7 +832,7 @@ VclPtr<vcl::Window>& JSInstanceBuilder::GetNotifierWindow() return m_bHasTopLevelDialog ? m_aOwnedToplevel : m_aParentDialog; } -std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id) +std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OUString& id) { std::unique_ptr<weld::Dialog> pRet; ::Dialog* pDialog = m_xBuilder->get<::Dialog>(id); @@ -860,7 +861,7 @@ std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id) return pRet; } -std::unique_ptr<weld::Assistant> JSInstanceBuilder::weld_assistant(const OString& id) +std::unique_ptr<weld::Assistant> JSInstanceBuilder::weld_assistant(const OUString& id) { vcl::RoadmapWizard* pDialog = m_xBuilder->get<vcl::RoadmapWizard>(id); std::unique_ptr<JSAssistant> pRet(pDialog ? new JSAssistant(this, pDialog, this, false) @@ -889,7 +890,7 @@ std::unique_ptr<weld::Assistant> JSInstanceBuilder::weld_assistant(const OString return pRet; } -std::unique_ptr<weld::MessageDialog> JSInstanceBuilder::weld_message_dialog(const OString& id) +std::unique_ptr<weld::MessageDialog> JSInstanceBuilder::weld_message_dialog(const OUString& id) { std::unique_ptr<weld::MessageDialog> pRet; ::MessageDialog* pMessageDialog = m_xBuilder->get<::MessageDialog>(id); @@ -917,7 +918,7 @@ std::unique_ptr<weld::MessageDialog> JSInstanceBuilder::weld_message_dialog(cons return pRet; } -std::unique_ptr<weld::Container> JSInstanceBuilder::weld_container(const OString& id) +std::unique_ptr<weld::Container> JSInstanceBuilder::weld_container(const OUString& id) { vcl::Window* pContainer = m_xBuilder->get<vcl::Window>(id); auto pWeldWidget @@ -932,15 +933,12 @@ std::unique_ptr<weld::Container> JSInstanceBuilder::weld_container(const OString // use parent builder to send update - avoid multiple calls from many builders vcl::Window* pParent = pContainer->GetParent(); - std::string sId = std::to_string(m_nWindowId); - while (pParent - && !FindWeldWidgetsMap( - sId, OUStringToOString(pParent->get_id(), RTL_TEXTENCODING_ASCII_US))) + OUString sId = OUString::number(m_nWindowId); + while (pParent && !FindWeldWidgetsMap(sId, pParent->get_id())) pParent = pParent->GetParent(); if (pParent) - jsdialog::SendFullUpdate( - sId, OUStringToOString(pParent->get_id(), RTL_TEXTENCODING_ASCII_US)); + jsdialog::SendFullUpdate(sId, pParent->get_id()); // this is nested builder, don't close parent dialog on destroy (eg. single tab page is closed) m_bCanClose = false; @@ -951,7 +949,7 @@ std::unique_ptr<weld::Container> JSInstanceBuilder::weld_container(const OString } std::unique_ptr<weld::ScrolledWindow> -JSInstanceBuilder::weld_scrolled_window(const OString& id, bool bUserManagedScrolling) +JSInstanceBuilder::weld_scrolled_window(const OUString& id, bool bUserManagedScrolling) { VclScrolledWindow* pScrolledWindow = m_xBuilder->get<VclScrolledWindow>(id); auto pWeldWidget = pScrolledWindow @@ -965,7 +963,7 @@ JSInstanceBuilder::weld_scrolled_window(const OString& id, bool bUserManagedScro return pWeldWidget; } -std::unique_ptr<weld::Label> JSInstanceBuilder::weld_label(const OString& id) +std::unique_ptr<weld::Label> JSInstanceBuilder::weld_label(const OUString& id) { Control* pLabel = m_xBuilder->get<Control>(id); auto pWeldWidget = std::make_unique<JSLabel>(this, pLabel, this, false); @@ -976,7 +974,7 @@ std::unique_ptr<weld::Label> JSInstanceBuilder::weld_label(const OString& id) return pWeldWidget; } -std::unique_ptr<weld::Button> JSInstanceBuilder::weld_button(const OString& id) +std::unique_ptr<weld::Button> JSInstanceBuilder::weld_button(const OUString& id) { ::Button* pButton = m_xBuilder->get<::Button>(id); auto pWeldWidget = pButton ? std::make_unique<JSButton>(this, pButton, this, false) : nullptr; @@ -987,7 +985,7 @@ std::unique_ptr<weld::Button> JSInstanceBuilder::weld_button(const OString& id) return pWeldWidget; } -std::unique_ptr<weld::LinkButton> JSInstanceBuilder::weld_link_button(const OString& id) +std::unique_ptr<weld::LinkButton> JSInstanceBuilder::weld_link_button(const OUString& id) { ::FixedHyperlink* pButton = m_xBuilder->get<::FixedHyperlink>(id); auto pWeldWidget @@ -999,7 +997,7 @@ std::unique_ptr<weld::LinkButton> JSInstanceBuilder::weld_link_button(const OStr return pWeldWidget; } -std::unique_ptr<weld::ToggleButton> JSInstanceBuilder::weld_toggle_button(const OString& id) +std::unique_ptr<weld::ToggleButton> JSInstanceBuilder::weld_toggle_button(const OUString& id) { ::PushButton* pButton = m_xBuilder->get<::PushButton>(id); auto pWeldWidget @@ -1011,7 +1009,7 @@ std::unique_ptr<weld::ToggleButton> JSInstanceBuilder::weld_toggle_button(const return pWeldWidget; } -std::unique_ptr<weld::Entry> JSInstanceBuilder::weld_entry(const OString& id) +std::unique_ptr<weld::Entry> JSInstanceBuilder::weld_entry(const OUString& id) { Edit* pEntry = m_xBuilder->get<Edit>(id); auto pWeldWidget = pEntry ? std::make_unique<JSEntry>(this, pEntry, this, false) : nullptr; @@ -1022,7 +1020,7 @@ std::unique_ptr<weld::Entry> JSInstanceBuilder::weld_entry(const OString& id) return pWeldWidget; } -std::unique_ptr<weld::ComboBox> JSInstanceBuilder::weld_combo_box(const OString& id) +std::unique_ptr<weld::ComboBox> JSInstanceBuilder::weld_combo_box(const OUString& id) { vcl::Window* pWidget = m_xBuilder->get<vcl::Window>(id); ::ComboBox* pComboBox = dynamic_cast<::ComboBox*>(pWidget); @@ -1044,7 +1042,7 @@ std::unique_ptr<weld::ComboBox> JSInstanceBuilder::weld_combo_box(const OString& return pWeldWidget; } -std::unique_ptr<weld::Notebook> JSInstanceBuilder::weld_notebook(const OString& id) +std::unique_ptr<weld::Notebook> JSInstanceBuilder::weld_notebook(const OUString& id) { TabControl* pNotebook = m_xBuilder->get<TabControl>(id); auto pWeldWidget @@ -1056,7 +1054,7 @@ std::unique_ptr<weld::Notebook> JSInstanceBuilder::weld_notebook(const OString& return pWeldWidget; } -std::unique_ptr<weld::SpinButton> JSInstanceBuilder::weld_spin_button(const OString& id) +std::unique_ptr<weld::SpinButton> JSInstanceBuilder::weld_spin_button(const OUString& id) { FormattedField* pSpinButton = m_xBuilder->get<FormattedField>(id); auto pWeldWidget @@ -1068,7 +1066,7 @@ std::unique_ptr<weld::SpinButton> JSInstanceBuilder::weld_spin_button(const OStr return pWeldWidget; } -std::unique_ptr<weld::CheckButton> JSInstanceBuilder::weld_check_button(const OString& id) +std::unique_ptr<weld::CheckButton> JSInstanceBuilder::weld_check_button(const OUString& id) { CheckBox* pCheckButton = m_xBuilder->get<CheckBox>(id); auto pWeldWidget @@ -1081,7 +1079,7 @@ std::unique_ptr<weld::CheckButton> JSInstanceBuilder::weld_check_button(const OS } std::unique_ptr<weld::DrawingArea> -JSInstanceBuilder::weld_drawing_area(const OString& id, const a11yref& rA11yImpl, +JSInstanceBuilder::weld_drawing_area(const OUString& id, const a11yref& rA11yImpl, FactoryFunction pUITestFactoryFunction, void* pUserData) { VclDrawingArea* pArea = m_xBuilder->get<VclDrawingArea>(id); @@ -1095,7 +1093,7 @@ JSInstanceBuilder::weld_drawing_area(const OString& id, const a11yref& rA11yImpl return pWeldWidget; } -std::unique_ptr<weld::Toolbar> JSInstanceBuilder::weld_toolbar(const OString& id) +std::unique_ptr<weld::Toolbar> JSInstanceBuilder::weld_toolbar(const OUString& id) { ToolBox* pToolBox = m_xBuilder->get<ToolBox>(id); auto pWeldWidget @@ -1107,7 +1105,7 @@ std::unique_ptr<weld::Toolbar> JSInstanceBuilder::weld_toolbar(const OString& id return pWeldWidget; } -std::unique_ptr<weld::TextView> JSInstanceBuilder::weld_text_view(const OString& id) +std::unique_ptr<weld::TextView> JSInstanceBuilder::weld_text_view(const OUString& id) { VclMultiLineEdit* pTextView = m_xBuilder->get<VclMultiLineEdit>(id); auto pWeldWidget @@ -1119,7 +1117,7 @@ std::unique_ptr<weld::TextView> JSInstanceBuilder::weld_text_view(const OString& return pWeldWidget; } -std::unique_ptr<weld::TreeView> JSInstanceBuilder::weld_tree_view(const OString& id) +std::unique_ptr<weld::TreeView> JSInstanceBuilder::weld_tree_view(const OUString& id) { SvTabListBox* pTreeView = m_xBuilder->get<SvTabListBox>(id); auto pWeldWidget @@ -1131,7 +1129,7 @@ std::unique_ptr<weld::TreeView> JSInstanceBuilder::weld_tree_view(const OString& return pWeldWidget; } -std::unique_ptr<weld::Expander> JSInstanceBuilder::weld_expander(const OString& id) +std::unique_ptr<weld::Expander> JSInstanceBuilder::weld_expander(const OUString& id) { VclExpander* pExpander = m_xBuilder->get<VclExpander>(id); auto pWeldWidget @@ -1143,7 +1141,7 @@ std::unique_ptr<weld::Expander> JSInstanceBuilder::weld_expander(const OString& return pWeldWidget; } -std::unique_ptr<weld::IconView> JSInstanceBuilder::weld_icon_view(const OString& id) +std::unique_ptr<weld::IconView> JSInstanceBuilder::weld_icon_view(const OUString& id) { ::IconView* pIconView = m_xBuilder->get<::IconView>(id); auto pWeldWidget @@ -1155,7 +1153,7 @@ std::unique_ptr<weld::IconView> JSInstanceBuilder::weld_icon_view(const OString& return pWeldWidget; } -std::unique_ptr<weld::RadioButton> JSInstanceBuilder::weld_radio_button(const OString& id) +std::unique_ptr<weld::RadioButton> JSInstanceBuilder::weld_radio_button(const OUString& id) { ::RadioButton* pRadioButton = m_xBuilder->get<::RadioButton>(id); auto pWeldWidget @@ -1167,7 +1165,7 @@ std::unique_ptr<weld::RadioButton> JSInstanceBuilder::weld_radio_button(const OS return pWeldWidget; } -std::unique_ptr<weld::Frame> JSInstanceBuilder::weld_frame(const OString& id) +std::unique_ptr<weld::Frame> JSInstanceBuilder::weld_frame(const OUString& id) { ::VclFrame* pFrame = m_xBuilder->get<::VclFrame>(id); auto pWeldWidget = pFrame ? std::make_unique<JSFrame>(this, pFrame, this, false) : nullptr; @@ -1178,7 +1176,7 @@ std::unique_ptr<weld::Frame> JSInstanceBuilder::weld_frame(const OString& id) return pWeldWidget; } -std::unique_ptr<weld::MenuButton> JSInstanceBuilder::weld_menu_button(const OString& id) +std::unique_ptr<weld::MenuButton> JSInstanceBuilder::weld_menu_button(const OUString& id) { ::MenuButton* pMenuButton = m_xBuilder->get<::MenuButton>(id); auto pWeldWidget @@ -1190,7 +1188,7 @@ std::unique_ptr<weld::MenuButton> JSInstanceBuilder::weld_menu_button(const OStr return pWeldWidget; } -std::unique_ptr<weld::Popover> JSInstanceBuilder::weld_popover(const OString& id) +std::unique_ptr<weld::Popover> JSInstanceBuilder::weld_popover(const OUString& id) { DockingWindow* pDockingWindow = m_xBuilder->get<DockingWindow>(id); JSPopover* pPopover @@ -1211,7 +1209,7 @@ std::unique_ptr<weld::Popover> JSInstanceBuilder::weld_popover(const OString& id m_nWindowId = m_aParentDialog->GetLOKWindowId(); pPopover->set_window_id(m_nWindowId); - JSInstanceBuilder::RememberPopup(std::to_string(m_nWindowId), pDockingWindow); + JSInstanceBuilder::RememberPopup(OUString::number(m_nWindowId), pDockingWindow); InsertWindowToMap(getMapIdFromWindowId()); initializeSender(GetNotifierWindow(), GetContentWindow(), GetTypeOfJSON()); @@ -1224,7 +1222,7 @@ std::unique_ptr<weld::Popover> JSInstanceBuilder::weld_popover(const OString& id return pWeldWidget; } -std::unique_ptr<weld::Box> JSInstanceBuilder::weld_box(const OString& id) +std::unique_ptr<weld::Box> JSInstanceBuilder::weld_box(const OUString& id) { VclBox* pContainer = m_xBuilder->get<VclBox>(id); auto pWeldWidget @@ -1236,7 +1234,7 @@ std::unique_ptr<weld::Box> JSInstanceBuilder::weld_box(const OString& id) return pWeldWidget; } -std::unique_ptr<weld::Widget> JSInstanceBuilder::weld_widget(const OString& id) +std::unique_ptr<weld::Widget> JSInstanceBuilder::weld_widget(const OUString& id) { vcl::Window* pWidget = m_xBuilder->get(id); auto pWeldWidget @@ -1248,7 +1246,7 @@ std::unique_ptr<weld::Widget> JSInstanceBuilder::weld_widget(const OString& id) return pWeldWidget; } -std::unique_ptr<weld::Image> JSInstanceBuilder::weld_image(const OString& id) +std::unique_ptr<weld::Image> JSInstanceBuilder::weld_image(const OUString& id) { FixedImage* pImage = m_xBuilder->get<FixedImage>(id); @@ -1283,7 +1281,7 @@ JSInstanceBuilder::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMe std::unique_ptr<char[], o3tl::free_delete> message(aJsonWriter.extractData()); pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.get()); - std::string sWindowId = std::to_string(xMessageDialog->GetLOKWindowId()); + OUString sWindowId = OUString::number(xMessageDialog->GetLOKWindowId()); InsertWindowToMap(sWindowId); xMessageDialog->SetLOKTunnelingState(false); @@ -1347,9 +1345,8 @@ weld::Button* JSDialog::weld_widget_for_response(int nResponse) { auto pParentDialog = m_xDialog->GetParentWithLOKNotifier(); if (pParentDialog) - JSInstanceBuilder::RememberWidget( - std::to_string(pParentDialog->GetLOKWindowId()), - OUStringToOString(pButton->get_id(), RTL_TEXTENCODING_UTF8), pWeldWidget); + JSInstanceBuilder::RememberWidget(OUString::number(pParentDialog->GetLOKWindowId()), + pButton->get_id(), pWeldWidget); } return pWeldWidget; @@ -1376,9 +1373,8 @@ weld::Button* JSAssistant::weld_widget_for_response(int nResponse) { auto pParentDialog = m_xWizard->GetParentWithLOKNotifier(); if (pParentDialog) - JSInstanceBuilder::RememberWidget( - std::to_string(pParentDialog->GetLOKWindowId()), - OUStringToOString(pButton->get_id(), RTL_TEXTENCODING_UTF8), pWeldWidget); + JSInstanceBuilder::RememberWidget(OUString::number(pParentDialog->GetLOKWindowId()), + pButton->get_id(), pWeldWidget); } return pWeldWidget; @@ -1396,7 +1392,7 @@ void JSAssistant::set_current_page(int nPage) sendFullUpdate(); } -void JSAssistant::set_current_page(const OString& rIdent) +void JSAssistant::set_current_page(const OUString& rIdent) { SalInstanceAssistant::set_current_page(rIdent); sendFullUpdate(); @@ -1599,13 +1595,13 @@ JSNotebook::JSNotebook(JSDialogSender* pSender, ::TabControl* pControl, { } -void JSNotebook::remove_page(const OString& rIdent) +void JSNotebook::remove_page(const OUString& rIdent) { SalInstanceNotebook::remove_page(rIdent); sendFullUpdate(); } -void JSNotebook::insert_page(const OString& rIdent, const OUString& rLabel, int nPos) +void JSNotebook::insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) { SalInstanceNotebook::insert_page(rIdent, rLabel, nPos); sendFullUpdate(); @@ -1645,13 +1641,13 @@ JSMessageDialog::JSMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* p if (pBuilder) return; - m_sWindowId = std::to_string(m_xMessageDialog->GetLOKWindowId()); + m_sWindowId = OUString::number(m_xMessageDialog->GetLOKWindowId()); if (::OKButton* pOKBtn = dynamic_cast<::OKButton*>(m_xMessageDialog->get_widget_for_response(RET_OK))) { m_pOK.reset(new JSButton(m_pSender, pOKBtn, nullptr, false)); - JSInstanceBuilder::AddChildWidget(m_sWindowId, pOKBtn->get_id().toUtf8(), m_pOK.get()); + JSInstanceBuilder::AddChildWidget(m_sWindowId, pOKBtn->get_id(), m_pOK.get()); m_pOK->connect_clicked(LINK(this, JSMessageDialog, OKHdl)); } @@ -1659,8 +1655,7 @@ JSMessageDialog::JSMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* p = dynamic_cast<::CancelButton*>(m_xMessageDialog->get_widget_for_response(RET_CANCEL))) { m_pCancel.reset(new JSButton(m_pSender, pCancelBtn, nullptr, false)); - JSInstanceBuilder::AddChildWidget(m_sWindowId, pCancelBtn->get_id().toUtf8(), - m_pCancel.get()); + JSInstanceBuilder::AddChildWidget(m_sWindowId, pCancelBtn->get_id(), m_pCancel.get()); m_pCancel->connect_clicked(LINK(this, JSMessageDialog, CancelHdl)); } } @@ -1673,8 +1668,8 @@ JSMessageDialog::~JSMessageDialog() void JSMessageDialog::RememberMessageDialog() { - static OStringLiteral sWidgetName = "__DIALOG__"; - std::string sWindowId = std::to_string(m_xMessageDialog->GetLOKWindowId()); + static OUStringLiteral sWidgetName = u"__DIALOG__"; + OUString sWindowId = OUString::number(m_xMessageDialog->GetLOKWindowId()); if (JSInstanceBuilder::FindWeldWidgetsMap(sWindowId, sWidgetName) != nullptr) return; @@ -1785,12 +1780,12 @@ JSToolbar::JSToolbar(JSDialogSender* pSender, ::ToolBox* pToolbox, SalInstanceBu { } -void JSToolbar::set_menu_item_active(const OString& rIdent, bool bActive) +void JSToolbar::set_menu_item_active(const OUString& rIdent, bool bActive) { bool bWasActive = get_menu_item_active(rIdent); SalInstanceToolbar::set_menu_item_active(rIdent, bActive); - ToolBoxItemId nItemId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)); + ToolBoxItemId nItemId = m_xToolBox->GetItemId(rIdent); VclPtr<vcl::Window> pFloat = m_aFloats[nItemId]; if (!pFloat) @@ -1806,25 +1801,25 @@ void JSToolbar::set_menu_item_active(const OString& rIdent, bool bActive) { if (bActive) { - JSInstanceBuilder::RememberPopup(std::to_string(pPopupRoot->GetLOKWindowId()), pFloat); - sendPopup(pPopupRoot, m_xToolBox->get_id(), - OStringToOUString(rIdent, RTL_TEXTENCODING_ASCII_US)); + JSInstanceBuilder::RememberPopup(OUString::number(pPopupRoot->GetLOKWindowId()), + pFloat); + sendPopup(pPopupRoot, m_xToolBox->get_id(), rIdent); } else if (bWasActive) { - JSInstanceBuilder::ForgetPopup(std::to_string(pPopupRoot->GetLOKWindowId())); + JSInstanceBuilder::ForgetPopup(OUString::number(pPopupRoot->GetLOKWindowId())); sendClosePopup(pPopupRoot->GetLOKWindowId()); } } } -void JSToolbar::set_item_sensitive(const OString& rIdent, bool bSensitive) +void JSToolbar::set_item_sensitive(const OUString& rIdent, bool bSensitive) { SalInstanceToolbar::set_item_sensitive(rIdent, bSensitive); sendUpdate(); } -void JSToolbar::set_item_icon_name(const OString& rIdent, const OUString& rIconName) +void JSToolbar::set_item_icon_name(const OUString& rIdent, const OUString& rIconName) { SalInstanceToolbar::set_item_icon_name(rIdent, rIconName); sendUpdate(); @@ -2124,7 +2119,7 @@ void JSPopover::popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRe void JSPopover::popdown() { - vcl::Window* pPopup = JSInstanceBuilder::FindPopup(std::to_string(mnWindowId)); + vcl::Window* pPopup = JSInstanceBuilder::FindPopup(OUString::number(mnWindowId)); if (pPopup) { diff --git a/vcl/source/app/customweld.cxx b/vcl/source/app/customweld.cxx index 14fbef077454..675373aa5f31 100644 --- a/vcl/source/app/customweld.cxx +++ b/vcl/source/app/customweld.cxx @@ -18,7 +18,7 @@ IMPL_LINK_NOARG(CustomWidgetController, DragBeginHdl, weld::DrawingArea&, bool) return StartDrag(); } -CustomWeld::CustomWeld(weld::Builder& rBuilder, const OString& rDrawingId, +CustomWeld::CustomWeld(weld::Builder& rBuilder, const OUString& rDrawingId, CustomWidgetController& rWidgetController) : m_rWidgetController(rWidgetController) , m_xDrawingArea(rBuilder.weld_drawing_area(rDrawingId, rWidgetController.CreateAccessible(), diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index c78ed6fecfef..3e13d215f2cb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -429,16 +429,13 @@ Size SalInstanceWidget::get_pixel_size(const OUString& rText) const vcl::Font SalInstanceWidget::get_font() { return m_xWidget->GetPointFont(*m_xWidget->GetOutDev()); } -OString SalInstanceWidget::get_buildable_name() const { return m_xWidget->get_id().toUtf8(); } +OUString SalInstanceWidget::get_buildable_name() const { return m_xWidget->get_id(); } -void SalInstanceWidget::set_buildable_name(const OString& rId) -{ - return m_xWidget->set_id(OUString::fromUtf8(rId)); -} +void SalInstanceWidget::set_buildable_name(const OUString& rId) { return m_xWidget->set_id(rId); } -void SalInstanceWidget::set_help_id(const OString& rId) { return m_xWidget->SetHelpId(rId); } +void SalInstanceWidget::set_help_id(const OUString& rId) { return m_xWidget->SetHelpId(rId); } -OString SalInstanceWidget::get_help_id() const { return m_xWidget->GetHelpId(); } +OUString SalInstanceWidget::get_help_id() const { return m_xWidget->GetHelpId(); } void SalInstanceWidget::set_grid_left_attach(int nAttach) { @@ -868,7 +865,7 @@ Image createImage(const VirtualDevice& rDevice) return Image(rDevice.GetBitmapEx(Point(), rDevice.GetOutputSizePixel())); } -sal_uInt16 insert_to_menu(sal_uInt16 nLastId, PopupMenu* pMenu, int pos, std::u16string_view rId, +sal_uInt16 insert_to_menu(sal_uInt16 nLastId, PopupMenu* pMenu, int pos, const OUString& rId, const OUString& rStr, const OUString* pIconName, const VirtualDevice* pImageSurface, const css::uno::Reference<css::graphic::XGraphic>& rImage, @@ -884,8 +881,7 @@ sal_uInt16 insert_to_menu(sal_uInt16 nLastId, PopupMenu* pMenu, int pos, std::u1 else nBits = MenuItemBits::NONE; - pMenu->InsertItem(nNewid, rStr, nBits, OUStringToOString(rId, RTL_TEXTENCODING_UTF8), - pos == -1 ? MENU_APPEND : pos); + pMenu->InsertItem(nNewid, rStr, nBits, rId, pos == -1 ? MENU_APPEND : pos); if (pIconName) { pMenu->SetItemImage(nNewid, createImage(*pIconName)); @@ -910,8 +906,8 @@ SalInstanceMenu::SalInstanceMenu(PopupMenu* pMenu, bool bTakeOwnership) m_nLastId = nCount ? pMenu->GetItemId(nCount - 1) : 0; m_xMenu->SetSelectHdl(LINK(this, SalInstanceMenu, SelectMenuHdl)); } -OString SalInstanceMenu::popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, - weld::Placement ePlace) +OUString SalInstanceMenu::popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, + weld::Placement ePlace) { SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pParent); assert(pVclWidget); @@ -923,31 +919,31 @@ OString SalInstanceMenu::popup_at_rect(weld::Widget* pParent, const tools::Recta m_xMenu->Execute(pVclWidget->getWidget(), rRect, eFlags); return m_xMenu->GetCurItemIdent(); } -void SalInstanceMenu::set_sensitive(const OString& rIdent, bool bSensitive) +void SalInstanceMenu::set_sensitive(const OUString& rIdent, bool bSensitive) { m_xMenu->EnableItem(rIdent, bSensitive); } -bool SalInstanceMenu::get_sensitive(const OString& rIdent) const +bool SalInstanceMenu::get_sensitive(const OUString& rIdent) const { return m_xMenu->IsItemEnabled(m_xMenu->GetItemId(rIdent)); } -void SalInstanceMenu::set_active(const OString& rIdent, bool bActive) +void SalInstanceMenu::set_active(const OUString& rIdent, bool bActive) { m_xMenu->CheckItem(rIdent, bActive); } -bool SalInstanceMenu::get_active(const OString& rIdent) const +bool SalInstanceMenu::get_active(const OUString& rIdent) const { return m_xMenu->IsItemChecked(m_xMenu->GetItemId(rIdent)); } -void SalInstanceMenu::set_label(const OString& rIdent, const OUString& rLabel) +void SalInstanceMenu::set_label(const OUString& rIdent, const OUString& rLabel) { m_xMenu->SetItemText(m_xMenu->GetItemId(rIdent), rLabel); } -OUString SalInstanceMenu::get_label(const OString& rIdent) const +OUString SalInstanceMenu::get_label(const OUString& rIdent) const { return m_xMenu->GetItemText(m_xMenu->GetItemId(rIdent)); } -void SalInstanceMenu::set_visible(const OString& rIdent, bool bShow) +void SalInstanceMenu::set_visible(const OUString& rIdent, bool bShow) { m_xMenu->ShowItem(m_xMenu->GetItemId(rIdent), bShow); } @@ -963,14 +959,14 @@ void SalInstanceMenu::insert(int pos, const OUString& rId, const OUString& rStr, void SalInstanceMenu::insert_separator(int pos, const OUString& rId) { auto nInsertPos = pos == -1 ? MENU_APPEND : pos; - m_xMenu->InsertSeparator(rId.toUtf8(), nInsertPos); + m_xMenu->InsertSeparator(rId, nInsertPos); } -void SalInstanceMenu::remove(const OString& rId) +void SalInstanceMenu::remove(const OUString& rId) { m_xMenu->RemoveItem(m_xMenu->GetItemPos(m_xMenu->GetItemId(rId))); } int SalInstanceMenu::n_children() const { return m_xMenu->GetItemCount(); } -OString SalInstanceMenu::get_id(int pos) const +OUString SalInstanceMenu::get_id(int pos) const { return m_xMenu->GetItemIdent(m_xMenu->GetItemId(pos)); } @@ -1005,50 +1001,50 @@ SalInstanceToolbar::SalInstanceToolbar(ToolBox* pToolBox, SalInstanceBuilder* pB m_xToolBox->SetDropdownClickHdl(LINK(this, SalInstanceToolbar, DropdownClick)); } -void SalInstanceToolbar::set_item_sensitive(const OString& rIdent, bool bSensitive) +void SalInstanceToolbar::set_item_sensitive(const OUString& rIdent, bool bSensitive) { - m_xToolBox->EnableItem(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), bSensitive); + m_xToolBox->EnableItem(m_xToolBox->GetItemId(rIdent), bSensitive); } -bool SalInstanceToolbar::get_item_sensitive(const OString& rIdent) const +bool SalInstanceToolbar::get_item_sensitive(const OUString& rIdent) const { - return m_xToolBox->IsItemEnabled(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent))); + return m_xToolBox->IsItemEnabled(m_xToolBox->GetItemId(rIdent)); } -void SalInstanceToolbar::set_item_visible(const OString& rIdent, bool bVisible) +void SalInstanceToolbar::set_item_visible(const OUString& rIdent, bool bVisible) { - m_xToolBox->ShowItem(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), bVisible); + m_xToolBox->ShowItem(m_xToolBox->GetItemId(rIdent), bVisible); } -void SalInstanceToolbar::set_item_help_id(const OString& rIdent, const OString& rHelpId) +void SalInstanceToolbar::set_item_help_id(const OUString& rIdent, const OUString& rHelpId) { - m_xToolBox->SetHelpId(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), rHelpId); + m_xToolBox->SetHelpId(m_xToolBox->GetItemId(rIdent), rHelpId); } -bool SalInstanceToolbar::get_item_visible(const OString& rIdent) const +bool SalInstanceToolbar::get_item_visible(const OUString& rIdent) const { - return m_xToolBox->IsItemVisible(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent))); + return m_xToolBox->IsItemVisible(m_xToolBox->GetItemId(rIdent)); } -void SalInstanceToolbar::set_item_active(const OString& rIdent, bool bActive) +void SalInstanceToolbar::set_item_active(const OUString& rIdent, bool bActive) { - ToolBoxItemId nItemId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)); + ToolBoxItemId nItemId = m_xToolBox->GetItemId(rIdent); m_xToolBox->CheckItem(nItemId, bActive); } -bool SalInstanceToolbar::get_item_active(const OString& rIdent) const +bool SalInstanceToolbar::get_item_active(const OUString& rIdent) const { - return m_xToolBox->IsItemChecked(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent))); + return m_xToolBox->IsItemChecked(m_xToolBox->GetItemId(rIdent)); } -void SalInstanceToolbar::set_menu_item_active(const OString& rIdent, bool bActive) +void SalInstanceToolbar::set_menu_item_active(const OUString& rIdent, bool bActive) { - ToolBoxItemId nItemId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)); + ToolBoxItemId nItemId = m_xToolBox->GetItemId(rIdent); assert(m_xToolBox->GetItemBits(nItemId) & ToolBoxItemBits::DROPDOWN); if (bActive) { - m_sStartShowIdent = m_xToolBox->GetItemCommand(nItemId).toUtf8(); + m_sStartShowIdent = m_xToolBox->GetItemCommand(nItemId); signal_toggle_menu(m_sStartShowIdent); } @@ -1076,9 +1072,9 @@ void SalInstanceToolbar::set_menu_item_active(const OString& rIdent, bool bActiv m_sStartShowIdent.clear(); } -bool SalInstanceToolbar::get_menu_item_active(const OString& rIdent) const +bool SalInstanceToolbar::get_menu_item_active(const OUString& rIdent) const { - ToolBoxItemId nItemId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)); + ToolBoxItemId nItemId = m_xToolBox->GetItemId(rIdent); assert(m_xToolBox->GetItemBits(nItemId) & ToolBoxItemBits::DROPDOWN); if (rIdent == m_sStartShowIdent) @@ -1099,7 +1095,7 @@ bool SalInstanceToolbar::get_menu_item_active(const OString& rIdent) const return false; } -void SalInstanceToolbar::set_item_popover(const OString& rIdent, weld::Widget* pPopover) +void SalInstanceToolbar::set_item_popover(const OUString& rIdent, weld::Widget* pPopover) { SalInstanceWidget* pPopoverWidget = dynamic_cast<SalInstanceWidget*>(pPopover); @@ -1110,7 +1106,7 @@ void SalInstanceToolbar::set_item_popover(const OString& rIdent, weld::Widget* p pFloat->EnableDocking(); } - ToolBoxItemId nId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)); + ToolBoxItemId nId = m_xToolBox->GetItemId(rIdent); auto xOldFloat = m_aFloats[nId]; if (xOldFloat) { @@ -1120,13 +1116,13 @@ void SalInstanceToolbar::set_item_popover(const OString& rIdent, weld::Widget* p m_aMenus[nId] = nullptr; } -void SalInstanceToolbar::set_item_menu(const OString& rIdent, weld::Menu* pMenu) +void SalInstanceToolbar::set_item_menu(const OUString& rIdent, weld::Menu* pMenu) { SalInstanceMenu* pInstanceMenu = dynamic_cast<SalInstanceMenu*>(pMenu); PopupMenu* pPopup = pInstanceMenu ? pInstanceMenu->getMenu() : nullptr; - ToolBoxItemId nId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)); + ToolBoxItemId nId = m_xToolBox->GetItemId(rIdent); m_aMenus[nId] = pPopup; m_aFloats[nId] = nullptr; } @@ -1145,14 +1141,14 @@ void SalInstanceToolbar::insert_separator(int pos, const OUString& /*rId*/) int SalInstanceToolbar::get_n_items() const { return m_xToolBox->GetItemCount(); } -OString SalInstanceToolbar::get_item_ident(int nIndex) const +OUString SalInstanceToolbar::get_item_ident(int nIndex) const { - return m_xToolBox->GetItemCommand(m_xToolBox->GetItemId(nIndex)).toUtf8(); + return m_xToolBox->GetItemCommand(m_xToolBox->GetItemId(nIndex)); } -void SalInstanceToolbar::set_item_ident(int nIndex, const OString& rIdent) +void SalInstanceToolbar::set_item_ident(int nIndex, const OUString& rIdent) { - return m_xToolBox->SetItemCommand(m_xToolBox->GetItemId(nIndex), OUString::fromUtf8(rIdent)); + return m_xToolBox->SetItemCommand(m_xToolBox->GetItemId(nIndex), rIdent); } void SalInstanceToolbar::set_item_label(int nIndex, const OUString& rLabel) @@ -1160,41 +1156,38 @@ void SalInstanceToolbar::set_item_label(int nIndex, const OUString& rLabel) m_xToolBox->SetItemText(m_xToolBox->GetItemId(nIndex), rLabel); } -OUString SalInstanceToolbar::get_item_label(const OString& rIdent) const +OUString SalInstanceToolbar::get_item_label(const OUString& rIdent) const { - return m_xToolBox->GetItemText(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent))); + return m_xToolBox->GetItemText(m_xToolBox->GetItemId(rIdent)); } -void SalInstanceToolbar::set_item_label(const OString& rIdent, const OUString& rLabel) +void SalInstanceToolbar::set_item_label(const OUString& rIdent, const OUString& rLabel) { - m_xToolBox->SetItemText(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), rLabel); + m_xToolBox->SetItemText(m_xToolBox->GetItemId(rIdent), rLabel); } -void SalInstanceToolbar::set_item_icon_name(const OString& rIdent, const OUString& rIconName) +void SalInstanceToolbar::set_item_icon_name(const OUString& rIdent, const OUString& rIconName) { - m_xToolBox->SetItemImage(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), - Image(StockImage::Yes, rIconName)); + m_xToolBox->SetItemImage(m_xToolBox->GetItemId(rIdent), Image(StockImage::Yes, rIconName)); } -void SalInstanceToolbar::set_item_image_mirrored(const OString& rIdent, bool bMirrored) +void SalInstanceToolbar::set_item_image_mirrored(const OUString& rIdent, bool bMirrored) { - m_xToolBox->SetItemImageMirrorMode(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), - bMirrored); + m_xToolBox->SetItemImageMirrorMode(m_xToolBox->GetItemId(rIdent), bMirrored); } -void SalInstanceToolbar::set_item_image(const OString& rIdent, +void SalInstanceToolbar::set_item_image(const OUString& rIdent, const css::uno::Reference<css::graphic::XGraphic>& rIcon) { - m_xToolBox->SetItemImage(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), Image(rIcon)); + m_xToolBox->SetItemImage(m_xToolBox->GetItemId(rIdent), Image(rIcon)); } -void SalInstanceToolbar::set_item_image(const OString& rIdent, VirtualDevice* pDevice) +void SalInstanceToolbar::set_item_image(const OUString& rIdent, VirtualDevice* pDevice) { if (pDevice) - m_xToolBox->SetItemImage(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), - createImage(*pDevice)); + m_xToolBox->SetItemImage(m_xToolBox->GetItemId(rIdent), createImage(*pDevice)); else - m_xToolBox->SetItemImage(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), Image()); + m_xToolBox->SetItemImage(m_xToolBox->GetItemId(rIdent), Image()); } void SalInstanceToolbar::set_item_image(int nIndex, @@ -1208,14 +1201,14 @@ void SalInstanceToolbar::set_item_tooltip_text(int nIndex, const OUString& rTip) m_xToolBox->SetQuickHelpText(m_xToolBox->GetItemId(nIndex), rTip); } -void SalInstanceToolbar::set_item_tooltip_text(const OString& rIdent, const OUString& rTip) +void SalInstanceToolbar::set_item_tooltip_text(const OUString& rIdent, const OUString& rTip) { - m_xToolBox->SetQuickHelpText(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent)), rTip); + m_xToolBox->SetQuickHelpText(m_xToolBox->GetItemId(rIdent), rTip); } -OUString SalInstanceToolbar::get_item_tooltip_text(const OString& rIdent) const +OUString SalInstanceToolbar::get_item_tooltip_text(const OUString& rIdent) const { - return m_xToolBox->GetQuickHelpText(m_xToolBox->GetItemId(OUString::fromUtf8(rIdent))); + return m_xToolBox->GetQuickHelpText(m_xToolBox->GetItemId(rIdent)); } vcl::ImageType SalInstanceToolbar::get_icon_size() const { return m_xToolBox->GetImageSize(); } @@ -1261,13 +1254,13 @@ SalInstanceToolbar::~SalInstanceToolbar() IMPL_LINK_NOARG(SalInstanceToolbar, ClickHdl, ToolBox*, void) { ToolBoxItemId nItemId = m_xToolBox->GetCurItemId(); - signal_clicked(m_xToolBox->GetItemCommand(nItemId).toUtf8()); + signal_clicked(m_xToolBox->GetItemCommand(nItemId)); } IMPL_LINK_NOARG(SalInstanceToolbar, DropdownClick, ToolBox*, void) { ToolBoxItemId nItemId = m_xToolBox->GetCurItemId(); - set_menu_item_active(m_xToolBox->GetItemCommand(nItemId).toUtf8(), true); + set_menu_item_active(m_xToolBox->GetItemCommand(nItemId), true); } IMPL_LINK(SalInstanceToolbar, MenuToggleListener, VclWindowEvent&, rEvent, void) @@ -1279,7 +1272,7 @@ IMPL_LINK(SalInstanceToolbar, MenuToggleListener, VclWindowEvent&, rEvent, void) if (rEvent.GetWindow() == rFloat.second) { ToolBoxItemId nItemId = rFloat.first; - signal_toggle_menu(m_xToolBox->GetItemCommand(nItemId).toUtf8()); + signal_toggle_menu(m_xToolBox->GetItemCommand(nItemId)); break; } } @@ -1678,14 +1671,14 @@ bool SalInstanceWindow::is_default_widget(const weld::Widget* pCandidate) const return pWidget && pWidget->GetStyle() & WB_DEFBUTTON; } -void SalInstanceWindow::set_window_state(const OString& rStr) +void SalInstanceWindow::set_window_state(const OUString& rStr) { SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(m_xWindow.get()); assert(pSysWin); pSysWin->SetWindowState(rStr); } -OString SalInstanceWindow::get_window_state(vcl::WindowDataMask nMask) const +OUString SalInstanceWindow::get_window_state(vcl::WindowDataMask nMask) const { SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(m_xWindow.get()); assert(pSysWin); @@ -1879,7 +1872,7 @@ int SalInstanceDialog::run() void SalInstanceDialog::response(int nResponse) { m_xDialog->EndDialog(nResponse); } -void SalInstanceDialog::add_button(const OUString& rText, int nResponse, const OString& rHelpId) +void SalInstanceDialog::add_button(const OUString& rText, int nResponse, const OUString& rHelpId) { VclButtonBox* pBox = m_xDialog->get_action_area(); VclPtr<PushButton> xButton( @@ -2004,11 +1997,11 @@ weld::Container* SalInstanceMessageDialog::weld_message_area() return new SalInstanceContainer(m_xMessageDialog->get_message_area(), m_pBuilder, false); } -int SalInstanceAssistant::find_page(std::string_view rIdent) const +int SalInstanceAssistant::find_page(std::u16string_view rIdent) const { for (size_t i = 0; i < m_aAddedPages.size(); ++i) { - if (m_aAddedPages[i]->get_id().toUtf8() == rIdent) + if (m_aAddedPages[i]->get_id() == rIdent) return i; } return -1; @@ -2040,12 +2033,12 @@ int SalInstanceAssistant::get_current_page() const { return find_id(m_xWizard->G int SalInstanceAssistant::get_n_pages() const { return m_aAddedPages.size(); } -OString SalInstanceAssistant::get_page_ident(int nPage) const +OUString SalInstanceAssistant::get_page_ident(int nPage) const { - return m_aAddedPages[nPage]->get_id().toUtf8(); + return m_aAddedPages[nPage]->get_id(); } -OString SalInstanceAssistant::get_current_page_ident() const +OUString SalInstanceAssistant::get_current_page_ident() const { return get_page_ident(get_current_page()); } @@ -2075,7 +2068,7 @@ void SalInstanceAssistant::set_current_page(int nPage) enable_notify_events(); } -void SalInstanceAssistant::set_current_page(const OString& rIdent) +void SalInstanceAssistant::set_current_page(const OUString& rIdent) { int nIndex = find_page(rIdent); if (nIndex == -1) @@ -2083,7 +2076,7 @@ void SalInstanceAssistant::set_current_page(const OString& rIdent) set_current_page(nIndex); } -void SalInstanceAssistant::set_page_index(const OString& rIdent, int nNewIndex) +void SalInstanceAssistant::set_page_index(const OUString& rIdent, int nNewIndex) { int nOldIndex = find_page(rIdent); @@ -2108,11 +2101,11 @@ void SalInstanceAssistant::set_page_index(const OString& rIdent, int nNewIndex) enable_notify_events(); } -weld::Container* SalInstanceAssistant::append_page(const OString& rIdent) +weld::Container* SalInstanceAssistant::append_page(const OUString& rIdent) { VclPtrInstance<TabPage> xPage(m_xWizard); VclPtrInstance<VclGrid> xGrid(xPage); - xPage->set_id(OUString::fromUtf8(rIdent)); + xPage->set_id(rIdent); xPage->Show(); xGrid->set_hexpand(true); xGrid->set_vexpand(true); @@ -2129,7 +2122,7 @@ weld::Container* SalInstanceAssistant::append_page(const OString& rIdent) return m_aPages.back().get(); } -OUString SalInstanceAssistant::get_page_title(const OString& rIdent) const +OUString SalInstanceAssistant::get_page_title(const OUString& rIdent) const { int nIndex = find_page(rIdent); if (nIndex == -1) @@ -2137,7 +2130,7 @@ OUString SalInstanceAssistant::get_page_title(const OString& rIdent) const return m_aAddedPages[nIndex]->GetText(); } -void SalInstanceAssistant::set_page_title(const OString& rIdent, const OUString& rTitle) +void SalInstanceAssistant::set_page_title(const OUString& rIdent, const OUString& rTitle) { int nIndex = find_page(rIdent); if (nIndex == -1) @@ -2151,7 +2144,7 @@ void SalInstanceAssistant::set_page_title(const OString& rIdent, const OUString& } } -void SalInstanceAssistant::set_page_sensitive(const OString& rIdent, bool bSensitive) +void SalInstanceAssistant::set_page_sensitive(const OUString& rIdent, bool bSensitive) { int nIndex = find_page(rIdent); if (nIndex == -1) @@ -2165,7 +2158,7 @@ void SalInstanceAssistant::set_page_sensitive(const OString& rIdent, bool bSensi } } -void SalInstanceAssistant::set_page_side_help_id(const OString& rHelpId) +void SalInstanceAssistant::set_page_side_help_id(const OUString& rHelpId) { m_xWizard->SetRoadmapHelpId(rHelpId); } @@ -2606,17 +2599,17 @@ int SalInstanceNotebook::get_current_page() const return m_xNotebook->GetPagePos(m_xNotebook->GetCurPageId()); } -OString SalInstanceNotebook::get_page_ident(int nPage) const +OUString SalInstanceNotebook::get_page_ident(int nPage) const { return m_xNotebook->GetPageName(m_xNotebook->GetPageId(nPage)); } -OString SalInstanceNotebook::get_current_page_ident() const +OUString SalInstanceNotebook::get_current_page_ident() const { return m_xNotebook->GetPageName(m_xNotebook->GetCurPageId()); } -int SalInstanceNotebook::get_page_index(const OString& rIdent) const +int SalInstanceNotebook::get_page_index(const OUString& rIdent) const { sal_uInt16 nPageId = m_xNotebook->GetPageId(rIdent); sal_uInt16 nPageIndex = m_xNotebook->GetPagePos(nPageId); @@ -2625,7 +2618,7 @@ int SalInstanceNotebook::get_page_index(const OString& rIdent) const return nPageIndex; } -weld::Container* SalInstanceNotebook::get_page(const OString& rIdent) const +weld::Container* SalInstanceNotebook::get_page(const OUString& rIdent) const { int nPageIndex = get_page_index(rIdent); if (nPageIndex == -1) @@ -2645,12 +2638,12 @@ void SalInstanceNotebook::set_current_page(int nPage) m_xNotebook->SetCurPageId(m_xNotebook->GetPageId(nPage)); } -void SalInstanceNotebook::set_current_page(const OString& rIdent) +void SalInstanceNotebook::set_current_page(const OUString& rIdent) { m_xNotebook->SetCurPageId(m_xNotebook->GetPageId(rIdent)); } -void SalInstanceNotebook::remove_page(const OString& rIdent) +void SalInstanceNotebook::remove_page(const OUString& rIdent) { sal_uInt16 nPageId = m_xNotebook->GetPageId(rIdent); sal_uInt16 nPageIndex = m_xNotebook->GetPagePos(nPageId); @@ -2670,7 +2663,7 @@ void SalInstanceNotebook::remove_page(const OString& rIdent) } } -void SalInstanceNotebook::insert_page(const OString& rIdent, const OUString& rLabel, int nPos) +void SalInstanceNotebook::insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) { sal_uInt16 nPageCount = m_xNotebook->GetPageCount(); sal_uInt16 nLastPageId = nPageCount ? m_xNotebook->GetPageId(nPageCount - 1) : 0; @@ -2698,12 +2691,12 @@ void SalInstanceNotebook::insert_page(const OString& rIdent, const OUString& rLa int SalInstanceNotebook::get_n_pages() const { return m_xNotebook->GetPageCount(); } -OUString SalInstanceNotebook::get_tab_label_text(const OString& rIdent) const +OUString SalInstanceNotebook::get_tab_label_text(const OUString& rIdent) const { return m_xNotebook->GetPageText(m_xNotebook->GetPageId(rIdent)); } -void SalInstanceNotebook::set_tab_label_text(const OString& rIdent, const OUString& rText) +void SalInstanceNotebook::set_tab_label_text(const OUString& rIdent, const OUString& rText) { return m_xNotebook->SetPageText(m_xNotebook->GetPageId(rIdent), rText); } @@ -2761,14 +2754,14 @@ public: return m_xNotebook->GetPagePos(m_xNotebook->GetCurPageId()); } - virtual OString get_page_ident(int nPage) const override + virtual OUString get_page_ident(int nPage) const override { return m_xNotebook->GetPageId(nPage); } - virtual OString get_current_page_ident() const override { return m_xNotebook->GetCurPageId(); } + virtual OUString get_current_page_ident() const override { return m_xNotebook->GetCurPageId(); } - virtual int get_page_index(const OString& rIdent) const override + virtual int get_page_index(const OUString& rIdent) const override { sal_uInt16 nPageIndex = m_xNotebook->GetPagePos(rIdent); if (nPageIndex == TAB_PAGE_NOTFOUND) @@ -2776,7 +2769,7 @@ public: return nPageIndex; } - virtual weld::Container* get_page(const OString& rIdent) const override + virtual weld::Container* get_page(const OUString& rIdent) const override { int nPageIndex = get_page_index(rIdent); if (nPageIndex == -1) @@ -2794,12 +2787,12 @@ public: m_xNotebook->SetCurPageId(m_xNotebook->GetPageId(nPage)); } - virtual void set_current_page(const OString& rIdent) override + virtual void set_current_page(const OUString& rIdent) override { m_xNotebook->SetCurPageId(rIdent); } - virtual void remove_page(const OString& rIdent) override + virtual void remove_page(const OUString& rIdent) override { sal_uInt16 nPageIndex = m_xNotebook->GetPagePos(rIdent); if (nPageIndex == TAB_PAGE_NOTFOUND) @@ -2809,7 +2802,7 @@ public: m_aPages.erase(m_aPages.begin() + nPageIndex); } - virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override + virtual void insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) override { VclPtrInstance<VclGrid> xGrid(m_xNotebook->GetPageParent()); xGrid->set_hexpand(true); @@ -2826,12 +2819,12 @@ public: virtual int get_n_pages() const override { return m_xNotebook->GetPageCount(); } - virtual void set_tab_label_text(const OString& rIdent, const OUString& rText) override + virtual void set_tab_label_text(const OUString& rIdent, const OUString& rText) override { return m_xNotebook->SetPageText(rIdent, rText); } - virtual OUString get_tab_label_text(const OString& rIdent) const override + virtual OUString get_tab_label_text(const OUString& rIdent) const override { return m_xNotebook->GetPageText(rIdent); } @@ -3005,16 +2998,16 @@ void SalInstanceMenuButton::insert_item(int pos, const OUString& rId, const OUSt void SalInstanceMenuButton::insert_separator(int pos, const OUString& rId) { auto nInsertPos = pos == -1 ? MENU_APPEND : pos; - m_xMenuButton->GetPopupMenu()->InsertSeparator(rId.toUtf8(), nInsertPos); + m_xMenuButton->GetPopupMenu()->InsertSeparator(rId, nInsertPos); } -void SalInstanceMenuButton::set_item_sensitive(const OString& rIdent, bool bSensitive) +void SalInstanceMenuButton::set_item_sensitive(const OUString& rIdent, bool bSensitive) { PopupMenu* pMenu = m_xMenuButton->GetPopupMenu(); pMenu->EnableItem(rIdent, bSensitive); } -void SalInstanceMenuButton::remove_item(const OString& rId) +void SalInstanceMenuButton::remove_item(const OUString& rId) { PopupMenu* pMenu = m_xMenuButton->GetPopupMenu(); pMenu->RemoveItem(pMenu->GetItemPos(pMenu->GetItemId(rId))); @@ -3026,25 +3019,25 @@ void SalInstanceMenuButton::clear() pMenu->Clear(); } -void SalInstanceMenuButton::set_item_active(const OString& rIdent, bool bActive) +void SalInstanceMenuButton::set_item_active(const OUString& rIdent, bool bActive) { PopupMenu* pMenu = m_xMenuButton->GetPopupMenu(); pMenu->CheckItem(rIdent, bActive); } -void SalInstanceMenuButton::set_item_label(const OString& rIdent, const OUString& rText) +void SalInstanceMenuButton::set_item_label(const OUString& rIdent, const OUString& rText) { PopupMenu* pMenu = m_xMenuButton->GetPopupMenu(); pMenu->SetItemText(pMenu->GetItemId(rIdent), rText); } -OUString SalInstanceMenuButton::get_item_label(const OString& rIdent) const +OUString SalInstanceMenuButton::get_item_label(const OUString& rIdent) const { PopupMenu* pMenu = m_xMenuButton->GetPopupMenu(); return pMenu->GetItemText(pMenu->GetItemId(rIdent)); } -void SalInstanceMenuButton::set_item_visible(const OString& rIdent, bool bShow) +void SalInstanceMenuButton::set_item_visible(const OUString& rIdent, bool bShow) { PopupMenu* pMenu = m_xMenuButton->GetPopupMenu(); pMenu->ShowItem(pMenu->GetItemId(rIdent), bShow); @@ -6883,7 +6876,7 @@ public: virtual void set_mru_entries(const OUString&) override { assert(false && "not implemented"); } - virtual void set_item_menu(const OString&, weld::Menu*) override + virtual void set_item_menu(const OUString&, weld::Menu*) override { assert(false && "not implemented"); } @@ -7033,11 +7026,11 @@ SalInstanceBuilder::SalInstanceBuilder(vcl::Window* pParent, const OUString& rUI const OUString& rUIFile, const css::uno::Reference<css::frame::XFrame>& rFrame) : weld::Builder() - , m_xBuilder(new VclBuilder(pParent, rUIRoot, rUIFile, OString(), rFrame, false)) + , m_xBuilder(new VclBuilder(pParent, rUIRoot, rUIFile, {}, rFrame, false)) { } -std::unique_ptr<weld::MessageDialog> SalInstanceBuilder::weld_message_dialog(const OString& id) +std::unique_ptr<weld::MessageDialog> SalInstanceBuilder::weld_message_dialog(const OUString& id) { MessageDialog* pMessageDialog = m_xBuilder->get<MessageDialog>(id); std::unique_ptr<weld::MessageDialog> pRet( @@ -7051,7 +7044,7 @@ std::unique_ptr<weld::MessageDialog> SalInstanceBuilder::weld_message_dialog(con return pRet; } -std::unique_ptr<weld::Dialog> SalInstanceBuilder::weld_dialog(const OString& id) +std::unique_ptr<weld::Dialog> SalInstanceBuilder::weld_dialog(const OUString& id) { Dialog* pDialog = m_xBuilder->get<Dialog>(id); std::unique_ptr<weld::Dialog> pRet(pDialog ? new SalInstanceDialog(pDialog, this, false) @@ -7065,7 +7058,7 @@ std::unique_ptr<weld::Dialog> SalInstanceBuilder::weld_dialog(const OString& id) return pRet; } -std::unique_ptr<weld::Assistant> SalInstanceBuilder::weld_assistant(const OString& id) +std::unique_ptr<weld::Assistant> SalInstanceBuilder::weld_assistant(const OUString& id) { vcl::RoadmapWizard* pDialog = m_xBuilder->get<vcl::RoadmapWizard>(id); std::unique_ptr<weld::Assistant> pRet(pDialog ? new SalInstanceAssistant(pDialog, this, false) @@ -7108,31 +7101,31 @@ std::unique_ptr<weld::Window> SalInstanceBuilder::create_screenshot_window() return std::unique_ptr<weld::Dialog>(new SalInstanceDialog(xDialog, this, false)); } -std::unique_ptr<weld::Widget> SalInstanceBuilder::weld_widget(const OString& id) +std::unique_ptr<weld::Widget> SalInstanceBuilder::weld_widget(const OUString& id) { vcl::Window* pWidget = m_xBuilder->get(id); return pWidget ? std::make_unique<SalInstanceWidget>(pWidget, this, false) : nullptr; } -std::unique_ptr<weld::Container> SalInstanceBuilder::weld_container(const OString& id) +std::unique_ptr<weld::Container> SalInstanceBuilder::weld_container(const OUString& id) { vcl::Window* pContainer = m_xBuilder->get(id); return pContainer ? std::make_unique<SalInstanceContainer>(pContainer, this, false) : nullptr; } -std::unique_ptr<weld::Box> SalInstanceBuilder::weld_box(const OString& id) +std::unique_ptr<weld::Box> SalInstanceBuilder::weld_box(const OUString& id) { VclBox* pContainer = m_xBuilder->get<VclBox>(id); return pContainer ? std::make_unique<SalInstanceBox>(pContainer, this, false) : nullptr; } -std::unique_ptr<weld::Paned> SalInstanceBuilder::weld_paned(const OString& id) +std::unique_ptr<weld::Paned> SalInstanceBuilder::weld_paned(const OUString& id) { VclPaned* pPaned = m_xBuilder->get<VclPaned>(id); return pPaned ? std::make_unique<SalInstancePaned>(pPaned, this, false) : nullptr; } -std::unique_ptr<weld::Frame> SalInstanceBuilder::weld_frame(const OString& id) +std::unique_ptr<weld::Frame> SalInstanceBuilder::weld_frame(const OUString& id) { VclFrame* pFrame = m_xBuilder->get<VclFrame>(id); std::unique_ptr<weld::Frame> pRet(pFrame ? new SalInstanceFrame(pFrame, this, false) : nullptr); @@ -7140,7 +7133,7 @@ std::unique_ptr<weld::Frame> SalInstanceBuilder::weld_frame(const OString& id) } std::unique_ptr<weld::ScrolledWindow> -SalInstanceBuilder::weld_scrolled_window(const OString& id, bool bUserManagedScrolling) +SalInstanceBuilder::weld_scrolled_window(const OUString& id, bool bUserManagedScrolling) { VclScrolledWindow* pScrolledWindow = m_xBuilder->get<VclScrolledWindow>(id); return pScrolledWindow ? std::make_unique<SalInstanceScrolledWindow>( @@ -7148,7 +7141,7 @@ SalInstanceBuilder::weld_scrolled_window(const OString& id, bool bUserManagedScr : nullptr; } -std::unique_ptr<weld::Notebook> SalInstanceBuilder::weld_notebook(const OString& id) +std::unique_ptr<weld::Notebook> SalInstanceBuilder::weld_notebook(const OUString& id) { vcl::Window* pNotebook = m_xBuilder->get(id); if (!pNotebook) @@ -7162,89 +7155,89 @@ std::unique_ptr<weld::Notebook> SalInstanceBuilder::weld_notebook(const OString& return nullptr; } -std::unique_ptr<weld::Button> SalInstanceBuilder::weld_button(const OString& id) +std::unique_ptr<weld::Button> SalInstanceBuilder::weld_button(const OUString& id) { Button* pButton = m_xBuilder->get<Button>(id); return pButton ? std::make_unique<SalInstanceButton>(pButton, this, false) : nullptr; } -std::unique_ptr<weld::MenuButton> SalInstanceBuilder::weld_menu_button(const OString& id) +std::unique_ptr<weld::MenuButton> SalInstanceBuilder::weld_menu_button(const OUString& id) { MenuButton* pButton = m_xBuilder->get<MenuButton>(id); return pButton ? std::make_unique<SalInstanceMenuButton>(pButton, this, false) : nullptr; } std::unique_ptr<weld::MenuToggleButton> -SalInstanceBuilder::weld_menu_toggle_button(const OString& id) +SalInstanceBuilder::weld_menu_toggle_button(const OUString& id) { MenuToggleButton* pButton = m_xBuilder->get<MenuToggleButton>(id); return pButton ? std::make_unique<SalInstanceMenuToggleButton>(pButton, this, false) : nullptr; } -std::unique_ptr<weld::LinkButton> SalInstanceBuilder::weld_link_button(const OString& id) +std::unique_ptr<weld::LinkButton> SalInstanceBuilder::weld_link_button(const OUString& id) { FixedHyperlink* pButton = m_xBuilder->get<FixedHyperlink>(id); return pButton ? std::make_unique<SalInstanceLinkButton>(pButton, this, false) : nullptr; } -std::unique_ptr<weld::ToggleButton> SalInstanceBuilder::weld_toggle_button(const OString& id) +std::unique_ptr<weld::ToggleButton> SalInstanceBuilder::weld_toggle_button(const OUString& id) { PushButton* pToggleButton = m_xBuilder->get<PushButton>(id); return pToggleButton ? std::make_unique<SalInstanceToggleButton>(pToggleButton, this, false) : nullptr; } -std::unique_ptr<weld::RadioButton> SalInstanceBuilder::weld_radio_button(const OString& id) +std::unique_ptr<weld::RadioButton> SalInstanceBuilder::weld_radio_button(const OUString& id) { RadioButton* pRadioButton = m_xBuilder->get<RadioButton>(id); return pRadioButton ? std::make_unique<SalInstanceRadioButton>(pRadioButton, this, false) : nullptr; } -std::unique_ptr<weld::CheckButton> SalInstanceBuilder::weld_check_button(const OString& id) +std::unique_ptr<weld::CheckButton> SalInstanceBuilder::weld_check_button(const OUString& id) { CheckBox* pCheckButton = m_xBuilder->get<CheckBox>(id); return pCheckButton ? std::make_unique<SalInstanceCheckButton>(pCheckButton, this, false) : nullptr; } -std::unique_ptr<weld::Scale> SalInstanceBuilder::weld_scale(const OString& id) +std::unique_ptr<weld::Scale> SalInstanceBuilder::weld_scale(const OUString& id) { Slider* pSlider = m_xBuilder->get<Slider>(id); return pSlider ? std::make_unique<SalInstanceScale>(pSlider, this, false) : nullptr; } -std::unique_ptr<weld::ProgressBar> SalInstanceBuilder::weld_progress_bar(const OString& id) +std::unique_ptr<weld::ProgressBar> SalInstanceBuilder::weld_progress_bar(const OUString& id) { ::ProgressBar* pProgress = m_xBuilder->get<::ProgressBar>(id); return pProgress ? std::make_unique<SalInstanceProgressBar>(pProgress, this, false) : nullptr; } -std::unique_ptr<weld::Spinner> SalInstanceBuilder::weld_spinner(const OString& id) +std::unique_ptr<weld::Spinner> SalInstanceBuilder::weld_spinner(const OUString& id) { Throbber* pThrobber = m_xBuilder->get<Throbber>(id); return pThrobber ? std::make_unique<SalInstanceSpinner>(pThrobber, this, false) : nullptr; } -std::unique_ptr<weld::Image> SalInstanceBuilder::weld_image(const OString& id) +std::unique_ptr<weld::Image> SalInstanceBuilder::weld_image(const OUString& id) { FixedImage* pImage = m_xBuilder->get<FixedImage>(id); return pImage ? std::make_unique<SalInstanceImage>(pImage, this, false) : nullptr; } -std::unique_ptr<weld::Calendar> SalInstanceBuilder::weld_calendar(const OString& id) +std::unique_ptr<weld::Calendar> SalInstanceBuilder::weld_calendar(const OUString& id) { Calendar* pCalendar = m_xBuilder->get<Calendar>(id); return pCalendar ? std::make_unique<SalInstanceCalendar>(pCalendar, this, false) : nullptr; } -std::unique_ptr<weld::Entry> SalInstanceBuilder::weld_entry(const OString& id) +std::unique_ptr<weld::Entry> SalInstanceBuilder::weld_entry(const OUString& id) { Edit* pEntry = m_xBuilder->get<Edit>(id); return pEntry ? std::make_unique<SalInstanceEntry>(pEntry, this, false) : nullptr; } -std::unique_ptr<weld::SpinButton> SalInstanceBuilder::weld_spin_button(const OString& id) +std::unique_ptr<weld::SpinButton> SalInstanceBuilder::weld_spin_button(const OUString& id) { FormattedField* pSpinButton = m_xBuilder->get<FormattedField>(id); return pSpinButton ? std::make_unique<SalInstanceSpinButton>(pSpinButton, this, false) @@ -7252,7 +7245,7 @@ std::unique_ptr<weld::SpinButton> SalInstanceBuilder::weld_spin_button(const OSt } std::unique_ptr<weld::MetricSpinButton> -SalInstanceBuilder::weld_metric_spin_button(const OString& id, FieldUnit eUnit) +SalInstanceBuilder::weld_metric_spin_button(const OUString& id, FieldUnit eUnit) { std::unique_ptr<weld::SpinButton> xButton(weld_spin_button(id)); if (xButton) @@ -7264,14 +7257,14 @@ SalInstanceBuilder::weld_metric_spin_button(const OString& id, FieldUnit eUnit) } std::unique_ptr<weld::FormattedSpinButton> -SalInstanceBuilder::weld_formatted_spin_button(const OString& id) +SalInstanceBuilder::weld_formatted_spin_button(const OUString& id) { FormattedField* pSpinButton = m_xBuilder->get<FormattedField>(id); return pSpinButton ? std::make_unique<SalInstanceFormattedSpinButton>(pSpinButton, this, false) : nullptr; } -std::unique_ptr<weld::ComboBox> SalInstanceBuilder::weld_combo_box(const OString& id) +std::unique_ptr<weld::ComboBox> SalInstanceBuilder::weld_combo_box(const OUString& id) { vcl::Window* pWidget = m_xBuilder->get(id); ::ComboBox* pComboBox = dynamic_cast<::ComboBox*>(pWidget); @@ -7283,8 +7276,8 @@ std::unique_ptr<weld::ComboBox> SalInstanceBuilder::weld_combo_box(const OString } std::unique_ptr<weld::EntryTreeView> -SalInstanceBuilder::weld_entry_tree_view(const OString& containerid, const OString& entryid, - const OString& treeviewid) +SalInstanceBuilder::weld_entry_tree_view(const OUString& containerid, const OUString& entryid, + const OUString& treeviewid) { vcl::Window* pContainer = m_xBuilder->get(containerid); return pContainer ? std::make_unique<SalInstanceEntryTreeView>(pContainer, this, false, @@ -7293,38 +7286,38 @@ SalInstanceBuilder::weld_entry_tree_view(const OString& containerid, const OStri : nullptr; } -std::unique_ptr<weld::TreeView> SalInstanceBuilder::weld_tree_view(const OString& id) +std::unique_ptr<weld::TreeView> SalInstanceBuilder::weld_tree_view(const OUString& id) { SvTabListBox* pTreeView = m_xBuilder->get<SvTabListBox>(id); return pTreeView ? std::make_unique<SalInstanceTreeView>(pTreeView, this, false) : nullptr; } -std::unique_ptr<weld::IconView> SalInstanceBuilder::weld_icon_view(const OString& id) +std::unique_ptr<weld::IconView> SalInstanceBuilder::weld_icon_view(const OUString& id) { IconView* pIconView = m_xBuilder->get<IconView>(id); return pIconView ? std::make_unique<SalInstanceIconView>(pIconView, this, false) : nullptr; } -std::unique_ptr<weld::Label> SalInstanceBuilder::weld_label(const OString& id) +std::unique_ptr<weld::Label> SalInstanceBuilder::weld_label(const OUString& id) { Control* pLabel = m_xBuilder->get<Control>(id); return pLabel ? std::make_unique<SalInstanceLabel>(pLabel, this, false) : nullptr; } -std::unique_ptr<weld::TextView> SalInstanceBuilder::weld_text_view(const OString& id) +std::unique_ptr<weld::TextView> SalInstanceBuilder::weld_text_view(const OUString& id) { VclMultiLineEdit* pTextView = m_xBuilder->get<VclMultiLineEdit>(id); return pTextView ? std::make_unique<SalInstanceTextView>(pTextView, this, false) : nullptr; } -std::unique_ptr<weld::Expander> SalInstanceBuilder::weld_expander(const OString& id) +std::unique_ptr<weld::Expander> SalInstanceBuilder::weld_expander(const OUString& id) { VclExpander* pExpander = m_xBuilder->get<VclExpander>(id); return pExpander ? std::make_unique<SalInstanceExpander>(pExpander, this, false) : nullptr; } std::unique_ptr<weld::DrawingArea> -SalInstanceBuilder::weld_drawing_area(const OString& id, const a11yref& rA11yImpl, +SalInstanceBuilder::weld_drawing_area(const OUString& id, const a11yref& rA11yImpl, FactoryFunction pUITestFactoryFunction, void* pUserData) { VclDrawingArea* pDrawingArea = m_xBuilder->get<VclDrawingArea>(id); @@ -7334,13 +7327,13 @@ SalInstanceBuilder::weld_drawing_area(const OString& id, const a11yref& rA11yImp : nullptr; } -std::unique_ptr<weld::Menu> SalInstanceBuilder::weld_menu(const OString& id) +std::unique_ptr<weld::Menu> SalInstanceBuilder::weld_menu(const OUString& id) { PopupMenu* pMenu = m_xBuilder->get_menu(id); return pMenu ? std::make_unique<SalInstanceMenu>(pMenu, true) : nullptr; } -std::unique_ptr<weld::Popover> SalInstanceBuilder::weld_popover(const OString& id) +std::unique_ptr<weld::Popover> SalInstanceBuilder::weld_popover(const OUString& id) { DockingWindow* pDockingWindow = m_xBuilder->get<DockingWindow>(id); std::unique_ptr<weld::Popover> pRet( @@ -7354,13 +7347,13 @@ std::unique_ptr<weld::Popover> SalInstanceBuilder::weld_popover(const OString& i return pRet; } -std::unique_ptr<weld::Toolbar> SalInstanceBuilder::weld_toolbar(const OString& id) +std::unique_ptr<weld::Toolbar> SalInstanceBuilder::weld_toolbar(const OUString& id) { ToolBox* pToolBox = m_xBuilder->get<ToolBox>(id); return pToolBox ? std::make_unique<SalInstanceToolbar>(pToolBox, this, false) : nullptr; } -std::unique_ptr<weld::Scrollbar> SalInstanceBuilder::weld_scrollbar(const OString& id) +std::unique_ptr<weld::Scrollbar> SalInstanceBuilder::weld_scrollbar(const OUString& id) { ScrollBar* pScrollbar = m_xBuilder->get<ScrollBar>(id); return pScrollbar ? std::make_unique<SalInstanceScrollbar>(pScrollbar, this, false) : nullptr; @@ -7371,11 +7364,11 @@ std::unique_ptr<weld::SizeGroup> SalInstanceBuilder::create_size_group() return std::make_unique<SalInstanceSizeGroup>(); } -OString SalInstanceBuilder::get_current_page_help_id() const +OUString SalInstanceBuilder::get_current_page_help_id() const { vcl::Window* pCtrl = m_xBuilder->get("tabcontrol"); if (!pCtrl) - return OString(); + return {}; VclPtr<vcl::Window> xTabPage; if (pCtrl->GetType() == WindowType::TABCONTROL) { @@ -7391,7 +7384,7 @@ OString SalInstanceBuilder::get_current_page_help_id() const pTabChild = pTabChild ? pTabChild->GetWindow(GetWindowType::FirstChild) : nullptr; if (pTabChild) return pTabChild->GetHelpId(); - return OString(); + return {}; } SalInstanceBuilder::~SalInstanceBuilder() @@ -7428,7 +7421,7 @@ void SalInstanceWindow::help() pWidget = m_xWindow; if (comphelper::LibreOfficeKit::isActive() && m_xWindow->GetFocusedWindow()) pWidget = m_xWindow->GetFocusedWindow().get(); - OString sHelpId = pWidget->GetHelpId(); + OUString sHelpId = pWidget->GetHelpId(); while (sHelpId.isEmpty()) { pWidget = pWidget->GetParent(); @@ -7453,7 +7446,7 @@ void SalInstanceWindow::help() // was the original id if (m_pBuilder && sHelpId.endsWith("/help")) { - OString sPageId = m_pBuilder->get_current_page_help_id(); + OUString sPageId = m_pBuilder->get_current_page_help_id(); if (!sPageId.isEmpty()) sHelpId = sPageId; else @@ -7471,12 +7464,12 @@ void SalInstanceWindow::help() } } } - pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), pSource); + pHelp->Start(sHelpId, pSource); } //iterate upwards through the hierarchy from this widgets through its parents //calling func with their helpid until func returns true or we run out of parents -void SalInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OString&)>& func) +void SalInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) { vcl::Window* pParent = m_xWidget; while ((pParent = pParent->GetParent())) diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index febed41cb98c..ac1fd6b2c623 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -22,6 +22,7 @@ #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/diagnose_ex.hxx> +#include <o3tl/string_view.hxx> #include <unotools/resmgr.hxx> #include <sal/log.hxx> @@ -280,12 +281,12 @@ const FieldUnitStringList& ImplGetFieldUnits() namespace vcl { - FieldUnit EnglishStringToMetric(std::string_view rEnglishMetricString) + FieldUnit EnglishStringToMetric(std::u16string_view rEnglishMetricString) { sal_uInt32 nUnits = SAL_N_ELEMENTS(SV_FUNIT_STRINGS); for (sal_uInt32 i = 0; i < nUnits; ++i) { - if (rEnglishMetricString == SV_FUNIT_STRINGS[i].first.mpId) + if (o3tl::equalsAscii(rEnglishMetricString, SV_FUNIT_STRINGS[i].first.mpId)) return SV_FUNIT_STRINGS[i].second; } return FieldUnit::NONE; diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx index f17aed238ae8..f67ea73d89a3 100644 --- a/vcl/source/app/weldutils.cxx +++ b/vcl/source/app/weldutils.cxx @@ -23,7 +23,7 @@ #include <vcl/weldutils.hxx> BuilderPage::BuilderPage(weld::Widget* pParent, weld::DialogController* pController, - const OUString& rUIXMLDescription, const OString& rID, bool bIsMobile) + const OUString& rUIXMLDescription, const OUString& rID, bool bIsMobile) : m_pDialogController(pController) , m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription, bIsMobile)) , m_xContainer(m_xBuilder->weld_container(rID)) @@ -49,7 +49,7 @@ DialogController::~DialogController() COVERITY_NOEXCEPT_FALSE {} Dialog* GenericDialogController::getDialog() { return m_xDialog.get(); } GenericDialogController::GenericDialogController(weld::Widget* pParent, const OUString& rUIFile, - const OString& rDialogId, bool bMobile) + const OUString& rDialogId, bool bMobile) : m_xBuilder(Application::CreateBuilder(pParent, rUIFile, bMobile)) , m_xDialog(m_xBuilder->weld_dialog(rDialogId)) { @@ -60,8 +60,8 @@ GenericDialogController::~GenericDialogController() COVERITY_NOEXCEPT_FALSE {} Dialog* MessageDialogController::getDialog() { return m_xDialog.get(); } MessageDialogController::MessageDialogController(weld::Widget* pParent, const OUString& rUIFile, - const OString& rDialogId, - const OString& rRelocateId) + const OUString& rDialogId, + const OUString& rRelocateId) : m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) , m_xDialog(m_xBuilder->weld_message_dialog(rDialogId)) , m_xContentArea(m_xDialog->weld_message_area()) @@ -85,7 +85,7 @@ MessageDialogController::~MessageDialogController() } AssistantController::AssistantController(weld::Widget* pParent, const OUString& rUIFile, - const OString& rDialogId) + const OUString& rDialogId) : m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) , m_xAssistant(m_xBuilder->weld_assistant(rDialogId)) { diff --git a/vcl/source/control/InterimItemWindow.cxx b/vcl/source/control/InterimItemWindow.cxx index 31b92d2f4d31..41d1466f70c4 100644 --- a/vcl/source/control/InterimItemWindow.cxx +++ b/vcl/source/control/InterimItemWindow.cxx @@ -13,7 +13,7 @@ #include <window.h> InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, - const OString& rID, bool bAllowCycleFocusOut, + const OUString& rID, bool bAllowCycleFocusOut, sal_uInt64 nLOKWindowId) : Control(pParent, WB_TABSTOP) , m_pWidget(nullptr) // inheritors are expected to call InitControlBase diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 96c6db8ac91e..69646cc9637e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -540,7 +540,7 @@ bool Button::IsSmallSymbol () const return mpButtonData->mbSmallSymbol; } -bool Button::set_property(const OString &rKey, const OUString &rValue) +bool Button::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "image-position") { @@ -1756,7 +1756,7 @@ Size PushButton::GetOptimalSize() const return CalcMinimumSize(); } -bool PushButton::set_property(const OString &rKey, const OUString &rValue) +bool PushButton::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "has-default") { @@ -2738,7 +2738,7 @@ void RadioButton::SetState( bool bCheck ) } } -bool RadioButton::set_property(const OString &rKey, const OUString &rValue) +bool RadioButton::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "active") SetState(toBool(rValue)); @@ -3605,7 +3605,7 @@ void CheckBox::SetState( TriState eState ) } } -bool CheckBox::set_property(const OString &rKey, const OUString &rValue) +bool CheckBox::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "active") SetState(toBool(rValue) ? TRISTATE_TRUE : TRISTATE_FALSE); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 1a8f7ef0673c..2fa7913c5148 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1550,7 +1550,7 @@ void ComboBox::setMaxWidthChars(sal_Int32 nWidth) } } -bool ComboBox::set_property(const OString &rKey, const OUString &rValue) +bool ComboBox::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "width-chars") SetWidthInChars(rValue.toInt32()); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e11a9bae45fa..57aa6c49d829 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -180,7 +180,7 @@ void Edit::setMaxWidthChars(sal_Int32 nWidth) } } -bool Edit::set_property(const OString &rKey, const OUString &rValue) +bool Edit::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "width-chars") SetWidthInChars(rValue.toInt32()); @@ -1999,18 +1999,18 @@ void Edit::Command( const CommandEvent& rCEvt ) bEnablePaste = bData; } - pPopup->EnableItem(pPopup->GetItemId("cut"), bEnableCut); - pPopup->EnableItem(pPopup->GetItemId("copy"), bEnableCopy); - pPopup->EnableItem(pPopup->GetItemId("delete"), bEnableDelete); - pPopup->EnableItem(pPopup->GetItemId("paste"), bEnablePaste); - pPopup->EnableItem(pPopup->GetItemId("specialchar"), bEnableSpecialChar); + pPopup->EnableItem(pPopup->GetItemId(u"cut"), bEnableCut); + pPopup->EnableItem(pPopup->GetItemId(u"copy"), bEnableCopy); + pPopup->EnableItem(pPopup->GetItemId(u"delete"), bEnableDelete); + pPopup->EnableItem(pPopup->GetItemId(u"paste"), bEnablePaste); + pPopup->EnableItem(pPopup->GetItemId(u"specialchar"), bEnableSpecialChar); pPopup->EnableItem( - pPopup->GetItemId("undo"), + pPopup->GetItemId(u"undo"), std::u16string_view(maUndoText) != std::u16string_view(maText.getStr(), maText.getLength())); bool bAllSelected = maSelection.Min() == 0 && maSelection.Max() == maText.getLength(); - pPopup->EnableItem(pPopup->GetItemId("selectall"), !bAllSelected); - pPopup->ShowItem(pPopup->GetItemId("specialchar"), pImplFncGetSpecialChars != nullptr); + pPopup->EnableItem(pPopup->GetItemId(u"selectall"), !bAllSelected); + pPopup->ShowItem(pPopup->GetItemId(u"specialchar"), pImplFncGetSpecialChars != nullptr); mbActivePopup = true; Selection aSaveSel = GetSelection(); // if someone changes selection in Get/LoseFocus, e.g. URL bar @@ -2023,7 +2023,7 @@ void Edit::Command( const CommandEvent& rCEvt ) } sal_uInt16 n = pPopup->Execute( this, aPos ); SetSelection( aSaveSel ); - OString sCommand = pPopup->GetItemIdent(n); + OUString sCommand = pPopup->GetItemIdent(n); if (sCommand == "undo") { Undo(); @@ -2733,7 +2733,7 @@ VclPtr<PopupMenu> Edit::CreatePopupMenu() { if (!mpUIBuilder) mpUIBuilder.reset(new VclBuilder(nullptr, AllSettings::GetUIRootDir(), "vcl/ui/editmenu.ui", "")); - VclPtr<PopupMenu> pPopup = mpUIBuilder->get_menu("menu"); + VclPtr<PopupMenu> pPopup = mpUIBuilder->get_menu(u"menu"); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if (rStyleSettings.GetHideDisabledMenuItems()) pPopup->SetMenuFlags( MenuFlags::HideDisabledEntries ); @@ -2741,13 +2741,13 @@ VclPtr<PopupMenu> Edit::CreatePopupMenu() pPopup->SetMenuFlags ( MenuFlags::AlwaysShowDisabledEntries ); if (rStyleSettings.GetContextMenuShortcuts()) { - pPopup->SetAccelKey(pPopup->GetItemId("undo"), vcl::KeyCode( KeyFuncType::UNDO)); - pPopup->SetAccelKey(pPopup->GetItemId("cut"), vcl::KeyCode( KeyFuncType::CUT)); - pPopup->SetAccelKey(pPopup->GetItemId("copy"), vcl::KeyCode( KeyFuncType::COPY)); - pPopup->SetAccelKey(pPopup->GetItemId("paste"), vcl::KeyCode( KeyFuncType::PASTE)); - pPopup->SetAccelKey(pPopup->GetItemId("delete"), vcl::KeyCode( KeyFuncType::DELETE)); - pPopup->SetAccelKey(pPopup->GetItemId("selectall"), vcl::KeyCode( KEY_A, false, true, false, false)); - pPopup->SetAccelKey(pPopup->GetItemId("specialchar"), vcl::KeyCode( KEY_S, true, true, false, false)); + pPopup->SetAccelKey(pPopup->GetItemId(u"undo"), vcl::KeyCode( KeyFuncType::UNDO)); + pPopup->SetAccelKey(pPopup->GetItemId(u"cut"), vcl::KeyCode( KeyFuncType::CUT)); + pPopup->SetAccelKey(pPopup->GetItemId(u"copy"), vcl::KeyCode( KeyFuncType::COPY)); + pPopup->SetAccelKey(pPopup->GetItemId(u"paste"), vcl::KeyCode( KeyFuncType::PASTE)); + pPopup->SetAccelKey(pPopup->GetItemId(u"delete"), vcl::KeyCode( KeyFuncType::DELETE)); + pPopup->SetAccelKey(pPopup->GetItemId(u"selectall"), vcl::KeyCode( KEY_A, false, true, false, false)); + pPopup->SetAccelKey(pPopup->GetItemId(u"specialchar"), vcl::KeyCode( KEY_S, true, true, false, false)); } return pPopup; } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 3de0eaf50165..c94aef2c4b0c 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1414,7 +1414,7 @@ Size MetricField::CalcMinimumSize() const return calcMinimumSize(*this, *this); } -bool MetricField::set_property(const OString &rKey, const OUString &rValue) +bool MetricField::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "digits") SetDecimalDigits(rValue.toInt32()); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index e73aa2e971f7..068332e5b610 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -373,7 +373,7 @@ void FixedText::setMinWidthChars(sal_Int32 nWidth) } } -bool FixedText::set_property(const OString &rKey, const OUString &rValue) +bool FixedText::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "max-width-chars") setMaxWidthChars(rValue.toInt32()); @@ -958,7 +958,7 @@ Image FixedImage::loadThemeImage(const OUString &rFileName) return Image(StockImage::Yes, rFileName); } -bool FixedImage::set_property(const OString &rKey, const OUString &rValue) +bool FixedImage::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "icon-size") { diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index d43d8559d602..5b4960d92f86 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -150,7 +150,7 @@ void FixedHyperlink::SetText(const OUString& rNewDescription) m_nTextLen = GetOutDev()->GetCtrlTextWidth(GetText()); } -bool FixedHyperlink::set_property(const OString &rKey, const OUString &rValue) +bool FixedHyperlink::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "uri") SetURL(rValue); diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx index 196e457e41e9..ed73accd3c7c 100644 --- a/vcl/source/control/fmtfield.cxx +++ b/vcl/source/control/fmtfield.cxx @@ -1160,7 +1160,7 @@ void FormattedField::SetText(const OUString& rStr, const Selection& rNewSelectio SetSelection(rNewSelection); } -bool FormattedField::set_property(const OString &rKey, const OUString &rValue) +bool FormattedField::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "digits") GetFormatter().SetDecimalDigits(rValue.toInt32()); diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index baf2dcd3e270..8a7e111f1581 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -430,7 +430,7 @@ css::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible() struct VerticalTabPageData { - OString sId; + OUString sId; SvxIconChoiceCtrlEntry* pEntry; VclPtr<vcl::Window> xPage; ///< the TabPage itself }; @@ -505,7 +505,7 @@ VerticalTabPageData* VerticalTabControl::GetPageData(const SvxIconChoiceCtrlEntr return pRet; } -VerticalTabPageData* VerticalTabControl::GetPageData(std::string_view rId) const +VerticalTabPageData* VerticalTabControl::GetPageData(std::u16string_view rId) const { VerticalTabPageData* pRet = nullptr; for (auto & pData : maPageList) @@ -519,9 +519,9 @@ VerticalTabPageData* VerticalTabControl::GetPageData(std::string_view rId) const return pRet; } -void VerticalTabControl::SetCurPageId(const OString& rId) +void VerticalTabControl::SetCurPageId(const OUString& rId) { - OString sOldPageId = GetCurPageId(); + OUString sOldPageId = GetCurPageId(); if (sOldPageId == rId) return; @@ -544,15 +544,15 @@ void VerticalTabControl::SetCurPageId(const OString& rId) ActivatePage(); pNewData->xPage->Show(); } - collectUIInformation(get_id(),OStringToOUString(m_sCurrentPageId,RTL_TEXTENCODING_UTF8)); + collectUIInformation(get_id(),m_sCurrentPageId); } -const OString & VerticalTabControl::GetPageId(sal_uInt16 nIndex) const +const OUString & VerticalTabControl::GetPageId(sal_uInt16 nIndex) const { return maPageList[nIndex]->sId; } -void VerticalTabControl::InsertPage(const rtl::OString &rIdent, const rtl::OUString& rLabel, const Image& rImage, +void VerticalTabControl::InsertPage(const rtl::OUString &rIdent, const rtl::OUString& rLabel, const Image& rImage, const rtl::OUString& rTooltip, VclPtr<vcl::Window> xPage, int nPos) { SvxIconChoiceCtrlEntry* pEntry = m_xChooser->InsertEntry(rLabel, rImage); @@ -579,7 +579,7 @@ void VerticalTabControl::InsertPage(const rtl::OString &rIdent, const rtl::OUStr pNew->xPage->Hide(); } -void VerticalTabControl::RemovePage(std::string_view rPageId) +void VerticalTabControl::RemovePage(std::u16string_view rPageId) { for (auto it = maPageList.begin(), end = maPageList.end(); it != end; ++it) { @@ -595,7 +595,7 @@ void VerticalTabControl::RemovePage(std::string_view rPageId) } } -sal_uInt16 VerticalTabControl::GetPagePos(std::string_view rPageId) const +sal_uInt16 VerticalTabControl::GetPagePos(std::u16string_view rPageId) const { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) @@ -603,7 +603,7 @@ sal_uInt16 VerticalTabControl::GetPagePos(std::string_view rPageId) const return m_xChooser->GetEntryListPos(pData->pEntry); } -VclPtr<vcl::Window> VerticalTabControl::GetPage(std::string_view rPageId) const +VclPtr<vcl::Window> VerticalTabControl::GetPage(std::u16string_view rPageId) const { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) @@ -611,7 +611,7 @@ VclPtr<vcl::Window> VerticalTabControl::GetPage(std::string_view rPageId) const return pData->xPage; } -OUString VerticalTabControl::GetPageText(std::string_view rPageId) const +OUString VerticalTabControl::GetPageText(std::u16string_view rPageId) const { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) @@ -619,7 +619,7 @@ OUString VerticalTabControl::GetPageText(std::string_view rPageId) const return pData->pEntry->GetText(); } -void VerticalTabControl::SetPageText(std::string_view rPageId, const OUString& rText) +void VerticalTabControl::SetPageText(std::u16string_view rPageId, const OUString& rText) { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 405919bc3565..d60e5e030476 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -1394,7 +1394,7 @@ void ListBox::setMaxWidthChars(sal_Int32 nWidth) } } -bool ListBox::set_property(const OString &rKey, const OUString &rValue) +bool ListBox::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "active") SelectEntryPos(rValue.toInt32()); diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index 2c2cba25a4c5..db336b1fe8f5 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -69,7 +69,7 @@ public: virtual void SAL_CALL disposing(const ::css::lang::EventObject&) override; }; -NotebookBar::NotebookBar(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, +NotebookBar::NotebookBar(Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame, const NotebookBarAddonsItem& aNotebookBarAddonsItem) : Control(pParent) @@ -110,7 +110,7 @@ NotebookBar::NotebookBar(Window* pParent, const OString& rID, const OUString& rU if (i) aName += OUString::number(i); - pContextContainer = dynamic_cast<NotebookbarContextControl*>(m_pUIBuilder->get<Window>(OUStringToOString(aName, RTL_TEXTENCODING_UTF8))); + pContextContainer = dynamic_cast<NotebookbarContextControl*>(m_pUIBuilder->get<Window>(aName)); if (pContextContainer) m_pContextContainers.push_back(pContextContainer); i++; diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 0aef0d00527e..846e6f2ee2f3 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -224,7 +224,7 @@ namespace vcl Dialog::dispose(); } - void RoadmapWizard::SetRoadmapHelpId( const OString& _rId ) + void RoadmapWizard::SetRoadmapHelpId( const OUString& _rId ) { m_xRoadmapImpl->pRoadmap->SetHelpId( _rId ); } @@ -234,7 +234,7 @@ namespace vcl m_xRoadmapImpl->pRoadmap->SetRoadmapBitmap(rBmp); } - void RoadmapWizardMachine::SetRoadmapHelpId(const OString& rId) + void RoadmapWizardMachine::SetRoadmapHelpId(const OUString& rId) { m_xAssistant->set_page_side_help_id(rId); } @@ -453,7 +453,7 @@ namespace vcl WizardTypes::WizardState nRequiredState = rActivePath[ nItemIndex ]; if ( nPresentItemId != nRequiredState ) { - m_xAssistant->set_page_title(OString::number(nPresentItemId), ""); + m_xAssistant->set_page_title(OUString::number(nPresentItemId), ""); bInsertItem = true; } } @@ -471,7 +471,7 @@ namespace vcl GetOrCreatePage(nState); } - OString sIdent(getPageIdentForState(nState)); + OUString sIdent(getPageIdentForState(nState)); m_xAssistant->set_page_index(sIdent, nItemIndex); m_xAssistant->set_page_title(sIdent, getStateDisplayName(nState)); @@ -638,7 +638,7 @@ namespace vcl m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID( getCurrentState() ); } - IMPL_LINK(RoadmapWizardMachine, OnRoadmapItemSelected, const OString&, rCurItemId, bool) + IMPL_LINK(RoadmapWizardMachine, OnRoadmapItemSelected, const OUString&, rCurItemId, bool) { WizardTypes::WizardState nSelectedState = getStateFromPageIdent(rCurItemId); @@ -814,7 +814,7 @@ namespace vcl rJsonWriter.put("type", "dialog"); rJsonWriter.put("title", GetText()); - OUString sDialogId = OStringToOUString(GetHelpId(), RTL_TEXTENCODING_ASCII_US); + OUString sDialogId = GetHelpId(); sal_Int32 nStartPos = sDialogId.lastIndexOf('/'); nStartPos = nStartPos >= 0 ? nStartPos + 1 : 0; rJsonWriter.put("dialogid", sDialogId.copy(nStartPos)); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 8cf999814820..fd6f53d63a1e 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -55,7 +55,7 @@ public: OUString maHelpText; OUString maAccessibleName; OUString maAccessibleDescription; - OString maTabName; + OUString maTabName; tools::Rectangle maRect; sal_uInt16 mnLine; bool mbFullVisible; @@ -664,7 +664,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) if ( pOldPage ) { if ( mbRestoreHelpId ) - pCtrlParent->SetHelpId( OString() ); + pCtrlParent->SetHelpId({}); } if ( pPage ) @@ -1485,7 +1485,7 @@ void TabControl::Command( const CommandEvent& rCEvt ) aMenu->InsertItem(item.id(), item.maText, MenuItemBits::CHECKABLE | MenuItemBits::RADIOCHECK); if (item.id() == mnCurPageId) aMenu->CheckItem(item.id()); - aMenu->SetHelpId(item.id(), OString()); + aMenu->SetHelpId(item.id(), {}); } sal_uInt16 nId = aMenu->Execute( this, aMenuPos ); @@ -1820,7 +1820,7 @@ sal_uInt16 TabControl::GetPageId( const Point& rPos ) const return (it != rList.end()) ? it->id() : 0; } -sal_uInt16 TabControl::GetPageId( const OString& rName ) const +sal_uInt16 TabControl::GetPageId( const OUString& rName ) const { const auto &rList = mpTabCtrlData->maItemList; const auto it = std::find_if(rList.begin(), rList.end(), [&rName](const auto &item) { @@ -2006,7 +2006,7 @@ OUString TabControl::GetAccessibleDescription( sal_uInt16 nPageId ) const return pItem->maHelpText; } -void TabControl::SetPageName( sal_uInt16 nPageId, const OString& rName ) const +void TabControl::SetPageName( sal_uInt16 nPageId, const OUString& rName ) const { ImplTabItem* pItem = ImplGetItem( nPageId ); @@ -2014,14 +2014,14 @@ void TabControl::SetPageName( sal_uInt16 nPageId, const OString& rName ) const pItem->maTabName = rName; } -OString TabControl::GetPageName( sal_uInt16 nPageId ) const +OUString TabControl::GetPageName( sal_uInt16 nPageId ) const { ImplTabItem* pItem = ImplGetItem( nPageId ); if (pItem) return pItem->maTabName; - return OString(); + return {}; } void TabControl::SetPageImage( sal_uInt16 i_nPageId, const Image& i_rImage ) @@ -2203,7 +2203,7 @@ std::vector<sal_uInt16> TabControl::GetPageIDs() const return aIDs; } -bool TabControl::set_property(const OString &rKey, const OUString &rValue) +bool TabControl::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "show-tabs") { diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index 0071ecc089a0..f52069404564 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -28,8 +28,8 @@ #include <stack> #include "wizimpldata.hxx" -constexpr OStringLiteral HID_WIZARD_NEXT = "SVT_HID_WIZARD_NEXT"; -constexpr OStringLiteral HID_WIZARD_PREVIOUS = "SVT_HID_WIZARD_PREVIOUS"; +constexpr OUStringLiteral HID_WIZARD_NEXT = u"SVT_HID_WIZARD_NEXT"; +constexpr OUStringLiteral HID_WIZARD_PREVIOUS = u"SVT_HID_WIZARD_PREVIOUS"; #define WIZARDDIALOG_BUTTON_OFFSET_Y 6 #define WIZARDDIALOG_BUTTON_DLGOFFSET_X 6 @@ -39,7 +39,7 @@ constexpr OStringLiteral HID_WIZARD_PREVIOUS = "SVT_HID_WIZARD_PREVIOUS"; namespace vcl { //= WizardPageImplData - OWizardPage::OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID) + OWizardPage::OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID) : BuilderPage(pPage, pController, rUIXMLDescription, rID) { } @@ -894,12 +894,12 @@ namespace vcl implUpdateTitle(); } - OString WizardMachine::getPageIdentForState(WizardTypes::WizardState nState) const + OUString WizardMachine::getPageIdentForState(WizardTypes::WizardState nState) const { - return OString::number(nState); + return OUString::number(nState); } - WizardTypes::WizardState WizardMachine::getStateFromPageIdent(const OString& rIdent) const + WizardTypes::WizardState WizardMachine::getStateFromPageIdent(const OUString& rIdent) const { return rIdent.toInt32(); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 3008a7e887d0..541d6bfc20c8 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -785,13 +785,13 @@ void TextWindow::Command( const CommandEvent& rCEvt ) { bEnableUndo = false; } - pPopup->EnableItem(pPopup->GetItemId("cut"), bEnableCut); - pPopup->EnableItem(pPopup->GetItemId("copy"), bEnableCopy); - pPopup->EnableItem(pPopup->GetItemId("delete"), bEnableDelete); - pPopup->EnableItem(pPopup->GetItemId("paste"), bEnablePaste); - pPopup->EnableItem(pPopup->GetItemId("specialchar"), bEnableSpecialChar); - pPopup->EnableItem(pPopup->GetItemId("undo"), bEnableUndo); - pPopup->ShowItem(pPopup->GetItemId("specialchar"), !vcl::GetGetSpecialCharsFunction()); + pPopup->EnableItem(pPopup->GetItemId(u"cut"), bEnableCut); + pPopup->EnableItem(pPopup->GetItemId(u"copy"), bEnableCopy); + pPopup->EnableItem(pPopup->GetItemId(u"delete"), bEnableDelete); + pPopup->EnableItem(pPopup->GetItemId(u"paste"), bEnablePaste); + pPopup->EnableItem(pPopup->GetItemId(u"specialchar"), bEnableSpecialChar); + pPopup->EnableItem(pPopup->GetItemId(u"undo"), bEnableUndo); + pPopup->ShowItem(pPopup->GetItemId(u"specialchar"), !vcl::GetGetSpecialCharsFunction()); mbActivePopup = true; Point aPos = rCEvt.GetMousePosPixel(); @@ -802,7 +802,7 @@ void TextWindow::Command( const CommandEvent& rCEvt ) aPos = Point( aSize.Width()/2, aSize.Height()/2 ); } sal_uInt16 n = pPopup->Execute( this, aPos ); - OString sCommand = pPopup->GetItemIdent(n); + OUString sCommand = pPopup->GetItemIdent(n); if (sCommand == "undo") { mpExtTextView->Undo(); @@ -1484,7 +1484,7 @@ FactoryFunction VclMultiLineEdit::GetUITestFactory() const return MultiLineEditUIObject::create; } -bool VclMultiLineEdit::set_property(const OString &rKey, const OUString &rValue) +bool VclMultiLineEdit::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "cursor-visible") EnableCursor(toBool(rValue)); diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index dd60e83d0c4a..e63eec4816e5 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -3523,7 +3523,7 @@ void SvTreeListBox::set_min_width_in_chars(sal_Int32 nChars) queue_resize(); } -bool SvTreeListBox::set_property(const OString &rKey, const OUString &rValue) +bool SvTreeListBox::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "min-width-chars") { diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 9b8616c3906b..f15643c6f999 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -1616,7 +1616,7 @@ void VerticalTabControlUIObject::execute(const OUString& rAction, { auto itr = rParameters.find("POS"); sal_uInt32 nPos = itr->second.toUInt32(); - OString xid = mxTabControl->GetPageId(nPos); + OUString xid = mxTabControl->GetPageId(nPos); mxTabControl->SetCurPageId(xid); } } @@ -1629,7 +1629,7 @@ StringMap VerticalTabControlUIObject::get_state() StringMap aMap = WindowUIObject::get_state(); aMap["PageCount"] = OUString::number(mxTabControl->GetPageCount()); - OString nPageId = mxTabControl->GetCurPageId(); + OUString nPageId = mxTabControl->GetCurPageId(); aMap["CurrPageTitel"] = mxTabControl->GetPageText(nPageId); aMap["CurrPagePos"] = OUString::number(mxTabControl->GetPagePos(nPageId)); @@ -1724,7 +1724,7 @@ StringMap MenuButtonUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); aMap["Label"] = mxMenuButton->GetDisplayText(); - aMap["CurrentItem"] = OUString::createFromAscii(mxMenuButton->GetCurItemIdent()); + aMap["CurrentItem"] = mxMenuButton->GetCurItemIdent(); return aMap; } diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx index 3a96f2a380e9..d8cdfebf8562 100644 --- a/vcl/source/window/NotebookBarAddonsMerger.cxx +++ b/vcl/source/window/NotebookBarAddonsMerger.cxx @@ -142,7 +142,7 @@ void MergeNotebookBarAddons(vcl::Window* pParent, const VclBuilder::customMakeWi } } -void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OString& sItemIdName, +void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OUString& sItemIdName, NotebookBarAddonsItem& aNotebookBarAddonsItem) { std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues; diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 29d79b0cd154..5bacc91b3751 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -62,13 +62,13 @@ bool VclAbstractDialog::StartExecuteAsync(AsyncContext&) return false; } -std::vector<OString> VclAbstractDialog::getAllPageUIXMLDescriptions() const +std::vector<OUString> VclAbstractDialog::getAllPageUIXMLDescriptions() const { // default has no pages - return std::vector<OString>(); + return {}; } -bool VclAbstractDialog::selectPageByUIXMLDescription(const OString& /*rUIXMLDescription*/) +bool VclAbstractDialog::selectPageByUIXMLDescription(const OUString& /*rUIXMLDescription*/) { // default cannot select a page (which is okay, return true) return true; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 047fd6e4ae9c..e052f9d25a04 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -444,13 +444,13 @@ namespace weld } VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUString& sUIFile, - OString sID, css::uno::Reference<css::frame::XFrame> xFrame, + OUString sID, css::uno::Reference<css::frame::XFrame> xFrame, bool bLegacy, const NotebookBarAddonsItem* pNotebookBarAddonsItem) : m_pNotebookBarAddonsItem(pNotebookBarAddonsItem ? new NotebookBarAddonsItem(*pNotebookBarAddonsItem) : new NotebookBarAddonsItem{}) , m_sID(std::move(sID)) - , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) + , m_sHelpRoot(sUIFile) , m_pStringReplace(Translate::GetReadStringHook()) , m_pParent(pParent) , m_bToplevelParentFound(false) @@ -487,7 +487,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr for (auto const& mnemonicWidget : m_pParserState->m_aMnemonicWidgetMaps) { FixedText *pOne = get<FixedText>(mnemonicWidget.m_sID); - vcl::Window *pOther = get(mnemonicWidget.m_sValue.toUtf8()); + vcl::Window *pOther = get(mnemonicWidget.m_sValue); SAL_WARN_IF(!pOne || !pOther, "vcl", "missing either source " << mnemonicWidget.m_sID << " or target " << mnemonicWidget.m_sValue << " member of Mnemonic Widget Mapping"); if (pOne && pOther) @@ -500,19 +500,17 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr vcl::Window *pSource = elemAtk.first; const stringmap &rMap = elemAtk.second; - for (auto const& elemMap : rMap) + for (auto const& [ rType, rParam ] : rMap) { - const OString &rType = elemMap.first; - const OUString &rParam = elemMap.second; if (rType == "role") { - sal_Int16 role = BuilderUtils::getRoleFromName(rParam.toUtf8()); + sal_Int16 role = BuilderUtils::getRoleFromName(rParam); if (role != com::sun::star::accessibility::AccessibleRole::UNKNOWN) pSource->SetAccessibleRole(role); } else { - vcl::Window *pTarget = get(rParam.toUtf8()); + vcl::Window *pTarget = get(rParam); SAL_WARN_IF(!pTarget, "vcl", "missing parameter of a11y relation: " << rParam); if (!pTarget) continue; @@ -558,7 +556,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr ComboBox *pComboBoxTarget = dynamic_cast<ComboBox*>(pTarget); SvTabListBox *pTreeBoxTarget = dynamic_cast<SvTabListBox*>(pTarget); // pStore may be empty - const ListStore *pStore = get_model_by_name(elem.m_sValue.toUtf8()); + const ListStore *pStore = get_model_by_name(elem.m_sValue); SAL_WARN_IF(!pListBoxTarget && !pComboBoxTarget && !pTreeBoxTarget && !dynamic_cast<IconView*>(pTarget), "vcl", "missing elements of combobox"); if (pListBoxTarget && pStore) mungeModel(*pListBoxTarget, *pStore, elem.m_nActiveId); @@ -572,7 +570,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr for (auto const& elem : m_pParserState->m_aTextBufferMaps) { VclMultiLineEdit *pTarget = get<VclMultiLineEdit>(elem.m_sID); - const TextBuffer *pBuffer = get_buffer_by_name(elem.m_sValue.toUtf8()); + const TextBuffer *pBuffer = get_buffer_by_name(elem.m_sValue); SAL_WARN_IF(!pTarget || !pBuffer, "vcl", "missing elements of textview/textbuffer"); if (pTarget && pBuffer) mungeTextBuffer(*pTarget, *pBuffer); @@ -582,7 +580,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr for (auto const& elem : m_pParserState->m_aNumericFormatterAdjustmentMaps) { NumericFormatter *pTarget = dynamic_cast<NumericFormatter*>(get(elem.m_sID)); - const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue.toUtf8()); + const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue); SAL_WARN_IF(!pTarget, "vcl", "missing NumericFormatter element of spinbutton/adjustment"); SAL_WARN_IF(!pAdjustment, "vcl", "missing Adjustment element of spinbutton/adjustment"); if (pTarget && pAdjustment) @@ -592,7 +590,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr for (auto const& elem : m_pParserState->m_aFormattedFormatterAdjustmentMaps) { FormattedField *pTarget = dynamic_cast<FormattedField*>(get(elem.m_sID)); - const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue.toUtf8()); + const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue); SAL_WARN_IF(!pTarget, "vcl", "missing FormattedField element of spinbutton/adjustment"); SAL_WARN_IF(!pAdjustment, "vcl", "missing Adjustment element of spinbutton/adjustment"); if (pTarget && pAdjustment) @@ -603,7 +601,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr for (auto const& elem : m_pParserState->m_aScrollAdjustmentMaps) { ScrollBar *pTarget = get<ScrollBar>(elem.m_sID); - const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue.toUtf8()); + const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of scrollbar/adjustment"); if (pTarget && pAdjustment) mungeAdjustment(*pTarget, *pAdjustment); @@ -613,7 +611,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr for (auto const& elem : m_pParserState->m_aSliderAdjustmentMaps) { Slider* pTarget = dynamic_cast<Slider*>(get(elem.m_sID)); - const Adjustment* pAdjustment = get_adjustment_by_name(elem.m_sValue.toUtf8()); + const Adjustment* pAdjustment = get_adjustment_by_name(elem.m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of scale(slider)/adjustment"); if (pTarget && pAdjustment) { @@ -626,16 +624,12 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr { std::shared_ptr<VclSizeGroup> xGroup(std::make_shared<VclSizeGroup>()); - for (auto const& elem : sizeGroup.m_aProperties) - { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; + for (auto const& [ rKey, rValue ] : sizeGroup.m_aProperties) xGroup->set_property(rKey, rValue); - } for (auto const& elem : sizeGroup.m_aWidgets) { - vcl::Window* pWindow = get(elem.getStr()); + vcl::Window* pWindow = get(elem); pWindow->add_to_size_group(xGroup); } } @@ -659,7 +653,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr pTarget = pTargetRadio; } - FixedImage *pImage = get<FixedImage>(elem.m_sValue.toUtf8()); + FixedImage *pImage = get<FixedImage>(elem.m_sValue); SAL_WARN_IF(!pTarget || !pImage, "vcl", "missing elements of button/image/stock"); if (!pTarget || !pImage) @@ -697,7 +691,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr else pTargetRadio->SetModeRadioImage(pImage->GetImage()); - auto aFind = m_pParserState->m_aImageSizeMap.find(elem.m_sValue.toUtf8()); + auto aFind = m_pParserState->m_aImageSizeMap.find(elem.m_sValue); if (aFind != m_pParserState->m_aImageSizeMap.end()) { switch (aFind->second) @@ -729,14 +723,14 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr //now we can remove them from the tree after their final munge for (auto const& elem : aImagesToBeRemoved) { - delete_by_name(elem.toUtf8()); + delete_by_name(elem); } //Set button menus when everything has been imported for (auto const& elem : m_pParserState->m_aButtonMenuMaps) { MenuButton *pTarget = get<MenuButton>(elem.m_sID); - PopupMenu *pMenu = get_menu(elem.m_sValue.toUtf8()); + PopupMenu *pMenu = get_menu(elem.m_sValue); SAL_WARN_IF(!pTarget || !pMenu, "vcl", "missing elements of button/menu"); if (!pTarget || !pMenu) @@ -1007,7 +1001,7 @@ namespace OUString sIconName; // allow pixbuf, but prefer icon-name { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("pixbuf")); + VclBuilder::stringmap::iterator aFind = rMap.find("pixbuf"); if (aFind != rMap.end()) { sIconName = aFind->second; @@ -1015,7 +1009,7 @@ namespace } } { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("icon-name")); + VclBuilder::stringmap::iterator aFind = rMap.find("icon-name"); if (aFind != rMap.end()) { sIconName = aFind->second; @@ -1031,7 +1025,7 @@ namespace WinBits extractRelief(VclBuilder::stringmap &rMap) { WinBits nBits = WB_3DLOOK; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("relief")); + VclBuilder::stringmap::iterator aFind = rMap.find("relief"); if (aFind != rMap.end()) { assert(aFind->second != "half" && "relief of 'half' unsupported"); @@ -1045,7 +1039,7 @@ namespace OUString extractLabel(VclBuilder::stringmap &rMap) { OUString sType; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("label")); + VclBuilder::stringmap::iterator aFind = rMap.find("label"); if (aFind != rMap.end()) { sType = aFind->second; @@ -1057,7 +1051,7 @@ namespace OUString extractActionName(VclBuilder::stringmap &rMap) { OUString sActionName; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("action-name")); + VclBuilder::stringmap::iterator aFind = rMap.find("action-name"); if (aFind != rMap.end()) { sActionName = aFind->second; @@ -1069,7 +1063,7 @@ namespace bool extractVisible(VclBuilder::stringmap &rMap) { bool bRet = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("visible")); + VclBuilder::stringmap::iterator aFind = rMap.find("visible"); if (aFind != rMap.end()) { bRet = toBool(aFind->second); @@ -1082,7 +1076,7 @@ namespace { OUString sWidthRequest("0"); OUString sHeightRequest("0"); - VclBuilder::stringmap::iterator aFind = rMap.find(OString("width-request")); + VclBuilder::stringmap::iterator aFind = rMap.find("width-request"); if (aFind != rMap.end()) { sWidthRequest = aFind->second; @@ -1100,9 +1094,9 @@ namespace OUString extractTooltipText(VclBuilder::stringmap &rMap) { OUString sTooltipText; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("tooltip-text")); + VclBuilder::stringmap::iterator aFind = rMap.find("tooltip-text"); if (aFind == rMap.end()) - aFind = rMap.find(OString("tooltip-markup")); + aFind = rMap.find("tooltip-markup"); if (aFind != rMap.end()) { sTooltipText = aFind->second; @@ -1114,7 +1108,7 @@ namespace float extractAlignment(VclBuilder::stringmap &rMap) { float f = 0.0; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("alignment")); + VclBuilder::stringmap::iterator aFind = rMap.find("alignment"); if (aFind != rMap.end()) { f = aFind->second.toFloat(); @@ -1126,7 +1120,7 @@ namespace OUString extractTitle(VclBuilder::stringmap &rMap) { OUString sTitle; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("title")); + VclBuilder::stringmap::iterator aFind = rMap.find("title"); if (aFind != rMap.end()) { sTitle = aFind->second; @@ -1138,7 +1132,7 @@ namespace bool extractHeadersVisible(VclBuilder::stringmap &rMap) { bool bHeadersVisible = true; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("headers-visible")); + VclBuilder::stringmap::iterator aFind = rMap.find("headers-visible"); if (aFind != rMap.end()) { bHeadersVisible = toBool(aFind->second); @@ -1150,7 +1144,7 @@ namespace bool extractSortIndicator(VclBuilder::stringmap &rMap) { bool bSortIndicator = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("sort-indicator")); + VclBuilder::stringmap::iterator aFind = rMap.find("sort-indicator"); if (aFind != rMap.end()) { bSortIndicator = toBool(aFind->second); @@ -1162,7 +1156,7 @@ namespace bool extractClickable(VclBuilder::stringmap &rMap) { bool bClickable = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("clickable")); + VclBuilder::stringmap::iterator aFind = rMap.find("clickable"); if (aFind != rMap.end()) { bClickable = toBool(aFind->second); @@ -1250,35 +1244,35 @@ namespace } } -void VclBuilder::extractGroup(const OString &id, stringmap &rMap) +void VclBuilder::extractGroup(const OUString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("group")); + VclBuilder::stringmap::iterator aFind = rMap.find("group"); if (aFind != rMap.end()) { OUString sID = aFind->second; sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) sID = sID.copy(0, nDelim); - m_pParserState->m_aGroupMaps.emplace_back(id, sID.toUtf8()); + m_pParserState->m_aGroupMaps.emplace_back(id, sID); rMap.erase(aFind); } } -void VclBuilder::connectNumericFormatterAdjustment(const OString &id, const OUString &rAdjustment) +void VclBuilder::connectNumericFormatterAdjustment(const OUString &id, const OUString &rAdjustment) { if (!rAdjustment.isEmpty()) m_pParserState->m_aNumericFormatterAdjustmentMaps.emplace_back(id, rAdjustment); } -void VclBuilder::connectFormattedFormatterAdjustment(const OString &id, const OUString &rAdjustment) +void VclBuilder::connectFormattedFormatterAdjustment(const OUString &id, const OUString &rAdjustment) { if (!rAdjustment.isEmpty()) m_pParserState->m_aFormattedFormatterAdjustmentMaps.emplace_back(id, rAdjustment); } -bool VclBuilder::extractAdjustmentToMap(const OString& id, VclBuilder::stringmap& rMap, std::vector<WidgetAdjustmentMap>& rAdjustmentMap) +bool VclBuilder::extractAdjustmentToMap(const OUString& id, VclBuilder::stringmap& rMap, std::vector<WidgetAdjustmentMap>& rAdjustmentMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment")); + VclBuilder::stringmap::iterator aFind = rMap.find("adjustment"); if (aFind != rMap.end()) { rAdjustmentMap.emplace_back(id, aFind->second); @@ -1293,7 +1287,7 @@ namespace sal_Int32 extractActive(VclBuilder::stringmap &rMap) { sal_Int32 nActiveId = 0; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("active")); + VclBuilder::stringmap::iterator aFind = rMap.find("active"); if (aFind != rMap.end()) { nActiveId = aFind->second.toInt32(); @@ -1305,7 +1299,7 @@ namespace bool extractSelectable(VclBuilder::stringmap &rMap) { bool bSelectable = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("selectable")); + VclBuilder::stringmap::iterator aFind = rMap.find("selectable"); if (aFind != rMap.end()) { bSelectable = toBool(aFind->second); @@ -1317,7 +1311,7 @@ namespace OUString extractAdjustment(VclBuilder::stringmap &rMap) { OUString sAdjustment; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment")); + VclBuilder::stringmap::iterator aFind = rMap.find("adjustment"); if (aFind != rMap.end()) { sAdjustment= aFind->second; @@ -1330,7 +1324,7 @@ namespace bool extractDrawIndicator(VclBuilder::stringmap &rMap) { bool bDrawIndicator = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("draw-indicator")); + VclBuilder::stringmap::iterator aFind = rMap.find("draw-indicator"); if (aFind != rMap.end()) { bDrawIndicator = toBool(aFind->second); @@ -1340,9 +1334,9 @@ namespace } } -void VclBuilder::extractModel(const OString &id, stringmap &rMap) +void VclBuilder::extractModel(const OUString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("model")); + VclBuilder::stringmap::iterator aFind = rMap.find("model"); if (aFind != rMap.end()) { m_pParserState->m_aModelMaps.emplace_back(id, aFind->second, @@ -1351,9 +1345,9 @@ void VclBuilder::extractModel(const OString &id, stringmap &rMap) } } -void VclBuilder::extractBuffer(const OString &id, stringmap &rMap) +void VclBuilder::extractBuffer(const OUString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("buffer")); + VclBuilder::stringmap::iterator aFind = rMap.find("buffer"); if (aFind != rMap.end()) { m_pParserState->m_aTextBufferMaps.emplace_back(id, aFind->second); @@ -1364,15 +1358,15 @@ void VclBuilder::extractBuffer(const OString &id, stringmap &rMap) int VclBuilder::getImageSize(const stringmap &rMap) { int nSize = 4; - auto aFind = rMap.find(OString("icon-size")); + auto aFind = rMap.find("icon-size"); if (aFind != rMap.end()) nSize = aFind->second.toInt32(); return nSize; } -void VclBuilder::extractButtonImage(const OString &id, stringmap &rMap, bool bRadio) +void VclBuilder::extractButtonImage(const OUString &id, stringmap &rMap, bool bRadio) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("image")); + VclBuilder::stringmap::iterator aFind = rMap.find("image"); if (aFind != rMap.end()) { m_pParserState->m_aButtonImageWidgetMaps.emplace_back(id, aFind->second, bRadio); @@ -1380,9 +1374,9 @@ void VclBuilder::extractButtonImage(const OString &id, stringmap &rMap, bool bRa } } -void VclBuilder::extractMnemonicWidget(const OString &rLabelID, stringmap &rMap) +void VclBuilder::extractMnemonicWidget(const OUString &rLabelID, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString("mnemonic-widget")); + VclBuilder::stringmap::iterator aFind = rMap.find("mnemonic-widget"); if (aFind != rMap.end()) { OUString sID = aFind->second; @@ -1416,9 +1410,9 @@ void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Wind { //remove the redundant scrolling parent sal_Int32 nWidthReq = pScrollParent->get_width_request(); - rMap[OString("width-request")] = OUString::number(nWidthReq); + rMap["width-request"] = OUString::number(nWidthReq); sal_Int32 nHeightReq = pScrollParent->get_height_request(); - rMap[OString("height-request")] = OUString::number(nHeightReq); + rMap["height-request"] = OUString::number(nHeightReq); m_pParserState->m_aRedundantParentWidgets[pScrollParent] = pWindow; } @@ -1520,18 +1514,17 @@ static VclBuilder::customMakeWidget lo_get_custom_widget_func(const char* name) namespace { // Takes a string like "sfxlo-NotebookbarToolBox" -VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& rName) +VclBuilder::customMakeWidget GetCustomMakeWidget(const OUString& rName) { - const OString name = rName == "sfxlo-SidebarToolBox" ? "sfxlo-NotebookbarToolBox" : rName; + const OUString name = rName == "sfxlo-SidebarToolBox" ? "sfxlo-NotebookbarToolBox" : rName; VclBuilder::customMakeWidget pFunction = nullptr; if (sal_Int32 nDelim = name.indexOf('-'); nDelim != -1) { - const OString aFunction(OString::Concat("make") + name.subView(nDelim + 1)); - const OUString sFunction(OStringToOUString(aFunction, RTL_TEXTENCODING_UTF8)); + const OUString sFunction(OUString::Concat("make") + name.subView(nDelim + 1)); #ifndef DISABLE_DYNLOADING - const OUString sModule = SAL_DLLPREFIX - + OStringToOUString(name.subView(0, nDelim), RTL_TEXTENCODING_UTF8) + const OUString sModule = OUString::Concat(SAL_DLLPREFIX) + + name.subView(0, nDelim) + SAL_DLLEXTENSION; ModuleMap::iterator aI = g_aModuleMap.find(sModule); if (aI == g_aModuleMap.end()) @@ -1556,7 +1549,7 @@ VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& rName) // which are already in-process if (comphelper::LibreOfficeKit::isActive()) { - pFunction = reinterpret_cast<VclBuilder::customMakeWidget>(dlsym(RTLD_DEFAULT, aFunction.getStr())); + pFunction = reinterpret_cast<VclBuilder::customMakeWidget>(dlsym(RTLD_DEFAULT, OUStringToOString(sFunction, RTL_TEXTENCODING_UTF8).getStr())); ok = !!pFunction; assert(ok && "couldn't even directly dlsym the sFunction (available via preload)"); } @@ -1589,7 +1582,7 @@ VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& rName) } } -VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &name, const OString &id, +VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OUString &name, const OUString &id, stringmap &rMap) { bool bIsPlaceHolder = name.isEmpty(); @@ -1618,9 +1611,9 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & pPage->Show(); //Make up a name for it - OString sTabPageId = get_by_window(pParent) + + OUString sTabPageId = get_by_window(pParent) + "-page" + - OString::number(nNewPageCount); + OUString::number(nNewPageCount); m_aChildren.emplace_back(sTabPageId, pPage, false); pPage->SetHelpId(m_sHelpRoot + sTabPageId); @@ -1875,7 +1868,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & } else if (name == "GtkIconView") { - assert(rMap.find(OString("model")) != rMap.end() && "GtkIconView must have a model"); + assert(rMap.find("model") != rMap.end() && "GtkIconView must have a model"); //window we want to apply the packing props for this GtkIconView to VclPtr<vcl::Window> xWindowForPackingProps; @@ -1898,7 +1891,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & { if (!m_bLegacy) { - assert(rMap.find(OString("model")) != rMap.end() && "GtkTreeView must have a model"); + assert(rMap.find("model") != rMap.end() && "GtkTreeView must have a model"); } //window we want to apply the packing props for this GtkTreeView to @@ -1933,13 +1926,13 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & if (bHeadersVisible) { VclPtr<VclVBox> xContainer = VclPtr<VclVBox>::Create(pRealParent); - OString containerid(id + "-container"); + OUString containerid(id + "-container"); xContainer->SetHelpId(m_sHelpRoot + containerid); m_aChildren.emplace_back(containerid, xContainer, true); VclPtrInstance<HeaderBar> xHeader(xContainer, WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP | WB_3DLOOK); xHeader->set_width_request(0); // let the headerbar width not affect the size request - OString headerid(id + "-header"); + OUString headerid(id + "-header"); xHeader->SetHelpId(m_sHelpRoot + headerid); m_aChildren.emplace_back(headerid, xHeader, true); @@ -2131,7 +2124,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & nItemId = ToolBoxItemId(pToolBox->GetItemCount() + 1); //TODO: ImplToolItems::size_type -> sal_uInt16! if (aCommand.isEmpty() && !m_bLegacy) - aCommand = OUString::fromUtf8(id); + aCommand = id; pToolBox->InsertItem(nItemId, extractLabel(rMap), aCommand, nBits); } @@ -2250,12 +2243,8 @@ namespace BuilderUtils { void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps) { - for (auto const& prop : rProps) - { - const OString &rKey = prop.first; - const OUString &rValue = prop.second; + for (auto const& [rKey, rValue] : rProps) pWindow->set_property(rKey, rValue); - } } OUString convertMnemonicMarkup(std::u16string_view rIn) @@ -2278,7 +2267,7 @@ namespace BuilderUtils OUString extractCustomProperty(VclBuilder::stringmap &rMap) { OUString sCustomProperty; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("customproperty")); + VclBuilder::stringmap::iterator aFind = rMap.find("customproperty"); if (aFind != rMap.end()) { sCustomProperty = aFind->second; @@ -2289,7 +2278,7 @@ namespace BuilderUtils void ensureDefaultWidthChars(VclBuilder::stringmap &rMap) { - OString sWidthChars("width-chars"); + OUString sWidthChars("width-chars"); VclBuilder::stringmap::iterator aFind = rMap.find(sWidthChars); if (aFind == rMap.end()) rMap[sWidthChars] = "20"; @@ -2298,7 +2287,7 @@ namespace BuilderUtils bool extractDropdown(VclBuilder::stringmap &rMap) { bool bDropdown = true; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("dropdown")); + VclBuilder::stringmap::iterator aFind = rMap.find("dropdown"); if (aFind != rMap.end()) { bDropdown = toBool(aFind->second); @@ -2339,11 +2328,11 @@ namespace BuilderUtils } } - sal_Int16 getRoleFromName(const OString& roleName) + sal_Int16 getRoleFromName(const OUString& roleName) { using namespace com::sun::star::accessibility; - static const std::unordered_map<OString, sal_Int16> aAtkRoleToAccessibleRole = { + static const std::unordered_map<OUString, sal_Int16> aAtkRoleToAccessibleRole = { /* This is in atkobject.h's AtkRole order */ { "invalid", AccessibleRole::UNKNOWN }, { "accelerator label", AccessibleRole::UNKNOWN }, @@ -2477,8 +2466,8 @@ namespace BuilderUtils } } -VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OString &rClass, - const OString &rID, stringmap &rProps, stringmap &rPango, stringmap &rAtk) +VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OUString &rClass, + const OUString &rID, stringmap &rProps, stringmap &rPango, stringmap &rAtk) { VclPtr<vcl::Window> pCurrentChild; @@ -2522,7 +2511,7 @@ VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OString if (pCurrentChild) { - pCurrentChild->set_id(OStringToOUString(rID, RTL_TEXTENCODING_UTF8)); + pCurrentChild->set_id(rID); if (pCurrentChild == m_pParent.get() && m_bToplevelHasDeferredProperties) m_aDeferredProperties = rProps; else @@ -2531,18 +2520,14 @@ VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OString // tdf#119827 handle size before scale so we can trivially // scale on the current font size whether size is present // or not. - VclBuilder::stringmap::iterator aSize = rPango.find(OString("size")); + VclBuilder::stringmap::iterator aSize = rPango.find("size"); if (aSize != rPango.end()) { pCurrentChild->set_font_attribute(aSize->first, aSize->second); rPango.erase(aSize); } - for (auto const& elem : rPango) - { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; + for (auto const& [ rKey, rValue ] : rPango) pCurrentChild->set_font_attribute(rKey, rValue); - } m_pParserState->m_aAtkInfo[pCurrentChild] = rAtk; } @@ -2564,7 +2549,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read TabControl *pTabControl = pParent && pParent->GetType() == WindowType::TABCONTROL ? static_cast<TabControl*>(pParent) : nullptr; - std::vector<OString> sIDs; + std::vector<OUString> sIDs; int nLevel = 1; stringmap aProperties; @@ -2589,12 +2574,11 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read if (name == "id") { name = reader.getAttributeValue(false); - OString sID(name.begin, name.length); + OUString sID(name.begin, name.length, RTL_TEXTENCODING_UTF8); sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { - OString sPattern = sID.copy(nDelim+1); - aProperties[OString("customproperty")] = OUString::fromUtf8(sPattern); + aProperties["customproperty"] = sID.copy(nDelim + 1); sID = sID.copy(0, nDelim); } sIDs.push_back(sID); @@ -2633,7 +2617,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read VerticalTabControl *pVerticalTabControl = pParent->GetType() == WindowType::VERTICALTABCONTROL ? static_cast<VerticalTabControl*>(pParent) : nullptr; assert(pTabControl || pVerticalTabControl); - VclBuilder::stringmap::iterator aFind = aProperties.find(OString("label")); + VclBuilder::stringmap::iterator aFind = aProperties.find("label"); if (aFind != aProperties.end()) { OUString sTooltip(extractTooltipText(aProperties)); @@ -2649,11 +2633,8 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read pPage->SetContext(std::move(context)); } - for (auto const& prop : aAtkProperties) + for (auto const& [ rKey, rValue ] : aAtkProperties) { - const OString &rKey = prop.first; - const OUString &rValue = prop.second; - if (rKey == "AtkObject::accessible-name") pTabControl->SetAccessibleName(nPageId, rValue); else if (rKey == "AtkObject::accessible-description") @@ -2887,25 +2868,25 @@ void VclBuilder::collectPangoAttribute(xmlreader::XmlReader &reader, stringmap & xmlreader::Span span; int nsId; - OString sProperty; - OString sValue; + OUString sProperty; + OUString sValue; while (reader.nextAttribute(&nsId, &span)) { if (span == "name") { span = reader.getAttributeValue(false); - sProperty = OString(span.begin, span.length); + sProperty = OUString(span.begin, span.length, RTL_TEXTENCODING_UTF8); } else if (span == "value") { span = reader.getAttributeValue(false); - sValue = OString(span.begin, span.length); + sValue = OUString(span.begin, span.length, RTL_TEXTENCODING_UTF8); } } if (!sProperty.isEmpty()) - rMap[sProperty] = OUString::fromUtf8(sValue); + rMap[sProperty] = sValue; } void VclBuilder::collectAtkRelationAttribute(xmlreader::XmlReader &reader, stringmap &rMap) @@ -2913,20 +2894,20 @@ void VclBuilder::collectAtkRelationAttribute(xmlreader::XmlReader &reader, strin xmlreader::Span span; int nsId; - OString sProperty; - OString sValue; + OUString sProperty; + OUString sValue; while (reader.nextAttribute(&nsId, &span)) { if (span == "type") { span = reader.getAttributeValue(false); - sProperty = OString(span.begin, span.length); + sProperty = OUString(span.begin, span.length, RTL_TEXTENCODING_UTF8); } else if (span == "target") { span = reader.getAttributeValue(false); - sValue = OString(span.begin, span.length); + sValue = OUString(span.begin, span.length, RTL_TEXTENCODING_UTF8); sal_Int32 nDelim = sValue.indexOf(':'); if (nDelim != -1) sValue = sValue.copy(0, nDelim); @@ -2934,7 +2915,7 @@ void VclBuilder::collectAtkRelationAttribute(xmlreader::XmlReader &reader, strin } if (!sProperty.isEmpty()) - rMap[sProperty] = OUString::fromUtf8(sValue); + rMap[sProperty] = sValue; } void VclBuilder::collectAtkRoleAttribute(xmlreader::XmlReader &reader, stringmap &rMap) @@ -2942,22 +2923,22 @@ void VclBuilder::collectAtkRoleAttribute(xmlreader::XmlReader &reader, stringmap xmlreader::Span span; int nsId; - OString sProperty; + OUString sProperty; while (reader.nextAttribute(&nsId, &span)) { if (span == "type") { span = reader.getAttributeValue(false); - sProperty = OString(span.begin, span.length); + sProperty = OUString(span.begin, span.length, RTL_TEXTENCODING_UTF8); } } if (!sProperty.isEmpty()) - rMap["role"] = OUString::fromUtf8(sProperty); + rMap["role"] = sProperty; } -void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID) +void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OUString &rID) { int nLevel = 1; @@ -3032,7 +3013,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID) m_pParserState->m_aModels[rID].m_aEntries.push_back(aRow); } -void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rID, std::string_view rClass) +void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OUString &rID, std::u16string_view rClass) { int nLevel = 1; @@ -3051,7 +3032,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI { if (name == "row") { - bool bNotTreeStore = rClass != "GtkTreeStore"; + bool bNotTreeStore = rClass != u"GtkTreeStore"; if (bNotTreeStore) handleRow(reader, rID); assert(bNotTreeStore && "gtk, as the time of writing, doesn't support data in GtkTreeStore serialization"); @@ -3109,11 +3090,8 @@ VclBuilder::stringmap VclBuilder::handleAtkObject(xmlreader::XmlReader &reader) void VclBuilder::applyAtkProperties(vcl::Window *pWindow, const stringmap& rProperties) { assert(pWindow); - for (auto const& prop : rProperties) + for (auto const& [ rKey, rValue ] : rProperties) { - const OString &rKey = prop.first; - const OUString &rValue = prop.second; - if (pWindow && rKey.match("AtkObject::")) pWindow->set_property(rKey.copy(RTL_CONSTASCII_LENGTH("AtkObject::")), rValue); else @@ -3144,7 +3122,8 @@ std::vector<ComboBoxTextItem> VclBuilder::handleItems(xmlreader::XmlReader &read if (name == "item") { bool bTranslated = false; - OString sContext, sId; + OString sContext; + OUString sId; while (reader.nextAttribute(&nsId, &name)) { @@ -3160,7 +3139,7 @@ std::vector<ComboBoxTextItem> VclBuilder::handleItems(xmlreader::XmlReader &read else if (name == "id") { name = reader.getAttributeValue(false); - sId = OString(name.begin, name.length); + sId = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } } @@ -3195,7 +3174,7 @@ std::vector<ComboBoxTextItem> VclBuilder::handleItems(xmlreader::XmlReader &read return aItems; } -VclPtr<Menu> VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID, bool bMenuBar) +VclPtr<Menu> VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OUString &rID, bool bMenuBar) { VclPtr<Menu> pCurrentMenu; if (bMenuBar) @@ -3203,7 +3182,7 @@ VclPtr<Menu> VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString else pCurrentMenu = VclPtr<PopupMenu>::Create(); - pCurrentMenu->set_id(OStringToOUString(rID, RTL_TEXTENCODING_UTF8)); + pCurrentMenu->set_id(rID); int nLevel = 1; @@ -3282,8 +3261,8 @@ void VclBuilder::handleMenuChild(Menu *pParent, xmlreader::XmlReader &reader) void VclBuilder::handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader) { - OString sClass; - OString sID; + OUString sClass; + OUString sID; OUString sCustomProperty; PopupMenu *pSubMenu = nullptr; @@ -3295,18 +3274,18 @@ void VclBuilder::handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader) if (name == "class") { name = reader.getAttributeValue(false); - sClass = OString(name.begin, name.length); + sClass = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } else if (name == "id") { name = reader.getAttributeValue(false); - sID = OString(name.begin, name.length); + sID = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); if (m_bLegacy) { sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { - sCustomProperty = OUString::fromUtf8(sID.subView(nDelim+1)); + sCustomProperty = sID.subView(nDelim+1); sID = sID.copy(0, nDelim); } } @@ -3320,7 +3299,7 @@ void VclBuilder::handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader) accelmap aAccelerators; if (!sCustomProperty.isEmpty()) - aProperties[OString("customproperty")] = sCustomProperty; + aProperties["customproperty"] = sCustomProperty; while(true) { @@ -3390,7 +3369,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader) if (name == "name") { name = reader.getAttributeValue(false); - OString sWidget(name.begin, name.length); + OUString sWidget(name.begin, name.length, RTL_TEXTENCODING_UTF8); sal_Int32 nDelim = sWidget.indexOf(':'); if (nDelim != -1) sWidget = sWidget.copy(0, nDelim); @@ -3417,7 +3396,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader) namespace { - vcl::KeyCode makeKeyCode(const std::pair<OString,OString> &rKey) + vcl::KeyCode makeKeyCode(const std::pair<OUString,OUString> &rKey) { bool bShift = rKey.second.indexOf("GDK_SHIFT_MASK") != -1; bool bMod1 = rKey.second.indexOf("GDK_CONTROL_MASK") != -1; @@ -3448,7 +3427,7 @@ namespace } assert (rKey.first.getLength() == 1); - char cChar = rKey.first.toChar(); + sal_Unicode cChar = rKey.first.toChar(); if (cChar >= 'a' && cChar <= 'z') return vcl::KeyCode(KEY_A + (cChar - 'a'), bShift, bMod1, bMod2, bMod3); @@ -3461,7 +3440,7 @@ namespace } } -void VclBuilder::insertMenuObject(Menu *pParent, PopupMenu *pSubMenu, const OString &rClass, const OString &rID, +void VclBuilder::insertMenuObject(Menu *pParent, PopupMenu *pSubMenu, const OUString &rClass, const OUString &rID, stringmap &rProps, stringmap &rAtkProps, accelmap &rAccels) { sal_uInt16 nOldCount = pParent->GetItemCount(); @@ -3508,11 +3487,8 @@ void VclBuilder::insertMenuObject(Menu *pParent, PopupMenu *pSubMenu, const OStr if (!extractVisible(rProps)) pParent->HideItem(nNewId); - for (auto const& prop : rProps) + for (auto const& [ rKey, rValue ] : rProps) { - const OString &rKey = prop.first; - const OUString &rValue = prop.second; - if (rKey == "tooltip-markup") pParent->SetTipHelpText(nNewId, rValue); else if (rKey == "tooltip-text") @@ -3521,11 +3497,8 @@ void VclBuilder::insertMenuObject(Menu *pParent, PopupMenu *pSubMenu, const OStr SAL_INFO("vcl.builder", "unhandled property: " << rKey); } - for (auto const& prop : rAtkProps) + for (auto const& [ rKey, rValue ] : rAtkProps) { - const OString &rKey = prop.first; - const OUString &rValue = prop.second; - if (rKey == "AtkObject::accessible-name") pParent->SetAccessibleName(nNewId, rValue); else if (rKey == "AtkObject::accessible-description") @@ -3534,11 +3507,8 @@ void VclBuilder::insertMenuObject(Menu *pParent, PopupMenu *pSubMenu, const OStr SAL_INFO("vcl.builder", "unhandled atk property: " << rKey); } - for (auto const& accel : rAccels) + for (auto const& [ rSignal, rValue ] : rAccels) { - const OString &rSignal = accel.first; - const auto &rValue = accel.second; - if (rSignal == "activate") pParent->SetAccelKey(nNewId, makeKeyCode(rValue)); else @@ -3565,7 +3535,7 @@ template<typename T> static bool insertItems(vcl::Window *pWindow, VclBuilder::s sal_Int32 nPos = pContainer->InsertEntry(item.m_sItem); if (!item.m_sId.isEmpty()) { - rUserData.emplace_back(std::make_unique<OUString>(OUString::fromUtf8(item.m_sId))); + rUserData.emplace_back(std::make_unique<OUString>(item.m_sId)); pContainer->SetEntryData(nPos, rUserData.back().get()); } } @@ -3577,8 +3547,8 @@ template<typename T> static bool insertItems(vcl::Window *pWindow, VclBuilder::s VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, stringmap *pAtkProps, xmlreader::XmlReader &reader) { - OString sClass; - OString sID; + OUString sClass; + OUString sID; OUString sCustomProperty; xmlreader::Span name; @@ -3589,18 +3559,18 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, stringmap *pA if (name == "class") { name = reader.getAttributeValue(false); - sClass = OString(name.begin, name.length); + sClass = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } else if (name == "id") { name = reader.getAttributeValue(false); - sID = OString(name.begin, name.length); + sID = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); if (m_bLegacy) { sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { - sCustomProperty = OUString::fromUtf8(sID.subView(nDelim+1)); + sCustomProperty = sID.subView(nDelim+1); sID = sID.copy(0, nDelim); } } @@ -3648,7 +3618,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, stringmap *pA std::vector<ComboBoxTextItem> aItems; if (!sCustomProperty.isEmpty()) - aProperties[OString("customproperty")] = sCustomProperty; + aProperties["customproperty"] = sCustomProperty; VclPtr<vcl::Window> pCurrentChild; while(true) @@ -3901,19 +3871,16 @@ std::vector<vcl::EnumContext::Context> VclBuilder::handleStyle(xmlreader::XmlRea ++nLevel; if (name == "class") { - OString classStyle = getStyleClass(reader); + OUString classStyle = getStyleClass(reader); + OUString rest; - if (classStyle.startsWith("context-")) + if (classStyle.startsWith("context-", &rest)) { - OString sContext = classStyle.copy(classStyle.indexOf('-') + 1); - OUString sContext2(sContext.getStr(), sContext.getLength(), RTL_TEXTENCODING_UTF8); - aContext.push_back(vcl::EnumContext::GetContextEnum(sContext2)); + aContext.push_back(vcl::EnumContext::GetContextEnum(rest)); } - else if (classStyle.startsWith("priority-")) + else if (classStyle.startsWith("priority-", &rest)) { - OString aPriority = classStyle.copy(classStyle.indexOf('-') + 1); - OUString aPriority2(aPriority.getStr(), aPriority.getLength(), RTL_TEXTENCODING_UTF8); - nPriority = aPriority2.toInt32(); + nPriority = rest.toInt32(); } else if (classStyle != "small-button" && classStyle != "destructive-action" && classStyle != "suggested-action") { @@ -3934,18 +3901,18 @@ std::vector<vcl::EnumContext::Context> VclBuilder::handleStyle(xmlreader::XmlRea return aContext; } -OString VclBuilder::getStyleClass(xmlreader::XmlReader &reader) +OUString VclBuilder::getStyleClass(xmlreader::XmlReader &reader) { xmlreader::Span name; int nsId; - OString aRet; + OUString aRet; while (reader.nextAttribute(&nsId, &name)) { if (name == "name") { name = reader.getAttributeValue(false); - aRet = OString (name.begin, name.length); + aRet = OUString (name.begin, name.length, RTL_TEXTENCODING_UTF8); } } @@ -3957,7 +3924,8 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap) xmlreader::Span name; int nsId; - OString sProperty, sContext; + OUString sProperty; + OString sContext; bool bTranslated = false; @@ -3966,7 +3934,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap) if (name == "name") { name = reader.getAttributeValue(false); - sProperty = OString(name.begin, name.length); + sProperty = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } else if (name == "context") { @@ -4015,7 +3983,7 @@ void VclBuilder::handleActionWidget(xmlreader::XmlReader &reader) } (void)reader.nextItem(xmlreader::XmlReader::Text::Raw, &name, &nsId); - OString sID(name.begin, name.length); + OUString sID(name.begin, name.length, RTL_TEXTENCODING_UTF8); sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) sID = sID.copy(0, nDelim); @@ -4027,26 +3995,26 @@ void VclBuilder::collectAccelerator(xmlreader::XmlReader &reader, accelmap &rMap xmlreader::Span name; int nsId; - OString sProperty; - OString sValue; - OString sModifiers; + OUString sProperty; + OUString sValue; + OUString sModifiers; while (reader.nextAttribute(&nsId, &name)) { if (name == "key") { name = reader.getAttributeValue(false); - sValue = OString(name.begin, name.length); + sValue = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } else if (name == "signal") { name = reader.getAttributeValue(false); - sProperty = OString(name.begin, name.length); + sProperty = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } else if (name == "modifiers") { name = reader.getAttributeValue(false); - sModifiers = OString(name.begin, name.length); + sModifiers = OUString(name.begin, name.length, RTL_TEXTENCODING_UTF8); } } @@ -4061,7 +4029,7 @@ vcl::Window *VclBuilder::get_widget_root() return m_aChildren.empty() ? nullptr : m_aChildren[0].m_pWindow.get(); } -vcl::Window *VclBuilder::get_by_name(std::string_view sID) +vcl::Window *VclBuilder::get_by_name(std::u16string_view sID) { for (auto const& child : m_aChildren) { @@ -4072,7 +4040,7 @@ vcl::Window *VclBuilder::get_by_name(std::string_view sID) return nullptr; } -PopupMenu *VclBuilder::get_menu(std::string_view sID) +PopupMenu *VclBuilder::get_menu(std::u16string_view sID) { for (auto const& menu : m_aMenus) { @@ -4083,7 +4051,7 @@ PopupMenu *VclBuilder::get_menu(std::string_view sID) return nullptr; } -void VclBuilder::set_response(std::string_view sID, short nResponse) +void VclBuilder::set_response(std::u16string_view sID, short nResponse) { switch (nResponse) { @@ -4126,7 +4094,7 @@ void VclBuilder::set_response(std::string_view sID, short nResponse) assert(false); } -void VclBuilder::delete_by_name(const OString& sID) +void VclBuilder::delete_by_name(const OUString& sID) { auto aI = std::find_if(m_aChildren.begin(), m_aChildren.end(), [&sID](WinAndId& rItem) { return rItem.m_sID == sID; }); @@ -4151,7 +4119,7 @@ void VclBuilder::drop_ownership(const vcl::Window *pWindow) m_aChildren.erase(aI); } -OString VclBuilder::get_by_window(const vcl::Window *pWindow) const +OUString VclBuilder::get_by_window(const vcl::Window *pWindow) const { for (auto const& child : m_aChildren) { @@ -4159,7 +4127,7 @@ OString VclBuilder::get_by_window(const vcl::Window *pWindow) const return child.m_sID; } - return OString(); + return {}; } VclBuilder::PackingData VclBuilder::get_window_packing_data(const vcl::Window *pWindow) const @@ -4188,25 +4156,25 @@ void VclBuilder::set_window_packing_position(const vcl::Window *pWindow, sal_Int } } -const VclBuilder::ListStore *VclBuilder::get_model_by_name(const OString& sID) const +const VclBuilder::ListStore *VclBuilder::get_model_by_name(const OUString& sID) const { - std::map<OString, ListStore>::const_iterator aI = m_pParserState->m_aModels.find(sID); + const auto aI = m_pParserState->m_aModels.find(sID); if (aI != m_pParserState->m_aModels.end()) return &(aI->second); return nullptr; } -const VclBuilder::TextBuffer *VclBuilder::get_buffer_by_name(const OString& sID) const +const VclBuilder::TextBuffer *VclBuilder::get_buffer_by_name(const OUString& sID) const { - std::map<OString, TextBuffer>::const_iterator aI = m_pParserState->m_aTextBuffers.find(sID); + const auto aI = m_pParserState->m_aTextBuffers.find(sID); if (aI != m_pParserState->m_aTextBuffers.end()) return &(aI->second); return nullptr; } -const VclBuilder::Adjustment *VclBuilder::get_adjustment_by_name(const OString& sID) const +const VclBuilder::Adjustment *VclBuilder::get_adjustment_by_name(const OUString& sID) const { - std::map<OString, Adjustment>::const_iterator aI = m_pParserState->m_aAdjustments.find(sID); + const auto aI = m_pParserState->m_aAdjustments.find(sID); if (aI != m_pParserState->m_aAdjustments.end()) return &(aI->second); return nullptr; @@ -4300,11 +4268,8 @@ void VclBuilder::mungeAdjustment(NumericFormatter &rTarget, const Adjustment &rA { int nMul = rtl_math_pow10Exp(1, rTarget.GetDecimalDigits()); - for (auto const& elem : rAdjustment) + for (auto const& [ rKey, rValue ] : rAdjustment) { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; - if (rKey == "upper") { sal_Int64 nUpper = rValue.toDouble() * nMul; @@ -4338,11 +4303,8 @@ void VclBuilder::mungeAdjustment(FormattedField &rTarget, const Adjustment &rAdj { double nMaxValue = 0, nMinValue = 0, nValue = 0, nSpinSize = 0; - for (auto const& elem : rAdjustment) + for (auto const& [ rKey, rValue ] : rAdjustment) { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; - if (rKey == "upper") nMaxValue = rValue.toDouble(); else if (rKey == "lower") @@ -4364,11 +4326,8 @@ void VclBuilder::mungeAdjustment(FormattedField &rTarget, const Adjustment &rAdj void VclBuilder::mungeAdjustment(ScrollBar &rTarget, const Adjustment &rAdjustment) { - for (auto const& elem : rAdjustment) + for (auto const& [ rKey, rValue ] : rAdjustment) { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; - if (rKey == "upper") rTarget.SetRangeMax(rValue.toInt32()); else if (rKey == "lower") @@ -4388,11 +4347,8 @@ void VclBuilder::mungeAdjustment(ScrollBar &rTarget, const Adjustment &rAdjustme void VclBuilder::mungeAdjustment(Slider& rTarget, const Adjustment& rAdjustment) { - for (auto const& elem : rAdjustment) + for (auto const& [ rKey, rValue ] : rAdjustment) { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; - if (rKey == "upper") rTarget.SetRangeMax(rValue.toInt32()); else if (rKey == "lower") @@ -4412,11 +4368,8 @@ void VclBuilder::mungeAdjustment(Slider& rTarget, const Adjustment& rAdjustment) void VclBuilder::mungeTextBuffer(VclMultiLineEdit &rTarget, const TextBuffer &rTextBuffer) { - for (auto const& elem : rTextBuffer) + for (auto const& [ rKey, rValue ] : rTextBuffer) { - const OString &rKey = elem.first; - const OUString &rValue = elem.second; - if (rKey == "text") rTarget.SetText(rValue); else @@ -4431,7 +4384,7 @@ VclBuilder::ParserState::ParserState() , m_nLastMenuItemId(0) {} -VclBuilder::MenuAndId::MenuAndId(OString aId, Menu *pMenu) +VclBuilder::MenuAndId::MenuAndId(OUString aId, Menu *pMenu) : m_sID(std::move(aId)) , m_pMenu(pMenu) {} diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 3327e371e6c1..d17f2d1d0695 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -571,13 +571,13 @@ void Dialog::doDeferredInit(WinBits nBits) mbIsDeferredInit = false; } -Dialog::Dialog(vcl::Window* pParent, std::u16string_view rID, const OUString& rUIXMLDescription) +Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle") , mnInitFlag(InitFlag::Default) { ImplLOKNotifier(pParent); ImplInitDialogData(); - loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); + loadUI(pParent, rID, rUIXMLDescription); } Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) @@ -1421,7 +1421,7 @@ void Dialog::Resize() } } -bool Dialog::set_property(const OString &rKey, const OUString &rValue) +bool Dialog::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "border-width") set_border_width(rValue.toInt32()); @@ -1713,7 +1713,7 @@ void Dialog::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) rJsonWriter.put("collapsed", true); } - OUString sDialogId = OStringToOUString(GetHelpId(), RTL_TEXTENCODING_ASCII_US); + OUString sDialogId = GetHelpId(); sal_Int32 nStartPos = sDialogId.lastIndexOf('/'); nStartPos = nStartPos >= 0 ? nStartPos + 1 : 0; rJsonWriter.put("dialogid", sDialogId.copy(nStartPos)); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 74c18cca5159..b0d65fbd47d6 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -368,7 +368,7 @@ void DockingWindow::doDeferredInit(WinBits nBits) mbIsDeferredInit = false; } -void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, +void DockingWindow::loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) { mbIsDeferredInit = true; @@ -376,7 +376,7 @@ void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStr m_pUIBuilder.reset( new VclBuilder(this, AllSettings::GetUIRootDir(), rUIXMLDescription, rID, rFrame) ); } -DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, +DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const char* pIdleDebugName, const css::uno::Reference<css::frame::XFrame> &rFrame) : Window(WindowType::DOCKINGWINDOW), @@ -1089,7 +1089,7 @@ SystemWindow* DockingWindow::GetFloatingWindow() const DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame, bool bTearable) : DockingWindow(pParent, - !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), + !bTearable ? OUString("InterimDockParent") : OUString("InterimTearableParent"), !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), "vcl::DropdownDockingWindow maLayoutIdle", rFrame) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 5798ff4f8c40..6fd221b4f0ca 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -154,7 +154,7 @@ FloatingWindow::FloatingWindow(vcl::Window* pParent, WinBits nStyle) : ImplInitFloating(pParent, nStyle); } -FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) +FloatingWindow::FloatingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : SystemWindow(WindowType::FLOATINGWINDOW, "vcl::FloatingWindow maLayoutIdle") , mpNextFloat(nullptr) , mpFirstPopupModeWin(nullptr) diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index c56f782a0aee..0caa23fb37b2 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -382,7 +382,7 @@ void VclBox::setAllocation(const Size &rAllocation) } } -bool VclBox::set_property(const OString &rKey, const OUString &rValue) +bool VclBox::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "spacing") set_spacing(rValue.toInt32()); @@ -611,7 +611,7 @@ Size VclButtonBox::calculateRequisition() const return addSpacing(addReqGroups(aReq), nVisibleChildren); } -bool VclButtonBox::set_property(const OString &rKey, const OUString &rValue) +bool VclButtonBox::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "layout-style") { @@ -1417,7 +1417,7 @@ bool toBool(std::u16string_view rValue) return (!rValue.empty() && (rValue[0] == 't' || rValue[0] == 'T' || rValue[0] == '1')); } -bool VclGrid::set_property(const OString &rKey, const OUString &rValue) +bool VclGrid::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "row-spacing") set_row_spacing(rValue.toInt32()); @@ -1803,7 +1803,7 @@ void VclExpander::setAllocation(const Size &rAllocation) } } -bool VclExpander::set_property(const OString &rKey, const OUString &rValue) +bool VclExpander::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "expanded") set_expanded(toBool(rValue)); @@ -2096,7 +2096,7 @@ Size VclScrolledWindow::getVisibleChildSize() const return aRet; } -bool VclScrolledWindow::set_property(const OString &rKey, const OUString &rValue) +bool VclScrolledWindow::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "shadow-type" || rKey == "name") { @@ -2325,7 +2325,7 @@ void VclSizeGroup::set_mode(VclSizeGroupMode eMode) } -void VclSizeGroup::set_property(const OString &rKey, const OUString &rValue) +void VclSizeGroup::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "ignore-hidden") set_ignore_hidden(toBool(rValue)); @@ -2597,7 +2597,7 @@ OUString const & MessageDialog::get_secondary_text() const return m_sSecondaryString; } -bool MessageDialog::set_property(const OString &rKey, const OUString &rValue) +bool MessageDialog::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "text") set_primary_text(rValue); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e8facf73acd9..2a46a41a12c3 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -416,7 +416,7 @@ void Menu::RemoveEventListener( const Link<VclMenuEvent&,void>& rEventListener ) MenuItemData* Menu::NbcInsertItem(sal_uInt16 nId, MenuItemBits nBits, const OUString& rStr, Menu* pMenu, - size_t nPos, const OString &rIdent) + size_t nPos, const OUString &rIdent) { // put Item in MenuItemList MenuItemData* pData = pItemList->Insert(nId, MenuItemType::STRING, @@ -430,7 +430,7 @@ MenuItemData* Menu::NbcInsertItem(sal_uInt16 nId, MenuItemBits nBits, } void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nItemBits, - const OString &rIdent, sal_uInt16 nPos) + const OUString &rIdent, sal_uInt16 nPos) { SAL_WARN_IF( !nItemId, "vcl", "Menu::InsertItem(): ItemId == 0" ); SAL_WARN_IF( GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND, "vcl", @@ -455,7 +455,7 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nIt } void Menu::InsertItem(sal_uInt16 nItemId, const Image& rImage, - MenuItemBits nItemBits, const OString &rIdent, sal_uInt16 nPos) + MenuItemBits nItemBits, const OUString &rIdent, sal_uInt16 nPos) { InsertItem(nItemId, OUString(), nItemBits, rIdent, nPos); SetItemImage( nItemId, rImage ); @@ -463,13 +463,13 @@ void Menu::InsertItem(sal_uInt16 nItemId, const Image& rImage, void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits, - const OString &rIdent, sal_uInt16 nPos) + const OUString &rIdent, sal_uInt16 nPos) { InsertItem(nItemId, rStr, nItemBits, rIdent, nPos); SetItemImage( nItemId, rImage ); } -void Menu::InsertSeparator(const OString &rIdent, sal_uInt16 nPos) +void Menu::InsertSeparator(const OUString &rIdent, sal_uInt16 nPos) { // do nothing if it's a menu bar if (IsMenuBar()) @@ -528,7 +528,7 @@ static void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_u return; if ( eType == MenuItemType::SEPARATOR ) - pThis->InsertSeparator( OString(), nNewPos ); + pThis->InsertSeparator( {}, nNewPos ); else { sal_uInt16 nId = rMenu.GetItemId( nPos ); @@ -630,7 +630,7 @@ sal_uInt16 Menu::GetItemId(sal_uInt16 nPos) const return 0; } -sal_uInt16 Menu::GetItemId(std::string_view rIdent) const +sal_uInt16 Menu::GetItemId(std::u16string_view rIdent) const { for (size_t n = 0; n < pItemList->size(); ++n) { @@ -662,10 +662,10 @@ MenuItemType Menu::GetItemType( sal_uInt16 nPos ) const return MenuItemType::DONTKNOW; } -OString Menu::GetItemIdent(sal_uInt16 nId) const +OUString Menu::GetItemIdent(sal_uInt16 nId) const { const MenuItemData* pData = pItemList->GetData(nId); - return pData ? pData->sIdent : OString(); + return pData ? pData->sIdent : OUString(); } void Menu::SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ) @@ -875,7 +875,7 @@ void Menu::CheckItem( sal_uInt16 nItemId, bool bCheck ) ImplCallEventListeners( bCheck ? VclEventId::MenuItemChecked : VclEventId::MenuItemUnchecked, nPos ); } -void Menu::CheckItem( std::string_view rIdent , bool bCheck ) +void Menu::CheckItem( std::u16string_view rIdent , bool bCheck ) { CheckItem( GetItemId( rIdent ), bCheck ); } @@ -1087,7 +1087,7 @@ OUString Menu::ImplGetHelpText( sal_uInt16 nItemId ) const if (!pData->aCommandStr.isEmpty()) pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, static_cast<weld::Widget*>(nullptr) ); if (pData->aHelpText.isEmpty() && !pData->aHelpId.isEmpty()) - pData->aHelpText = pHelp->GetHelpText( OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), static_cast<weld::Widget*>(nullptr) ); + pData->aHelpText = pHelp->GetHelpText( pData->aHelpId, static_cast<weld::Widget*>(nullptr) ); } } @@ -1120,7 +1120,7 @@ OUString Menu::GetTipHelpText( sal_uInt16 nItemId ) const return OUString(); } -void Menu::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) +void Menu::SetHelpId( sal_uInt16 nItemId, const OUString& rHelpId ) { MenuItemData* pData = pItemList->GetData( nItemId ); @@ -1128,9 +1128,9 @@ void Menu::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) pData->aHelpId = rHelpId; } -OString Menu::GetHelpId( sal_uInt16 nItemId ) const +OUString Menu::GetHelpId( sal_uInt16 nItemId ) const { - OString aRet; + OUString aRet; MenuItemData* pData = pItemList->GetData( nItemId ); @@ -1139,7 +1139,7 @@ OString Menu::GetHelpId( sal_uInt16 nItemId ) const if ( !pData->aHelpId.isEmpty() ) aRet = pData->aHelpId; else - aRet = OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); + aRet = pData->aCommandStr; } return aRet; @@ -2855,7 +2855,7 @@ bool PopupMenu::PrepareRun(const VclPtr<vcl::Window>& pParentWin, tools::Rectang { OUString aTmpEntryText(VclResId(SV_RESID_STRING_NOSELECTIONPOSSIBLE)); - MenuItemData* pData = NbcInsertItem(0xFFFF, MenuItemBits::NONE, aTmpEntryText, nullptr, 0xFFFF, OString()); + MenuItemData* pData = NbcInsertItem(0xFFFF, MenuItemBits::NONE, aTmpEntryText, nullptr, 0xFFFF, {}); size_t nPos = 0; pData = pItemList->GetData( pData->nId, nPos ); assert(pData); diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 456474d7e610..d6849e3e71a2 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -71,7 +71,7 @@ MenuItemData* MenuItemList::Insert( const OUString& rStr, Menu* pMenu, size_t nPos, - const OString &rIdent + const OUString &rIdent ) { MenuItemData* pData = new MenuItemData( rStr ); @@ -104,7 +104,7 @@ MenuItemData* MenuItemList::Insert( return pData; } -void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) +void MenuItemList::InsertSeparator(const OUString &rIdent, size_t nPos) { MenuItemData* pData = new MenuItemData; pData->nId = 0; diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index e02dddc6f024..4cd89b478577 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -42,8 +42,8 @@ struct MenuItemData OUString aTipHelpText; // TipHelp-String (eg, expanded filenames) OUString aCommandStr; // CommandString OUString aHelpCommandStr; // Help command string (to reference external help) - OString sIdent; - OString aHelpId; // Help-Id + OUString sIdent; + OUString aHelpId; // Help-Id void* nUserValue; // User value MenuUserDataReleaseFunction aUserValueReleaseFunc; // called when MenuItemData is destroyed Image aImage; // Image @@ -116,9 +116,9 @@ public: const OUString& rStr, Menu* pMenu, size_t nPos, - const OString &rIdent + const OUString &rIdent ); - void InsertSeparator(const OString &rIdent, size_t nPos); + void InsertSeparator(const OUString &rIdent, size_t nPos); void Remove( size_t nPos ); void Clear(); diff --git a/vcl/source/window/menuwindow.cxx b/vcl/source/window/menuwindow.cxx index a3412e0778b3..36ed07f0730d 100644 --- a/vcl/source/window/menuwindow.cxx +++ b/vcl/source/window/menuwindow.cxx @@ -94,14 +94,14 @@ bool MenuWindow::ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu const * pMen // is an id available, then call help with the id, otherwise // use help-index OUString aCommand = pMenu->GetItemCommand( nId ); - OString aHelpId( pMenu->GetHelpId( nId ) ); + OUString aHelpId( pMenu->GetHelpId( nId ) ); if( aHelpId.isEmpty() ) aHelpId = OOO_HELP_INDEX; if ( !aCommand.isEmpty() ) pHelp->Start(aCommand); else - pHelp->Start(OStringToOUString(aHelpId, RTL_TEXTENCODING_UTF8)); + pHelp->Start(aHelpId); } bDone = true; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index b67e15bfab80..9fcb055633d8 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -766,7 +766,7 @@ void PrintDialog::storeToSettings() pItem->setValue( "PrintDialog", "WindowState", - OStringToOUString(m_xDialog->get_window_state(vcl::WindowDataMask::All), RTL_TEXTENCODING_UTF8) ); + m_xDialog->get_window_state(vcl::WindowDataMask::All) ); pItem->setValue( "PrintDialog", "CopyCount", @@ -800,7 +800,7 @@ void PrintDialog::readFromSettings() sal_uInt16 nCount = mxTabCtrl->get_n_pages(); for (sal_uInt16 i = 0; i < nCount; ++i) { - OString sPageId = mxTabCtrl->get_page_ident(i); + OUString sPageId = mxTabCtrl->get_page_ident(i); if (aValue == mxTabCtrl->get_tab_label_text(sPageId)) { mxTabCtrl->set_current_page(sPageId); @@ -812,7 +812,7 @@ void PrintDialog::readFromSettings() aValue = pItem->getValue( "PrintDialog", "WindowState" ); if (!aValue.isEmpty()) - m_xDialog->set_window_state(OUStringToOString(aValue, RTL_TEXTENCODING_UTF8)); + m_xDialog->set_window_state(aValue); // collate aValue = pItem->getValue( "PrintDialog", @@ -1309,7 +1309,7 @@ namespace void setHelpId( weld::Widget* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex ) { if( i_nIndex >= 0 && i_nIndex < i_rHelpIds.getLength() ) - i_pWindow->set_help_id( OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) ); + i_pWindow->set_help_id( i_rHelpIds.getConstArray()[i_nIndex] ); } void setHelpText( weld::Widget* i_pWindow, const Sequence< OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) @@ -1341,7 +1341,7 @@ void PrintDialog::setupOptionalUI() // extract ui element OUString aCtrlType; - OString aID; + OUString aID; OUString aText; OUString aPropertyName; Sequence< OUString > aChoices; @@ -1357,7 +1357,7 @@ void PrintDialog::setupOptionalUI() if ( rEntry.Name == "ID" ) { rEntry.Value >>= aIDs; - aID = OUStringToOString(aIDs[0], RTL_TEXTENCODING_UTF8); + aID = aIDs[0]; } if ( rEntry.Name == "Text" ) { @@ -1449,11 +1449,11 @@ void PrintDialog::setupOptionalUI() // set help id if (aHelpIds.hasElements()) - pPage->set_help_id(OUStringToOString(aHelpIds.getConstArray()[0], RTL_TEXTENCODING_UTF8)); + pPage->set_help_id(aHelpIds[0]); // set help text if (aHelpTexts.hasElements()) - pPage->set_tooltip_text(aHelpTexts.getConstArray()[0]); + pPage->set_tooltip_text(aHelpTexts[0]); pPage->show(); } @@ -1552,7 +1552,7 @@ void PrintDialog::setupOptionalUI() pVal->Value >>= nSelectVal; for( sal_Int32 m = 0; m < aChoices.getLength(); m++ ) { - aID = OUStringToOString(aIDs[m], RTL_TEXTENCODING_UTF8); + aID = aIDs[m]; std::unique_ptr<weld::RadioButton> xBtn = m_xBuilder->weld_radio_button(aID); if (!xBtn && mxCustomOptionsUIBuilder) xBtn = mxCustomOptionsUIBuilder->weld_radio_button(aID); diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 7440e33de02e..9907dd5479db 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -65,7 +65,7 @@ struct ImplStatusItem OUString maText; OUString maHelpText; OUString maQuickHelpText; - OString maHelpId; + OUString maHelpId; void* mpUserData; bool mbVisible; OUString maAccessibleName; @@ -1292,7 +1292,7 @@ const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const if ( !pItem->maCommand.isEmpty() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommand, this ); if ( pItem->maHelpText.isEmpty() && !pItem->maHelpId.isEmpty() ) - pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( pItem->maHelpId, this ); } } @@ -1317,7 +1317,7 @@ const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const return pItem->maQuickHelpText; } -void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) +void StatusBar::SetHelpId( sal_uInt16 nItemId, const OUString& rHelpId ) { sal_uInt16 nPos = GetItemPos( nItemId ); diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 603cc8aca5fd..643f83e96ce6 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -35,7 +35,7 @@ #include <vcl/tabpage.hxx> #include <vcl/virdev.hxx> -#include <rtl/strbuf.hxx> +#include <rtl/ustrbuf.hxx> #include <o3tl/string_view.hxx> #include <accel.hxx> @@ -87,7 +87,7 @@ SystemWindow::SystemWindow(WindowType nType, const char* pIdleDebugName) maLayoutIdle.SetInvokeHandler( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) ); } -void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, +void SystemWindow::loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) { mbIsDeferredInit = true; @@ -399,13 +399,13 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const return mpImplData->maMaxOutSize; } -vcl::WindowData::WindowData(std::string_view rStr) +vcl::WindowData::WindowData(std::u16string_view rStr) { vcl::WindowData& rData = *this; vcl::WindowDataMask nValidMask = vcl::WindowDataMask::NONE; sal_Int32 nIndex = 0; - std::string_view aTokenStr = o3tl::getToken(rStr, 0, ',', nIndex); + std::u16string_view aTokenStr = o3tl::getToken(rStr, 0, ',', nIndex); if (!aTokenStr.empty()) { rData.setX(o3tl::toInt32(aTokenStr)); @@ -520,13 +520,13 @@ vcl::WindowData::WindowData(std::string_view rStr) rData.setMask(nValidMask); } -OString vcl::WindowData::toStr() const +OUString vcl::WindowData::toStr() const { const vcl::WindowDataMask nValidMask = mask(); if ( nValidMask == vcl::WindowDataMask::NONE ) - return OString(); + return {}; - OStringBuffer rStrBuf(64); + OUStringBuffer rStrBuf(64); tools::Rectangle aRect = posSize(); @@ -831,14 +831,14 @@ void SystemWindow::GetWindowState(vcl::WindowData& rData) const } } -void SystemWindow::SetWindowState(std::string_view rStr) +void SystemWindow::SetWindowState(std::u16string_view rStr) { if (rStr.empty()) return; SetWindowState(vcl::WindowData(rStr)); } -OString SystemWindow::GetWindowState(vcl::WindowDataMask nMask) const +OUString SystemWindow::GetWindowState(vcl::WindowDataMask nMask) const { vcl::WindowData aData; aData.setMask(nMask); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 5e96911c8f20..cb33666cb06d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1272,7 +1272,7 @@ ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -ToolBox::ToolBox(vcl::Window* pParent, const OString& rID, +ToolBox::ToolBox(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : DockingWindow(WindowType::TOOLBOX, "vcl::ToolBox maLayoutIdle") { @@ -3605,7 +3605,7 @@ const OUString& ToolBox::ImplGetHelpText( ToolBoxItemId nItemId ) const if (DispatchableCommand(pItem->maCommandStr)) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommandStr, this ); if ( pItem->maHelpText.isEmpty() && !pItem->maHelpId.isEmpty() ) - pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( pItem->maHelpId, this ); } } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 66e5637e6dff..699080f9a530 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1349,7 +1349,7 @@ const OUString& ToolBox::GetHelpText( ToolBoxItemId nItemId ) const return ImplGetHelpText( nItemId ); } -void ToolBox::SetHelpId( ToolBoxItemId nItemId, const OString& rHelpId ) +void ToolBox::SetHelpId( ToolBoxItemId nItemId, const OUString& rHelpId ) { ImplToolItem* pItem = ImplGetItem( nItemId ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index c3333d4a0f45..57e479ceb993 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1907,7 +1907,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } else if (!mpWindowImpl->maHelpRequestHdl.IsSet() || mpWindowImpl->maHelpRequestHdl.Call(*this)) { - OUString aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + OUString aStrHelpId( GetHelpId() ); if ( aStrHelpId.isEmpty() && ImplGetParent() ) ImplGetParent()->RequestHelp( rHEvt ); else @@ -3096,7 +3096,7 @@ const Wallpaper& Window::GetDisplayBackground() const const OUString& Window::GetHelpText() const { - OUString aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + OUString aStrHelpId( GetHelpId() ); bool bStrHelpId = !aStrHelpId.isEmpty(); if ( !mpWindowImpl->maHelpText.getLength() && bStrHelpId ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 180edf5cf961..6a6f20dab5a7 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -854,12 +854,12 @@ void Window::EnableDocking( bool bEnable ) return ImplGetTopmostFrameWindow()->mpWindowImpl->mpFrameData->maOwnerDrawList; } -void Window::SetHelpId( const OString& rHelpId ) +void Window::SetHelpId( const OUString& rHelpId ) { mpWindowImpl->maHelpId = rHelpId; } -const OString& Window::GetHelpId() const +const OUString& Window::GetHelpId() const { return mpWindowImpl->maHelpId; } @@ -1422,7 +1422,7 @@ namespace } } -bool Window::set_font_attribute(const OString &rKey, std::u16string_view rValue) +bool Window::set_font_attribute(const OUString &rKey, std::u16string_view rValue) { if (rKey == "weight") { @@ -1488,7 +1488,7 @@ bool Window::set_font_attribute(const OString &rKey, std::u16string_view rValue) return true; } -bool Window::set_property(const OString &rKey, const OUString &rValue) +bool Window::set_property(const OUString &rKey, const OUString &rValue) { if ((rKey == "label") || (rKey == "title") || (rKey == "text") ) { @@ -1622,7 +1622,7 @@ bool Window::set_property(const OString &rKey, const OUString &rValue) } else if (rKey == "accessible-role") { - sal_Int16 role = BuilderUtils::getRoleFromName(rValue.toUtf8()); + sal_Int16 role = BuilderUtils::getRoleFromName(rValue); if (role != com::sun::star::accessibility::AccessibleRole::UNKNOWN) SetAccessibleRole(role); } diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index a13133d6017b..90ae49ec5179 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -90,7 +90,7 @@ RTSDialog::~RTSDialog() { } -IMPL_LINK(RTSDialog, ActivatePage, const OString&, rPage, void) +IMPL_LINK(RTSDialog, ActivatePage, const OUString&, rPage, void) { if (rPage == "paper") m_xPaperPage->update(); diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index bcf86670d0b6..04b89d54e075 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -45,7 +45,7 @@ class RTSDialog : public weld::GenericDialogController std::unique_ptr<RTSPaperPage> m_xPaperPage; std::unique_ptr<RTSDevicePage> m_xDevicePage; - DECL_LINK(ActivatePage, const OString&, void); + DECL_LINK(ActivatePage, const OUString&, void); DECL_LINK(ClickButton, weld::Button&, void); // helper functions diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx index cc8535ff2ad2..f595369f8b53 100644 --- a/vcl/unx/gtk3/gtkdata.cxx +++ b/vcl/unx/gtk3/gtkdata.cxx @@ -888,37 +888,37 @@ namespace { struct ButtonOrder { - std::string_view m_aType; + std::u16string_view m_aType; int m_nPriority; }; } -int getButtonPriority(std::string_view rType) +int getButtonPriority(std::u16string_view rType) { static const size_t N_TYPES = 8; static const ButtonOrder aDiscardCancelSave[N_TYPES] = { - { "discard", 0 }, - { "cancel", 1 }, - { "close", 1 }, - { "no", 2 }, - { "open", 3 }, - { "save", 3 }, - { "yes", 3 }, - { "ok", 3 } + { u"discard", 0 }, + { u"cancel", 1 }, + { u"close", 1 }, + { u"no", 2 }, + { u"open", 3 }, + { u"save", 3 }, + { u"yes", 3 }, + { u"ok", 3 } }; static const ButtonOrder aSaveDiscardCancel[N_TYPES] = { - { "open", 0 }, - { "save", 0 }, - { "yes", 0 }, - { "ok", 0 }, - { "discard", 1 }, - { "no", 1 }, - { "cancel", 2 }, - { "close", 2 } + { u"open", 0 }, + { u"save", 0 }, + { u"yes", 0 }, + { u"ok", 0 }, + { u"discard", 1 }, + { u"no", 1 }, + { u"cancel", 2 }, + { u"close", 2 } }; const ButtonOrder* pOrder = &aDiscardCancelSave[0]; diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 6369aec3b1a3..30ff8681f630 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -2174,17 +2174,17 @@ namespace class GtkInstanceBuilder; - void set_help_id(const GtkWidget *pWidget, const OString& rHelpId) + void set_help_id(const GtkWidget *pWidget, std::u16string_view rHelpId) { - gchar *helpid = g_strdup(rHelpId.getStr()); + gchar *helpid = g_strdup(OUStringToOString(rHelpId, RTL_TEXTENCODING_UTF8).getStr()); g_object_set_data_full(G_OBJECT(pWidget), "g-lo-helpid", helpid, g_free); } - OString get_help_id(const GtkWidget *pWidget) + OUString get_help_id(const GtkWidget *pWidget) { void* pData = g_object_get_data(G_OBJECT(pWidget), "g-lo-helpid"); const gchar* pStr = static_cast<const gchar*>(pData); - return OString(pStr, pStr ? strlen(pStr) : 0); + return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); } KeyEvent CreateKeyEvent(guint keyval, guint16 hardware_keycode, guint state, guint8 group) @@ -2522,23 +2522,23 @@ vcl::Font get_font(GtkWidget* pWidget) } -OString get_buildable_id(GtkBuildable* pWidget) +OUString get_buildable_id(GtkBuildable* pWidget) { #if GTK_CHECK_VERSION(4, 0, 0) const gchar* pStr = gtk_buildable_get_buildable_id(pWidget); #else const gchar* pStr = gtk_buildable_get_name(pWidget); #endif - return OString(pStr, pStr ? strlen(pStr) : 0); + return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); } -void set_buildable_id(GtkBuildable* pWidget, const OString& rId) +void set_buildable_id(GtkBuildable* pWidget, const OUString& rId) { #if GTK_CHECK_VERSION(4, 0, 0) GtkBuildableIface *iface = GTK_BUILDABLE_GET_IFACE(pWidget); - (*iface->set_id)(pWidget, rId.getStr()); + (*iface->set_id)(pWidget, OUStringToOString(rId, RTL_TEXTENCODING_UTF8).getStr()); #else - gtk_buildable_set_name(pWidget, rId.getStr()); + gtk_buildable_set_name(pWidget, OUStringToOString(rId, RTL_TEXTENCODING_UTF8).getStr()); #endif } @@ -3929,26 +3929,26 @@ public: virtual std::unique_ptr<weld::Container> weld_parent() const override; - virtual OString get_buildable_name() const override + virtual OUString get_buildable_name() const override { return ::get_buildable_id(GTK_BUILDABLE(m_pWidget)); } - virtual void set_buildable_name(const OString& rId) override + virtual void set_buildable_name(const OUString& rId) override { ::set_buildable_id(GTK_BUILDABLE(m_pWidget), rId); } - virtual void set_help_id(const OString& rHelpId) override + virtual void set_help_id(const OUString& rHelpId) override { ::set_help_id(m_pWidget, rHelpId); } - virtual OString get_help_id() const override + virtual OUString get_help_id() const override { - OString sRet = ::get_help_id(m_pWidget); + OUString sRet = ::get_help_id(m_pWidget); if (sRet.isEmpty()) - sRet = OString("null"); + sRet = "null"; return sRet; } @@ -4426,7 +4426,7 @@ public: } } - virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) override; + virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) override; virtual OUString strip_mnemonic(const OUString &rLabel) const override { @@ -5232,13 +5232,13 @@ protected: #if !GTK_CHECK_VERSION(4, 0, 0) GtkMenu* m_pMenu; - std::map<OString, GtkMenuItem*> m_aMap; + std::map<OUString, GtkMenuItem*> m_aMap; #else GtkPopoverMenu* m_pMenu; o3tl::sorted_vector<OString> m_aInsertedActions; // must outlive m_aActionEntries - std::map<OString, OString> m_aIdToAction; - std::set<OString> m_aHiddenIds; + std::map<OUString, OString> m_aIdToAction; + std::set<OUString> m_aHiddenIds; std::vector<GActionEntry> m_aActionEntries; GActionGroup* m_pActionGroup; // move 'invisible' entries to m_pHiddenActionGroup @@ -5247,7 +5247,7 @@ protected: bool m_bTakeOwnership; private: - virtual void signal_item_activate(const OString& rIdent) = 0; + virtual void signal_item_activate(const OUString& rIdent) = 0; #if !GTK_CHECK_VERSION(4, 0, 0) static void collect(GtkWidget* pItem, gpointer widget) @@ -5266,15 +5266,15 @@ private: pThis->signal_item_activate(::get_buildable_id(GTK_BUILDABLE(pItem))); } #else - static std::pair<GMenuModel*, int> find_id(GMenuModel* pMenuModel, const OString& rId) + static std::pair<GMenuModel*, int> find_id(GMenuModel* pMenuModel, const OUString& rId) { for (int i = 0, nCount = g_menu_model_get_n_items(pMenuModel); i < nCount; ++i) { - OString sTarget; + OUString sTarget; char *id; if (g_menu_model_get_item_attribute(pMenuModel, i, "target", "s", &id)) { - sTarget = OString(id); + sTarget = OStringToOUString(id, RTL_TEXTENCODING_UTF8); g_free(id); } @@ -5314,7 +5314,7 @@ private: { gsize nLength(0); const gchar* pStr = g_variant_get_string(pParameter, &nLength); - OString aStr(pStr, nLength); + OUString aStr(pStr, nLength, RTL_TEXTENCODING_UTF8); MenuHelper* pThis = static_cast<MenuHelper*>(widget); SolarMutexGuard aGuard; pThis->signal_item_activate(aStr); @@ -5343,14 +5343,14 @@ public: #if !GTK_CHECK_VERSION(4, 0, 0) void add_to_map(GtkMenuItem* pMenuItem) { - OString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem)); + OUString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem)); m_aMap[id] = pMenuItem; g_signal_connect(pMenuItem, "activate", G_CALLBACK(signalActivate), this); } void remove_from_map(GtkMenuItem* pMenuItem) { - OString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem)); + OUString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem)); auto iter = m_aMap.find(id); g_signal_handlers_disconnect_by_data(pMenuItem, this); m_aMap.erase(iter); @@ -5427,7 +5427,8 @@ public: { for (int i = 0, nCount = g_menu_model_get_n_items(pMenuModel); i < nCount; ++i) { - OString sAction, sTarget; + OString sAction; + OUString sTarget; char *id; if (g_menu_model_get_item_attribute(pMenuModel, i, "action", "s", &id)) { @@ -5451,7 +5452,7 @@ public: if (g_menu_model_get_item_attribute(pMenuModel, i, "target", "s", &id)) { - sTarget = OString(id); + sTarget = OStringToOUString(id, RTL_TEXTENCODING_UTF8); g_free(id); } @@ -5517,7 +5518,7 @@ public: if (eCheckRadioFalse == TRISTATE_FALSE) gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(pItem), true); - ::set_buildable_id(GTK_BUILDABLE(pItem), OUStringToOString(rId, RTL_TEXTENCODING_UTF8)); + ::set_buildable_id(GTK_BUILDABLE(pItem), rId); gtk_menu_shell_append(GTK_MENU_SHELL(m_pMenu), pItem); gtk_widget_show(pItem); add_to_map(GTK_MENU_ITEM(pItem)); @@ -5551,7 +5552,7 @@ public: { #if !GTK_CHECK_VERSION(4, 0, 0) GtkWidget* pItem = gtk_separator_menu_item_new(); - ::set_buildable_id(GTK_BUILDABLE(pItem), OUStringToOString(rId, RTL_TEXTENCODING_UTF8)); + ::set_buildable_id(GTK_BUILDABLE(pItem), rId); gtk_menu_shell_append(GTK_MENU_SHELL(m_pMenu), pItem); gtk_widget_show(pItem); add_to_map(GTK_MENU_ITEM(pItem)); @@ -5590,7 +5591,7 @@ public: #endif } - void remove_item(const OString& rIdent) + void remove_item(const OUString& rIdent) { #if !GTK_CHECK_VERSION(4, 0, 0) GtkMenuItem* pMenuItem = m_aMap[rIdent]; @@ -5607,7 +5608,7 @@ public: #endif } - void set_item_sensitive(const OString& rIdent, bool bSensitive) + void set_item_sensitive(const OUString& rIdent, bool bSensitive) { #if GTK_CHECK_VERSION(4, 0, 0) GActionGroup* pActionGroup = m_aHiddenIds.find(rIdent) == m_aHiddenIds.end() ? m_pActionGroup : m_pHiddenActionGroup; @@ -5618,7 +5619,7 @@ public: #endif } - bool get_item_sensitive(const OString& rIdent) const + bool get_item_sensitive(const OUString& rIdent) const { #if GTK_CHECK_VERSION(4, 0, 0) GActionGroup* pActionGroup = m_aHiddenIds.find(rIdent) == m_aHiddenIds.end() ? m_pActionGroup : m_pHiddenActionGroup; @@ -5629,7 +5630,7 @@ public: #endif } - void set_item_active(const OString& rIdent, bool bActive) + void set_item_active(const OUString& rIdent, bool bActive) { #if !GTK_CHECK_VERSION(4, 0, 0) disable_item_notify_events(); @@ -5638,11 +5639,11 @@ public: #else GActionGroup* pActionGroup = m_aHiddenIds.find(rIdent) == m_aHiddenIds.end() ? m_pActionGroup : m_pHiddenActionGroup; g_action_group_change_action_state(pActionGroup, m_aIdToAction[rIdent].getStr(), - g_variant_new_string(bActive ? rIdent.getStr() : "'none'")); + g_variant_new_string(bActive ? OUStringToOString(rIdent, RTL_TEXTENCODING_UTF8).getStr() : "'none'")); #endif } - bool get_item_active(const OString& rIdent) const + bool get_item_active(const OUString& rIdent) const { #if !GTK_CHECK_VERSION(4, 0, 0) return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(m_aMap.find(rIdent)->second)); @@ -5658,7 +5659,7 @@ public: #endif } - void set_item_label(const OString& rIdent, const OUString& rText) + void set_item_label(const OUString& rIdent, const OUString& rText) { #if !GTK_CHECK_VERSION(4, 0, 0) gtk_menu_item_set_label(m_aMap[rIdent], MapToGtkAccelerator(rText).getStr()); @@ -5679,7 +5680,7 @@ public: #endif } - OUString get_item_label(const OString& rIdent) const + OUString get_item_label(const OUString& rIdent) const { #if !GTK_CHECK_VERSION(4, 0, 0) const gchar* pText = gtk_menu_item_get_label(m_aMap.find(rIdent)->second); @@ -5704,7 +5705,7 @@ public: #endif } - void set_item_visible(const OString& rIdent, bool bShow) + void set_item_visible(const OUString& rIdent, bool bShow) { #if !GTK_CHECK_VERSION(4, 0, 0) GtkWidget* pWidget = GTK_WIDGET(m_aMap[rIdent]); @@ -5734,23 +5735,23 @@ public: #endif } - OString get_item_id(int pos) const + OUString get_item_id(int pos) const { #if !GTK_CHECK_VERSION(4, 0, 0) GList* pChildren = gtk_container_get_children(GTK_CONTAINER(m_pMenu)); gpointer pMenuItem = g_list_nth_data(pChildren, pos); - OString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem)); + OUString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem)); g_list_free(pChildren); return id; #else - OString sTarget; + OUString sTarget; if (GMenuModel* pMenuModel = m_pMenu ? gtk_popover_menu_get_menu_model(m_pMenu) : nullptr) { auto aSectionAndPos = get_section_and_pos_for(pMenuModel, pos); char *id; if (g_menu_model_get_item_attribute(aSectionAndPos.first, aSectionAndPos.second, "target", "s", &id)) { - sTarget = OString(id); + sTarget = OStringToOUString(id, RTL_TEXTENCODING_UTF8); g_free(id); } } @@ -6468,7 +6469,7 @@ public: #endif } - virtual void set_window_state(const OString& rStr) override + virtual void set_window_state(const OUString& rStr) override { const vcl::WindowData aData(rStr); const auto nMask = aData.mask(); @@ -6494,7 +6495,7 @@ public: #endif } - virtual OString get_window_state(vcl::WindowDataMask nMask) const override + virtual OUString get_window_state(vcl::WindowDataMask nMask) const override { bool bPositioningAllowed = isPositioningAllowed(); @@ -7142,7 +7143,7 @@ public: virtual void response(int nResponse) override; - virtual void add_button(const OUString& rText, int nResponse, const OString& rHelpId) override + virtual void add_button(const OUString& rText, int nResponse, const OUString& rHelpId) override { GtkWidget* pWidget = gtk_dialog_add_button(GTK_DIALOG(m_pDialog), MapToGtkAccelerator(rText).getStr(), VclToGtk(nResponse)); if (!rHelpId.isEmpty()) @@ -7386,15 +7387,15 @@ private: GtkButton* m_pCancel; gulong m_nButtonPressSignalId; std::vector<std::unique_ptr<GtkInstanceContainer>> m_aPages; - std::map<OString, bool> m_aNotClickable; + std::map<OUString, bool> m_aNotClickable; - int find_page(std::string_view ident) const + int find_page(std::u16string_view ident) const { int nPages = gtk_assistant_get_n_pages(m_pAssistant); for (int i = 0; i < nPages; ++i) { GtkWidget* pPage = gtk_assistant_get_nth_page(m_pAssistant, i); - OString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pPage)); + OUString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pPage)); if (sBuildableName == ident) return i; } @@ -7413,7 +7414,7 @@ private: static void find_sidebar(GtkWidget *pWidget, gpointer user_data) { - OString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pWidget)); + OUString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pWidget)); if (sBuildableName == "sidebar") { GtkWidget **ppSidebar = static_cast<GtkWidget**>(user_data); @@ -7506,7 +7507,7 @@ private: if (nNewCurrentPage != -1 && nNewCurrentPage != get_current_page()) { - OString sIdent = get_page_ident(nNewCurrentPage); + OUString sIdent = get_page_ident(nNewCurrentPage); if (!m_aNotClickable[sIdent] && !signal_jump_page(sIdent)) set_current_page(nNewCurrentPage); } @@ -7655,13 +7656,13 @@ public: return gtk_assistant_get_n_pages(m_pAssistant); } - virtual OString get_page_ident(int nPage) const override + virtual OUString get_page_ident(int nPage) const override { const GtkWidget* pWidget = gtk_assistant_get_nth_page(m_pAssistant, nPage); return ::get_buildable_id(GTK_BUILDABLE(pWidget)); } - virtual OString get_current_page_ident() const override + virtual OUString get_current_page_ident() const override { return get_page_ident(get_current_page()); } @@ -7679,7 +7680,7 @@ public: gtk_window_set_title(GTK_WINDOW(m_pAssistant), sDialogTitle.getStr()); } - virtual void set_current_page(const OString& rIdent) override + virtual void set_current_page(const OUString& rIdent) override { int nPage = find_page(rIdent); if (nPage == -1) @@ -7687,7 +7688,7 @@ public: set_current_page(nPage); } - virtual void set_page_title(const OString& rIdent, const OUString& rTitle) override + virtual void set_page_title(const OUString& rIdent, const OUString& rTitle) override { int nIndex = find_page(rIdent); if (nIndex == -1) @@ -7700,7 +7701,7 @@ public: #endif } - virtual OUString get_page_title(const OString& rIdent) const override + virtual OUString get_page_title(const OUString& rIdent) const override { int nIndex = find_page(rIdent); if (nIndex == -1) @@ -7710,12 +7711,12 @@ public: return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); } - virtual void set_page_sensitive(const OString& rIdent, bool bSensitive) override + virtual void set_page_sensitive(const OUString& rIdent, bool bSensitive) override { m_aNotClickable[rIdent] = !bSensitive; } - virtual void set_page_index(const OString& rIdent, int nNewIndex) override + virtual void set_page_index(const OUString& rIdent, int nNewIndex) override { int nOldIndex = find_page(rIdent); if (nOldIndex == -1) @@ -7741,7 +7742,7 @@ public: g_object_unref(pPage); } - virtual weld::Container* append_page(const OString& rIdent) override + virtual weld::Container* append_page(const OUString& rIdent) override { disable_notify_events(); @@ -7762,7 +7763,7 @@ public: return m_aPages.back().get(); } - virtual void set_page_side_help_id(const OString& rHelpId) override + virtual void set_page_side_help_id(const OUString& rHelpId) override { if (!m_pSidebar) return; @@ -8814,7 +8815,7 @@ private: } if (m_bOverFlowBoxActive) gtk_notebook_set_current_page(m_pOverFlowNotebook, gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1); - OString sNewIdent(get_page_ident(nNewPage)); + OUString sNewIdent(get_page_ident(nNewPage)); if (!m_bInternalPageChange) m_aEnterPageHdl.Call(sNewIdent); } @@ -8831,7 +8832,7 @@ private: int i = nMainPages; while (nOverFlowPages) { - OString sIdent(get_page_ident(m_pOverFlowNotebook, 0)); + OUString sIdent(get_page_ident(m_pOverFlowNotebook, 0)); OUString sLabel(get_tab_label_text(m_pOverFlowNotebook, 0)); remove_page(m_pOverFlowNotebook, sIdent); @@ -8847,7 +8848,7 @@ private: } // remove the dangling placeholder tab page - remove_page(m_pOverFlowNotebook, "useless"); + remove_page(m_pOverFlowNotebook, u"useless"); } // a tab has been selected on the overflow notebook @@ -8881,30 +8882,30 @@ private: enable_notify_events(); // trigger main notebook switch-page callback - OString sNewIdent(get_page_ident(m_pNotebook, nNewPage)); + OUString sNewIdent(get_page_ident(m_pNotebook, nNewPage)); m_aEnterPageHdl.Call(sNewIdent); } - static OString get_page_ident(GtkNotebook *pNotebook, guint nPage) + static OUString get_page_ident(GtkNotebook *pNotebook, guint nPage) { const GtkWidget* pTabWidget = gtk_notebook_get_tab_label(pNotebook, gtk_notebook_get_nth_page(pNotebook, nPage)); return ::get_buildable_id(GTK_BUILDABLE(pTabWidget)); } - static gint get_page_number(GtkNotebook *pNotebook, std::string_view ident) + static gint get_page_number(GtkNotebook *pNotebook, std::u16string_view ident) { gint nPages = gtk_notebook_get_n_pages(pNotebook); for (gint i = 0; i < nPages; ++i) { const GtkWidget* pTabWidget = gtk_notebook_get_tab_label(pNotebook, gtk_notebook_get_nth_page(pNotebook, i)); - OString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pTabWidget)); + OUString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pTabWidget)); if (sBuildableName == ident) return i; } return -1; } - int remove_page(GtkNotebook *pNotebook, std::string_view ident) + int remove_page(GtkNotebook *pNotebook, std::u16string_view ident) { disable_notify_events(); int nPageNumber = get_page_number(pNotebook, ident); @@ -8954,7 +8955,7 @@ private: enable_notify_events(); } - void insert_page(GtkNotebook *pNotebook, const OString& rIdent, const OUString& rLabel, GtkWidget *pChild, int nPos) + void insert_page(GtkNotebook *pNotebook, const OUString& rIdent, const OUString& rLabel, GtkWidget *pChild, int nPos) { disable_notify_events(); @@ -9058,7 +9059,7 @@ private: int nOverFlowPages = m_nStartTabCount; while (nOverFlowPages) { - OString sIdent(get_page_ident(m_pNotebook, 0)); + OUString sIdent(get_page_ident(m_pNotebook, 0)); OUString sLabel(get_tab_label_text(m_pNotebook, 0)); remove_page(m_pNotebook, sIdent); insert_page(m_pOverFlowNotebook, sIdent, sLabel, gtk_grid_new(), -1); @@ -9095,7 +9096,7 @@ private: gtk_widget_set_size_request(GTK_WIDGET(m_pOverFlowNotebook), nWidth, -1); // remove it once we've measured it - remove_page(m_pNotebook, "useless"); + remove_page(m_pNotebook, u"useless"); #if !GTK_CHECK_VERSION(4, 0, 0) gtk_widget_thaw_child_notify(GTK_WIDGET(m_pOverFlowNotebook)); @@ -9266,7 +9267,7 @@ public: return nPage; } - virtual OString get_page_ident(int nPage) const override + virtual OUString get_page_ident(int nPage) const override { auto nMainLen = gtk_notebook_get_n_pages(m_pNotebook); auto nOverFlowLen = m_bOverFlowBoxActive ? gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1 : 0; @@ -9286,13 +9287,13 @@ public: } } - virtual OString get_current_page_ident() const override + virtual OUString get_current_page_ident() const override { const int nPage = get_current_page(); - return nPage != -1 ? get_page_ident(nPage) : OString(); + return nPage != -1 ? get_page_ident(nPage) : OUString(); } - virtual int get_page_index(const OString& rIdent) const override + virtual int get_page_index(const OUString& rIdent) const override { auto nMainIndex = get_page_number(m_pNotebook, rIdent); auto nOverFlowIndex = get_page_number(m_pOverFlowNotebook, rIdent); @@ -9322,7 +9323,7 @@ public: } } - virtual weld::Container* get_page(const OString& rIdent) const override + virtual weld::Container* get_page(const OUString& rIdent) const override { int nPage = get_page_index(rIdent); if (nPage < 0) @@ -9400,7 +9401,7 @@ public: m_bInternalPageChange = bInternalPageChange; } - virtual void set_current_page(const OString& rIdent) override + virtual void set_current_page(const OUString& rIdent) override { gint nPage = get_page_index(rIdent); set_current_page(nPage); @@ -9414,7 +9415,7 @@ public: return nLen; } - virtual OUString get_tab_label_text(const OString& rIdent) const override + virtual OUString get_tab_label_text(const OUString& rIdent) const override { gint nPageNum = get_page_number(m_pNotebook, rIdent); if (nPageNum != -1) @@ -9425,7 +9426,7 @@ public: return OUString(); } - virtual void set_tab_label_text(const OString& rIdent, const OUString& rText) override + virtual void set_tab_label_text(const OUString& rIdent, const OUString& rText) override { gint nPageNum = get_page_number(m_pNotebook, rIdent); if (nPageNum != -1) @@ -9491,7 +9492,7 @@ public: m_nEndTabCount = 0; } - virtual void remove_page(const OString& rIdent) override + virtual void remove_page(const OUString& rIdent) override { if (m_bOverFlowBoxActive) { @@ -9504,7 +9505,7 @@ public: m_aPages.erase(m_aPages.begin() + nPageIndex); } - virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override + virtual void insert_page(const OUString& rIdent, const OUString& rLabel, int nPos) override { if (m_bOverFlowBoxActive) { @@ -10846,7 +10847,7 @@ public: MenuHelper::insert_separator(pos, rId); } - virtual void remove_item(const OString& rId) override + virtual void remove_item(const OUString& rId) override { MenuHelper::remove_item(rId); } @@ -10856,32 +10857,32 @@ public: MenuHelper::clear_items(); } - virtual void set_item_active(const OString& rIdent, bool bActive) override + virtual void set_item_active(const OUString& rIdent, bool bActive) override { MenuHelper::set_item_active(rIdent, bActive); } - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) override + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) override { MenuHelper::set_item_sensitive(rIdent, bSensitive); } - virtual void set_item_label(const OString& rIdent, const OUString& rLabel) override + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) override { MenuHelper::set_item_label(rIdent, rLabel); } - virtual OUString get_item_label(const OString& rIdent) const override + virtual OUString get_item_label(const OUString& rIdent) const override { return MenuHelper::get_item_label(rIdent); } - virtual void set_item_visible(const OString& rIdent, bool bVisible) override + virtual void set_item_visible(const OUString& rIdent, bool bVisible) override { MenuHelper::set_item_visible(rIdent, bVisible); } - virtual void signal_item_activate(const OString& rIdent) override + virtual void signal_item_activate(const OUString& rIdent) override { signal_selected(rIdent); } @@ -11275,7 +11276,7 @@ public: MenuHelper::insert_separator(pos, rId); } - virtual void remove_item(const OString& rId) override + virtual void remove_item(const OUString& rId) override { MenuHelper::remove_item(rId); } @@ -11285,32 +11286,32 @@ public: MenuHelper::clear_items(); } - virtual void set_item_active(const OString& rIdent, bool bActive) override + virtual void set_item_active(const OUString& rIdent, bool bActive) override { MenuHelper::set_item_active(rIdent, bActive); } - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) override + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) override { MenuHelper::set_item_sensitive(rIdent, bSensitive); } - virtual void set_item_label(const OString& rIdent, const OUString& rLabel) override + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) override { MenuHelper::set_item_label(rIdent, rLabel); } - virtual OUString get_item_label(const OString& rIdent) const override + virtual OUString get_item_label(const OUString& rIdent) const override { return MenuHelper::get_item_label(rIdent); } - virtual void set_item_visible(const OString& rIdent, bool bVisible) override + virtual void set_item_visible(const OUString& rIdent, bool bVisible) override { MenuHelper::set_item_visible(rIdent, bVisible); } - virtual void signal_item_activate(const OString& rIdent) override + virtual void signal_item_activate(const OUString& rIdent) override { signal_selected(rIdent); } @@ -11327,13 +11328,13 @@ protected: #if !GTK_CHECK_VERSION(4, 0, 0) std::vector<GtkMenuItem*> m_aExtraItems; #endif - OString m_sActivated; + OUString m_sActivated; #if !GTK_CHECK_VERSION(4, 0, 0) MenuHelper* m_pTopLevelMenuHelper; #endif private: - virtual void signal_item_activate(const OString& rIdent) override + virtual void signal_item_activate(const OUString& rIdent) override { m_sActivated = rIdent; weld::Menu::signal_activate(m_sActivated); @@ -11401,7 +11402,7 @@ public: #endif } - virtual OString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, weld::Placement ePlace) override + virtual OUString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect, weld::Placement ePlace) override { m_sActivated.clear(); @@ -11526,37 +11527,37 @@ public: return m_sActivated; } - virtual void set_sensitive(const OString& rIdent, bool bSensitive) override + virtual void set_sensitive(const OUString& rIdent, bool bSensitive) override { set_item_sensitive(rIdent, bSensitive); } - virtual bool get_sensitive(const OString& rIdent) const override + virtual bool get_sensitive(const OUString& rIdent) const override { return get_item_sensitive(rIdent); } - virtual void set_active(const OString& rIdent, bool bActive) override + virtual void set_active(const OUString& rIdent, bool bActive) override { set_item_active(rIdent, bActive); } - virtual bool get_active(const OString& rIdent) const override + virtual bool get_active(const OUString& rIdent) const override { return get_item_active(rIdent); } - virtual void set_visible(const OString& rIdent, bool bShow) override + virtual void set_visible(const OUString& rIdent, bool bShow) override { set_item_visible(rIdent, bShow); } - virtual void set_label(const OString& rIdent, const OUString& rLabel) override + virtual void set_label(const OUString& rIdent, const OUString& rLabel) override { set_item_label(rIdent, rLabel); } - virtual OUString get_label(const OString& rIdent) const override + virtual OUString get_label(const OUString& rIdent) const override { return get_item_label(rIdent); } @@ -11613,7 +11614,7 @@ public: if (eCheckRadioFalse == TRISTATE_FALSE) gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(pItem), true); - ::set_buildable_id(GTK_BUILDABLE(pItem), OUStringToOString(rId, RTL_TEXTENCODING_UTF8)); + ::set_buildable_id(GTK_BUILDABLE(pItem), rId); gtk_menu_shell_append(GTK_MENU_SHELL(m_pMenu), pItem); gtk_widget_show(pItem); GtkMenuItem* pMenuItem = GTK_MENU_ITEM(pItem); @@ -11651,7 +11652,7 @@ public: #endif } - virtual OString get_id(int pos) const override + virtual OUString get_id(int pos) const override { return get_item_id(pos); } @@ -11661,7 +11662,7 @@ public: return get_n_children(); } - void remove(const OString& rIdent) override + void remove(const OUString& rIdent) override { #if !GTK_CHECK_VERSION(4, 0, 0) if (!m_aExtraItems.empty()) @@ -11819,9 +11820,9 @@ private: #endif GtkCssProvider *m_pMenuButtonProvider; - std::map<OString, GtkWidget*> m_aMap; - std::map<OString, std::unique_ptr<GtkInstanceMenuButton>> m_aMenuButtonMap; - std::map<OString, bool> m_aMirroredMap; + std::map<OUString, GtkWidget*> m_aMap; + std::map<OUString, std::unique_ptr<GtkInstanceMenuButton>> m_aMenuButtonMap; + std::map<OUString, bool> m_aMirroredMap; #if !GTK_CHECK_VERSION(4, 0, 0) // at the time of writing there is no gtk_menu_tool_button_set_popover available @@ -11872,7 +11873,7 @@ private: void add_to_map(GtkWidget* pToolItem, GtkMenuButton* pMenuButton) { - OString id = ::get_buildable_id(GTK_BUILDABLE(pToolItem)); + OUString id = ::get_buildable_id(GTK_BUILDABLE(pToolItem)); m_aMap[id] = pToolItem; if (pMenuButton) { @@ -12089,36 +12090,36 @@ public: } } - virtual void set_item_sensitive(const OString& rIdent, bool bSensitive) override + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) override { disable_item_notify_events(); gtk_widget_set_sensitive(GTK_WIDGET(m_aMap[rIdent]), bSensitive); enable_item_notify_events(); } - virtual bool get_item_sensitive(const OString& rIdent) const override + virtual bool get_item_sensitive(const OUString& rIdent) const override { return gtk_widget_get_sensitive(GTK_WIDGET(m_aMap.find(rIdent)->second)); } - virtual void set_item_visible(const OString& rIdent, bool bVisible) override + virtual void set_item_visible(const OUString& rIdent, bool bVisible) override { disable_item_notify_events(); gtk_widget_set_visible(GTK_WIDGET(m_aMap[rIdent]), bVisible); enable_item_notify_events(); } - virtual void set_item_help_id(const OString& rIdent, const OString& rHelpId) override + virtual void set_item_help_id(const OUString& rIdent, const OUString& rHelpId) override { ::set_help_id(GTK_WIDGET(m_aMap[rIdent]), rHelpId); } - virtual bool get_item_visible(const OString& rIdent) const override + virtual bool get_item_visible(const OUString& rIdent) const override { return gtk_widget_get_visible(GTK_WIDGET(m_aMap.find(rIdent)->second)); } - virtual void set_item_active(const OString& rIdent, bool bActive) override + virtual void set_item_active(const OUString& rIdent, bool bActive) override { disable_item_notify_events(); @@ -12159,7 +12160,7 @@ public: enable_item_notify_events(); } - virtual bool get_item_active(const OString& rIdent) const override + virtual bool get_item_active(const OUString& rIdent) const override { GtkWidget* pToolButton = m_aMap.find(rIdent)->second; @@ -12192,7 +12193,7 @@ public: return false; } - virtual void set_menu_item_active(const OString& rIdent, bool bActive) override + virtual void set_menu_item_active(const OUString& rIdent, bool bActive) override { disable_item_notify_events(); @@ -12203,7 +12204,7 @@ public: enable_item_notify_events(); } - virtual bool get_menu_item_active(const OString& rIdent) const override + virtual bool get_menu_item_active(const OUString& rIdent) const override { auto aFind = m_aMenuButtonMap.find(rIdent); assert (aFind != m_aMenuButtonMap.end()); @@ -12212,13 +12213,12 @@ public: virtual void insert_item(int pos, const OUString& rId) override { - OString sId = OUStringToOString(rId, RTL_TEXTENCODING_UTF8); #if !GTK_CHECK_VERSION(4, 0, 0) - GtkToolItem* pItem = gtk_tool_button_new(nullptr, sId.getStr()); + GtkToolItem* pItem = gtk_tool_button_new(nullptr, OUStringToOString(rId, RTL_TEXTENCODING_UTF8).getStr()); #else GtkWidget* pItem = gtk_button_new(); #endif - ::set_buildable_id(GTK_BUILDABLE(pItem), sId); + ::set_buildable_id(GTK_BUILDABLE(pItem), rId); #if !GTK_CHECK_VERSION(4, 0, 0) gtk_toolbar_insert(m_pToolbar, pItem, pos); #else @@ -12230,13 +12230,12 @@ public: virtual void insert_separator(int pos, const OUString& rId) override { - OString sId = OUStringToOString(rId, RTL_TEXTENCODING_UTF8); #if !GTK_CHECK_VERSION(4, 0, 0) GtkToolItem* pItem = gtk_separator_tool_item_new(); #else GtkWidget* pItem = gtk_separator_new(GTK_ORIENTATION_VERTICAL); #endif - ::set_buildable_id(GTK_BUILDABLE(pItem), sId); + ::set_buildable_id(GTK_BUILDABLE(pItem), rId); #if !GTK_CHECK_VERSION(4, 0, 0) gtk_toolbar_insert(m_pToolbar, pItem, pos); #else @@ -12245,12 +12244,12 @@ public: gtk_widget_show(GTK_WIDGET(pItem)); } - virtual void set_item_popover(const OString& rIdent, weld::Widget* pPopover) override + virtual void set_item_popover(const OUString& rIdent, weld::Widget* pPopover) override { m_aMenuButtonMap[rIdent]->set_popover(pPopover); } - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) override + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) override { m_aMenuButtonMap[rIdent]->set_menu(pMenu); } @@ -12270,15 +12269,15 @@ public: #endif } - virtual OString get_item_ident(int nIndex) const override + virtual OUString get_item_ident(int nIndex) const override { auto* pItem = toolbar_get_nth_item(nIndex); return ::get_buildable_id(GTK_BUILDABLE(pItem)); } - virtual void set_item_ident(int nIndex, const OString& rIdent) override + virtual void set_item_ident(int nIndex, const OUString& rIdent) override { - OString sOldIdent(get_item_ident(nIndex)); + OUString sOldIdent(get_item_ident(nIndex)); m_aMap.erase(m_aMap.find(sOldIdent)); auto* pItem = toolbar_get_nth_item(nIndex); @@ -12311,7 +12310,7 @@ public: #endif } - virtual void set_item_label(const OString& rIdent, const OUString& rLabel) override + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) override { GtkWidget* pItem = m_aMap[rIdent]; #if !GTK_CHECK_VERSION(4, 0, 0) @@ -12325,7 +12324,7 @@ public: #endif } - OUString get_item_label(const OString& rIdent) const override + OUString get_item_label(const OUString& rIdent) const override { #if !GTK_CHECK_VERSION(4, 0, 0) const gchar* pText = gtk_tool_button_get_label(GTK_TOOL_BUTTON(m_aMap.find(rIdent)->second)); @@ -12335,7 +12334,7 @@ public: return OUString(pText, pText ? strlen(pText) : 0, RTL_TEXTENCODING_UTF8); } - virtual void set_item_icon_name(const OString& rIdent, const OUString& rIconName) override + virtual void set_item_icon_name(const OUString& rIdent, const OUString& rIconName) override { GtkWidget* pItem = m_aMap[rIdent]; #if !GTK_CHECK_VERSION(4, 0, 0) @@ -12359,12 +12358,12 @@ public: #endif } - virtual void set_item_image_mirrored(const OString& rIdent, bool bMirrored) override + virtual void set_item_image_mirrored(const OUString& rIdent, bool bMirrored) override { m_aMirroredMap[rIdent] = bMirrored; } - virtual void set_item_image(const OString& rIdent, const css::uno::Reference<css::graphic::XGraphic>& rIcon) override + virtual void set_item_image(const OUString& rIdent, const css::uno::Reference<css::graphic::XGraphic>& rIcon) override { GtkWidget* pItem = m_aMap[rIdent]; auto it = m_aMirroredMap.find(rIdent); @@ -12380,7 +12379,7 @@ public: #endif } - virtual void set_item_image(const OString& rIdent, VirtualDevice* pDevice) override + virtual void set_item_image(const OUString& rIdent, VirtualDevice* pDevice) override { GtkWidget* pItem = m_aMap[rIdent]; #if !GTK_CHECK_VERSION(4, 0, 0) @@ -12412,13 +12411,13 @@ public: gtk_widget_set_tooltip_text(GTK_WIDGET(pItem), OUStringToOString(rTip, RTL_TEXTENCODING_UTF8).getStr()); } - virtual void set_item_tooltip_text(const OString& rIdent, const OUString& rTip) override + virtual void set_item_tooltip_text(const OUString& rIdent, const OUString& rTip) override { GtkWidget* pItem = GTK_WIDGET(m_aMap[rIdent]); gtk_widget_set_tooltip_text(pItem, OUStringToOString(rTip, RTL_TEXTENCODING_UTF8).getStr()); } - virtual OUString get_item_tooltip_text(const OString& rIdent) const override + virtual OUString get_item_tooltip_text(const OUString& rIdent) const override { GtkWidget* pItem = GTK_WIDGET(m_aMap.find(rIdent)->second); const gchar* pStr = gtk_widget_get_tooltip_text(pItem); @@ -19036,7 +19035,7 @@ public: , m_pComboBox(pComboBox) { } - virtual void signal_item_activate(const OString& /*rIdent*/) override + virtual void signal_item_activate(const OUString& /*rIdent*/) override { gtk_toggle_button_set_active(m_pComboBox, false); } @@ -19062,11 +19061,11 @@ gboolean signalTooltipQuery(GtkWidget* pWidget, gint /*x*/, gint /*y*/, #endif // fallback to the mechanism which needs help installed - OString sHelpId = ::get_help_id(pWidget); + OUString sHelpId = ::get_help_id(pWidget); Help* pHelp = !sHelpId.isEmpty() ? Application::GetHelp() : nullptr; if (pHelp) { - OUString sHelpText = pHelp->GetHelpText(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), static_cast<weld::Widget*>(nullptr)); + OUString sHelpText = pHelp->GetHelpText(sHelpId, static_cast<weld::Widget*>(nullptr)); if (!sHelpText.isEmpty()) { gtk_tooltip_set_text(tooltip, OUStringToOString(sHelpText, RTL_TEXTENCODING_UTF8).getStr()); @@ -20756,7 +20755,7 @@ public: return create_virtual_device(); } - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) override + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) override { #if 0 m_xCustomMenuButtonHelper.reset(); @@ -20767,7 +20766,7 @@ public: gtk_widget_queue_resize_no_redraw(GTK_WIDGET(m_pOverlayButton)); // force location recalc if (pMenuWidget) m_xCustomMenuButtonHelper.reset(new CustomRenderMenuButtonHelper(GTK_MENU(pMenuWidget), GTK_TOGGLE_BUTTON(m_pToggleButton))); - m_sMenuButtonRow = OUString::fromUtf8(rIdent); + m_sMenuButtonRow = rIdent; #else (void)rIdent; (void)pMenu; #endif @@ -22565,7 +22564,7 @@ public: return create_virtual_device(); } - virtual void set_item_menu(const OString& rIdent, weld::Menu* pMenu) override + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) override { m_xCustomMenuButtonHelper.reset(); GtkInstanceMenu* pPopoverWidget = dynamic_cast<GtkInstanceMenu*>(pMenu); @@ -22575,7 +22574,7 @@ public: gtk_widget_queue_resize_no_redraw(GTK_WIDGET(m_pOverlayButton)); // force location recalc if (pMenuWidget) m_xCustomMenuButtonHelper.reset(new CustomRenderMenuButtonHelper(GTK_MENU(pMenuWidget), GTK_TOGGLE_BUTTON(m_pToggleButton))); - m_sMenuButtonRow = OUString::fromUtf8(rIdent); + m_sMenuButtonRow = rIdent; } OUString get_mru_entries() const override @@ -23004,7 +23003,7 @@ public: assert(false && "not implemented"); } - virtual void set_item_menu(const OString&, weld::Menu*) override + virtual void set_item_menu(const OUString&, weld::Menu*) override { assert(false && "not implemented"); } @@ -23559,7 +23558,7 @@ class GtkInstanceBuilder : public weld::Builder { private: ResHookProc m_pStringReplace; - OString m_aUtf8HelpRoot; + OUString m_aHelpRoot; OUString m_aIconTheme; OUString m_aUILang; GtkBuilder* m_pBuilder; @@ -23683,10 +23682,10 @@ private: #endif //set helpids - OString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pWidget)); + OUString sBuildableName = ::get_buildable_id(GTK_BUILDABLE(pWidget)); if (!sBuildableName.isEmpty()) { - OString sHelpId = m_aUtf8HelpRoot + sBuildableName; + OUString sHelpId = m_aHelpRoot + sBuildableName; set_help_id(pWidget, sHelpId); //hook up for extended help const ImplSVHelpData& aHelpData = ImplGetSVHelpData(); @@ -23891,7 +23890,7 @@ public: if (nIdx != -1) sHelpRoot = sHelpRoot.copy(0, nIdx); sHelpRoot += "/"; - m_aUtf8HelpRoot = OUStringToOString(sHelpRoot, RTL_TEXTENCODING_UTF8); + m_aHelpRoot = sHelpRoot; m_aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); m_aUILang = Application::GetSettings().GetUILanguageTag().getBcp47(); @@ -23966,9 +23965,9 @@ public: m_aMnemonicButtons.clear(); } - OString get_current_page_help_id() + OUString get_current_page_help_id() { - OString sPageHelpId; + OUString sPageHelpId; // check to see if there is a notebook called tabcontrol and get the // helpid for the current page of that std::unique_ptr<weld::Notebook> xNotebook(weld_notebook("tabcontrol")); @@ -24014,18 +24013,18 @@ public: #endif } - virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OString &id) override + virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OUString &id) override { - GtkMessageDialog* pMessageDialog = GTK_MESSAGE_DIALOG(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkMessageDialog* pMessageDialog = GTK_MESSAGE_DIALOG(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pMessageDialog) return nullptr; gtk_window_set_transient_for(GTK_WINDOW(pMessageDialog), GTK_WINDOW(widget_get_toplevel(m_pParentWidget))); return std::make_unique<GtkInstanceMessageDialog>(pMessageDialog, this, true); } - virtual std::unique_ptr<weld::Assistant> weld_assistant(const OString &id) override + virtual std::unique_ptr<weld::Assistant> weld_assistant(const OUString &id) override { - GtkAssistant* pAssistant = GTK_ASSISTANT(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkAssistant* pAssistant = GTK_ASSISTANT(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pAssistant) return nullptr; if (m_pParentWidget) @@ -24033,9 +24032,9 @@ public: return std::make_unique<GtkInstanceAssistant>(pAssistant, this, true); } - virtual std::unique_ptr<weld::Dialog> weld_dialog(const OString &id) override + virtual std::unique_ptr<weld::Dialog> weld_dialog(const OUString &id) override { - GtkWindow* pDialog = GTK_WINDOW(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkWindow* pDialog = GTK_WINDOW(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pDialog) return nullptr; if (m_pParentWidget) @@ -24086,21 +24085,21 @@ public: return std::make_unique<GtkInstanceDialog>(pDialog, this, true); } - virtual std::unique_ptr<weld::Widget> weld_widget(const OString &id) override + virtual std::unique_ptr<weld::Widget> weld_widget(const OUString &id) override { - GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pWidget) return nullptr; auto_add_parentless_widgets_to_container(pWidget); return std::make_unique<GtkInstanceWidget>(pWidget, this, false); } - virtual std::unique_ptr<weld::Container> weld_container(const OString &id) override + virtual std::unique_ptr<weld::Container> weld_container(const OUString &id) override { #if !GTK_CHECK_VERSION(4, 0, 0) - GtkContainer* pContainer = GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkContainer* pContainer = GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #else - GtkWidget* pContainer = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkWidget* pContainer = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #endif if (!pContainer) return nullptr; @@ -24108,72 +24107,72 @@ public: return std::make_unique<GtkInstanceContainer>(pContainer, this, false); } - virtual std::unique_ptr<weld::Box> weld_box(const OString &id) override + virtual std::unique_ptr<weld::Box> weld_box(const OUString &id) override { - GtkBox* pBox = GTK_BOX(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkBox* pBox = GTK_BOX(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pBox) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pBox)); return std::make_unique<GtkInstanceBox>(pBox, this, false); } - virtual std::unique_ptr<weld::Paned> weld_paned(const OString &id) override + virtual std::unique_ptr<weld::Paned> weld_paned(const OUString &id) override { - GtkPaned* pPaned = GTK_PANED(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkPaned* pPaned = GTK_PANED(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pPaned) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pPaned)); return std::make_unique<GtkInstancePaned>(pPaned, this, false); } - virtual std::unique_ptr<weld::Frame> weld_frame(const OString &id) override + virtual std::unique_ptr<weld::Frame> weld_frame(const OUString &id) override { - GtkFrame* pFrame = GTK_FRAME(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkFrame* pFrame = GTK_FRAME(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pFrame) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pFrame)); return std::make_unique<GtkInstanceFrame>(pFrame, this, false); } - virtual std::unique_ptr<weld::ScrolledWindow> weld_scrolled_window(const OString &id, bool bUserManagedScrolling = false) override + virtual std::unique_ptr<weld::ScrolledWindow> weld_scrolled_window(const OUString &id, bool bUserManagedScrolling = false) override { - GtkScrolledWindow* pScrolledWindow = GTK_SCROLLED_WINDOW(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkScrolledWindow* pScrolledWindow = GTK_SCROLLED_WINDOW(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pScrolledWindow) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pScrolledWindow)); return std::make_unique<GtkInstanceScrolledWindow>(pScrolledWindow, this, false, bUserManagedScrolling); } - virtual std::unique_ptr<weld::Notebook> weld_notebook(const OString &id) override + virtual std::unique_ptr<weld::Notebook> weld_notebook(const OUString &id) override { - GtkNotebook* pNotebook = GTK_NOTEBOOK(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkNotebook* pNotebook = GTK_NOTEBOOK(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pNotebook) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pNotebook)); return std::make_unique<GtkInstanceNotebook>(pNotebook, this, false); } - virtual std::unique_ptr<weld::Button> weld_button(const OString &id) override + virtual std::unique_ptr<weld::Button> weld_button(const OUString &id) override { - GtkButton* pButton = GTK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkButton* pButton = GTK_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton)); return std::make_unique<GtkInstanceButton>(pButton, this, false); } - virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OString &id) override + virtual std::unique_ptr<weld::MenuButton> weld_menu_button(const OUString &id) override { - GtkMenuButton* pButton = GTK_MENU_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkMenuButton* pButton = GTK_MENU_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton)); return std::make_unique<GtkInstanceMenuButton>(pButton, nullptr, this, false); } - virtual std::unique_ptr<weld::MenuToggleButton> weld_menu_toggle_button(const OString &id) override + virtual std::unique_ptr<weld::MenuToggleButton> weld_menu_toggle_button(const OUString &id) override { - GtkMenuButton* pButton = GTK_MENU_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkMenuButton* pButton = GTK_MENU_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton)); @@ -24182,30 +24181,30 @@ public: return std::make_unique<GtkInstanceMenuToggleButton>(pMenuToggleButton, pButton, this, false); } - virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OString &id) override + virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OUString &id) override { - GtkLinkButton* pButton = GTK_LINK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkLinkButton* pButton = GTK_LINK_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton)); return std::make_unique<GtkInstanceLinkButton>(pButton, this, false); } - virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OString &id) override + virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OUString &id) override { - GtkToggleButton* pToggleButton = GTK_TOGGLE_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkToggleButton* pToggleButton = GTK_TOGGLE_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pToggleButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pToggleButton)); return std::make_unique<GtkInstanceToggleButton>(pToggleButton, this, false); } - virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OString &id) override + virtual std::unique_ptr<weld::RadioButton> weld_radio_button(const OUString &id) override { #if GTK_CHECK_VERSION(4, 0, 0) - GtkCheckButton* pRadioButton = GTK_CHECK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkCheckButton* pRadioButton = GTK_CHECK_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #else - GtkRadioButton* pRadioButton = GTK_RADIO_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkRadioButton* pRadioButton = GTK_RADIO_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #endif if (!pRadioButton) return nullptr; @@ -24213,45 +24212,45 @@ public: return std::make_unique<GtkInstanceRadioButton>(pRadioButton, this, false); } - virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OString &id) override + virtual std::unique_ptr<weld::CheckButton> weld_check_button(const OUString &id) override { - GtkCheckButton* pCheckButton = GTK_CHECK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkCheckButton* pCheckButton = GTK_CHECK_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pCheckButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pCheckButton)); return std::make_unique<GtkInstanceCheckButton>(pCheckButton, this, false); } - virtual std::unique_ptr<weld::Scale> weld_scale(const OString &id) override + virtual std::unique_ptr<weld::Scale> weld_scale(const OUString &id) override { - GtkScale* pScale = GTK_SCALE(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkScale* pScale = GTK_SCALE(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pScale) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pScale)); return std::make_unique<GtkInstanceScale>(pScale, this, false); } - virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OString &id) override + virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OUString &id) override { - GtkProgressBar* pProgressBar = GTK_PROGRESS_BAR(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkProgressBar* pProgressBar = GTK_PROGRESS_BAR(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pProgressBar) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pProgressBar)); return std::make_unique<GtkInstanceProgressBar>(pProgressBar, this, false); } - virtual std::unique_ptr<weld::Spinner> weld_spinner(const OString &id) override + virtual std::unique_ptr<weld::Spinner> weld_spinner(const OUString &id) override { - GtkSpinner* pSpinner = GTK_SPINNER(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkSpinner* pSpinner = GTK_SPINNER(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pSpinner) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinner)); return std::make_unique<GtkInstanceSpinner>(pSpinner, this, false); } - virtual std::unique_ptr<weld::Image> weld_image(const OString &id) override + virtual std::unique_ptr<weld::Image> weld_image(const OUString &id) override { - GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pWidget) return nullptr; if (GTK_IS_IMAGE(pWidget)) @@ -24269,50 +24268,50 @@ public: return nullptr; } - virtual std::unique_ptr<weld::Calendar> weld_calendar(const OString &id) override + virtual std::unique_ptr<weld::Calendar> weld_calendar(const OUString &id) override { - GtkCalendar* pCalendar = GTK_CALENDAR(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkCalendar* pCalendar = GTK_CALENDAR(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pCalendar) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pCalendar)); return std::make_unique<GtkInstanceCalendar>(pCalendar, this, false); } - virtual std::unique_ptr<weld::Entry> weld_entry(const OString &id) override + virtual std::unique_ptr<weld::Entry> weld_entry(const OUString &id) override { - GtkEntry* pEntry = GTK_ENTRY(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkEntry* pEntry = GTK_ENTRY(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pEntry) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pEntry)); return std::make_unique<GtkInstanceEntry>(pEntry, this, false); } - virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OString &id) override + virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OUString &id) override { - GtkSpinButton* pSpinButton = GTK_SPIN_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkSpinButton* pSpinButton = GTK_SPIN_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pSpinButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinButton)); return std::make_unique<GtkInstanceSpinButton>(pSpinButton, this, false); } - virtual std::unique_ptr<weld::MetricSpinButton> weld_metric_spin_button(const OString& id, FieldUnit eUnit) override + virtual std::unique_ptr<weld::MetricSpinButton> weld_metric_spin_button(const OUString& id, FieldUnit eUnit) override { return std::make_unique<weld::MetricSpinButton>(weld_spin_button(id), eUnit); } - virtual std::unique_ptr<weld::FormattedSpinButton> weld_formatted_spin_button(const OString &id) override + virtual std::unique_ptr<weld::FormattedSpinButton> weld_formatted_spin_button(const OUString &id) override { - GtkSpinButton* pSpinButton = GTK_SPIN_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkSpinButton* pSpinButton = GTK_SPIN_BUTTON(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pSpinButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinButton)); return std::make_unique<GtkInstanceFormattedSpinButton>(pSpinButton, this, false); } - virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OString &id) override + virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OUString &id) override { - GtkComboBox* pComboBox = GTK_COMBO_BOX(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkComboBox* pComboBox = GTK_COMBO_BOX(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pComboBox) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pComboBox)); @@ -24352,30 +24351,30 @@ public: #endif } - virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OString &id) override + virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OUString &id) override { - GtkTreeView* pTreeView = GTK_TREE_VIEW(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkTreeView* pTreeView = GTK_TREE_VIEW(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pTreeView) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pTreeView)); return std::make_unique<GtkInstanceTreeView>(pTreeView, this, false); } - virtual std::unique_ptr<weld::IconView> weld_icon_view(const OString &id) override + virtual std::unique_ptr<weld::IconView> weld_icon_view(const OUString &id) override { - GtkIconView* pIconView = GTK_ICON_VIEW(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkIconView* pIconView = GTK_ICON_VIEW(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pIconView) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pIconView)); return std::make_unique<GtkInstanceIconView>(pIconView, this, false); } - virtual std::unique_ptr<weld::EntryTreeView> weld_entry_tree_view(const OString& containerid, const OString& entryid, const OString& treeviewid) override + virtual std::unique_ptr<weld::EntryTreeView> weld_entry_tree_view(const OUString& containerid, const OUString& entryid, const OUString& treeviewid) override { #if GTK_CHECK_VERSION(4, 0, 0) - GtkWidget* pContainer = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, containerid.getStr())); + GtkWidget* pContainer = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, OUStringToOString(containerid, RTL_TEXTENCODING_UTF8).getStr())); #else - GtkContainer* pContainer = GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, containerid.getStr())); + GtkContainer* pContainer = GTK_CONTAINER(gtk_builder_get_object(m_pBuilder, OUStringToOString(containerid, RTL_TEXTENCODING_UTF8).getStr())); #endif if (!pContainer) return nullptr; @@ -24385,58 +24384,58 @@ public: weld_tree_view(treeviewid)); } - virtual std::unique_ptr<weld::Label> weld_label(const OString &id) override + virtual std::unique_ptr<weld::Label> weld_label(const OUString &id) override { - GtkLabel* pLabel = GTK_LABEL(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkLabel* pLabel = GTK_LABEL(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pLabel) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pLabel)); return std::make_unique<GtkInstanceLabel>(pLabel, this, false); } - virtual std::unique_ptr<weld::TextView> weld_text_view(const OString &id) override + virtual std::unique_ptr<weld::TextView> weld_text_view(const OUString &id) override { - GtkTextView* pTextView = GTK_TEXT_VIEW(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkTextView* pTextView = GTK_TEXT_VIEW(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pTextView) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pTextView)); return std::make_unique<GtkInstanceTextView>(pTextView, this, false); } - virtual std::unique_ptr<weld::Expander> weld_expander(const OString &id) override + virtual std::unique_ptr<weld::Expander> weld_expander(const OUString &id) override { - GtkExpander* pExpander = GTK_EXPANDER(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkExpander* pExpander = GTK_EXPANDER(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pExpander) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pExpander)); return std::make_unique<GtkInstanceExpander>(pExpander, this, false); } - virtual std::unique_ptr<weld::DrawingArea> weld_drawing_area(const OString &id, const a11yref& rA11y, + virtual std::unique_ptr<weld::DrawingArea> weld_drawing_area(const OUString &id, const a11yref& rA11y, FactoryFunction /*pUITestFactoryFunction*/, void* /*pUserData*/) override { - GtkDrawingArea* pDrawingArea = GTK_DRAWING_AREA(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkDrawingArea* pDrawingArea = GTK_DRAWING_AREA(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pDrawingArea) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pDrawingArea)); return std::make_unique<GtkInstanceDrawingArea>(pDrawingArea, this, rA11y, false); } - virtual std::unique_ptr<weld::Menu> weld_menu(const OString &id) override + virtual std::unique_ptr<weld::Menu> weld_menu(const OUString &id) override { #if GTK_CHECK_VERSION(4, 0, 0) - GtkPopoverMenu* pMenu = GTK_POPOVER_MENU(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkPopoverMenu* pMenu = GTK_POPOVER_MENU(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #else - GtkMenu* pMenu = GTK_MENU(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkMenu* pMenu = GTK_MENU(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #endif if (!pMenu) return nullptr; return std::make_unique<GtkInstanceMenu>(pMenu, true); } - virtual std::unique_ptr<weld::Popover> weld_popover(const OString &id) override + virtual std::unique_ptr<weld::Popover> weld_popover(const OUString &id) override { - GtkPopover* pPopover = GTK_POPOVER(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkPopover* pPopover = GTK_POPOVER(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pPopover) return nullptr; #if GTK_CHECK_VERSION(4, 0, 0) @@ -24446,12 +24445,12 @@ public: #endif } - virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OString &id) override + virtual std::unique_ptr<weld::Toolbar> weld_toolbar(const OUString &id) override { #if GTK_CHECK_VERSION(4, 0, 0) - GtkBox* pToolbar = GTK_BOX(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkBox* pToolbar = GTK_BOX(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #else - GtkToolbar* pToolbar = GTK_TOOLBAR(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkToolbar* pToolbar = GTK_TOOLBAR(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); #endif if (!pToolbar) return nullptr; @@ -24459,9 +24458,9 @@ public: return std::make_unique<GtkInstanceToolbar>(pToolbar, this, false); } - virtual std::unique_ptr<weld::Scrollbar> weld_scrollbar(const OString &id) override + virtual std::unique_ptr<weld::Scrollbar> weld_scrollbar(const OUString &id) override { - GtkScrollbar* pScrollbar = GTK_SCROLLBAR(gtk_builder_get_object(m_pBuilder, id.getStr())); + GtkScrollbar* pScrollbar = GTK_SCROLLBAR(gtk_builder_get_object(m_pBuilder, OUStringToOString(id, RTL_TEXTENCODING_UTF8).getStr())); if (!pScrollbar) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pScrollbar)); @@ -24482,7 +24481,7 @@ void GtkInstanceWindow::help() GtkWidget* pWidget = gtk_window_get_focus(m_pWindow); if (!pWidget) pWidget = GTK_WIDGET(m_pWindow); - OString sHelpId = ::get_help_id(pWidget); + OUString sHelpId = ::get_help_id(pWidget); while (sHelpId.isEmpty()) { pWidget = gtk_widget_get_parent(pWidget); @@ -24507,7 +24506,7 @@ void GtkInstanceWindow::help() // was the original id if (m_pBuilder && sHelpId.endsWith("/help")) { - OString sPageId = m_pBuilder->get_current_page_help_id(); + OUString sPageId = m_pBuilder->get_current_page_help_id(); if (!sPageId.isEmpty()) sHelpId = sPageId; else @@ -24531,12 +24530,12 @@ void GtkInstanceWindow::help() } } #endif - pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), pSource); + pHelp->Start(sHelpId, pSource); } //iterate upwards through the hierarchy from this widgets through its parents //calling func with their helpid until func returns true or we run out of parents -void GtkInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OString&)>& func) +void GtkInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) { GtkWidget* pParent = m_pWidget; while ((pParent = gtk_widget_get_parent(pParent))) @@ -24570,7 +24569,7 @@ gboolean GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, G GtkWidget* pWidget = gtk_window_get_focus(pWindow); if (!pWidget) pWidget = GTK_WIDGET(pWindow); - OString sHelpId = ::get_help_id(pWidget); + OUString sHelpId = ::get_help_id(pWidget); while (sHelpId.isEmpty()) { pWidget = gtk_widget_get_parent(pWidget); @@ -24596,14 +24595,14 @@ gboolean GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, G } if (!pChildWindow) return true; - pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), pChildWindow); + pHelp->Start(sHelpId, pChildWindow); return true; } if (!pWidget) return true; std::unique_ptr<weld::Widget> xTemp(new GtkInstanceWidget(pWidget, nullptr, false)); - pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), xTemp.get()); + pHelp->Start(sHelpId, xTemp.get()); return true; } #endif diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx index b03db5fa6cf6..a85bffa79c6e 100644 --- a/vcl/unx/gtk3/gtksalmenu.cxx +++ b/vcl/unx/gtk3/gtksalmenu.cxx @@ -797,7 +797,7 @@ namespace static void MenuButtonClicked(GtkWidget* pWidget, gpointer pMenu) { - OString aId(get_buildable_id(GTK_BUILDABLE(pWidget))); + OUString aId(get_buildable_id(GTK_BUILDABLE(pWidget))); static_cast<MenuBar*>(pMenu)->HandleMenuButtonEvent(aId.toUInt32()); } @@ -835,7 +835,7 @@ bool GtkSalMenu::AddMenuBarButton(const SalMenuButtonItem& rNewItem) maExtraButtons.emplace_back(rNewItem.mnId, pButton); - set_buildable_id(GTK_BUILDABLE(pButton), OString::number(rNewItem.mnId).getStr()); + set_buildable_id(GTK_BUILDABLE(pButton), OUString::number(rNewItem.mnId)); gtk_widget_set_tooltip_text(pButton, rNewItem.maToolTipText.toUtf8().getStr()); diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx index 272df9a5f74c..16c7403bb261 100644 --- a/vcl/unx/gtk4/convert3to4.cxx +++ b/vcl/unx/gtk4/convert3to4.cxx @@ -24,8 +24,8 @@ typedef std::pair<css::uno::Reference<css::xml::dom::XNode>, OUString> named_nod bool sortButtonNodes(const named_node& rA, const named_node& rB) { - OString sA(rA.second.toUtf8()); - OString sB(rB.second.toUtf8()); + OUString sA(rA.second); + OUString sB(rB.second); //order within groups according to platform rules return getButtonPriority(sA) < getButtonPriority(sB); } diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index 8aeb5f3368ff..2db66ddba2db 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -52,7 +52,7 @@ private: std::unique_ptr<CertificateViewerDetailsTP> mxDetailsPage; std::unique_ptr<CertificateViewerCertPathTP> mxPathId; - DECL_LINK(ActivatePageHdl, const OString&, void); + DECL_LINK(ActivatePageHdl, const OUString&, void); public: CertificateViewer(weld::Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey, CertificateChooser* pParentChooser); @@ -68,7 +68,7 @@ protected: public: CertificateViewerTP(weld::Container* pParent, const OUString& rUIXMLDescription, - const OString& rID, CertificateViewer* pDlg); + const OUString& rID, CertificateViewer* pDlg); }; class CertificateViewerGeneralTP : public CertificateViewerTP diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 52c45ecb3743..5d9feb94c808 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -40,7 +40,7 @@ private: std::unique_ptr<MacroSecurityTP> m_xLevelTP; std::unique_ptr<MacroSecurityTP> m_xTrustSrcTP; - DECL_LINK(ActivatePageHdl, const OString&, void); + DECL_LINK(ActivatePageHdl, const OUString&, void); DECL_LINK(OkBtnHdl, weld::Button&, void); public: MacroSecurity(weld::Window* pParent, @@ -61,7 +61,7 @@ protected: MacroSecurity* m_pDlg; public: MacroSecurityTP(weld::Container* pParent, const OUString& rUIXMLDescription, - const OString& rID, MacroSecurity* pDlg); + const OUString& rID, MacroSecurity* pDlg); virtual ~MacroSecurityTP(); virtual void ActivatePage(); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 1801cdf53192..62de673c00e4 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -68,14 +68,14 @@ CertificateViewer::CertificateViewer(weld::Window* _pParent, mxTabCtrl->set_current_page("general"); } -IMPL_LINK(CertificateViewer, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(CertificateViewer, ActivatePageHdl, const OUString&, rPage, void) { if (rPage == "path") mxPathId->ActivatePage(); } CertificateViewerTP::CertificateViewerTP(weld::Container* pParent, const OUString& rUIXMLDescription, - const OString& rID, CertificateViewer* pDlg) + const OUString& rID, CertificateViewer* pDlg) : mxBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) , mxContainer(mxBuilder->weld_container(rID)) , mpDlg(pDlg) diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index f3012dae2eef..ca4df4e64c03 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -71,7 +71,7 @@ MacroSecurity::MacroSecurity(weld::Window* pParent, m_xOkBtn->connect_clicked(LINK(this, MacroSecurity, OkBtnHdl)); } -IMPL_LINK(MacroSecurity, ActivatePageHdl, const OString&, rPage, void) +IMPL_LINK(MacroSecurity, ActivatePageHdl, const OUString&, rPage, void) { if (rPage == "SecurityLevelPage") m_xLevelTP->ActivatePage(); @@ -80,7 +80,7 @@ IMPL_LINK(MacroSecurity, ActivatePageHdl, const OString&, rPage, void) } MacroSecurityTP::MacroSecurityTP(weld::Container* pParent, const OUString& rUIXMLDescription, - const OString& rID, MacroSecurity* pDlg) + const OUString& rID, MacroSecurity* pDlg) : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) , m_xContainer(m_xBuilder->weld_container(rID)) , m_pDlg(pDlg) |