diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-18 07:37:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-18 11:26:44 +0200 |
| commit | b946842a744c2b869e5c01adf90335edf07f09ad (patch) | |
| tree | 8a6b21fb1040a0e825856e06f20bd1250fbeaf27 /framework | |
| parent | 35ea75e9c2be75a70298a3f4e7d703c1d0f9497e (diff) | |
Clean up the remaining uses of OUStringConstExpr, and drop it
Change-Id: I30b2ac77b58e2ae1d1e997a0c830c513542b973d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158101
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/xml/toolboxdocumenthandler.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 67d67ed308a9..26b28a04f348 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -82,7 +82,7 @@ namespace { struct ToolboxStyleItem { sal_Int16 nBit; - rtl::OUStringConstExpr attrName; + OUString attrName; }; } @@ -671,7 +671,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( { if ( !aValue.isEmpty() ) aValue.append(" "); - aValue.append( OUString(pStyle->attrName) ); + aValue.append( pStyle->attrName ); } } pList->AddAttribute( m_aXMLToolbarNS + ATTRIBUTE_ITEMSTYLE, diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 97a1402c9f2e..be600fae3c46 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -81,7 +81,7 @@ const sal_Int16 PROPERTY_DOCKPOS = 14; const sal_Int16 PROPERTY_DOCKSIZE = 15; // Order must be the same as WindowStateMask!! -rtl::OUStringConstExpr CONFIGURATION_PROPERTIES[] +constexpr OUString CONFIGURATION_PROPERTIES[] { WINDOWSTATE_PROPERTY_LOCKED, WINDOWSTATE_PROPERTY_DOCKED, @@ -224,7 +224,7 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( std::u16string m_bModified( false ) { // Initialize access array with property names. - for (const rtl::OUStringConstExpr & s : CONFIGURATION_PROPERTIES ) + for (const OUString & s : CONFIGURATION_PROPERTIES ) m_aPropArray.push_back(s); } diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index b6dd84e069ce..83f80d242ac7 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -87,7 +87,7 @@ static TranslateId aLabels[] = RID_STR_PROPTITLE_NAVBAR }; -const rtl::OUStringConstExpr aImgIds[] +constexpr OUString aImgIds[] { RID_SVXBMP_EDITBOX, RID_SVXBMP_BUTTON, @@ -193,7 +193,7 @@ void ControlMenuController::updateImagesPopupMenu(Reference<awt::XPopupMenu> con sal_Int16 nItemId = i + 1; if (m_bShowMenuImages) { - Image aImage(StockImage::Yes, OUString(aImgIds[i])); + Image aImage(StockImage::Yes, aImgIds[i]); Graphic aGraphic(aImage); rPopupMenu->setItemImage(nItemId, aGraphic.GetXGraphic(), false); } |