diff options
51 files changed, 438 insertions, 438 deletions
diff --git a/svtools/qa/unit/testHtmlReader.cxx b/svtools/qa/unit/testHtmlReader.cxx index 5605060eab34..d50da0d3cd97 100644 --- a/svtools/qa/unit/testHtmlReader.cxx +++ b/svtools/qa/unit/testHtmlReader.cxx @@ -62,7 +62,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf114428) // This was '<?xml version="1.0" encoding="utf-8"?> hello', XML declaration // was not ignored. - CPPUNIT_ASSERT_EQUAL(OUString("hello"), xParser->m_aDocument.trim()); + CPPUNIT_ASSERT_EQUAL(u"hello"_ustr, xParser->m_aDocument.trim()); } CPPUNIT_TEST_FIXTURE(Test, testLineBreak) @@ -97,7 +97,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCdata) // - Expected: B ü < // - Actual : // i.e. the content inside CDATA was lost. - CPPUNIT_ASSERT_EQUAL(OUString("B ü <"), xParser->m_aCdata); + CPPUNIT_ASSERT_EQUAL(u"B ü <"_ustr, xParser->m_aCdata); } } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index ce32f324bd42..982e00cfd388 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -121,11 +121,11 @@ private: std::unique_ptr<weld::Label> m_xRecordCount; public: MeasureStatusBar(vcl::Window *pParent) - : InterimItemWindow(pParent, "svx/ui/navigationbar.ui", "NavigationBar") - , m_xRecordText(m_xBuilder->weld_label("recordtext")) - , m_xAbsolute(m_xBuilder->weld_entry("entry-noframe")) - , m_xRecordOf(m_xBuilder->weld_label("recordof")) - , m_xRecordCount(m_xBuilder->weld_label("recordcount")) + : InterimItemWindow(pParent, u"svx/ui/navigationbar.ui"_ustr, u"NavigationBar"_ustr) + , m_xRecordText(m_xBuilder->weld_label(u"recordtext"_ustr)) + , m_xAbsolute(m_xBuilder->weld_entry(u"entry-noframe"_ustr)) + , m_xRecordOf(m_xBuilder->weld_label(u"recordof"_ustr)) + , m_xRecordCount(m_xBuilder->weld_label(u"recordcount"_ustr)) { vcl::Font aApplFont(Application::GetSettings().GetStyleSettings().GetToolFont()); m_xAbsolute->set_font(aApplFont); diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index c818bb9d829d..01e8c9997f23 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -132,7 +132,7 @@ void BrowserColumn::Draw( BrowseBox const & rBox, OutputDevice& rDev, const Poin { // paint handle column ButtonFrame( rPos, Size( Width()-1, rBox.GetDataRowHeight()-1 ), - "", false ).Draw( rDev ); + u""_ustr, false ).Draw( rDev ); Color aOldLineColor = rDev.GetLineColor(); rDev.SetLineColor( COL_BLACK ); rDev.DrawLine( diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 45b1a3766e76..06500b48e0d2 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -23,8 +23,8 @@ namespace svt { //= ComboBoxControl ComboBoxControl::ComboBoxControl(BrowserDataWin* pParent) - : ControlBase(pParent, "svt/ui/combocontrol.ui", "ComboControl") - , m_xWidget(m_xBuilder->weld_combo_box("combobox")) + : ControlBase(pParent, u"svt/ui/combocontrol.ui"_ustr, u"ComboControl"_ustr) + , m_xWidget(m_xBuilder->weld_combo_box(u"combobox"_ustr)) { InitControlBase(m_xWidget.get()); m_xWidget->set_entry_width_chars(1); // so a smaller than default width can be used @@ -119,8 +119,8 @@ namespace svt //= ListBoxControl ListBoxControl::ListBoxControl(BrowserDataWin* pParent) - : ControlBase(pParent, "svt/ui/listcontrol.ui", "ListControl") - , m_xWidget(m_xBuilder->weld_combo_box("listbox")) + : ControlBase(pParent, u"svt/ui/listcontrol.ui"_ustr, u"ListControl"_ustr) + , m_xWidget(m_xBuilder->weld_combo_box(u"listbox"_ustr)) { InitControlBase(m_xWidget.get()); m_xWidget->set_size_request(42, -1); // so a later narrow size request can stick @@ -199,8 +199,8 @@ namespace svt //= CheckBoxControl CheckBoxControl::CheckBoxControl(BrowserDataWin* pParent) - : ControlBase(pParent, "svt/ui/checkboxcontrol.ui", "CheckBoxControl") - , m_xBox(m_xBuilder->weld_check_button("checkbox")) + : ControlBase(pParent, u"svt/ui/checkboxcontrol.ui"_ustr, u"CheckBoxControl"_ustr) + , m_xBox(m_xBuilder->weld_check_button(u"checkbox"_ustr)) { m_aModeState.bTriStateEnabled = true; InitControlBase(m_xBox.get()); @@ -354,7 +354,7 @@ namespace svt } EditControlBase::EditControlBase(BrowserDataWin* pParent) - : ControlBase(pParent, "svt/ui/thineditcontrol.ui", "EditControl") // *thin*editcontrol has no frame/border + : ControlBase(pParent, u"svt/ui/thineditcontrol.ui"_ustr, u"EditControl"_ustr) // *thin*editcontrol has no frame/border , m_pEntry(nullptr) // inheritors are expected to call InitEditControlBase { } @@ -429,7 +429,7 @@ namespace svt EditControl::EditControl(BrowserDataWin* pParent) : EditControlBase(pParent) - , m_xWidget(m_xBuilder->weld_entry("entry")) + , m_xWidget(m_xBuilder->weld_entry(u"entry"_ustr)) { InitEditControlBase(m_xWidget.get()); } @@ -443,8 +443,8 @@ namespace svt FormattedControlBase::FormattedControlBase(BrowserDataWin* pParent, bool bSpinVariant) : EditControlBase(pParent) , m_bSpinVariant(bSpinVariant) - , m_xEntry(m_xBuilder->weld_entry("entry")) - , m_xSpinButton(m_xBuilder->weld_formatted_spin_button("spinbutton")) + , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr)) + , m_xSpinButton(m_xBuilder->weld_formatted_spin_button(u"spinbutton"_ustr)) { } @@ -528,13 +528,13 @@ namespace svt DateControl::DateControl(BrowserDataWin* pParent, bool bDropDown) : FormattedControlBase(pParent, false) - , m_xMenuButton(m_xBuilder->weld_menu_button("button")) - , m_xCalendarBuilder(Application::CreateBuilder(m_xMenuButton.get(), "svt/ui/datewindow.ui")) - , m_xTopLevel(m_xCalendarBuilder->weld_widget("date_popup_window")) - , m_xCalendar(m_xCalendarBuilder->weld_calendar("date_picker")) - , m_xExtras(m_xCalendarBuilder->weld_widget("extras")) - , m_xTodayBtn(m_xCalendarBuilder->weld_button("today")) - , m_xNoneBtn(m_xCalendarBuilder->weld_button("none")) + , m_xMenuButton(m_xBuilder->weld_menu_button(u"button"_ustr)) + , m_xCalendarBuilder(Application::CreateBuilder(m_xMenuButton.get(), u"svt/ui/datewindow.ui"_ustr)) + , m_xTopLevel(m_xCalendarBuilder->weld_widget(u"date_popup_window"_ustr)) + , m_xCalendar(m_xCalendarBuilder->weld_calendar(u"date_picker"_ustr)) + , m_xExtras(m_xCalendarBuilder->weld_widget(u"extras"_ustr)) + , m_xTodayBtn(m_xCalendarBuilder->weld_button(u"today"_ustr)) + , m_xNoneBtn(m_xCalendarBuilder->weld_button(u"none"_ustr)) { m_xEntryFormatter.reset(new weld::DateFormatter(*m_xEntry)); InitFormattedControlBase(); @@ -600,7 +600,7 @@ namespace svt PatternControl::PatternControl(BrowserDataWin* pParent) : EditControlBase(pParent) - , m_xWidget(m_xBuilder->weld_entry("entry")) + , m_xWidget(m_xBuilder->weld_entry(u"entry"_ustr)) { m_xEntryFormatter.reset(new weld::PatternFormatter(*m_xWidget)); InitEditControlBase(m_xWidget.get()); @@ -709,8 +709,8 @@ namespace svt } MultiLineTextCell::MultiLineTextCell(BrowserDataWin* pParent) - : ControlBase(pParent, "svt/ui/textviewcontrol.ui", "TextViewControl") - , m_xWidget(m_xBuilder->weld_text_view("textview")) + : ControlBase(pParent, u"svt/ui/textviewcontrol.ui"_ustr, u"TextViewControl"_ustr) + , m_xWidget(m_xBuilder->weld_text_view(u"textview"_ustr)) { InitControlBase(m_xWidget.get()); m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl)); diff --git a/svtools/source/brwbox/recorditemwindow.cxx b/svtools/source/brwbox/recorditemwindow.cxx index 98ff79a2759e..b62460499d90 100644 --- a/svtools/source/brwbox/recorditemwindow.cxx +++ b/svtools/source/brwbox/recorditemwindow.cxx @@ -33,8 +33,8 @@ RecordItemWindowBase::RecordItemWindowBase(std::unique_ptr<weld::Entry> xEntry) RecordItemWindowBase::~RecordItemWindowBase() {} RecordItemWindow::RecordItemWindow(vcl::Window* pParent) - : InterimItemWindow(pParent, "svx/ui/absrecbox.ui", "AbsRecBox") - , RecordItemWindowBase(m_xBuilder->weld_entry("entry-frame")) + : InterimItemWindow(pParent, u"svx/ui/absrecbox.ui"_ustr, u"AbsRecBox"_ustr) + , RecordItemWindowBase(m_xBuilder->weld_entry(u"entry-frame"_ustr)) { InitControlBase(m_xWidget.get()); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 4a4e94370bef..60488ef5f3fb 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -189,7 +189,7 @@ uno::Sequence< OUString> GetPropertyNames(std::u16string_view rScheme) } ColorConfig_Impl::ColorConfig_Impl() : - ConfigItem("Office.UI/ColorScheme") + ConfigItem(u"Office.UI/ColorScheme"_ustr) { //try to register on the root node - if possible uno::Sequence < OUString > aNames(1); @@ -213,7 +213,7 @@ void ColorConfig_Impl::Load(const OUString& rScheme) if(sScheme.isEmpty()) { //detect current scheme name - uno::Sequence < OUString > aCurrent { "CurrentColorScheme" }; + uno::Sequence < OUString > aCurrent { u"CurrentColorScheme"_ustr }; uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } @@ -292,7 +292,7 @@ void ColorConfig_Impl::ImplCommit() nIndex++; } } - SetSetProperties("ColorSchemes", aPropValues); + SetSetProperties(u"ColorSchemes"_ustr, aPropValues); CommitCurrentSchemeName(); } @@ -300,7 +300,7 @@ void ColorConfig_Impl::ImplCommit() void ColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name - uno::Sequence < OUString > aCurrent { "CurrentColorScheme" }; + uno::Sequence < OUString > aCurrent { u"CurrentColorScheme"_ustr }; uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); @@ -317,12 +317,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC uno::Sequence< OUString> ColorConfig_Impl::GetSchemeNames() { - return GetNodeNames("ColorSchemes"); + return GetNodeNames(u"ColorSchemes"_ustr); } void ColorConfig_Impl::AddScheme(const OUString& rScheme) { - if(ConfigItem::AddNode("ColorSchemes", rScheme)) + if(ConfigItem::AddNode(u"ColorSchemes"_ustr, rScheme)) { m_sLoadedScheme = rScheme; Commit(); @@ -332,7 +332,7 @@ void ColorConfig_Impl::AddScheme(const OUString& rScheme) void ColorConfig_Impl::RemoveScheme(const OUString& rScheme) { uno::Sequence< OUString > aElements { rScheme }; - ClearNodeElements("ColorSchemes", aElements); + ClearNodeElements(u"ColorSchemes"_ustr, aElements); } void ColorConfig_Impl::SettingsChanged() diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index da3ce6a2de46..11a8a0bdca06 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -191,7 +191,7 @@ OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const bool ExtendedColorConfig_Impl::m_bLockBroadcast = false; bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = false; ExtendedColorConfig_Impl::ExtendedColorConfig_Impl() : - ConfigItem("Office.ExtendedColorScheme"), + ConfigItem(u"Office.ExtendedColorScheme"_ustr), m_bIsBroadcastEnabled(true) { //try to register on the root node - if possible @@ -234,8 +234,8 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme) // fill display names TDisplayNames aDisplayNameMap; - uno::Sequence < OUString > aComponentNames = GetPropertyNames("EntryNames"); - OUString sDisplayName("/DisplayName"); + uno::Sequence < OUString > aComponentNames = GetPropertyNames(u"EntryNames"_ustr); + OUString sDisplayName(u"/DisplayName"_ustr); for(OUString & componentName : asNonConstRange(aComponentNames)) { uno::Sequence< uno::Any > aComponentDisplayNamesValue = GetProperties( { componentName + sDisplayName } ); @@ -271,7 +271,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme) if(sScheme.isEmpty()) { //detect current scheme name - uno::Sequence < OUString > aCurrent { "ExtendedColorScheme/CurrentColorScheme" }; + uno::Sequence < OUString > aCurrent { u"ExtendedColorScheme/CurrentColorScheme"_ustr }; uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } // if(!sScheme.getLength()) @@ -294,7 +294,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme) { if ( ExistsScheme(u"default") ) { - aComponentNames = GetPropertyNames("ExtendedColorScheme/ColorSchemes/default"); + aComponentNames = GetPropertyNames(u"ExtendedColorScheme/ColorSchemes/default"_ustr); FillComponentColors(aComponentNames,aDisplayNameMap); } } @@ -412,7 +412,7 @@ void ExtendedColorConfig_Impl::ImplCommit() // the default color will never be changed ++pPropValues; } - SetSetProperties("ExtendedColorScheme/ColorSchemes", aPropValues); + SetSetProperties(u"ExtendedColorScheme/ColorSchemes"_ustr, aPropValues); } } @@ -422,7 +422,7 @@ void ExtendedColorConfig_Impl::ImplCommit() void ExtendedColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name - uno::Sequence < OUString > aCurrent { "ExtendedColorScheme/CurrentColorScheme" }; + uno::Sequence < OUString > aCurrent { u"ExtendedColorScheme/CurrentColorScheme"_ustr }; uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); @@ -430,7 +430,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName() bool ExtendedColorConfig_Impl::ExistsScheme(std::u16string_view _sSchemeName) { - OUString sBase("ExtendedColorScheme/ColorSchemes"); + OUString sBase(u"ExtendedColorScheme/ColorSchemes"_ustr); uno::Sequence < OUString > aComponentNames = GetPropertyNames(sBase); sBase += OUString::Concat("/") + _sSchemeName; @@ -451,7 +451,7 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const OUString& _sName, const void ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme) { - if(ConfigItem::AddNode("ExtendedColorScheme/ColorSchemes", rScheme)) + if(ConfigItem::AddNode(u"ExtendedColorScheme/ColorSchemes"_ustr, rScheme)) { m_sLoadedScheme = rScheme; Commit(); @@ -461,7 +461,7 @@ void ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme) void ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme) { uno::Sequence< OUString > aElements { rScheme }; - ClearNodeElements("ExtendedColorScheme/ColorSchemes", aElements); + ClearNodeElements(u"ExtendedColorScheme/ColorSchemes"_ustr, aElements); } void ExtendedColorConfig_Impl::SettingsChanged() diff --git a/svtools/source/contnr/querydelete.cxx b/svtools/source/contnr/querydelete.cxx index 9b97983f7d1d..d0ae79a08fc3 100644 --- a/svtools/source/contnr/querydelete.cxx +++ b/svtools/source/contnr/querydelete.cxx @@ -22,8 +22,9 @@ namespace svtools { QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(weld::Widget* pParent, std::u16string_view rName) - : MessageDialogController(pParent, "svt/ui/querydeletedialog.ui", "QueryDeleteDialog") - , m_xAllButton(m_xBuilder->weld_button("all")) + : MessageDialogController(pParent, u"svt/ui/querydeletedialog.ui"_ustr, + u"QueryDeleteDialog"_ustr) + , m_xAllButton(m_xBuilder->weld_button(u"all"_ustr)) { // display specified texts m_xDialog->set_secondary_text(m_xDialog->get_secondary_text().replaceFirst("%s", rName)); diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 386b5add7ba7..35cd3a92e53f 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -291,7 +291,7 @@ sal_Int32 SvtRulerAccessible::getBackground( ) // XServiceInfo OUString SAL_CALL SvtRulerAccessible::getImplementationName() { - return "com.sun.star.comp.ui.SvtRulerAccessible"; + return u"com.sun.star.comp.ui.SvtRulerAccessible"_ustr; } sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName ) @@ -301,7 +301,7 @@ sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceN Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() { - return { "com.sun.star.accessibility.AccessibleContext" }; + return { u"com.sun.star.accessibility.AccessibleContext"_ustr }; } //===== XTypeProvider ======================================================= diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 5b06c7540090..a4b293b7629e 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -472,7 +472,7 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile ) void FontNameBox::InitFontMRUEntriesFile() { - OUString sUserConfigDir("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); + OUString sUserConfigDir(u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"_ustr); rtl::Bootstrap::expandMacros(sUserConfigDir); maFontMRUEntriesFile = sUserConfigDir; @@ -1466,11 +1466,11 @@ void SvtLineListBox::ImpGetLine( tools::Long nLine1, tools::Long nLine2, tools:: } SvtLineListBox::SvtLineListBox(std::unique_ptr<weld::MenuButton> pControl) - : WeldToolbarPopup(css::uno::Reference<css::frame::XFrame>(), pControl.get(), "svt/ui/linewindow.ui", "line_popup_window") + : WeldToolbarPopup(css::uno::Reference<css::frame::XFrame>(), pControl.get(), u"svt/ui/linewindow.ui"_ustr, u"line_popup_window"_ustr) , m_xControl(std::move(pControl)) - , m_xNoneButton(m_xBuilder->weld_button("none_line_button")) + , m_xNoneButton(m_xBuilder->weld_button(u"none_line_button"_ustr)) , m_xLineSet(new ValueSet(nullptr)) - , m_xLineSetWin(new weld::CustomWeld(*m_xBuilder, "lineset", *m_xLineSet)) + , m_xLineSetWin(new weld::CustomWeld(*m_xBuilder, u"lineset"_ustr, *m_xLineSet)) , m_nWidth( 5 ) , aVirDev(VclPtr<VirtualDevice>::Create()) , aColor(COL_BLACK) @@ -1490,7 +1490,7 @@ SvtLineListBox::SvtLineListBox(std::unique_ptr<weld::MenuButton> pControl) // lock size to these maxes height/width so it doesn't jump around in size m_xControl->set_label(GetLineStyleName(SvxBorderLineStyle::NONE)); Size aNonePrefSize = m_xControl->get_preferred_size(); - m_xControl->set_label(""); + m_xControl->set_label(u""_ustr); aVirDev->SetOutputSizePixel(getPreviewSize(*m_xControl)); m_xControl->set_image(aVirDev); Size aSolidPrefSize = m_xControl->get_preferred_size(); @@ -1626,7 +1626,7 @@ void SvtLineListBox::UpdatePreview() else { Image aImage(m_xLineSet->GetItemImage(m_xLineSet->GetSelectedItemId())); - m_xControl->set_label(""); + m_xControl->set_label(u""_ustr); const auto nPos = (aVirDev->GetOutputSizePixel().Height() - aImage.GetSizePixel().Height()) / 2; aVirDev->Push(vcl::PushFlags::MAPMODE); aVirDev->SetMapMode(MapMode(MapUnit::MapPixel)); @@ -1642,9 +1642,9 @@ void SvtLineListBox::UpdatePreview() SvtCalendarBox::SvtCalendarBox(std::unique_ptr<weld::MenuButton> pControl, bool bUseLabel) : m_bUseLabel(bUseLabel) , m_xControl(std::move(pControl)) - , m_xBuilder(Application::CreateBuilder(m_xControl.get(), "svt/ui/datewindow.ui")) - , m_xTopLevel(m_xBuilder->weld_popover("date_popup_window")) - , m_xCalendar(m_xBuilder->weld_calendar("date_picker")) + , m_xBuilder(Application::CreateBuilder(m_xControl.get(), u"svt/ui/datewindow.ui"_ustr)) + , m_xTopLevel(m_xBuilder->weld_popover(u"date_popup_window"_ustr)) + , m_xCalendar(m_xBuilder->weld_calendar(u"date_picker"_ustr)) { m_xControl->set_popover(m_xTopLevel.get()); m_xCalendar->connect_selected(LINK(this, SvtCalendarBox, SelectHdl)); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index fb98ebb45182..aa6269c9a21d 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -314,7 +314,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS; if ( bOnlyDirectories ) eInclude = INCLUDE_FOLDERS_ONLY; - uno::Reference< XDynamicResultSet > xDynResultSet = aCnt.createDynamicCursor( { "Title", "IsFolder" }, eInclude ); + uno::Reference< XDynamicResultSet > xDynResultSet = aCnt.createDynamicCursor( { u"Title"_ustr, u"IsFolder"_ustr }, eInclude ); uno::Reference < XAnyCompareFactory > xCompare; uno::Reference < XSortedDynamicResultSetFactory > xSRSFac = @@ -466,7 +466,7 @@ void SvtMatchContext_Impl::doExecute() css::ucb::UniversalContentBroker::create( ctx)); css::uno::Sequence< css::beans::Property > prop{ - { /* Name */ "IsFolder", + { /* Name */ u"IsFolder"_ustr, /* Handle */ -1, /* Type */ cppu::UnoType< bool >::get(), /* Attributes */ {} } @@ -488,7 +488,7 @@ void SvtMatchContext_Impl::doExecute() } res = proc->execute( css::ucb::Command( - "getPropertyValues", -1, + u"getPropertyValues"_ustr, -1, css::uno::Any(prop)), id, css::uno::Reference< @@ -1038,7 +1038,7 @@ OUString SvtURLBox::GetURL() { OUString aFileURL; - Any aAny = UCBContentHelper::GetProperty(aURL, "CasePreservingURL"); + Any aAny = UCBContentHelper::GetProperty(aURL, u"CasePreservingURL"_ustr); bool success = (aAny >>= aFileURL); OUString aTitle; if(success) diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index f26240107f9f..b5b49047a064 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -229,7 +229,7 @@ void Ruler::ImplInit( WinBits nWinBits ) // Setup the default size tools::Rectangle aRect; - GetOutDev()->GetTextBoundRect( aRect, "0123456789" ); + GetOutDev()->GetTextBoundRect( aRect, u"0123456789"_ustr ); tools::Long nDefHeight = aRect.GetHeight() + RULER_OFF * 2 + ruler_tab.textoff * 2 + mnBorderWidth; Size aDefSize; diff --git a/svtools/source/control/scrolladaptor.cxx b/svtools/source/control/scrolladaptor.cxx index 8c2725c1715d..98c4fe7d672c 100644 --- a/svtools/source/control/scrolladaptor.cxx +++ b/svtools/source/control/scrolladaptor.cxx @@ -20,9 +20,8 @@ #include <svtools/scrolladaptor.hxx> ScrollAdaptor::ScrollAdaptor(vcl::Window* pWin, bool bHoriz) - : InterimItemWindow(pWin, "svt/ui/scrollbars.ui", "ScrollBars") - , m_xScrollBar( - m_xBuilder->weld_scrollbar(bHoriz ? OUString("horizontal") : OUString("vertical"))) + : InterimItemWindow(pWin, u"svt/ui/scrollbars.ui"_ustr, u"ScrollBars"_ustr) + , m_xScrollBar(m_xBuilder->weld_scrollbar(bHoriz ? u"horizontal"_ustr : u"vertical"_ustr)) , m_bHori(bHoriz) { m_xScrollBar->show(); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 58fa5d76de3a..2aabd9be3d89 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -345,8 +345,8 @@ public: } TabBarEdit::TabBarEdit(TabBar* pParent) - : InterimItemWindow(pParent, "svt/ui/tabbaredit.ui", "TabBarEdit") - , m_xEntry(m_xBuilder->weld_entry("entry")) + : InterimItemWindow(pParent, u"svt/ui/tabbaredit.ui"_ustr, u"TabBarEdit"_ustr) + , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr)) , maLoseFocusIdle( "svtools::TabBarEdit maLoseFocusIdle" ) { InitControlBase(m_xEntry.get()); @@ -447,14 +447,14 @@ public: TabButtons(TabBar* pParent, bool bSheets) : InterimItemWindow(pParent, - pParent->IsMirrored() ? OUString("svt/ui/tabbuttonsmirrored.ui") - : OUString("svt/ui/tabbuttons.ui"), - "TabButtons") - , m_xFirstButton(m_xBuilder->weld_button("first")) - , m_xPrevButton(m_xBuilder->weld_button("prev")) - , m_xNextButton(m_xBuilder->weld_button("next")) - , m_xLastButton(m_xBuilder->weld_button("last")) - , m_xAddButton(m_xBuilder->weld_button("add")) + pParent->IsMirrored() ? u"svt/ui/tabbuttonsmirrored.ui"_ustr + : u"svt/ui/tabbuttons.ui"_ustr, + u"TabButtons"_ustr) + , m_xFirstButton(m_xBuilder->weld_button(u"first"_ustr)) + , m_xPrevButton(m_xBuilder->weld_button(u"prev"_ustr)) + , m_xNextButton(m_xBuilder->weld_button(u"next"_ustr)) + , m_xLastButton(m_xBuilder->weld_button(u"last"_ustr)) + , m_xAddButton(m_xBuilder->weld_button(u"add"_ustr)) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); SetPaintTransparent(false); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 8a1761a7006e..5d5fc8d375a1 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -108,7 +108,7 @@ WeldToolbarPopup::WeldToolbarPopup(css::uno::Reference<css::frame::XFrame> xFram const OUString& rId) : m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) , m_xTopLevel(m_xBuilder->weld_popover(rId)) - , m_xContainer(m_xBuilder->weld_container("container")) + , m_xContainer(m_xBuilder->weld_container(u"container"_ustr)) , m_xFrame(std::move(xFrame)) { m_xTopLevel->connect_focus_in(LINK(this, WeldToolbarPopup, FocusHdl)); @@ -126,9 +126,9 @@ IMPL_LINK_NOARG(WeldToolbarPopup, FocusHdl, weld::Widget&, void) } ToolbarPopupContainer::ToolbarPopupContainer(weld::Widget* pParent) - : m_xBuilder(Application::CreateBuilder(pParent, "svx/ui/toolbarpopover.ui")) - , m_xTopLevel(m_xBuilder->weld_container("ToolbarPopover")) - , m_xContainer(m_xBuilder->weld_container("container")) + : m_xBuilder(Application::CreateBuilder(pParent, u"svx/ui/toolbarpopover.ui"_ustr)) + , m_xTopLevel(m_xBuilder->weld_container(u"ToolbarPopover"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"container"_ustr)) { m_xTopLevel->connect_focus_in(LINK(this, ToolbarPopupContainer, FocusHdl)); } @@ -169,8 +169,8 @@ InterimToolbarPopup::InterimToolbarPopup(const css::uno::Reference<css::frame::X std::unique_ptr<WeldToolbarPopup> xPopup, bool bTearable) : DropdownDockingWindow(pParent, rFrame, bTearable) , m_xFrame(rFrame) - , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), "svt/ui/interimparent.ui", false)) - , m_xContainer(m_xBuilder->weld_container("container")) + , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), u"svt/ui/interimparent.ui"_ustr, false)) + , m_xContainer(m_xBuilder->weld_container(u"container"_ustr)) , m_xPopup(std::move(xPopup)) { if (SystemWindow* pWindow = GetTopMostParentSystemWindow(*this)) diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 2497d4513b2c..cec532a39a71 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -231,7 +231,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() { const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); - lang::Locale aRet( "", "", "" ); + lang::Locale aRet( u""_ustr, u""_ustr, u""_ustr ); if( xParent.is() ) { @@ -609,7 +609,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); - lang::Locale aRet( "", "", "" ); + lang::Locale aRet( u""_ustr, u""_ustr, u""_ustr ); if( xParent.is() ) { @@ -947,14 +947,14 @@ void ValueSetAcc::ThrowIfDisposed(bool bCheckParent) { SAL_WARN("svx", "Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - "object has been already disposed", + u"object has been already disposed"_ustr, getXWeak()); } if (bCheckParent && !mpParent) { assert(false && "ValueSetAcc not disposed but mpParent == NULL"); - throw css::uno::RuntimeException("ValueSetAcc not disposed but mpParent == NULL"); + throw css::uno::RuntimeException(u"ValueSetAcc not disposed but mpParent == NULL"_ustr); } } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index a51486e408a8..2905f502b857 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -22,40 +22,40 @@ using namespace com::sun::star::uno; PlaceEditDialog::PlaceEditDialog(weld::Window* pParent) - : GenericDialogController(pParent, "svt/ui/placeedit.ui", "PlaceEditDialog") + : GenericDialogController(pParent, u"svt/ui/placeedit.ui"_ustr, u"PlaceEditDialog"_ustr) , m_xCurrentDetails() , m_nCurrentType( 0 ) , m_bLabelChanged( false ) , m_bShowPassword( true ) - , m_xEDServerName(m_xBuilder->weld_entry("name")) - , m_xLBServerType(m_xBuilder->weld_combo_box("type")) - , m_xEDUsername(m_xBuilder->weld_entry("login")) - , m_xFTUsernameLabel(m_xBuilder->weld_label("loginLabel")) - , m_xBTOk(m_xBuilder->weld_button("ok")) - , m_xBTDelete(m_xBuilder->weld_button("delete")) - , m_xBTRepoRefresh(m_xBuilder->weld_button("repositoriesRefresh")) - , m_xCBPassword(m_xBuilder->weld_check_button("rememberPassword")) - , m_xEDPassword(m_xBuilder->weld_entry("password")) - , m_xFTPasswordLabel(m_xBuilder->weld_label("passwordLabel")) - , m_xTypeGrid(m_xBuilder->weld_widget("TypeGrid")) - - , m_xRepositoryBox(m_xBuilder->weld_widget("RepositoryDetails")) - , m_xFTRepository(m_xBuilder->weld_label("repositoryLabel")) - , m_xLBRepository(m_xBuilder->weld_combo_box("repositories")) - - , m_xEDShare(m_xBuilder->weld_entry("share")) - , m_xFTShare(m_xBuilder->weld_label("shareLabel")) - - , m_xDetailsGrid(m_xBuilder->weld_widget("Details")) - , m_xHostBox(m_xBuilder->weld_widget("HostDetails")) - , m_xEDHost(m_xBuilder->weld_entry("host")) - , m_xFTHost(m_xBuilder->weld_label("hostLabel")) - , m_xEDPort(m_xBuilder->weld_spin_button("port")) - , m_xFTPort(m_xBuilder->weld_label("portLabel")) - , m_xEDRoot(m_xBuilder->weld_entry("path")) - , m_xFTRoot(m_xBuilder->weld_label("pathLabel")) - - , m_xCBDavs(m_xBuilder->weld_check_button("webdavs")) + , m_xEDServerName(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xLBServerType(m_xBuilder->weld_combo_box(u"type"_ustr)) + , m_xEDUsername(m_xBuilder->weld_entry(u"login"_ustr)) + , m_xFTUsernameLabel(m_xBuilder->weld_label(u"loginLabel"_ustr)) + , m_xBTOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xBTDelete(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xBTRepoRefresh(m_xBuilder->weld_button(u"repositoriesRefresh"_ustr)) + , m_xCBPassword(m_xBuilder->weld_check_button(u"rememberPassword"_ustr)) + , m_xEDPassword(m_xBuilder->weld_entry(u"password"_ustr)) + , m_xFTPasswordLabel(m_xBuilder->weld_label(u"passwordLabel"_ustr)) + , m_xTypeGrid(m_xBuilder->weld_widget(u"TypeGrid"_ustr)) + + , m_xRepositoryBox(m_xBuilder->weld_widget(u"RepositoryDetails"_ustr)) + , m_xFTRepository(m_xBuilder->weld_label(u"repositoryLabel"_ustr)) + , m_xLBRepository(m_xBuilder->weld_combo_box(u"repositories"_ustr)) + + , m_xEDShare(m_xBuilder->weld_entry(u"share"_ustr)) + , m_xFTShare(m_xBuilder->weld_label(u"shareLabel"_ustr)) + + , m_xDetailsGrid(m_xBuilder->weld_widget(u"Details"_ustr)) + , m_xHostBox(m_xBuilder->weld_widget(u"HostDetails"_ustr)) + , m_xEDHost(m_xBuilder->weld_entry(u"host"_ustr)) + , m_xFTHost(m_xBuilder->weld_label(u"hostLabel"_ustr)) + , m_xEDPort(m_xBuilder->weld_spin_button(u"port"_ustr)) + , m_xFTPort(m_xBuilder->weld_label(u"portLabel"_ustr)) + , m_xEDRoot(m_xBuilder->weld_entry(u"path"_ustr)) + , m_xFTRoot(m_xBuilder->weld_label(u"pathLabel"_ustr)) + + , m_xCBDavs(m_xBuilder->weld_check_button(u"webdavs"_ustr)) { m_xBTOk->connect_clicked( LINK( this, PlaceEditDialog, OKHdl) ); m_xBTOk->set_sensitive( false ); @@ -74,39 +74,39 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent) } PlaceEditDialog::PlaceEditDialog(weld::Window* pParent, const std::shared_ptr<Place>& rPlace) - : GenericDialogController(pParent, "svt/ui/placeedit.ui", "PlaceEditDialog") + : GenericDialogController(pParent, u"svt/ui/placeedit.ui"_ustr, u"PlaceEditDialog"_ustr) , m_xCurrentDetails( ) , m_bLabelChanged( true ) , m_bShowPassword( false ) - , m_xEDServerName(m_xBuilder->weld_entry("name")) - , m_xLBServerType(m_xBuilder->weld_combo_box("type")) - , m_xEDUsername(m_xBuilder->weld_entry("login")) - , m_xFTUsernameLabel(m_xBuilder->weld_label("loginLabel")) - , m_xBTOk(m_xBuilder->weld_button("ok")) - , m_xBTDelete(m_xBuilder->weld_button("delete")) - , m_xBTRepoRefresh(m_xBuilder->weld_button("repositoriesRefresh")) - , m_xCBPassword(m_xBuilder->weld_check_button("rememberPassword")) - , m_xEDPassword(m_xBuilder->weld_entry("password")) - , m_xFTPasswordLabel(m_xBuilder->weld_label("passwordLabel")) - , m_xTypeGrid(m_xBuilder->weld_widget("TypeGrid")) - - , m_xRepositoryBox(m_xBuilder->weld_widget("RepositoryDetails")) - , m_xFTRepository(m_xBuilder->weld_label("repositoryLabel")) - , m_xLBRepository(m_xBuilder->weld_combo_box("repositories")) - - , m_xEDShare(m_xBuilder->weld_entry("share")) - , m_xFTShare(m_xBuilder->weld_label("shareLabel")) - - , m_xDetailsGrid(m_xBuilder->weld_widget("Details")) - , m_xHostBox(m_xBuilder->weld_widget("HostDetails")) - , m_xEDHost(m_xBuilder->weld_entry("host")) - , m_xFTHost(m_xBuilder->weld_label("hostLabel")) - , m_xEDPort(m_xBuilder->weld_spin_button("port")) - , m_xFTPort(m_xBuilder->weld_label("portLabel")) - , m_xEDRoot(m_xBuilder->weld_entry("path")) - , m_xFTRoot(m_xBuilder->weld_label("pathLabel")) - - , m_xCBDavs(m_xBuilder->weld_check_button("webdavs")) + , m_xEDServerName(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xLBServerType(m_xBuilder->weld_combo_box(u"type"_ustr)) + , m_xEDUsername(m_xBuilder->weld_entry(u"login"_ustr)) + , m_xFTUsernameLabel(m_xBuilder->weld_label(u"loginLabel"_ustr)) + , m_xBTOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xBTDelete(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xBTRepoRefresh(m_xBuilder->weld_button(u"repositoriesRefresh"_ustr)) + , m_xCBPassword(m_xBuilder->weld_check_button(u"rememberPassword"_ustr)) + , m_xEDPassword(m_xBuilder->weld_entry(u"password"_ustr)) + , m_xFTPasswordLabel(m_xBuilder->weld_label(u"passwordLabel"_ustr)) + , m_xTypeGrid(m_xBuilder->weld_widget(u"TypeGrid"_ustr)) + + , m_xRepositoryBox(m_xBuilder->weld_widget(u"RepositoryDetails"_ustr)) + , m_xFTRepository(m_xBuilder->weld_label(u"repositoryLabel"_ustr)) + , m_xLBRepository(m_xBuilder->weld_combo_box(u"repositories"_ustr)) + + , m_xEDShare(m_xBuilder->weld_entry(u"share"_ustr)) + , m_xFTShare(m_xBuilder->weld_label(u"shareLabel"_ustr)) + + , m_xDetailsGrid(m_xBuilder->weld_widget(u"Details"_ustr)) + , m_xHostBox(m_xBuilder->weld_widget(u"HostDetails"_ustr)) + , m_xEDHost(m_xBuilder->weld_entry(u"host"_ustr)) + , m_xFTHost(m_xBuilder->weld_label(u"hostLabel"_ustr)) + , m_xEDPort(m_xBuilder->weld_spin_button(u"port"_ustr)) + , m_xFTPort(m_xBuilder->weld_label(u"portLabel"_ustr)) + , m_xEDRoot(m_xBuilder->weld_entry(u"path"_ustr)) + , m_xFTRoot(m_xBuilder->weld_label(u"pathLabel"_ustr)) + + , m_xCBDavs(m_xBuilder->weld_check_button(u"webdavs"_ustr)) { m_xEDPassword->hide(); m_xFTPasswordLabel->hide(); diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 36ae07533357..055cb60324f0 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -149,7 +149,7 @@ bool HostDetailsContainer::verifyScheme( const OUString& sScheme ) } DavDetailsContainer::DavDetailsContainer(PlaceEditDialog* pBuilder) - : HostDetailsContainer(pBuilder, 80, "http") + : HostDetailsContainer(pBuilder, 80, u"http"_ustr) { m_pDialog->m_xCBDavs->connect_toggled(LINK(this, DavDetailsContainer, ToggledDavsHdl)); @@ -193,7 +193,7 @@ IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, weld::Toggleable&, rCheckBox, vo else if ( m_pDialog->m_xEDPort->get_value() == 443 && !bCheckedDavs ) m_pDialog->m_xEDPort->set_value( 80 ); - OUString sScheme( "http" ); + OUString sScheme( u"http"_ustr ); if ( bCheckedDavs ) sScheme = "https"; setScheme( sScheme ); @@ -400,7 +400,7 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, weld::Button&, void ) OUString sBindingUrl = m_pDialog->m_xEDHost->get_text().trim( ); - OUString sEncodedUsername = ""; + OUString sEncodedUsername = u""_ustr; if ( !m_sUsername.isEmpty( ) ) { @@ -448,7 +448,7 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, weld::Button&, void ) { // Get the Content ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() ); - Sequence<OUString> aProps { "Title" }; + Sequence<OUString> aProps { u"Title"_ustr }; Reference< XResultSet > xResultSet( aCnt.createCursor( aProps ), UNO_SET_THROW ); Reference< XContentAccess > xAccess( xResultSet, UNO_QUERY_THROW ); while ( xResultSet->next() ) diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 1da175a6452f..0a211b641e19 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -286,9 +286,9 @@ void AssignmentPersistentData::ImplCommit() AssignmentPersistentData::AssignmentPersistentData() - :ConfigItem("Office.DataAccess/AddressBook") + :ConfigItem(u"Office.DataAccess/AddressBook"_ustr) { - const Sequence< OUString > aStoredNames = GetNodeNames("Fields"); + const Sequence< OUString > aStoredNames = GetNodeNames(u"Fields"_ustr); m_aStoredFields.insert(aStoredNames.begin(), aStoredNames.end()); } @@ -348,7 +348,7 @@ void AssignmentPersistentData::ImplCommit() } // Fields - OUString sDescriptionNodePath("Fields"); + OUString sDescriptionNodePath(u"Fields"_ustr); // Fields/<field> OUString sFieldElementNodePath = sDescriptionNodePath + "/" + _rLogicalName; @@ -376,7 +376,7 @@ void AssignmentPersistentData::ImplCommit() return; Sequence< OUString > aNames(&_rLogicalName, 1); - ClearNodeElements("Fields", aNames); + ClearNodeElements(u"Fields"_ustr, aNames); } @@ -461,7 +461,7 @@ void AssignmentPersistentData::ImplCommit() // = AddressBookSourceDialog AddressBookSourceDialog::AddressBookSourceDialog(weld::Window* pParent, const Reference< XComponentContext >& _rxORB ) - : GenericDialogController(pParent, "svt/ui/addresstemplatedialog.ui", "AddressTemplateDialog") + : GenericDialogController(pParent, u"svt/ui/addresstemplatedialog.ui"_ustr, u"AddressTemplateDialog"_ustr) , m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION)) , m_xORB(_rxORB) , m_pImpl( new AddressBookSourceDialogData ) @@ -472,7 +472,7 @@ void AssignmentPersistentData::ImplCommit() AddressBookSourceDialog::AddressBookSourceDialog(weld::Window* pParent, const Reference< XComponentContext >& _rxORB, const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) - : GenericDialogController(pParent, "svt/ui/addresstemplatedialog.ui", "AddressTemplateDialog") + : GenericDialogController(pParent, u"svt/ui/addresstemplatedialog.ui"_ustr, u"AddressTemplateDialog"_ustr) , m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION)) , m_xORB(_rxORB) , m_pImpl( new AddressBookSourceDialogData( _rxTransientDS, _rDataSourceName, _rTable, _rMapping ) ) @@ -482,12 +482,12 @@ void AssignmentPersistentData::ImplCommit() void AddressBookSourceDialog::implConstruct() { - m_xOKButton = m_xBuilder->weld_button("ok"); - m_xDatasource = m_xBuilder->weld_combo_box("datasource"); - m_xAdministrateDatasources = m_xBuilder->weld_button("admin"); - m_xTable = m_xBuilder->weld_combo_box("datatable"); - m_xFieldScroller = m_xBuilder->weld_scrolled_window("scrollwindow", true); - m_xGrid = m_xBuilder->weld_widget("grid"); + m_xOKButton = m_xBuilder->weld_button(u"ok"_ustr); + m_xDatasource = m_xBuilder->weld_combo_box(u"datasource"_ustr); + m_xAdministrateDatasources = m_xBuilder->weld_button(u"admin"_ustr); + m_xTable = m_xBuilder->weld_combo_box(u"datatable"_ustr); + m_xFieldScroller = m_xBuilder->weld_scrolled_window(u"scrollwindow"_ustr, true); + m_xGrid = m_xBuilder->weld_widget(u"grid"_ustr); for (sal_Int32 row=0; row<FIELD_PAIRS_VISIBLE; ++row) { @@ -1080,7 +1080,7 @@ void AssignmentPersistentData::ImplCommit() if ( xProp.is() ) { OUString sName; - xProp->getPropertyValue("DataSourceName") >>= sName; + xProp->getPropertyValue(u"DataSourceName"_ustr) >>= sName; INetURLObject aURL( sName ); if( aURL.GetProtocol() != INetProtocol::NotValid ) diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 496f95bf1d9f..4de8ed7377bc 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -74,7 +74,7 @@ short SvColorDialog::Execute(weld::Window* pParent) Sequence< PropertyValue > props{ comphelper::makePropertyValue(sColor, maColor), - comphelper::makePropertyValue("Mode", static_cast<sal_Int16>(meMode)) + comphelper::makePropertyValue(u"Mode"_ustr, static_cast<sal_Int16>(meMode)) }; xPropertyAccess->setPropertyValues( props ); @@ -118,7 +118,7 @@ void SvColorDialog::ExecuteAsync(weld::Window* pParent, const std::function<void Sequence< PropertyValue > props{ comphelper::makePropertyValue(sColor, maColor), - comphelper::makePropertyValue("Mode", static_cast<sal_Int16>(meMode)) + comphelper::makePropertyValue(u"Mode"_ustr, static_cast<sal_Int16>(meMode)) }; xPropertyAccess->setPropertyValues( props ); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 50fad4a75dcd..b59705dc456c 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -115,10 +115,10 @@ void SvObjectServerList::FillInsertObjects() uno::Sequence<uno::Any> aArguments(comphelper::InitAnyPropertySequence( { - {"nodepath", uno::Any(OUString( "/org.openoffice.Office.Embedding/ObjectNames" ))} + {"nodepath", uno::Any(u"/org.openoffice.Office.Embedding/ObjectNames"_ustr)} })); uno::Reference< container::XNameAccess > xNameAccess( - sProviderMSFactory->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aArguments ), + sProviderMSFactory->createInstanceWithArguments( u"com.sun.star.configuration.ConfigurationAccess"_ustr, aArguments ), uno::UNO_QUERY ); if( xNameAccess.is()) @@ -133,8 +133,8 @@ void SvObjectServerList::FillInsertObjects() { OUString aUIName; OUString aClassID; - xEntry->getByName("ObjectUIName") >>= aUIName; - xEntry->getByName("ClassID") >>= aClassID; + xEntry->getByName(u"ObjectUIName"_ustr) >>= aUIName; + xEntry->getByName(u"ClassID"_ustr) >>= aClassID; if ( !aUIName.isEmpty() ) { diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 60dba4348ec3..9d71832b3513 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -215,14 +215,14 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) } PrinterSetupDialog::PrinterSetupDialog(weld::Window* pParent) - : GenericDialogController(pParent, "svt/ui/printersetupdialog.ui", "PrinterSetupDialog") - , m_xLbName(m_xBuilder->weld_combo_box("name")) - , m_xBtnProperties(m_xBuilder->weld_button("properties")) - , m_xBtnOptions(m_xBuilder->weld_button("options")) - , m_xFiStatus(m_xBuilder->weld_label("status")) - , m_xFiType(m_xBuilder->weld_label("type")) - , m_xFiLocation(m_xBuilder->weld_label("location")) - , m_xFiComment(m_xBuilder->weld_label("comment")) + : GenericDialogController(pParent, u"svt/ui/printersetupdialog.ui"_ustr, u"PrinterSetupDialog"_ustr) + , m_xLbName(m_xBuilder->weld_combo_box(u"name"_ustr)) + , m_xBtnProperties(m_xBuilder->weld_button(u"properties"_ustr)) + , m_xBtnOptions(m_xBuilder->weld_button(u"options"_ustr)) + , m_xFiStatus(m_xBuilder->weld_label(u"status"_ustr)) + , m_xFiType(m_xBuilder->weld_label(u"type"_ustr)) + , m_xFiLocation(m_xBuilder->weld_label(u"location"_ustr)) + , m_xFiComment(m_xBuilder->weld_label(u"comment"_ustr)) , maStatusTimer("PrinterSetupDialog maStatusTimer") { m_xLbName->make_sorted(); diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index f4c838a22fc3..3c66343cec2b 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -24,49 +24,49 @@ namespace { class RestartDialog : public weld::GenericDialogController{ public: RestartDialog(weld::Window* parent, svtools::RestartReason reason) - : GenericDialogController(parent, "svt/ui/restartdialog.ui", "RestartDialog") - , btnYes_(m_xBuilder->weld_button("yes")) - , btnNo_(m_xBuilder->weld_button("no")) + : GenericDialogController(parent, u"svt/ui/restartdialog.ui"_ustr, u"RestartDialog"_ustr) + , btnYes_(m_xBuilder->weld_button(u"yes"_ustr)) + , btnNo_(m_xBuilder->weld_button(u"no"_ustr)) { switch (reason) { case svtools::RESTART_REASON_JAVA: - reason_ = m_xBuilder->weld_widget("reason_java"); + reason_ = m_xBuilder->weld_widget(u"reason_java"_ustr); break; case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL: - reason_ = m_xBuilder->weld_widget("reason_bibliography_install"); + reason_ = m_xBuilder->weld_widget(u"reason_bibliography_install"_ustr); break; case svtools::RESTART_REASON_MAILMERGE_INSTALL: - reason_ = m_xBuilder->weld_widget("reason_mailmerge_install"); + reason_ = m_xBuilder->weld_widget(u"reason_mailmerge_install"_ustr); break; case svtools::RESTART_REASON_LANGUAGE_CHANGE: - reason_ = m_xBuilder->weld_widget("reason_language_change"); + reason_ = m_xBuilder->weld_widget(u"reason_language_change"_ustr); break; case svtools::RESTART_REASON_ADDING_PATH: - reason_ = m_xBuilder->weld_widget("reason_adding_path"); + reason_ = m_xBuilder->weld_widget(u"reason_adding_path"_ustr); break; case svtools::RESTART_REASON_ASSIGNING_JAVAPARAMETERS: - reason_ = m_xBuilder->weld_widget("reason_assigning_javaparameters"); + reason_ = m_xBuilder->weld_widget(u"reason_assigning_javaparameters"_ustr); break; case svtools::RESTART_REASON_ASSIGNING_FOLDERS: - reason_ = m_xBuilder->weld_widget("reason_assigning_folders"); + reason_ = m_xBuilder->weld_widget(u"reason_assigning_folders"_ustr); break; case svtools::RESTART_REASON_EXP_FEATURES: - reason_ = m_xBuilder->weld_widget("reason_exp_features"); + reason_ = m_xBuilder->weld_widget(u"reason_exp_features"_ustr); break; case svtools::RESTART_REASON_EXTENSION_INSTALL: - reason_ = m_xBuilder->weld_widget("reason_extension_install"); + reason_ = m_xBuilder->weld_widget(u"reason_extension_install"_ustr); break; case svtools::RESTART_REASON_SKIA: - reason_ = m_xBuilder->weld_widget("reason_skia"); + reason_ = m_xBuilder->weld_widget(u"reason_skia"_ustr); break; case svtools::RESTART_REASON_OPENCL: - reason_ = m_xBuilder->weld_widget("reason_opencl"); + reason_ = m_xBuilder->weld_widget(u"reason_opencl"_ustr); break; case svtools::RESTART_REASON_THREADING: - reason_ = m_xBuilder->weld_widget("reason_threading"); + reason_ = m_xBuilder->weld_widget(u"reason_threading"_ustr); break; case svtools::RESTART_REASON_UI_CHANGE: - reason_ = m_xBuilder->weld_widget("reason_uichange"); + reason_ = m_xBuilder->weld_widget(u"reason_uichange"_ustr); break; default: assert(false); // this cannot happen diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx index c2858a1dae60..67b080261238 100644 --- a/svtools/source/filter/DocumentToGraphicRenderer.cxx +++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx @@ -59,11 +59,11 @@ DocumentToGraphicRenderer::DocumentToGraphicRenderer( const Reference<XComponent uno::Reference< lang::XServiceInfo > xServiceInfo( mxDocument, uno::UNO_QUERY); if (xServiceInfo.is()) { - if (xServiceInfo->supportsService("com.sun.star.text.TextDocument")) + if (xServiceInfo->supportsService(u"com.sun.star.text.TextDocument"_ustr)) meDocType = WRITER; - else if (xServiceInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.sheet.SpreadsheetDocument"_ustr)) meDocType = CALC; - else if (xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.presentation.PresentationDocument"_ustr)) meDocType = IMPRESS; else meDocType = UNKNOWN; @@ -131,10 +131,10 @@ Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 nCurrentPage, uno::Any selection( getSelection()); - PropertyValues renderProperties{ comphelper::makePropertyValue("IsPrinter", true), - comphelper::makePropertyValue("RenderDevice", xDevice), - comphelper::makePropertyValue("View", mxController), - comphelper::makePropertyValue("RenderToGraphic", true) }; + PropertyValues renderProperties{ comphelper::makePropertyValue(u"IsPrinter"_ustr, true), + comphelper::makePropertyValue(u"RenderDevice"_ustr, xDevice), + comphelper::makePropertyValue(u"View"_ustr, mxController), + comphelper::makePropertyValue(u"RenderToGraphic"_ustr, true) }; awt::Size aSize; awt::Size aCalcPageSize; @@ -203,12 +203,12 @@ Graphic DocumentToGraphicRenderer::renderToGraphic( double fScaleY = aTargetSizePixel.Height() / static_cast<double>(aDocumentSizePixel.Height()); PropertyValues renderProps{ - comphelper::makePropertyValue("IsPrinter", true), - comphelper::makePropertyValue("RenderDevice", xDevice), - comphelper::makePropertyValue("View", mxController), - comphelper::makePropertyValue("RenderToGraphic", true), - comphelper::makePropertyValue("HasPDFExtOutDevData", bExtOutDevData), - comphelper::makePropertyValue("PageRange", OUString::number(nCurrentPage)) + comphelper::makePropertyValue(u"IsPrinter"_ustr, true), + comphelper::makePropertyValue(u"RenderDevice"_ustr, xDevice), + comphelper::makePropertyValue(u"View"_ustr, mxController), + comphelper::makePropertyValue(u"RenderToGraphic"_ustr, true), + comphelper::makePropertyValue(u"HasPDFExtOutDevData"_ustr, bExtOutDevData), + comphelper::makePropertyValue(u"PageRange"_ustr, OUString::number(nCurrentPage)) }; GDIMetaFile aMtf; @@ -272,10 +272,10 @@ sal_Int32 DocumentToGraphicRenderer::getPageCount() uno::Any selection( getSelection() ); - PropertyValues renderProperties{ comphelper::makePropertyValue("IsPrinter", true), - comphelper::makePropertyValue("RenderDevice", xDevice), - comphelper::makePropertyValue("View", mxController), - comphelper::makePropertyValue("RenderToGraphic", true) }; + PropertyValues renderProperties{ comphelper::makePropertyValue(u"IsPrinter"_ustr, true), + comphelper::makePropertyValue(u"RenderDevice"_ustr, xDevice), + comphelper::makePropertyValue(u"View"_ustr, mxController), + comphelper::makePropertyValue(u"RenderToGraphic"_ustr, true) }; sal_Int32 nPages = mxRenderable->getRendererCount( selection, renderProperties ); diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 4291c15a88eb..3a3c9e7a548b 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -135,7 +135,7 @@ void SAL_CALL SvFilterOptionsDialog::initialize(const uno::Sequence<uno::Any>& r // XServiceInfo OUString SAL_CALL SvFilterOptionsDialog::getImplementationName() { - return "com.sun.star.svtools.SvFilterOptionsDialog"; + return u"com.sun.star.svtools.SvFilterOptionsDialog"_ustr; } sal_Bool SAL_CALL SvFilterOptionsDialog::supportsService( const OUString& rServiceName ) { @@ -143,7 +143,7 @@ sal_Bool SAL_CALL SvFilterOptionsDialog::supportsService( const OUString& rServi } uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog::getSupportedServiceNames() { - return { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; + return { u"com.sun.star.ui.dialogs.FilterOptionsDialog"_ustr }; } // XPropertyAccess @@ -252,16 +252,16 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp if ( !xServiceInfo.is() ) return; - if ( xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument") ) + if ( xServiceInfo->supportsService(u"com.sun.star.presentation.PresentationDocument"_ustr) ) aConfigPath = "Office.Impress/Layout/Other/MeasureUnit"; - else if ( xServiceInfo->supportsService("com.sun.star.drawing.DrawingDocument") ) + else if ( xServiceInfo->supportsService(u"com.sun.star.drawing.DrawingDocument"_ustr) ) aConfigPath = "Office.Draw/Layout/Other/MeasureUnit"; else { mbGraphicsSource = false; - if ( xServiceInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument") ) + if ( xServiceInfo->supportsService(u"com.sun.star.sheet.SpreadsheetDocument"_ustr) ) aConfigPath = "Office.Calc/Layout/Other/MeasureUnit"; - else if ( xServiceInfo->supportsService("com.sun.star.text.TextDocument") ) + else if ( xServiceInfo->supportsService(u"com.sun.star.text.TextDocument"_ustr) ) aConfigPath = "Office.Writer/Layout/Other/MeasureUnit"; } if ( !aConfigPath.isEmpty() ) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 22013e1f9e6b..55a7dd563917 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -175,16 +175,16 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC if ( nResolution < 1 ) nResolution = 96; - mpOptionsItem->WriteInt32("PixelExportUnit", nUnit); - mpOptionsItem->WriteInt32("PixelExportResolution", nResolution); - mpOptionsItem->WriteInt32("PixelExportResolutionUnit", mxLbResolution->get_active()); + mpOptionsItem->WriteInt32(u"PixelExportUnit"_ustr, nUnit); + mpOptionsItem->WriteInt32(u"PixelExportResolution"_ustr, nResolution); + mpOptionsItem->WriteInt32(u"PixelExportResolutionUnit"_ustr, mxLbResolution->get_active()); } else { if ( nUnit >= UNIT_PIXEL ) nUnit = UNIT_CM; - mpOptionsItem->WriteInt32("VectorExportUnit", nUnit); + mpOptionsItem->WriteInt32(u"VectorExportUnit"_ustr, nUnit); } } @@ -201,8 +201,8 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC static constexpr OUString sLogicalHeight(u"LogicalHeight"_ustr); if ( mbIsPixelFormat ) { - pFilterOptions->WriteInt32("PixelWidth", maSize.Width ); - pFilterOptions->WriteInt32("PixelHeight", maSize.Height ); + pFilterOptions->WriteInt32(u"PixelWidth"_ustr, maSize.Width ); + pFilterOptions->WriteInt32(u"PixelHeight"_ustr, maSize.Height ); if ( maResolution.Width && maResolution.Height ) { const double f100thmmPerPixelX = 100000.0 / maResolution.Width; @@ -230,31 +230,31 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC nColor = 0; else nColor = 1; - pFilterOptions->WriteInt32("ColorMode", nColor); + pFilterOptions->WriteInt32(u"ColorMode"_ustr, nColor); assert(mpSbCompression); - pFilterOptions->WriteInt32("Quality", static_cast<sal_Int32>(mpSbCompression->get_value())); + pFilterOptions->WriteInt32(u"Quality"_ustr, static_cast<sal_Int32>(mpSbCompression->get_value())); } break; case FORMAT_PNG : { assert(mpSbCompression); - pFilterOptions->WriteInt32("Compression", static_cast<sal_Int32>(mpSbCompression->get_value())); + pFilterOptions->WriteInt32(u"Compression"_ustr, static_cast<sal_Int32>(mpSbCompression->get_value())); sal_Int32 nInterlace = 0; if ( mxCbInterlaced->get_active() ) nInterlace++; - pFilterOptions->WriteInt32("Interlaced", nInterlace); + pFilterOptions->WriteInt32(u"Interlaced"_ustr, nInterlace); sal_Int32 nValue = 0; if ( mxCbSaveTransparency->get_active() ) nValue++; - pFilterOptions->WriteInt32("Translucent", nValue); + pFilterOptions->WriteInt32(u"Translucent"_ustr, nValue); } break; case FORMAT_BMP : { - pFilterOptions->WriteInt32("Color", mxLbColorDepth->get_active() + 1); - pFilterOptions->WriteBool("RLE_Coding", mxCbRLEEncoding->get_active()); + pFilterOptions->WriteInt32(u"Color"_ustr, mxLbColorDepth->get_active() + 1); + pFilterOptions->WriteBool(u"RLE_Coding"_ustr, mxCbRLEEncoding->get_active()); } break; @@ -263,12 +263,12 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC sal_Int32 nValue = 0; if ( mxCbInterlaced->get_active() ) nValue++; - pFilterOptions->WriteInt32("Interlaced", nValue); + pFilterOptions->WriteInt32(u"Interlaced"_ustr, nValue); nValue = 0; if (mxCbSaveTransparency->get_active()) nValue++; - pFilterOptions->WriteInt32("Translucent", nValue); + pFilterOptions->WriteInt32(u"Translucent"_ustr, nValue); } break; @@ -279,30 +279,30 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC nCheck++; if ( mxCbEPSPreviewEPSI->get_active() ) nCheck += 2; - pFilterOptions->WriteInt32("Preview", nCheck); + pFilterOptions->WriteInt32(u"Preview"_ustr, nCheck); nCheck = 1; if ( mxRbEPSLevel2->get_active() ) nCheck++; - pFilterOptions->WriteInt32("Version", nCheck); + pFilterOptions->WriteInt32(u"Version"_ustr, nCheck); nCheck = 1; if ( mxRbEPSColorFormat2->get_active() ) nCheck++; - pFilterOptions->WriteInt32("ColorFormat", nCheck); + pFilterOptions->WriteInt32(u"ColorFormat"_ustr, nCheck); nCheck = 1; if ( mxRbEPSCompressionNone->get_active() ) nCheck++; - pFilterOptions->WriteInt32("CompressionMode", nCheck); + pFilterOptions->WriteInt32(u"CompressionMode"_ustr, nCheck); } break; case FORMAT_WEBP : { assert(mpSbCompression); - pFilterOptions->WriteInt32("Quality", static_cast<sal_Int32>(mpSbCompression->get_value())); - pFilterOptions->WriteBool("Lossless", mxCbLossless->get_active()); + pFilterOptions->WriteInt32(u"Quality"_ustr, static_cast<sal_Int32>(mpSbCompression->get_value())); + pFilterOptions->WriteBool(u"Lossless"_ustr, mxCbLossless->get_active()); } break; @@ -327,9 +327,9 @@ awt::Size ExportDialog::GetOriginalSize() sal_Int32 nWidth = 0; sal_Int32 nHeight= 0; css::uno::Any aAny; - aAny = xPagePropSet->getPropertyValue("Width"); + aAny = xPagePropSet->getPropertyValue(u"Width"_ustr); aAny >>= nWidth; - aAny = xPagePropSet->getPropertyValue("Height"); + aAny = xPagePropSet->getPropertyValue(u"Height"_ustr); aAny >>= nHeight; aShapesRange = basegfx::B2DRange( 0, 0, nWidth, nHeight ); } @@ -348,7 +348,7 @@ awt::Size ExportDialog::GetOriginalSize() aTransformation.m12 = aViewTransformation.get(1,2); uno::Sequence< beans::PropertyValue > aViewInformation{ comphelper::makePropertyValue( - "ViewTransformation", aTransformation) }; + u"ViewTransformation"_ustr, aTransformation) }; if ( mxShape.is() ) aShapesRange = GetShapeRangeForXShape( mxShape, xPrimitiveFactory, aViewInformation ); @@ -494,9 +494,9 @@ void ExportDialog::GetGraphicStream() OUString sFormat( maExt ); uno::Sequence< beans::PropertyValue > aDescriptor{ - comphelper::makePropertyValue("OutputStream", xOutputStream), - comphelper::makePropertyValue("FilterName", sFormat), - comphelper::makePropertyValue("FilterData", aNewFilterData) + comphelper::makePropertyValue(u"OutputStream"_ustr, xOutputStream), + comphelper::makePropertyValue(u"FilterName"_ustr, sFormat), + comphelper::makePropertyValue(u"FilterData"_ustr, aNewFilterData) }; uno::Reference< drawing::XGraphicExportFilter > xGraphicExporter = @@ -556,7 +556,7 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, const css::uno::Reference< css::lang::XComponent >& rxSourceDocument, bool bExportSelection, bool bIsPixelFormat, bool bGraphicsSource, const css::uno::Reference< css::graphic::XGraphic >& rxGraphic) - : GenericDialogController(rPara.pWindow, "svt/ui/graphicexport.ui", "GraphicExportDialog") + : GenericDialogController(rPara.pWindow, u"svt/ui/graphicexport.ui"_ustr, u"GraphicExportDialog"_ustr) , mrFltCallPara(rPara) , mxContext(std::move(xContext)) , mxSourceDocument(rxSourceDocument) @@ -578,61 +578,61 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, , mbGraphicsSource(bGraphicsSource) , mpSbCompression(nullptr) , mpNfCompression(nullptr) - , mxMfSizeX(m_xBuilder->weld_spin_button("widthmf")) - , mxLbSizeX(m_xBuilder->weld_combo_box("widthlb")) - , mxMfSizeY(m_xBuilder->weld_spin_button( "heightmf")) - , mxFtResolution(m_xBuilder->weld_label("resolutionft")) - , mxNfResolution(m_xBuilder->weld_spin_button("resolutionmf")) - , mxLbResolution(m_xBuilder->weld_combo_box("resolutionlb")) - , mxColorDepth(m_xBuilder->weld_widget("colordepth")) - , mxLbColorDepth(m_xBuilder->weld_combo_box("colordepthlb")) - , mxJPGWEBPQuality(m_xBuilder->weld_widget("jpgwebpquality")) - , mxPNGCompression(m_xBuilder->weld_widget("pngcompression")) - , mxSbPngCompression(m_xBuilder->weld_scale("compressionpngsb")) - , mxNfPngCompression(m_xBuilder->weld_spin_button("compressionpngnf")) - , mxSbJpgWebpCompression(m_xBuilder->weld_scale("compressionjpgwebpsb")) - , mxNfJpgWebpCompression(m_xBuilder->weld_spin_button("compressionjpgwebpnf")) - , mxCbLossless(m_xBuilder->weld_check_button("losslesscb")) - , mxMode(m_xBuilder->weld_widget("mode")) - , mxCbInterlaced(m_xBuilder->weld_check_button("interlacedcb")) - , mxBMPCompression(m_xBuilder->weld_widget("bmpcompression")) - , mxCbRLEEncoding(m_xBuilder->weld_check_button("rlecb")) - , mxDrawingObjects(m_xBuilder->weld_widget("drawingobjects")) - , mxCbSaveTransparency(m_xBuilder->weld_check_button("savetransparencycb")) - , mxEncoding(m_xBuilder->weld_widget("encoding")) - , mxRbBinary(m_xBuilder->weld_radio_button("binarycb")) - , mxRbText(m_xBuilder->weld_radio_button("textcb")) - , mxEPSGrid(m_xBuilder->weld_widget("epsgrid")) - , mxModifyDimension(m_xBuilder->weld_radio_button("modifydimensionscb")) - , mxModifyResolution(m_xBuilder->weld_radio_button("modifyresolutioncb")) - , mxCbEPSPreviewTIFF(m_xBuilder->weld_check_button("tiffpreviewcb")) - , mxCbEPSPreviewEPSI(m_xBuilder->weld_check_button("epsipreviewcb")) - , mxRbEPSLevel1(m_xBuilder->weld_radio_button("level1rb")) - , mxRbEPSLevel2(m_xBuilder->weld_radio_button("level2rb")) - , mxRbEPSColorFormat1(m_xBuilder->weld_radio_button("color1rb")) - , mxRbEPSColorFormat2(m_xBuilder->weld_radio_button("color2rb")) - , mxRbEPSCompressionLZW(m_xBuilder->weld_radio_button("compresslzw")) - , mxRbEPSCompressionNone(m_xBuilder->weld_radio_button("compressnone")) - , mxInfo(m_xBuilder->weld_widget("information")) - , mxFtEstimatedSize(m_xBuilder->weld_label("estsizeft")) - , mxBtnOK(m_xBuilder->weld_button("ok")) + , mxMfSizeX(m_xBuilder->weld_spin_button(u"widthmf"_ustr)) + , mxLbSizeX(m_xBuilder->weld_combo_box(u"widthlb"_ustr)) + , mxMfSizeY(m_xBuilder->weld_spin_button( u"heightmf"_ustr)) + , mxFtResolution(m_xBuilder->weld_label(u"resolutionft"_ustr)) + , mxNfResolution(m_xBuilder->weld_spin_button(u"resolutionmf"_ustr)) + , mxLbResolution(m_xBuilder->weld_combo_box(u"resolutionlb"_ustr)) + , mxColorDepth(m_xBuilder->weld_widget(u"colordepth"_ustr)) + , mxLbColorDepth(m_xBuilder->weld_combo_box(u"colordepthlb"_ustr)) + , mxJPGWEBPQuality(m_xBuilder->weld_widget(u"jpgwebpquality"_ustr)) + , mxPNGCompression(m_xBuilder->weld_widget(u"pngcompression"_ustr)) + , mxSbPngCompression(m_xBuilder->weld_scale(u"compressionpngsb"_ustr)) + , mxNfPngCompression(m_xBuilder->weld_spin_button(u"compressionpngnf"_ustr)) + , mxSbJpgWebpCompression(m_xBuilder->weld_scale(u"compressionjpgwebpsb"_ustr)) + , mxNfJpgWebpCompression(m_xBuilder->weld_spin_button(u"compressionjpgwebpnf"_ustr)) + , mxCbLossless(m_xBuilder->weld_check_button(u"losslesscb"_ustr)) + , mxMode(m_xBuilder->weld_widget(u"mode"_ustr)) + , mxCbInterlaced(m_xBuilder->weld_check_button(u"interlacedcb"_ustr)) + , mxBMPCompression(m_xBuilder->weld_widget(u"bmpcompression"_ustr)) + , mxCbRLEEncoding(m_xBuilder->weld_check_button(u"rlecb"_ustr)) + , mxDrawingObjects(m_xBuilder->weld_widget(u"drawingobjects"_ustr)) + , mxCbSaveTransparency(m_xBuilder->weld_check_button(u"savetransparencycb"_ustr)) + , mxEncoding(m_xBuilder->weld_widget(u"encoding"_ustr)) + , mxRbBinary(m_xBuilder->weld_radio_button(u"binarycb"_ustr)) + , mxRbText(m_xBuilder->weld_radio_button(u"textcb"_ustr)) + , mxEPSGrid(m_xBuilder->weld_widget(u"epsgrid"_ustr)) + , mxModifyDimension(m_xBuilder->weld_radio_button(u"modifydimensionscb"_ustr)) + , mxModifyResolution(m_xBuilder->weld_radio_button(u"modifyresolutioncb"_ustr)) + , mxCbEPSPreviewTIFF(m_xBuilder->weld_check_button(u"tiffpreviewcb"_ustr)) + , mxCbEPSPreviewEPSI(m_xBuilder->weld_check_button(u"epsipreviewcb"_ustr)) + , mxRbEPSLevel1(m_xBuilder->weld_radio_button(u"level1rb"_ustr)) + , mxRbEPSLevel2(m_xBuilder->weld_radio_button(u"level2rb"_ustr)) + , mxRbEPSColorFormat1(m_xBuilder->weld_radio_button(u"color1rb"_ustr)) + , mxRbEPSColorFormat2(m_xBuilder->weld_radio_button(u"color2rb"_ustr)) + , mxRbEPSCompressionLZW(m_xBuilder->weld_radio_button(u"compresslzw"_ustr)) + , mxRbEPSCompressionNone(m_xBuilder->weld_radio_button(u"compressnone"_ustr)) + , mxInfo(m_xBuilder->weld_widget(u"information"_ustr)) + , mxFtEstimatedSize(m_xBuilder->weld_label(u"estsizeft"_ustr)) + , mxBtnOK(m_xBuilder->weld_button(u"ok"_ustr)) { GetGraphicSource(); maExt = maExt.toAsciiUpperCase(); - OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Export/" ); + OUString aFilterConfigPath( u"Office.Common/Filter/Graphic/Export/"_ustr ); mpOptionsItem.reset(new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData )); aFilterConfigPath += maExt; mpFilterOptionsItem.reset(new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData )); mnInitialResolutionUnit = mbIsPixelFormat - ? mpOptionsItem->ReadInt32("PixelExportUnit", UNIT_DEFAULT) - : mpOptionsItem->ReadInt32("VectorExportUnit", UNIT_DEFAULT); + ? mpOptionsItem->ReadInt32(u"PixelExportUnit"_ustr, UNIT_DEFAULT) + : mpOptionsItem->ReadInt32(u"VectorExportUnit"_ustr, UNIT_DEFAULT); mnMaxFilesizeForRealtimePreview = std::max( - mpOptionsItem->ReadInt32("MaxFilesizeForRealtimePreview", 0), sal_Int32(0)); - mxFtEstimatedSize->set_label(" \n "); + mpOptionsItem->ReadInt32(u"MaxFilesizeForRealtimePreview"_ustr, 0), sal_Int32(0)); + mxFtEstimatedSize->set_label(u" \n "_ustr); m_xDialog->set_title(m_xDialog->get_title().replaceFirst("%1", maExt)); //Set dialog title @@ -740,12 +740,12 @@ void ExportDialog::setupSizeControls() // sense eg for bitmap fillings in metafiles, to preserve high dpi output // (atm without special vector support the bitmaps are rendered with 96dpi) - sal_Int32 nResolution = mpOptionsItem->ReadInt32("PixelExportResolution", 96); + sal_Int32 nResolution = mpOptionsItem->ReadInt32(u"PixelExportResolution"_ustr, 96); if ( nResolution < 1 ) nResolution = 96; mxNfResolution->set_value( nResolution ); - sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32("PixelExportResolutionUnit", 1); + sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32(u"PixelExportResolutionUnit"_ustr, 1); if ( ( nResolutionUnit < 0 ) || ( nResolutionUnit > 2 ) ) nResolutionUnit = 1; mxLbResolution->set_active( static_cast< sal_uInt16 >( nResolutionUnit ) ); @@ -757,7 +757,7 @@ void ExportDialog::createFilterOptions() { case FORMAT_JPG : { - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32("ColorMode", 0); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(u"ColorMode"_ustr, 0); if ( nColor == 1 ) nColor = 0; else @@ -769,7 +769,7 @@ void ExportDialog::createFilterOptions() // Quality mxJPGWEBPQuality->show(); - sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32("Quality", 75); + sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32(u"Quality"_ustr, 75); if ((nQuality < 1 ) || (nQuality > 100)) nQuality = 75; mpSbCompression = mxSbJpgWebpCompression.get(); @@ -784,7 +784,7 @@ void ExportDialog::createFilterOptions() { // Compression 1..9 mxPNGCompression->show(); - sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32("Compression", 6); + sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32(u"Compression"_ustr, 6); if ( ( nCompression < 1 ) || ( nCompression > 9 ) ) nCompression = 6; @@ -796,16 +796,16 @@ void ExportDialog::createFilterOptions() // Interlaced mxMode->show(); - mxCbInterlaced->set_active(mpFilterOptionsItem->ReadInt32("Interlaced", 0) != 0); + mxCbInterlaced->set_active(mpFilterOptionsItem->ReadInt32(u"Interlaced"_ustr, 0) != 0); // Transparency mxDrawingObjects->show(); - mxCbSaveTransparency->set_active(mpFilterOptionsItem->ReadInt32("Translucent", 1) != 0); + mxCbSaveTransparency->set_active(mpFilterOptionsItem->ReadInt32(u"Translucent"_ustr, 1) != 0); } break; case FORMAT_BMP : { - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32("Color", 0); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(u"Color"_ustr, 0); if ( nColor == 0 ) nColor = 6; else @@ -819,30 +819,30 @@ void ExportDialog::createFilterOptions() // RLE coding mxBMPCompression->show(); - mxCbRLEEncoding->set_active(mpFilterOptionsItem->ReadBool("RLE_Coding", true)); + mxCbRLEEncoding->set_active(mpFilterOptionsItem->ReadBool(u"RLE_Coding"_ustr, true)); } break; case FORMAT_GIF : { // Interlaced mxMode->show(); - mxCbInterlaced->set_active(mpFilterOptionsItem->ReadInt32("Interlaced", 1) != 0); + mxCbInterlaced->set_active(mpFilterOptionsItem->ReadInt32(u"Interlaced"_ustr, 1) != 0); // Transparency mxDrawingObjects->show(); - mxCbSaveTransparency->set_active(mpFilterOptionsItem->ReadInt32("Translucent", 1) != 0); + mxCbSaveTransparency->set_active(mpFilterOptionsItem->ReadInt32(u"Translucent"_ustr, 1) != 0); } break; case FORMAT_EPS : { mxEPSGrid->show(); - sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32("Preview", 0); - sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32("Version", 2); - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32("ColorFormat", 0); - sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32("CompressionMode", 2); + sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32(u"Preview"_ustr, 0); + sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32(u"Version"_ustr, 2); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(u"ColorFormat"_ustr, 0); + sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32(u"CompressionMode"_ustr, 2); - mpFilterOptionsItem->ReadInt32("TextMode", 0); + mpFilterOptionsItem->ReadInt32(u"TextMode"_ustr, 0); mxCbEPSPreviewTIFF->set_active( ( nPreview & 1 ) != 0 ); mxCbEPSPreviewEPSI->set_active( ( nPreview & 2 ) != 0 ); @@ -861,7 +861,7 @@ void ExportDialog::createFilterOptions() { // Quality mxJPGWEBPQuality->show(); - sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32("Quality", 75); + sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32(u"Quality"_ustr, 75); if ((nQuality < 1 ) || (nQuality > 100)) nQuality = 75; mpSbCompression = mxSbJpgWebpCompression.get(); @@ -871,7 +871,7 @@ void ExportDialog::createFilterOptions() mpNfCompression->set_value(nQuality); // Lossless - mxCbLossless->set_active(mpFilterOptionsItem->ReadBool("Lossless", true)); + mxCbLossless->set_active(mpFilterOptionsItem->ReadBool(u"Lossless"_ustr, true)); UpdateHdlLossless(*mxCbLossless); } break; diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index e5988af75336..61365d72e60c 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -129,7 +129,7 @@ void SAL_CALL GraphicRendererVCL::release() OUString SAL_CALL GraphicRendererVCL::getImplementationName() { - return "com.sun.star.comp.graphic.GraphicRendererVCL"; + return u"com.sun.star.comp.graphic.GraphicRendererVCL"_ustr; } sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName ) @@ -140,7 +140,7 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceNa uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() { - return { "com.sun.star.graphic.GraphicRendererVCL" }; + return { u"com.sun.star.graphic.GraphicRendererVCL"_ustr }; } @@ -166,9 +166,9 @@ rtl::Reference<::comphelper::PropertySetInfo> GraphicRendererVCL::createProperty { static ::comphelper::PropertyMapEntry const aEntries[] = { - { OUString("Device"), UNOGRAPHIC_DEVICE, cppu::UnoType<uno::Any>::get(), 0, 0 }, - { OUString("DestinationRect"), UNOGRAPHIC_DESTINATIONRECT, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, - { OUString("RenderData"), UNOGRAPHIC_RENDERDATA, cppu::UnoType<uno::Any>::get(), 0, 0 }, + { u"Device"_ustr, UNOGRAPHIC_DEVICE, cppu::UnoType<uno::Any>::get(), 0, 0 }, + { u"DestinationRect"_ustr, UNOGRAPHIC_DESTINATIONRECT, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, + { u"RenderData"_ustr, UNOGRAPHIC_RENDERDATA, cppu::UnoType<uno::Any>::get(), 0, 0 }, }; return rtl::Reference<::comphelper::PropertySetInfo>( new ::comphelper::PropertySetInfo(aEntries) ); diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index c032f41146c1..79052d884456 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -184,8 +184,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque { g_JavaEvents.bDisabledHandled = true; // Java disabled. Give user a chance to enable Java inside Office. - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, "svt/ui/javadisableddialog.ui")); - std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("JavaDisabledDialog")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, u"svt/ui/javadisableddialog.ui"_ustr)); + std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog(u"JavaDisabledDialog"_ustr)); nResult = xQueryBox->run(); if ( nResult == RET_YES ) { diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 0d474f058ac0..24a4d365e894 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -312,65 +312,65 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) switch( aKey.KeyCode ) { case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: - return ".uno:DelToStartOfLine"; + return u".uno:DelToStartOfLine"_ustr; case css::awt::Key::DELETE_TO_END_OF_LINE: - return ".uno:DelToEndOfLine"; + return u".uno:DelToEndOfLine"_ustr; case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: - return ".uno:DelToStartOfPara"; + return u".uno:DelToStartOfPara"_ustr; case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH: - return ".uno:DelToEndOfPara"; + return u".uno:DelToEndOfPara"_ustr; case css::awt::Key::DELETE_WORD_BACKWARD: - return ".uno:DelToStartOfWord"; + return u".uno:DelToStartOfWord"_ustr; case css::awt::Key::DELETE_WORD_FORWARD: - return ".uno:DelToEndOfWord"; + return u".uno:DelToEndOfWord"_ustr; case css::awt::Key::INSERT_LINEBREAK: - return ".uno:InsertLinebreak"; + return u".uno:InsertLinebreak"_ustr; case css::awt::Key::INSERT_PARAGRAPH: - return ".uno:InsertPara"; + return u".uno:InsertPara"_ustr; case css::awt::Key::MOVE_WORD_BACKWARD: - return ".uno:GoToPrevWord"; + return u".uno:GoToPrevWord"_ustr; case css::awt::Key::MOVE_WORD_FORWARD: - return ".uno:GoToNextWord"; + return u".uno:GoToNextWord"_ustr; case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: - return ".uno:GoToStartOfLine"; + return u".uno:GoToStartOfLine"_ustr; case css::awt::Key::MOVE_TO_END_OF_LINE: - return ".uno:GoToEndOfLine"; + return u".uno:GoToEndOfLine"_ustr; case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - return ".uno:GoToStartOfPara"; + return u".uno:GoToStartOfPara"_ustr; case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - return ".uno:GoToEndOfPara"; + return u".uno:GoToEndOfPara"_ustr; case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - return ".uno:GoToStartOfDoc"; + return u".uno:GoToStartOfDoc"_ustr; case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: - return ".uno:GoToEndOfDoc"; + return u".uno:GoToEndOfDoc"_ustr; case css::awt::Key::SELECT_BACKWARD: - return ".uno:CharLeftSel"; + return u".uno:CharLeftSel"_ustr; case css::awt::Key::SELECT_FORWARD: - return ".uno:CharRightSel"; + return u".uno:CharRightSel"_ustr; case css::awt::Key::SELECT_WORD_BACKWARD: - return ".uno:WordLeftSel"; + return u".uno:WordLeftSel"_ustr; case css::awt::Key::SELECT_WORD_FORWARD: - return ".uno:WordRightSel"; + return u".uno:WordRightSel"_ustr; case css::awt::Key::SELECT_WORD: - return ".uno:SelectWord"; + return u".uno:SelectWord"_ustr; case css::awt::Key::SELECT_LINE: return OUString(); case css::awt::Key::SELECT_PARAGRAPH: - return ".uno:SelectText"; + return u".uno:SelectText"_ustr; case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: - return ".uno:StartOfLineSel"; + return u".uno:StartOfLineSel"_ustr; case css::awt::Key::SELECT_TO_END_OF_LINE: - return ".uno:EndOfLineSel"; + return u".uno:EndOfLineSel"_ustr; case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - return ".uno:StartOfParaSel"; + return u".uno:StartOfParaSel"_ustr; case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - return ".uno:EndOfParaSel"; + return u".uno:EndOfParaSel"_ustr; case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - return ".uno:StartOfDocumentSel"; + return u".uno:StartOfDocumentSel"_ustr; case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: - return ".uno:EndOfDocumentSel"; + return u".uno:EndOfDocumentSel"_ustr; case css::awt::Key::SELECT_ALL: - return ".uno:SelectAll"; + return u".uno:SelectAll"_ustr; default: break; } diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index ba5494975695..0d16c80008b7 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -46,7 +46,7 @@ static bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< fr try { uno::Reference< beans::XPropertySet > xPropSet( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( u"NamedRanges"_ustr ), uno::UNO_QUERY_THROW ); xReferrer.set ( xNamed->getByName( sAddress ), uno::UNO_QUERY ); } catch( uno::Exception& /*e*/ ) @@ -81,15 +81,15 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference // RefCell - convert from XL // pretend we converted the imported string address into the // appropriate address structure - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellAddressConversion"), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( u"com.sun.star.table.CellAddressConversion"_ustr), uno::UNO_QUERY ); css::table::CellAddress aAddress; if ( xConvertor.is() ) { // we need this service to properly convert XL notation also // Should be easy to extend - xConvertor->setPropertyValue( "ReferenceSheet", uno::Any( nRefTab ) ); - xConvertor->setPropertyValue( "XLA1Representation", uno::Any( rsCtrlSource ) ); - xConvertor->getPropertyValue( "Address" ) >>= aAddress; + xConvertor->setPropertyValue( u"ReferenceSheet"_ustr, uno::Any( nRefTab ) ); + xConvertor->setPropertyValue( u"XLA1Representation"_ustr, uno::Any( rsCtrlSource ) ); + xConvertor->getPropertyValue( u"Address"_ustr ) >>= aAddress; } beans::NamedValue aArg1; @@ -97,7 +97,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference aArg1.Value <<= aAddress; uno::Sequence< uno::Any > aArgs{ uno::Any(aArg1) }; - uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( "com.sun.star.table.CellValueBinding", aArgs ), uno::UNO_QUERY ); + uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( u"com.sun.star.table.CellValueBinding"_ustr, aArgs ), uno::UNO_QUERY ); xBindable->setValueBinding( xBinding ); } else if ( xBindable.is() ) // reset it @@ -110,7 +110,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference // RefCell - convert from XL // pretend we converted the imported string address into the // appropriate address structure - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellRangeAddressConversion"), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( u"com.sun.star.table.CellRangeAddressConversion"_ustr), uno::UNO_QUERY ); css::table::CellRangeAddress aAddress; if ( xConvertor.is() ) { @@ -118,9 +118,9 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference { // we need this service to properly convert XL notation also // Should be easy to extend - xConvertor->setPropertyValue( "ReferenceSheet", uno::Any( nRefTab ) ); - xConvertor->setPropertyValue( "XLA1Representation", uno::Any( rsRowSource ) ); - xConvertor->getPropertyValue( "Address" ) >>= aAddress; + xConvertor->setPropertyValue( u"ReferenceSheet"_ustr, uno::Any( nRefTab ) ); + xConvertor->setPropertyValue( u"XLA1Representation"_ustr, uno::Any( rsRowSource ) ); + xConvertor->getPropertyValue( u"Address"_ustr ) >>= aAddress; } } @@ -129,7 +129,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const css::uno::Reference aArg1.Value <<= aAddress; uno::Sequence< uno::Any > aArgs{ uno::Any(aArg1) }; - uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", aArgs ), uno::UNO_QUERY ); + uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( u"com.sun.star.table.CellRangeListSource"_ustr, aArgs ), uno::UNO_QUERY ); xListEntrySink->setListEntrySource( xSource ); } else if ( xListEntrySink.is() ) // reset diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 59613089a514..e740055a65df 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -62,7 +62,7 @@ static DialogMask aWndFunc( else if ( (nFlags & DialogMask::ButtonsYesNo) == DialogMask::ButtonsYesNo ) eButtonsType = VclButtonsType::YesNo; - OUString aErr("$(ACTION)$(ERROR)"); + OUString aErr(u"$(ACTION)$(ERROR)"_ustr); OUString aAction(rAction); if ( !aAction.isEmpty() ) aAction += ":\n"; diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 38321e843e0d..3bf114a2b97f 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -291,7 +291,7 @@ struct EmbeddedObjectRef_Impl mxObj->getComponent(), css::uno::UNO_QUERY); if (pComponent.is()) { - auto const s = pComponent->dump(""); + auto const s = pComponent->dump(u""_ustr); auto const s1 = OUStringToOString(s, RTL_TEXTENCODING_ISO_8859_1); //TODO (void)xmlTextWriterWriteRawLen( pWriter, reinterpret_cast<xmlChar const *>(s1.getStr()), s1.getLength()); @@ -742,7 +742,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const tools::Rectangle &rRect, con { MapMode aMM( MapUnit::MapAppFont ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, nullptr ); - vcl::Font aFnt( "Noto Sans", aAppFontSz ); + vcl::Font aFnt( u"Noto Sans"_ustr, aAppFontSz ); aFnt.SetTransparent( true ); aFnt.SetColor( COL_LIGHTRED ); aFnt.SetWeight( WEIGHT_BOLD ); @@ -1022,7 +1022,7 @@ OUString EmbeddedObjectRef::GetChartType() if( xProp.is()) { bool bCurrent = false; - if( xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bCurrent ) + if( xProp->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bCurrent ) { if (bCurrent) Style += "Bars"; diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 2d453425b493..233a1000c297 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -106,7 +106,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo if ( xPers.is() ) { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage(); - OUString aName( "Dummy" ); + OUString aName( u"Dummy"_ustr ); SvStream* pStream = nullptr; bool bDeleteStream = false; uno::Sequence < beans::PropertyValue > aEmpty; diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 1e868c43e7ce..a1952bf26243 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -232,7 +232,7 @@ static OUString GetImageExtensionByFactory_Impl( const OUString& rURL ) // get the TypeDetection service to access all registered types css::uno::Reference < css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); css::uno::Reference < css::document::XTypeDetection > xTypeDetector( - xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext), + xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.document.TypeDetection"_ustr, xContext), css::uno::UNO_QUERY ); OUString aInternalType = xTypeDetector->queryTypeByURL( rURL ); @@ -309,11 +309,11 @@ static bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::V try { - bRet = ( ( rContent.getPropertyValue( "IsVolume" ) >>= rVolumeInfo.m_bIsVolume ) && - ( rContent.getPropertyValue( "IsRemote" ) >>= rVolumeInfo.m_bIsRemote ) && - ( rContent.getPropertyValue( "IsRemoveable" ) >>= rVolumeInfo.m_bIsRemoveable ) && - ( rContent.getPropertyValue( "IsFloppy" ) >>= rVolumeInfo.m_bIsFloppy ) && - ( rContent.getPropertyValue( "IsCompactDisc" ) >>= rVolumeInfo.m_bIsCompactDisc ) ); + bRet = ( ( rContent.getPropertyValue( u"IsVolume"_ustr ) >>= rVolumeInfo.m_bIsVolume ) && + ( rContent.getPropertyValue( u"IsRemote"_ustr ) >>= rVolumeInfo.m_bIsRemote ) && + ( rContent.getPropertyValue( u"IsRemoveable"_ustr ) >>= rVolumeInfo.m_bIsRemoveable ) && + ( rContent.getPropertyValue( u"IsFloppy"_ustr ) >>= rVolumeInfo.m_bIsFloppy ) && + ( rContent.getPropertyValue( u"IsCompactDisc"_ustr ) >>= rVolumeInfo.m_bIsCompactDisc ) ); } catch( const css::uno::RuntimeException& ) { diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 7a44a4d90dee..eef81ec52688 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -129,7 +129,7 @@ std::unique_ptr<SvStream> getImageStream(uno::Reference<uno::XComponentContext> // let it create a graphic from the given URL uno::Sequence<beans::PropertyValue> aMediaProperties{ comphelper::makePropertyValue( - "URL", rImageResourceURL) }; + u"URL"_ustr, rImageResourceURL) }; uno::Reference<graphic::XGraphic> xGraphic(xProvider->queryGraphic(aMediaProperties)); OSL_ENSURE(xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!"); @@ -142,8 +142,8 @@ std::unique_ptr<SvStream> getImageStream(uno::Reference<uno::XComponentContext> new OSeekableInputStreamWrapper(*pMemBuffer), new OSeekableOutputStreamWrapper(*pMemBuffer)); - aMediaProperties = { comphelper::makePropertyValue("OutputStream", xBufferAccess), - comphelper::makePropertyValue("MimeType", OUString("image/png")) }; + aMediaProperties = { comphelper::makePropertyValue(u"OutputStream"_ustr, xBufferAccess), + comphelper::makePropertyValue(u"MimeType"_ustr, u"image/png"_ustr) }; xProvider->storeGraphic(xGraphic, aMediaProperties); pMemBuffer->Seek(0); diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index afc6830fde54..3490aea5f09d 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -158,7 +158,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString } } if (locale.isEmpty()) - locale = getInstalledLocaleForLanguage(rLocaleElementNames, "en-US"); + locale = getInstalledLocaleForLanguage(rLocaleElementNames, u"en-US"_ustr); if (locale.isEmpty() && rLocaleElementNames.hasElements()) locale = rLocaleElementNames[0]; return locale; diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index a3ed27a3bdf2..dfacf5663e61 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -203,8 +203,8 @@ SvtLanguageTableImpl::SvtLanguageTableImpl() sal_Int32 nType = 0; uno::Reference <container::XNameAccess> xNB; xNA->getByName(rBcp47) >>= xNB; - bool bSuccess = (xNB->getByName("Name") >>= aName) && - (xNB->getByName("ScriptType") >>= nType); + bool bSuccess = (xNB->getByName(u"Name"_ustr) >>= aName) && + (xNB->getByName(u"ScriptType"_ustr) >>= nType); if (bSuccess) { LanguageTag aLang(rBcp47); diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 3c1552f0d91c..516636c564b5 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -201,7 +201,7 @@ void OpenFileDropTargetListener::implts_OpenFile( const OUString& rFilePath ) css::uno::Reference < css::frame::XDispatchProvider > xProvider( xTargetFrame, css::uno::UNO_QUERY ); // Create a new task or recycle an existing one - css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aURL, "_default", 0 ); + css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aURL, u"_default"_ustr, 0 ); if ( xDispatcher.is() ) xDispatcher->dispatch( aURL, css::uno::Sequence < css::beans::PropertyValue >() ); } diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 101d68362ad9..12e98cd769d7 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -1184,10 +1184,10 @@ namespace const std::map<UScriptCode, std::vector<OUString>> distCjkMap = { - { USCRIPT_KOREAN, { " KR", "Korean"} }, // Korean - { USCRIPT_JAPANESE, {" JP", "Japanese"} } , // Japanese - { USCRIPT_SIMPLIFIED_HAN, {" SC", " GB", "S Chinese"} }, // Simplified Chinese Family - { USCRIPT_TRADITIONAL_HAN, {" TC", " HC", " TW", " HK", " MO", "T Chinese"} }// Traditional Chinese Family + { USCRIPT_KOREAN, { u" KR"_ustr, u"Korean"_ustr} }, // Korean + { USCRIPT_JAPANESE, {u" JP"_ustr, u"Japanese"_ustr} } , // Japanese + { USCRIPT_SIMPLIFIED_HAN, {u" SC"_ustr, u" GB"_ustr, u"S Chinese"_ustr} }, // Simplified Chinese Family + { USCRIPT_TRADITIONAL_HAN, {u" TC"_ustr, u" HC"_ustr, u" TW"_ustr, u" HK"_ustr, u" MO"_ustr, u"T Chinese"_ustr} }// Traditional Chinese Family }; namespace { diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index d8e473350e10..57279a92b08d 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -532,8 +532,8 @@ namespace svt { // create a content for the current folder root Reference< XResultSet > xResultSet; - Sequence< OUString > aContentProperties{ "Title", "DateModified", "DateCreated", - "IsFolder" }; + Sequence< OUString > aContentProperties{ u"Title"_ustr, u"DateModified"_ustr, u"DateCreated"_ustr, + u"IsFolder"_ustr }; // get the set of sub contents in the folder try diff --git a/svtools/source/uitest/uiobject.cxx b/svtools/source/uitest/uiobject.cxx index 2de31226f93d..9d933f6202f3 100644 --- a/svtools/source/uitest/uiobject.cxx +++ b/svtools/source/uitest/uiobject.cxx @@ -22,9 +22,9 @@ void ValueSetUIObject::execute(const OUString& rAction, const StringMap& rParame { if (rAction == "CHOOSE") { - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - OUString aIndexStr = rParameters.find("POS")->second; + OUString aIndexStr = rParameters.find(u"POS"_ustr)->second; sal_Int32 nIndex = aIndexStr.toInt32(); mpSet->SelectItem(nIndex); @@ -40,14 +40,14 @@ std::unique_ptr<UIObject> ValueSetUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new ValueSetUIObject(pWindow)); } -OUString ValueSetUIObject::get_name() const { return "ValueSetUIObject"; } +OUString ValueSetUIObject::get_name() const { return u"ValueSetUIObject"_ustr; } StringMap ValueSetUIObject::get_state() { StringMap aMap = DrawingAreaUIObject::get_state(); - aMap["SelectedItemId"] = OUString::number(mpSet->GetSelectedItemId()); - aMap["SelectedItemPos"] = OUString::number(mpSet->GetSelectItemPos()); - aMap["ItemsCount"] = OUString::number(mpSet->GetItemCount()); + aMap[u"SelectedItemId"_ustr] = OUString::number(mpSet->GetSelectedItemId()); + aMap[u"SelectedItemPos"_ustr] = OUString::number(mpSet->GetSelectItemPos()); + aMap[u"ItemsCount"_ustr] = OUString::number(mpSet->GetItemCount()); return aMap; } diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index a0c530f8f1f0..0c8694e76b76 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -94,13 +94,13 @@ constexpr OUStringLiteral UNODIALOG_PROPERTY_ALIASES = u"FieldMapping"; OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() { - return "com.sun.star.comp.svtools.OAddressBookSourceDialogUno"; + return u"com.sun.star.comp.svtools.OAddressBookSourceDialogUno"_ustr; } css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() { - return { "com.sun.star.ui.AddressBookSourceDialog" }; + return { u"com.sun.star.ui.AddressBookSourceDialog"_ustr }; } diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index e02d8abebb80..9800f40fea32 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -39,9 +39,9 @@ static OUString FilePicker_getSystemPickerServiceName() #ifdef UNX OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) - return "com.sun.star.ui.dialogs.AquaFilePicker"; + return u"com.sun.star.ui.dialogs.AquaFilePicker"_ustr; else - return "com.sun.star.ui.dialogs.SystemFilePicker"; + return u"com.sun.star.ui.dialogs.SystemFilePicker"_ustr; #endif #ifdef _WIN32 return "com.sun.star.ui.dialogs.Win32FilePicker"; @@ -88,7 +88,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance ( { // Always fall back to OfficeFilePicker. xResult = xFactory->createInstanceWithContext ( - "com.sun.star.ui.dialogs.OfficeFilePicker", + u"com.sun.star.ui.dialogs.OfficeFilePicker"_ustr, context); } if (xResult.is()) @@ -101,12 +101,12 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance ( OUString FilePicker_getImplementationName() { - return "com.sun.star.comp.svt.FilePicker"; + return u"com.sun.star.comp.svt.FilePicker"_ustr; } Sequence< OUString > FilePicker_getSupportedServiceNames() { - Sequence< OUString > aServiceNames { "com.sun.star.ui.dialogs.FilePicker" }; + Sequence< OUString > aServiceNames { u"com.sun.star.ui.dialogs.FilePicker"_ustr }; return aServiceNames; } @@ -118,9 +118,9 @@ static OUString FolderPicker_getSystemPickerServiceName() #ifdef UNX OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) - return "com.sun.star.ui.dialogs.AquaFolderPicker"; + return u"com.sun.star.ui.dialogs.AquaFolderPicker"_ustr; #endif - return "com.sun.star.ui.dialogs.SystemFolderPicker"; + return u"com.sun.star.ui.dialogs.SystemFolderPicker"_ustr; } Reference< css::uno::XInterface > FolderPicker_CreateInstance ( @@ -153,7 +153,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance ( { // Always fall back to OfficeFolderPicker. xResult = xFactory->createInstanceWithContext ( - "com.sun.star.ui.dialogs.OfficeFolderPicker", + u"com.sun.star.ui.dialogs.OfficeFolderPicker"_ustr, context); } if (xResult.is()) @@ -166,12 +166,12 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance ( OUString FolderPicker_getImplementationName() { - return "com.sun.star.comp.svt.FolderPicker"; + return u"com.sun.star.comp.svt.FolderPicker"_ustr; } Sequence< OUString > FolderPicker_getSupportedServiceNames() { - Sequence< OUString > aServiceNames { "com.sun.star.ui.dialogs.FolderPicker" }; + Sequence< OUString > aServiceNames { u"com.sun.star.ui.dialogs.FolderPicker"_ustr }; return aServiceNames; } diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 349d9a73a4d4..6a7f0a3be741 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -190,7 +190,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute() if (m_bExecuting) throw RuntimeException( - "already executing the dialog (recursive call)", + u"already executing the dialog (recursive call)"_ustr, *this ); diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 61df2a4645af..85065724f9f3 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -275,7 +275,7 @@ void SAL_CALL PopupMenuControllerBase::removeStatusListener( OUString PopupMenuControllerBase::determineBaseURL( std::u16string_view aURL ) { // Just use the main part of the URL for popup menu controllers - OUString aMainURL( "vnd.sun.star.popup:" ); + OUString aMainURL( u"vnd.sun.star.popup:"_ustr ); size_t nSchemePart = aURL.find( ':' ); if (( nSchemePart != std::u16string_view::npos && nSchemePart > 0 ) && diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 59607875ffc6..fb56a0b47fa2 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -276,7 +276,7 @@ void SAL_CALL StatusbarController::statusChanged( const FeatureStateEvent& Event if ( Event.State >>= aStrValue ) pStatusBar->SetItemText( m_nID, aStrValue ); else if ( !Event.State.hasValue() ) - pStatusBar->SetItemText( m_nID, "" ); + pStatusBar->SetItemText( m_nID, u""_ustr ); } } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index f1f97fd88c52..b397ae65649c 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -128,7 +128,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const { try { - xLayoutManager.set(xPropSet->getPropertyValue("LayoutManager"),UNO_QUERY); + xLayoutManager.set(xPropSet->getPropertyValue(u"LayoutManager"_ustr),UNO_QUERY); } catch ( Exception& ) { @@ -344,7 +344,7 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier ) css::util::URL aTargetURL; // Provide key modifier information to dispatch function - Sequence<PropertyValue> aArgs{ comphelper::makePropertyValue("KeyModifier", KeyModifier) }; + Sequence<PropertyValue> aArgs{ comphelper::makePropertyValue(u"KeyModifier"_ustr, KeyModifier) }; aTargetURL.Complete = aCommandURL; if ( m_xUrlTransformer.is() ) diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 853815e7d161..cfb33a0296a0 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -166,7 +166,7 @@ void getMacroFromAny( if (bNone) { // return empty macro - rMacro = SvxMacro( "", "" ); + rMacro = SvxMacro( u""_ustr, u""_ustr ); } else { @@ -221,7 +221,7 @@ void SvBaseEventDescriptor::replaceByName( rElement >>= aSequence; // perform replace (in subclass) - SvxMacro aMacro("",""); + SvxMacro aMacro(u""_ustr,u""_ustr); getMacroFromAny(aMacro, rElement); replaceByName(nMacroID, aMacro); } @@ -237,7 +237,7 @@ Any SvBaseEventDescriptor::getByName( // perform get (in subclass) Any aAny; - SvxMacro aMacro( "", "" ); + SvxMacro aMacro( u""_ustr, u""_ustr ); getByName(aMacro, nMacroID); getAnyFromMacro(aAny, aMacro); return aAny; @@ -335,7 +335,7 @@ void SvEventDescriptor::getByName( if (rItem.HasMacro(nEvent)) rMacro = rItem.GetMacro(nEvent); else - rMacro = SvxMacro("", ""); + rMacro = SvxMacro(u""_ustr, u""_ustr); } SvDetachedEventDescriptor::SvDetachedEventDescriptor( @@ -363,7 +363,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const SvMacroItemId nID) const OUString SvDetachedEventDescriptor::getImplementationName() { - return "SvDetachedEventDescriptor"; + return u"SvDetachedEventDescriptor"_ustr; } @@ -435,7 +435,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable( const SvMacroItemId nEvent = mpSupportedMacroItems[i].mnEvent; if (hasById(nEvent)) { - SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro("", "")); + SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro(u""_ustr, u""_ustr)); getByName(rMacro, nEvent); } } diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 1776f2ce7305..637f13b98a47 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -126,13 +126,13 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap { static PropertyMapEntry const aPolygonObj_Impl[] = { - { OUString("URL"), HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Title"), HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("Polygon"), HANDLE_POLYGON, cppu::UnoType<PointSequence>::get(), 0, 0 }, + { u"URL"_ustr, HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Title"_ustr, HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Description"_ustr, HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Target"_ustr, HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Name"_ustr, HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"IsActive"_ustr, HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"Polygon"_ustr, HANDLE_POLYGON, cppu::UnoType<PointSequence>::get(), 0, 0 }, }; return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aPolygonObj_Impl )); @@ -141,14 +141,14 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap { static PropertyMapEntry const aCircleObj_Impl[] = { - { OUString("URL"), HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Title"), HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("Center"), HANDLE_CENTER, cppu::UnoType<awt::Point>::get(), 0, 0 }, - { OUString("Radius"), HANDLE_RADIUS, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"URL"_ustr, HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Title"_ustr, HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Description"_ustr, HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Target"_ustr, HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Name"_ustr, HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"IsActive"_ustr, HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"Center"_ustr, HANDLE_CENTER, cppu::UnoType<awt::Point>::get(), 0, 0 }, + { u"Radius"_ustr, HANDLE_RADIUS, cppu::UnoType<sal_Int32>::get(), 0, 0 }, }; return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aCircleObj_Impl )); @@ -158,13 +158,13 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap { static PropertyMapEntry const aRectangleObj_Impl[] = { - { OUString("URL"), HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Title"), HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("Boundary"), HANDLE_BOUNDARY, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, + { u"URL"_ustr, HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Title"_ustr, HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Description"_ustr, HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Target"_ustr, HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Name"_ustr, HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"IsActive"_ustr, HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"Boundary"_ustr, HANDLE_BOUNDARY, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, }; return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aRectangleObj_Impl )); @@ -368,11 +368,11 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName() { case IMapObjectType::Polygon: default: - return "org.openoffice.comp.svt.ImageMapPolygonObject"; + return u"org.openoffice.comp.svt.ImageMapPolygonObject"_ustr; case IMapObjectType::Circle: - return "org.openoffice.comp.svt.ImageMapCircleObject"; + return u"org.openoffice.comp.svt.ImageMapCircleObject"_ustr; case IMapObjectType::Rectangle: - return "org.openoffice.comp.svt.ImageMapRectangleObject"; + return u"org.openoffice.comp.svt.ImageMapRectangleObject"_ustr; } } @@ -631,7 +631,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) // XServiceInfo OUString SAL_CALL SvUnoImageMap::getImplementationName( ) { - return "org.openoffice.comp.svt.SvUnoImageMap"; + return u"org.openoffice.comp.svt.SvUnoImageMap"_ustr; } sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName ) @@ -641,7 +641,7 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) { - return { "com.sun.star.image.ImageMap" }; + return { u"com.sun.star.image.ImageMap"_ustr }; } void SvUnoImageMap::fillImageMap( ImageMap& rMap ) const diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 4ec742a24add..69c34b00ae42 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -198,7 +198,7 @@ namespace { if (std::any_of(i_rPaths.begin(), i_rPaths.end(), [nFirstPageId](const Sequence< sal_Int16 >& rPath) { return rPath[0] != nFirstPageId; })) throw IllegalArgumentException( - "All paths must start with the same page id.", + u"All paths must start with the same page id."_ustr, i_rContext, 2 ); } @@ -252,12 +252,12 @@ namespace { OUString SAL_CALL Wizard::getImplementationName() { - return "com.sun.star.comp.svtools.uno.Wizard"; + return u"com.sun.star.comp.svtools.uno.Wizard"_ustr; } Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() { - return { "com.sun.star.ui.dialogs.Wizard" }; + return { u"com.sun.star.ui.dialogs.Wizard"_ustr }; } Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 9a6870b2cdfe..39487d13b55a 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -182,7 +182,7 @@ namespace svt::uno { public: EmptyPage(weld::Widget* pParent, weld::DialogController* pController) - : BuilderPage(pParent, pController, "svt/ui/emptypage.ui", "EmptyPage") + : BuilderPage(pParent, pController, u"svt/ui/emptypage.ui"_ustr, u"EmptyPage"_ustr) { m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width() * 70, m_xContainer->get_text_height() * 10); |