const OUString -> const OUStringLiteral

Mostly automated rewrite

Change-Id: Ie020a083f898bc126b8fb039d4ecb2e687172da1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112965
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

18 files changed, 52 insertions, 52 deletions

diff --git a/svx/qa/unit/gallery/test_gallery.cxx b/svx/qa/unit/gallery/test_gallery.cxx
index 641101e11a50..072361232dc7 100644
--- a/svx/qa/unit/gallery/test_gallery.cxx
+++ b/svx/qa/unit/gallery/test_gallery.cxx
@@ -69,7 +69,7 @@ void GalleryObjTest::TestCreateTheme()
 
     std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
     CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
-    const OUString myThemeName = "addytesttheme";
+    static const OUStringLiteral myThemeName = u"addytesttheme";
     CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
     CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
 
@@ -94,7 +94,7 @@ void GalleryObjTest::TestDeleteTheme()
 
     std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
     CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
-    const OUString myThemeName = "addytesttheme";
+    static const OUStringLiteral myThemeName = u"addytesttheme";
     CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
     CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
 
@@ -130,12 +130,12 @@ void GalleryObjTest::TestSetThemeName()
 
     std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
     CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
-    const OUString myThemeName = "addytesttheme";
+    static const OUStringLiteral myThemeName = u"addytesttheme";
     CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
     CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
 
     // Rename theme
-    const OUString myNewThemeName = "addytestthemenew";
+    static const OUStringLiteral myNewThemeName = u"addytestthemenew";
     pGallery->RenameTheme(myThemeName, myNewThemeName);
     CPPUNIT_ASSERT_MESSAGE("Could not rename theme because old theme name still exists",
                            !pGallery->HasTheme(myThemeName));
@@ -298,7 +298,7 @@ void GalleryObjTest::TestInsertGalleryObject()
 
     std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
     CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
-    const OUString myThemeName = "addytesttheme";
+    static const OUStringLiteral myThemeName = u"addytesttheme";
     CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
     CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
 
@@ -343,7 +343,7 @@ void GalleryObjTest::TestRemoveGalleryObject()
 
     std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
     CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
-    const OUString myThemeName = "addytesttheme";
+    static const OUStringLiteral myThemeName = u"addytesttheme";
     CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
     CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
 
@@ -398,7 +398,7 @@ void GalleryObjTest::TestChangePositionGalleryObject()
 
     std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
     CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
-    const OUString myThemeName = "addytesttheme";
+    static const OUStringLiteral myThemeName = u"addytesttheme";
     CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
     CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
 
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 2c97da419c98..997644b6260a 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -398,7 +398,7 @@ void GraphicHelper::SaveShapeAsGraphic(weld::Window* pParent,  const Reference<
         // populate filter dialog filter list and select default filter to match graphic mime type
 
         GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
-        const OUString aDefaultMimeType("image/png");
+        static const OUStringLiteral aDefaultMimeType(u"image/png");
         OUString aDefaultFormatName;
         sal_uInt16 nCount = rGraphicFilter.GetExportFormatCount();
 
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index c33031a86605..736634c42205 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -554,7 +554,7 @@ void EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomShapeGeometryIt
         nCoordWidthG  = std::abs( aViewBox.Width );
         nCoordHeightG = std::abs( aViewBox.Height);
     }
-    const OUString sPath( "Path" );
+    static const OUStringLiteral sPath( u"Path" );
 
 
     // Path/Coordinates
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index b848fa63672b..a1deb9dcaceb 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -213,7 +213,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                         aOrgRect.TopLeft(), aRectSize,
                         *pVDev );
     // Now comes the text
-    const OUString sValue("Value");
+    static const OUStringLiteral sValue(u"Value");
     if( NumberingPageType::SINGLENUM == ePageType ||
            NumberingPageType::BULLET == ePageType )
     {
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 1e44ece8973d..e937c08a6b33 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -76,8 +76,8 @@ namespace
 
 sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
 {
-    const OUString aModelPrefix("com.sun.star.form.component.");
-    const OUString aCompatibleModelPrefix("stardiv.one.form.component.");
+    static const OUStringLiteral aModelPrefix(u"com.sun.star.form.component.");
+    static const OUStringLiteral aCompatibleModelPrefix(u"stardiv.one.form.component.");
 
     sal_Int32 nTypeId = -1;
     if (aModelName == FM_COMPONENT_EDIT)
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index de1e56303aab..780171aa5cf9 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -449,7 +449,7 @@ namespace svxform
                 case FormComponentType::IMAGEBUTTON:
                 case FormComponentType::IMAGECONTROL:
                 {
-                    const OUString sScaleModeProperty( "ScaleMode" );
+                    static const OUStringLiteral sScaleModeProperty( u"ScaleMode" );
                     if ( xPSI->hasPropertyByName( sScaleModeProperty ) )
                         _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::ISOTROPIC ) );
                 }
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index 6010750bfee9..fda61882a42b 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -184,7 +184,7 @@ void SmartTagMenuController::FillMenu()
 
     if ( 0 < pVCLMenu->GetItemCount() )
     {
-        const OUString aCommand = ".uno:AutoCorrectDlg?OpenSmartTag:bool=true";
+        static const OUStringLiteral aCommand = u".uno:AutoCorrectDlg?OpenSmartTag:bool=true";
         pVCLMenu->InsertSeparator();
         auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(aCommand, m_aModuleName);
         pVCLMenu->InsertItem( nMenuId, vcl::CommandInfoProvider::GetPopupLabelForCommand(aProperties) );
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index fd5b0c3082c5..0db559b15eea 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -442,7 +442,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
 
 bool SdrObjCustomShape::IsTextPath() const
 {
-    const OUString sTextPath( "TextPath" );
+    static const OUStringLiteral sTextPath( u"TextPath" );
     bool bTextPathOn = false;
     const SdrCustomShapeGeometryItem& rGeometryItem = GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
     const Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
@@ -455,7 +455,7 @@ bool SdrObjCustomShape::UseNoFillStyle() const
 {
     bool bRet = false;
     OUString sShapeType;
-    const OUString sType( "Type" );
+    static const OUStringLiteral sType( u"Type" );
     const SdrCustomShapeGeometryItem& rGeometryItem( GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
     const Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
     if ( pAny )
@@ -820,7 +820,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
 {
     PropertyValue aPropVal;
     OUString sShapeType;
-    const OUString sType( "Type" );
+    static const OUStringLiteral sType( u"Type" );
     SdrCustomShapeGeometryItem aGeometryItem( GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
     if ( pType && !pType->isEmpty() )
     {
@@ -852,7 +852,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
 
     // AdjustmentValues
 
-    const OUString sAdjustmentValues( "AdjustmentValues" );
+    static const OUStringLiteral sAdjustmentValues( u"AdjustmentValues" );
     const Any* pAny = aGeometryItem.GetPropertyValueByName( sAdjustmentValues );
     if ( pAny )
         *pAny >>= seqAdjustmentValues;
@@ -888,7 +888,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
 
     // Coordsize
 
-    const OUString sViewBox( "ViewBox" );
+    static const OUStringLiteral sViewBox( u"ViewBox" );
     const Any* pViewBox = aGeometryItem.GetPropertyValueByName( sViewBox );
     css::awt::Rectangle aViewBox;
     if ( !pViewBox || !(*pViewBox >>= aViewBox ) )
@@ -905,12 +905,12 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
         }
     }
 
-    const OUString sPath( "Path" );
+    static const OUStringLiteral sPath( u"Path" );
 
 
     // Path/Coordinates
 
-    const OUString sCoordinates( "Coordinates" );
+    static const OUStringLiteral sCoordinates( u"Coordinates" );
     pAny = aGeometryItem.GetPropertyValueByName( sPath, sCoordinates );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices )
     {
@@ -929,7 +929,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Path/GluePoints
-    const OUString sGluePoints( "GluePoints" );
+    static const OUStringLiteral sGluePoints( u"GluePoints" );
     pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePoints );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints )
     {
@@ -947,7 +947,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Path/Segments
-    const OUString sSegments( "Segments" );
+    static const OUStringLiteral sSegments( u"Segments" );
     pAny = aGeometryItem.GetPropertyValueByName( sPath, sSegments );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements )
     {
@@ -967,7 +967,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Path/StretchX
-    const OUString sStretchX( "StretchX" );
+    static const OUStringLiteral sStretchX( u"StretchX" );
     pAny = aGeometryItem.GetPropertyValueByName( sPath, sStretchX );
     if ( !pAny && pDefCustomShape )
     {
@@ -981,7 +981,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Path/StretchY
-    const OUString sStretchY( "StretchY" );
+    static const OUStringLiteral sStretchY( u"StretchY" );
     pAny = aGeometryItem.GetPropertyValueByName( sPath, sStretchY );
     if ( !pAny && pDefCustomShape )
     {
@@ -995,7 +995,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Path/TextFrames
-    const OUString sTextFrames( "TextFrames" );
+    static const OUStringLiteral sTextFrames( u"TextFrames" );
     pAny = aGeometryItem.GetPropertyValueByName( sPath, sTextFrames );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect )
     {
@@ -1017,7 +1017,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Equations
-    const OUString sEquations(  "Equations"  );
+    static const OUStringLiteral sEquations(  u"Equations"  );
     pAny = aGeometryItem.GetPropertyValueByName( sEquations );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation )
     {
@@ -1034,7 +1034,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
     }
 
     // Handles
-    const OUString sHandles(  "Handles"  );
+    static const OUStringLiteral sHandles(  u"Handles"  );
     pAny = aGeometryItem.GetPropertyValueByName( sHandles );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
     {
@@ -1110,7 +1110,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons
     MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
 
     const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
-    const OUString sPath( "Path" );
+    static const OUStringLiteral sPath( u"Path" );
     switch( eDefaultType )
     {
         case DefaultType::Viewbox :
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 6aa3e7cb66ef..313ec63dfa08 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -284,7 +284,7 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector<
 
     if( nNewCols > 0 )
     {
-        const OUString sWidth("Width");
+        static const OUStringLiteral sWidth(u"Width");
         Reference< XTableColumns > xCols( mxTable->getColumns(), UNO_SET_THROW );
         Reference< XPropertySet > xRefColumn( xCols->getByIndex( nCol ), UNO_QUERY_THROW );
         sal_Int32 nWidth = 0;
@@ -398,7 +398,7 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In
 
     if( nNewRows > 0 )
     {
-        const OUString sHeight("Height");
+        static const OUStringLiteral sHeight(u"Height");
         Reference< XTableRows > xRows( mxTable->getRows(), UNO_SET_THROW );
         Reference< XPropertySet > xRefRow( xRows->getByIndex( nRow ), UNO_QUERY_THROW );
         sal_Int32 nHeight = 0;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 66be795a8817..5d387afc5236 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -323,7 +323,7 @@ void SdrTableObjImpl::CropTableModelToSelection(const CellPos& rStart, const Cel
 
     // copy row heights
     Reference< XTableRows > xNewRows(mxTable->getRows(), css::uno::UNO_SET_THROW );
-    const OUString sHeight( "Height" );
+    static const OUStringLiteral sHeight( u"Height" );
     for( sal_Int32 nRow = 0; nRow < nRows; ++nRow )
     {
         Reference< XPropertySet > xNewSet( xNewRows->getByIndex( nRow ), UNO_QUERY_THROW );
@@ -332,7 +332,7 @@ void SdrTableObjImpl::CropTableModelToSelection(const CellPos& rStart, const Cel
 
     // copy column widths
     Reference< XTableColumns > xNewColumns( mxTable->getColumns(), css::uno::UNO_SET_THROW );
-    const OUString sWidth( "Width" );
+    static const OUStringLiteral sWidth( u"Width" );
     for( sal_Int32 nCol = 0; nCol < nColumns; ++nCol )
     {
         Reference< XPropertySet > xNewSet( xNewColumns->getByIndex( nCol ), UNO_QUERY_THROW );
@@ -591,7 +591,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset
 
     try
     {
-        const OUString sSize( "Size" );
+        static const OUStringLiteral sSize( u"Size" );
         if( mbHorizontal )
         {
             if (nEdge <= getRowCount())
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 429b2e58da43..453259c35068 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -562,7 +562,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
 
     RemoveSelection();
 
-    const OUString sSize( "Size" );
+    static const OUStringLiteral sSize( u"Size" );
     const bool bUndo(rModel.IsUndoEnabled());
 
     switch( nSId )
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index ed944fb3c1e1..0c517707f4f8 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -582,7 +582,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
     MergeVector aMergedCells( nColCount );
     std::vector<sal_Int32> aOptimalColumns;
 
-    const OUString sOptimalSize("OptimalSize");
+    static const OUStringLiteral sOptimalSize(u"OptimalSize");
 
     if( sal::static_int_cast< sal_Int32 >( maColumns.size() ) != nColCount )
         maColumns.resize( nColCount );
@@ -734,7 +734,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
     MergeVector aMergedCells( nRowCount );
     std::vector<sal_Int32> aOptimalRows;
 
-    const OUString sOptimalSize("OptimalSize");
+    static const OUStringLiteral sOptimalSize(u"OptimalSize");
 
     // first calculate current height and initial minimum size per column,
     // merged cells will be counted later
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 2ede658f6a40..9104a0a2d378 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -986,7 +986,7 @@ void TableModel::optimize()
             {
                 try
                 {
-                    const OUString sWidth("Width");
+                    static const OUStringLiteral sWidth(u"Width");
                     sal_Int32 nWidth1 = 0, nWidth2 = 0;
                     Reference< XPropertySet > xSet1( static_cast< XCellRange* >( maColumns[nCol].get() ), UNO_QUERY_THROW );
                     Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maColumns[nCol-1].get() ), UNO_QUERY_THROW );
@@ -1023,7 +1023,7 @@ void TableModel::optimize()
             {
                 try
                 {
-                    const OUString sHeight("Height");
+                    static const OUStringLiteral sHeight(u"Height");
                     sal_Int32 nHeight1 = 0, nHeight2 = 0;
                     Reference< XPropertySet > xSet1( static_cast< XCellRange* >( maRows[nRow].get() ), UNO_QUERY_THROW );
                     Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maRows[nRow-1].get() ), UNO_QUERY_THROW );
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 74e127b03f91..7b8bf0c3d65b 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -281,7 +281,7 @@ void SdrTableRTFParser::FillTable()
             nColCount = mxTable->getColumnCount();
         }
 
-        const OUString sWidth("Width");
+        static const OUStringLiteral sWidth(u"Width");
         sal_Int32 nCol, nLastEdge = 0;
         for( nCol = 0; nCol < nColCount; nCol++ )
         {
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5d57508a9bc1..fbac6172a92e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3752,7 +3752,7 @@ void SvxCurrencyToolBoxControl::GetCurrencySymbols( std::vector<OUString>& rList
     CollatorWrapper aCollator( ::comphelper::getProcessComponentContext() );
     aCollator.loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0 );
 
-    const OUString aTwoSpace("  ");
+    static const OUStringLiteral aTwoSpace(u"  ");
 
     for( sal_uInt16 i = 1; i < nCount; ++i )
     {
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 1b2606ed393a..3e38304727c7 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -288,7 +288,7 @@ IMPL_LINK(FindTextFieldControl, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
             aValue >>= xLayoutManager;
             if (xLayoutManager.is())
             {
-                const OUString sResourceURL( "private:resource/toolbar/findbar" );
+                static const OUStringLiteral sResourceURL( u"private:resource/toolbar/findbar" );
                 xLayoutManager->hideElement( sResourceURL );
                 xLayoutManager->destroyElement( sResourceURL );
             }
@@ -1268,7 +1268,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
         aValue >>= xLayoutManager;
         if (xLayoutManager.is())
         {
-            const OUString sResourceURL( "private:resource/toolbar/findbar" );
+            static const OUStringLiteral sResourceURL( u"private:resource/toolbar/findbar" );
             xLayoutManager->hideElement( sResourceURL );
             xLayoutManager->destroyElement( sResourceURL );
         }
@@ -1538,7 +1538,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
     if (!xLayoutManager.is())
         return;
 
-    const OUString sResourceURL( "private:resource/toolbar/findbar" );
+    static const OUStringLiteral sResourceURL( u"private:resource/toolbar/findbar" );
     css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
     if (!xUIElement.is())
     {
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 3399b20d79ea..8f7029204006 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -302,19 +302,19 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
 
 static void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString& rCustomShape )
 {
-    const OUString sType( "Type" );
+    static const OUStringLiteral sType( u"Type" );
 
     css::beans::PropertyValue aPropVal;
     aPropVal.Name = sType;
     aPropVal.Value <<= rCustomShape;
     rGeometryItem.SetPropertyValue( aPropVal );
 
-    const OUString sAdjustmentValues( "AdjustmentValues" );
-    const OUString sCoordinateOrigin( "CoordinateOrigin" );
-    const OUString sCoordinateSize( "CoordinateSize" );
-    const OUString sEquations( "Equations" );
-    const OUString sHandles( "Handles" );
-    const OUString sPath( "Path" );
+    static const OUStringLiteral sAdjustmentValues( u"AdjustmentValues" );
+    static const OUStringLiteral sCoordinateOrigin( u"CoordinateOrigin" );
+    static const OUStringLiteral sCoordinateSize( u"CoordinateSize" );
+    static const OUStringLiteral sEquations( u"Equations" );
+    static const OUStringLiteral sHandles( u"Handles" );
+    static const OUStringLiteral sPath( u"Path" );
     rGeometryItem.ClearPropertyValue( sAdjustmentValues );
     rGeometryItem.ClearPropertyValue( sCoordinateOrigin );
     rGeometryItem.ClearPropertyValue( sCoordinateSize );
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 9de42e8a693b..dcdc1b0983a1 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -381,7 +381,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
 
     uno::Reference< uno::XInterface > xRet;
 
-    const OUString aPackagePrefix( "com.sun.star.presentation." );
+    static const OUStringLiteral aPackagePrefix( u"com.sun.star.presentation." );
     if( aServiceSpecifier.startsWith( aPackagePrefix ) )
     {
         SvxShape* pShape = nullptr;