diff options
Diffstat (limited to 'vcl/source')
99 files changed, 901 insertions, 900 deletions
diff --git a/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx b/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx index 39a77d2476b4..23f3d66c990d 100644 --- a/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx +++ b/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx @@ -35,11 +35,11 @@ namespace OUString lcl_ConvertCharEscapement(sal_Int16 nEscapement) { if (nEscapement > 0) - return "super"; + return u"super"_ustr; if (nEscapement < 0) - return "sub"; + return u"sub"_ustr; - return "baseline"; + return u"baseline"_ustr; } OUString lcl_ConverCharStrikeout(sal_Int16 nStrikeout) @@ -92,24 +92,24 @@ OUString lcl_ConverCharStrikeout(sal_Int16 nStrikeout) OUString lcl_convertFontWeight(double fontWeight) { if (fontWeight == css::awt::FontWeight::THIN || fontWeight == css::awt::FontWeight::ULTRALIGHT) - return "100"; + return u"100"_ustr; if (fontWeight == css::awt::FontWeight::LIGHT) - return "200"; + return u"200"_ustr; if (fontWeight == css::awt::FontWeight::SEMILIGHT) - return "300"; + return u"300"_ustr; if (fontWeight == css::awt::FontWeight::NORMAL) - return "normal"; + return u"normal"_ustr; if (fontWeight == css::awt::FontWeight::SEMIBOLD) - return "500"; + return u"500"_ustr; if (fontWeight == css::awt::FontWeight::BOLD) - return "bold"; + return u"bold"_ustr; if (fontWeight == css::awt::FontWeight::ULTRABOLD) - return "800"; + return u"800"_ustr; if (fontWeight == css::awt::FontWeight::BLACK) - return "900"; + return u"900"_ustr; // awt::FontWeight::DONTKNOW || fontWeight == awt::FontWeight::NORMAL - return "normal"; + return u"normal"_ustr; } OUString lcl_ConvertFontSlant(css::awt::FontSlant eFontSlant) @@ -117,17 +117,17 @@ OUString lcl_ConvertFontSlant(css::awt::FontSlant eFontSlant) switch (eFontSlant) { case css::awt::FontSlant::FontSlant_NONE: - return "normal"; + return u"normal"_ustr; case css::awt::FontSlant::FontSlant_OBLIQUE: case css::awt::FontSlant::FontSlant_REVERSE_OBLIQUE: - return "oblique"; + return u"oblique"_ustr; case css::awt::FontSlant::FontSlant_ITALIC: case css::awt::FontSlant::FontSlant_REVERSE_ITALIC: - return "italic"; + return u"italic"_ustr; case css::awt::FontSlant::FontSlant_DONTKNOW: case css::awt::FontSlant::FontSlant_MAKE_FIXED_SIZE: default: - return ""; + return u""_ustr; } } diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index ae3af74b3da2..eeea0227e603 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -56,9 +56,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi if (comphelper::LibreOfficeKit::isActive()) { if (!bPreferDarkIconTheme) - return "colibre"; + return u"colibre"_ustr; else - return "colibre_dark"; + return u"colibre_dark"_ustr; } #ifdef _WIN32 diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 4ab1608d53e6..78493d58eb30 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -56,10 +56,10 @@ bool Application::LoadBrandBitmap (std::u16string_view pName, BitmapEx &rBitmap) { // TODO - if we want more flexibility we could add a branding path // in an rc file perhaps fallback to "about.bmp" - OUString aBaseDir( "$BRAND_BASE_DIR"); + OUString aBaseDir( u"$BRAND_BASE_DIR"_ustr); rtl::Bootstrap::expandMacros( aBaseDir ); OUString aBaseName(OUStringChar('/') + pName); - OUString aPng( ".png" ); + OUString aPng( u".png"_ustr ); rtl_Locale *pLoc = nullptr; osl_getProcessLocale (&pLoc); diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index feb31dea77d4..ed23b18ffa2a 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -284,7 +284,7 @@ bool IsHeadlessModeRequested() SalInstance *CreateSalInstance() { OUString aUsePlugin; - rtl::Bootstrap::get("SAL_USE_VCLPLUGIN", aUsePlugin); + rtl::Bootstrap::get(u"SAL_USE_VCLPLUGIN"_ustr, aUsePlugin); SAL_INFO_IF(!aUsePlugin.isEmpty(), "vcl.plugadapt", "Requested VCL plugin: " << aUsePlugin); if (Application::IsBitmapRendering() || (aUsePlugin.isEmpty() && IsHeadlessModeRequested())) @@ -402,7 +402,7 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore ) std::fprintf( stderr, "Unspecified Application Error\n" ); else { - CrashReporter::addKeyValue("AbortMessage", rErrorText, CrashReporter::Write); + CrashReporter::addKeyValue(u"AbortMessage"_ustr, rErrorText, CrashReporter::Write); std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); } #endif diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 36312092e419..4df7d6ad38fa 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1668,11 +1668,11 @@ void SalInstanceWindow::change_default_widget(weld::Widget* pOld, weld::Widget* SalInstanceWidget* pVclOld = dynamic_cast<SalInstanceWidget*>(pOld); vcl::Window* pWidgetOld = pVclOld ? pVclOld->getWidget() : nullptr; if (pWidgetOld) - pWidgetOld->set_property("has-default", OUString::boolean(false)); + pWidgetOld->set_property(u"has-default"_ustr, OUString::boolean(false)); else recursively_unset_default_buttons(); if (pWidgetNew) - pWidgetNew->set_property("has-default", OUString::boolean(true)); + pWidgetNew->set_property(u"has-default"_ustr, OUString::boolean(true)); } bool SalInstanceWindow::is_default_widget(const weld::Widget* pCandidate) const @@ -1894,19 +1894,19 @@ void SalInstanceDialog::add_button(const OUString& rText, int nResponse, const O switch (nResponse) { case RET_OK: - xButton->set_id("ok"); + xButton->set_id(u"ok"_ustr); break; case RET_CLOSE: - xButton->set_id("close"); + xButton->set_id(u"close"_ustr); break; case RET_CANCEL: - xButton->set_id("cancel"); + xButton->set_id(u"cancel"_ustr); break; case RET_YES: - xButton->set_id("yes"); + xButton->set_id(u"yes"_ustr); break; case RET_NO: - xButton->set_id("no"); + xButton->set_id(u"no"_ustr); break; } @@ -1943,7 +1943,7 @@ IMPL_LINK(SalInstanceDialog, PopupScreenShotMenuHdl, const CommandEvent&, rCEvt, aMenu->InsertItem(nLocalID, VclResId(SV_BUTTONTEXT_SCREENSHOT)); aMenu->SetHelpText(nLocalID, VclResId(SV_HELPTEXT_SCREENSHOT)); - aMenu->SetHelpId(nLocalID, "InteractiveScreenshotMode"); + aMenu->SetHelpId(nLocalID, u"InteractiveScreenshotMode"_ustr); aMenu->EnableItem(nLocalID); const sal_uInt16 nId(aMenu->Execute(m_xDialog, aMenuPos)); @@ -2716,7 +2716,7 @@ void SalInstanceNotebook::set_tab_label_text(const OUString& rIdent, const OUStr void SalInstanceNotebook::set_show_tabs(bool bShow) { - m_xNotebook->set_property("show-tabs", OUString::boolean(bShow)); + m_xNotebook->set_property(u"show-tabs"_ustr, OUString::boolean(bShow)); } SalInstanceNotebook::~SalInstanceNotebook() @@ -2812,7 +2812,7 @@ void SalInstanceVerticalNotebook::insert_page(const OUString& rIdent, const OUSt VclPtrInstance<VclGrid> xGrid(m_xNotebook->GetPageParent()); xGrid->set_hexpand(true); xGrid->set_vexpand(true); - m_xNotebook->InsertPage(rIdent, rLabel, Image(), "", xGrid, nPos); + m_xNotebook->InsertPage(rIdent, rLabel, Image(), u""_ustr, xGrid, nPos); if (nPos != -1) { @@ -3674,7 +3674,7 @@ void SalInstanceTreeView::do_insert(const weld::TreeIter* pParent, int pos, cons pEntry->SetFlags(pEntry->GetFlags() | SvTLEntryFlags::IS_SEPARATOR); if (m_xTreeView->nTreeFlags & SvTreeFlags::CHKBTN) - AddStringItem(pEntry, "", -1); + AddStringItem(pEntry, u""_ustr, -1); if (pIconName || pImageSurface) { @@ -3700,7 +3700,7 @@ void SalInstanceTreeView::do_insert(const weld::TreeIter* pParent, int pos, cons if (bChildrenOnDemand) { SvTreeListEntry* pPlaceHolder - = m_xTreeView->InsertEntry("<dummy>", pEntry, false, 0, nullptr); + = m_xTreeView->InsertEntry(u"<dummy>"_ustr, pEntry, false, 0, nullptr); SvViewDataEntry* pViewData = m_xTreeView->GetViewDataEntry(pPlaceHolder); pViewData->SetSelectable(false); } @@ -3796,7 +3796,7 @@ void SalInstanceTreeView::set_toggle(SvTreeListEntry* pEntry, TriState eState, i // blank out missing entries for (int i = pEntry->ItemCount(); i < col; ++i) - AddStringItem(pEntry, "", i - 1); + AddStringItem(pEntry, u""_ustr, i - 1); if (static_cast<size_t>(col) == pEntry->ItemCount()) { @@ -4051,7 +4051,7 @@ void SalInstanceTreeView::bulk_insert_for_each( { aVclIter.iter = new SvTreeListEntry; if (bHasAutoCheckButton) - AddStringItem(aVclIter.iter, "", -1); + AddStringItem(aVclIter.iter, u""_ustr, -1); aVclIter.iter->AddItem(std::make_unique<SvLBoxContextBmp>(aDummy, aDummy, false)); m_xTreeView->Insert(aVclIter.iter, pVclParent, TREELIST_APPEND); func(aVclIter, i); @@ -4263,7 +4263,7 @@ void SalInstanceTreeView::set_text(SvTreeListEntry* pEntry, const OUString& rTex // blank out missing entries for (int i = pEntry->ItemCount(); i < col; ++i) - AddStringItem(pEntry, "", i - 1); + AddStringItem(pEntry, u""_ustr, i - 1); if (static_cast<size_t>(col) == pEntry->ItemCount()) { @@ -4507,7 +4507,7 @@ void SalInstanceTreeView::set_image(SvTreeListEntry* pEntry, const Image& rImage // blank out missing entries for (int i = pEntry->ItemCount(); i < col; ++i) - AddStringItem(pEntry, "", i - 1); + AddStringItem(pEntry, u""_ustr, i - 1); if (static_cast<size_t>(col) == pEntry->ItemCount()) { @@ -4801,7 +4801,7 @@ void SalInstanceTreeView::set_children_on_demand(const weld::TreeIter& rIter, if (bChildrenOnDemand && !pPlaceHolder) { - pPlaceHolder = m_xTreeView->InsertEntry("<dummy>", rVclIter.iter, false, 0, nullptr); + pPlaceHolder = m_xTreeView->InsertEntry(u"<dummy>"_ustr, rVclIter.iter, false, 0, nullptr); SvViewDataEntry* pViewData = m_xTreeView->GetViewDataEntry(pPlaceHolder); pViewData->SetSelectable(false); } @@ -5113,7 +5113,7 @@ void SalInstanceTreeView::vadjustment_set_value(int nValue) void SalInstanceTreeView::set_show_expanders(bool bShow) { - m_xTreeView->set_property("show-expanders", OUString::boolean(bShow)); + m_xTreeView->set_property(u"show-expanders"_ustr, OUString::boolean(bShow)); } bool SalInstanceTreeView::changed_by_hover() const { return m_xTreeView->IsSelectDueToHover(); } @@ -5353,7 +5353,7 @@ bool SalInstanceTreeView::ExpandRow(const SalInstanceTreeIter& rIter) //expand disallowed, restore placeholder if (!bRet) { - pPlaceHolder = m_xTreeView->InsertEntry("<dummy>", pEntry, false, 0, nullptr); + pPlaceHolder = m_xTreeView->InsertEntry(u"<dummy>"_ustr, pEntry, false, 0, nullptr); SvViewDataEntry* pViewData = m_xTreeView->GetViewDataEntry(pPlaceHolder); pViewData->SetSelectable(false); } @@ -7406,7 +7406,7 @@ std::unique_ptr<weld::SizeGroup> SalInstanceBuilder::create_size_group() OUString SalInstanceBuilder::get_current_page_help_id() const { - vcl::Window* pCtrl = m_xBuilder->get("tabcontrol"); + vcl::Window* pCtrl = m_xBuilder->get(u"tabcontrol"_ustr); if (!pCtrl) return {}; VclPtr<vcl::Window> xTabPage; diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 3f1ff9cb2f9b..b742fc948ba0 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -87,7 +87,7 @@ class VCLSession: virtual sal_Bool SAL_CALL cancelShutdown() override; OUString SAL_CALL getImplementationName() override { - return "com.sun.star.frame.VCLSessionManagerClient"; + return u"com.sun.star.frame.VCLSessionManagerClient"_ustr; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { @@ -95,7 +95,7 @@ class VCLSession: } css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return {"com.sun.star.frame.SessionManagerClient"}; + return {u"com.sun.star.frame.SessionManagerClient"_ustr}; } void disposing(std::unique_lock<std::mutex>& rGuard) override; diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 6cf975f50d52..4716d56bc784 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -643,9 +643,9 @@ void ImplStyleData::SetStandardStyles() aStdFont.SetCharSet( osl_getThreadTextEncoding() ); aStdFont.SetWeight( WEIGHT_NORMAL ); if (!comphelper::IsFuzzing()) - aStdFont.SetFamilyName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en"))); + aStdFont.SetFamilyName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag(u"en"_ustr))); else - aStdFont.SetFamilyName("Liberation Sans"); + aStdFont.SetFamilyName(u"Liberation Sans"_ustr); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; @@ -2446,7 +2446,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot if ( !aName.isEmpty() ) { - OUString gallery(""); + OUString gallery(u""_ustr); // try the gallery first, then the program path: if ( aPersona == "own" && !aPersonaSettings.startsWith( "vnd.sun.star.expand" ) ) { @@ -2469,8 +2469,8 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot if( rHeaderFooterBitmap.IsEmpty() ) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::Misc::Persona::set( "no", batch ); - officecfg::Office::Common::Misc::PersonaSettings::set( "", batch ); + officecfg::Office::Common::Misc::Persona::set( u"no"_ustr, batch ); + officecfg::Office::Common::Misc::PersonaSettings::set( u""_ustr, batch ); batch->commit(); } } @@ -2685,8 +2685,8 @@ bool MiscSettings::GetDisablePrinting() const { OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( "DesktopManagement", - "DisablePrinting" ); + getValue( u"DesktopManagement"_ustr, + u"DisablePrinting"_ustr ); mxData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? TRISTATE_TRUE : TRISTATE_FALSE; } @@ -2751,8 +2751,8 @@ bool MiscSettings::GetEnableATToolSupport() const { OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( "Accessibility", - "EnableATToolSupport" ); + getValue( u"Accessibility"_ustr, + u"EnableATToolSupport"_ustr ); mxData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? TRISTATE_TRUE : TRISTATE_FALSE; } else @@ -3100,7 +3100,7 @@ namespace nUIMirroring = 0; // ask configuration only once utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), - "org.openoffice.Office.Common/I18N/CTL" ); // note: case sensitive ! + u"org.openoffice.Office.Common/I18N/CTL"_ustr ); // note: case sensitive ! if ( aNode.isValid() ) { bool bTmp = bool(); @@ -3146,7 +3146,7 @@ const LanguageTag& AllSettings::GetLanguageTag() const { if (comphelper::IsFuzzing()) { - static LanguageTag aRet("en-US"); + static LanguageTag aRet(u"en-US"_ustr); return aRet; } @@ -3164,7 +3164,7 @@ const LanguageTag& AllSettings::GetUILanguageTag() const { if (comphelper::IsFuzzing()) { - static LanguageTag aRet("en-US"); + static LanguageTag aRet(u"en-US"_ustr); return aRet; } @@ -3198,7 +3198,7 @@ const LocaleDataWrapper& AllSettings::GetNeutralLocaleDataWrapper() const { if ( !mxData->mpNeutralLocaleDataWrapper ) const_cast<AllSettings*>(this)->mxData->mpNeutralLocaleDataWrapper.reset( new LocaleDataWrapper( - comphelper::getProcessComponentContext(), LanguageTag("en-US") ) ); + comphelper::getProcessComponentContext(), LanguageTag(u"en-US"_ustr) ) ); return *mxData->mpNeutralLocaleDataWrapper; } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 21de9dfc0f16..8bfcb5e03d66 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -153,7 +153,7 @@ Application* GetpApp() Application::Application() { // useful for themes at least, perhaps extensions too - OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED); + OUString aVar(u"LIBO_VERSION"_ustr), aValue(u"" LIBO_VERSION_DOTTED ""_ustr); osl_setEnvironment(aVar.pData, aValue.pData); ImplGetSVData()->mpApp = this; @@ -273,7 +273,7 @@ void Application::Exception( ExceptionCategory nCategory ) case ExceptionCategory::UserInterface: break; default: - Abort("Unknown Error"); + Abort(u"Unknown Error"_ustr); break; } } @@ -1166,7 +1166,7 @@ static OUString Localize(TranslateId aId, const bool bLocalize) if (bLocalize) return VclResId(aId); else - return Translate::get(aId, Translate::Create("vcl", LanguageTag("en-US"))); + return Translate::get(aId, Translate::Create("vcl", LanguageTag(u"en-US"_ustr))); } OUString Application::GetOSVersion() diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 26bf023ce848..a29a28c71701 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -233,7 +233,7 @@ vcl::Window *ImplGetDefaultContextWindow() SAL_INFO( "vcl", "ImplGetDefaultWindow(): No AppWindow" ); pSVData->mpDefaultWin = VclPtr<WorkWindow>::Create(nullptr, WB_DEFAULTWIN); - pSVData->mpDefaultWin->SetText( "VCL ImplGetDefaultWindow" ); + pSVData->mpDefaultWin->SetText( u"VCL ImplGetDefaultWindow"_ustr ); } catch (const css::uno::Exception&) { diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 689b616e97d7..f046755863f1 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -371,7 +371,7 @@ bool InitVCL() if (!aLocaleString.isEmpty()) { MsLangId::getSystemUILanguage(); //call this now to pin what the system UI really was - OUString envVar("LANGUAGE"); + OUString envVar(u"LANGUAGE"_ustr); osl_setEnvironment(envVar.pData, aLocaleString.pData); } } diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx index 235e3140adca..6ab024953b01 100644 --- a/vcl/source/app/weldutils.cxx +++ b/vcl/source/app/weldutils.cxx @@ -493,8 +493,8 @@ int GetMinimumEditHeight() { // load this little .ui just to measure the height of an Entry std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(nullptr, "cui/ui/namedialog.ui")); - std::unique_ptr<weld::Entry> xEntry(xBuilder->weld_entry("name_entry")); + Application::CreateBuilder(nullptr, u"cui/ui/namedialog.ui"_ustr)); + std::unique_ptr<weld::Entry> xEntry(xBuilder->weld_entry(u"name_entry"_ustr)); return xEntry->get_preferred_size().Height(); } @@ -527,7 +527,7 @@ void WidgetStatusListener::startListening() if (!xDispatchProvider.is()) return; - mxDispatch = xDispatchProvider->queryDispatch(maCommandURL, "", 0); + mxDispatch = xDispatchProvider->queryDispatch(maCommandURL, u""_ustr, 0); if (mxDispatch.is()) mxDispatch->addStatusListener(this, maCommandURL); } diff --git a/vcl/source/cnttype/mcnttfactory.cxx b/vcl/source/cnttype/mcnttfactory.cxx index de8f3489d95a..1f396109b641 100644 --- a/vcl/source/cnttype/mcnttfactory.cxx +++ b/vcl/source/cnttype/mcnttfactory.cxx @@ -40,7 +40,7 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( ) { - return "com.sun.star.datatransfer.MimeCntTypeFactory"; + return u"com.sun.star.datatransfer.MimeCntTypeFactory"_ustr; } sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName ) @@ -50,7 +50,7 @@ sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& Serv Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( ) { - return { "com.sun.star.datatransfer.MimeContentTypeFactory" }; + return { u"com.sun.star.datatransfer.MimeContentTypeFactory"_ustr }; } diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 92554d3fb75c..49cb61eb37fa 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -111,13 +111,13 @@ public: Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() { - Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" }; + Sequence< OUString > aRet { u"com.sun.star.datatransfer.clipboard.SystemClipboard"_ustr }; return aRet; } OUString GenericClipboard::getImplementationName() { - return "com.sun.star.datatransfer.VCLGenericClipboard"; + return u"com.sun.star.datatransfer.VCLGenericClipboard"_ustr; } Sequence< OUString > GenericClipboard::getSupportedServiceNames() @@ -161,7 +161,7 @@ void GenericClipboard::setContents( OUString GenericClipboard::getName() { - return "CLIPBOARD"; + return u"CLIPBOARD"_ustr; } sal_Int8 GenericClipboard::getRenderingCapabilities() @@ -225,7 +225,7 @@ public: virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) override; OUString SAL_CALL getImplementationName() override - { return "com.sun.star.datatransfer.dnd.VclGenericDragSource"; } + { return u"com.sun.star.datatransfer.dnd.VclGenericDragSource"_ustr; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } @@ -235,7 +235,7 @@ public: static Sequence< OUString > getSupportedServiceNames_static() { - return { "com.sun.star.datatransfer.dnd.GenericDragSource" }; + return { u"com.sun.star.datatransfer.dnd.GenericDragSource"_ustr }; } }; @@ -277,7 +277,7 @@ Sequence< OUString > DragSource_getSupportedServiceNames() #if defined MACOSX return { "com.sun.star.datatransfer.dnd.OleDragSource" }; #elif defined UNX - return { "com.sun.star.datatransfer.dnd.X11DragSource" }; + return { u"com.sun.star.datatransfer.dnd.X11DragSource"_ustr }; #else return { "com.sun.star.datatransfer.dnd.VclGenericDragSource" }; #endif @@ -288,7 +288,7 @@ OUString DragSource_getImplementationName() #if defined MACOSX return "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"; #elif defined UNX - return "com.sun.star.datatransfer.dnd.XdndSupport"; + return u"com.sun.star.datatransfer.dnd.XdndSupport"_ustr; #else return "com.sun.star.datatransfer.dnd.VclGenericDragSource"; #endif @@ -328,7 +328,7 @@ public: virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override; OUString SAL_CALL getImplementationName() override - { return "com.sun.star.datatransfer.dnd.VclGenericDropTarget"; } + { return u"com.sun.star.datatransfer.dnd.VclGenericDropTarget"_ustr; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } @@ -338,7 +338,7 @@ public: static Sequence< OUString > getSupportedServiceNames_static() { - return { "com.sun.star.datatransfer.dnd.GenericDropTarget" }; + return { u"com.sun.star.datatransfer.dnd.GenericDropTarget"_ustr }; } }; @@ -379,7 +379,7 @@ Sequence< OUString > DropTarget_getSupportedServiceNames() #if defined MACOSX return { "com.sun.star.datatransfer.dnd.OleDropTarget" }; #elif defined UNX - return { "com.sun.star.datatransfer.dnd.X11DropTarget" }; + return { u"com.sun.star.datatransfer.dnd.X11DropTarget"_ustr }; #else return GenericDropTarget::getSupportedServiceNames_static(); #endif @@ -391,7 +391,7 @@ OUString DropTarget_getImplementationName() #if defined MACOSX "com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1" #elif defined UNX - "com.sun.star.datatransfer.dnd.XdndDropTarget" + u"com.sun.star.datatransfer.dnd.XdndDropTarget"_ustr #else "com.sun.star.datatransfer.dnd.VclGenericDropTarget" #endif @@ -414,7 +414,7 @@ Reference< XInterface > SalInstance::CreateClipboard( const Sequence< Any >& arg { if (arguments.hasElements()) { throw css::lang::IllegalArgumentException( - "non-empty SalInstance::CreateClipboard arguments", {}, -1); + u"non-empty SalInstance::CreateClipboard arguments"_ustr, {}, -1); } #ifdef IOS return getXWeak(new vcl::GenericClipboard()); diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 104981ad4366..4b3353341c29 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -151,7 +151,7 @@ Any SAL_CALL FontIdentificator::getMaterial() // XServiceInfo OUString SAL_CALL FontIdentificator::getImplementationName() { - return "vcl::FontIdentificator"; + return u"vcl::FontIdentificator"_ustr; } sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) @@ -161,7 +161,7 @@ sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rService Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() { - return { "com.sun.star.awt.FontIdentificator" }; + return { u"com.sun.star.awt.FontIdentificator"_ustr }; } } // namespace vcl diff --git a/vcl/source/control/NotebookbarPopup.cxx b/vcl/source/control/NotebookbarPopup.cxx index 3cc21815ab84..2821a048843b 100644 --- a/vcl/source/control/NotebookbarPopup.cxx +++ b/vcl/source/control/NotebookbarPopup.cxx @@ -14,10 +14,10 @@ #include <NotebookbarPopup.hxx> NotebookbarPopup::NotebookbarPopup(const VclPtr<VclHBox>& pParent) - : FloatingWindow(pParent, "Popup", "sfx/ui/notebookbarpopup.ui") + : FloatingWindow(pParent, u"Popup"_ustr, u"sfx/ui/notebookbarpopup.ui"_ustr) , m_pParent(pParent) { - m_pUIBuilder->get(m_pBox, "box"); + m_pUIBuilder->get(m_pBox, u"box"_ustr); m_pBox->SetSizePixel(Size(100, 75)); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const BitmapEx& aPersona = rStyleSettings.GetPersonaHeader(); diff --git a/vcl/source/control/WeldedTabbedNotebookbar.cxx b/vcl/source/control/WeldedTabbedNotebookbar.cxx index 1b9eef3756e0..056f19ce1d27 100644 --- a/vcl/source/control/WeldedTabbedNotebookbar.cxx +++ b/vcl/source/control/WeldedTabbedNotebookbar.cxx @@ -17,8 +17,8 @@ WeldedTabbedNotebookbar::WeldedTabbedNotebookbar( : m_xBuilder(JSInstanceBuilder::CreateNotebookbarBuilder( pContainerWindow, AllSettings::GetUIRootDir(), rUIFilePath, rFrame, nWindowId)) { - m_xContainer = m_xBuilder->weld_container("NotebookBar"); - m_xWeldedToolbar = m_xBuilder->weld_toolbar("WeldedToolbar"); + m_xContainer = m_xBuilder->weld_container(u"NotebookBar"_ustr); + m_xWeldedToolbar = m_xBuilder->weld_toolbar(u"WeldedToolbar"_ustr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 138f17d0d4eb..4f8eafa7a144 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -241,7 +241,7 @@ void Button::ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, tools::Rectangle(Point(), Size(0x7fffffff, 0x7fffffff)), aText, nTextStyle); // If the button text doesn't fit into it, put it into a tooltip (might happen in sidebar) if (GetQuickHelpText()!= aText && mpButtonData->mbGeneratedTooltip) - SetQuickHelpText(""); + SetQuickHelpText(u""_ustr); if (GetQuickHelpText().isEmpty() && textRect.getOpenWidth() > rSize.getWidth()) { SetQuickHelpText(aText); @@ -1786,7 +1786,7 @@ void PushButton::ShowFocus(const tools::Rectangle& rRect) void OKButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { - set_id("ok"); + set_id(u"ok"_ustr); PushButton::ImplInit( pParent, nStyle ); SetText( GetStandardText( StandardButtonType::OK ) ); @@ -1833,7 +1833,7 @@ void OKButton::Click() void CancelButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { - set_id("cancel"); + set_id(u"cancel"_ustr); PushButton::ImplInit( pParent, nStyle ); SetText( GetStandardText( StandardButtonType::Cancel ) ); @@ -1885,7 +1885,7 @@ CloseButton::CloseButton( vcl::Window* pParent ) void HelpButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { - set_id("help"); + set_id(u"help"_ustr); PushButton::ImplInit( pParent, nStyle | WB_NOPOINTERFOCUS ); SetText( GetStandardText( StandardButtonType::Help ) ); diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index cce0bce63a3a..d147738e110a 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -84,7 +84,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) mbPrevIn = false; mbNextIn = false; - OUString aGregorian( "gregorian"); + OUString aGregorian( u"gregorian"_ustr); maCalendarWrapper.loadCalendar( aGregorian, Application::GetAppLocaleDataWrapper().getLanguageTag().getLocale()); if (maCalendarWrapper.getUniqueID() != aGregorian) @@ -97,7 +97,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) * rewrite would be necessary to internally replace use of class Date * with proper class CalendarWrapper methods, get rid of fixed 12 * months, fixed 7 days, ... */ - maCalendarWrapper.loadCalendar( aGregorian, lang::Locale( "en", "US", "")); + maCalendarWrapper.loadCalendar( aGregorian, lang::Locale( u"en"_ustr, u"US"_ustr, u""_ustr)); } SetFirstDate( maCurDate ); @@ -204,7 +204,7 @@ void Calendar::ImplFormat() if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) ) return; - tools::Long n99TextWidth = GetTextWidth( "99" ); + tools::Long n99TextWidth = GetTextWidth( u"99"_ustr ); tools::Long nTextHeight = GetTextHeight(); // calculate width and x-position @@ -1503,7 +1503,7 @@ void Calendar::EndSelection() Size Calendar::CalcWindowSizePixel() const { Size aSize; - tools::Long n99TextWidth = GetTextWidth( "99" ); + tools::Long n99TextWidth = GetTextWidth( u"99"_ustr ); tools::Long nTextHeight = GetTextHeight(); aSize.AdjustWidth((n99TextWidth+DAY_OFFX)*7); @@ -1547,11 +1547,11 @@ namespace public: ImplCFieldFloat(vcl::Window* pContainer) - : mxBuilder(Application::CreateInterimBuilder(pContainer, "svt/ui/calendar.ui", false)) - , mxContainer(mxBuilder->weld_container("Calendar")) - , mxCalendar(mxBuilder->weld_calendar("date")) - , mxTodayBtn(mxBuilder->weld_button("today")) - , mxNoneBtn(mxBuilder->weld_button("none")) + : mxBuilder(Application::CreateInterimBuilder(pContainer, u"svt/ui/calendar.ui"_ustr, false)) + , mxContainer(mxBuilder->weld_container(u"Calendar"_ustr)) + , mxCalendar(mxBuilder->weld_calendar(u"date"_ustr)) + , mxTodayBtn(mxBuilder->weld_button(u"today"_ustr)) + , mxNoneBtn(mxBuilder->weld_button(u"none"_ustr)) { } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 0e75dc36b91c..c2a7c4c9ccf8 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2707,7 +2707,7 @@ namespace vcl VclPtr<PopupMenu> Edit::CreatePopupMenu() { if (!mpUIBuilder) - mpUIBuilder.reset(new VclBuilder(nullptr, AllSettings::GetUIRootDir(), "vcl/ui/editmenu.ui", "")); + mpUIBuilder.reset(new VclBuilder(nullptr, AllSettings::GetUIRootDir(), u"vcl/ui/editmenu.ui"_ustr, u""_ustr)); VclPtr<PopupMenu> pPopup = mpUIBuilder->get_menu(u"menu"); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if (rStyleSettings.GetHideDisabledMenuItems()) diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8552d2510d24..15e994e48ff3 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1294,7 +1294,7 @@ static sal_uInt16 ImplCutMonthFromString( OUString& rStr, OUString& rCalendarNam static OUString ImplGetDateSep( const LocaleDataWrapper& rLocaleDataWrapper, ExtDateFieldFormat eFormat ) { if ( ( eFormat == ExtDateFieldFormat::ShortYYMMDD_DIN5008 ) || ( eFormat == ExtDateFieldFormat::ShortYYYYMMDD_DIN5008 ) ) - return "-"; + return u"-"_ustr; else return rLocaleDataWrapper.getDateSep(); } diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 6508c4fe12c3..3071083494e1 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -2042,7 +2042,7 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry const * pThi Size SvxIconChoiceCtrl_Impl::GetMinGrid() const { - Size aTextSize( pView->GetTextWidth( "XXX" ), pView->GetTextHeight() ); + Size aTextSize( pView->GetTextWidth( u"XXX"_ustr ), pView->GetTextHeight() ); if (nWinBits & WB_DETAILS) return Size(aTextSize.Width(), aTextSize.Height()); diff --git a/vcl/source/control/managedmenubutton.cxx b/vcl/source/control/managedmenubutton.cxx index 7545dba9b374..cdd0e5345c90 100644 --- a/vcl/source/control/managedmenubutton.cxx +++ b/vcl/source/control/managedmenubutton.cxx @@ -72,9 +72,9 @@ void ManagedMenuButton::PrepareExecute() {} css::uno::Sequence<css::uno::Any> aArgs { - css::uno::Any(comphelper::makePropertyValue("ModuleIdentifier", aModuleName)), - css::uno::Any(comphelper::makePropertyValue("Frame", css::uno::Any(xFrame))), - css::uno::Any(comphelper::makePropertyValue("InToolbar", css::uno::Any(true))) + css::uno::Any(comphelper::makePropertyValue(u"ModuleIdentifier"_ustr, aModuleName)), + css::uno::Any(comphelper::makePropertyValue(u"Frame"_ustr, css::uno::Any(xFrame))), + css::uno::Any(comphelper::makePropertyValue(u"InToolbar"_ustr, css::uno::Any(true))) }; const OUString aCommand(GetCommand()); @@ -91,7 +91,7 @@ void ManagedMenuButton::PrepareExecute() // No registered controller found, use one the can handle arbitrary menus (e.g. defined in .ui file). if (!m_xPopupController.is()) m_xPopupController.set(xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.comp.framework.ResourceMenuController", aArgs, xContext), css::uno::UNO_QUERY); + u"com.sun.star.comp.framework.ResourceMenuController"_ustr, aArgs, xContext), css::uno::UNO_QUERY); if (m_xPopupController.is()) m_xPopupController->setPopupMenu(m_xPopupMenu); diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 186340d8e047..28417879888d 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -106,7 +106,7 @@ void MenuButton::ExecuteMenu() mnCurItemId = 0; msCurItemIdent.clear(); } - collectUIInformation(aID,"OPENLIST","",""); + collectUIInformation(aID,u"OPENLIST"_ustr,u""_ustr,u""_ustr); } void MenuButton::CancelMenu() @@ -125,7 +125,7 @@ void MenuButton::CancelMenu() else vcl::Window::GetDockingManager()->EndPopupMode(mpFloatingWindow); } - collectUIInformation(get_id(),"CLOSELIST","",""); + collectUIInformation(get_id(),u"CLOSELIST"_ustr,u""_ustr,u""_ustr); } bool MenuButton::InPopupMode() const @@ -235,7 +235,7 @@ void MenuButton::Activate() void MenuButton::Select() { if (mnCurItemId) - collectUIInformation(get_id(),"OPENFROMLIST","POS",OUString::number(mnCurItemId)); + collectUIInformation(get_id(),u"OPENFROMLIST"_ustr,u"POS"_ustr,OUString::number(mnCurItemId)); maSelectHdl.Call( this ); } diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index db336b1fe8f5..4b6da5c4b573 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -29,8 +29,8 @@ static OUString getCustomizedUIRootDir() { - OUString sShareLayer("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( - "bootstrap") ":UserInstallation}/user/config/soffice.cfg/"); + OUString sShareLayer(u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( + "bootstrap") ":UserInstallation}/user/config/soffice.cfg/"_ustr); rtl::Bootstrap::expandMacros(sShareLayer); return sShareLayer; } @@ -106,7 +106,7 @@ NotebookBar::NotebookBar(Window* pParent, const OUString& rID, const OUString& r int i = 0; do { - OUString aName = "ContextContainer"; + OUString aName = u"ContextContainer"_ustr; if (i) aName += OUString::number(i); diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx index a3d3251cea90..9216fb29a230 100644 --- a/vcl/source/control/roadmap.cxx +++ b/vcl/source/control/roadmap.cxx @@ -328,7 +328,7 @@ void ORoadmap::SetRoadmapComplete(bool _bComplete) } } else if (bWasComplete) - m_pImpl->InCompleteHyperLabel = InsertHyperLabel(m_pImpl->getItemCount(), "...", -1, true/*bEnabled*/, true/*bIncomplete*/ ); + m_pImpl->InCompleteHyperLabel = InsertHyperLabel(m_pImpl->getItemCount(), u"..."_ustr, -1, true/*bEnabled*/, true/*bIncomplete*/ ); } void ORoadmap::UpdatefollowingHyperLabels(ItemIndex _nIndex) @@ -352,7 +352,7 @@ void ORoadmap::UpdatefollowingHyperLabels(ItemIndex _nIndex) { RoadmapItem* pOldItem = GetPreviousHyperLabel( m_pImpl->getItemCount() ); m_pImpl->InCompleteHyperLabel->SetPosition( pOldItem ); - m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), "..." ); + m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), u"..."_ustr ); } } @@ -779,7 +779,7 @@ void RoadmapItem::ImplUpdatePosSize() { // calculate widths tools::Long nIDWidth = mpID->GetTextWidth( mpID->GetText() ); - tools::Long nMaxIDWidth = mpID->GetTextWidth( "100." ); + tools::Long nMaxIDWidth = mpID->GetTextWidth( u"100."_ustr ); nIDWidth = ::std::min( nIDWidth, nMaxIDWidth ); // check how many space the description would need diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 1b3c9e96b477..1c9bc35c3c95 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -393,7 +393,7 @@ namespace vcl int nPages = nRoadmapItems; for (int i = nPages - 1; i >= nItemIndex; --i) { - m_xAssistant->set_page_title(m_xAssistant->get_page_ident(i), ""); + m_xAssistant->set_page_title(m_xAssistant->get_page_ident(i), u""_ustr); --nRoadmapItems; } break; @@ -406,7 +406,7 @@ namespace vcl WizardTypes::WizardState nRequiredState = rActivePath[ nItemIndex ]; if ( nPresentItemId != nRequiredState ) { - m_xAssistant->set_page_title(OUString::number(nPresentItemId), ""); + m_xAssistant->set_page_title(OUString::number(nPresentItemId), u""_ustr); bInsertItem = true; } } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index cafbae98623c..5d57fa23a6b9 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -259,7 +259,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, tools::Long nMaxWidth ) // shorten Text if needed if ( aSize.Width()+4 >= nMaxWidth ) { - OUString aAppendStr("..."); + OUString aAppendStr(u"..."_ustr); pItem->maFormatText += aAppendStr; do { diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 075e40d2de9b..01913d0023e1 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -80,7 +80,7 @@ namespace for ( const auto& rImageURL : aImageURLs ) { Reference< XGraphic > xGraphic; - aMediaProperties.put( "URL", rImageURL ); + aMediaProperties.put( u"URL"_ustr, rImageURL ); xGraphic = xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ); aImages.emplace_back( xGraphic ); } diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index a439059b906d..31e84ca37eb7 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -319,7 +319,7 @@ namespace vcl m_pHelp= VclPtr<HelpButton>::Create(this, WB_TABSTOP); m_pHelp->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont))); m_pHelp->Show(); - m_pHelp->set_id("help"); + m_pHelp->set_id(u"help"_ustr); AddButtonResponse(m_pHelp, RET_HELP); AddButton( m_pHelp, WIZARDDIALOG_BUTTON_STDOFFSET_X); } @@ -332,7 +332,7 @@ namespace vcl m_pPrevPage->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont))); m_pPrevPage->SetText(VclResId(STR_WIZDLG_PREVIOUS)); m_pPrevPage->Show(); - m_pPrevPage->set_id("previous"); + m_pPrevPage->set_id(u"previous"_ustr); if (_nButtonFlags & WizardButtonFlags::NEXT) AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button @@ -350,7 +350,7 @@ namespace vcl m_pNextPage->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont))); m_pNextPage->SetText(VclResId(STR_WIZDLG_NEXT)); m_pNextPage->Show(); - m_pNextPage->set_id("next"); + m_pNextPage->set_id(u"next"_ustr); AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X ); mpNextBtn = m_pNextPage; @@ -364,7 +364,7 @@ namespace vcl m_pFinish->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont))); m_pFinish->SetText(VclResId(STR_WIZDLG_FINISH)); m_pFinish->Show(); - m_pFinish->set_id("finish"); + m_pFinish->set_id(u"finish"_ustr); AddButton( m_pFinish, WIZARDDIALOG_BUTTON_STDOFFSET_X ); m_pFinish->SetClickHdl( LINK( this, RoadmapWizard, OnFinish ) ); @@ -802,7 +802,7 @@ namespace vcl } WizardMachine::WizardMachine(weld::Window* pParent, WizardButtonFlags nButtonFlags) - : AssistantController(pParent, "vcl/ui/wizard.ui", "Wizard") + : AssistantController(pParent, u"vcl/ui/wizard.ui"_ustr, u"Wizard"_ustr) , m_pCurTabPage(nullptr) , m_nCurState(0) , m_pFirstPage(nullptr) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 697b4728369a..6ddbce0f6bdd 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -189,9 +189,9 @@ void TextEngine::SetFont( const vcl::Font& rFont ) maFont.SetAlignment( ALIGN_TOP ); mpRefDev->SetFont( maFont ); - mnDefTab = mpRefDev->GetTextWidth(" "); + mnDefTab = mpRefDev->GetTextWidth(u" "_ustr); if ( !mnDefTab ) - mnDefTab = mpRefDev->GetTextWidth("XXXX"); + mnDefTab = mpRefDev->GetTextWidth(u"XXXX"_ustr); if ( !mnDefTab ) mnDefTab = 1; mnCharHeight = mpRefDev->GetTextHeight(); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 331f69fb914d..53ed200ce870 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -2321,7 +2321,7 @@ void TextView::ToggleComment() std::u16string_view sLine(sText); if (o3tl::trim(sLine).length() > 0) { - pEngine->ImpInsertText(TextPaM(n, nCommentPos), "' "); + pEngine->ImpInsertText(TextPaM(n, nCommentPos), u"' "_ustr); bChanged = true; } } diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index a00b7996f5ed..85020ec607a4 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -102,13 +102,13 @@ static Reference< XInterface > openConfig(const char* sPackage) // define cfg path for open aParam.Name = "nodepath"; if (rtl_str_compareIgnoreAsciiCase(sPackage, "types") == 0) - aParam.Value <<= OUString( "/org.openoffice.TypeDetection.Types/Types" ); + aParam.Value <<= u"/org.openoffice.TypeDetection.Types/Types"_ustr; if (rtl_str_compareIgnoreAsciiCase(sPackage, "filters") == 0) - aParam.Value <<= OUString( "/org.openoffice.TypeDetection.GraphicFilter/Filters" ); + aParam.Value <<= u"/org.openoffice.TypeDetection.GraphicFilter/Filters"_ustr; Sequence< Any > lParams{ Any(aParam) }; // get access to file - xCfg = xConfigProvider->createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams); + xCfg = xConfigProvider->createInstanceWithArguments(u"com.sun.star.configuration.ConfigurationAccess"_ustr, lParams); } catch(const RuntimeException&) { throw; } diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 5137a2f87016..8fefa8cb6d4c 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -53,7 +53,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory > const & rXCfgP ++nIdx; // creation arguments: nodepath - PropertyValue aPathArgument = comphelper::makePropertyValue("nodepath", + PropertyValue aPathArgument = comphelper::makePropertyValue(u"nodepath"_ustr, OUString(o3tl::getToken(rTree, 0, '/', nIdx))); Sequence< Any > aArguments{ Any(aPathArgument) }; @@ -61,7 +61,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory > const & rXCfgP try { xReadAccess = rXCfgProv->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", + u"com.sun.star.configuration.ConfigurationAccess"_ustr, aArguments ); } catch (const css::uno::Exception&) @@ -117,7 +117,7 @@ void FilterConfigItem::ImpInitTree( std::u16string_view rSubTree ) try { xUpdatableView = xCfgProv->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", + u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr, aArguments ); if ( xUpdatableView.is() ) xPropSet.set( xUpdatableView, UNO_QUERY ); diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx index 792dd6a93a8f..7f2c2dfff645 100644 --- a/vcl/source/filter/GraphicNativeTransform.cxx +++ b/vcl/source/filter/GraphicNativeTransform.cxx @@ -94,9 +94,9 @@ bool GraphicNativeTransform::rotateGeneric(Degree10 aRotation, std::u16string_vi GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); css::uno::Sequence<css::beans::PropertyValue> aFilterData{ - comphelper::makePropertyValue("Interlaced", sal_Int32(0)), - comphelper::makePropertyValue("Compression", sal_Int32(9)), - comphelper::makePropertyValue("Quality", sal_Int32(90)) + comphelper::makePropertyValue(u"Interlaced"_ustr, sal_Int32(0)), + comphelper::makePropertyValue(u"Compression"_ustr, sal_Int32(9)), + comphelper::makePropertyValue(u"Quality"_ustr, sal_Int32(90)) }; sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName(aType); diff --git a/vcl/source/filter/bmp/BmpWriter.cxx b/vcl/source/filter/bmp/BmpWriter.cxx index a5fcedec231a..7768259a5392 100644 --- a/vcl/source/filter/bmp/BmpWriter.cxx +++ b/vcl/source/filter/bmp/BmpWriter.cxx @@ -23,7 +23,7 @@ bool BmpWriter(SvStream& rStream, const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { BitmapEx aBitmap = rGraphic.GetBitmapEx(); - sal_Int32 nColor = pFilterConfigItem->ReadInt32("Color", 0); + sal_Int32 nColor = pFilterConfigItem->ReadInt32(u"Color"_ustr, 0); auto nColorRes = static_cast<BmpConversion>(nColor); if (nColorRes != BmpConversion::NNONE && nColorRes <= BmpConversion::N24Bit) @@ -31,7 +31,7 @@ bool BmpWriter(SvStream& rStream, const Graphic& rGraphic, FilterConfigItem* pFi if (!aBitmap.Convert(nColorRes)) aBitmap = rGraphic.GetBitmapEx(); } - bool bRleCoding = pFilterConfigItem->ReadBool("RLE_Coding", true); + bool bRleCoding = pFilterConfigItem->ReadBool(u"RLE_Coding"_ustr, true); WriteDIB(aBitmap, rStream, bRleCoding); return rStream.good(); diff --git a/vcl/source/filter/egif/egif.cxx b/vcl/source/filter/egif/egif.cxx index 59ba24cf5ccf..8b57bac7aa1e 100644 --- a/vcl/source/filter/egif/egif.cxx +++ b/vcl/source/filter/egif/egif.cxx @@ -112,7 +112,7 @@ bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfi m_pAcc.reset(); if ( pFilterConfigItem ) - nInterlaced = pFilterConfigItem->ReadInt32( "Interlaced", 0 ); + nInterlaced = pFilterConfigItem->ReadInt32( u"Interlaced"_ustr, 0 ); m_rGIF.SetEndian( SvStreamEndian::LITTLE ); diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx index 046907a80927..22131a80a03e 100644 --- a/vcl/source/filter/eps/eps.cxx +++ b/vcl/source/filter/eps/eps.cxx @@ -304,20 +304,20 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter if ( pFilterConfigItem ) { #ifdef UNX // don't put binary tiff preview ahead of postscript code by default on unix as ghostscript is unable to read it - mnPreview = pFilterConfigItem->ReadInt32( "Preview", 0 ); + mnPreview = pFilterConfigItem->ReadInt32( u"Preview"_ustr, 0 ); #else mnPreview = pFilterConfigItem->ReadInt32( "Preview", 1 ); #endif - mnLevel = pFilterConfigItem->ReadInt32( "Version", 2 ); + mnLevel = pFilterConfigItem->ReadInt32( u"Version"_ustr, 2 ); if ( mnLevel != 1 ) mnLevel = 2; - mbGrayScale = pFilterConfigItem->ReadInt32( "ColorFormat", 1 ) == 2; + mbGrayScale = pFilterConfigItem->ReadInt32( u"ColorFormat"_ustr, 1 ) == 2; #ifdef UNX // don't compress by default on unix as ghostscript is unable to read LZW compressed eps - mbCompression = pFilterConfigItem->ReadInt32( "CompressionMode", 0 ) != 0; + mbCompression = pFilterConfigItem->ReadInt32( u"CompressionMode"_ustr, 0 ) != 0; #else mbCompression = pFilterConfigItem->ReadInt32( "CompressionMode", 1 ) == 1; #endif - mnTextMode = pFilterConfigItem->ReadInt32( "TextMode", 0 ); + mnTextMode = pFilterConfigItem->ReadInt32( u"TextMode"_ustr, 0 ); if ( mnTextMode > 2 ) mnTextMode = 0; } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 11612378fb8e..a7b125760107 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -180,7 +180,7 @@ ErrCode GraphicFilter::ImpTestOrFindFormat( std::u16string_view rPath, SvStream& else if ( pConfig->GetImportFilterType( rFormat ).equalsIgnoreAsciiCase( "pcd_Photo_CD_Base16" ) ) nBase = 0; FilterConfigItem aFilterConfigItem( u"Office.Common/Filter/Graphic/Import/PCD" ); - aFilterConfigItem.WriteInt32( "Resolution", nBase ); + aFilterConfigItem.WriteInt32( u"Resolution"_ustr, nBase ); } } @@ -191,12 +191,12 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r { Graphic aGraphic; - sal_Int32 nLogicalWidth = rConfigItem.ReadInt32( "LogicalWidth", 0 ); - sal_Int32 nLogicalHeight = rConfigItem.ReadInt32( "LogicalHeight", 0 ); + sal_Int32 nLogicalWidth = rConfigItem.ReadInt32( u"LogicalWidth"_ustr, 0 ); + sal_Int32 nLogicalHeight = rConfigItem.ReadInt32( u"LogicalHeight"_ustr, 0 ); if ( rGraphic.GetType() != GraphicType::NONE ) { - sal_Int32 nMode = rConfigItem.ReadInt32( "ExportMode", -1 ); + sal_Int32 nMode = rConfigItem.ReadInt32( u"ExportMode"_ustr, -1 ); if ( nMode == -1 ) // the property is not there, this is possible, if the graphic filter { // is called via UnoGraphicExporter and not from a graphic export Dialog @@ -225,7 +225,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r BitmapEx aBitmap( rGraphic.GetBitmapEx() ); MapMode aMap( MapUnit::Map100thInch ); - sal_Int32 nDPI = rConfigItem.ReadInt32( "Resolution", 75 ); + sal_Int32 nDPI = rConfigItem.ReadInt32( u"Resolution"_ustr, 75 ); Fraction aFrac( 1, std::clamp( nDPI, sal_Int32(75), sal_Int32(600) ) ); aMap.SetScaleX( aFrac ); @@ -247,7 +247,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r else aGraphic = rGraphic; - sal_Int32 nColors = rConfigItem.ReadInt32( "Color", 0 ); + sal_Int32 nColors = rConfigItem.ReadInt32( u"Color"_ustr, 0 ); if ( nColors ) // graphic conversion necessary ? { BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); @@ -317,7 +317,7 @@ void GraphicFilter::ImplInit() if( bUseConfig ) { - OUString url("$BRAND_BASE_DIR/" LIBO_LIB_FOLDER); + OUString url(u"$BRAND_BASE_DIR/" LIBO_LIB_FOLDER ""_ustr); rtl::Bootstrap::expandMacros(url); //TODO: detect failure osl::FileBase::getSystemPathFromFileURL(url, aFilterPath); } @@ -1230,7 +1230,7 @@ ErrCode GraphicFilter::readPCD(SvStream & rStream, Graphic & rGraphic) std::unique_ptr<FilterConfigItem> pFilterConfigItem; if (!comphelper::IsFuzzing()) { - OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Import/PCD" ); + OUString aFilterConfigPath( u"Office.Common/Filter/Graphic/Import/PCD"_ustr ); pFilterConfigItem = std::make_unique<FilterConfigItem>(aFilterConfigPath); } @@ -1577,7 +1577,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, std::u16string_vi } else if( aFilterName.equalsIgnoreAsciiCase( EXP_SVMETAFILE ) ) { - sal_Int32 nVersion = aConfigItem.ReadInt32( "Version", 0 ) ; + sal_Int32 nVersion = aConfigItem.ReadInt32( u"Version"_ustr, 0 ) ; if ( nVersion ) rOStm.SetVersion( nVersion ); @@ -1753,7 +1753,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, std::u16string_vi css::uno::Sequence< css::uno::Any > aArguments{ css::uno::Any( aConfigItem.GetFilterData()) }; css::uno::Reference< css::svg::XSVGWriter > xSVGWriter( - xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "com.sun.star.svg.SVGWriter", aArguments, xContext), + xContext->getServiceManager()->createInstanceWithArgumentsAndContext( u"com.sun.star.svg.SVGWriter"_ustr, aArguments, xContext), css::uno::UNO_QUERY ); if( xSaxWriter.is() && xSVGWriter.is() ) { @@ -1952,7 +1952,7 @@ ErrCode GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilt ErrCode GraphicFilter::compressAsPNG(const Graphic& rGraphic, SvStream& rOutputStream) { css::uno::Sequence< css::beans::PropertyValue > aFilterData{ comphelper::makePropertyValue( - "Compression", sal_uInt32(9)) }; + u"Compression"_ustr, sal_uInt32(9)) }; sal_uInt16 nFilterFormat = GetExportFormatNumberForShortName(u"PNG"); return ExportGraphic(rGraphic, u"", rOutputStream, nFilterFormat, &aFilterData); diff --git a/vcl/source/filter/ieps/ieps.cxx b/vcl/source/filter/ieps/ieps.cxx index 0a0b576924ac..d9d233ed77bf 100644 --- a/vcl/source/filter/ieps/ieps.cxx +++ b/vcl/source/filter/ieps/ieps.cxx @@ -225,9 +225,9 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r //Under Linux, positioning of letters within pstoedit is very approximate. //Using the -nfw option delegates the positioning to the reader, and we //will do a proper job. The option is ignored on Windows. - OUString arg1("-usebbfrominput"); //-usebbfrominput use the original ps bounding box - OUString arg2("-f"); - OUString arg3("emf:-OO -drawbb -nfw"); //-drawbb mark out the bounding box extent with bg pixels + OUString arg1(u"-usebbfrominput"_ustr); //-usebbfrominput use the original ps bounding box + OUString arg2(u"-f"_ustr); + OUString arg3(u"emf:-OO -drawbb -nfw"_ustr); //-drawbb mark out the bounding box extent with bg pixels //-nfw delegate letter placement to us rtl_uString *args[] = { @@ -238,7 +238,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r oslFileHandle pOut = nullptr; oslFileHandle pErr = nullptr; oslProcessError eErr = runProcessWithPathSearch( - "pstoedit" EXESUFFIX, + u"pstoedit" EXESUFFIX ""_ustr, args, SAL_N_ELEMENTS(args), &aProcess, &pIn, &pOut, &pErr); @@ -362,14 +362,14 @@ static bool RenderAsBMPThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe Graphic &rGraphic) { // density in pixel/inch - OUString arg1("-density"); + OUString arg1(u"-density"_ustr); // since the preview is also used for PDF-Export & printing on non-PS-printers, // use some better quality - 300x300 should allow some resizing as well - OUString arg2("300x300"); + OUString arg2(u"300x300"_ustr); // read eps from STDIN - OUString arg3("eps:-"); + OUString arg3(u"eps:-"_ustr); // write bmp to STDOUT - OUString arg4("bmp:-"); + OUString arg4(u"bmp:-"_ustr); rtl_uString *args[] = { arg1.pData, arg2.pData, arg3.pData, arg4.pData @@ -383,17 +383,17 @@ static bool RenderAsBMPThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &rGraphic) { - OUString arg1("-q"); - OUString arg2("-dBATCH"); - OUString arg3("-dNOPAUSE"); - OUString arg4("-dPARANOIDSAFER"); - OUString arg5("-dEPSCrop"); - OUString arg6("-dTextAlphaBits=4"); - OUString arg7("-dGraphicsAlphaBits=4"); - OUString arg8("-r300x300"); - OUString arg9("-sDEVICE=bmp16m"); - OUString arg10("-sOutputFile=-"); - OUString arg11("-"); + OUString arg1(u"-q"_ustr); + OUString arg2(u"-dBATCH"_ustr); + OUString arg3(u"-dNOPAUSE"_ustr); + OUString arg4(u"-dPARANOIDSAFER"_ustr); + OUString arg5(u"-dEPSCrop"_ustr); + OUString arg6(u"-dTextAlphaBits=4"_ustr); + OUString arg7(u"-dGraphicsAlphaBits=4"_ustr); + OUString arg8(u"-r300x300"_ustr); + OUString arg9(u"-sDEVICE=bmp16m"_ustr); + OUString arg10(u"-sOutputFile=-"_ustr); + OUString arg11(u"-"_ustr); rtl_uString *args[] = { arg1.pData, arg2.pData, arg3.pData, arg4.pData, arg5.pData, diff --git a/vcl/source/filter/imet/ios2met.cxx b/vcl/source/filter/imet/ios2met.cxx index e055ea83824a..ff6a54db253d 100644 --- a/vcl/source/filter/imet/ios2met.cxx +++ b/vcl/source/filter/imet/ios2met.cxx @@ -917,7 +917,7 @@ void OS2METReader::ReadRelLine(bool bGivenPos, sal_uInt16 nOrderLen) } else aP0=aAttr.aCurPos; if (nOrderLen > pOS2MET->remainingSize()) - throw css::uno::Exception("attempt to read past end of input", nullptr); + throw css::uno::Exception(u"attempt to read past end of input"_ustr, nullptr); nPolySize=nOrderLen/2; if (nPolySize==0) return; tools::Polygon aPolygon(nPolySize); @@ -1061,7 +1061,7 @@ void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt1 nLen = nOrderLen-4; } if (!pOS2MET->good() || nLen > pOS2MET->remainingSize()) - throw css::uno::Exception("attempt to read past end of input", nullptr); + throw css::uno::Exception(u"attempt to read past end of input"_ustr, nullptr); std::unique_ptr<char[]> pChr(new char[nLen+1]); for (sal_uInt16 i=0; i<nLen; i++) pOS2MET->ReadChar( pChr[i] ); diff --git a/vcl/source/filter/ipcd/ipcd.cxx b/vcl/source/filter/ipcd/ipcd.cxx index 220ac6111012..1bb0db542eca 100644 --- a/vcl/source/filter/ipcd/ipcd.cxx +++ b/vcl/source/filter/ipcd/ipcd.cxx @@ -111,7 +111,7 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem ) eResolution = PCDRES_BASE; if ( pConfigItem ) { - sal_Int32 nResolution = pConfigItem->ReadInt32( "Resolution", 2 ); + sal_Int32 nResolution = pConfigItem->ReadInt32( u"Resolution"_ustr, 2 ); if ( nResolution == 1 ) eResolution = PCDRES_BASE4; else if ( nResolution == 0 ) diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index ae644884c1f0..3a5776f8a6dc 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -120,9 +120,9 @@ JPEGWriter::JPEGWriter( SvStream& rStream, const css::uno::Sequence< css::beans: mpExpWasGrey ( pExportWasGrey ) { FilterConfigItem aConfigItem( pFilterData ); - mbGreys = aConfigItem.ReadInt32( "ColorMode", 0 ) != 0; - mnQuality = aConfigItem.ReadInt32( "Quality", 75 ); - maChromaSubsampling = aConfigItem.ReadInt32( "ChromaSubsamplingMode", 0 ); + mbGreys = aConfigItem.ReadInt32( u"ColorMode"_ustr, 0 ) != 0; + mnQuality = aConfigItem.ReadInt32( u"Quality"_ustr, 75 ); + maChromaSubsampling = aConfigItem.ReadInt32( u"ChromaSubsamplingMode"_ustr, 0 ); if ( pFilterData ) { diff --git a/vcl/source/filter/webp/writer.cxx b/vcl/source/filter/webp/writer.cxx index c5249b5adf41..021947682a1c 100644 --- a/vcl/source/filter/webp/writer.cxx +++ b/vcl/source/filter/webp/writer.cxx @@ -195,10 +195,10 @@ bool ExportWebpGraphic(SvStream& rStream, const Graphic& rGraphic, { BitmapEx bitmap = rGraphic.GetBitmapEx(); // If lossless, neither presets nor quality matter. - bool lossless = pFilterConfigItem->ReadBool("Lossless", true); + bool lossless = pFilterConfigItem->ReadBool(u"Lossless"_ustr, true); // Preset is WebPPreset values. - const OUString preset = pFilterConfigItem->ReadString("Preset", ""); - int quality = pFilterConfigItem->ReadInt32("Quality", 75); + const OUString preset = pFilterConfigItem->ReadString(u"Preset"_ustr, u""_ustr); + int quality = pFilterConfigItem->ReadInt32(u"Quality"_ustr, 75); return writeWebp(rStream, bitmap, lossless, preset, quality); } diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index f3e0ae81c9a0..3f975ec5e659 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1692,7 +1692,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, } comphelper::SequenceAsHashMap aMap(pFConfigItem->GetFilterData()); - auto it = aMap.find("EmbedEMF"); + auto it = aMap.find(u"EmbedEMF"_ustr); if (it != aMap.end()) { it->second >>= bEmbedEMF; diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index c38fabb71ee6..6c3838772546 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -848,7 +848,7 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() co if (!comphelper::IsFuzzing()) { const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); - LanguageTag aLanguageTag("en"); + LanguageTag aLanguageTag(u"en"_ustr); OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE ); pFoundData = FindFontFamilyByTokenNames( aFontname ); @@ -1159,7 +1159,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily(FontSelectPattern& rF // if a target symbol font is not available use a default symbol font if( rFSD.IsMicrosoftSymbolEncoded() ) { - LanguageTag aDefaultLanguageTag("en"); + LanguageTag aDefaultLanguageTag(u"en"_ustr); if (comphelper::IsFuzzing()) aSearchName = "OpenSymbol"; else diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx index 0be4c829ddf4..0caee37852b8 100644 --- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx +++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx @@ -47,7 +47,7 @@ namespace { OUString lcl_getThemeDefinitionPath() { - OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/theme_definitions/"); + OUString sPath(u"$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/theme_definitions/"_ustr); rtl::Bootstrap::expandMacros(sPath); return sPath; } @@ -476,7 +476,7 @@ void munchDrawCommands(std::vector<std::shared_ptr<WidgetDrawAction>> const& rDr { SvFileStream aFileStream(rWidgetDraw.msSource, StreamMode::READ); - vcl::bitmap::loadFromSvg(aFileStream, "", aBitmap, nScaleFactor); + vcl::bitmap::loadFromSvg(aFileStream, u""_ustr, aBitmap, nScaleFactor); if (!aBitmap.IsEmpty()) { rCacheImages.insert(std::make_pair(rCacheKey, aBitmap)); @@ -536,7 +536,7 @@ void munchDrawCommands(std::vector<std::shared_ptr<WidgetDrawAction>> const& rDr uno::Reference<io::XInputStream> aInputStream( new comphelper::SequenceInputStream(aData)); - uno::Any aAny = xSvgParser->getDrawCommands(aInputStream, ""); + uno::Any aAny = xSvgParser->getDrawCommands(aInputStream, u""_ustr); if (aAny.has<sal_uInt64>()) { auto* pDrawRoot = reinterpret_cast<gfx::DrawRoot*>(aAny.get<sal_uInt64>()); @@ -1091,7 +1091,7 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings& rSettings) vcl::Font aFont(FAMILY_SWISS, Size(0, nFontSize)); aFont.SetCharSet(osl_getThreadTextEncoding()); aFont.SetWeight(WEIGHT_NORMAL); - aFont.SetFamilyName("Liberation Sans"); + aFont.SetFamilyName(u"Liberation Sans"_ustr); aStyleSet.SetAppFont(aFont); aStyleSet.SetHelpFont(aFont); aStyleSet.SetMenuFont(aFont); diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index a8a4f7e983ba..1ac57ce1b59a 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontshelper.cxx @@ -58,7 +58,7 @@ static void clearDir( const OUString& path ) void EmbeddedFontsHelper::clearTemporaryFontFiles() { - OUString path = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString path = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros( path ); path += "/user/temp/embeddedfonts/"; clearDir( path + "fromdocs/" ); @@ -191,7 +191,7 @@ void EmbeddedFontsHelper::activateFonts() OUString EmbeddedFontsHelper::fileUrlForTemporaryFont( const OUString& fontName, std::u16string_view extra ) { - OUString path = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString path = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros( path ); path += "/user/temp/embeddedfonts/fromdocs/"; osl::Directory::createPath( path ); @@ -242,7 +242,7 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* data, tools::Long siz OUString EmbeddedFontsHelper::fontFileUrl( std::u16string_view familyName, FontFamily family, FontItalic italic, FontWeight weight, FontPitch pitch, FontRights rights ) { - OUString path = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString path = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros( path ); path += "/user/temp/embeddedfonts/fromsystem/"; osl::Directory::createPath( path ); @@ -357,7 +357,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( std::u16string_view familyName, FontF } } } - return ok ? url : ""; + return ok ? url : u""_ustr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/gdi/formpdfexport.cxx b/vcl/source/gdi/formpdfexport.cxx index ac952491a26e..1d0151c98d4c 100644 --- a/vcl/source/gdi/formpdfexport.cxx +++ b/vcl/source/gdi/formpdfexport.cxx @@ -234,12 +234,12 @@ namespace toolkitform { xElement.set( xCurrentContainer->getByIndex( i ), UNO_QUERY_THROW ); Reference< XServiceInfo > xModelSI( xElement, UNO_QUERY_THROW ); - if ( xModelSI->supportsService("com.sun.star.awt.UnoControlRadioButtonModel") ) + if ( xModelSI->supportsService(u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr) ) { Reference< XPropertySet > aProps( xElement, UNO_QUERY_THROW ); OUString sGroupName; - aProps->getPropertyValue("GroupName") >>= sGroupName; + aProps->getPropertyValue(u"GroupName"_ustr) >>= sGroupName; if ( !sGroupName.isEmpty() ) { // map: unique key is the group name, so attempts to add a different ID value @@ -301,7 +301,7 @@ namespace toolkitform void getStringItemVector( const Reference< XPropertySet >& _rxModel, ::std::vector< OUString >& _rVector ) { Sequence< OUString > aListEntries; - if( ! (_rxModel->getPropertyValue( "StringItemList" ) >>= aListEntries) ) { + if( ! (_rxModel->getPropertyValue( u"StringItemList"_ustr ) >>= aListEntries) ) { SAL_WARN("toolkit.helper", "getStringItemVector: unable to get property StringItemList"); } _rVector.insert( _rVector.end(), std::cbegin(aListEntries), std::cend(aListEntries) ); @@ -342,7 +342,7 @@ namespace toolkitform if( ! (xModelProps->getPropertyValue( FM_PROP_NAME ) >>= Descriptor->Name) ) { SAL_WARN("toolkit.helper", "describePDFControl: unable to get property " << FM_PROP_NAME); } - if( ! (xModelProps->getPropertyValue( "HelpText" ) >>= Descriptor->Description) ) { + if( ! (xModelProps->getPropertyValue( u"HelpText"_ustr ) >>= Descriptor->Description) ) { SAL_INFO("toolkit.helper", "describePDFControl: unable to get property HelpText"); } Any aText; @@ -384,7 +384,7 @@ namespace toolkitform SAL_WARN("toolkit.helper", "describePDFControl: unable to get property " << FM_PROP_BORDER); Descriptor->Border = ( nBorderType != 0 ); - OUString sBorderColorPropertyName( "BorderColor" ); + OUString sBorderColorPropertyName( u"BorderColor"_ustr ); if ( xPSI->hasPropertyByName( sBorderColorPropertyName ) ) { Color nBorderColor = COL_TRANSPARENT; @@ -454,7 +454,7 @@ namespace toolkitform // vertical alignment { - OUString sVertAlignPropertyName( "VerticalAlign" ); + OUString sVertAlignPropertyName( u"VerticalAlign"_ustr ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) { VerticalAlignment nAlign = VerticalAlignment_MIDDLE; @@ -481,7 +481,7 @@ namespace toolkitform } // tab order - OUString aTabIndexString( "TabIndex" ); + OUString aTabIndexString( u"TabIndex"_ustr ); if ( xPSI->hasPropertyByName( aTabIndexString ) ) { sal_Int16 nIndex = -1; @@ -502,7 +502,7 @@ namespace toolkitform pEditWidget->MultiLine = bool( Descriptor->TextStyle & DrawTextFlags::MultiLine ); // password input - OUString sEchoCharPropName( "EchoChar" ); + OUString sEchoCharPropName( u"EchoChar"_ustr ); if ( xPSI->hasPropertyByName( sEchoCharPropName ) ) { sal_Int16 nEchoChar = 0; @@ -511,7 +511,7 @@ namespace toolkitform } // file select - if ( xSI->supportsService( "com.sun.star.form.component.FileControl" ) ) + if ( xSI->supportsService( u"com.sun.star.form.component.FileControl"_ustr ) ) pEditWidget->FileSelect = true; // maximum text length @@ -646,7 +646,7 @@ namespace toolkitform { vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< vcl::PDFWriter::PushButtonWidget* >( Descriptor.get() ); FormButtonType eButtonType = FormButtonType_PUSH; - if( ! (xModelProps->getPropertyValue("ButtonType") >>= eButtonType) ) + if( ! (xModelProps->getPropertyValue(u"ButtonType"_ustr) >>= eButtonType) ) SAL_WARN("toolkit.helper", "describePDFControl: unable to get property ButtonType"); static constexpr OUString FM_PROP_TARGET_URL = u"TargetURL"_ustr; if ( eButtonType == FormButtonType_SUBMIT ) @@ -659,13 +659,13 @@ namespace toolkitform if ( xParentProps.is() ) { Reference< XServiceInfo > xParentSI( xParentProps, UNO_QUERY ); - if ( xParentSI.is() && xParentSI->supportsService("com.sun.star.form.component.HTMLForm") ) + if ( xParentSI.is() && xParentSI->supportsService(u"com.sun.star.form.component.HTMLForm"_ustr) ) { if( ! (xParentProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= pButtonWidget->URL) ) SAL_WARN("toolkit.helper", "describePDFControl: unable to get property " << FM_PROP_TARGET_URL); pButtonWidget->Submit = true; FormSubmitMethod eMethod = FormSubmitMethod_POST; - if( ! (xParentProps->getPropertyValue("SubmitMethod") >>= eMethod) ) + if( ! (xParentProps->getPropertyValue(u"SubmitMethod"_ustr) >>= eMethod) ) SAL_WARN("toolkit.helper", "describePDFControl: unable to get property " << FM_PROP_TARGET_URL); pButtonWidget->SubmitGet = (eMethod == FormSubmitMethod_GET); } @@ -721,7 +721,7 @@ namespace toolkitform try { - xModelProps->getPropertyValue( "RefValue" ) >>= pCheckBoxWidget->OnValue; + xModelProps->getPropertyValue( u"RefValue"_ustr ) >>= pCheckBoxWidget->OnValue; } catch(...) { @@ -729,7 +729,7 @@ namespace toolkitform try { - xModelProps->getPropertyValue( "SecondaryRefValue" ) >>= pCheckBoxWidget->OffValue; + xModelProps->getPropertyValue( u"SecondaryRefValue"_ustr ) >>= pCheckBoxWidget->OffValue; } catch(...) { @@ -748,7 +748,7 @@ namespace toolkitform pRadioWidget->RadioGroup = determineRadioGroupId( xModelProps ); try { - xModelProps->getPropertyValue( "RefValue" ) >>= pRadioWidget->OnValue; + xModelProps->getPropertyValue( u"RefValue"_ustr ) >>= pRadioWidget->OnValue; } catch(...) { @@ -756,7 +756,7 @@ namespace toolkitform try { - xModelProps->getPropertyValue( "SecondaryRefValue" ) >>= pRadioWidget->OffValue; + xModelProps->getPropertyValue( u"SecondaryRefValue"_ustr ) >>= pRadioWidget->OffValue; } catch(...) { @@ -770,11 +770,11 @@ namespace toolkitform vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< vcl::PDFWriter::ListBoxWidget* >( Descriptor.get() ); // drop down - if( ! (xModelProps->getPropertyValue( "Dropdown" ) >>= pListWidget->DropDown) ) + if( ! (xModelProps->getPropertyValue( u"Dropdown"_ustr ) >>= pListWidget->DropDown) ) SAL_WARN("toolkit.helper", "describePDFControl: unable to get property Dropdown"); // multi selection - if( ! (xModelProps->getPropertyValue("MultiSelection") >>= pListWidget->MultiSelect) ) + if( ! (xModelProps->getPropertyValue(u"MultiSelection"_ustr) >>= pListWidget->MultiSelect) ) SAL_WARN("toolkit.helper", "describePDFControl: unable to get property MultiSelection"); // entries @@ -782,7 +782,7 @@ namespace toolkitform // get selected items Sequence< sal_Int16 > aSelectIndices; - if( ! (xModelProps->getPropertyValue("SelectedItems") >>= aSelectIndices) ) + if( ! (xModelProps->getPropertyValue(u"SelectedItems"_ustr) >>= aSelectIndices) ) SAL_WARN("toolkit.helper", "describePDFControl: unable to get property SelectedItems"); if( aSelectIndices.hasElements() ) { diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 3979d3882b7c..31ca14215561 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2347,7 +2347,7 @@ void GDIMetaFile::UseCanvas( bool _bUseCanvas ) void GDIMetaFile::dumpAsXml(const char* pFileName) const { - SvFileStream aStream(pFileName ? OUString::fromUtf8(pFileName) : OUString("file:///tmp/metafile.xml"), + SvFileStream aStream(pFileName ? OUString::fromUtf8(pFileName) : u"file:///tmp/metafile.xml"_ustr, StreamMode::STD_READWRITE | StreamMode::TRUNC); assert(aStream.good()); MetafileXmlDump aDumper; diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx index 2792297feeca..0f251f535d18 100644 --- a/vcl/source/gdi/mtfxmldump.cxx +++ b/vcl/source/gdi/mtfxmldump.cxx @@ -29,9 +29,9 @@ namespace OUString collectPushFlags(vcl::PushFlags nFlags) { if ((nFlags & vcl::PushFlags::ALL) == vcl::PushFlags::ALL) - return "PushAll"; + return u"PushAll"_ustr; else if ((nFlags & PUSH_ALLFONT) == PUSH_ALLFONT) - return "PushAllFont"; + return u"PushAllFont"_ustr; std::vector<OUString> aStrings; @@ -118,7 +118,7 @@ OUString convertDrawTextFlagsToString(DrawTextFlags eDrawTextFlags) OUString aString; if (aStrings.empty()) - return "None"; + return u"None"_ustr; aString = aStrings[0]; for (size_t i = 1; i < aStrings.size(); ++i) @@ -132,11 +132,11 @@ OUString convertRopToString(RasterOp eRop) { switch (eRop) { - case RasterOp::OverPaint: return "overpaint"; - case RasterOp::Xor: return "xor"; - case RasterOp::N0: return "0"; - case RasterOp::N1: return "1"; - case RasterOp::Invert: return "invert"; + case RasterOp::OverPaint: return u"overpaint"_ustr; + case RasterOp::Xor: return u"xor"_ustr; + case RasterOp::N0: return u"0"_ustr; + case RasterOp::N1: return u"1"_ustr; + case RasterOp::Invert: return u"invert"_ustr; } return OUString(); } @@ -145,10 +145,10 @@ OUString convertTextAlignToString(TextAlign eAlign) { switch (eAlign) { - case ALIGN_BASELINE: return "baseline"; - case ALIGN_BOTTOM: return "bottom"; - case ALIGN_TOP: return "top"; - case TextAlign_FORCE_EQUAL_SIZE: return "equalsize"; + case ALIGN_BASELINE: return u"baseline"_ustr; + case ALIGN_BOTTOM: return u"bottom"_ustr; + case ALIGN_TOP: return u"top"_ustr; + case TextAlign_FORCE_EQUAL_SIZE: return u"equalsize"_ustr; } return OUString(); } @@ -163,9 +163,9 @@ OUString convertLineStyleToString(LineStyle eAlign) { switch (eAlign) { - case LineStyle::NONE: return "none"; - case LineStyle::Solid: return "solid"; - case LineStyle::Dash: return "dash"; + case LineStyle::NONE: return u"none"_ustr; + case LineStyle::Solid: return u"solid"_ustr; + case LineStyle::Dash: return u"dash"_ustr; default: break; } return OUString(); @@ -176,10 +176,10 @@ OUString convertLineJoinToString(basegfx::B2DLineJoin eJoin) switch (eJoin) { default: - case basegfx::B2DLineJoin::NONE: return "none"; - case basegfx::B2DLineJoin::Bevel: return "bevel"; - case basegfx::B2DLineJoin::Miter: return "miter"; - case basegfx::B2DLineJoin::Round: return "round"; + case basegfx::B2DLineJoin::NONE: return u"none"_ustr; + case basegfx::B2DLineJoin::Bevel: return u"bevel"_ustr; + case basegfx::B2DLineJoin::Miter: return u"miter"_ustr; + case basegfx::B2DLineJoin::Round: return u"round"_ustr; } } @@ -188,9 +188,9 @@ OUString convertLineCapToString(css::drawing::LineCap eCap) switch (eCap) { default: - case css::drawing::LineCap_BUTT: return "butt"; - case css::drawing::LineCap_ROUND: return "round"; - case css::drawing::LineCap_SQUARE: return "square"; + case css::drawing::LineCap_BUTT: return u"butt"_ustr; + case css::drawing::LineCap_ROUND: return u"round"_ustr; + case css::drawing::LineCap_SQUARE: return u"square"_ustr; } } @@ -199,10 +199,10 @@ OUString convertPolygonFlags(PolyFlags eFlags) switch (eFlags) { default: - case PolyFlags::Normal: return "normal"; - case PolyFlags::Control: return "control"; - case PolyFlags::Smooth: return "smooth"; - case PolyFlags::Symmetric: return "symmetric"; + case PolyFlags::Normal: return u"normal"_ustr; + case PolyFlags::Control: return u"control"_ustr; + case PolyFlags::Smooth: return u"smooth"_ustr; + case PolyFlags::Symmetric: return u"symmetric"_ustr; } } @@ -210,18 +210,18 @@ OUString convertFontWeightToString(FontWeight eFontWeight) { switch (eFontWeight) { - case WEIGHT_DONTKNOW: return "unknown"; - case WEIGHT_THIN: return "thin"; - case WEIGHT_ULTRALIGHT: return "ultralight"; - case WEIGHT_LIGHT: return "light"; - case WEIGHT_SEMILIGHT: return "semilight"; - case WEIGHT_NORMAL: return "normal"; - case WEIGHT_MEDIUM: return "medium"; - case WEIGHT_SEMIBOLD: return "semibold"; - case WEIGHT_BOLD: return "bold"; - case WEIGHT_ULTRABOLD: return "ultrabold"; - case WEIGHT_BLACK: return "black"; - case FontWeight_FORCE_EQUAL_SIZE: return "equalsize"; + case WEIGHT_DONTKNOW: return u"unknown"_ustr; + case WEIGHT_THIN: return u"thin"_ustr; + case WEIGHT_ULTRALIGHT: return u"ultralight"_ustr; + case WEIGHT_LIGHT: return u"light"_ustr; + case WEIGHT_SEMILIGHT: return u"semilight"_ustr; + case WEIGHT_NORMAL: return u"normal"_ustr; + case WEIGHT_MEDIUM: return u"medium"_ustr; + case WEIGHT_SEMIBOLD: return u"semibold"_ustr; + case WEIGHT_BOLD: return u"bold"_ustr; + case WEIGHT_ULTRABOLD: return u"ultrabold"_ustr; + case WEIGHT_BLACK: return u"black"_ustr; + case FontWeight_FORCE_EQUAL_SIZE: return u"equalsize"_ustr; } return OUString(); } @@ -230,14 +230,14 @@ OUString convertFontStrikeoutToString(FontStrikeout eFontStrikeout) { switch (eFontStrikeout) { - case STRIKEOUT_NONE: return "none"; - case STRIKEOUT_SINGLE: return "single"; - case STRIKEOUT_DOUBLE: return "double"; - case STRIKEOUT_DONTKNOW: return "dontknow"; - case STRIKEOUT_BOLD: return "bold"; - case STRIKEOUT_SLASH: return "slash"; - case STRIKEOUT_X: return "x"; - case FontStrikeout_FORCE_EQUAL_SIZE: return "equalsize"; + case STRIKEOUT_NONE: return u"none"_ustr; + case STRIKEOUT_SINGLE: return u"single"_ustr; + case STRIKEOUT_DOUBLE: return u"double"_ustr; + case STRIKEOUT_DONTKNOW: return u"dontknow"_ustr; + case STRIKEOUT_BOLD: return u"bold"_ustr; + case STRIKEOUT_SLASH: return u"slash"_ustr; + case STRIKEOUT_X: return u"x"_ustr; + case FontStrikeout_FORCE_EQUAL_SIZE: return u"equalsize"_ustr; } return OUString(); } @@ -246,26 +246,26 @@ OUString convertFontLineStyleToString(FontLineStyle eFontLineStyle) { switch (eFontLineStyle) { - case LINESTYLE_NONE: return "none"; - case LINESTYLE_SINGLE: return "single"; - case LINESTYLE_DOUBLE: return "double"; - case LINESTYLE_DOTTED: return "dotted"; - case LINESTYLE_DONTKNOW: return "dontknow"; - case LINESTYLE_DASH: return "dash"; - case LINESTYLE_LONGDASH: return "longdash"; - case LINESTYLE_DASHDOT: return "dashdot"; - case LINESTYLE_DASHDOTDOT: return "dashdotdot"; - case LINESTYLE_SMALLWAVE: return "smallwave"; - case LINESTYLE_WAVE: return "wave"; - case LINESTYLE_DOUBLEWAVE: return "doublewave"; - case LINESTYLE_BOLD: return "bold"; - case LINESTYLE_BOLDDOTTED: return "bolddotted"; - case LINESTYLE_BOLDDASH: return "bolddash"; - case LINESTYLE_BOLDLONGDASH: return "boldlongdash"; - case LINESTYLE_BOLDDASHDOT: return "bolddashdot"; - case LINESTYLE_BOLDDASHDOTDOT: return "bolddashdotdot"; - case LINESTYLE_BOLDWAVE: return "boldwave"; - case FontLineStyle_FORCE_EQUAL_SIZE: return "equalsize"; + case LINESTYLE_NONE: return u"none"_ustr; + case LINESTYLE_SINGLE: return u"single"_ustr; + case LINESTYLE_DOUBLE: return u"double"_ustr; + case LINESTYLE_DOTTED: return u"dotted"_ustr; + case LINESTYLE_DONTKNOW: return u"dontknow"_ustr; + case LINESTYLE_DASH: return u"dash"_ustr; + case LINESTYLE_LONGDASH: return u"longdash"_ustr; + case LINESTYLE_DASHDOT: return u"dashdot"_ustr; + case LINESTYLE_DASHDOTDOT: return u"dashdotdot"_ustr; + case LINESTYLE_SMALLWAVE: return u"smallwave"_ustr; + case LINESTYLE_WAVE: return u"wave"_ustr; + case LINESTYLE_DOUBLEWAVE: return u"doublewave"_ustr; + case LINESTYLE_BOLD: return u"bold"_ustr; + case LINESTYLE_BOLDDOTTED: return u"bolddotted"_ustr; + case LINESTYLE_BOLDDASH: return u"bolddash"_ustr; + case LINESTYLE_BOLDLONGDASH: return u"boldlongdash"_ustr; + case LINESTYLE_BOLDDASHDOT: return u"bolddashdot"_ustr; + case LINESTYLE_BOLDDASHDOTDOT: return u"bolddashdotdot"_ustr; + case LINESTYLE_BOLDWAVE: return u"boldwave"_ustr; + case FontLineStyle_FORCE_EQUAL_SIZE: return u"equalsize"_ustr; } return OUString(); } @@ -335,9 +335,9 @@ OString convertLineStyleToString(const MetaActionType nActionType) OUString convertBitmapExTransparentType(BitmapEx const & rBitmapEx) { if (rBitmapEx.IsAlpha()) - return "bitmap"; + return u"bitmap"_ustr; else - return "none"; + return u"none"_ustr; } OUString convertMapUnitToString(MapUnit eUnit) @@ -345,21 +345,21 @@ OUString convertMapUnitToString(MapUnit eUnit) switch (eUnit) { default: - case MapUnit::LASTENUMDUMMY: return "LASTENUMDUMMY"; - case MapUnit::Map1000thInch: return "Map1000thInch"; - case MapUnit::Map100thInch: return "Map100thInch"; - case MapUnit::Map100thMM: return "Map100thMM"; - case MapUnit::Map10thInch: return "Map10thInch"; - case MapUnit::Map10thMM: return "Map10thMM"; - case MapUnit::MapAppFont: return "MapAppFont"; - case MapUnit::MapCM: return "MapCM"; - case MapUnit::MapInch: return "MapInch"; - case MapUnit::MapMM: return "MapMM"; - case MapUnit::MapPixel: return "MapPixel"; - case MapUnit::MapPoint: return "MapPoint"; - case MapUnit::MapRelative: return "MapRelative"; - case MapUnit::MapSysFont: return "MapSysFont"; - case MapUnit::MapTwip: return "MapTwip"; + case MapUnit::LASTENUMDUMMY: return u"LASTENUMDUMMY"_ustr; + case MapUnit::Map1000thInch: return u"Map1000thInch"_ustr; + case MapUnit::Map100thInch: return u"Map100thInch"_ustr; + case MapUnit::Map100thMM: return u"Map100thMM"_ustr; + case MapUnit::Map10thInch: return u"Map10thInch"_ustr; + case MapUnit::Map10thMM: return u"Map10thMM"_ustr; + case MapUnit::MapAppFont: return u"MapAppFont"_ustr; + case MapUnit::MapCM: return u"MapCM"_ustr; + case MapUnit::MapInch: return u"MapInch"_ustr; + case MapUnit::MapMM: return u"MapMM"_ustr; + case MapUnit::MapPixel: return u"MapPixel"_ustr; + case MapUnit::MapPoint: return u"MapPoint"_ustr; + case MapUnit::MapRelative: return u"MapRelative"_ustr; + case MapUnit::MapSysFont: return u"MapSysFont"_ustr; + case MapUnit::MapTwip: return u"MapTwip"_ustr; } } @@ -376,13 +376,13 @@ OUString convertGradientStyleToOUString(css::awt::GradientStyle eStyle) { switch (eStyle) { - case css::awt::GradientStyle_LINEAR: return "Linear"; - case css::awt::GradientStyle_AXIAL: return "Axial"; - case css::awt::GradientStyle_RADIAL: return "Radial"; - case css::awt::GradientStyle_ELLIPTICAL: return "Elliptical"; - case css::awt::GradientStyle_SQUARE: return "Square"; - case css::awt::GradientStyle_RECT: return "Rect"; - case css::awt::GradientStyle::GradientStyle_MAKE_FIXED_SIZE: return "ForceEqualSize"; + case css::awt::GradientStyle_LINEAR: return u"Linear"_ustr; + case css::awt::GradientStyle_AXIAL: return u"Axial"_ustr; + case css::awt::GradientStyle_RADIAL: return u"Radial"_ustr; + case css::awt::GradientStyle_ELLIPTICAL: return u"Elliptical"_ustr; + case css::awt::GradientStyle_SQUARE: return u"Square"_ustr; + case css::awt::GradientStyle_RECT: return u"Rect"_ustr; + case css::awt::GradientStyle::GradientStyle_MAKE_FIXED_SIZE: return u"ForceEqualSize"_ustr; } return OUString(); } @@ -391,10 +391,10 @@ OUString convertHatchStyle(HatchStyle eStyle) { switch (eStyle) { - case HatchStyle::Single: return "Single"; - case HatchStyle::Double: return "Double"; - case HatchStyle::Triple: return "Triple"; - case HatchStyle::FORCE_EQUAL_SIZE: return "ForceEqualSize"; + case HatchStyle::Single: return u"Single"_ustr; + case HatchStyle::Double: return u"Double"_ustr; + case HatchStyle::Triple: return u"Triple"_ustr; + case HatchStyle::FORCE_EQUAL_SIZE: return u"ForceEqualSize"_ustr; } return OUString(); } @@ -410,19 +410,19 @@ OUString convertWallpaperStyleToString(WallpaperStyle eWallpaperStyle) { switch (eWallpaperStyle) { - case WallpaperStyle::NONE: return "NONE"; - case WallpaperStyle::Tile: return "Tile"; - case WallpaperStyle::Center: return "Center"; - case WallpaperStyle::Scale: return "Scale"; - case WallpaperStyle::TopLeft: return "TopLeft"; - case WallpaperStyle::Top: return "Top"; - case WallpaperStyle::TopRight: return "TopRight"; - case WallpaperStyle::Left: return "Left"; - case WallpaperStyle::Right: return "Right"; - case WallpaperStyle::BottomLeft: return "BottomLeft"; - case WallpaperStyle::Bottom: return "Bottom"; - case WallpaperStyle::BottomRight: return "BottomRight"; - case WallpaperStyle::ApplicationGradient: return "ApplicationGradient"; + case WallpaperStyle::NONE: return u"NONE"_ustr; + case WallpaperStyle::Tile: return u"Tile"_ustr; + case WallpaperStyle::Center: return u"Center"_ustr; + case WallpaperStyle::Scale: return u"Scale"_ustr; + case WallpaperStyle::TopLeft: return u"TopLeft"_ustr; + case WallpaperStyle::Top: return u"Top"_ustr; + case WallpaperStyle::TopRight: return u"TopRight"_ustr; + case WallpaperStyle::Left: return u"Left"_ustr; + case WallpaperStyle::Right: return u"Right"_ustr; + case WallpaperStyle::BottomLeft: return u"BottomLeft"_ustr; + case WallpaperStyle::Bottom: return u"Bottom"_ustr; + case WallpaperStyle::BottomRight: return u"BottomRight"_ustr; + case WallpaperStyle::ApplicationGradient: return u"ApplicationGradient"_ustr; } return OUString(); } @@ -431,10 +431,10 @@ OUString convertPixelFormatToString(vcl::PixelFormat ePixelFormat) { switch (ePixelFormat) { - case vcl::PixelFormat::INVALID: return "INVALID"; - case vcl::PixelFormat::N8_BPP: return "8BPP"; - case vcl::PixelFormat::N24_BPP: return "24BPP"; - case vcl::PixelFormat::N32_BPP: return "32BPP"; + case vcl::PixelFormat::INVALID: return u"INVALID"_ustr; + case vcl::PixelFormat::N8_BPP: return u"8BPP"_ustr; + case vcl::PixelFormat::N24_BPP: return u"24BPP"_ustr; + case vcl::PixelFormat::N32_BPP: return u"32BPP"_ustr; } return OUString(); } @@ -442,7 +442,7 @@ OUString convertPixelFormatToString(vcl::PixelFormat ePixelFormat) OUString convertComplexTestLayoutFlags(vcl::text::ComplexTextLayoutFlags nFlags) { if (nFlags == vcl::text::ComplexTextLayoutFlags::Default) - return "Default"; + return u"Default"_ustr; std::vector<OUString> aStrings; @@ -472,20 +472,20 @@ OUString convertGfxLinkTypeToString(GfxLinkType eGfxLinkType) { switch(eGfxLinkType) { - case GfxLinkType::EpsBuffer: return "EpsBuffer"; - case GfxLinkType::NativeBmp: return "NativeBmp"; - case GfxLinkType::NativeGif: return "NativeGif"; - case GfxLinkType::NativeJpg: return "NativeJpg"; - case GfxLinkType::NativeMet: return "NativeMet"; - case GfxLinkType::NativeMov: return "NativeMov"; - case GfxLinkType::NativePct: return "NativePct"; - case GfxLinkType::NativePdf: return "NativePdf"; - case GfxLinkType::NativePng: return "NativePng"; - case GfxLinkType::NativeSvg: return "NativeSvg"; - case GfxLinkType::NativeTif: return "NativeTif"; - case GfxLinkType::NativeWmf: return "NativeWmf"; - case GfxLinkType::NativeWebp: return "NativeWebp"; - case GfxLinkType::NONE: return "None"; + case GfxLinkType::EpsBuffer: return u"EpsBuffer"_ustr; + case GfxLinkType::NativeBmp: return u"NativeBmp"_ustr; + case GfxLinkType::NativeGif: return u"NativeGif"_ustr; + case GfxLinkType::NativeJpg: return u"NativeJpg"_ustr; + case GfxLinkType::NativeMet: return u"NativeMet"_ustr; + case GfxLinkType::NativeMov: return u"NativeMov"_ustr; + case GfxLinkType::NativePct: return u"NativePct"_ustr; + case GfxLinkType::NativePdf: return u"NativePdf"_ustr; + case GfxLinkType::NativePng: return u"NativePng"_ustr; + case GfxLinkType::NativeSvg: return u"NativeSvg"_ustr; + case GfxLinkType::NativeTif: return u"NativeTif"_ustr; + case GfxLinkType::NativeWmf: return u"NativeWmf"_ustr; + case GfxLinkType::NativeWebp: return u"NativeWebp"_ustr; + case GfxLinkType::NONE: return u"None"_ustr; } return OUString(); } diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index 7cdee7b0fa88..d42b02f866ce 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -93,7 +93,7 @@ Sequence< PropertyValue > OldStylePrintAdaptor::getPageParameters( int i_nPage ) css::awt::Size aSize; if( i_nPage < int(mpData->maPages.size() ) ) aSize = mpData->maPages[i_nPage].maPageSize; - return { comphelper::makePropertyValue("PageSize", css::uno::Any(aSize)) }; + return { comphelper::makePropertyValue(u"PageSize"_ustr, css::uno::Any(aSize)) }; } void OldStylePrintAdaptor::printPage( int i_nPage ) const diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index cf5a5fc39546..3474c94c8a72 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1260,7 +1260,7 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, //m_StructElementStack.push(0); Font aFont; - aFont.SetFamilyName( "Times" ); + aFont.SetFamilyName( u"Times"_ustr ); aFont.SetFontSize( Size( 0, 12 ) ); // tdf#150786 use the same settings for widgets regardless of theme @@ -1738,7 +1738,7 @@ void PDFWriterImpl::endPage() // reset the default font Font aFont; - aFont.SetFamilyName( "Times" ); + aFont.SetFamilyName( u"Times"_ustr ); aFont.SetFontSize( Size( 0, 12 ) ); m_aCurrentPDFState = m_aGraphicsStack.front(); @@ -4174,7 +4174,7 @@ void PDFWriterImpl::createDefaultPushButtonAppearance( PDFWidget& rButton, const // (that is before endRedirect()) OStringBuffer aDA( 256 ); appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetButtonTextColor() ), aDA ); - Font aDummyFont( "Helvetica", aFont.GetFontSize() ); + Font aDummyFont( u"Helvetica"_ustr, aFont.GetFontSize() ); sal_Int32 nDummyBuildin = getBestBuildinFont( aDummyFont ); aDA.append( ' ' ); aDA.append(pdf::BuildinFontFace::Get(nDummyBuildin).getNameObject()); @@ -4405,7 +4405,7 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW // being present, but our own OpenSymbol - N.B. PDF/A for good // reasons require even the standard PS fonts to be embedded! Push(); - SetFont( Font( OUString( "OpenSymbol" ), aFont.GetFontSize() ) ); + SetFont( Font( u"OpenSymbol"_ustr, aFont.GetFontSize() ) ); const LogicalFontInstance* pFontInstance = GetFontInstance(); const vcl::font::PhysicalFontFace* pFace = pFontInstance->GetFontFace(); Pop(); @@ -7764,7 +7764,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, tools::Long nWidth, Fo //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need //to tweak this - OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? OUString( "/" ) : OUString( "X" ); + OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? u"/"_ustr : u"X"_ustr; OUString aStrikeout = aStrikeoutChar; while( GetTextWidth( aStrikeout ) < nWidth ) aStrikeout += aStrikeout; diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index b83a41b2c556..0820e80c07d1 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -203,8 +203,8 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz Graphic aGraphic(BitmapEx(aBitmapEx.GetBitmap())); Sequence< PropertyValue > aFilterData{ - comphelper::makePropertyValue("Quality", sal_Int32(i_rContext.m_nJPEGQuality)), - comphelper::makePropertyValue("ColorMode", sal_Int32(0)) + comphelper::makePropertyValue(u"Quality"_ustr, sal_Int32(i_rContext.m_nJPEGQuality)), + comphelper::makePropertyValue(u"ColorMode"_ustr, sal_Int32(0)) }; try @@ -216,9 +216,9 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz uno::Reference< graphic::XGraphic > xGraphic( aGraphic.GetXGraphic() ); uno::Reference < io::XOutputStream > xOut( xStream->getOutputStream() ); uno::Sequence< beans::PropertyValue > aOutMediaProperties{ - comphelper::makePropertyValue("OutputStream", xOut), - comphelper::makePropertyValue("MimeType", OUString("image/jpeg")), - comphelper::makePropertyValue("FilterData", aFilterData) + comphelper::makePropertyValue(u"OutputStream"_ustr, xOut), + comphelper::makePropertyValue(u"MimeType"_ustr, u"image/jpeg"_ustr), + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData) }; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); xOut->flush(); @@ -231,13 +231,13 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz pStrm->Seek( STREAM_SEEK_TO_END ); xSeekable->seek( 0 ); - Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue("InputStream", + Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(u"InputStream"_ustr, xStream) }; uno::Reference< XPropertySet > xPropSet( xGraphicProvider->queryGraphicDescriptor( aArgs ) ); if ( xPropSet.is() ) { sal_Int16 nBitsPerPixel = 24; - if ( xPropSet->getPropertyValue("BitsPerPixel") >>= nBitsPerPixel ) + if ( xPropSet->getPropertyValue(u"BitsPerPixel"_ustr) >>= nBitsPerPixel ) { bTrueColorJPG = nBitsPerPixel != 8; } diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 5f5e0e0327c9..1111c1e86143 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -272,15 +272,15 @@ static OUString queryFile( Printer const * pPrinter ) bPDF = false; } if( bPS ) - xFilePicker->appendFilter( "PostScript", "*.ps" ); + xFilePicker->appendFilter( u"PostScript"_ustr, u"*.ps"_ustr ); if( bPDF ) - xFilePicker->appendFilter( "Portable Document Format", "*.pdf" ); + xFilePicker->appendFilter( u"Portable Document Format"_ustr, u"*.pdf"_ustr ); #elif defined _WIN32 (void)pPrinter; xFilePicker->appendFilter( "*.PRN", "*.prn" ); #endif // add arbitrary files - xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); + xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), u"*.*"_ustr); } catch (const css::lang::IllegalArgumentException&) { @@ -325,7 +325,7 @@ void Printer::PrintJob(const std::shared_ptr<PrinterController>& i_xController, const JobSetup& i_rInitSetup) { bool bSynchronous = false; - css::beans::PropertyValue* pVal = i_xController->getValue( "Wait" ); + css::beans::PropertyValue* pVal = i_xController->getValue( u"Wait"_ustr ); if( pVal ) pVal->Value >>= bSynchronous; @@ -346,11 +346,11 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, { if (xController->isShowDialogs()) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(xController->getWindow(), "vcl/ui/errornoprinterdialog.ui")); - std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("ErrorNoPrinterDialog")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(xController->getWindow(), u"vcl/ui/errornoprinterdialog.ui"_ustr)); + std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog(u"ErrorNoPrinterDialog"_ustr)); xBox->run(); } - xController->setValue( "IsDirect", + xController->setValue( u"IsDirect"_ustr, css::uno::Any( false ) ); } @@ -380,12 +380,12 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, // "Pages" attribute from API is now equivalent to "PageRange" // AND "PrintContent" = 1 except calc where it is "PrintRange" = 1 // Argh ! That sure needs cleaning up - css::beans::PropertyValue* pContentVal = xController->getValue("PrintRange"); + css::beans::PropertyValue* pContentVal = xController->getValue(u"PrintRange"_ustr); if( ! pContentVal ) - pContentVal = xController->getValue("PrintContent"); + pContentVal = xController->getValue(u"PrintContent"_ustr); // case 1: UNO API has set "Pages" - css::beans::PropertyValue* pPagesVal = xController->getValue("Pages"); + css::beans::PropertyValue* pPagesVal = xController->getValue(u"Pages"_ustr); if( pPagesVal ) { OUString aPagesVal; @@ -398,7 +398,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, if( pContentVal ) { pContentVal->Value <<= sal_Int32( 1 ); - xController->setValue("PageRange", pPagesVal->Value); + xController->setValue(u"PageRange"_ustr, pPagesVal->Value); } } } @@ -411,7 +411,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, if( nContent == 0 ) { // do not overwrite PageRange if it is already set - css::beans::PropertyValue* pRangeVal = xController->getValue("PageRange"); + css::beans::PropertyValue* pRangeVal = xController->getValue(u"PageRange"_ustr); OUString aRange; if( pRangeVal ) pRangeVal->Value >>= aRange; @@ -426,14 +426,14 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, { aBuf.append( "-" + OUString::number( nPages ) ); } - xController->setValue("PageRange", css::uno::Any(aBuf.makeStringAndClear())); + xController->setValue(u"PageRange"_ustr, css::uno::Any(aBuf.makeStringAndClear())); } } } } } - css::beans::PropertyValue* pReverseVal = xController->getValue("PrintReverse"); + css::beans::PropertyValue* pReverseVal = xController->getValue(u"PrintReverse"_ustr); if( pReverseVal ) { bool bReverse = false; @@ -441,7 +441,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, xController->setReversePrint( bReverse ); } - css::beans::PropertyValue* pPapersizeFromSetupVal = xController->getValue("PapersizeFromSetup"); + css::beans::PropertyValue* pPapersizeFromSetupVal = xController->getValue(u"PapersizeFromSetup"_ustr); if( pPapersizeFromSetupVal ) { bool bPapersizeFromSetup = false; @@ -450,35 +450,35 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, } // setup NUp printing from properties - sal_Int32 nRows = xController->getIntProperty("NUpRows", 1); - sal_Int32 nCols = xController->getIntProperty("NUpColumns", 1); + sal_Int32 nRows = xController->getIntProperty(u"NUpRows"_ustr, 1); + sal_Int32 nCols = xController->getIntProperty(u"NUpColumns"_ustr, 1); if( nRows > 1 || nCols > 1 ) { PrinterController::MultiPageSetup aMPS; aMPS.nRows = std::max<sal_Int32>(nRows, 1); aMPS.nColumns = std::max<sal_Int32>(nCols, 1); - sal_Int32 nValue = xController->getIntProperty("NUpPageMarginLeft", aMPS.nLeftMargin); + sal_Int32 nValue = xController->getIntProperty(u"NUpPageMarginLeft"_ustr, aMPS.nLeftMargin); if( nValue >= 0 ) aMPS.nLeftMargin = nValue; - nValue = xController->getIntProperty("NUpPageMarginRight", aMPS.nRightMargin); + nValue = xController->getIntProperty(u"NUpPageMarginRight"_ustr, aMPS.nRightMargin); if( nValue >= 0 ) aMPS.nRightMargin = nValue; - nValue = xController->getIntProperty( "NUpPageMarginTop", aMPS.nTopMargin ); + nValue = xController->getIntProperty( u"NUpPageMarginTop"_ustr, aMPS.nTopMargin ); if( nValue >= 0 ) aMPS.nTopMargin = nValue; - nValue = xController->getIntProperty( "NUpPageMarginBottom", aMPS.nBottomMargin ); + nValue = xController->getIntProperty( u"NUpPageMarginBottom"_ustr, aMPS.nBottomMargin ); if( nValue >= 0 ) aMPS.nBottomMargin = nValue; - nValue = xController->getIntProperty( "NUpHorizontalSpacing", aMPS.nHorizontalSpacing ); + nValue = xController->getIntProperty( u"NUpHorizontalSpacing"_ustr, aMPS.nHorizontalSpacing ); if( nValue >= 0 ) aMPS.nHorizontalSpacing = nValue; - nValue = xController->getIntProperty( "NUpVerticalSpacing", aMPS.nVerticalSpacing ); + nValue = xController->getIntProperty( u"NUpVerticalSpacing"_ustr, aMPS.nVerticalSpacing ); if( nValue >= 0 ) aMPS.nVerticalSpacing = nValue; - aMPS.bDrawBorder = xController->getBoolProperty( "NUpDrawBorder", aMPS.bDrawBorder ); - aMPS.nOrder = static_cast<NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", static_cast<sal_Int32>(aMPS.nOrder) )); + aMPS.bDrawBorder = xController->getBoolProperty( u"NUpDrawBorder"_ustr, aMPS.bDrawBorder ); + aMPS.nOrder = static_cast<NupOrderType>(xController->getIntProperty( u"NUpSubPageOrder"_ustr, static_cast<sal_Int32>(aMPS.nOrder) )); aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( xController->getPrinter()->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ); - css::beans::PropertyValue* pPgSizeVal = xController->getValue( "NUpPaperSize" ); + css::beans::PropertyValue* pPgSizeVal = xController->getValue( u"NUpPaperSize"_ustr ); css::awt::Size aSizeVal; if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) ) { @@ -495,8 +495,8 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, { if( xController->getFilteredPageCount() == 0 ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(xController->getWindow(), "vcl/ui/errornocontentdialog.ui")); - std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("ErrorNoContentDialog")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(xController->getWindow(), u"vcl/ui/errornocontentdialog.ui"_ustr)); + std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog(u"ErrorNoContentDialog"_ustr)); xBox->run(); return false; } @@ -525,7 +525,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, xController->abortJob(); return false; } - xController->setValue( "LocalFileName", + xController->setValue( u"LocalFileName"_ustr, css::uno::Any( aFile ) ); } else if (aDlg.isSingleJobs()) @@ -555,7 +555,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, bool Printer::ExecutePrintJob(const std::shared_ptr<PrinterController>& xController) { OUString aJobName; - css::beans::PropertyValue* pJobNameVal = xController->getValue( "JobName" ); + css::beans::PropertyValue* pJobNameVal = xController->getValue( u"JobName"_ustr ); if( pJobNameVal ) pJobNameVal->Value >>= aJobName; @@ -618,7 +618,7 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer bool bSinglePrintJobs = i_xController->getPrinter()->IsSinglePrintJobs(); - css::beans::PropertyValue* pFileValue = i_xController->getValue("LocalFileName"); + css::beans::PropertyValue* pFileValue = i_xController->getValue(u"LocalFileName"_ustr); if( pFileValue ) { OUString aFile; @@ -778,8 +778,8 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer if (i_xController->isShowDialogs() && !i_xController->isDirectPrint()) { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( "PrintDialog", - "LastPrinterUsed", + pItem->setValue( u"PrintDialog"_ustr, + u"LastPrinterUsed"_ustr, GetName() ); } @@ -839,7 +839,7 @@ void PrinterController::setPrinter( const VclPtr<Printer>& i_rPrinter ) } mpImplData->mxPrinter = i_rPrinter; - setValue( "Name", + setValue( u"Name"_ustr, css::uno::Any( i_rPrinter->GetName() ) ); mpImplData->mnDefaultPaperBin = mpImplData->mxPrinter->GetPaperBin(); mpImplData->mxPrinter->Push(); @@ -1501,7 +1501,7 @@ css::uno::Sequence< css::beans::PropertyValue > PrinterController::getJobPropert pResult[nCur++] = rPropVal; } // append IsFirstPage - if( aMergeSet.find( "IsFirstPage" ) == aMergeSet.end() ) + if( aMergeSet.find( u"IsFirstPage"_ustr ) == aMergeSet.end() ) { css::beans::PropertyValue aVal; aVal.Name = "IsFirstPage"; @@ -1509,7 +1509,7 @@ css::uno::Sequence< css::beans::PropertyValue > PrinterController::getJobPropert pResult[nCur++] = aVal; } // append IsLastPage - if( aMergeSet.find( "IsLastPage" ) == aMergeSet.end() ) + if( aMergeSet.find( u"IsLastPage"_ustr ) == aMergeSet.end() ) { css::beans::PropertyValue aVal; aVal.Name = "IsLastPage"; @@ -1517,7 +1517,7 @@ css::uno::Sequence< css::beans::PropertyValue > PrinterController::getJobPropert pResult[nCur++] = aVal; } // append IsPrinter - if( aMergeSet.find( "IsPrinter" ) == aMergeSet.end() ) + if( aMergeSet.find( u"IsPrinter"_ustr ) == aMergeSet.end() ) { css::beans::PropertyValue aVal; aVal.Name = "IsPrinter"; @@ -1747,12 +1747,12 @@ void PrinterController::createProgressDialog() if (!mpImplData->mxProgress) { bool bShow = true; - css::beans::PropertyValue* pMonitor = getValue( "MonitorVisible" ); + css::beans::PropertyValue* pMonitor = getValue( u"MonitorVisible"_ustr ); if( pMonitor ) pMonitor->Value >>= bShow; else { - const css::beans::PropertyValue* pVal = getValue( "IsApi" ); + const css::beans::PropertyValue* pVal = getValue( u"IsApi"_ustr ); if( pVal ) { bool bApi = false; @@ -1798,23 +1798,23 @@ void PrinterController::pushPropertiesToPrinter() { sal_Int32 nCopyCount = 1; // set copycount and collate - const css::beans::PropertyValue* pVal = getValue( "CopyCount" ); + const css::beans::PropertyValue* pVal = getValue( u"CopyCount"_ustr ); if( pVal ) pVal->Value >>= nCopyCount; bool bCollate = false; - pVal = getValue( "Collate" ); + pVal = getValue( u"Collate"_ustr ); if( pVal ) pVal->Value >>= bCollate; mpImplData->mxPrinter->SetCopyCount( static_cast<sal_uInt16>(nCopyCount), bCollate ); - pVal = getValue("SinglePrintJobs"); + pVal = getValue(u"SinglePrintJobs"_ustr); bool bSinglePrintJobs = false; if (pVal) pVal->Value >>= bSinglePrintJobs; mpImplData->mxPrinter->SetSinglePrintJobs(bSinglePrintJobs); // duplex mode - pVal = getValue( "DuplexMode" ); + pVal = getValue( u"DuplexMode"_ustr ); if( pVal ) { sal_Int16 nDuplex = css::view::DuplexMode::UNKNOWN; @@ -1830,13 +1830,13 @@ void PrinterController::pushPropertiesToPrinter() bool PrinterController::isShowDialogs() const { - bool bApi = getBoolProperty( "IsApi", false ); + bool bApi = getBoolProperty( u"IsApi"_ustr, false ); return ! bApi && ! Application::IsHeadlessModeEnabled(); } bool PrinterController::isDirectPrint() const { - bool bDirect = getBoolProperty( "IsDirect", false ); + bool bDirect = getBoolProperty( u"IsDirect"_ustr, false ); return bDirect; } @@ -1918,7 +1918,7 @@ void PrinterOptionsHelper::appendPrintUIOptions( css::uno::Sequence< css::beans: sal_Int32 nIndex = io_rProps.getLength(); io_rProps.realloc( nIndex+1 ); io_rProps.getArray()[ nIndex ] = comphelper::makePropertyValue( - "ExtraPrintUIOptions", comphelper::containerToSequence(m_aUIProperties)); + u"ExtraPrintUIOptions"_ustr, comphelper::containerToSequence(m_aUIProperties)); } } @@ -2021,7 +2021,7 @@ css::uno::Any PrinterOptionsHelper::setGroupControlOpt(const OUString& i_rID, *aHelpId.getArray() = i_rHelpId; } css::uno::Sequence< OUString > aIds { i_rID }; - return setUIControlOpt(aIds, i_rTitle, aHelpId, "Group"); + return setUIControlOpt(aIds, i_rTitle, aHelpId, u"Group"_ustr); } css::uno::Any PrinterOptionsHelper::setSubgroupControlOpt(const OUString& i_rID, @@ -2036,7 +2036,7 @@ css::uno::Any PrinterOptionsHelper::setSubgroupControlOpt(const OUString& i_rID, *aHelpId.getArray() = i_rHelpId; } css::uno::Sequence< OUString > aIds { i_rID }; - return setUIControlOpt(aIds, i_rTitle, aHelpId, "Subgroup", nullptr, i_rControlOptions); + return setUIControlOpt(aIds, i_rTitle, aHelpId, u"Subgroup"_ustr, nullptr, i_rControlOptions); } css::uno::Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID, @@ -2056,7 +2056,7 @@ css::uno::Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID, aVal.Name = i_rProperty; aVal.Value <<= i_bValue; css::uno::Sequence< OUString > aIds { i_rID }; - return setUIControlOpt(aIds, i_rTitle, aHelpId, "Bool", &aVal, i_rControlOptions); + return setUIControlOpt(aIds, i_rTitle, aHelpId, u"Bool"_ustr, &aVal, i_rControlOptions); } css::uno::Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const css::uno::Sequence< OUString >& i_rIDs, @@ -2082,7 +2082,7 @@ css::uno::Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const css::uno::Se css::beans::PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value <<= i_nValue; - return setUIControlOpt(i_rIDs, i_rTitle, i_rHelpId, "Radio", &aVal, aOpt); + return setUIControlOpt(i_rIDs, i_rTitle, i_rHelpId, u"Radio"_ustr, &aVal, aOpt); } css::uno::Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rID, @@ -2109,7 +2109,7 @@ css::uno::Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rI aVal.Name = i_rProperty; aVal.Value <<= i_nValue; css::uno::Sequence< OUString > aIds { i_rID }; - return setUIControlOpt(aIds, i_rTitle, i_rHelpId, "List", &aVal, aOpt); + return setUIControlOpt(aIds, i_rTitle, i_rHelpId, u"List"_ustr, &aVal, aOpt); } css::uno::Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID, @@ -2142,7 +2142,7 @@ css::uno::Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID, aVal.Name = i_rProperty; aVal.Value <<= i_nValue; css::uno::Sequence< OUString > aIds { i_rID }; - return setUIControlOpt(aIds, i_rTitle, aHelpId, "Range", &aVal, aOpt); + return setUIControlOpt(aIds, i_rTitle, aHelpId, u"Range"_ustr, &aVal, aOpt); } css::uno::Any PrinterOptionsHelper::setEditControlOpt(const OUString& i_rID, @@ -2162,7 +2162,7 @@ css::uno::Any PrinterOptionsHelper::setEditControlOpt(const OUString& i_rID, aVal.Name = i_rProperty; aVal.Value <<= i_rValue; css::uno::Sequence< OUString > aIds { i_rID }; - return setUIControlOpt(aIds, i_rTitle, aHelpId, "Edit", &aVal, i_rControlOptions); + return setUIControlOpt(aIds, i_rTitle, aHelpId, u"Edit"_ustr, &aVal, i_rControlOptions); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx index 957d15c13a41..2417276dd397 100644 --- a/vcl/source/gdi/vectorgraphicdata.cxx +++ b/vcl/source/gdi/vectorgraphicdata.cxx @@ -66,7 +66,7 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx( const uno::Reference< graphic::XPrimitive2DRenderer > xPrimitive2DRenderer = graphic::Primitive2DTools::create(xContext); uno::Sequence< beans::PropertyValue > aViewParameters = { - comphelper::makePropertyValue("RangeUnit", static_cast<sal_Int32>(eTargetUnit)), + comphelper::makePropertyValue(u"RangeUnit"_ustr, static_cast<sal_Int32>(eTargetUnit)), }; geometry::RealRectangle2D aRealRect; @@ -225,7 +225,7 @@ void VectorGraphicData::ensureSequenceAndRange() if (!mbEnableEMFPlus) { - aPropertySequence = { comphelper::makePropertyValue("EMFPlusEnable", uno::Any(false)) }; + aPropertySequence = { comphelper::makePropertyValue(u"EMFPlusEnable"_ustr, uno::Any(false)) }; } maSequence = comphelper::sequenceToContainer<std::deque<css::uno::Reference< css::graphic::XPrimitive2D >>>(xEmfParser->getDecomposition(xInputStream, OUString(), aPropertySequence)); diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index b86c4ae49624..b16cdb764a2b 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -161,7 +161,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, { // do not abort but throw an exception, may be the current thread terminates anyway (plugin-scenario) throw css::uno::RuntimeException( - "Could not create system bitmap!", + u"Could not create system bitmap!"_ustr, css::uno::Reference< css::uno::XInterface >() ); } diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index 109f55af2403..dccd0c959fbf 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -58,10 +58,10 @@ void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface, uno::Reference<beans::XPropertySet> xPropertySet(xInterface, UNO_QUERY); if (xPropertySet.is()) { - if (xPropertySet->getPropertySetInfo()->hasPropertyByName("ImageURL")) + if (xPropertySet->getPropertySetInfo()->hasPropertyByName(u"ImageURL"_ustr)) { OUString sURL; - xPropertySet->getPropertyValue("ImageURL") >>= sURL; + xPropertySet->getPropertyValue(u"ImageURL"_ustr) >>= sURL; if (!sURL.isEmpty() && !GraphicObject::isGraphicObjectUniqueIdURL(sURL)) { Graphic aGraphic = vcl::graphic::loadFromURL(sURL); @@ -70,10 +70,10 @@ void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface, raGraphicList.push_back(aGraphic.GetXGraphic()); } } - } else if (xPropertySet->getPropertySetInfo()->hasPropertyByName("Graphic")) + } else if (xPropertySet->getPropertySetInfo()->hasPropertyByName(u"Graphic"_ustr)) { uno::Reference<css::graphic::XGraphic> xGraphic; - xPropertySet->getPropertyValue("Graphic") >>= xGraphic; + xPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic; if (xGraphic.is()) { raGraphicList.push_back(xGraphic); diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx index 9036f54452ba..2f360c8b40b7 100644 --- a/vcl/source/graphic/UnoGraphic.cxx +++ b/vcl/source/graphic/UnoGraphic.cxx @@ -78,7 +78,7 @@ void SAL_CALL Graphic::release() noexcept OUString SAL_CALL Graphic::getImplementationName() { - return "com.sun.star.comp.graphic.Graphic"; + return u"com.sun.star.comp.graphic.Graphic"_ustr; } sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName ) @@ -89,7 +89,7 @@ sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames() { uno::Sequence< OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); - const uno::Sequence< OUString > aNew { "com.sun.star.graphic.Graphic" }; + const uno::Sequence< OUString > aNew { u"com.sun.star.graphic.Graphic"_ustr }; sal_Int32 nOldCount = aRet.getLength(); aRet.realloc( nOldCount + aNew.getLength() ); diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx index 32ffe48fd68f..f36d04988be8 100644 --- a/vcl/source/graphic/UnoGraphicDescriptor.cxx +++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx @@ -195,7 +195,7 @@ void SAL_CALL GraphicDescriptor::release() OUString SAL_CALL GraphicDescriptor::getImplementationName() { - return "com.sun.star.comp.graphic.GraphicDescriptor"; + return u"com.sun.star.comp.graphic.GraphicDescriptor"_ustr; } sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName ) @@ -206,7 +206,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() { - return { "com.sun.star.graphic.GraphicDescriptor" }; + return { u"com.sun.star.graphic.GraphicDescriptor"_ustr }; } @@ -232,16 +232,16 @@ rtl::Reference<::comphelper::PropertySetInfo> GraphicDescriptor::createPropertyS { static ::comphelper::PropertyMapEntry const aEntries[] = { - { OUString( "GraphicType" ), static_cast< sal_Int32 >( UnoGraphicProperty::GraphicType ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "MimeType" ), static_cast< sal_Int32 >( UnoGraphicProperty::MimeType ), cppu::UnoType< OUString >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "SizePixel" ), static_cast< sal_Int32 >( UnoGraphicProperty::SizePixel ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "Size100thMM" ), static_cast< sal_Int32 >( UnoGraphicProperty::Size100thMM ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "BitsPerPixel" ), static_cast< sal_Int32 >( UnoGraphicProperty::BitsPerPixel ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "Transparent" ), static_cast< sal_Int32 >( UnoGraphicProperty::Transparent ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "Alpha" ), static_cast< sal_Int32 >( UnoGraphicProperty::Alpha ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString( "Animated" ), static_cast< sal_Int32 >( UnoGraphicProperty::Animated ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString("Linked"), sal_Int32(UnoGraphicProperty::Linked), cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString("OriginURL"), sal_Int32(UnoGraphicProperty::OriginURL), cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"GraphicType"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::GraphicType ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"MimeType"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::MimeType ), cppu::UnoType< OUString >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"SizePixel"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::SizePixel ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"Size100thMM"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Size100thMM ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"BitsPerPixel"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::BitsPerPixel ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"Transparent"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Transparent ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"Alpha"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Alpha ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"Animated"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Animated ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"Linked"_ustr, sal_Int32(UnoGraphicProperty::Linked), cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 }, + { u"OriginURL"_ustr, sal_Int32(UnoGraphicProperty::OriginURL), cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, }; return rtl::Reference<::comphelper::PropertySetInfo>( new ::comphelper::PropertySetInfo(aEntries) ); diff --git a/vcl/source/graphic/UnoGraphicMapper.cxx b/vcl/source/graphic/UnoGraphicMapper.cxx index 6bde78097681..6a2e48552c1a 100644 --- a/vcl/source/graphic/UnoGraphicMapper.cxx +++ b/vcl/source/graphic/UnoGraphicMapper.cxx @@ -34,7 +34,7 @@ protected: // XServiceInfo OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.graphic.GraphicMapper"; + return u"com.sun.star.comp.graphic.GraphicMapper"_ustr; } sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override { @@ -42,7 +42,7 @@ protected: } css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.graphic.GraphicMapper" }; + return { u"com.sun.star.graphic.GraphicMapper"_ustr }; } // XTypeProvider diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx index 73bbcef3ec8e..b7700a391d4a 100644 --- a/vcl/source/graphic/UnoGraphicObject.cxx +++ b/vcl/source/graphic/UnoGraphicObject.cxx @@ -50,7 +50,7 @@ public: virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.graphic.GraphicObject"; + return u"com.sun.star.graphic.GraphicObject"_ustr; } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override @@ -60,7 +60,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.graphic.GraphicObject" }; + return { u"com.sun.star.graphic.GraphicObject"_ustr }; } }; diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx index 63916164eb4b..d472aaaadcfd 100644 --- a/vcl/source/graphic/UnoGraphicProvider.cxx +++ b/vcl/source/graphic/UnoGraphicProvider.cxx @@ -94,7 +94,7 @@ GraphicProvider::GraphicProvider() OUString SAL_CALL GraphicProvider::getImplementationName() { - return "com.sun.star.comp.graphic.GraphicProvider"; + return u"com.sun.star.comp.graphic.GraphicProvider"_ustr; } sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName ) @@ -104,7 +104,7 @@ sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName uno::Sequence< OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() { - return { "com.sun.star.graphic.GraphicProvider" }; + return { u"com.sun.star.graphic.GraphicProvider"_ustr }; } uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 7243eee4bf97..2806aa0726cf 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -586,7 +586,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 ); OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException("Palette index out of range", + throw lang::IndexOutOfBoundsException(u"Palette index out of range"_ustr, static_cast<rendering::XBitmapPalette*>(this)); const BitmapColor aCol = m_pBmpAcc->GetPaletteColor(sal::static_int_cast<sal_uInt16>(nIndex)); @@ -608,7 +608,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException("Palette index out of range", + throw lang::IndexOutOfBoundsException(u"Palette index out of range"_ustr, static_cast<rendering::XBitmapPalette*>(this)); return false; // read-only implementation diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx index eb964b34b8ee..86ea1f0397cb 100644 --- a/vcl/source/helper/commandinfoprovider.cxx +++ b/vcl/source/helper/commandinfoprovider.cxx @@ -244,30 +244,30 @@ static OUString GetCommandProperty(const OUString& rsProperty, const Sequence<be OUString GetLabelForCommand(const css::uno::Sequence<css::beans::PropertyValue>& rProperties) { - return GetCommandProperty("Name", rProperties); + return GetCommandProperty(u"Name"_ustr, rProperties); } OUString GetMenuLabelForCommand(const css::uno::Sequence<css::beans::PropertyValue>& rProperties) { // Here we want to use "Label", not "Name". "Name" is a stripped-down version of "Label" without accelerators // and ellipsis. In the menu, we want to have those accelerators and ellipsis. - return GetCommandProperty("Label", rProperties); + return GetCommandProperty(u"Label"_ustr, rProperties); } OUString GetPopupLabelForCommand(const css::uno::Sequence<css::beans::PropertyValue>& rProperties) { - OUString sPopupLabel(GetCommandProperty("PopupLabel", rProperties)); + OUString sPopupLabel(GetCommandProperty(u"PopupLabel"_ustr, rProperties)); if (!sPopupLabel.isEmpty()) return sPopupLabel; - return GetCommandProperty("Label", rProperties); + return GetCommandProperty(u"Label"_ustr, rProperties); } OUString GetTooltipLabelForCommand(const css::uno::Sequence<css::beans::PropertyValue>& rProperties) { - OUString sLabel(GetCommandProperty("TooltipLabel", rProperties)); + OUString sLabel(GetCommandProperty(u"TooltipLabel"_ustr, rProperties)); if (!sLabel.isEmpty()) return sLabel; - return GetCommandProperty("Label", rProperties); + return GetCommandProperty(u"Label"_ustr, rProperties); } OUString GetTooltipForCommand( @@ -275,7 +275,7 @@ OUString GetTooltipForCommand( const css::uno::Sequence<css::beans::PropertyValue>& rProperties, const Reference<frame::XFrame>& rxFrame) { - OUString sLabel(GetCommandProperty("TooltipLabel", rProperties)); + OUString sLabel(GetCommandProperty(u"TooltipLabel"_ustr, rProperties)); if (sLabel.isEmpty()) { sLabel = GetPopupLabelForCommand(rProperties); // Remove '...' at the end and mnemonics (we don't want those in tooltips) @@ -334,7 +334,7 @@ vcl::KeyCode GetCommandKeyCodeShortcut (const OUString& rsCommandName, const Ref OUString GetRealCommandForCommand(const css::uno::Sequence<css::beans::PropertyValue>& rProperties) { - return GetCommandProperty("TargetURL", rProperties); + return GetCommandProperty(u"TargetURL"_ustr, rProperties); } Reference<graphic::XGraphic> GetXGraphicForCommand(const OUString& rsCommandName, @@ -416,12 +416,12 @@ sal_Int32 GetPropertiesForCommand ( bool IsRotated(const OUString& rsCommandName, const OUString& rsModuleName) { - return ResourceHasKey("private:resource/image/commandrotateimagelist", rsCommandName, rsModuleName); + return ResourceHasKey(u"private:resource/image/commandrotateimagelist"_ustr, rsCommandName, rsModuleName); } bool IsMirrored(const OUString& rsCommandName, const OUString& rsModuleName) { - return ResourceHasKey("private:resource/image/commandmirrorimagelist", rsCommandName, rsModuleName); + return ResourceHasKey(u"private:resource/image/commandmirrorimagelist"_ustr, rsCommandName, rsModuleName); } bool IsExperimental(const OUString& rsCommandName, const OUString& rModuleName) diff --git a/vcl/source/helper/driverblocklist.cxx b/vcl/source/helper/driverblocklist.cxx index e17b45e7a922..b14b146491fd 100644 --- a/vcl/source/helper/driverblocklist.cxx +++ b/vcl/source/helper/driverblocklist.cxx @@ -101,23 +101,23 @@ static OUString GetVendorId(std::string_view rString) { if (rString == "all") { - return ""; + return u""_ustr; } else if (rString == "intel") { - return "0x8086"; + return u"0x8086"_ustr; } else if (rString == "nvidia") { - return "0x10de"; + return u"0x10de"_ustr; } else if (rString == "amd") { - return "0x1002"; + return u"0x1002"_ustr; } else if (rString == "microsoft") { - return "0x1414"; + return u"0x1414"_ustr; } else { @@ -133,15 +133,15 @@ OUString GetVendorId(DeviceVendor id) switch (id) { case VendorAll: - return ""; + return u""_ustr; case VendorIntel: - return "0x8086"; + return u"0x8086"_ustr; case VendorNVIDIA: - return "0x10de"; + return u"0x10de"_ustr; case VendorAMD: - return "0x1002"; + return u"0x1002"_ustr; case VendorMicrosoft: - return "0x1414"; + return u"0x1414"_ustr; } abort(); } @@ -636,7 +636,7 @@ bool FindBlocklistedDeviceInList(std::vector<DriverInfo>& aDeviceInfos, VersionT } if (std::none_of(aDeviceInfos[i].maDevices.begin(), aDeviceInfos[i].maDevices.end(), - compareIgnoreAsciiCase("all")) + compareIgnoreAsciiCase(u"all"_ustr)) && std::none_of(aDeviceInfos[i].maDevices.begin(), aDeviceInfos[i].maDevices.end(), compareIgnoreAsciiCase(sAdapterDeviceID))) { diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index f8c0d56f8893..c92f609a535c 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -62,7 +62,7 @@ Image::Image(const OUString & rFileUrl) else { Graphic aGraphic; - if (ERRCODE_NONE == GraphicFilter::LoadGraphic(rFileUrl, IMP_PNG, aGraphic)) + if (ERRCODE_NONE == GraphicFilter::LoadGraphic(rFileUrl, u"" IMP_PNG ""_ustr, aGraphic)) ImplInit(aGraphic.GetBitmapEx()); } } diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 94ce3b94cfe4..55fb4ee2f349 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -113,7 +113,7 @@ OUString getIconCacheUrl(std::u16string_view sVariant, ImageRequestParameters co // the macro expansion can be expensive in bulk, so cache that static OUString CACHE_DIR = []() { - OUString sDir = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"; + OUString sDir = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"_ustr; rtl::Bootstrap::expandMacros(sDir); return sDir; }(); diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index c944426b75f7..19fb34df5d96 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -53,7 +53,7 @@ using namespace rtl; OUString getShaderFolder() { - OUString aUrl("$BRAND_BASE_DIR/" LIBO_ETC_FOLDER); + OUString aUrl(u"$BRAND_BASE_DIR/" LIBO_ETC_FOLDER ""_ustr); rtl::Bootstrap::expandMacros(aUrl); return aUrl + "/opengl/"; @@ -229,7 +229,7 @@ namespace OString getCacheFolder() { - OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"); + OUString url(u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"_ustr); rtl::Bootstrap::expandMacros(url); osl::Directory::create(url); @@ -425,7 +425,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, // Check Vertex Shader glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result); if (!Result) - return LogCompilerError(VertexShaderID, "vertex", + return LogCompilerError(VertexShaderID, u"vertex"_ustr, rVertexShaderName, true); // Compile Fragment Shader @@ -438,7 +438,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, // Check Fragment Shader glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result); if (!Result) - return LogCompilerError(FragmentShaderID, "fragment", + return LogCompilerError(FragmentShaderID, u"fragment"_ustr, rFragmentShaderName, true); if (bHasGeometryShader) @@ -453,7 +453,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, // Check Geometry Shader glGetShaderiv(GeometryShaderID, GL_COMPILE_STATUS, &Result); if (!Result) - return LogCompilerError(GeometryShaderID, "geometry", + return LogCompilerError(GeometryShaderID, u"geometry"_ustr, rGeometryShaderName, true); } @@ -471,7 +471,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, if (!Result) { SAL_WARN("vcl.opengl", "linking failed: " << Result ); - return LogCompilerError(ProgramID, "program", "<both>", false); + return LogCompilerError(ProgramID, u"program"_ustr, u"<both>"_ustr, false); } OString aFileName = createFileName(rVertexShaderName, rFragmentShaderName, rGeometryShaderName, rDigest); @@ -490,7 +490,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, // Check the program glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result); if (!Result) - return LogCompilerError(ProgramID, "program", "<both>", false); + return LogCompilerError(ProgramID, u"program"_ustr, u"<both>"_ustr, false); CHECK_GL_ERROR(); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 9416963b93b6..ae38e3d1c159 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -642,7 +642,7 @@ void OutputDevice::ImplInitFontList() const // There is absolutely no way there should be no fonts available on the device if( !mxFontCollection->Count() ) { - OUString aError( "Application error: no fonts and no vcl resource found on your system" ); + OUString aError( u"Application error: no fonts and no vcl resource found on your system"_ustr ); OUString aResStr(VclResId(SV_ACCESSERROR_NO_FONTS)); if (!aResStr.isEmpty()) aError = aResStr; diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 828a121cca91..44806506aa32 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -797,8 +797,8 @@ com::sun::star::uno::Reference< css::rendering::XCanvas > OutputDevice::ImplGetC { xCanvas.set( xCanvasFactory->createInstanceWithArgumentsAndContext( bSpriteCanvas ? - OUString( "com.sun.star.rendering.SpriteCanvas" ) : - OUString( "com.sun.star.rendering.Canvas" ), + u"com.sun.star.rendering.SpriteCanvas"_ustr : + u"com.sun.star.rendering.Canvas"_ustr, aArg, xContext ), UNO_QUERY ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 1f342304ce5f..d1a16bcf2c61 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -681,12 +681,12 @@ float OutputDevice::approximate_char_width() const //note pango uses "The quick brown fox jumps over the lazy dog." for english //and has a bunch of per-language strings which corresponds somewhat with //makeRepresentativeText in include/svtools/sampletext.hxx - return GetTextWidth("aemnnxEM") / 8.0; + return GetTextWidth(u"aemnnxEM"_ustr) / 8.0; } float OutputDevice::approximate_digit_width() const { - return GetTextWidth("0123456789") / 10.0; + return GetTextWidth(u"0123456789"_ustr) / 10.0; } void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr, diff --git a/vcl/source/pdf/PDFiumTools.cxx b/vcl/source/pdf/PDFiumTools.cxx index cb392a8cb8da..35d0ffa2c098 100644 --- a/vcl/source/pdf/PDFiumTools.cxx +++ b/vcl/source/pdf/PDFiumTools.cxx @@ -43,7 +43,7 @@ OUString convertPdfDateToISO8601(std::u16string_view rInput) if (rInput.size() >= 16) sSeconds = rInput.substr(14, 2); - OUString sTimeZoneMark("Z"); + OUString sTimeZoneMark(u"Z"_ustr); if (rInput.size() >= 17) sTimeZoneMark = rInput.substr(16, 1); diff --git a/vcl/source/printer/Options.cxx b/vcl/source/printer/Options.cxx index 776b14d47cd5..fbf7a069d518 100644 --- a/vcl/source/printer/Options.cxx +++ b/vcl/source/printer/Options.cxx @@ -52,13 +52,13 @@ void Options::ReadFromConfig(bool i_bFile) css::beans::PropertyValue aVal; aVal.Name = "nodepath"; if (i_bFile) - aVal.Value <<= OUString("/org.openoffice.Office.Common/Print/Option/File"); + aVal.Value <<= u"/org.openoffice.Office.Common/Print/Option/File"_ustr; else - aVal.Value <<= OUString("/org.openoffice.Office.Common/Print/Option/Printer"); - xConfigAccess.set( - xConfigProvider->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", { css::uno::Any(aVal) }), - css::uno::UNO_QUERY); + aVal.Value <<= u"/org.openoffice.Office.Common/Print/Option/Printer"_ustr; + xConfigAccess.set(xConfigProvider->createInstanceWithArguments( + u"com.sun.star.configuration.ConfigurationAccess"_ustr, + { css::uno::Any(aVal) }), + css::uno::UNO_QUERY); if (xConfigAccess.is()) { css::uno::Reference<css::beans::XPropertySet> xSet(xConfigAccess, @@ -67,25 +67,26 @@ void Options::ReadFromConfig(bool i_bFile) { sal_Int32 nValue = 0; bool bValue = false; - if (xSet->getPropertyValue("ReduceTransparency") >>= bValue) + if (xSet->getPropertyValue(u"ReduceTransparency"_ustr) >>= bValue) SetReduceTransparency(bValue); - if (xSet->getPropertyValue("ReducedTransparencyMode") >>= nValue) + if (xSet->getPropertyValue(u"ReducedTransparencyMode"_ustr) >>= nValue) SetReducedTransparencyMode(static_cast<TransparencyMode>(nValue)); - if (xSet->getPropertyValue("ReduceGradients") >>= bValue) + if (xSet->getPropertyValue(u"ReduceGradients"_ustr) >>= bValue) SetReduceGradients(bValue); - if (xSet->getPropertyValue("ReducedGradientMode") >>= nValue) + if (xSet->getPropertyValue(u"ReducedGradientMode"_ustr) >>= nValue) SetReducedGradientMode(static_cast<GradientMode>(nValue)); - if (xSet->getPropertyValue("ReducedGradientStepCount") >>= nValue) + if (xSet->getPropertyValue(u"ReducedGradientStepCount"_ustr) >>= nValue) SetReducedGradientStepCount(static_cast<sal_uInt16>(nValue)); - if (xSet->getPropertyValue("ReduceBitmaps") >>= bValue) + if (xSet->getPropertyValue(u"ReduceBitmaps"_ustr) >>= bValue) SetReduceBitmaps(bValue); - if (xSet->getPropertyValue("ReducedBitmapMode") >>= nValue) + if (xSet->getPropertyValue(u"ReducedBitmapMode"_ustr) >>= nValue) SetReducedBitmapMode(static_cast<BitmapMode>(nValue)); - if (xSet->getPropertyValue("ReducedBitmapResolution") >>= nValue) + if (xSet->getPropertyValue(u"ReducedBitmapResolution"_ustr) >>= nValue) SetReducedBitmapResolution(static_cast<sal_uInt16>(nValue)); - if (xSet->getPropertyValue("ReducedBitmapIncludesTransparency") >>= bValue) + if (xSet->getPropertyValue(u"ReducedBitmapIncludesTransparency"_ustr) + >>= bValue) SetReducedBitmapIncludesTransparency(bValue); - if (xSet->getPropertyValue("ConvertToGreyscales") >>= bValue) + if (xSet->getPropertyValue(u"ConvertToGreyscales"_ustr) >>= bValue) SetConvertToGreyscales(bValue); bSuccess = true; diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx index e80a29b0bc0b..cc3ac778f8a7 100644 --- a/vcl/source/treelist/iconview.cxx +++ b/vcl/source/treelist/iconview.cxx @@ -262,7 +262,7 @@ static OString extractPngString(const SvLBoxContextBmp* pBmpItem) SvMemoryStream aOStm(65535, 65535); // Use fastest compression "1" css::uno::Sequence<css::beans::PropertyValue> aFilterData{ - comphelper::makePropertyValue("Compression", sal_Int32(1)), + comphelper::makePropertyValue(u"Compression"_ustr, sal_Int32(1)), }; vcl::PngImageWriter aPNGWriter(aOStm); aPNGWriter.setParameters(aFilterData); diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx index ba29af020261..800b85089379 100644 --- a/vcl/source/treelist/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -74,7 +74,7 @@ void IMapObject::Write( SvStream& rOStm ) const rOStm.WriteUInt16( eEncoding ); const OString aRelURL = OUStringToOString( - URIHelper::simpleNormalizedMakeRelative("", aURL), eEncoding); + URIHelper::simpleNormalizedMakeRelative(u""_ustr, aURL), eEncoding); write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); rOStm.WriteBool( bActive ); diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx index 154380139246..c49aa45b5e6e 100644 --- a/vcl/source/treelist/imap2.cxx +++ b/vcl/source/treelist/imap2.cxx @@ -60,12 +60,12 @@ void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) void IMapObject::AppendCERNURL(OStringBuffer& rBuf) const { - rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative("", aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(u""_ustr, aURL), osl_getThreadTextEncoding())); } void IMapObject::AppendNCSAURL(OStringBuffer& rBuf) const { - rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative("", aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(u""_ustr, aURL), osl_getThreadTextEncoding())); rBuf.append(' '); } diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx index 73ecd5f312ee..cd0b014e5112 100644 --- a/vcl/source/treelist/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -289,7 +289,7 @@ void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const Ev OUString SAL_CALL TransferableHelper::TerminateListener::getImplementationName() { - return "com.sun.star.comp.svt.TransferableHelperTerminateListener"; + return u"com.sun.star.comp.svt.TransferableHelperTerminateListener"_ustr; } sal_Bool SAL_CALL TransferableHelper::TerminateListener::supportsService(const OUString& /*rServiceName*/) @@ -2097,7 +2097,7 @@ std::unique_ptr<SvStream> TransferableDataHelper::GetSotStorageStream( const Dat if (!aSeq.hasElements()) return nullptr; - std::unique_ptr<SvStream> xStream = SotTempStream::Create( "" ); + std::unique_ptr<SvStream> xStream = SotTempStream::Create( u""_ustr ); xStream->WriteBytes( aSeq.getConstArray(), aSeq.getLength() ); xStream->Seek(0); return xStream; diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx index 1c53be66f1c6..a3cf6ac577ca 100644 --- a/vcl/source/treelist/transfer2.cxx +++ b/vcl/source/treelist/transfer2.cxx @@ -511,9 +511,9 @@ Reference<XClipboard> GetSystemPrimarySelection() #if USING_X11 // A hack, making the primary selection available as an instance // of the SystemClipboard service on X11: - Sequence< Any > args{ Any(OUString("PRIMARY")) }; + Sequence< Any > args{ Any(u"PRIMARY"_ustr) }; xSelection.set(xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.datatransfer.clipboard.SystemClipboard", args, xContext), UNO_QUERY_THROW); + u"com.sun.star.datatransfer.clipboard.SystemClipboard"_ustr, args, xContext), UNO_QUERY_THROW); #else static Reference< XClipboard > s_xSelection( xContext->getServiceManager()->createInstanceWithContext( diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 6dd915e23996..a16758e3eaba 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -1848,7 +1848,7 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt ) void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { if( !pParent->HasChildren() ) - InsertEntry( "<dummy>", pParent ); + InsertEntry( u"<dummy>"_ustr, pParent ); } void SvTreeListBox::GetFocus() diff --git a/vcl/source/treelist/uiobject.cxx b/vcl/source/treelist/uiobject.cxx index e9999e2ae119..d3b3b475ae80 100644 --- a/vcl/source/treelist/uiobject.cxx +++ b/vcl/source/treelist/uiobject.cxx @@ -34,13 +34,13 @@ StringMap TreeListUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["SelectionCount"] = OUString::number(mxTreeList->GetSelectionCount()); - aMap["VisibleCount"] = OUString::number(mxTreeList->GetVisibleCount()); - aMap["Children"] = OUString::number(mxTreeList->GetChildCount(nullptr)); - aMap["LevelChildren"] = OUString::number(mxTreeList->GetLevelChildCount(nullptr)); - aMap["CheckBoxList"] = OUString::boolean(isCheckBoxList(mxTreeList)); + aMap[u"SelectionCount"_ustr] = OUString::number(mxTreeList->GetSelectionCount()); + aMap[u"VisibleCount"_ustr] = OUString::number(mxTreeList->GetVisibleCount()); + aMap[u"Children"_ustr] = OUString::number(mxTreeList->GetChildCount(nullptr)); + aMap[u"LevelChildren"_ustr] = OUString::number(mxTreeList->GetLevelChildCount(nullptr)); + aMap[u"CheckBoxList"_ustr] = OUString::boolean(isCheckBoxList(mxTreeList)); SvTreeListEntry* pEntry = mxTreeList->FirstSelected(); - aMap["SelectEntryText"] = pEntry ? mxTreeList->GetEntryText(pEntry) : OUString(); + aMap[u"SelectEntryText"_ustr] = pEntry ? mxTreeList->GetEntryText(pEntry) : OUString(); return aMap; } @@ -96,7 +96,7 @@ std::set<OUString> TreeListUIObject::get_children() const OUString TreeListUIObject::get_name() const { - return "TreeListUIObject"; + return u"TreeListUIObject"_ustr; } std::unique_ptr<UIObject> TreeListUIObject::create(vcl::Window* pWindow) @@ -130,16 +130,16 @@ StringMap TreeListEntryUIObject::get_state() StringMap aMap; - aMap["Text"] = mxTreeList->GetEntryText(pEntry); - aMap["Children"] = OUString::number(mxTreeList->GetLevelChildCount(pEntry)); - aMap["VisibleChildCount"] = OUString::number(mxTreeList->GetVisibleChildCount(pEntry)); - aMap["IsSelected"] = OUString::boolean(mxTreeList->IsSelected(pEntry)); + aMap[u"Text"_ustr] = mxTreeList->GetEntryText(pEntry); + aMap[u"Children"_ustr] = OUString::number(mxTreeList->GetLevelChildCount(pEntry)); + aMap[u"VisibleChildCount"_ustr] = OUString::number(mxTreeList->GetVisibleChildCount(pEntry)); + aMap[u"IsSelected"_ustr] = OUString::boolean(mxTreeList->IsSelected(pEntry)); - aMap["IsSemiTransparent"] = OUString::boolean(bool(pEntry->GetFlags() & SvTLEntryFlags::SEMITRANSPARENT)); + aMap[u"IsSemiTransparent"_ustr] = OUString::boolean(bool(pEntry->GetFlags() & SvTLEntryFlags::SEMITRANSPARENT)); SvLBoxButton* pItem = static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SvLBoxItemType::Button)); if (pItem) - aMap["IsChecked"] = OUString::boolean(pItem->IsStateChecked()); + aMap[u"IsChecked"_ustr] = OUString::boolean(pItem->IsStateChecked()); return aMap; } @@ -214,7 +214,7 @@ std::set<OUString> TreeListEntryUIObject::get_children() const OUString TreeListEntryUIObject::get_type() const { - return "TreeListEntry"; + return u"TreeListEntry"_ustr; } bool TreeListEntryUIObject::equals(const UIObject& rOther) const diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx index 29520fd61331..3920fcd39061 100644 --- a/vcl/source/uitest/logger.cxx +++ b/vcl/source/uitest/logger.cxx @@ -68,8 +68,8 @@ UITestLogger::UITestLogger() static const char* pFile = std::getenv("LO_COLLECT_UIINFO"); if (pFile) { - OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER - "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/"); + OUString aDirPath(u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/"_ustr); rtl::Bootstrap::expandMacros(aDirPath); osl::Directory::createPath(aDirPath); OUString aFilePath = aDirPath + OUString::fromUtf8(pFile); @@ -320,7 +320,7 @@ namespace OUString StringMapToOUString(const std::map<OUString, OUString>& rParameters) { if (rParameters.empty()) - return ""; + return u""_ustr; OUStringBuffer aParameterString(static_cast<int>(rParameters.size() * 32)); aParameterString.append(" {"); diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index d209edd6a5c4..7c760b6c81fc 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -54,7 +54,7 @@ UIObject::~UIObject() StringMap UIObject::get_state() { StringMap aMap; - aMap["NotImplemented"] = "NotImplemented"; + aMap[u"NotImplemented"_ustr] = "NotImplemented"; return aMap; } @@ -67,7 +67,7 @@ void UIObject::execute(const OUString& /*rAction*/, OUString UIObject::get_type() const { - return "Generic UIObject"; + return u"Generic UIObject"_ustr; } std::unique_ptr<UIObject> UIObject::get_child(const OUString&) @@ -296,19 +296,19 @@ StringMap WindowUIObject::get_state() mxWindow->RequestDoubleBuffering(false); StringMap aMap; - aMap["Visible"] = OUString::boolean(mxWindow->IsVisible()); - aMap["ReallyVisible"] = OUString::boolean(mxWindow->IsReallyVisible()); - aMap["Enabled"] = OUString::boolean(mxWindow->IsEnabled()); - aMap["HasFocus"] = OUString::boolean(mxWindow->HasChildPathFocus()); - aMap["WindowType"] = OUString::number(static_cast<sal_uInt16>(mxWindow->GetType()), 16); + aMap[u"Visible"_ustr] = OUString::boolean(mxWindow->IsVisible()); + aMap[u"ReallyVisible"_ustr] = OUString::boolean(mxWindow->IsReallyVisible()); + aMap[u"Enabled"_ustr] = OUString::boolean(mxWindow->IsEnabled()); + aMap[u"HasFocus"_ustr] = OUString::boolean(mxWindow->HasChildPathFocus()); + aMap[u"WindowType"_ustr] = OUString::number(static_cast<sal_uInt16>(mxWindow->GetType()), 16); Point aPos = mxWindow->GetPosPixel(); - aMap["RelPosition"] = to_string(aPos); - aMap["Size"] = to_string(mxWindow->GetSizePixel()); - aMap["ID"] = mxWindow->get_id(); + aMap[u"RelPosition"_ustr] = to_string(aPos); + aMap[u"Size"_ustr] = to_string(mxWindow->GetSizePixel()); + aMap[u"ID"_ustr] = mxWindow->get_id(); vcl::Window* pParent = mxWindow->GetParent(); if (pParent) - aMap["Parent"] = mxWindow->GetParent()->get_id(); + aMap[u"Parent"_ustr] = mxWindow->GetParent()->get_id(); bool bIgnoreAllExceptTop = isDialogWindow(mxWindow.get()); while(pParent) @@ -327,9 +327,9 @@ StringMap WindowUIObject::get_state() if (!pParent && bIgnoreAllExceptTop) aPos += aParentPos; } - aMap["AbsPosition"] = to_string(aPos); - aMap["Text"] = mxWindow->GetText(); - aMap["DisplayText"] = mxWindow->GetDisplayText(); + aMap[u"AbsPosition"_ustr] = to_string(aPos); + aMap[u"Text"_ustr] = mxWindow->GetText(); + aMap[u"DisplayText"_ustr] = mxWindow->GetDisplayText(); return aMap; } @@ -346,7 +346,7 @@ void WindowUIObject::execute(const OUString& rAction, } else if (rAction == "TYPE") { - auto it = rParameters.find("TEXT"); + auto it = rParameters.find(u"TEXT"_ustr); if (it != rParameters.end()) { const OUString& rText = it->second; @@ -356,9 +356,9 @@ void WindowUIObject::execute(const OUString& rAction, mxWindow->KeyInput(keyEvent); } } - else if (rParameters.find("KEYCODE") != rParameters.end()) + else if (rParameters.find(u"KEYCODE"_ustr) != rParameters.end()) { - auto itr = rParameters.find("KEYCODE"); + auto itr = rParameters.find(u"KEYCODE"_ustr); const OUString rText = itr->second; auto aKeyEvents = generate_key_events_from_keycode(rText); for (auto const& keyEvent : aKeyEvents) @@ -514,7 +514,7 @@ std::set<OUString> WindowUIObject::get_children() const OUString WindowUIObject::get_name() const { - return "WindowUIObject"; + return u"WindowUIObject"_ustr; } namespace { @@ -615,7 +615,7 @@ StringMap ButtonUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); // Move that to a Control base class - aMap["Label"] = mxButton->GetDisplayText(); + aMap[u"Label"_ustr] = mxButton->GetDisplayText(); return aMap; } @@ -640,7 +640,7 @@ void ButtonUIObject::execute(const OUString& rAction, OUString ButtonUIObject::get_name() const { - return "ButtonUIObject"; + return u"ButtonUIObject"_ustr; } OUString ButtonUIObject::get_action(VclEventId nEvent) const @@ -649,33 +649,33 @@ OUString ButtonUIObject::get_action(VclEventId nEvent) const { if(mxButton->get_id()=="writer_all") { - UITestLogger::getInstance().setAppName("writer"); - return "Start writer" ; + UITestLogger::getInstance().setAppName(u"writer"_ustr); + return u"Start writer"_ustr ; } else if(mxButton->get_id()=="calc_all") { - UITestLogger::getInstance().setAppName("calc"); - return "Start calc" ; + UITestLogger::getInstance().setAppName(u"calc"_ustr); + return u"Start calc"_ustr ; } else if(mxButton->get_id()=="impress_all") { - UITestLogger::getInstance().setAppName("impress"); - return "Start impress" ; + UITestLogger::getInstance().setAppName(u"impress"_ustr); + return u"Start impress"_ustr ; } else if(mxButton->get_id()=="draw_all") { - UITestLogger::getInstance().setAppName("draw"); - return "Start draw" ; + UITestLogger::getInstance().setAppName(u"draw"_ustr); + return u"Start draw"_ustr ; } else if(mxButton->get_id()=="math_all") { - UITestLogger::getInstance().setAppName("math"); - return "Start math" ; + UITestLogger::getInstance().setAppName(u"math"_ustr); + return u"Start math"_ustr ; } else if(mxButton->get_id()=="database_all") { - UITestLogger::getInstance().setAppName("database"); - return "Start database" ; + UITestLogger::getInstance().setAppName(u"database"_ustr); + return u"Start database"_ustr ; } else{ if (get_top_parent(mxButton)->get_id().isEmpty()){ @@ -710,14 +710,14 @@ DialogUIObject::~DialogUIObject() StringMap DialogUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["Modal"] = OUString::boolean(mxDialog->IsModalInputMode()); + aMap[u"Modal"_ustr] = OUString::boolean(mxDialog->IsModalInputMode()); return aMap; } OUString DialogUIObject::get_name() const { - return "DialogUIObject"; + return u"DialogUIObject"_ustr; } std::unique_ptr<UIObject> DialogUIObject::create(vcl::Window* pWindow) @@ -743,7 +743,7 @@ void EditUIObject::execute(const OUString& rAction, bool bHandled = true; if (rAction == "TYPE") { - auto it = rParameters.find("TEXT"); + auto it = rParameters.find(u"TEXT"_ustr); if (it != rParameters.end()) { const OUString& rText = it->second; @@ -760,7 +760,7 @@ void EditUIObject::execute(const OUString& rAction, } else if (rAction == "SET") { - auto it = rParameters.find("TEXT"); + auto it = rParameters.find(u"TEXT"_ustr); if (it != rParameters.end()) { mxEdit->SetText(it->second); @@ -771,18 +771,18 @@ void EditUIObject::execute(const OUString& rAction, } else if (rAction == "SELECT") { - if (rParameters.find("FROM") != rParameters.end() && - rParameters.find("TO") != rParameters.end()) + if (rParameters.find(u"FROM"_ustr) != rParameters.end() && + rParameters.find(u"TO"_ustr) != rParameters.end()) { - tools::Long nMin = rParameters.find("FROM")->second.toInt32(); - tools::Long nMax = rParameters.find("TO")->second.toInt32(); + tools::Long nMin = rParameters.find(u"FROM"_ustr)->second.toInt32(); + tools::Long nMax = rParameters.find(u"TO"_ustr)->second.toInt32(); Selection aSelection(nMin, nMax); mxEdit->SetSelection(aSelection); } } else if (rAction == "CLEAR") { - mxEdit->SetText(""); + mxEdit->SetText(u""_ustr); mxEdit->Modify(); bHandled = true; } @@ -798,10 +798,10 @@ void EditUIObject::execute(const OUString& rAction, StringMap EditUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["MaxTextLength"] = OUString::number(mxEdit->GetMaxTextLen()); - aMap["QuickHelpText"] = mxEdit->GetQuickHelpText(); - aMap["SelectedText"] = mxEdit->GetSelected(); - aMap["Text"] = mxEdit->GetText(); + aMap[u"MaxTextLength"_ustr] = OUString::number(mxEdit->GetMaxTextLen()); + aMap[u"QuickHelpText"_ustr] = mxEdit->GetQuickHelpText(); + aMap[u"SelectedText"_ustr] = mxEdit->GetSelected(); + aMap[u"Text"_ustr] = mxEdit->GetText(); return aMap; } @@ -834,7 +834,7 @@ OUString EditUIObject::get_action(VclEventId nEvent) const OUString EditUIObject::get_name() const { - return "EditUIObject"; + return u"EditUIObject"_ustr; } std::unique_ptr<UIObject> EditUIObject::create(vcl::Window* pWindow) @@ -865,11 +865,11 @@ void MultiLineEditUIObject::execute(const OUString& rAction, } else if (rAction == "SELECT") { - if (rParameters.find("FROM") != rParameters.end() && - rParameters.find("TO") != rParameters.end()) + if (rParameters.find(u"FROM"_ustr) != rParameters.end() && + rParameters.find(u"TO"_ustr) != rParameters.end()) { - tools::Long nMin = rParameters.find("FROM")->second.toInt32(); - tools::Long nMax = rParameters.find("TO")->second.toInt32(); + tools::Long nMin = rParameters.find(u"FROM"_ustr)->second.toInt32(); + tools::Long nMax = rParameters.find(u"TO"_ustr)->second.toInt32(); Selection aSelection(nMin, nMax); mxEdit->SetSelection(aSelection); } @@ -886,16 +886,16 @@ void MultiLineEditUIObject::execute(const OUString& rAction, StringMap MultiLineEditUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["MaxTextLength"] = OUString::number(mxEdit->GetMaxTextLen()); - aMap["SelectedText"] = mxEdit->GetSelected(); - aMap["Text"] = mxEdit->GetText(); + aMap[u"MaxTextLength"_ustr] = OUString::number(mxEdit->GetMaxTextLen()); + aMap[u"SelectedText"_ustr] = mxEdit->GetSelected(); + aMap[u"Text"_ustr] = mxEdit->GetText(); return aMap; } OUString MultiLineEditUIObject::get_name() const { - return "MultiLineEditUIObject"; + return u"MultiLineEditUIObject"_ustr; } std::unique_ptr<UIObject> MultiLineEditUIObject::create(vcl::Window* pWindow) @@ -932,13 +932,13 @@ void ExpanderUIObject::execute(const OUString& rAction, const StringMap& rParame StringMap ExpanderUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["Expanded"] = OUString::boolean(mxExpander->get_expanded()); + aMap[u"Expanded"_ustr] = OUString::boolean(mxExpander->get_expanded()); return aMap; } OUString ExpanderUIObject::get_name() const { - return "ExpanderUIObject"; + return u"ExpanderUIObject"_ustr; } std::unique_ptr<UIObject> ExpanderUIObject::create(vcl::Window* pWindow) @@ -973,14 +973,14 @@ void CheckBoxUIObject::execute(const OUString& rAction, StringMap CheckBoxUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["Selected"] = OUString::boolean(mxCheckBox->IsChecked()); - aMap["TriStateEnabled"] = OUString::boolean(mxCheckBox->IsTriStateEnabled()); + aMap[u"Selected"_ustr] = OUString::boolean(mxCheckBox->IsChecked()); + aMap[u"TriStateEnabled"_ustr] = OUString::boolean(mxCheckBox->IsTriStateEnabled()); return aMap; } OUString CheckBoxUIObject::get_name() const { - return "CheckBoxUIObject"; + return u"CheckBoxUIObject"_ustr; } OUString CheckBoxUIObject::get_action(VclEventId nEvent) const @@ -1029,15 +1029,15 @@ void RadioButtonUIObject::execute(const OUString& rAction, StringMap RadioButtonUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["Checked"] = OUString::boolean(mxRadioButton->IsChecked()); - aMap["Enabled"] = OUString::boolean(mxRadioButton->IsEnabled()); + aMap[u"Checked"_ustr] = OUString::boolean(mxRadioButton->IsChecked()); + aMap[u"Enabled"_ustr] = OUString::boolean(mxRadioButton->IsEnabled()); return aMap; } OUString RadioButtonUIObject::get_name() const { - return "RadioButtonUIObject"; + return u"RadioButtonUIObject"_ustr; } OUString RadioButtonUIObject::get_action(VclEventId nEvent) const @@ -1087,7 +1087,7 @@ StringMap TabPageUIObject::get_state() OUString TabPageUIObject::get_name() const { - return "TabPageUIObject"; + return u"TabPageUIObject"_ustr; } ListBoxUIObject::ListBoxUIObject(const VclPtr<ListBox>& xListBox): @@ -1113,16 +1113,16 @@ void ListBoxUIObject::execute(const OUString& rAction, if (rAction == "SELECT") { bool bSelect = true; - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); OUString aVal = itr->second; sal_Int32 nPos = aVal.toInt32(); mxListBox->SelectEntryPos(nPos, bSelect); } - else if (rParameters.find("TEXT") != rParameters.end()) + else if (rParameters.find(u"TEXT"_ustr) != rParameters.end()) { - auto itr = rParameters.find("TEXT"); + auto itr = rParameters.find(u"TEXT"_ustr); OUString aText = itr->second; mxListBox->SelectEntry(aText, bSelect); } @@ -1135,19 +1135,19 @@ void ListBoxUIObject::execute(const OUString& rAction, StringMap ListBoxUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["ReadOnly"] = OUString::boolean(mxListBox->IsReadOnly()); - aMap["MultiSelect"] = OUString::boolean(mxListBox->IsMultiSelectionEnabled()); - aMap["EntryCount"] = OUString::number(mxListBox->GetEntryCount()); - aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectedEntryCount()); - aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectedEntryPos()); - aMap["SelectEntryText"] = mxListBox->GetSelectedEntry(); + aMap[u"ReadOnly"_ustr] = OUString::boolean(mxListBox->IsReadOnly()); + aMap[u"MultiSelect"_ustr] = OUString::boolean(mxListBox->IsMultiSelectionEnabled()); + aMap[u"EntryCount"_ustr] = OUString::number(mxListBox->GetEntryCount()); + aMap[u"SelectEntryCount"_ustr] = OUString::number(mxListBox->GetSelectedEntryCount()); + aMap[u"SelectEntryPos"_ustr] = OUString::number(mxListBox->GetSelectedEntryPos()); + aMap[u"SelectEntryText"_ustr] = mxListBox->GetSelectedEntry(); return aMap; } OUString ListBoxUIObject::get_name() const { - return "ListBoxUIObject"; + return u"ListBoxUIObject"_ustr; } OUString ListBoxUIObject::get_action(VclEventId nEvent) const @@ -1199,15 +1199,15 @@ void ComboBoxUIObject::execute(const OUString& rAction, { if (rAction == "SELECT") { - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); OUString aVal = itr->second; sal_Int32 nPos = aVal.toInt32(); mxComboBox->SelectEntryPos(nPos); } - else if(rParameters.find("TEXT") != rParameters.end()){ - auto itr = rParameters.find("TEXT"); + else if(rParameters.find(u"TEXT"_ustr) != rParameters.end()){ + auto itr = rParameters.find(u"TEXT"_ustr); OUString aVal = itr->second; sal_Int32 nPos = mxComboBox->GetEntryPos(aVal); mxComboBox->SelectEntryPos(nPos); @@ -1231,14 +1231,14 @@ void ComboBoxUIObject::execute(const OUString& rAction, StringMap ComboBoxUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["SelectedText"] = mxComboBox->GetSelected(); - aMap["EntryCount"] = OUString::number(mxComboBox->GetEntryCount()); + aMap[u"SelectedText"_ustr] = mxComboBox->GetSelected(); + aMap[u"EntryCount"_ustr] = OUString::number(mxComboBox->GetEntryCount()); return aMap; } OUString ComboBoxUIObject::get_name() const { - return "ComboBoxUIObject"; + return u"ComboBoxUIObject"_ustr; } OUString ComboBoxUIObject::get_action(VclEventId nEvent) const @@ -1294,10 +1294,10 @@ void SpinUIObject::execute(const OUString& rAction, StringMap SpinUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["Min"] = OUString::number(mxSpinButton->GetRangeMin()); - aMap["Max"] = OUString::number(mxSpinButton->GetRangeMax()); - aMap["Step"] = OUString::number(mxSpinButton->GetValueStep()); - aMap["Value"] = OUString::number(mxSpinButton->GetValue()); + aMap[u"Min"_ustr] = OUString::number(mxSpinButton->GetRangeMin()); + aMap[u"Max"_ustr] = OUString::number(mxSpinButton->GetRangeMax()); + aMap[u"Step"_ustr] = OUString::number(mxSpinButton->GetValueStep()); + aMap[u"Value"_ustr] = OUString::number(mxSpinButton->GetValue()); return aMap; } @@ -1320,7 +1320,7 @@ OUString SpinUIObject::get_action(VclEventId nEvent) const OUString SpinUIObject::get_name() const { - return "SpinUIObject"; + return u"SpinUIObject"_ustr; } SpinFieldUIObject::SpinFieldUIObject(const VclPtr<SpinField>& xSpinField): @@ -1392,7 +1392,7 @@ OUString SpinFieldUIObject::get_action(VclEventId nEvent) const OUString SpinFieldUIObject::get_name() const { - return "SpinFieldUIObject"; + return u"SpinFieldUIObject"_ustr; } std::unique_ptr<UIObject> SpinFieldUIObject::create(vcl::Window* pWindow) @@ -1418,7 +1418,7 @@ void MetricFieldUIObject::execute(const OUString& rAction, { if (rAction == "VALUE") { - auto itPos = rParameters.find("VALUE"); + auto itPos = rParameters.find(u"VALUE"_ustr); if (itPos != rParameters.end()) { mxMetricField->SetValueFromString(itPos->second); @@ -1431,14 +1431,14 @@ void MetricFieldUIObject::execute(const OUString& rAction, StringMap MetricFieldUIObject::get_state() { StringMap aMap = EditUIObject::get_state(); - aMap["Value"] = mxMetricField->GetValueString(); + aMap[u"Value"_ustr] = mxMetricField->GetValueString(); return aMap; } OUString MetricFieldUIObject::get_name() const { - return "MetricFieldUIObject"; + return u"MetricFieldUIObject"_ustr; } std::unique_ptr<UIObject> MetricFieldUIObject::create(vcl::Window* pWindow) @@ -1463,7 +1463,7 @@ void FormattedFieldUIObject::execute(const OUString& rAction, { if (rAction == "VALUE") { - auto itPos = rParameters.find("VALUE"); + auto itPos = rParameters.find(u"VALUE"_ustr); if (itPos != rParameters.end()) { mxFormattedField->SetValueFromString(itPos->second); @@ -1476,14 +1476,14 @@ void FormattedFieldUIObject::execute(const OUString& rAction, StringMap FormattedFieldUIObject::get_state() { StringMap aMap = EditUIObject::get_state(); - aMap["Value"] = OUString::number(mxFormattedField->GetFormatter().GetValue()); + aMap[u"Value"_ustr] = OUString::number(mxFormattedField->GetFormatter().GetValue()); return aMap; } OUString FormattedFieldUIObject::get_name() const { - return "FormattedFieldUIObject"; + return u"FormattedFieldUIObject"_ustr; } std::unique_ptr<UIObject> FormattedFieldUIObject::create(vcl::Window* pWindow) @@ -1508,9 +1508,9 @@ void TabControlUIObject::execute(const OUString& rAction, { if (rAction == "SELECT") { - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); sal_uInt32 nPos = itr->second.toUInt32(); std::vector<sal_uInt16> aIds = mxTabControl->GetPageIDs(); mxTabControl->SelectTabPage(aIds[nPos]); @@ -1523,11 +1523,11 @@ void TabControlUIObject::execute(const OUString& rAction, StringMap TabControlUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["PageCount"] = OUString::number(mxTabControl->GetPageCount()); + aMap[u"PageCount"_ustr] = OUString::number(mxTabControl->GetPageCount()); sal_uInt16 nPageId = mxTabControl->GetCurPageId(); - aMap["CurrPageId"] = OUString::number(nPageId); - aMap["CurrPagePos"] = OUString::number(mxTabControl->GetPagePos(nPageId)); + aMap[u"CurrPageId"_ustr] = OUString::number(nPageId); + aMap[u"CurrPagePos"_ustr] = OUString::number(mxTabControl->GetPagePos(nPageId)); return aMap; } @@ -1553,7 +1553,7 @@ OUString TabControlUIObject::get_action(VclEventId nEvent) const OUString TabControlUIObject::get_name() const { - return "TabControlUIObject"; + return u"TabControlUIObject"_ustr; } std::unique_ptr<UIObject> TabControlUIObject::create(vcl::Window* pWindow) @@ -1578,9 +1578,9 @@ void RoadmapWizardUIObject::execute(const OUString& rAction, { if (rAction == "SELECT") { - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); sal_uInt32 nPos = itr->second.toUInt32(); mxRoadmapWizard->SelectRoadmapItemByID(nPos); } @@ -1593,14 +1593,14 @@ StringMap RoadmapWizardUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["CurrentStep"] = OUString::number(mxRoadmapWizard->GetCurrentRoadmapItemID()); + aMap[u"CurrentStep"_ustr] = OUString::number(mxRoadmapWizard->GetCurrentRoadmapItemID()); return aMap; } OUString RoadmapWizardUIObject::get_name() const { - return "RoadmapWizardUIObject"; + return u"RoadmapWizardUIObject"_ustr; } std::unique_ptr<UIObject> RoadmapWizardUIObject::create(vcl::Window* pWindow) @@ -1625,9 +1625,9 @@ void VerticalTabControlUIObject::execute(const OUString& rAction, { if (rAction == "SELECT") { - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); sal_uInt32 nPos = itr->second.toUInt32(); OUString xid = mxTabControl->GetPageId(nPos); mxTabControl->SetCurPageId(xid); @@ -1640,18 +1640,18 @@ void VerticalTabControlUIObject::execute(const OUString& rAction, StringMap VerticalTabControlUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["PageCount"] = OUString::number(mxTabControl->GetPageCount()); + aMap[u"PageCount"_ustr] = OUString::number(mxTabControl->GetPageCount()); OUString nPageId = mxTabControl->GetCurPageId(); - aMap["CurrPageTitel"] = mxTabControl->GetPageText(nPageId); - aMap["CurrPagePos"] = OUString::number(mxTabControl->GetPagePos(nPageId)); + aMap[u"CurrPageTitel"_ustr] = mxTabControl->GetPageText(nPageId); + aMap[u"CurrPagePos"_ustr] = OUString::number(mxTabControl->GetPagePos(nPageId)); return aMap; } OUString VerticalTabControlUIObject::get_name() const { - return "VerticalTabControlUIObject"; + return u"VerticalTabControlUIObject"_ustr; } std::unique_ptr<UIObject> VerticalTabControlUIObject::create(vcl::Window* pWindow) @@ -1677,9 +1677,9 @@ void ToolBoxUIObject::execute(const OUString& rAction, { if (rAction == "CLICK") { - if (rParameters.find("POS") != rParameters.end()) + if (rParameters.find(u"POS"_ustr) != rParameters.end()) { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); sal_uInt16 nPos = itr->second.toUInt32(); mxToolBox->SetCurItemId(mxToolBox->GetItemId(nPos)); mxToolBox->Click(); @@ -1705,16 +1705,16 @@ StringMap ToolBoxUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); ToolBoxItemId nCurItemId = mxToolBox->GetCurItemId(); - aMap["CurrSelectedItemID"] = OUString::number(sal_uInt16(nCurItemId)); - aMap["CurrSelectedItemText"] = nCurItemId ? mxToolBox->GetItemText(nCurItemId) : ""; - aMap["CurrSelectedItemCommand"] = nCurItemId ? mxToolBox->GetItemCommand(nCurItemId) : ""; - aMap["ItemCount"] = OUString::number(mxToolBox->GetItemCount()); + aMap[u"CurrSelectedItemID"_ustr] = OUString::number(sal_uInt16(nCurItemId)); + aMap[u"CurrSelectedItemText"_ustr] = nCurItemId ? mxToolBox->GetItemText(nCurItemId) : u""_ustr; + aMap[u"CurrSelectedItemCommand"_ustr] = nCurItemId ? mxToolBox->GetItemCommand(nCurItemId) : u""_ustr; + aMap[u"ItemCount"_ustr] = OUString::number(mxToolBox->GetItemCount()); return aMap; } OUString ToolBoxUIObject::get_name() const { - return "ToolBoxUIObject"; + return u"ToolBoxUIObject"_ustr; } std::unique_ptr<UIObject> ToolBoxUIObject::create(vcl::Window* pWindow) @@ -1737,8 +1737,8 @@ MenuButtonUIObject::~MenuButtonUIObject() StringMap MenuButtonUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["Label"] = mxMenuButton->GetDisplayText(); - aMap["CurrentItem"] = mxMenuButton->GetCurItemIdent(); + aMap[u"Label"_ustr] = mxMenuButton->GetDisplayText(); + aMap[u"CurrentItem"_ustr] = mxMenuButton->GetCurItemIdent(); return aMap; } @@ -1756,7 +1756,7 @@ void MenuButtonUIObject::execute(const OUString& rAction, } else if (rAction == "OPENFROMLIST") { - auto itr = rParameters.find("POS"); + auto itr = rParameters.find(u"POS"_ustr); assert(itr != rParameters.end()); sal_uInt32 nPos = itr->second.toUInt32(); @@ -1775,7 +1775,7 @@ void MenuButtonUIObject::execute(const OUString& rAction, OUString MenuButtonUIObject::get_name() const { - return "MenuButtonUIObject"; + return u"MenuButtonUIObject"_ustr; } std::unique_ptr<UIObject> MenuButtonUIObject::create(vcl::Window* pWindow) @@ -1802,11 +1802,11 @@ void DrawingAreaUIObject::execute(const OUString& rAction, const StringMap& rPar if (rAction == "CLICK") { // POSX and POSY are percentage of width/height dimensions - if (rParameters.find("POSX") != rParameters.end() && - rParameters.find("POSY") != rParameters.end()) + if (rParameters.find(u"POSX"_ustr) != rParameters.end() && + rParameters.find(u"POSY"_ustr) != rParameters.end()) { - auto aPosX = rParameters.find("POSX"); - auto aPosY = rParameters.find("POSY"); + auto aPosX = rParameters.find(u"POSX"_ustr); + auto aPosY = rParameters.find(u"POSY"_ustr); OString sPosX2 = OUStringToOString(aPosX->second, RTL_TEXTENCODING_ASCII_US); OString sPoxY2 = OUStringToOString(aPosY->second, RTL_TEXTENCODING_ASCII_US); @@ -1849,18 +1849,18 @@ StringMap IconViewUIObject::get_state() OUString* pId = static_cast<OUString*>(pEntry->GetUserData()); if (pId) - aMap["SelectedItemId"] = *pId; + aMap[u"SelectedItemId"_ustr] = *pId; SvTreeList* pModel = mxTreeList->GetModel(); if (pModel) - aMap["SelectedItemPos"] = OUString::number(pModel->GetAbsPos(pEntry)); + aMap[u"SelectedItemPos"_ustr] = OUString::number(pModel->GetAbsPos(pEntry)); return aMap; } OUString IconViewUIObject::get_name() const { - return "IconViewUIObject"; + return u"IconViewUIObject"_ustr; } std::unique_ptr<UIObject> IconViewUIObject::create(vcl::Window* pWindow) diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx index f52e636f5081..ba2cef12dd3f 100644 --- a/vcl/source/uitest/uitest.cxx +++ b/vcl/source/uitest/uitest.cxx @@ -23,7 +23,7 @@ bool UITest::executeCommand(const OUString& rCommand) { return comphelper::dispatchCommand( rCommand, - {{"SynchronMode", -1, css::uno::Any(true), + {{u"SynchronMode"_ustr, -1, css::uno::Any(true), css::beans::PropertyState_DIRECT_VALUE}}); } @@ -31,7 +31,7 @@ bool UITest::executeCommandWithParameters(const OUString& rCommand, const css::uno::Sequence< css::beans::PropertyValue >& rArgs) { css::uno::Sequence< css::beans::PropertyValue > lNewArgs = - {{"SynchronMode", -1, css::uno::Any(true), + {{u"SynchronMode"_ustr, -1, css::uno::Any(true), css::beans::PropertyState_DIRECT_VALUE}}; if ( rArgs.hasElements() ) @@ -48,7 +48,7 @@ bool UITest::executeDialog(const OUString& rCommand) { return comphelper::dispatchCommand( rCommand, - {{"SynchronMode", -1, css::uno::Any(false), + {{u"SynchronMode"_ustr, -1, css::uno::Any(false), css::beans::PropertyState_DIRECT_VALUE}}); } diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx index 5a67cf5f902e..de0efabddbf9 100644 --- a/vcl/source/uitest/uno/uiobject_uno.cxx +++ b/vcl/source/uitest/uno/uiobject_uno.cxx @@ -189,7 +189,7 @@ OUString SAL_CALL UIObjectUnoObj::getType() OUString SAL_CALL UIObjectUnoObj::getImplementationName() { - return "org.libreoffice.uitest.UIObject"; + return u"org.libreoffice.uitest.UIObject"_ustr; } sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName) @@ -199,7 +199,7 @@ sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> UIObjectUnoObj::getSupportedServiceNames() { - return { "com.sun.star.ui.test.UIObject" }; + return { u"com.sun.star.ui.test.UIObject"_ustr }; } OUString SAL_CALL UIObjectUnoObj::getHierarchy() diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx index 12694521fc19..a96371daba38 100644 --- a/vcl/source/uitest/uno/uitest_uno.cxx +++ b/vcl/source/uitest/uno/uitest_uno.cxx @@ -81,7 +81,7 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocus SolarMutexGuard aGuard; std::unique_ptr<UIObject> pObj = UITest::getFocusTopWindow(); if (!pObj) - throw css::uno::RuntimeException("UITest::getFocusTopWindow did not find a window"); + throw css::uno::RuntimeException(u"UITest::getFocusTopWindow did not find a window"_ustr); return new UIObjectUnoObj(std::move(pObj)); } @@ -90,13 +90,13 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getFloatWin SolarMutexGuard aGuard; std::unique_ptr<UIObject> pObj = UITest::getFloatWindow(); if (!pObj) - throw css::uno::RuntimeException("UITest::getFloatWindow did not find a window"); + throw css::uno::RuntimeException(u"UITest::getFloatWindow did not find a window"_ustr); return new UIObjectUnoObj(std::move(pObj)); } OUString SAL_CALL UITestUnoObj::getImplementationName() { - return "org.libreoffice.uitest.UITest"; + return u"org.libreoffice.uitest.UITest"_ustr; } sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName) @@ -106,7 +106,7 @@ sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> UITestUnoObj::getSupportedServiceNames() { - return { "com.sun.star.ui.test.UITest" }; + return { u"com.sun.star.ui.test.UITest"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/vcl/source/window/EnumContext.cxx b/vcl/source/window/EnumContext.cxx index ffe065568282..46486f98f82d 100644 --- a/vcl/source/window/EnumContext.cxx +++ b/vcl/source/window/EnumContext.cxx @@ -110,20 +110,20 @@ void EnumContext::ProvideApplicationContainers() if (!maApplicationMap.empty()) return; - AddEntry("com.sun.star.text.TextDocument", EnumContext::Application::Writer); - AddEntry("com.sun.star.text.GlobalDocument", EnumContext::Application::WriterGlobal); - AddEntry("com.sun.star.text.WebDocument", EnumContext::Application::WriterWeb); - AddEntry("com.sun.star.xforms.XMLFormDocument", EnumContext::Application::WriterXML); - AddEntry("com.sun.star.sdb.FormDesign", EnumContext::Application::WriterForm); - AddEntry("com.sun.star.sdb.TextReportDesign", EnumContext::Application::WriterReport); - AddEntry("com.sun.star.sheet.SpreadsheetDocument", EnumContext::Application::Calc); - AddEntry("com.sun.star.chart2.ChartDocument", EnumContext::Application::Chart); - AddEntry("com.sun.star.drawing.DrawingDocument", EnumContext::Application::Draw); - AddEntry("com.sun.star.presentation.PresentationDocument", EnumContext::Application::Impress); - AddEntry("com.sun.star.formula.FormulaProperties", EnumContext::Application::Formula); - AddEntry("com.sun.star.sdb.OfficeDatabaseDocument", EnumContext::Application::Base); - AddEntry("any", EnumContext::Application::Any); - AddEntry("none", EnumContext::Application::NONE); + AddEntry(u"com.sun.star.text.TextDocument"_ustr, EnumContext::Application::Writer); + AddEntry(u"com.sun.star.text.GlobalDocument"_ustr, EnumContext::Application::WriterGlobal); + AddEntry(u"com.sun.star.text.WebDocument"_ustr, EnumContext::Application::WriterWeb); + AddEntry(u"com.sun.star.xforms.XMLFormDocument"_ustr, EnumContext::Application::WriterXML); + AddEntry(u"com.sun.star.sdb.FormDesign"_ustr, EnumContext::Application::WriterForm); + AddEntry(u"com.sun.star.sdb.TextReportDesign"_ustr, EnumContext::Application::WriterReport); + AddEntry(u"com.sun.star.sheet.SpreadsheetDocument"_ustr, EnumContext::Application::Calc); + AddEntry(u"com.sun.star.chart2.ChartDocument"_ustr, EnumContext::Application::Chart); + AddEntry(u"com.sun.star.drawing.DrawingDocument"_ustr, EnumContext::Application::Draw); + AddEntry(u"com.sun.star.presentation.PresentationDocument"_ustr, EnumContext::Application::Impress); + AddEntry(u"com.sun.star.formula.FormulaProperties"_ustr, EnumContext::Application::Formula); + AddEntry(u"com.sun.star.sdb.OfficeDatabaseDocument"_ustr, EnumContext::Application::Base); + AddEntry(u"any"_ustr, EnumContext::Application::Any); + AddEntry(u"none"_ustr, EnumContext::Application::NONE); } @@ -156,46 +156,46 @@ void EnumContext::ProvideContextContainers() if (!maContextMap.empty()) return; - AddEntry("3DObject", Context::ThreeDObject); - AddEntry("Annotation", Context::Annotation); - AddEntry("Auditing", Context::Auditing); - AddEntry("Axis", Context::Axis); - AddEntry("Cell", Context::Cell); - AddEntry("Chart", Context::Chart); - AddEntry("ChartElements", Context::ChartElements); - AddEntry("Draw", Context::Draw); - AddEntry("DrawFontwork", Context::DrawFontwork); - AddEntry("DrawLine", Context::DrawLine); - AddEntry("DrawPage", Context::DrawPage); - AddEntry("DrawText", Context::DrawText); - AddEntry("EditCell", Context::EditCell); - AddEntry("ErrorBar", Context::ErrorBar); - AddEntry("Form", Context::Form); - AddEntry("Frame", Context::Frame); - AddEntry("Graphic", Context::Graphic); - AddEntry("Grid", Context::Grid); - AddEntry("HandoutPage", Context::HandoutPage); - AddEntry("MasterPage", Context::MasterPage); - AddEntry("Math", Context::Math); - AddEntry("Media", Context::Media); - AddEntry("MultiObject", Context::MultiObject); - AddEntry("NotesPage", Context::NotesPage); - AddEntry("OLE", Context::OLE); - AddEntry("OutlineText", Context::OutlineText); - AddEntry("Pivot", Context::Pivot); - AddEntry("Printpreview", Context::Printpreview); - AddEntry("Series", Context::Series); - AddEntry("SlidesorterPage", Context::SlidesorterPage); - AddEntry("Table", Context::Table); - AddEntry("Text", Context::Text); - AddEntry("TextObject", Context::TextObject); - AddEntry("Trendline", Context::Trendline); - AddEntry("Sparkline", Context::Sparkline); + AddEntry(u"3DObject"_ustr, Context::ThreeDObject); + AddEntry(u"Annotation"_ustr, Context::Annotation); + AddEntry(u"Auditing"_ustr, Context::Auditing); + AddEntry(u"Axis"_ustr, Context::Axis); + AddEntry(u"Cell"_ustr, Context::Cell); + AddEntry(u"Chart"_ustr, Context::Chart); + AddEntry(u"ChartElements"_ustr, Context::ChartElements); + AddEntry(u"Draw"_ustr, Context::Draw); + AddEntry(u"DrawFontwork"_ustr, Context::DrawFontwork); + AddEntry(u"DrawLine"_ustr, Context::DrawLine); + AddEntry(u"DrawPage"_ustr, Context::DrawPage); + AddEntry(u"DrawText"_ustr, Context::DrawText); + AddEntry(u"EditCell"_ustr, Context::EditCell); + AddEntry(u"ErrorBar"_ustr, Context::ErrorBar); + AddEntry(u"Form"_ustr, Context::Form); + AddEntry(u"Frame"_ustr, Context::Frame); + AddEntry(u"Graphic"_ustr, Context::Graphic); + AddEntry(u"Grid"_ustr, Context::Grid); + AddEntry(u"HandoutPage"_ustr, Context::HandoutPage); + AddEntry(u"MasterPage"_ustr, Context::MasterPage); + AddEntry(u"Math"_ustr, Context::Math); + AddEntry(u"Media"_ustr, Context::Media); + AddEntry(u"MultiObject"_ustr, Context::MultiObject); + AddEntry(u"NotesPage"_ustr, Context::NotesPage); + AddEntry(u"OLE"_ustr, Context::OLE); + AddEntry(u"OutlineText"_ustr, Context::OutlineText); + AddEntry(u"Pivot"_ustr, Context::Pivot); + AddEntry(u"Printpreview"_ustr, Context::Printpreview); + AddEntry(u"Series"_ustr, Context::Series); + AddEntry(u"SlidesorterPage"_ustr, Context::SlidesorterPage); + AddEntry(u"Table"_ustr, Context::Table); + AddEntry(u"Text"_ustr, Context::Text); + AddEntry(u"TextObject"_ustr, Context::TextObject); + AddEntry(u"Trendline"_ustr, Context::Trendline); + AddEntry(u"Sparkline"_ustr, Context::Sparkline); // other general contexts - AddEntry("any", Context::Any); - AddEntry("default", Context::Default); - AddEntry("empty", Context::Empty); + AddEntry(u"any"_ustr, Context::Any); + AddEntry(u"default"_ustr, Context::Default); + AddEntry(u"empty"_ustr, Context::Empty); } EnumContext::Context EnumContext::GetContextEnum (const OUString& rsContextName) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 225ad1b6f1c4..ed8d349f2dac 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -479,7 +479,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr catch (const css::uno::Exception &rExcept) { TOOLS_WARN_EXCEPTION("vcl.builder", "Unable to read .ui file " << sUIDir << sUIFile); - CrashReporter::addKeyValue("VclBuilderException", "Unable to read .ui file: " + rExcept.Message, CrashReporter::Write); + CrashReporter::addKeyValue(u"VclBuilderException"_ustr, "Unable to read .ui file: " + rExcept.Message, CrashReporter::Write); assert(false && "missing ui file or missing gb_CppunitTest_use_uiconfigs dependency"); throw; } @@ -796,7 +796,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr officecfg::Office::Common::Help::HelpRootURL::get().isEmpty(); if (bHideHelp) { - if (vcl::Window *pHelpButton = get("help")) + if (vcl::Window *pHelpButton = get(u"help"_ustr)) pHelpButton->Hide(); } } @@ -829,7 +829,7 @@ namespace bool extractHasFrame(VclBuilder::stringmap& rMap) { bool bHasFrame = true; - VclBuilder::stringmap::iterator aFind = rMap.find("has-frame"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"has-frame"_ustr); if (aFind != rMap.end()) { bHasFrame = toBool(aFind->second); @@ -841,7 +841,7 @@ namespace bool extractDrawValue(VclBuilder::stringmap& rMap) { bool bDrawValue = true; - VclBuilder::stringmap::iterator aFind = rMap.find("draw-value"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"draw-value"_ustr); if (aFind != rMap.end()) { bDrawValue = toBool(aFind->second); @@ -853,7 +853,7 @@ namespace OUString extractPopupMenu(VclBuilder::stringmap& rMap) { OUString sRet; - VclBuilder::stringmap::iterator aFind = rMap.find("popup"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"popup"_ustr); if (aFind != rMap.end()) { sRet = aFind->second; @@ -865,7 +865,7 @@ namespace OUString extractWidgetName(VclBuilder::stringmap& rMap) { OUString sRet; - VclBuilder::stringmap::iterator aFind = rMap.find("name"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"name"_ustr); if (aFind != rMap.end()) { sRet = aFind->second; @@ -876,8 +876,8 @@ namespace OUString extractValuePos(VclBuilder::stringmap& rMap) { - OUString sRet("top"); - VclBuilder::stringmap::iterator aFind = rMap.find("value-pos"); + OUString sRet(u"top"_ustr); + VclBuilder::stringmap::iterator aFind = rMap.find(u"value-pos"_ustr); if (aFind != rMap.end()) { sRet = aFind->second; @@ -888,8 +888,8 @@ namespace OUString extractTypeHint(VclBuilder::stringmap &rMap) { - OUString sRet("normal"); - VclBuilder::stringmap::iterator aFind = rMap.find("type-hint"); + OUString sRet(u"normal"_ustr); + VclBuilder::stringmap::iterator aFind = rMap.find(u"type-hint"_ustr); if (aFind != rMap.end()) { sRet = aFind->second; @@ -901,7 +901,7 @@ namespace bool extractResizable(VclBuilder::stringmap &rMap) { bool bResizable = true; - VclBuilder::stringmap::iterator aFind = rMap.find("resizable"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"resizable"_ustr); if (aFind != rMap.end()) { bResizable = toBool(aFind->second); @@ -914,7 +914,7 @@ namespace bool extractModal(VclBuilder::stringmap &rMap) { bool bModal = false; - VclBuilder::stringmap::iterator aFind = rMap.find("modal"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"modal"_ustr); if (aFind != rMap.end()) { bModal = toBool(aFind->second); @@ -927,7 +927,7 @@ namespace bool extractDecorated(VclBuilder::stringmap &rMap) { bool bDecorated = true; - VclBuilder::stringmap::iterator aFind = rMap.find("decorated"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"decorated"_ustr); if (aFind != rMap.end()) { bDecorated = toBool(aFind->second); @@ -939,7 +939,7 @@ namespace bool extractCloseable(VclBuilder::stringmap &rMap) { bool bCloseable = true; - VclBuilder::stringmap::iterator aFind = rMap.find("deletable"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"deletable"_ustr); if (aFind != rMap.end()) { bCloseable = toBool(aFind->second); @@ -951,7 +951,7 @@ namespace bool extractEntry(VclBuilder::stringmap &rMap) { bool bHasEntry = false; - VclBuilder::stringmap::iterator aFind = rMap.find("has-entry"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"has-entry"_ustr); if (aFind != rMap.end()) { bHasEntry = toBool(aFind->second); @@ -963,7 +963,7 @@ namespace bool extractOrientation(VclBuilder::stringmap &rMap) { bool bVertical = false; - VclBuilder::stringmap::iterator aFind = rMap.find("orientation"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"orientation"_ustr); if (aFind != rMap.end()) { bVertical = aFind->second.equalsIgnoreAsciiCase("vertical"); @@ -975,7 +975,7 @@ namespace bool extractVerticalTabPos(VclBuilder::stringmap &rMap) { bool bVertical = false; - VclBuilder::stringmap::iterator aFind = rMap.find("tab-pos"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"tab-pos"_ustr); if (aFind != rMap.end()) { bVertical = aFind->second.equalsIgnoreAsciiCase("left") || @@ -988,7 +988,7 @@ namespace bool extractVerticalTabsWithIcons(VclBuilder::stringmap &rMap) { bool bWithIcons = false; - VclBuilder::stringmap::iterator aFind = rMap.find("group-name"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"group-name"_ustr); if (aFind != rMap.end()) { bWithIcons = aFind->second.equalsIgnoreAsciiCase("icons"); @@ -1000,7 +1000,7 @@ namespace bool extractInconsistent(VclBuilder::stringmap &rMap) { bool bInconsistent = false; - VclBuilder::stringmap::iterator aFind = rMap.find("inconsistent"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"inconsistent"_ustr); if (aFind != rMap.end()) { bInconsistent = toBool(aFind->second); @@ -1014,7 +1014,7 @@ namespace OUString sIconName; // allow pixbuf, but prefer icon-name { - VclBuilder::stringmap::iterator aFind = rMap.find("pixbuf"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"pixbuf"_ustr); if (aFind != rMap.end()) { sIconName = aFind->second; @@ -1022,7 +1022,7 @@ namespace } } { - VclBuilder::stringmap::iterator aFind = rMap.find("icon-name"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"icon-name"_ustr); if (aFind != rMap.end()) { sIconName = aFind->second; @@ -1038,7 +1038,7 @@ namespace WinBits extractRelief(VclBuilder::stringmap &rMap) { WinBits nBits = WB_3DLOOK; - VclBuilder::stringmap::iterator aFind = rMap.find("relief"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"relief"_ustr); if (aFind != rMap.end()) { assert(aFind->second != "half" && "relief of 'half' unsupported"); @@ -1052,7 +1052,7 @@ namespace OUString extractLabel(VclBuilder::stringmap &rMap) { OUString sType; - VclBuilder::stringmap::iterator aFind = rMap.find("label"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"label"_ustr); if (aFind != rMap.end()) { sType = aFind->second; @@ -1064,7 +1064,7 @@ namespace OUString extractActionName(VclBuilder::stringmap &rMap) { OUString sActionName; - VclBuilder::stringmap::iterator aFind = rMap.find("action-name"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"action-name"_ustr); if (aFind != rMap.end()) { sActionName = aFind->second; @@ -1076,7 +1076,7 @@ namespace bool extractVisible(VclBuilder::stringmap &rMap) { bool bRet = false; - VclBuilder::stringmap::iterator aFind = rMap.find("visible"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"visible"_ustr); if (aFind != rMap.end()) { bRet = toBool(aFind->second); @@ -1087,15 +1087,15 @@ namespace Size extractSizeRequest(VclBuilder::stringmap &rMap) { - OUString sWidthRequest("0"); - OUString sHeightRequest("0"); - VclBuilder::stringmap::iterator aFind = rMap.find("width-request"); + OUString sWidthRequest(u"0"_ustr); + OUString sHeightRequest(u"0"_ustr); + VclBuilder::stringmap::iterator aFind = rMap.find(u"width-request"_ustr); if (aFind != rMap.end()) { sWidthRequest = aFind->second; rMap.erase(aFind); } - aFind = rMap.find("height-request"); + aFind = rMap.find(u"height-request"_ustr); if (aFind != rMap.end()) { sHeightRequest = aFind->second; @@ -1107,9 +1107,9 @@ namespace OUString extractTooltipText(VclBuilder::stringmap &rMap) { OUString sTooltipText; - VclBuilder::stringmap::iterator aFind = rMap.find("tooltip-text"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"tooltip-text"_ustr); if (aFind == rMap.end()) - aFind = rMap.find("tooltip-markup"); + aFind = rMap.find(u"tooltip-markup"_ustr); if (aFind != rMap.end()) { sTooltipText = aFind->second; @@ -1121,7 +1121,7 @@ namespace float extractAlignment(VclBuilder::stringmap &rMap) { float f = 0.0; - VclBuilder::stringmap::iterator aFind = rMap.find("alignment"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"alignment"_ustr); if (aFind != rMap.end()) { f = aFind->second.toFloat(); @@ -1133,7 +1133,7 @@ namespace OUString extractTitle(VclBuilder::stringmap &rMap) { OUString sTitle; - VclBuilder::stringmap::iterator aFind = rMap.find("title"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"title"_ustr); if (aFind != rMap.end()) { sTitle = aFind->second; @@ -1145,7 +1145,7 @@ namespace bool extractHeadersVisible(VclBuilder::stringmap &rMap) { bool bHeadersVisible = true; - VclBuilder::stringmap::iterator aFind = rMap.find("headers-visible"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"headers-visible"_ustr); if (aFind != rMap.end()) { bHeadersVisible = toBool(aFind->second); @@ -1157,7 +1157,7 @@ namespace bool extractSortIndicator(VclBuilder::stringmap &rMap) { bool bSortIndicator = false; - VclBuilder::stringmap::iterator aFind = rMap.find("sort-indicator"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"sort-indicator"_ustr); if (aFind != rMap.end()) { bSortIndicator = toBool(aFind->second); @@ -1169,7 +1169,7 @@ namespace bool extractClickable(VclBuilder::stringmap &rMap) { bool bClickable = false; - VclBuilder::stringmap::iterator aFind = rMap.find("clickable"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"clickable"_ustr); if (aFind != rMap.end()) { bClickable = toBool(aFind->second); @@ -1259,7 +1259,7 @@ namespace void VclBuilder::extractGroup(const OUString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find("group"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"group"_ustr); if (aFind != rMap.end()) { OUString sID = aFind->second; @@ -1285,7 +1285,7 @@ void VclBuilder::connectFormattedFormatterAdjustment(const OUString &id, const O bool VclBuilder::extractAdjustmentToMap(const OUString& id, VclBuilder::stringmap& rMap, std::vector<WidgetAdjustmentMap>& rAdjustmentMap) { - VclBuilder::stringmap::iterator aFind = rMap.find("adjustment"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"adjustment"_ustr); if (aFind != rMap.end()) { rAdjustmentMap.emplace_back(id, aFind->second); @@ -1300,7 +1300,7 @@ namespace sal_Int32 extractActive(VclBuilder::stringmap &rMap) { sal_Int32 nActiveId = 0; - VclBuilder::stringmap::iterator aFind = rMap.find("active"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"active"_ustr); if (aFind != rMap.end()) { nActiveId = aFind->second.toInt32(); @@ -1312,7 +1312,7 @@ namespace bool extractSelectable(VclBuilder::stringmap &rMap) { bool bSelectable = false; - VclBuilder::stringmap::iterator aFind = rMap.find("selectable"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"selectable"_ustr); if (aFind != rMap.end()) { bSelectable = toBool(aFind->second); @@ -1324,7 +1324,7 @@ namespace OUString extractAdjustment(VclBuilder::stringmap &rMap) { OUString sAdjustment; - VclBuilder::stringmap::iterator aFind = rMap.find("adjustment"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"adjustment"_ustr); if (aFind != rMap.end()) { sAdjustment= aFind->second; @@ -1337,7 +1337,7 @@ namespace bool extractDrawIndicator(VclBuilder::stringmap &rMap) { bool bDrawIndicator = false; - VclBuilder::stringmap::iterator aFind = rMap.find("draw-indicator"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"draw-indicator"_ustr); if (aFind != rMap.end()) { bDrawIndicator = toBool(aFind->second); @@ -1349,7 +1349,7 @@ namespace void VclBuilder::extractModel(const OUString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find("model"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"model"_ustr); if (aFind != rMap.end()) { m_pParserState->m_aModelMaps.emplace_back(id, aFind->second, @@ -1360,7 +1360,7 @@ void VclBuilder::extractModel(const OUString &id, stringmap &rMap) void VclBuilder::extractBuffer(const OUString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find("buffer"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"buffer"_ustr); if (aFind != rMap.end()) { m_pParserState->m_aTextBufferMaps.emplace_back(id, aFind->second); @@ -1371,7 +1371,7 @@ void VclBuilder::extractBuffer(const OUString &id, stringmap &rMap) int VclBuilder::getImageSize(const stringmap &rMap) { int nSize = 4; - auto aFind = rMap.find("icon-size"); + auto aFind = rMap.find(u"icon-size"_ustr); if (aFind != rMap.end()) nSize = aFind->second.toInt32(); return nSize; @@ -1379,7 +1379,7 @@ int VclBuilder::getImageSize(const stringmap &rMap) void VclBuilder::extractButtonImage(const OUString &id, stringmap &rMap, bool bRadio) { - VclBuilder::stringmap::iterator aFind = rMap.find("image"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"image"_ustr); if (aFind != rMap.end()) { m_pParserState->m_aButtonImageWidgetMaps.emplace_back(id, aFind->second, bRadio); @@ -1389,7 +1389,7 @@ void VclBuilder::extractButtonImage(const OUString &id, stringmap &rMap, bool bR void VclBuilder::extractMnemonicWidget(const OUString &rLabelID, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find("mnemonic-widget"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"mnemonic-widget"_ustr); if (aFind != rMap.end()) { OUString sID = aFind->second; @@ -1423,9 +1423,9 @@ void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Wind { //remove the redundant scrolling parent sal_Int32 nWidthReq = pScrollParent->get_width_request(); - rMap["width-request"] = OUString::number(nWidthReq); + rMap[u"width-request"_ustr] = OUString::number(nWidthReq); sal_Int32 nHeightReq = pScrollParent->get_height_request(); - rMap["height-request"] = OUString::number(nHeightReq); + rMap[u"height-request"_ustr] = OUString::number(nHeightReq); m_pParserState->m_aRedundantParentWidgets[pScrollParent] = pWindow; } @@ -1529,7 +1529,7 @@ namespace // Takes a string like "sfxlo-NotebookbarToolBox" VclBuilder::customMakeWidget GetCustomMakeWidget(const OUString& rName) { - const OUString name = rName == "sfxlo-SidebarToolBox" ? "sfxlo-NotebookbarToolBox" : rName; + const OUString name = rName == "sfxlo-SidebarToolBox" ? u"sfxlo-NotebookbarToolBox"_ustr : rName; VclBuilder::customMakeWidget pFunction = nullptr; if (sal_Int32 nDelim = name.indexOf('-'); nDelim != -1) { @@ -1884,7 +1884,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OUString } else if (name == "GtkIconView") { - assert(rMap.find("model") != rMap.end() && "GtkIconView must have a model"); + assert(rMap.find(u"model"_ustr) != rMap.end() && "GtkIconView must have a model"); //window we want to apply the packing props for this GtkIconView to VclPtr<vcl::Window> xWindowForPackingProps; @@ -1907,7 +1907,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OUString { if (!m_bLegacy) { - assert(rMap.find("model") != rMap.end() && "GtkTreeView must have a model"); + assert(rMap.find(u"model"_ustr) != rMap.end() && "GtkTreeView must have a model"); } //window we want to apply the packing props for this GtkTreeView to @@ -2022,7 +2022,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OUString //full screen windows if (!pParent) { - rMap["visible"] = "false"; + rMap[u"visible"_ustr] = "false"; } } else if (name == "GtkSeparator") @@ -2115,7 +2115,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OUString } else if(name == "NotebookBarAddonsToolMergePoint") { - customMakeWidget pFunction = GetCustomMakeWidget("sfxlo-NotebookbarToolBox"); + customMakeWidget pFunction = GetCustomMakeWidget(u"sfxlo-NotebookbarToolBox"_ustr); if(pFunction != nullptr) NotebookBarAddonsMerger::MergeNotebookBarAddons(pParent, pFunction, m_xFrame, *m_pNotebookBarAddonsItem, rMap); return nullptr; @@ -2288,7 +2288,7 @@ namespace BuilderUtils OUString extractCustomProperty(VclBuilder::stringmap &rMap) { OUString sCustomProperty; - VclBuilder::stringmap::iterator aFind = rMap.find("customproperty"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"customproperty"_ustr); if (aFind != rMap.end()) { sCustomProperty = aFind->second; @@ -2299,7 +2299,7 @@ namespace BuilderUtils void ensureDefaultWidthChars(VclBuilder::stringmap &rMap) { - OUString sWidthChars("width-chars"); + OUString sWidthChars(u"width-chars"_ustr); VclBuilder::stringmap::iterator aFind = rMap.find(sWidthChars); if (aFind == rMap.end()) rMap[sWidthChars] = "20"; @@ -2308,7 +2308,7 @@ namespace BuilderUtils bool extractDropdown(VclBuilder::stringmap &rMap) { bool bDropdown = true; - VclBuilder::stringmap::iterator aFind = rMap.find("dropdown"); + VclBuilder::stringmap::iterator aFind = rMap.find(u"dropdown"_ustr); if (aFind != rMap.end()) { bDropdown = toBool(aFind->second); @@ -2541,7 +2541,7 @@ VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OUStrin // tdf#119827 handle size before scale so we can trivially // scale on the current font size whether size is present // or not. - VclBuilder::stringmap::iterator aSize = rPango.find("size"); + VclBuilder::stringmap::iterator aSize = rPango.find(u"size"_ustr); if (aSize != rPango.end()) { pCurrentChild->set_font_attribute(aSize->first, aSize->second); @@ -2599,7 +2599,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { - aProperties["customproperty"] = sID.copy(nDelim + 1); + aProperties[u"customproperty"_ustr] = sID.copy(nDelim + 1); sID = sID.copy(0, nDelim); } sIDs.push_back(sID); @@ -2638,7 +2638,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read VerticalTabControl *pVerticalTabControl = pParent->GetType() == WindowType::VERTICALTABCONTROL ? static_cast<VerticalTabControl*>(pParent) : nullptr; assert(pTabControl || pVerticalTabControl); - VclBuilder::stringmap::iterator aFind = aProperties.find("label"); + VclBuilder::stringmap::iterator aFind = aProperties.find(u"label"_ustr); if (aFind != aProperties.end()) { OUString sTooltip(extractTooltipText(aProperties)); @@ -2960,7 +2960,7 @@ void BuilderBase::collectAtkRoleAttribute(xmlreader::XmlReader& reader, stringma } if (!sProperty.isEmpty()) - rMap["role"] = sProperty; + rMap[u"role"_ustr] = sProperty; } void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OUString &rID) @@ -3339,7 +3339,7 @@ void VclBuilder::handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader) accelmap aAccelerators; if (!sCustomProperty.isEmpty()) - aProperties["customproperty"] = sCustomProperty; + aProperties[u"customproperty"_ustr] = sCustomProperty; while(true) { @@ -3656,7 +3656,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, stringmap *pA std::vector<ComboBoxTextItem> aItems; if (!sCustomProperty.isEmpty()) - aProperties["customproperty"] = sCustomProperty; + aProperties[u"customproperty"_ustr] = sCustomProperty; VclPtr<vcl::Window> pCurrentChild; while(true) diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index d160e8aa73ef..6c9d7577aa41 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -236,8 +236,8 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore ) mpData->maTimer.Start(); else if ( !mpData->mbCurVisible ) ImplDraw(); - LOKNotify( pWindow, "cursor_invalidate" ); - LOKNotify( pWindow, "cursor_visible" ); + LOKNotify( pWindow, u"cursor_invalidate"_ustr ); + LOKNotify( pWindow, u"cursor_visible"_ustr ); } } @@ -297,7 +297,7 @@ bool vcl::Cursor::ImplDoHide( bool bSuspend ) if ( !bSuspend ) { - LOKNotify( mpData->mpWindow, "cursor_visible" ); + LOKNotify( mpData->mpWindow, u"cursor_visible"_ustr ); mpData->maTimer.Stop(); mpData->mpWindow = nullptr; } @@ -336,7 +336,7 @@ void vcl::Cursor::ImplNew() ImplDraw(); if ( !mpWindow ) { - LOKNotify( mpData->mpWindow, "cursor_invalidate" ); + LOKNotify( mpData->mpWindow, u"cursor_invalidate"_ustr ); if ( mpData->maTimer.GetTimeout() != STYLE_CURSOR_NOBLINKTIME ) mpData->maTimer.Start(); } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1ba812c94197..aa8f3d1d4b4c 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -556,7 +556,7 @@ void VclBuilderContainer::disposeBuilder() OUString AllSettings::GetUIRootDir() { - OUString sShareLayer("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/"); + OUString sShareLayer(u"$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/"_ustr); rtl::Bootstrap::expandMacros(sShareLayer); return sShareLayer; } @@ -641,7 +641,7 @@ void Dialog::dispose() if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { if (bTunnelingEnabled) - pNotifier->notifyWindow(GetLOKWindowId(), "close"); + pNotifier->notifyWindow(GetLOKWindowId(), u"close"_ustr); ReleaseLOKNotifier(); } } @@ -773,8 +773,8 @@ void Dialog::StateChanged( StateChangedType nType ) if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { - pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); - pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); + pNotifier->notifyWindow(GetLOKWindowId(), u"created"_ustr, aItems); + pNotifier->notifyWindow(GetLOKWindowId(), u"created"_ustr, aItems); } else { @@ -782,7 +782,7 @@ void Dialog::StateChanged( StateChangedType nType ) if (pViewShell) { SetLOKNotifier(pViewShell); - pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems); + pViewShell->notifyWindow(GetLOKWindowId(), u"created"_ustr, aItems); } } } @@ -807,7 +807,7 @@ void Dialog::StateChanged( StateChangedType nType ) { std::vector<vcl::LOKPayloadItem> aPayload; aPayload.emplace_back("title", GetText().toUtf8()); - pNotifier->notifyWindow(GetLOKWindowId(), "title_changed", aPayload); + pNotifier->notifyWindow(GetLOKWindowId(), u"title_changed"_ustr, aPayload); } } @@ -826,7 +826,7 @@ void Dialog::StateChanged( StateChangedType nType ) { std::vector<vcl::LOKPayloadItem> aPayload; aPayload.emplace_back("title", GetText().toUtf8()); - pNotifier->notifyWindow(GetLOKWindowId(), IsVisible()? OUString("show"): OUString("hide"), aPayload); + pNotifier->notifyWindow(GetLOKWindowId(), IsVisible()? u"show"_ustr: u"hide"_ustr, aPayload); } } } @@ -1049,7 +1049,7 @@ bool Dialog::ImplStartExecute() std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back("size", GetSizePixel().toString()); aItems.emplace_back("unique_id", this->get_id().toUtf8()); - pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems); + pNotifier->notifyWindow(GetLOKWindowId(), u"size_changed"_ustr, aItems); } } @@ -1147,7 +1147,7 @@ void Dialog::EndDialog( tools::Long nResult ) if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { if (mpDialogImpl->m_bLOKTunneling) - pNotifier->notifyWindow(GetLOKWindowId(), "close"); + pNotifier->notifyWindow(GetLOKWindowId(), u"close"_ustr); ReleaseLOKNotifier(); } } @@ -1439,7 +1439,7 @@ void Dialog::Resize() std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back("size", GetSizePixel().toString()); aItems.emplace_back("unique_id", this->get_id().toUtf8()); - pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems); + pNotifier->notifyWindow(GetLOKWindowId(), u"size_changed"_ustr, aItems); } } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 2bced4d8047b..e55cca238349 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -1088,11 +1088,11 @@ SystemWindow* DockingWindow::GetFloatingWindow() const DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame, bool bTearable) : DockingWindow(pParent, - !bTearable ? OUString("InterimDockParent") : OUString("InterimTearableParent"), - !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), + !bTearable ? u"InterimDockParent"_ustr : u"InterimTearableParent"_ustr, + !bTearable ? u"vcl/ui/interimdockparent.ui"_ustr : u"vcl/ui/interimtearableparent.ui"_ustr, "vcl::DropdownDockingWindow maLayoutIdle", rFrame) - , m_xBox(m_pUIBuilder->get("box")) + , m_xBox(m_pUIBuilder->get(u"box"_ustr)) { } @@ -1108,8 +1108,8 @@ void DropdownDockingWindow::dispose() } ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame) - : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui", "vcl::ResizableDockingWindow maLayoutIdle", rFrame) - , m_xBox(m_pUIBuilder->get("box")) + : DockingWindow(pParent, u"DockingWindow"_ustr, u"vcl/ui/dockingwindow.ui"_ustr, "vcl::ResizableDockingWindow maLayoutIdle", rFrame) + , m_xBox(m_pUIBuilder->get(u"box"_ustr)) { } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index b2faacadb5fa..5c576a0fd358 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -662,7 +662,7 @@ void FloatingWindow::PixelInvalidate(const tools::Rectangle* /*pRectangle*/) std::make_pair("rectangle"_ostr, aRect.toString()) }; const vcl::ILibreOfficeKitNotifier* pNotifier = pParent->GetLOKNotifier(); - pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload); + pNotifier->notifyWindow(GetLOKWindowId(), u"invalidate"_ustr, aPayload); } } @@ -708,13 +708,13 @@ void FloatingWindow::StateChanged( StateChangedType nType ) } aItems.emplace_back("size", GetSizePixel().toString()); - GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems); + GetLOKNotifier()->notifyWindow(GetLOKWindowId(), u"created"_ustr, aItems); } else if (!IsVisible() && nType == StateChangedType::Visible) { if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { - pNotifier->notifyWindow(GetLOKWindowId(), "close"); + pNotifier->notifyWindow(GetLOKWindowId(), u"close"_ustr); ReleaseLOKNotifier(); } } diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index cc3fca5802ea..31bf70f08d57 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -66,7 +66,7 @@ vcl::KeyCode::KeyCode( KeyFuncType eFunction ) OUString vcl::KeyCode::GetName() const { vcl::Window* pWindow = ImplGetDefaultWindow(); - return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : ""; + return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : u""_ustr; } KeyFuncType vcl::KeyCode::GetFunction() const diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index c4729a1e1abb..2d42d305498e 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2449,7 +2449,7 @@ void MessageDialog::create_message_area() pBtn.set( VclPtr<OKButton>::Create(pButtonBox) ); pBtn->SetStyle(pBtn->GetStyle() & WB_DEFBUTTON); pBtn->Show(); - pBtn->set_id("ok"); + pBtn->set_id(u"ok"_ustr); add_button(pBtn, RET_OK, true); nDefaultResponse = RET_OK; break; @@ -2457,7 +2457,7 @@ void MessageDialog::create_message_area() pBtn.set( VclPtr<CloseButton>::Create(pButtonBox) ); pBtn->SetStyle(pBtn->GetStyle() & WB_DEFBUTTON); pBtn->Show(); - pBtn->set_id("close"); + pBtn->set_id(u"close"_ustr); add_button(pBtn, RET_CLOSE, true); nDefaultResponse = RET_CLOSE; break; @@ -2465,7 +2465,7 @@ void MessageDialog::create_message_area() pBtn.set( VclPtr<CancelButton>::Create(pButtonBox) ); pBtn->SetStyle(pBtn->GetStyle() & WB_DEFBUTTON); pBtn->Show(); - pBtn->set_id("cancel"); + pBtn->set_id(u"cancel"_ustr); add_button(pBtn, RET_CANCEL, true); nDefaultResponse = RET_CANCEL; break; @@ -2473,25 +2473,25 @@ void MessageDialog::create_message_area() pBtn = VclPtr<PushButton>::Create(pButtonBox); pBtn->SetText(GetStandardText(StandardButtonType::Yes)); pBtn->Show(); - pBtn->set_id("yes"); + pBtn->set_id(u"yes"_ustr); add_button(pBtn, RET_YES, true); pBtn.set( VclPtr<PushButton>::Create(pButtonBox) ); pBtn->SetText(GetStandardText(StandardButtonType::No)); pBtn->Show(); - pBtn->set_id("no"); + pBtn->set_id(u"no"_ustr); add_button(pBtn, RET_NO, true); nDefaultResponse = RET_NO; break; case VclButtonsType::OkCancel: pBtn.set( VclPtr<OKButton>::Create(pButtonBox) ); pBtn->Show(); - pBtn->set_id("ok"); + pBtn->set_id(u"ok"_ustr); add_button(pBtn, RET_OK, true); pBtn.set( VclPtr<CancelButton>::Create(pButtonBox) ); pBtn->Show(); - pBtn->set_id("cancel"); + pBtn->set_id(u"cancel"_ustr); add_button(pBtn, RET_CANCEL, true); nDefaultResponse = RET_CANCEL; break; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index eb08c4de9848..3fedfb936bc3 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -84,7 +84,7 @@ static bool ImplAccelDisabled() { OUString aStr = vcl::SettingsConfigItem::get()-> - getValue( "Menu", "SuppressAccelerators" ); + getValue( u"Menu"_ustr, u"SuppressAccelerators"_ustr ); nAccelDisabled = aStr.equalsIgnoreAsciiCase("true") ? 1 : 0; } return nAccelDisabled == 1; diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 5996b818d4bb..fc6435ef46bd 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1225,7 +1225,7 @@ void Window::PixelInvalidate(const tools::Rectangle* pRectangle) aPayload.emplace_back("rectangle", aRect.toString()); - pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload); + pNotifier->notifyWindow(GetLOKWindowId(), u"invalidate"_ustr, aPayload); } // Added for dialog items. Pass invalidation to the parent window. else if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier()) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index c76701b31698..f642641a0fc2 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -524,57 +524,57 @@ Size const & PrintDialog::getJobPageSize() } PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptr<PrinterController> i_xController) - : GenericDialogController(i_pWindow, "vcl/ui/printdialog.ui", "PrintDialog") + : GenericDialogController(i_pWindow, u"vcl/ui/printdialog.ui"_ustr, u"PrintDialog"_ustr) , maPController(std::move( i_xController )) - , mxTabCtrl(m_xBuilder->weld_notebook("tabcontrol")) - , mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow")) - , mxPageLayoutFrame(m_xBuilder->weld_frame("layoutframe")) - , mxPrinters(m_xBuilder->weld_combo_box("printersbox")) - , mxStatusTxt(m_xBuilder->weld_label("status")) - , mxSetupButton(m_xBuilder->weld_button("setup")) - , mxCopyCountField(m_xBuilder->weld_spin_button("copycount")) - , mxCollateBox(m_xBuilder->weld_check_button("collate")) - , mxCollateImage(m_xBuilder->weld_image("collateimage")) - , mxPageRangeEdit(m_xBuilder->weld_entry("pagerange")) - , mxPageRangesRadioButton(m_xBuilder->weld_radio_button("rbRangePages")) - , mxPaperSidesBox(m_xBuilder->weld_combo_box("sidesbox")) - , mxSingleJobsBox(m_xBuilder->weld_check_button("singlejobs")) - , mxReverseOrderBox(m_xBuilder->weld_check_button("reverseorder")) - , mxOKButton(m_xBuilder->weld_button("ok")) - , mxCancelButton(m_xBuilder->weld_button("cancel")) - , mxBackwardBtn(m_xBuilder->weld_button("backward")) - , mxForwardBtn(m_xBuilder->weld_button("forward")) - , mxFirstBtn(m_xBuilder->weld_button("btnFirst")) - , mxLastBtn(m_xBuilder->weld_button("btnLast")) - , mxPreviewBox(m_xBuilder->weld_check_button("previewbox")) - , mxNumPagesText(m_xBuilder->weld_label("totalnumpages")) + , mxTabCtrl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) + , mxScrolledWindow(m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr)) + , mxPageLayoutFrame(m_xBuilder->weld_frame(u"layoutframe"_ustr)) + , mxPrinters(m_xBuilder->weld_combo_box(u"printersbox"_ustr)) + , mxStatusTxt(m_xBuilder->weld_label(u"status"_ustr)) + , mxSetupButton(m_xBuilder->weld_button(u"setup"_ustr)) + , mxCopyCountField(m_xBuilder->weld_spin_button(u"copycount"_ustr)) + , mxCollateBox(m_xBuilder->weld_check_button(u"collate"_ustr)) + , mxCollateImage(m_xBuilder->weld_image(u"collateimage"_ustr)) + , mxPageRangeEdit(m_xBuilder->weld_entry(u"pagerange"_ustr)) + , mxPageRangesRadioButton(m_xBuilder->weld_radio_button(u"rbRangePages"_ustr)) + , mxPaperSidesBox(m_xBuilder->weld_combo_box(u"sidesbox"_ustr)) + , mxSingleJobsBox(m_xBuilder->weld_check_button(u"singlejobs"_ustr)) + , mxReverseOrderBox(m_xBuilder->weld_check_button(u"reverseorder"_ustr)) + , mxOKButton(m_xBuilder->weld_button(u"ok"_ustr)) + , mxCancelButton(m_xBuilder->weld_button(u"cancel"_ustr)) + , mxBackwardBtn(m_xBuilder->weld_button(u"backward"_ustr)) + , mxForwardBtn(m_xBuilder->weld_button(u"forward"_ustr)) + , mxFirstBtn(m_xBuilder->weld_button(u"btnFirst"_ustr)) + , mxLastBtn(m_xBuilder->weld_button(u"btnLast"_ustr)) + , mxPreviewBox(m_xBuilder->weld_check_button(u"previewbox"_ustr)) + , mxNumPagesText(m_xBuilder->weld_label(u"totalnumpages"_ustr)) , mxPreview(new PrintPreviewWindow(this)) - , mxPreviewWindow(new weld::CustomWeld(*m_xBuilder, "preview", *mxPreview)) - , mxPageEdit(m_xBuilder->weld_entry("pageedit")) - , mxPagesBtn(m_xBuilder->weld_radio_button("pagespersheetbtn")) - , mxBrochureBtn(m_xBuilder->weld_radio_button("brochure")) - , mxPagesBoxTitleTxt(m_xBuilder->weld_label("pagespersheettxt")) - , mxNupPagesBox(m_xBuilder->weld_combo_box("pagespersheetbox")) - , mxNupNumPagesTxt(m_xBuilder->weld_label("pagestxt")) - , mxNupColEdt(m_xBuilder->weld_spin_button("pagecols")) - , mxNupTimesTxt(m_xBuilder->weld_label("by")) - , mxNupRowsEdt(m_xBuilder->weld_spin_button("pagerows")) - , mxPageMarginTxt1(m_xBuilder->weld_label("pagemargintxt1")) - , mxPageMarginEdt(m_xBuilder->weld_metric_spin_button("pagemarginsb", FieldUnit::MM)) - , mxPageMarginTxt2(m_xBuilder->weld_label("pagemargintxt2")) - , mxSheetMarginTxt1(m_xBuilder->weld_label("sheetmargintxt1")) - , mxSheetMarginEdt(m_xBuilder->weld_metric_spin_button("sheetmarginsb", FieldUnit::MM)) - , mxSheetMarginTxt2(m_xBuilder->weld_label("sheetmargintxt2")) - , mxPaperSizeBox(m_xBuilder->weld_combo_box("papersizebox")) - , mxOrientationBox(m_xBuilder->weld_combo_box("pageorientationbox")) - , mxNupOrderTxt(m_xBuilder->weld_label("labelorder")) - , mxNupOrderBox(m_xBuilder->weld_combo_box("orderbox")) + , mxPreviewWindow(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, *mxPreview)) + , mxPageEdit(m_xBuilder->weld_entry(u"pageedit"_ustr)) + , mxPagesBtn(m_xBuilder->weld_radio_button(u"pagespersheetbtn"_ustr)) + , mxBrochureBtn(m_xBuilder->weld_radio_button(u"brochure"_ustr)) + , mxPagesBoxTitleTxt(m_xBuilder->weld_label(u"pagespersheettxt"_ustr)) + , mxNupPagesBox(m_xBuilder->weld_combo_box(u"pagespersheetbox"_ustr)) + , mxNupNumPagesTxt(m_xBuilder->weld_label(u"pagestxt"_ustr)) + , mxNupColEdt(m_xBuilder->weld_spin_button(u"pagecols"_ustr)) + , mxNupTimesTxt(m_xBuilder->weld_label(u"by"_ustr)) + , mxNupRowsEdt(m_xBuilder->weld_spin_button(u"pagerows"_ustr)) + , mxPageMarginTxt1(m_xBuilder->weld_label(u"pagemargintxt1"_ustr)) + , mxPageMarginEdt(m_xBuilder->weld_metric_spin_button(u"pagemarginsb"_ustr, FieldUnit::MM)) + , mxPageMarginTxt2(m_xBuilder->weld_label(u"pagemargintxt2"_ustr)) + , mxSheetMarginTxt1(m_xBuilder->weld_label(u"sheetmargintxt1"_ustr)) + , mxSheetMarginEdt(m_xBuilder->weld_metric_spin_button(u"sheetmarginsb"_ustr, FieldUnit::MM)) + , mxSheetMarginTxt2(m_xBuilder->weld_label(u"sheetmargintxt2"_ustr)) + , mxPaperSizeBox(m_xBuilder->weld_combo_box(u"papersizebox"_ustr)) + , mxOrientationBox(m_xBuilder->weld_combo_box(u"pageorientationbox"_ustr)) + , mxNupOrderTxt(m_xBuilder->weld_label(u"labelorder"_ustr)) + , mxNupOrderBox(m_xBuilder->weld_combo_box(u"orderbox"_ustr)) , mxNupOrder(new ShowNupOrderWindow) - , mxNupOrderWin(new weld::CustomWeld(*m_xBuilder, "orderpreview", *mxNupOrder)) - , mxBorderCB(m_xBuilder->weld_check_button("bordercb")) - , mxRangeExpander(m_xBuilder->weld_expander("exRangeExpander")) - , mxLayoutExpander(m_xBuilder->weld_expander("exLayoutExpander")) - , mxCustom(m_xBuilder->weld_widget("customcontents")) + , mxNupOrderWin(new weld::CustomWeld(*m_xBuilder, u"orderpreview"_ustr, *mxNupOrder)) + , mxBorderCB(m_xBuilder->weld_check_button(u"bordercb"_ustr)) + , mxRangeExpander(m_xBuilder->weld_expander(u"exRangeExpander"_ustr)) + , mxLayoutExpander(m_xBuilder->weld_expander(u"exLayoutExpander"_ustr)) + , mxCustom(m_xBuilder->weld_widget(u"customcontents"_ustr)) , maPrintToFileText( VclResId( SV_PRINT_TOFILE_TXT ) ) , maDefPrtText( VclResId( SV_PRINT_DEFPRT_TXT ) ) , maNoPageStr( VclResId( SV_PRINT_NOPAGES ) ) @@ -608,8 +608,8 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptr<PrinterControl { // fall back to last printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - OUString aValue( pItem->getValue( "PrintDialog", - "LastPrinter" ) ); + OUString aValue( pItem->getValue( u"PrintDialog"_ustr, + u"LastPrinter"_ustr ) ); if (mxPrinters->find_text(aValue) != -1) { mxPrinters->set_active_text(aValue); @@ -752,37 +752,37 @@ void PrintDialog::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( "PrintDialog", - "LastPrinter", + pItem->setValue( u"PrintDialog"_ustr, + u"LastPrinter"_ustr, isPrintToFile() ? Printer::GetDefaultPrinterName() : mxPrinters->get_active_text() ); - pItem->setValue( "PrintDialog", - "LastPage", + pItem->setValue( u"PrintDialog"_ustr, + u"LastPage"_ustr, mxTabCtrl->get_tab_label_text(mxTabCtrl->get_current_page_ident())); - pItem->setValue( "PrintDialog", - "WindowState", + pItem->setValue( u"PrintDialog"_ustr, + u"WindowState"_ustr, m_xDialog->get_window_state(vcl::WindowDataMask::All) ); - pItem->setValue( "PrintDialog", - "CopyCount", + pItem->setValue( u"PrintDialog"_ustr, + u"CopyCount"_ustr, mxCopyCountField->get_text() ); - pItem->setValue( "PrintDialog", - "Collate", - mxCollateBox->get_active() ? OUString("true") : - OUString("false") ); + pItem->setValue( u"PrintDialog"_ustr, + u"Collate"_ustr, + mxCollateBox->get_active() ? u"true"_ustr : + u"false"_ustr ); - pItem->setValue( "PrintDialog", - "CollateSingleJobs", - mxSingleJobsBox->get_active() ? OUString("true") : - OUString("false") ); + pItem->setValue( u"PrintDialog"_ustr, + u"CollateSingleJobs"_ustr, + mxSingleJobsBox->get_active() ? u"true"_ustr : + u"false"_ustr ); - pItem->setValue( "PrintDialog", - "HasPreview", - hasPreview() ? OUString("true") : - OUString("false") ); + pItem->setValue( u"PrintDialog"_ustr, + u"HasPreview"_ustr, + hasPreview() ? u"true"_ustr : + u"false"_ustr ); pItem->Commit(); } @@ -792,8 +792,8 @@ void PrintDialog::readFromSettings() SettingsConfigItem* pItem = SettingsConfigItem::get(); // read last selected tab page; if it exists, activate it - OUString aValue = pItem->getValue( "PrintDialog", - "LastPage" ); + OUString aValue = pItem->getValue( u"PrintDialog"_ustr, + u"LastPage"_ustr ); sal_uInt16 nCount = mxTabCtrl->get_n_pages(); for (sal_uInt16 i = 0; i < nCount; ++i) { @@ -806,14 +806,14 @@ void PrintDialog::readFromSettings() } // persistent window state - aValue = pItem->getValue( "PrintDialog", - "WindowState" ); + aValue = pItem->getValue( u"PrintDialog"_ustr, + u"WindowState"_ustr ); if (!aValue.isEmpty()) m_xDialog->set_window_state(aValue); // collate - aValue = pItem->getValue( "PrintDialog", - "CollateBox" ); + aValue = pItem->getValue( u"PrintDialog"_ustr, + u"CollateBox"_ustr ); if( aValue.equalsIgnoreAsciiCase("alwaysoff") ) { mbCollateAlwaysOff = true; @@ -823,19 +823,19 @@ void PrintDialog::readFromSettings() else { mbCollateAlwaysOff = false; - aValue = pItem->getValue( "PrintDialog", - "Collate" ); + aValue = pItem->getValue( u"PrintDialog"_ustr, + u"Collate"_ustr ); mxCollateBox->set_active( aValue.equalsIgnoreAsciiCase("true") ); } // collate single jobs - aValue = pItem->getValue( "PrintDialog", - "CollateSingleJobs" ); + aValue = pItem->getValue( u"PrintDialog"_ustr, + u"CollateSingleJobs"_ustr ); mxSingleJobsBox->set_active(aValue.equalsIgnoreAsciiCase("true")); // preview box - aValue = pItem->getValue( "PrintDialog", - "HasPreview" ); + aValue = pItem->getValue( u"PrintDialog"_ustr, + u"HasPreview"_ustr ); if ( aValue.equalsIgnoreAsciiCase("false") ) mxPreviewBox->set_active( false ); else @@ -877,7 +877,7 @@ void PrintDialog::setPaperSizes() OUString aWidth( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) ); OUString aHeight( rLocWrap.getNum( aLogicPaperSize.Height(), nDigits ) ); - OUString aUnit = eUnit == o3tl::Length::mm ? OUString("mm") : OUString("in"); + OUString aUnit = eUnit == o3tl::Length::mm ? u"mm"_ustr : u"in"_ustr; OUString aPaperName; // Paper sizes that we don't know of but the system printer driver lists are not "User @@ -1015,7 +1015,7 @@ void PrintDialog::updatePageRange(sal_Int32 nPages) } OUString sRange = aBuf.makeStringAndClear(); mxPageRangeEdit->set_text(sRange); - maPController->setValue("PageRange", Any(sRange)); + maPController->setValue(u"PageRange"_ustr, Any(sRange)); } } @@ -1372,8 +1372,8 @@ void PrintDialog::setupOptionalUI() OUString sOptionsUIFile; rOption.Value >>= sOptionsUIFile; mxCustomOptionsUIBuilder = Application::CreateBuilder(mxCustom.get(), sOptionsUIFile); - std::unique_ptr<weld::Container> xWindow = mxCustomOptionsUIBuilder->weld_container("box"); - xWindow->set_help_id("vcl/ui/printdialog/PrintDialog"); + std::unique_ptr<weld::Container> xWindow = mxCustomOptionsUIBuilder->weld_container(u"box"_ustr); + xWindow->set_help_id(u"vcl/ui/printdialog/PrintDialog"_ustr); xWindow->show(); continue; } @@ -1856,13 +1856,13 @@ IMPL_LINK(PrintDialog, ToggleHdl, weld::Toggleable&, rButton, void) } else if (&rButton == mxSingleJobsBox.get()) { - maPController->setValue( "SinglePrintJobs", + maPController->setValue( u"SinglePrintJobs"_ustr, Any( isSingleJobs() ) ); checkControlDependencies(); } else if( &rButton == mxCollateBox.get() ) { - maPController->setValue( "Collate", + maPController->setValue( u"Collate"_ustr, Any( isCollate() ) ); checkControlDependencies(); } @@ -1870,7 +1870,7 @@ IMPL_LINK(PrintDialog, ToggleHdl, weld::Toggleable&, rButton, void) { bool bChecked = mxReverseOrderBox->get_active(); maPController->setReversePrint( bChecked ); - maPController->setValue( "PrintReverse", + maPController->setValue( u"PrintReverse"_ustr, Any( bChecked ) ); maUpdatePreviewIdle.Start(); } @@ -2064,7 +2064,7 @@ IMPL_LINK_NOARG(PrintDialog, ActivateHdl, weld::Entry&, bool) if (nPage < 1) { nPage = 1; - mxPageEdit->set_text("1"); + mxPageEdit->set_text(u"1"_ustr); } else if (nPage > mnCachedPages) { @@ -2089,9 +2089,9 @@ IMPL_LINK( PrintDialog, SpinModifyHdl, weld::SpinButton&, rEdit, void ) } else if( &rEdit == mxCopyCountField.get() ) { - maPController->setValue( "CopyCount", + maPController->setValue( u"CopyCount"_ustr, Any( sal_Int32(mxCopyCountField->get_value()) ) ); - maPController->setValue( "Collate", + maPController->setValue( u"Collate"_ustr, Any( isCollate() ) ); } } @@ -2224,7 +2224,7 @@ void PrintDialog::previewBackward() void PrintDialog::previewFirst() { - mxPageEdit->set_text("1"); + mxPageEdit->set_text(u"1"_ustr); ActivateHdl(*mxPageEdit); } @@ -2245,13 +2245,13 @@ static OUString getNewLabel(const OUString& aLabel, int i_nCurr, int i_nMax) // PrintProgressDialog PrintProgressDialog::PrintProgressDialog(weld::Window* i_pParent, int i_nMax) - : GenericDialogController(i_pParent, "vcl/ui/printprogressdialog.ui", "PrintProgressDialog") + : GenericDialogController(i_pParent, u"vcl/ui/printprogressdialog.ui"_ustr, u"PrintProgressDialog"_ustr) , mbCanceled(false) , mnCur(0) , mnMax(i_nMax) - , mxText(m_xBuilder->weld_label("label")) - , mxProgress(m_xBuilder->weld_progress_bar("progressbar")) - , mxButton(m_xBuilder->weld_button("cancel")) + , mxText(m_xBuilder->weld_label(u"label"_ustr)) + , mxProgress(m_xBuilder->weld_progress_bar(u"progressbar"_ustr)) + , mxButton(m_xBuilder->weld_button(u"cancel"_ustr)) { if( mnMax < 1 ) mnMax = 1; diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index fc14762bef7a..b79f58766461 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1173,8 +1173,8 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText, int nCha tools::Long nWidth; if (nCharsWidth != -1) { - nWidth = GetTextWidth("0",0,-1,nullptr, - SalLayoutGlyphsCache::self()->GetLayoutGlyphs(GetOutDev(),"0")); + nWidth = GetTextWidth(u"0"_ustr,0,-1,nullptr, + SalLayoutGlyphsCache::self()->GetLayoutGlyphs(GetOutDev(),u"0"_ustr)); nWidth = nWidth * nCharsWidth + nFudge; } else diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 7fdd03a031e3..37a0c4c75fe0 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1679,7 +1679,7 @@ bool ToolBox::AlwaysLocked() utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), - "/org.openoffice.Office.UI.GlobalSettings/Toolbars" ); // note: case sensitive ! + u"/org.openoffice.Office.UI.GlobalSettings/Toolbars"_ustr ); // note: case sensitive ! if ( aNode.isValid() ) { // feature enabled ? @@ -1692,7 +1692,7 @@ bool ToolBox::AlwaysLocked() // now read the locking state utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), - "/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ); // note: case sensitive ! + u"/org.openoffice.Office.UI.GlobalSettings/Toolbars/States"_ustr ); // note: case sensitive ! bool bLocked = bool(); css::uno::Any aValue2 = aNode2.getNodeValue( "Locked" ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 06a60a209483..b7f0ea58181b 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1059,7 +1059,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p { // do not abort but throw an exception, may be the current thread terminates anyway (plugin-scenario) throw RuntimeException( - "Could not create system window!", + u"Could not create system window!"_ustr, Reference< XInterface >() ); } @@ -1921,7 +1921,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) if( !aStrHelpId.isEmpty() ) pHelp->Start( aStrHelpId, this ); else - pHelp->Start( OOO_HELP_INDEX, this ); + pHelp->Start( u"" OOO_HELP_INDEX ""_ustr, this ); } } } @@ -3783,8 +3783,8 @@ Reference< css::rendering::XCanvas > WindowOutputDevice::ImplGetCanvas( bool bSp { xCanvas.set( xCanvasFactory->createInstanceWithArgumentsAndContext( bSpriteCanvas ? - OUString( "com.sun.star.rendering.SpriteCanvas" ) : - OUString( "com.sun.star.rendering.Canvas" ), + u"com.sun.star.rendering.SpriteCanvas"_ustr : + u"com.sun.star.rendering.Canvas"_ustr, aArg, xContext ), UNO_QUERY ); |