sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx | 57 +++++++++---------
sw/source/uibase/sidebar/PageColumnControl.cxx | 24 +++----
sw/source/uibase/sidebar/PageColumnPopup.cxx | 4 -
sw/source/uibase/sidebar/PageFooterPanel.cxx | 14 ++--
sw/source/uibase/sidebar/PageFormatPanel.cxx | 16 ++---
sw/source/uibase/sidebar/PageHeaderPanel.cxx | 16 ++---
sw/source/uibase/sidebar/PageMarginControl.cxx | 44 ++++++-------
sw/source/uibase/sidebar/PageMarginPopup.cxx | 4 -
sw/source/uibase/sidebar/PageOrientationControl.cxx | 8 +-
sw/source/uibase/sidebar/PageOrientationPopup.cxx | 4 -
sw/source/uibase/sidebar/PageSizeControl.cxx | 8 +-
sw/source/uibase/sidebar/PageSizePopup.cxx | 4 -
sw/source/uibase/sidebar/PageStylesPanel.cxx | 24 +++----
sw/source/uibase/sidebar/QuickFindPanel.cxx | 10 +--
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 6 -
sw/source/uibase/sidebar/SwPanelFactory.cxx | 16 ++---
sw/source/uibase/sidebar/TableEditPanel.cxx | 36 +++++------
sw/source/uibase/sidebar/ThemePanel.cxx | 8 +-
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 12 +--
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 33 +++++-----
20 files changed, 175 insertions(+), 173 deletions(-)
New commits:
commit 782f7c23af25187b9205e7ca036cb819834be2df
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 3 14:37:41 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jun 3 19:35:46 2024 +0200
loplugin:ostr in sw/.../sidebar
Change-Id: Ic905099e9b7266998a414416c288fe0db87a618c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168373
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
index 8a41db78f0ac..bf5333ac6456 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
@@ -32,11 +32,11 @@ namespace sw::sidebar
{
AccessibilityCheckEntry::AccessibilityCheckEntry(
weld::Container* pParent, std::shared_ptr<sfx::AccessibilityIssue> const&
rAccessibilityIssue)
- : m_xBuilder(Application::CreateBuilder(pParent,
"svx/ui/accessibilitycheckentry.ui"))
- , m_xContainer(m_xBuilder->weld_container("accessibilityCheckEntryBox"))
- , m_xLabel(m_xBuilder->weld_label("accessibilityCheckEntryLabel"))
- ,
m_xGotoButton(m_xBuilder->weld_link_button("accessibilityCheckEntryLinkButton"))
- , m_xFixButton(m_xBuilder->weld_button("accessibilityCheckEntryFixButton"))
+ : m_xBuilder(Application::CreateBuilder(pParent,
u"svx/ui/accessibilitycheckentry.ui"_ustr))
+ ,
m_xContainer(m_xBuilder->weld_container(u"accessibilityCheckEntryBox"_ustr))
+ , m_xLabel(m_xBuilder->weld_label(u"accessibilityCheckEntryLabel"_ustr))
+ ,
m_xGotoButton(m_xBuilder->weld_link_button(u"accessibilityCheckEntryLinkButton"_ustr))
+ ,
m_xFixButton(m_xBuilder->weld_button(u"accessibilityCheckEntryFixButton"_ustr))
, m_pAccessibilityIssue(rAccessibilityIssue)
{
// lock in the height as including the button so all rows are the same
height
@@ -97,39 +97,40 @@ std::unique_ptr<PanelLayout>
A11yCheckIssuesPanel::Create(weld::Widget* pParent,
{
if (pParent == nullptr)
throw ::com::sun::star::lang::IllegalArgumentException(
- "no parent window given to A11yCheckIssuesPanel::Create", nullptr,
0);
+ u"no parent window given to A11yCheckIssuesPanel::Create"_ustr,
nullptr, 0);
return std::make_unique<A11yCheckIssuesPanel>(pParent, pBindings);
}
A11yCheckIssuesPanel::A11yCheckIssuesPanel(weld::Widget* pParent, SfxBindings*
pBindings)
- : PanelLayout(pParent, "A11yCheckIssuesPanel",
"modules/swriter/ui/a11ycheckissuespanel.ui")
+ : PanelLayout(pParent, u"A11yCheckIssuesPanel"_ustr,
+ u"modules/swriter/ui/a11ycheckissuespanel.ui"_ustr)
, mpBindings(pBindings)
, mpDoc(nullptr)
, maA11yCheckController(FN_STAT_ACCESSIBILITY_CHECK, *pBindings, *this)
, mnIssueCount(0)
, mbAutomaticCheckEnabled(false)
{
- m_xExpanders[0] = m_xBuilder->weld_expander("expand_document");
- m_xExpanders[1] = m_xBuilder->weld_expander("expand_styles");
- m_xExpanders[2] = m_xBuilder->weld_expander("expand_linked");
- m_xExpanders[3] = m_xBuilder->weld_expander("expand_no_alt");
- m_xExpanders[4] = m_xBuilder->weld_expander("expand_table");
- m_xExpanders[5] = m_xBuilder->weld_expander("expand_formatting");
- m_xExpanders[6] = m_xBuilder->weld_expander("expand_hyperlink");
- m_xExpanders[7] = m_xBuilder->weld_expander("expand_fakes");
- m_xExpanders[8] = m_xBuilder->weld_expander("expand_numbering");
- m_xExpanders[9] = m_xBuilder->weld_expander("expand_other");
-
- m_xBoxes[0] = m_xBuilder->weld_box("box_document");
- m_xBoxes[1] = m_xBuilder->weld_box("box_styles");
- m_xBoxes[2] = m_xBuilder->weld_box("box_linked");
- m_xBoxes[3] = m_xBuilder->weld_box("box_no_alt");
- m_xBoxes[4] = m_xBuilder->weld_box("box_table");
- m_xBoxes[5] = m_xBuilder->weld_box("box_formatting");
- m_xBoxes[6] = m_xBuilder->weld_box("box_hyperlink");
- m_xBoxes[7] = m_xBuilder->weld_box("box_fakes");
- m_xBoxes[8] = m_xBuilder->weld_box("box_numbering");
- m_xBoxes[9] = m_xBuilder->weld_box("box_other");
+ m_xExpanders[0] = m_xBuilder->weld_expander(u"expand_document"_ustr);
+ m_xExpanders[1] = m_xBuilder->weld_expander(u"expand_styles"_ustr);
+ m_xExpanders[2] = m_xBuilder->weld_expander(u"expand_linked"_ustr);
+ m_xExpanders[3] = m_xBuilder->weld_expander(u"expand_no_alt"_ustr);
+ m_xExpanders[4] = m_xBuilder->weld_expander(u"expand_table"_ustr);
+ m_xExpanders[5] = m_xBuilder->weld_expander(u"expand_formatting"_ustr);
+ m_xExpanders[6] = m_xBuilder->weld_expander(u"expand_hyperlink"_ustr);
+ m_xExpanders[7] = m_xBuilder->weld_expander(u"expand_fakes"_ustr);
+ m_xExpanders[8] = m_xBuilder->weld_expander(u"expand_numbering"_ustr);
+ m_xExpanders[9] = m_xBuilder->weld_expander(u"expand_other"_ustr);
+
+ m_xBoxes[0] = m_xBuilder->weld_box(u"box_document"_ustr);
+ m_xBoxes[1] = m_xBuilder->weld_box(u"box_styles"_ustr);
+ m_xBoxes[2] = m_xBuilder->weld_box(u"box_linked"_ustr);
+ m_xBoxes[3] = m_xBuilder->weld_box(u"box_no_alt"_ustr);
+ m_xBoxes[4] = m_xBuilder->weld_box(u"box_table"_ustr);
+ m_xBoxes[5] = m_xBuilder->weld_box(u"box_formatting"_ustr);
+ m_xBoxes[6] = m_xBuilder->weld_box(u"box_hyperlink"_ustr);
+ m_xBoxes[7] = m_xBuilder->weld_box(u"box_fakes"_ustr);
+ m_xBoxes[8] = m_xBuilder->weld_box(u"box_numbering"_ustr);
+ m_xBoxes[9] = m_xBuilder->weld_box(u"box_other"_ustr);
SwDocShell* pDocSh = dynamic_cast<SwDocShell*>(SfxObjectShell::Current());
if (!pDocSh)
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx
b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 6afb22a81928..af84a767fff8 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -32,8 +32,8 @@
namespace sw::sidebar {
PageColumnControl::PageColumnControl(PageColumnPopup* pControl, weld::Widget*
pParent)
- : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pagecolumncontrol.ui", "PageColumnControl")
- , m_xMoreButton(m_xBuilder->weld_button("moreoptions"))
+ : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
u"modules/swriter/ui/pagecolumncontrol.ui"_ustr, u"PageColumnControl"_ustr)
+ , m_xMoreButton(m_xBuilder->weld_button(u"moreoptions"_ustr))
, m_xControl(pControl)
{
bool bLandscape = false;
@@ -47,19 +47,19 @@ PageColumnControl::PageColumnControl(PageColumnPopup*
pControl, weld::Widget* pP
if ( bLandscape )
{
- m_xOneColumn = m_xBuilder->weld_button("column1L");
- m_xTwoColumns = m_xBuilder->weld_button("column2L");
- m_xThreeColumns = m_xBuilder->weld_button("column3L");
- m_xLeft = m_xBuilder->weld_button("columnleftL");
- m_xRight = m_xBuilder->weld_button("columnrightL");
+ m_xOneColumn = m_xBuilder->weld_button(u"column1L"_ustr);
+ m_xTwoColumns = m_xBuilder->weld_button(u"column2L"_ustr);
+ m_xThreeColumns = m_xBuilder->weld_button(u"column3L"_ustr);
+ m_xLeft = m_xBuilder->weld_button(u"columnleftL"_ustr);
+ m_xRight = m_xBuilder->weld_button(u"columnrightL"_ustr);
}
else
{
- m_xOneColumn = m_xBuilder->weld_button("column1");
- m_xTwoColumns = m_xBuilder->weld_button( "column2");
- m_xThreeColumns = m_xBuilder->weld_button("column3");
- m_xLeft = m_xBuilder->weld_button("columnleft");
- m_xRight = m_xBuilder->weld_button("columnright");
+ m_xOneColumn = m_xBuilder->weld_button(u"column1"_ustr);
+ m_xTwoColumns = m_xBuilder->weld_button( u"column2"_ustr);
+ m_xThreeColumns = m_xBuilder->weld_button(u"column3"_ustr);
+ m_xLeft = m_xBuilder->weld_button(u"columnleft"_ustr);
+ m_xRight = m_xBuilder->weld_button(u"columnright"_ustr);
}
m_xOneColumn->show();
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx
b/sw/source/uibase/sidebar/PageColumnPopup.cxx
index da64a484d342..20c766037cf4 100644
--- a/sw/source/uibase/sidebar/PageColumnPopup.cxx
+++ b/sw/source/uibase/sidebar/PageColumnPopup.cxx
@@ -56,12 +56,12 @@ VclPtr<vcl::Window> PageColumnPopup::createVclPopupWindow(
vcl::Window* pParent
OUString PageColumnPopup::getImplementationName()
{
- return "lo.writer.PageColumnToolBoxControl";
+ return u"lo.writer.PageColumnToolBoxControl"_ustr;
}
css::uno::Sequence<OUString> PageColumnPopup::getSupportedServiceNames()
{
- return { "com.sun.star.frame.ToolbarController" };
+ return { u"com.sun.star.frame.ToolbarController"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx
b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index 1a2f049dcee5..8060f91308f0 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -39,7 +39,7 @@ std::unique_ptr<PanelLayout> PageFooterPanel::Create(
SfxBindings* pBindings)
{
if( pParent == nullptr )
- throw ::com::sun::star::lang::IllegalArgumentException("no parent
window given to PageFooterPanel::Create", nullptr, 0);
+ throw ::com::sun::star::lang::IllegalArgumentException(u"no parent
window given to PageFooterPanel::Create"_ustr, nullptr, 0);
return std::make_unique<PageFooterPanel>(pParent, pBindings);
}
@@ -52,7 +52,7 @@ void PageFooterPanel::SetMarginsAndSpacingFieldUnit()
PageFooterPanel::PageFooterPanel(
weld::Widget* pParent,
SfxBindings* pBindings) :
- PanelLayout(pParent, "PageFooterPanel",
"modules/swriter/ui/pagefooterpanel.ui"),
+ PanelLayout(pParent, u"PageFooterPanel"_ustr,
u"modules/swriter/ui/pagefooterpanel.ui"_ustr),
mpBindings( pBindings ),
maHFToggleController(SID_ATTR_PAGE_FOOTER, *pBindings, *this),
maMetricController(SID_ATTR_METRIC, *pBindings,*this),
@@ -64,11 +64,11 @@ PageFooterPanel::PageFooterPanel(
mpFooterLRMarginItem( new SvxLongLRSpaceItem(0, 0,
SID_ATTR_PAGE_FOOTER_LRMARGIN)),
mpFooterSpacingItem( new SvxLongULSpaceItem(0, 0,
SID_ATTR_PAGE_FOOTER_SPACING)),
mpFooterLayoutItem( new SfxInt16Item(SID_ATTR_PAGE_FOOTER_LAYOUT)),
- mxFooterToggle(m_xBuilder->weld_check_button("footertoggle")),
- mxFooterSpacingLB(m_xBuilder->weld_combo_box("spacingpreset")),
- mxFooterMarginPresetLB(m_xBuilder->weld_combo_box("footermarginpreset")),
- mxFooterLayoutLB(m_xBuilder->weld_combo_box("samecontentLB")),
- mxCustomEntry(m_xBuilder->weld_label("customlabel"))
+ mxFooterToggle(m_xBuilder->weld_check_button(u"footertoggle"_ustr)),
+ mxFooterSpacingLB(m_xBuilder->weld_combo_box(u"spacingpreset"_ustr)),
+
mxFooterMarginPresetLB(m_xBuilder->weld_combo_box(u"footermarginpreset"_ustr)),
+ mxFooterLayoutLB(m_xBuilder->weld_combo_box(u"samecontentLB"_ustr)),
+ mxCustomEntry(m_xBuilder->weld_label(u"customlabel"_ustr))
{
Initialize();
}
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 02e23999fe92..57aa6f03a01b 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -48,7 +48,7 @@ std::unique_ptr<PanelLayout> PageFormatPanel::Create(
SfxBindings* pBindings)
{
if( pParent == nullptr )
- throw ::com::sun::star::lang::IllegalArgumentException("no parent
window given to PageFormatPanel::Create", nullptr, 0);
+ throw ::com::sun::star::lang::IllegalArgumentException(u"no parent
window given to PageFormatPanel::Create"_ustr, nullptr, 0);
return std::make_unique<PageFormatPanel>(pParent, pBindings);
}
@@ -81,14 +81,14 @@ void PageFormatPanel::SetMarginFieldUnit()
}
PageFormatPanel::PageFormatPanel(weld::Widget* pParent, SfxBindings*
pBindings) :
- PanelLayout(pParent, "PageFormatPanel",
"modules/swriter/ui/pageformatpanel.ui"),
+ PanelLayout(pParent, u"PageFormatPanel"_ustr,
u"modules/swriter/ui/pageformatpanel.ui"_ustr),
mpBindings( pBindings ),
- mxPaperSizeBox(new
SvxPaperSizeListBox(m_xBuilder->weld_combo_box("papersize"))),
- mxPaperWidth(new
SvxRelativeField(m_xBuilder->weld_metric_spin_button("paperwidth",
FieldUnit::CM))),
- mxPaperHeight(new
SvxRelativeField(m_xBuilder->weld_metric_spin_button("paperheight",
FieldUnit::CM))),
- mxPaperOrientation(m_xBuilder->weld_combo_box("paperorientation")),
- mxMarginSelectBox(m_xBuilder->weld_combo_box("marginLB")),
- mxCustomEntry(m_xBuilder->weld_label("customlabel")),
+ mxPaperSizeBox(new
SvxPaperSizeListBox(m_xBuilder->weld_combo_box(u"papersize"_ustr))),
+ mxPaperWidth(new
SvxRelativeField(m_xBuilder->weld_metric_spin_button(u"paperwidth"_ustr,
FieldUnit::CM))),
+ mxPaperHeight(new
SvxRelativeField(m_xBuilder->weld_metric_spin_button(u"paperheight"_ustr,
FieldUnit::CM))),
+ mxPaperOrientation(m_xBuilder->weld_combo_box(u"paperorientation"_ustr)),
+ mxMarginSelectBox(m_xBuilder->weld_combo_box(u"marginLB"_ustr)),
+ mxCustomEntry(m_xBuilder->weld_label(u"customlabel"_ustr)),
maPaperSizeController(SID_ATTR_PAGE_SIZE, *pBindings, *this),
maPaperOrientationController(SID_ATTR_PAGE, *pBindings, *this),
maMetricController(SID_ATTR_METRIC, *pBindings,*this),
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index e0706f9c7698..f77799314751 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -39,9 +39,9 @@ std::unique_ptr<PanelLayout> PageHeaderPanel::Create(
SfxBindings* pBindings)
{
if( pParent == nullptr )
- throw ::com::sun::star::lang::IllegalArgumentException("no parent
window given to PageHeaderPanel::Create", nullptr, 0);
+ throw ::com::sun::star::lang::IllegalArgumentException(u"no parent
window given to PageHeaderPanel::Create"_ustr, nullptr, 0);
if( pBindings == nullptr )
- throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings
given to PageHeaderPanel::Create", nullptr, 0);
+ throw ::com::sun::star::lang::IllegalArgumentException(u"no
SfxBindings given to PageHeaderPanel::Create"_ustr, nullptr, 0);
return std::make_unique<PageHeaderPanel>(pParent, pBindings);
}
@@ -56,7 +56,7 @@ PageHeaderPanel::PageHeaderPanel(
weld::Widget* pParent,
SfxBindings* pBindings
) :
- PanelLayout(pParent, "PageHeaderPanel",
"modules/swriter/ui/pageheaderpanel.ui"),
+ PanelLayout(pParent, u"PageHeaderPanel"_ustr,
u"modules/swriter/ui/pageheaderpanel.ui"_ustr),
mpBindings( pBindings ),
maHFToggleController(SID_ATTR_PAGE_HEADER, *pBindings, *this),
maMetricController(SID_ATTR_METRIC, *pBindings,*this),
@@ -68,11 +68,11 @@ PageHeaderPanel::PageHeaderPanel(
mpHeaderLRMarginItem( new SvxLongLRSpaceItem(0, 0,
SID_ATTR_PAGE_HEADER_LRMARGIN)),
mpHeaderSpacingItem( new SvxLongULSpaceItem(0, 0,
SID_ATTR_PAGE_HEADER_SPACING)),
mpHeaderLayoutItem( new SfxInt16Item(SID_ATTR_PAGE_HEADER_LAYOUT)),
- mxHeaderToggle(m_xBuilder->weld_check_button("headertoggle")),
- mxHeaderSpacingLB(m_xBuilder->weld_combo_box("spacingpreset")),
- mxHeaderMarginPresetLB(m_xBuilder->weld_combo_box("headermarginpreset")),
- mxHeaderLayoutLB(m_xBuilder->weld_combo_box("samecontentLB")),
- mxCustomEntry(m_xBuilder->weld_label("customlabel"))
+ mxHeaderToggle(m_xBuilder->weld_check_button(u"headertoggle"_ustr)),
+ mxHeaderSpacingLB(m_xBuilder->weld_combo_box(u"spacingpreset"_ustr)),
+
mxHeaderMarginPresetLB(m_xBuilder->weld_combo_box(u"headermarginpreset"_ustr)),
+ mxHeaderLayoutLB(m_xBuilder->weld_combo_box(u"samecontentLB"_ustr)),
+ mxCustomEntry(m_xBuilder->weld_label(u"customlabel"_ustr))
{
Initialize();
}
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx
b/sw/source/uibase/sidebar/PageMarginControl.cxx
index dde681c60282..6898f73e536b 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -91,17 +91,17 @@ namespace
namespace sw::sidebar {
PageMarginControl::PageMarginControl(PageMarginPopup* pControl, weld::Widget*
pParent)
- : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pagemargincontrol.ui", "PageMarginControl")
- , m_xMoreButton(m_xBuilder->weld_button("moreoptions"))
- , m_xLeft(m_xBuilder->weld_label("leftLabel"))
- , m_xRight(m_xBuilder->weld_label("rightLabel"))
- , m_xInner(m_xBuilder->weld_label("innerLabel"))
- , m_xOuter(m_xBuilder->weld_label("outerLabel"))
- , m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button("left",
FieldUnit::CM))
- , m_xRightMarginEdit(m_xBuilder->weld_metric_spin_button("right",
FieldUnit::CM))
- , m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button("top",
FieldUnit::CM))
- , m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("bottom",
FieldUnit::CM))
- , m_xWidthHeightField(m_xBuilder->weld_metric_spin_button("hidden",
FieldUnit::CM))
+ : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
u"modules/swriter/ui/pagemargincontrol.ui"_ustr, u"PageMarginControl"_ustr)
+ , m_xMoreButton(m_xBuilder->weld_button(u"moreoptions"_ustr))
+ , m_xLeft(m_xBuilder->weld_label(u"leftLabel"_ustr))
+ , m_xRight(m_xBuilder->weld_label(u"rightLabel"_ustr))
+ , m_xInner(m_xBuilder->weld_label(u"innerLabel"_ustr))
+ , m_xOuter(m_xBuilder->weld_label(u"outerLabel"_ustr))
+ , m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button(u"left"_ustr,
FieldUnit::CM))
+ , m_xRightMarginEdit(m_xBuilder->weld_metric_spin_button(u"right"_ustr,
FieldUnit::CM))
+ , m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button(u"top"_ustr,
FieldUnit::CM))
+ , m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button(u"bottom"_ustr,
FieldUnit::CM))
+ , m_xWidthHeightField(m_xBuilder->weld_metric_spin_button(u"hidden"_ustr,
FieldUnit::CM))
, m_xControl(pControl)
, m_nPageLeftMargin(0)
, m_nPageRightMargin(0)
@@ -159,19 +159,19 @@ PageMarginControl::PageMarginControl(PageMarginPopup*
pControl, weld::Widget* pP
if ( bLandscape )
{
- m_xNarrow = m_xBuilder->weld_button("narrowL");
- m_xNormal = m_xBuilder->weld_button("normalL");
- m_xWide = m_xBuilder->weld_button("wideL");
- m_xMirrored = m_xBuilder->weld_button("mirroredL");
- m_xLast = m_xBuilder->weld_button("lastL");
+ m_xNarrow = m_xBuilder->weld_button(u"narrowL"_ustr);
+ m_xNormal = m_xBuilder->weld_button(u"normalL"_ustr);
+ m_xWide = m_xBuilder->weld_button(u"wideL"_ustr);
+ m_xMirrored = m_xBuilder->weld_button(u"mirroredL"_ustr);
+ m_xLast = m_xBuilder->weld_button(u"lastL"_ustr);
}
else
{
- m_xNarrow = m_xBuilder->weld_button("narrow");
- m_xNormal = m_xBuilder->weld_button("normal");
- m_xWide = m_xBuilder->weld_button("wide");
- m_xMirrored = m_xBuilder->weld_button("mirrored");
- m_xLast = m_xBuilder->weld_button("last");
+ m_xNarrow = m_xBuilder->weld_button(u"narrow"_ustr);
+ m_xNormal = m_xBuilder->weld_button(u"normal"_ustr);
+ m_xWide = m_xBuilder->weld_button(u"wide"_ustr);
+ m_xMirrored = m_xBuilder->weld_button(u"mirrored"_ustr);
+ m_xLast = m_xBuilder->weld_button(u"last"_ustr);
}
m_xNarrow->show();
@@ -407,7 +407,7 @@ IMPL_LINK( PageMarginControl, SelectMarginHdl,
weld::Button&, rControl, void )
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
const css::uno::Reference<css::document::XUndoManager>
xUndoManager(pViewFrm ?
getUndoManager(pViewFrm->GetFrame().GetFrameInterface()) : nullptr);
if ( xUndoManager.is() )
- xUndoManager->enterUndoContext( "" );
+ xUndoManager->enterUndoContext( u""_ustr );
ExecuteMarginLRChange( m_nPageLeftMargin, m_nPageRightMargin );
ExecuteMarginULChange( m_nPageTopMargin, m_nPageBottomMargin );
diff --git a/sw/source/uibase/sidebar/PageMarginPopup.cxx
b/sw/source/uibase/sidebar/PageMarginPopup.cxx
index 67f13acc01d8..169d0333ba1a 100644
--- a/sw/source/uibase/sidebar/PageMarginPopup.cxx
+++ b/sw/source/uibase/sidebar/PageMarginPopup.cxx
@@ -56,12 +56,12 @@ VclPtr<vcl::Window> PageMarginPopup::createVclPopupWindow(
vcl::Window* pParent
OUString PageMarginPopup::getImplementationName()
{
- return "lo.writer.PageMarginToolBoxControl";
+ return u"lo.writer.PageMarginToolBoxControl"_ustr;
}
css::uno::Sequence<OUString> PageMarginPopup::getSupportedServiceNames()
{
- return { "com.sun.star.frame.ToolbarController" };
+ return { u"com.sun.star.frame.ToolbarController"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx
b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 6f0a45d2686b..73bdee58a1e6 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -50,9 +50,9 @@ namespace {
namespace sw::sidebar {
PageOrientationControl::PageOrientationControl(PageOrientationPopup* pControl,
weld::Widget* pParent)
- : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pageorientationcontrol.ui", "PageOrientationControl")
- , m_xPortrait(m_xBuilder->weld_button("portrait"))
- , m_xLandscape(m_xBuilder->weld_button("landscape"))
+ : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
u"modules/swriter/ui/pageorientationcontrol.ui"_ustr,
u"PageOrientationControl"_ustr)
+ , m_xPortrait(m_xBuilder->weld_button(u"portrait"_ustr))
+ , m_xLandscape(m_xBuilder->weld_button(u"landscape"_ustr))
, m_xControl(pControl)
, mpPageItem( new SvxPageItem(SID_ATTR_PAGE) )
, mpPageSizeItem( new SvxSizeItem(SID_ATTR_PAGE_SIZE) )
@@ -104,7 +104,7 @@ void PageOrientationControl::ExecuteOrientationChange(
const bool bLandscape )
getUndoManager( pViewFrm->GetFrame().GetFrameInterface() ) );
if ( mxUndoManager.is() )
- mxUndoManager->enterUndoContext( "" );
+ mxUndoManager->enterUndoContext( u""_ustr );
SfxPoolItemHolder aResult;
pViewFrm->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_SIZE,
aResult);
diff --git a/sw/source/uibase/sidebar/PageOrientationPopup.cxx
b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
index ca506c83a6f5..aba10280e628 100644
--- a/sw/source/uibase/sidebar/PageOrientationPopup.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
@@ -56,12 +56,12 @@ VclPtr<vcl::Window>
PageOrientationPopup::createVclPopupWindow( vcl::Window* pPa
OUString PageOrientationPopup::getImplementationName()
{
- return "lo.writer.PageOrientationToolBoxControl";
+ return u"lo.writer.PageOrientationToolBoxControl"_ustr;
}
css::uno::Sequence<OUString> PageOrientationPopup::getSupportedServiceNames()
{
- return { "com.sun.star.frame.ToolbarController" };
+ return { u"com.sun.star.frame.ToolbarController"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx
b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 37ed1835e972..33785c007832 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -68,11 +68,11 @@ namespace
namespace sw::sidebar {
PageSizeControl::PageSizeControl(PageSizePopup* pControl, weld::Widget*
pParent)
- : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pagesizecontrol.ui", "PageSizeControl")
- , mxMoreButton(m_xBuilder->weld_button("moreoptions"))
- , mxWidthHeightField(m_xBuilder->weld_metric_spin_button("metric",
FieldUnit::CM))
+ : WeldToolbarPopup(pControl->getFrameInterface(), pParent,
u"modules/swriter/ui/pagesizecontrol.ui"_ustr, u"PageSizeControl"_ustr)
+ , mxMoreButton(m_xBuilder->weld_button(u"moreoptions"_ustr))
+ , mxWidthHeightField(m_xBuilder->weld_metric_spin_button(u"metric"_ustr,
FieldUnit::CM))
, mxSizeValueSet(new svx::sidebar::ValueSetWithTextControl)
- , mxSizeValueSetWin(new weld::CustomWeld(*m_xBuilder, "pagesizevalueset",
*mxSizeValueSet))
+ , mxSizeValueSetWin(new weld::CustomWeld(*m_xBuilder,
u"pagesizevalueset"_ustr, *mxSizeValueSet))
, mxControl(pControl)
{
mxWidthHeightField->set_unit(FieldUnit::CM);
diff --git a/sw/source/uibase/sidebar/PageSizePopup.cxx
b/sw/source/uibase/sidebar/PageSizePopup.cxx
index 7e2f7e7a4f90..bae9f676196c 100644
--- a/sw/source/uibase/sidebar/PageSizePopup.cxx
+++ b/sw/source/uibase/sidebar/PageSizePopup.cxx
@@ -56,12 +56,12 @@ VclPtr<vcl::Window> PageSizePopup::createVclPopupWindow(
vcl::Window* pParent )
OUString PageSizePopup::getImplementationName()
{
- return "lo.writer.PageSizeToolBoxControl";
+ return u"lo.writer.PageSizeToolBoxControl"_ustr;
}
css::uno::Sequence<OUString> PageSizePopup::getSupportedServiceNames()
{
- return { "com.sun.star.frame.ToolbarController" };
+ return { u"com.sun.star.frame.ToolbarController"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx
b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 53cf43fb742e..dd03db6fb9ca 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -79,9 +79,9 @@ static SvxPageUsage PosToPageUsage_Impl( sal_uInt16 nPos )
std::unique_ptr<PanelLayout> PageStylesPanel::Create(weld::Widget* pParent,
SfxBindings* pBindings)
{
if( pParent == nullptr )
- throw ::com::sun::star::lang::IllegalArgumentException("no parent
window given to PageStylesPanel::Create", nullptr, 0);
+ throw ::com::sun::star::lang::IllegalArgumentException(u"no parent
window given to PageStylesPanel::Create"_ustr, nullptr, 0);
if( pBindings == nullptr )
- throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings
given to PageStylesPanel::Create", nullptr, 0);
+ throw ::com::sun::star::lang::IllegalArgumentException(u"no
SfxBindings given to PageStylesPanel::Create"_ustr, nullptr, 0);
return std::make_unique<PageStylesPanel>(pParent, pBindings);
}
@@ -90,7 +90,7 @@ PageStylesPanel::PageStylesPanel(
weld::Widget* pParent,
SfxBindings* pBindings
) :
- PanelLayout(pParent, "PageStylesPanel",
"modules/swriter/ui/pagestylespanel.ui"),
+ PanelLayout(pParent, u"PageStylesPanel"_ustr,
u"modules/swriter/ui/pagestylespanel.ui"_ustr),
mpBindings( pBindings ),
mpPageColumnItem( new SfxInt16Item(SID_ATTR_PAGE_COLUMN) ),
mpPageItem( new SvxPageItem(SID_ATTR_PAGE) ),
@@ -101,15 +101,15 @@ PageStylesPanel::PageStylesPanel(
maBgGradientControl( SID_ATTR_PAGE_GRADIENT, *pBindings, *this ),
maBgBitmapControl( SID_ATTR_PAGE_BITMAP, *pBindings, *this ),
maBgFillStyleControl(SID_ATTR_PAGE_FILLSTYLE, *pBindings, *this),
- mxBgColorLB(new ColorListBox(m_xBuilder->weld_menu_button("lbcolor"),
[this]{ return GetFrameWeld(); })),
- mxBgHatchingLB(m_xBuilder->weld_combo_box("lbhatching")),
- mxBgGradientLB(new
ColorListBox(m_xBuilder->weld_menu_button("lbgradient"), [this]{ return
GetFrameWeld(); })),
- mxBgBitmapLB(m_xBuilder->weld_combo_box("lbbitmap")),
- mxLayoutSelectLB(m_xBuilder->weld_combo_box("layoutbox")),
- mxColumnCount(m_xBuilder->weld_combo_box("columnbox")),
- mxNumberSelectLB(new
SvxPageNumberListBox(m_xBuilder->weld_combo_box("numberbox"))),
- mxBgFillType(m_xBuilder->weld_combo_box("bgselect")),
- mxCustomEntry(m_xBuilder->weld_label("customlabel"))
+ mxBgColorLB(new
ColorListBox(m_xBuilder->weld_menu_button(u"lbcolor"_ustr), [this]{ return
GetFrameWeld(); })),
+ mxBgHatchingLB(m_xBuilder->weld_combo_box(u"lbhatching"_ustr)),
+ mxBgGradientLB(new
ColorListBox(m_xBuilder->weld_menu_button(u"lbgradient"_ustr), [this]{ return
GetFrameWeld(); })),
+ mxBgBitmapLB(m_xBuilder->weld_combo_box(u"lbbitmap"_ustr)),
+ mxLayoutSelectLB(m_xBuilder->weld_combo_box(u"layoutbox"_ustr)),
+ mxColumnCount(m_xBuilder->weld_combo_box(u"columnbox"_ustr)),
+ mxNumberSelectLB(new
SvxPageNumberListBox(m_xBuilder->weld_combo_box(u"numberbox"_ustr))),
+ mxBgFillType(m_xBuilder->weld_combo_box(u"bgselect"_ustr)),
+ mxCustomEntry(m_xBuilder->weld_label(u"customlabel"_ustr))
{
Initialize();
}
diff --git a/sw/source/uibase/sidebar/QuickFindPanel.cxx
b/sw/source/uibase/sidebar/QuickFindPanel.cxx
index 90f428b1ed0c..37edbc90019a 100644
--- a/sw/source/uibase/sidebar/QuickFindPanel.cxx
+++ b/sw/source/uibase/sidebar/QuickFindPanel.cxx
@@ -33,14 +33,14 @@ std::unique_ptr<PanelLayout>
QuickFindPanel::Create(weld::Widget* pParent)
{
if (pParent == nullptr)
throw css::lang::IllegalArgumentException(
- "no parent Window given to QuickFindPanel::Create", nullptr, 0);
+ u"no parent Window given to QuickFindPanel::Create"_ustr, nullptr,
0);
return std::make_unique<QuickFindPanel>(pParent);
}
QuickFindPanel::QuickFindPanel(weld::Widget* pParent)
- : PanelLayout(pParent, "QuickFindPanel",
"modules/swriter/ui/sidebarquickfind.ui")
- , m_xSearchFindEntry(m_xBuilder->weld_entry("Find"))
- , m_xSearchFindsList(m_xBuilder->weld_tree_view("searchfinds"))
+ : PanelLayout(pParent, u"QuickFindPanel"_ustr,
u"modules/swriter/ui/sidebarquickfind.ui"_ustr)
+ , m_xSearchFindEntry(m_xBuilder->weld_entry(u"Find"_ustr))
+ , m_xSearchFindsList(m_xBuilder->weld_tree_view(u"searchfinds"_ustr))
, m_nRowHeight(m_xSearchFindsList->get_height_rows(4))
, m_pWrtShell(::GetActiveWrtShell())
@@ -147,7 +147,7 @@ void QuickFindPanel::FillSearchFindsList()
{ "SearchItem.Command",
css::uno::Any(sal_uInt16(SvxSearchCmd::FIND_ALL)) },
}));
- comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
+ comphelper::dispatchCommand(u".uno:ExecuteSearch"_ustr, aPropertyValues);
if (m_pWrtShell->HasMark())
{
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index ff05d11cfe73..8455f6c7ac10 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -134,15 +134,15 @@ BitmapEx CreatePreview(OUString const & aUrl, OUString
const & aName)
std::unique_ptr<PanelLayout> StylePresetsPanel::Create(weld::Widget* pParent)
{
if (pParent == nullptr)
- throw css::lang::IllegalArgumentException("no parent Window given to
StylePresetsPanel::Create", nullptr, 0);
+ throw css::lang::IllegalArgumentException(u"no parent Window given to
StylePresetsPanel::Create"_ustr, nullptr, 0);
return std::make_unique<StylePresetsPanel>(pParent);
}
StylePresetsPanel::StylePresetsPanel(weld::Widget* pParent)
- : PanelLayout(pParent, "StylePresetsPanel",
"modules/swriter/ui/sidebarstylepresets.ui")
+ : PanelLayout(pParent, u"StylePresetsPanel"_ustr,
u"modules/swriter/ui/sidebarstylepresets.ui"_ustr)
, mxValueSet(new ValueSet(nullptr))
- , mxValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxValueSet))
+ , mxValueSetWin(new weld::CustomWeld(*m_xBuilder, u"valueset"_ustr,
*mxValueSet))
{
mxValueSet->SetColCount(2);
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 75b7e2f17257..ee378d8e6461 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -66,13 +66,13 @@ public:
const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
override;
OUString SAL_CALL getImplementationName() override
- { return "org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"; }
+ { return u"org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"_ustr; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
- { return {"com.sun.star.ui.UIElementFactory"}; }
+ { return {u"com.sun.star.ui.UIElementFactory"_ustr}; }
};
SwPanelFactory::SwPanelFactory()
@@ -86,9 +86,9 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
Reference<ui::XUIElement> xElement;
const ::comphelper::NamedValueCollection aArguments (rArguments);
- Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame",
Reference<frame::XFrame>()));
- Reference<awt::XWindow> xParentWindow
(aArguments.getOrDefault("ParentWindow", Reference<awt::XWindow>()));
- const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings",
sal_uInt64(0)));
+ Reference<frame::XFrame> xFrame (aArguments.getOrDefault(u"Frame"_ustr,
Reference<frame::XFrame>()));
+ Reference<awt::XWindow> xParentWindow
(aArguments.getOrDefault(u"ParentWindow"_ustr, Reference<awt::XWindow>()));
+ const sal_uInt64 nBindingsValue
(aArguments.getOrDefault(u"SfxBindings"_ustr, sal_uInt64(0)));
SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
weld::Widget* pParent(nullptr);
@@ -97,15 +97,15 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
if (!pParent)
throw RuntimeException(
- "PanelFactory::createUIElement called without ParentWindow",
+ u"PanelFactory::createUIElement called without ParentWindow"_ustr,
nullptr);
if ( ! xFrame.is())
throw RuntimeException(
- "PanelFactory::createUIElement called without Frame",
+ u"PanelFactory::createUIElement called without Frame"_ustr,
nullptr);
if (pBindings == nullptr)
throw RuntimeException(
- "PanelFactory::createUIElement called without SfxBindings",
+ u"PanelFactory::createUIElement called without SfxBindings"_ustr,
nullptr);
if(rsResourceURL.endsWith("/PageStylesPanel"))
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx
b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 1022804cbbf0..a3c376835768 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -34,9 +34,9 @@ TableEditPanel::Create(weld::Widget* pParent,
{
if (pParent == nullptr)
throw css::lang::IllegalArgumentException(
- "no parent Window given to TableEditPanel::Create", nullptr, 0);
+ u"no parent Window given to TableEditPanel::Create"_ustr, nullptr,
0);
if (!rxFrame.is())
- throw css::lang::IllegalArgumentException("no XFrame given to
TableEditPanel::Create",
+ throw css::lang::IllegalArgumentException(u"no XFrame given to
TableEditPanel::Create"_ustr,
nullptr, 1);
return std::make_unique<TableEditPanel>(pParent, rxFrame, pBindings);
@@ -63,7 +63,7 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID,
const SfxItemState
}
}
else if (eState != SfxItemState::DISABLED)
- m_aRowHeightEdit.set_text("");
+ m_aRowHeightEdit.set_text(u""_ustr);
break;
}
@@ -83,7 +83,7 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID,
const SfxItemState
}
}
else if (eState != SfxItemState::DISABLED)
- m_aColumnWidthEdit.set_text("");
+ m_aColumnWidthEdit.set_text(u""_ustr);
break;
}
@@ -129,26 +129,26 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16
nSID, const SfxItemState
TableEditPanel::TableEditPanel(weld::Widget* pParent,
const css::uno::Reference<css::frame::XFrame>&
rxFrame,
SfxBindings* pBindings)
- : PanelLayout(pParent, "TableEditPanel",
"modules/swriter/ui/sidebartableedit.ui")
+ : PanelLayout(pParent, u"TableEditPanel"_ustr,
u"modules/swriter/ui/sidebartableedit.ui"_ustr)
, m_pBindings(pBindings)
- , m_aRowHeightEdit(m_xBuilder->weld_metric_spin_button("rowheight",
FieldUnit::CM))
- , m_aColumnWidthEdit(m_xBuilder->weld_metric_spin_button("columnwidth",
FieldUnit::CM))
- , m_xInsert(m_xBuilder->weld_toolbar("insert"))
+ , m_aRowHeightEdit(m_xBuilder->weld_metric_spin_button(u"rowheight"_ustr,
FieldUnit::CM))
+ ,
m_aColumnWidthEdit(m_xBuilder->weld_metric_spin_button(u"columnwidth"_ustr,
FieldUnit::CM))
+ , m_xInsert(m_xBuilder->weld_toolbar(u"insert"_ustr))
, m_xInsertDispatch(new ToolbarUnoDispatcher(*m_xInsert, *m_xBuilder,
rxFrame))
- , m_xSelect(m_xBuilder->weld_toolbar("select"))
+ , m_xSelect(m_xBuilder->weld_toolbar(u"select"_ustr))
, m_xSelectDispatch(new ToolbarUnoDispatcher(*m_xSelect, *m_xBuilder,
rxFrame))
- , m_xRowSizing(m_xBuilder->weld_toolbar("rowsizing"))
+ , m_xRowSizing(m_xBuilder->weld_toolbar(u"rowsizing"_ustr))
, m_xRowSizingDispatch(new ToolbarUnoDispatcher(*m_xRowSizing,
*m_xBuilder, rxFrame))
- , m_xColumnSizing(m_xBuilder->weld_toolbar("columnsizing"))
+ , m_xColumnSizing(m_xBuilder->weld_toolbar(u"columnsizing"_ustr))
, m_xColumnSizingDispatch(new ToolbarUnoDispatcher(*m_xColumnSizing,
*m_xBuilder, rxFrame))
- , m_xDelete(m_xBuilder->weld_toolbar("delete"))
+ , m_xDelete(m_xBuilder->weld_toolbar(u"delete"_ustr))
, m_xDeleteDispatch(new ToolbarUnoDispatcher(*m_xDelete, *m_xBuilder,
rxFrame))
- , m_xSplitMerge(m_xBuilder->weld_toolbar("split_merge"))
+ , m_xSplitMerge(m_xBuilder->weld_toolbar(u"split_merge"_ustr))
, m_xSplitMergeDispatch(new ToolbarUnoDispatcher(*m_xSplitMerge,
*m_xBuilder, rxFrame))
- , m_xAlignment(m_xBuilder->weld_combo_box("alignmentLB"))
- , m_aLeftSpacingEdit(m_xBuilder->weld_metric_spin_button("leftspace",
FieldUnit::CM))
- , m_aRightSpacingEdit(m_xBuilder->weld_metric_spin_button("rightspace",
FieldUnit::CM))
- , m_xMisc(m_xBuilder->weld_toolbar("misc"))
+ , m_xAlignment(m_xBuilder->weld_combo_box(u"alignmentLB"_ustr))
+ ,
m_aLeftSpacingEdit(m_xBuilder->weld_metric_spin_button(u"leftspace"_ustr,
FieldUnit::CM))
+ ,
m_aRightSpacingEdit(m_xBuilder->weld_metric_spin_button(u"rightspace"_ustr,
FieldUnit::CM))
+ , m_xMisc(m_xBuilder->weld_toolbar(u"misc"_ustr))
, m_xMiscDispatch(new ToolbarUnoDispatcher(*m_xMisc, *m_xBuilder, rxFrame))
, m_aRowHeightController(SID_ATTR_TABLE_ROW_HEIGHT, *pBindings, *this)
, m_aColumnWidthController(SID_ATTR_TABLE_COLUMN_WIDTH, *pBindings, *this)
@@ -180,7 +180,7 @@ TableEditPanel::TableEditPanel(weld::Widget* pParent,
InitColumnWidthToolitem();
InitAlignmentControls();
if (comphelper::LibreOfficeKit::isActive())
- m_xMisc->set_item_visible(".uno:InsertFormula", false);
+ m_xMisc->set_item_visible(u".uno:InsertFormula"_ustr, false);
}
void TableEditPanel::InitRowHeightToolitem()
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx
b/sw/source/uibase/sidebar/ThemePanel.cxx
index 55853a544f8e..f73ca7bbc8a0 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -29,16 +29,16 @@ namespace sw::sidebar
std::unique_ptr<PanelLayout> ThemePanel::Create(weld::Widget* pParent)
{
if (pParent == nullptr)
- throw css::lang::IllegalArgumentException("no parent Window given to
PagePropertyPanel::Create", nullptr, 0);
+ throw css::lang::IllegalArgumentException(u"no parent Window given to
PagePropertyPanel::Create"_ustr, nullptr, 0);
return std::make_unique<ThemePanel>(pParent);
}
ThemePanel::ThemePanel(weld::Widget* pParent)
- : PanelLayout(pParent, "ThemePanel", "modules/swriter/ui/sidebartheme.ui")
+ : PanelLayout(pParent, u"ThemePanel"_ustr,
u"modules/swriter/ui/sidebartheme.ui"_ustr)
, mxValueSetColors(new svx::ThemeColorValueSet)
- , mxValueSetColorsWin(new weld::CustomWeld(*m_xBuilder, "valueset_colors",
*mxValueSetColors))
- , mxApplyButton(m_xBuilder->weld_button("apply"))
+ , mxValueSetColorsWin(new weld::CustomWeld(*m_xBuilder,
u"valueset_colors"_ustr, *mxValueSetColors))
+ , mxApplyButton(m_xBuilder->weld_button(u"apply"_ustr))
{
mxValueSetColors->SetColCount(2);
mxValueSetColors->SetLineCount(3);
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 8f38a161ffce..627dad0b406c 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -40,11 +40,11 @@ std::unique_ptr<PanelLayout> WrapPropertyPanel::Create (
SfxBindings* pBindings)
{
if (pParent == nullptr)
- throw css::lang::IllegalArgumentException("no parent Window given to
WrapPropertyPanel::Create", nullptr, 0);
+ throw css::lang::IllegalArgumentException(u"no parent Window given to
WrapPropertyPanel::Create"_ustr, nullptr, 0);
if ( ! rxFrame.is())
- throw css::lang::IllegalArgumentException("no XFrame given to
WrapPropertyPanel::Create", nullptr, 1);
+ throw css::lang::IllegalArgumentException(u"no XFrame given to
WrapPropertyPanel::Create"_ustr, nullptr, 1);
if (pBindings == nullptr)
- throw css::lang::IllegalArgumentException("no SfxBindings given to
WrapPropertyPanel::Create", nullptr, 2);
+ throw css::lang::IllegalArgumentException(u"no SfxBindings given to
WrapPropertyPanel::Create"_ustr, nullptr, 2);
return std::make_unique<WrapPropertyPanel>(pParent, rxFrame, pBindings);
}
@@ -53,7 +53,7 @@ WrapPropertyPanel::WrapPropertyPanel(
weld::Widget* pParent,
const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings )
- : PanelLayout(pParent, "WrapPropertyPanel",
"modules/swriter/ui/sidebarwrap.ui")
+ : PanelLayout(pParent, u"WrapPropertyPanel"_ustr,
u"modules/swriter/ui/sidebarwrap.ui"_ustr)
, mpBindings(pBindings)
// spacing
, m_nTop(0)
@@ -65,9 +65,9 @@ WrapPropertyPanel::WrapPropertyPanel(
// controller items
, maSwLRSpacingControl(SID_ATTR_LRSPACE, *pBindings, *this)
, maSwULSpacingControl(SID_ATTR_ULSPACE, *pBindings, *this)
- , mxWrapOptions(m_xBuilder->weld_toolbar("wrapoptions"))
+ , mxWrapOptions(m_xBuilder->weld_toolbar(u"wrapoptions"_ustr))
, mxWrapOptionsDispatch(new ToolbarUnoDispatcher(*mxWrapOptions,
*m_xBuilder, rxFrame))
- , mxSpacingLB(m_xBuilder->weld_combo_box("spacingLB"))
+ , mxSpacingLB(m_xBuilder->weld_combo_box(u"spacingLB"_ustr))
{
FieldUnit eMetric = ::GetDfltMetric(false);
SpacingListBox::Fill(IsInch(eMetric) ? SpacingType::SPACING_INCH :
SpacingType::SPACING_CM, *mxSpacingLB);
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index ec02dd111bc1..6a836cd2fe4b 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -56,7 +56,7 @@ std::unique_ptr<PanelLayout>
WriterInspectorTextPanel::Create(weld::Widget* pPar
{
if (pParent == nullptr)
throw lang::IllegalArgumentException(
- "no parent Window given to WriterInspectorTextPanel::Create",
nullptr, 0);
+ u"no parent Window given to
WriterInspectorTextPanel::Create"_ustr, nullptr, 0);
return std::make_unique<WriterInspectorTextPanel>(pParent);
}
@@ -363,13 +363,14 @@ static svx::sidebar::TreeNode BorderToTreeNode(const
OUString& rName, const css:
aCurNode.sNodeName = PropertyNametoRID(rName);
aCurNode.NodeType = svx::sidebar::TreeNode::ComplexProperty;
- aCurNode.children
- = { SimplePropToTreeNode("BorderColor", css::uno::Any(aBorder.Color)),
- SimplePropToTreeNode("BorderLineWidth",
css::uno::Any(aBorder.LineWidth)),
- SimplePropToTreeNode("BorderLineStyle",
css::uno::Any(aBorder.LineStyle)),
- SimplePropToTreeNode("BorderLineDistance",
css::uno::Any(aBorder.LineDistance)),
- SimplePropToTreeNode("BorderInnerLineWidth",
css::uno::Any(aBorder.InnerLineWidth)),
- SimplePropToTreeNode("BorderOuterLineWidth",
css::uno::Any(aBorder.OuterLineWidth)) };
+ aCurNode.children = {
+ SimplePropToTreeNode(u"BorderColor"_ustr,
css::uno::Any(aBorder.Color)),
+ SimplePropToTreeNode(u"BorderLineWidth"_ustr,
css::uno::Any(aBorder.LineWidth)),
+ SimplePropToTreeNode(u"BorderLineStyle"_ustr,
css::uno::Any(aBorder.LineStyle)),
+ SimplePropToTreeNode(u"BorderLineDistance"_ustr,
css::uno::Any(aBorder.LineDistance)),
+ SimplePropToTreeNode(u"BorderInnerLineWidth"_ustr,
css::uno::Any(aBorder.InnerLineWidth)),
+ SimplePropToTreeNode(u"BorderOuterLineWidth"_ustr,
css::uno::Any(aBorder.OuterLineWidth))
+ };
return aCurNode;
}
@@ -429,11 +430,11 @@ static void MetadataToTreeNode(const
css::uno::Reference<css::uno::XInterface>&
}
svx::sidebar::TreeNode aCurNode;
- aCurNode.sNodeName = PropertyNametoRID("MetadataReference");
+ aCurNode.sNodeName = PropertyNametoRID(u"MetadataReference"_ustr);
aCurNode.NodeType = svx::sidebar::TreeNode::ComplexProperty;
aCurNode.children.push_back(
- SimplePropToTreeNode("xml:id",
uno::Any(xMeta->getMetadataReference().Second)));
+ SimplePropToTreeNode(u"xml:id"_ustr,
uno::Any(xMeta->getMetadataReference().Second)));
// list associated (predicate, object) pairs of the actual subject
// under the tree node "Metadata Reference"
@@ -598,15 +599,15 @@ static void UpdateTree(SwDocShell& rDocSh, SwEditShell&
rEditSh,
OUString sCurrentCharStyle, sCurrentParaStyle, sDisplayName;
uno::Reference<container::XNameAccess> xStyleFamily(
- xStyleFamilies->getByName("CharacterStyles"), uno::UNO_QUERY_THROW);
- xRange->getPropertyValue("CharStyleName") >>= sCurrentCharStyle;
- xRange->getPropertyValue("ParaStyleName") >>= sCurrentParaStyle;
+ xStyleFamilies->getByName(u"CharacterStyles"_ustr),
uno::UNO_QUERY_THROW);
+ xRange->getPropertyValue(u"CharStyleName"_ustr) >>= sCurrentCharStyle;
+ xRange->getPropertyValue(u"ParaStyleName"_ustr) >>= sCurrentParaStyle;
if (!sCurrentCharStyle.isEmpty())
{
uno::Reference<beans::XPropertySet> xPropertiesSet(
xStyleFamily->getByName(sCurrentCharStyle),
css::uno::UNO_QUERY_THROW);
- xPropertiesSet->getPropertyValue("DisplayName") >>= sDisplayName;
+ xPropertiesSet->getPropertyValue(u"DisplayName"_ustr) >>= sDisplayName;
svx::sidebar::TreeNode aCurrentChild;
aCurrentChild.sNodeName = sDisplayName;
aCurrentChild.NodeType = svx::sidebar::TreeNode::ComplexProperty;
@@ -628,7 +629,7 @@ static void UpdateTree(SwDocShell& rDocSh, SwEditShell&
rEditSh,
aFieldsNode);
}
- xStyleFamily.set(xStyleFamilies->getByName("ParagraphStyles"),
uno::UNO_QUERY_THROW);
+ xStyleFamily.set(xStyleFamilies->getByName(u"ParagraphStyles"_ustr),
uno::UNO_QUERY_THROW);
while (!sCurrentParaStyle.isEmpty())
{
@@ -636,7 +637,7 @@ static void UpdateTree(SwDocShell& rDocSh, SwEditShell&
rEditSh,
uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropertiesSet(xPropertiesStyle,
css::uno::UNO_QUERY_THROW);
- xPropertiesSet->getPropertyValue("DisplayName") >>= sDisplayName;
+ xPropertiesSet->getPropertyValue(u"DisplayName"_ustr) >>= sDisplayName;
OUString aParentParaStyle = xPropertiesStyle->getParentStyle();
svx::sidebar::TreeNode aCurrentChild;
aCurrentChild.sNodeName = sDisplayName;
