diff options
Diffstat (limited to 'extensions/source/propctrlr/propertyeditor.cxx')
| -rw-r--r-- | extensions/source/propctrlr/propertyeditor.cxx | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 3c94a3a24bf3..f6f1c1fe5f29 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -23,6 +23,7 @@ #include "linedescriptor.hxx" #include <tools/debug.hxx> +#include <utility> #include <osl/diagnose.h> namespace pcr @@ -32,9 +33,9 @@ namespace pcr using ::com::sun::star::uno::Reference; OPropertyEditor::OPropertyEditor(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder) - : m_xContainer(rBuilder.weld_container("box")) - , m_xTabControl(rBuilder.weld_notebook("tabcontrol")) - , m_xControlHoldingParent(rBuilder.weld_container("controlparent")) // controls initially have this parent before they are moved + : m_xContainer(rBuilder.weld_container(u"box"_ustr)) + , m_xTabControl(rBuilder.weld_notebook(u"tabcontrol"_ustr)) + , m_xControlHoldingParent(rBuilder.weld_container(u"controlparent"_ustr)) // controls initially have this parent before they are moved , m_xContext(rContext) , m_pListener(nullptr) , m_pObserver(nullptr) @@ -64,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); } @@ -115,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 @@ -139,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); } @@ -151,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 @@ -289,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); @@ -346,12 +347,12 @@ namespace pcr return xControl; } - IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate, const OString&, void) + IMPL_LINK(OPropertyEditor, OnPageActivate, const OUString&, rNewPage, void) { - m_aPageActivationHandler.Call(nullptr); + 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) @@ -370,8 +371,8 @@ namespace pcr { } - OPropertyEditor::PropertyPage::PropertyPage(sal_uInt16 nPagePos, const OUString& rLabel, std::unique_ptr<OBrowserPage> pPage) - : nPos(nPagePos), sLabel(rLabel), xPage(std::move(pPage)) + OPropertyEditor::PropertyPage::PropertyPage(sal_uInt16 nPagePos, OUString aLabel, std::unique_ptr<OBrowserPage> pPage) + : nPos(nPagePos), sLabel(std::move(aLabel)), xPage(std::move(pPage)) { } |