diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 35314045e918..b8e8ac56686c 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -49,7 +49,7 @@ namespace abp const char16_t sDriverSettingsNodeName[] = u"/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver"; - constexpr OUStringLiteral sAddressBookNodeName = u"/org.openoffice.Office.DataAccess/AddressBook"; + constexpr OUString sAddressBookNodeName = u"/org.openoffice.Office.DataAccess/AddressBook"_ustr; namespace fieldmapping { @@ -218,8 +218,8 @@ namespace abp const OUString* pExistentFields = aExistentFields.getConstArray(); const OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - static constexpr OUStringLiteral sProgrammaticNodeName( u"ProgrammaticFieldName" ); - static constexpr OUStringLiteral sAssignedNodeName( u"AssignedFieldName" ); + static constexpr OUString sProgrammaticNodeName( u"ProgrammaticFieldName"_ustr ); + static constexpr OUString sAssignedNodeName( u"AssignedFieldName"_ustr ); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 14203ae6c346..358adf8c58c3 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; -constexpr OUStringLiteral cDataSourceHistory = u"DataSourceHistory"; +constexpr OUString cDataSourceHistory = u"DataSourceHistory"_ustr; Sequence const & BibConfig::GetPropertyNames() { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 4f20e997cc24..a15a3e889c18 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang; // PropertyNames constexpr OUStringLiteral FM_PROP_LABEL = u"Label"; -constexpr OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField"; +constexpr OUString FM_PROP_CONTROLSOURCE = u"DataField"_ustr; constexpr OUStringLiteral FM_PROP_NAME = u"Name"; static Reference< XConnection > getConnection(const OUString& _rURL) diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index c084eda7b364..99507008870d 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -93,8 +93,8 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static constexpr OUStringLiteral s_sMouseWheelBehavior = u"MouseWheelBehavior"; - static constexpr OUStringLiteral s_sEmptyString = u""; + static constexpr OUString s_sMouseWheelBehavior = u"MouseWheelBehavior"_ustr; + static constexpr OUString s_sEmptyString = u""_ustr; // collect "descriptors" for the to-be-created (grid)columns std::vector< OUString > aColumnServiceNames; // service names to be used with the XGridColumnFactory diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 499a7b783bcf..c35b0cefc8d7 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -189,7 +189,7 @@ namespace dbp void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { - static constexpr OUStringLiteral s_sAnchorPropertyName = u"AnchorType"; + static constexpr OUString s_sAnchorPropertyName = u"AnchorType"_ustr; Reference< XPropertySetInfo > xPropertyInfo; if (_rxShapeProps.is()) xPropertyInfo = _rxShapeProps->getPropertySetInfo(); diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index c495bbe1ea95..a9ea13f208ca 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -90,7 +90,7 @@ namespace { const sal_Unicode quote_char = '"'; const sal_Unicode comma_char = ','; - constexpr OUStringLiteral dos_newline = u"\r\n"; + constexpr OUString dos_newline = u"\r\n"_ustr; bool needsQuoting(std::u16string_view str) { diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 1cac902eaccb..395d90444ed6 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -65,7 +65,7 @@ constexpr OUStringLiteral PROPERTY_TITLE = u"BubbleHeading"; constexpr OUStringLiteral PROPERTY_TEXT = u"BubbleText"; constexpr OUStringLiteral PROPERTY_SHOW_BUBBLE = u"BubbleVisible"; constexpr OUStringLiteral PROPERTY_CLICK_HDL = u"MenuClickHDL"; -constexpr OUStringLiteral PROPERTY_SHOW_MENUICON = u"MenuIconVisible"; +constexpr OUString PROPERTY_SHOW_MENUICON = u"MenuIconVisible"_ustr; // Returns the URL of the release note for the given position OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled) diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index ed2261b4ec14..299a4f215f49 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -64,20 +64,20 @@ #include #include -constexpr OUStringLiteral COMMAND_CLOSE = u"close"; +constexpr OUString COMMAND_CLOSE = u"close"_ustr; -constexpr OUStringLiteral CTRL_THROBBER = u"throbber"; -constexpr OUStringLiteral CTRL_PROGRESS = u"progress"; +constexpr OUString CTRL_THROBBER = u"throbber"_ustr; +constexpr OUString CTRL_PROGRESS = u"progress"_ustr; -constexpr OUStringLiteral TEXT_STATUS = u"text_status"; -constexpr OUStringLiteral TEXT_PERCENT = u"text_percent"; -constexpr OUStringLiteral TEXT_DESCRIPTION = u"text_description"; +constexpr OUString TEXT_STATUS = u"text_status"_ustr; +constexpr OUString TEXT_PERCENT = u"text_percent"_ustr; +constexpr OUString TEXT_DESCRIPTION = u"text_description"_ustr; constexpr OUStringLiteral FIXED_LINE_MODEL = u"com.sun.star.awt.UnoControlFixedLineModel"; -constexpr OUStringLiteral FIXED_TEXT_MODEL = u"com.sun.star.awt.UnoControlFixedTextModel"; -constexpr OUStringLiteral EDIT_FIELD_MODEL = u"com.sun.star.awt.UnoControlEditModel"; -constexpr OUStringLiteral BUTTON_MODEL = u"com.sun.star.awt.UnoControlButtonModel"; -constexpr OUStringLiteral GROUP_BOX_MODEL = u"com.sun.star.awt.UnoControlGroupBoxModel"; +constexpr OUString FIXED_TEXT_MODEL = u"com.sun.star.awt.UnoControlFixedTextModel"_ustr; +constexpr OUString EDIT_FIELD_MODEL = u"com.sun.star.awt.UnoControlEditModel"_ustr; +constexpr OUString BUTTON_MODEL = u"com.sun.star.awt.UnoControlButtonModel"_ustr; +constexpr OUString GROUP_BOX_MODEL = u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr; using namespace com::sun::star; diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index f7f1f011363b..492cb92669ab 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -39,12 +39,12 @@ #include -constexpr OUStringLiteral PROPERTY_TITLE = u"BubbleHeading"; -constexpr OUStringLiteral PROPERTY_TEXT = u"BubbleText"; -constexpr OUStringLiteral PROPERTY_IMAGE = u"BubbleImageURL"; -constexpr OUStringLiteral PROPERTY_SHOW_BUBBLE = u"BubbleVisible"; -constexpr OUStringLiteral PROPERTY_CLICK_HDL = u"MenuClickHDL"; -constexpr OUStringLiteral PROPERTY_SHOW_MENUICON = u"MenuIconVisible"; +constexpr OUString PROPERTY_TITLE = u"BubbleHeading"_ustr; +constexpr OUString PROPERTY_TEXT = u"BubbleText"_ustr; +constexpr OUString PROPERTY_IMAGE = u"BubbleImageURL"_ustr; +constexpr OUString PROPERTY_SHOW_BUBBLE = u"BubbleVisible"_ustr; +constexpr OUString PROPERTY_CLICK_HDL = u"MenuClickHDL"_ustr; +constexpr OUString PROPERTY_SHOW_MENUICON = u"MenuIconVisible"_ustr; using namespace ::com::sun::star;