[Libreoffice-commits] core.git: basic/source chart2/source comphelper/source connectivity/qa connectivity/source cpputools/source cui/source dbaccess/qa dbaccess/source desktop/source drawinglayer/source editeng/source embeddedobj/source extensions/source filter/source forms/source fpicker/source framework/source i18npool/source linguistic/source oox/source package/source reportdesign/source sal/qa sc/qa sc/source sdext/source sd/qa sd/source sfx2/source starmath/source svl/source svtools/source svx/qa svx/source sw/qa sw/source test/source ucb/source unodevtools/source vcl/source vcl/unx vcl/win writerfilter/source xmloff/source xmlsecurity/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Thu Mar 25 09:07:28 UTC 2021


 basic/source/classes/sb.cxx                                              |    2 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx              |    2 
 chart2/source/controller/dialogs/tp_DataSource.cxx                       |    4 -
 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx |    4 -
 chart2/source/controller/main/DrawCommandDispatch.cxx                    |    5 -
 chart2/source/model/template/PieChartTypeTemplate.cxx                    |    2 
 chart2/source/tools/InternalDataProvider.cxx                             |    2 
 chart2/source/tools/RegressionCurveHelper.cxx                            |    2 
 chart2/source/tools/StatisticsHelper.cxx                                 |    2 
 chart2/source/tools/UncachedDataSequence.cxx                             |    2 
 chart2/source/view/axes/VCartesianAxis.cxx                               |    2 
 chart2/source/view/main/VLegend.cxx                                      |    2 
 comphelper/source/misc/backupfilehelper.cxx                              |    6 -
 connectivity/qa/connectivity/ado/DriverTest.cxx                          |    6 -
 connectivity/source/commontools/DateConversion.cxx                       |    2 
 connectivity/source/commontools/dbtools.cxx                              |    2 
 connectivity/source/commontools/formattedcolumnvalue.cxx                 |    2 
 connectivity/source/commontools/statementcomposer.cxx                    |    4 -
 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx                 |    2 
 connectivity/source/drivers/hsqldb/HDriver.cxx                           |    2 
 cpputools/source/unoexe/unoexe.cxx                                       |    2 
 cui/source/dialogs/hlmarkwn.cxx                                          |    6 -
 cui/source/tabpages/chardlg.cxx                                          |    2 
 dbaccess/qa/extras/dialog-save.cxx                                       |    2 
 dbaccess/qa/extras/empty-stdlib-save.cxx                                 |    2 
 dbaccess/qa/extras/nolib-save.cxx                                        |    2 
 dbaccess/source/core/api/FilteredContainer.cxx                           |    6 -
 dbaccess/source/core/recovery/subcomponentrecovery.cxx                   |    2 
 dbaccess/source/filter/xml/xmlExport.cxx                                 |    2 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx                                   |    2 
 dbaccess/source/ui/dlg/queryorder.cxx                                    |    4 -
 desktop/source/app/crashreport.cxx                                       |    4 -
 desktop/source/deployment/registry/help/dp_help.cxx                      |    2 
 desktop/source/deployment/registry/package/dp_package.cxx                |    6 -
 desktop/source/lib/init.cxx                                              |    2 
 desktop/source/migration/migration.cxx                                   |   18 ++--
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx               |    2 
 editeng/source/misc/unolingu.cxx                                         |    2 
 editeng/source/xml/xmltxtexp.cxx                                         |    2 
 editeng/source/xml/xmltxtimp.cxx                                         |    2 
 embeddedobj/source/commonembedding/persistence.cxx                       |    2 
 extensions/source/abpilot/fieldmappingimpl.cxx                           |    4 -
 filter/source/msfilter/escherex.cxx                                      |   18 ++--
 filter/source/msfilter/msdffimp.cxx                                      |   12 +--
 filter/source/pdf/pdfexport.cxx                                          |    4 -
 filter/source/svg/svgwriter.cxx                                          |    8 +-
 filter/source/xsltdialog/typedetectionexport.cxx                         |   40 +++++-----
 forms/source/component/Columns.cxx                                       |    4 -
 fpicker/source/office/iodlg.cxx                                          |    2 
 fpicker/source/win32/shared.hxx                                          |    6 -
 fpicker/source/win32/workbench/Test_fps.cxx                              |    2 
 framework/source/accelerators/acceleratorconfiguration.cxx               |    2 
 framework/source/fwe/classes/addonsoptions.cxx                           |    8 +-
 framework/source/uielement/fontmenucontroller.cxx                        |    2 
 framework/source/uielement/fontsizemenucontroller.cxx                    |    2 
 framework/source/uielement/headermenucontroller.cxx                      |    4 -
 framework/source/uielement/langselectionmenucontroller.cxx               |    2 
 framework/source/uielement/langselectionstatusbarcontroller.cxx          |    2 
 framework/source/uielement/macrosmenucontroller.cxx                      |    6 -
 framework/source/uielement/objectmenucontroller.cxx                      |    2 
 framework/source/uielement/recentfilesmenucontroller.cxx                 |    2 
 framework/source/uifactory/uicontrollerfactory.cxx                       |    2 
 i18npool/source/collator/chaptercollator.cxx                             |    2 
 linguistic/source/lngsvcmgr.cxx                                          |    8 +-
 oox/source/core/filterbase.cxx                                           |    6 -
 oox/source/drawingml/customshapeproperties.cxx                           |    6 -
 oox/source/drawingml/hyperlinkcontext.cxx                                |    4 -
 oox/source/drawingml/shape.cxx                                           |    8 +-
 oox/source/export/shapes.cxx                                             |    2 
 oox/source/helper/propertymap.cxx                                        |    2 
 oox/source/ole/vbacontrol.cxx                                            |    2 
 oox/source/ole/vbaexport.cxx                                             |    2 
 oox/source/ppt/pptshape.cxx                                              |    2 
 oox/source/ppt/presentationfragmenthandler.cxx                           |    8 +-
 oox/source/ppt/slidepersist.cxx                                          |    8 +-
 oox/source/vml/vmlshape.cxx                                              |    2 
 package/source/manifest/ManifestExport.cxx                               |   36 ++++-----
 package/source/zippackage/ZipPackage.cxx                                 |   38 ++++-----
 package/source/zippackage/ZipPackageStream.cxx                           |   10 +-
 reportdesign/source/core/misc/conditionalexpression.cxx                  |    6 -
 reportdesign/source/core/sdr/formatnormalizer.cxx                        |    2 
 reportdesign/source/ui/inspection/DataProviderHandler.cxx                |    4 -
 reportdesign/source/ui/inspection/GeometryHandler.cxx                    |    6 -
 reportdesign/source/ui/inspection/ReportComponentHandler.cxx             |    4 -
 reportdesign/source/ui/report/ReportController.cxx                       |    7 -
 sal/qa/rtl/process/rtl_Process.cxx                                       |    8 +-
 sc/qa/extras/macros-test.cxx                                             |   12 +--
 sc/qa/unit/screenshots/screenshots.cxx                                   |    2 
 sc/qa/unit/subsequent_filters-test.cxx                                   |    2 
 sc/source/filter/excel/xechart.cxx                                       |    4 -
 sc/source/filter/excel/xicontent.cxx                                     |    2 
 sc/source/filter/oox/querytablebuffer.cxx                                |    2 
 sc/source/filter/xcl97/xcl97esc.cxx                                      |    2 
 sc/source/filter/xml/XMLStylesExportHelper.cxx                           |    2 
 sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx             |    2 
 sc/source/ui/dbgui/validate.cxx                                          |    2 
 sc/source/ui/docshell/datastream.cxx                                     |    2 
 sc/source/ui/docshell/docsh4.cxx                                         |    8 +-
 sc/source/ui/vba/vbasheetobject.cxx                                      |    5 -
 sd/qa/unit/SVGExportTests.cxx                                            |    2 
 sd/qa/unit/export-tests-ooxml2.cxx                                       |    9 --
 sd/qa/unit/misc-tests.cxx                                                |    2 
 sd/source/core/CustomAnimationEffect.cxx                                 |    2 
 sd/source/filter/eppt/pptx-epptooxml.cxx                                 |    2 
 sd/source/filter/grf/sdgrffilter.cxx                                     |    2 
 sd/source/filter/xml/sdxmlwrp.cxx                                        |    4 -
 sd/source/ui/animations/CustomAnimationDialog.cxx                        |    2 
 sd/source/ui/animations/CustomAnimationList.cxx                          |    4 -
 sd/source/ui/animations/CustomAnimationPane.cxx                          |    4 -
 sd/source/ui/docshell/docshel3.cxx                                       |    8 +-
 sd/source/ui/docshell/docshel4.cxx                                       |    4 -
 sd/source/ui/framework/configuration/ConfigurationTracer.cxx             |    2 
 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx                         |    8 +-
 sd/source/ui/unoidl/unomodel.cxx                                         |    4 -
 sd/source/ui/unoidl/unopage.cxx                                          |    2 
 sd/source/ui/view/DocumentRenderer.cxx                                   |    2 
 sd/source/ui/view/drviewsf.cxx                                           |    8 +-
 sdext/source/minimizer/informationdialog.cxx                             |    6 -
 sdext/source/presenter/PresenterController.cxx                           |    6 -
 sdext/source/presenter/PresenterSlideSorter.cxx                          |    2 
 sfx2/source/appl/sfxhelp.cxx                                             |    2 
 sfx2/source/dialog/dinfdlg.cxx                                           |    2 
 sfx2/source/dialog/mailmodel.cxx                                         |    2 
 sfx2/source/doc/docmacromode.cxx                                         |    4 -
 sfx2/source/doc/doctemplates.cxx                                         |    6 -
 sfx2/source/doc/doctemplateslocal.cxx                                    |    4 -
 sfx2/source/doc/guisaveas.cxx                                            |   14 +--
 sfx2/source/doc/objstor.cxx                                              |   30 +++----
 sfx2/source/doc/sfxbasemodel.cxx                                         |   10 +-
 sfx2/source/view/viewfrm.cxx                                             |    4 -
 starmath/source/edit.cxx                                                 |    2 
 starmath/source/mathml/mathmlimport.cxx                                  |    6 -
 svl/source/numbers/zformat.cxx                                           |    4 -
 svtools/source/config/extcolorcfg.cxx                                    |   10 +-
 svtools/source/dialogs/colrdlg.cxx                                       |    2 
 svtools/source/filter/exportdialog.cxx                                   |    4 -
 svx/qa/unit/gallery/test_gallery.cxx                                     |   14 +--
 svx/source/core/graphichelper.cxx                                        |    2 
 svx/source/customshapes/EnhancedCustomShape2d.cxx                        |    2 
 svx/source/dialog/svxbmpnumvalueset.cxx                                  |    2 
 svx/source/fmcomp/gridcols.cxx                                           |    4 -
 svx/source/form/formcontrolfactory.cxx                                   |    2 
 svx/source/mnuctrls/smarttagmenu.cxx                                     |    2 
 svx/source/svdraw/svdoashp.cxx                                           |   30 +++----
 svx/source/table/cellcursor.cxx                                          |    4 -
 svx/source/table/svdotable.cxx                                           |    6 -
 svx/source/table/tablecontroller.cxx                                     |    2 
 svx/source/table/tablelayouter.cxx                                       |    4 -
 svx/source/table/tablemodel.cxx                                          |    4 -
 svx/source/table/tablertfimporter.cxx                                    |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                         |    2 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                           |    6 -
 svx/source/toolbars/fontworkbar.cxx                                      |   14 +--
 svx/source/unodraw/unomod.cxx                                            |    2 
 sw/qa/core/uwriter.cxx                                                   |    2 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx                                |    4 -
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx                                 |    2 
 sw/qa/extras/unowriter/unowriter.cxx                                     |   12 +--
 sw/source/core/doc/DocumentContentOperationsManager.cxx                  |    2 
 sw/source/core/doc/docfld.cxx                                            |    4 -
 sw/source/core/doc/doclay.cxx                                            |    2 
 sw/source/core/edit/edfcol.cxx                                           |    2 
 sw/source/core/unocore/unodraw.cxx                                       |    8 +-
 sw/source/core/view/printdata.cxx                                        |    4 -
 sw/source/filter/html/swhtml.cxx                                         |    4 -
 sw/source/filter/html/wrthtml.cxx                                        |    2 
 sw/source/filter/ww8/ww8par5.cxx                                         |    2 
 sw/source/filter/ww8/ww8toolbar.cxx                                      |    2 
 sw/source/filter/xml/swxml.cxx                                           |   12 +--
 sw/source/filter/xml/xmlexp.cxx                                          |    4 -
 sw/source/filter/xml/xmlimp.cxx                                          |   10 +-
 sw/source/ui/envelp/mailmrge.cxx                                         |    2 
 sw/source/ui/misc/glosbib.cxx                                            |    2 
 sw/source/ui/misc/glossary.cxx                                           |    2 
 sw/source/ui/vba/vbaparagraphformat.cxx                                  |    2 
 sw/source/uibase/app/docstyle.cxx                                        |    2 
 sw/source/uibase/shells/langhelper.cxx                                   |    6 -
 sw/source/uibase/shells/textsh1.cxx                                      |   14 +--
 sw/source/uibase/uno/unomailmerge.cxx                                    |    2 
 test/source/sheet/cellarealink.cxx                                       |   10 +-
 test/source/sheet/databaserange.cxx                                      |   22 ++---
 test/source/sheet/datapilotitem.cxx                                      |    4 -
 test/source/sheet/xarrayformularange.cxx                                 |    2 
 test/source/sheet/xspreadsheets2.cxx                                     |    2 
 test/source/text/textsettings.cxx                                        |    6 -
 ucb/source/core/ucbcmds.cxx                                              |    2 
 ucb/source/core/ucbstore.cxx                                             |   12 +--
 ucb/source/ucp/ext/ucpext_provider.cxx                                   |    2 
 ucb/source/ucp/file/bc.cxx                                               |    2 
 unodevtools/source/unodevtools/options.cxx                               |    2 
 vcl/source/filter/FilterConfigItem.cxx                                   |    5 -
 vcl/source/image/ImplImageTree.cxx                                       |    2 
 vcl/source/treelist/transfer.cxx                                         |   22 ++---
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx                           |    2 
 vcl/win/dtrans/MimeAttrib.hxx                                            |   10 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                        |    2 
 xmloff/source/chart/SchXMLSeries2Context.cxx                             |    2 
 xmloff/source/chart/SchXMLTableContext.cxx                               |    2 
 xmloff/source/chart/SchXMLTools.cxx                                      |    8 +-
 xmloff/source/core/SettingsExportHelper.cxx                              |   30 +++----
 xmloff/source/core/xmlexp.cxx                                            |    8 +-
 xmloff/source/draw/XMLGraphicsDefaultStyle.cxx                           |    2 
 xmloff/source/draw/layerexp.cxx                                          |   12 +--
 xmloff/source/draw/sdxmlexp.cxx                                          |    8 +-
 xmloff/source/draw/shapeexport.cxx                                       |   16 ++--
 xmloff/source/draw/xexptran.cxx                                          |   24 +++---
 xmloff/source/draw/ximppage.cxx                                          |    8 +-
 xmloff/source/draw/ximpshap.cxx                                          |   16 ++--
 xmloff/source/meta/xmlmetai.cxx                                          |    6 -
 xmloff/source/style/XMLPageExport.cxx                                    |    2 
 xmloff/source/style/xmlnume.cxx                                          |    2 
 xmloff/source/table/XMLTableExport.cxx                                   |    2 
 xmloff/source/text/XMLSectionExport.cxx                                  |    2 
 xmloff/source/text/XMLTextFrameContext.cxx                               |    4 -
 xmloff/source/text/XMLTextHeaderFooterContext.cxx                        |    2 
 xmloff/source/text/txtimp.cxx                                            |   12 +--
 xmloff/source/text/txtparae.cxx                                          |    4 -
 xmlsecurity/source/helper/documentsignaturemanager.cxx                   |    6 -
 218 files changed, 590 insertions(+), 597 deletions(-)

New commits:
commit a0656ec6fc2b41e65f1b40dbd64f546175e2762f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Mar 25 09:53:33 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Mar 25 10:06:26 2021 +0100

    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 at collabora.com>

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 790cbb993c89..10d7f4281271 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1877,7 +1877,7 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
     // look for the ThisComponent variable, first in the parent (which
     // might be the document's Basic), then in the parent's parent (which might be
     // the application Basic)
-    const OUString sThisComponent( "ThisComponent");
+    static const OUStringLiteral sThisComponent( u"ThisComponent");
     SbxVariable* pThisComponent = nullptr;
 
     SbxObject* pLookup = pBasic->GetParent();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index aa12dbc27eea..8b068a9a57c7 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -468,7 +468,7 @@ sal_Int32 lcl_getNewAPIIndexForOldAPIIndex(
 
 OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
 {
-    const OUString aPrefix("com.sun.star.chart2.template.");
+    static const OUStringLiteral aPrefix(u"com.sun.star.chart2.template.");
 
     if( rTemplateServiceName.match( aPrefix ))
     {
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 90eb974ca0d5..8586bd7260c7 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -355,7 +355,7 @@ void DataSourceTabPage::fillSeriesListBox()
                 OUString aResString(::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ));
 
                 // replace index of unnamed series
-                const OUString aReplacementStr( "%NUMBER" );
+                static const OUStringLiteral aReplacementStr( u"%NUMBER" );
                 sal_Int32 nIndex = aResString.indexOf( aReplacementStr );
                 if( nIndex != -1 )
                     aLabel = aResString.replaceAt(
@@ -485,7 +485,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, weld::TreeView&, voi
     OUString aSelectedRange = lcl_GetSelectedRolesRange( *m_xLB_ROLE );
 
     // replace role in fixed text label
-    const OUString aReplacementStr( "%VALUETYPE" );
+    static const OUStringLiteral aReplacementStr( u"%VALUETYPE" );
     sal_Int32 nIndex = m_aFixedTextRange.indexOf( aReplacementStr );
     if( nIndex != -1 )
     {
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 55e954e946d9..f553ff16bc34 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -426,7 +426,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
         case XATTR_FILLBMP_STRETCH:
             if( lcl_supportsFillProperties( m_GraphicObjectType ))
             {
-                const OUString aModePropName("FillBitmapMode");
+                static const OUStringLiteral aModePropName(u"FillBitmapMode");
                 bool bStretched = rItemSet.Get( XATTR_FILLBMP_STRETCH ).GetValue();
                 drawing::BitmapMode aMode =
                     (bStretched ? drawing::BitmapMode_STRETCH : drawing::BitmapMode_NO_REPEAT);
@@ -448,7 +448,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
         case XATTR_FILLBMP_TILE:
             if( lcl_supportsFillProperties( m_GraphicObjectType ))
             {
-                const OUString aModePropName("FillBitmapMode");
+                static const OUStringLiteral aModePropName(u"FillBitmapMode");
                 bool bTiled = rItemSet.Get( XATTR_FILLBMP_TILE ).GetValue();
                 drawing::BitmapMode aMode =
                     (bTiled ? drawing::BitmapMode_REPEAT : drawing::BitmapMode_NO_REPEAT);
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index ef0bdfd5af5b..f2011022595f 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -350,12 +350,11 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea
         pDrawViewWrapper->SetCreateMode();
     }
 
-    const OUString sKeyModifier( "KeyModifier" );
     const beans::PropertyValue* pIter = rArgs.getConstArray();
     const beans::PropertyValue* pEnd  = pIter + rArgs.getLength();
     const beans::PropertyValue* pKeyModifier = std::find_if(pIter, pEnd,
-                                                    [&sKeyModifier](const beans::PropertyValue& lhs)
-                                                    {return lhs.Name == sKeyModifier;} );
+                                                    [](const beans::PropertyValue& lhs)
+                                                    {return lhs.Name == "KeyModifier";} );
     sal_Int16 nKeyModifier = 0;
     if ( !(pKeyModifier != pEnd && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1) )
         return;
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index bf71bfc48fc1..0848f0e98239 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -478,7 +478,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
 
         if( nSeriesIndex == nOuterSeriesIndex ) //@todo in future this will depend on Orientation of the radius axis scale
         {
-            const OUString aOffsetPropName( "Offset" );
+            static const OUStringLiteral aOffsetPropName( u"Offset" );
             // get offset mode
             chart2::PieChartOffsetMode ePieOffsetMode;
             getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode;
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index edbef2f39401..1b2f6ae28351 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1227,7 +1227,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
         return "";
     }
 
-    const OUString aPivotTableID("PT@");
+    static const OUStringLiteral aPivotTableID(u"PT@");
     if (aXMLRange.startsWith(aPivotTableID))
         return aXMLRange.copy(aPivotTableID.getLength());
 
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 66f56725133b..61f155011664 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -712,7 +712,7 @@ void RegressionCurveHelper::resetEquationPosition(
 
     try
     {
-        const OUString aPosPropertyName( "RelativePosition" );
+        static const OUStringLiteral aPosPropertyName( u"RelativePosition" );
         Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); // since m233: , uno::UNO_SET_THROW );
         if( xEqProp->getPropertyValue( aPosPropertyName ).hasValue())
             xEqProp->setPropertyValue( aPosPropertyName, uno::Any());
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 02dab3b9bd89..ef9c141208a1 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -146,7 +146,7 @@ void lcl_setXMLRangePropertyAtDataSequence(
 {
     try
     {
-        const OUString aXMLRangePropName( "CachedXMLRange");
+        static const OUStringLiteral aXMLRangePropName( u"CachedXMLRange");
         Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW );
         Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo());
         if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName ))
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 40412ffa16ae..1eae8def8f4e 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -214,7 +214,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
     // auto-generated label
     sal_Int32 nSeries = m_aSourceRepresentation.toInt32() + 1;
     OUString aResString(::chart::SchResId(STR_DATA_UNNAMED_SERIES_WITH_INDEX));
-    const OUString aReplacementStr("%NUMBER");
+    static const OUStringLiteral aReplacementStr(u"%NUMBER");
     sal_Int32 nIndex = aResString.indexOf(aReplacementStr);
     OUString aName;
     if( nIndex != -1 )
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index cb57a6a62207..ebd045a24845 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -97,7 +97,7 @@ static void lcl_ResizeTextShapeToFitAvailableSpace( Reference< drawing::XShape >
     if( !nAvgCharWidth )
         return;
 
-    const OUString sDots = "...";
+    static const OUStringLiteral sDots = u"...";
     const sal_Int32 nCharsToRemove = ( nTextSize - nMaxLabelsSize ) / nAvgCharWidth + 1;
     sal_Int32 nNewLen = rLabel.getLength() - nCharsToRemove - sDots.getLength();
     // Prevent from showing only dots
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index e05aa94db702..0e3ea7de79e9 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -419,7 +419,7 @@ awt::Size lcl_placeLegendEntries(
                     try
                     {
                         OUString aLabelString = rEntries[0].aLabel[0]->getString();
-                        const OUString sDots = "...";
+                        static const OUStringLiteral sDots = u"...";
                         ShapeFactory* pShapeFactory = ShapeFactory::getOrCreateShapeFactory(xShapeFactory);
                         for (sal_Int32 nNewLen = aLabelString.getLength() - sDots.getLength(); nNewLen > 0; nNewLen--)
                         {
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index c7bcd4253ed0..5cdf2bf6dc7f 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -666,8 +666,8 @@ namespace
             const ExtensionInfoEntryVector& rToBeEnabled,
             const ExtensionInfoEntryVector& rToBeDisabled)
         {
-            const OUString aRegPathFront("/uno_packages/cache/registry/com.sun.star.comp.deployment.");
-            const OUString aRegPathBack(".PackageRegistryBackend/backenddb.xml");
+            static const OUStringLiteral aRegPathFront(u"/uno_packages/cache/registry/com.sun.star.comp.deployment.");
+            static const OUStringLiteral aRegPathBack(u".PackageRegistryBackend/backenddb.xml");
             // first appearance to check
             {
                 const OUString aUnoPackagReg(OUString::Concat(rUserConfigWorkURL) + aRegPathFront + "bundle" + aRegPathBack);
@@ -1482,7 +1482,7 @@ namespace comphelper
             // points to registrymodifications.xcu
             OUString conf("${CONFIGURATION_LAYERS}");
             rtl::Bootstrap::expandMacros(conf);
-            const OUString aTokenUser("user:");
+            static const OUStringLiteral aTokenUser(u"user:");
             sal_Int32 nStart(conf.indexOf(aTokenUser));
 
             if (-1 != nStart)
diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx
index 1be8c04c7fb5..abe4da67b012 100644
--- a/connectivity/qa/connectivity/ado/DriverTest.cxx
+++ b/connectivity/qa/connectivity/ado/DriverTest.cxx
@@ -93,8 +93,8 @@ void AdoDriverTest::test_metadata()
     }
 
     const Any catalog;
-    const OUString schemaPattern = "%";
-    const OUString tableNamePattern = "%";
+    static const OUStringLiteral schemaPattern = u"%";
+    static const OUStringLiteral tableNamePattern = u"%";
     const Sequence< OUString > types;
 
     Reference< XResultSet > xResultSet =
@@ -107,7 +107,7 @@ void AdoDriverTest::test_metadata()
 
 void AdoDriverTest::test_select_default_all()
 {
-    const OUString sql = "select \"FirstName\" from \"Students\" ORDER BY \"FirstName\"";
+    static const OUStringLiteral sql = u"select \"FirstName\" from \"Students\" ORDER BY \"FirstName\"";
     Reference< XPreparedStatement > xStatement = m_xConnection->prepareStatement(sql);
     if (!xStatement.is())
     {
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 09b80f62653c..81338b3dc9fa 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -84,7 +84,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal,
                         OUString aTemp;
                         _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
                         sal_Int32 nIndex = sal_Int32(-2);
-                        const OUString sQuot("\'");
+                        static const OUStringLiteral sQuot(u"\'");
                         do
                         {
                             nIndex += 2;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index fef22a3b2196..e5e5dcdabbb3 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -394,7 +394,7 @@ static SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet,
 
         // build a connection with its current settings (4. data source name, or 5. URL)
 
-        const OUString sUserProp( "User" );
+        static const OUStringLiteral sUserProp( u"User" );
         OUString sDataSourceName;
         xRowSetProps->getPropertyValue("DataSourceName") >>= sDataSourceName;
         OUString sURL;
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index de317c43b4ab..fea5b4906e4e 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -150,7 +150,7 @@ namespace dbtools
                 // get the format key of our bound field
                 Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_SET_THROW );
                 bool bHaveFieldFormat = false;
-                const OUString sFormatKeyProperty( "FormatKey" );
+                static const OUStringLiteral sFormatKeyProperty( u"FormatKey" );
                 if ( xPSI->hasPropertyByName( sFormatKeyProperty ) )
                 {
                     bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey );
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 01f20e9c1e3c..b0aaaa460f64 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -169,7 +169,7 @@ namespace dbtools
                         xComposer->setElementaryQuery( sStatement );
 
                         // the sort order
-                        const OUString sPropOrder( "Order" );
+                        static const OUStringLiteral sPropOrder( u"Order" );
                         if ( ::comphelper::hasProperty( sPropOrder, xQuery ) )
                         {
                             OUString sOrder;
@@ -179,7 +179,7 @@ namespace dbtools
 
                         // the filter
                         bool bApplyFilter = true;
-                        const OUString sPropApply( "ApplyFilter" );
+                        static const OUStringLiteral sPropApply( u"ApplyFilter" );
                         if ( ::comphelper::hasProperty( sPropApply, xQuery ) )
                         {
                             OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter );
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 631e9b254bc8..d677c4fe9ae7 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -1081,7 +1081,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     // check if any type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    const OUString aTable("TABLE");
+    static const OUStringLiteral aTable(u"TABLE");
 
     bool bTableFound = true;
     sal_Int32 nLength = types.getLength();
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index b34256d2d34b..8ac7db04a367 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -242,7 +242,7 @@ namespace connectivity
                 OUString sMessage;
                 try
                 {
-                    const OUString sProperties(  "properties"  );
+                    static const OUStringLiteral sProperties(  u"properties"  );
                     if ( !bIsNewDatabase && xStorage->isStreamElement(sProperties) )
                     {
                         Reference<XStream > xStream = xStorage->openStreamElement(sProperties,ElementModes::READ);
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index b5be9ff175ff..add2d0e4a192 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -91,7 +91,7 @@ const char arUsingText[] =
 static bool readOption( OUString * pValue, const char * pOpt,
                         sal_uInt32 * pnIndex, const OUString & aArg)
 {
-    const OUString dash("-");
+    static const OUStringLiteral dash(u"-");
     if(!aArg.startsWith(dash))
         return false;
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index cdc1039cab18..1f6a85494e82 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -291,9 +291,9 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess >
     const sal_Int32 nLinks = aNames.getLength();
     const OUString* pNames = aNames.getConstArray();
 
-    const OUString aProp_LinkDisplayName( "LinkDisplayName" );
-    const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" );
-    const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" );
+    static const OUStringLiteral aProp_LinkDisplayName( u"LinkDisplayName" );
+    static const OUStringLiteral aProp_LinkTarget( u"com.sun.star.document.LinkTarget" );
+    static const OUStringLiteral aProp_LinkDisplayBitmap( u"LinkDisplayBitmap" );
     for( sal_Int32 i = 0; i < nLinks; i++ )
     {
         uno::Any aAny;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 836739d44f86..8c9c9825373d 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2993,7 +2993,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet )
 
 void SvxCharPositionPage::FillUserData()
 {
-    const OUString cTok( ";" );
+    static const OUStringLiteral cTok( u";" );
 
     OUString sUser = OUString::number( m_nSuperEsc )  + cTok +
                      OUString::number( m_nSubEsc )    + cTok +
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index fc34768bd10f..1eb4720cbcd1 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -66,7 +66,7 @@ void DialogSaveTest::test()
         uno::Reference< script::XStorageBasedLibraryContainer > xStorDlgLib(xDocScr->getDialogLibraries());
         CPPUNIT_ASSERT(xStorDlgLib.is());
         uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, UNO_QUERY_THROW);
-        const OUString sStandard("Standard");
+        static const OUStringLiteral sStandard(u"Standard");
         xBasLib->loadLibrary(sStandard);
         CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
         // the whole point of this test is to test the "save" operation
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 978045a2e2e1..9339d3c4307e 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -64,7 +64,7 @@ void DialogSaveTest::test()
         uno::Reference< script::XStorageBasedLibraryContainer > xStorDlgLib(xDocScr->getDialogLibraries());
         CPPUNIT_ASSERT(xStorDlgLib.is());
         uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, UNO_QUERY_THROW);
-        const OUString sStandard("Standard");
+        static const OUStringLiteral sStandard(u"Standard");
         xBasLib->loadLibrary(sStandard);
         xDlgLib->loadLibrary(sStandard);
         CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index 4443bfd4e2b7..f441b608b31e 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -64,7 +64,7 @@ void DialogSaveTest::test()
         uno::Reference< script::XStorageBasedLibraryContainer > xStorDlgLib(xDocScr->getDialogLibraries());
         CPPUNIT_ASSERT(xStorDlgLib.is());
         uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, UNO_QUERY_THROW);
-        const OUString sStandard("Standard");
+        static const OUStringLiteral sStandard(u"Standard");
         xBasLib->loadLibrary(sStandard);
         xDlgLib->loadLibrary(sStandard);
         CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 1b08eb8fa7ca..3c923a706b8b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -432,9 +432,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::
             OSL_VERIFY( aFilterModeSetting >>= nFilterMode );
         }
 
-        const OUString sAll( "%"  );
-        const OUString sView( "VIEW"  );
-        const OUString sTable( "TABLE"  );
+        static const OUStringLiteral sAll( u"%"  );
+        static const OUStringLiteral sView( u"VIEW"  );
+        static const OUStringLiteral sTable( u"TABLE"  );
 
         switch ( nFilterMode )
         {
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index e47ef6a0e6ce..e7ffffd61452 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -480,7 +480,7 @@ namespace dbaccess
         StorageXMLOutputStream aDesignOutput( m_rContext, i_rObjectStorage, sSettingsStreamName );
         SettingsExportContext aSettingsExportContext( m_rContext, aDesignOutput );
 
-        const OUString sWhitespace( " " );
+        static const OUStringLiteral sWhitespace( u" " );
 
         aDesignOutput.startElement( "office:settings" );
         aDesignOutput.ignorableWhitespace( sWhitespace );
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 9668dcbd4e38..58aa2b4decf7 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -560,7 +560,7 @@ void ODBExport::exportConnectionData()
                         Reference< XPropertySetInfo > xSettingsInfo( xDataSourceSettings->getPropertySetInfo(), UNO_SET_THROW );
 
 
-                        const OUString sPropertyName = "LocalSocket";
+                        static const OUStringLiteral sPropertyName = u"LocalSocket";
                         if ( xSettingsInfo->hasPropertyByName( sPropertyName ) )
                         {
                             OUString sPropertyValue;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index fe25fa3f6f2c..215a8c8f53c4 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -632,7 +632,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
     try { xInfo = _rxDest->getPropertySetInfo(); }
     catch(Exception&) { }
 
-    const OUString sUrlProp("URL");
+    static const OUStringLiteral sUrlProp(u"URL");
     // transfer the direct properties
     for (auto const& elem : m_aDirectPropTranslator)
     {
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index f06935f5e72b..40b25cdd3d54 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -126,8 +126,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
 {
     try
     {
-        const OUString sNameProperty = "Name";
-        const OUString sAscendingProperty = "IsAscending";
+        static const OUStringLiteral sNameProperty = u"Name";
+        static const OUStringLiteral sAscendingProperty = u"IsAscending";
 
         Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_SET_THROW );
         sal_Int32 nColumns = xOrderColumns->getCount();
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 82300fa19ddc..ff9c80c51996 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -127,8 +127,8 @@ void CrashReporter::writeCommonInfo()
 
     ucbhelper::InternetProxyDecider proxy_decider(::comphelper::getProcessComponentContext());
 
-    const OUString protocol = "https";
-    const OUString url = "crashreport.libreoffice.org";
+    static const OUStringLiteral protocol = u"https";
+    static const OUStringLiteral url = u"crashreport.libreoffice.org";
     const sal_Int32 port = 443;
 
     const ucbhelper::InternetProxyServer proxy_server = proxy_decider.getProxy(protocol, url, port);
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 1f1eb5f2fe90..b1367a335fa2 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -420,7 +420,7 @@ void BackendImpl::implProcessHelp(
                             &langFolderContent,
                             langFolderDest, xCmdEnv);
 
-                        const OUString aHelpStr("help");
+                        static const OUStringLiteral aHelpStr(u"help");
 
                         OUString aJarFile(
                             makeURL(sHelpFolder, langFolderURLSegment + "/" + aHelpStr + ".jar"));
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 20571efa8947..3cdf121438e9 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1059,9 +1059,9 @@ void BackendImpl::PackageImpl::exportTo(
         manifest.reserve( bundle.getLength() );
         sal_Int32 baseURLlen = m_url_expanded.getLength();
         Reference<deployment::XPackage> const *pbundle = bundle.getConstArray();
-        const OUString strMediaType( "MediaType" );
-        const OUString strFullPath( "FullPath" );
-        const OUString strIsFolder( "IsFolder" );
+        static const OUStringLiteral strMediaType( u"MediaType" );
+        static const OUStringLiteral strFullPath( u"FullPath" );
+        static const OUStringLiteral strIsFolder( u"IsFolder" );
         for ( sal_Int32 pos = bundle.getLength(); pos--; )
         {
             Reference<deployment::XPackage> const & xPackage = pbundle[ pos ];
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 12eff83a4bc3..031bd2625b22 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4744,7 +4744,7 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand)
     {
         boost::property_tree::ptree aChild;
         boost::property_tree::ptree aChildren;
-        const OUString sPageStyles("PageStyles");
+        static const OUStringLiteral sPageStyles(u"PageStyles");
         uno::Reference<beans::XPropertySet> xProperty;
         uno::Reference<container::XNameContainer> xContainer;
 
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index ef4b6688d4c2..92b07f754e17 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -189,8 +189,8 @@ bool MigrationImpl::doMigration()
 
         copyFiles();
 
-        const OUString sMenubarResourceURL("private:resource/menubar/menubar");
-        const OUString sToolbarResourcePre("private:resource/toolbar/");
+        static const OUStringLiteral sMenubarResourceURL(u"private:resource/menubar/menubar");
+        static const OUStringLiteral sToolbarResourcePre(u"private:resource/toolbar/");
         for (MigrationModuleInfo & i : vModulesInfo) {
             OUString sModuleIdentifier = mapModuleShortNameToIdentifier(i.sModuleShortName);
             if (sModuleIdentifier.isEmpty())
@@ -306,8 +306,8 @@ void MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr
     uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_SET_THROW);
     const uno::Sequence< OUString > seqSupportedVersions = aMigrationAccess->getElementNames();
 
-    const OUString aVersionIdentifiers( "VersionIdentifiers" );
-    const OUString aPriorityIdentifier( "Priority" );
+    static const OUStringLiteral aVersionIdentifiers( u"VersionIdentifiers" );
+    static const OUStringLiteral aPriorityIdentifier( u"Priority" );
 
     for (OUString const & supportedVersion :seqSupportedVersions) {
         sal_Int32                 nPriority( 0 );
@@ -803,8 +803,8 @@ void MigrationImpl::runServices()
 std::vector< MigrationModuleInfo > MigrationImpl::detectUIChangesForAllModules() const
 {
     std::vector< MigrationModuleInfo > vModulesInfo;
-    const OUString MENUBAR("menubar");
-    const OUString TOOLBAR("toolbar");
+    static const OUStringLiteral MENUBAR(u"menubar");
+    static const OUStringLiteral TOOLBAR(u"toolbar");
 
     uno::Sequence< uno::Any > lArgs {uno::makeAny(m_aInfo.userdata + "/user/config/soffice.cfg/modules"),
                                      uno::makeAny(embed::ElementModes::READ)};
@@ -864,7 +864,7 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
         const uno::Reference< container::XIndexContainer >& xIndexNew,
         const OUString& sResourceURL)
 {
-    const OUString MENU_SEPARATOR(" | ");
+    static const OUStringLiteral MENU_SEPARATOR(u" | ");
 
     std::vector< MigrationItem > vOldItems;
     std::vector< MigrationItem > vNewItems;
@@ -1072,8 +1072,8 @@ void NewVersionUIInfo::init(const std::vector< MigrationModuleInfo >& vModulesIn
     m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size());
     m_lNewVersionToolbarSettingsSeq.realloc(vModulesInfo.size());
 
-    const OUString sMenubarResourceURL("private:resource/menubar/menubar");
-    const OUString sToolbarResourcePre("private:resource/toolbar/");
+    static const OUStringLiteral sMenubarResourceURL(u"private:resource/menubar/menubar");
+    static const OUStringLiteral sToolbarResourcePre(u"private:resource/toolbar/");
 
     uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = ui::theModuleUIConfigurationManagerSupplier::get( ::comphelper::getProcessComponentContext() );
 
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 7cf4fc4b2cd2..6f690ca55f46 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1088,7 +1088,7 @@ void VclMetafileProcessor2D::processControlPrimitive2D(
             uno::Reference<beans::XPropertySetInfo> xPropertyInfo(
                 xModelProperties.is() ? xModelProperties->getPropertySetInfo()
                                       : uno::Reference<beans::XPropertySetInfo>());
-            const OUString sPrintablePropertyName("Printable");
+            static const OUStringLiteral sPrintablePropertyName(u"Printable");
 
             if (xPropertyInfo.is() && xPropertyInfo->hasPropertyByName(sPrintablePropertyName))
             {
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index a65af50b37e1..b72fae9ebb67 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -632,7 +632,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
     if (!xTmpDicList.is())
         return nullptr;
 
-    const OUString aDicName( "standard.dic" );
+    static const OUStringLiteral aDicName( u"standard.dic" );
     uno::Reference< XDictionary > xDic = xTmpDicList->getDictionaryByName( aDicName );
     if (!xDic.is())
     {
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 4ad23b10abae..b6f3f5cf14b0 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -305,7 +305,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
             uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( rStream ) );
 
 /* testcode
-            const OUString aURL( "file:///e:/test.xml" );
+            static const OUStringLiteral aURL( u"file:///e:/test.xml" );
             SvFileStream aStream(aURL, StreamMode::WRITE | StreamMode::TRUNC);
             xOut = new utl::OOutputStreamWrapper(aStream);
 */
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index f5532f009196..e45c505e1675 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -169,7 +169,7 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection
             uno::Reference<io::XInputStream> xInputStream = new utl::OInputStreamWrapper( rStream );
 
 /* testcode
-            const OUString aURL( "file:///e:/test.xml" );
+            static const OUStringLiteral aURL( u"file:///e:/test.xml" );
             SfxMedium aMedium( aURL, StreamMode::READ | STREAM_NOCREATE, sal_True );
             uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
 
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 6dda3c67830b..dd7099c01a77 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -176,7 +176,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc
     {
         const uno::Reference< beans::XPropertySet > xSourceProps( i_rSource, uno::UNO_QUERY_THROW );
         const uno::Reference< beans::XPropertySet > xTargetProps( i_rTarget, uno::UNO_QUERY_THROW );
-        const OUString sMediaTypePropName( "MediaType" );
+        static const OUStringLiteral sMediaTypePropName( u"MediaType" );
         xTargetProps->setPropertyValue( sMediaTypePropName, xSourceProps->getPropertyValue( sMediaTypePropName ) );
     }
     catch( const uno::Exception& )
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 8047053dc51d..04fa95028b18 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -222,8 +222,8 @@ namespace abp
             const OUString* pExistentFields = aExistentFields.getConstArray();
             const OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength();
 
-            const OUString sProgrammaticNodeName( "ProgrammaticFieldName" );
-            const OUString sAssignedNodeName( "AssignedFieldName" );
+            static const OUStringLiteral sProgrammaticNodeName( u"ProgrammaticFieldName" );
+            static const OUStringLiteral sAssignedNodeName( u"AssignedFieldName" );
 
             for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields )
             {
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 536b94ce8cf6..64bfe3e0d9de 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -600,7 +600,7 @@ void EscherPropertyContainer::CreateFillProperties(
     uno::Any aAny;
     AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
     AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
-    const OUString aPropName( "FillStyle" );
+    static const OUStringLiteral aPropName( u"FillStyle" );
 
     if ( EscherPropertyValueHelper::GetPropertyValue(
             aAny, rXPropSet, aPropName ) )
@@ -2592,14 +2592,14 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
     if ( !(aGeoPropSet >>= aGeoPropSeq) )
         return;
 
-    const OUString sViewBox            ( "ViewBox"  );
-    const OUString sTextRotateAngle    ( "TextRotateAngle"  );
-    const OUString sExtrusion          ( "Extrusion"  );
-    const OUString sEquations          ( "Equations"  );
-    const OUString sPath               ( "Path"  );
-    const OUString sTextPath           ( "TextPath"  );
-    const OUString sHandles            ( "Handles"  );
-    const OUString sAdjustmentValues   ( "AdjustmentValues"  );
+    static const OUStringLiteral sViewBox            ( u"ViewBox"  );
+    static const OUStringLiteral sTextRotateAngle    ( u"TextRotateAngle"  );
+    static const OUStringLiteral sExtrusion          ( u"Extrusion"  );
+    static const OUStringLiteral sEquations          ( u"Equations"  );
+    static const OUStringLiteral sPath               ( u"Path"  );
+    static const OUStringLiteral sTextPath           ( u"TextPath"  );
+    static const OUStringLiteral sHandles            ( u"Handles"  );
+    static const OUStringLiteral sAdjustmentValues   ( u"AdjustmentValues"  );
 
     bool bAdjustmentValuesProp = false;
     uno::Any aAdjustmentValuesProp;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 91b36b230129..5ed426de2ab6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -601,7 +601,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                             {
                                 const SfxPoolItem& aCustomShape =  static_cast<SdrObjCustomShape*>(pO)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
                                 SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(aCustomShape) );
-                                const OUString sPath( "Path" );
+                                static const OUStringLiteral sPath( u"Path" );
                                 sal_Int16 nGluePointType = EnhancedCustomShapeGluePointType::SEGMENTS;
                                 css::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sPath, "GluePointType" );
                                 if ( pAny )
@@ -723,7 +723,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                                             sal_Int32 nX = 0, nY = 0;
                                             if ( ( rPara.First.Value >>= nX ) && ( rPara.Second.Value >>= nY ) )
                                             {
-                                                const OUString sGluePoints( "GluePoints" );
+                                                static const OUStringLiteral sGluePoints( u"GluePoints" );
                                                 css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aGluePoints;
                                                 pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePoints );
                                                 if ( pAny )
@@ -2762,7 +2762,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem
 
     const css::uno::Any* pAny;
     SdrCustomShapeGeometryItem aGeometryItem(rSet.Get( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
-    const OUString sTextRotateAngle( "TextRotateAngle" );
+    static const OUStringLiteral sTextRotateAngle( u"TextRotateAngle" );
     pAny = aGeometryItem.GetPropertyValueByName( sTextRotateAngle );
     double fExtraTextRotateAngle = 0.0;
     if ( pAny )
@@ -4506,9 +4506,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                     // applies only if importing arcs from MS Office.
                     if ( aObjData.eShapeType == mso_sptArc )
                     {
-                        const OUString sAdjustmentValues( "AdjustmentValues" );
-                        const OUString sViewBox( "ViewBox" );
-                        const OUString sPath( "Path" );
+                        static const OUStringLiteral sAdjustmentValues( u"AdjustmentValues" );
+                        static const OUStringLiteral sViewBox( u"ViewBox" );
+                        static const OUStringLiteral sPath( u"Path" );
                         SdrCustomShapeGeometryItem aGeometryItem( static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
                         PropertyValue aPropVal;
 
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 5af0c03775c8..d3452998c7bd 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -893,9 +893,9 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
                 }
                 bool bExportNotesPages = false;
                 bool bReChangeToNormalView = false;
-                const OUString sShowOnlineLayout( "ShowOnlineLayout" );
+                static const OUStringLiteral sShowOnlineLayout( u"ShowOnlineLayout" );
                 bool bReHideWhitespace = false;
-                const OUString sHideWhitespace("HideWhitespace");
+                static const OUStringLiteral sHideWhitespace(u"HideWhitespace");
                 uno::Reference< beans::XPropertySet > xViewProperties;
 
                 if ( aCreator == "Writer" )
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 47dbce93bbd5..c3ec4a8971d4 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1152,8 +1152,8 @@ bool SVGTextWriter::nextTextPortion()
                     Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY );
                     if( xTextField.is() )
                     {
-                        const OUString sServicePrefix("com.sun.star.text.textfield.");
-                        const OUString sPresentationServicePrefix("com.sun.star.presentation.TextField.");
+                        static const OUStringLiteral sServicePrefix(u"com.sun.star.text.textfield.");
+                        static const OUStringLiteral sPresentationServicePrefix(u"com.sun.star.presentation.TextField.");
 
                         Reference< XServiceInfo > xService( xTextField, UNO_QUERY );
                         const Sequence< OUString > aServices = xService->getSupportedServiceNames();
@@ -1870,8 +1870,8 @@ tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPol
 OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine )
 {
     OUStringBuffer   aPathData;
-    const OUString   aBlank( " " );
-    const OUString   aComma( "," );
+    static const OUStringLiteral   aBlank( u" " );
+    static const OUStringLiteral   aComma( u"," );
     Point                      aPolyPoint;
 
     for( tools::Long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 51be4018fef7..300d4a0fb6d8 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -79,18 +79,18 @@ void TypeDetectionExporter::doExport( const Reference< XOutputStream >& xOS,  co
 {
     try
     {
-        const OUString sComponentData       ( "oor:component-data" );
-        const OUString sNode                ( "node" );
-        const OUString sName                ( "oor:name" );
-        const OUString sWhiteSpace          ( " " );
-        const OUString sUIName              ( "UIName" );
-        const OUString sComma               ( "," );
-        const OUString sDelim               ( ";" );
-        const OUString sData                ( "Data" );
-        const OUString sDocTypePrefix       ( "doctype:" );
-        const OUString sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
-        const OUString sXSLTFilterService   ( "com.sun.star.documentconversion.XSLTFilter" );
-        const OUString sCdataAttribute      ( "CDATA" );
+        static const OUStringLiteral sComponentData       ( u"oor:component-data" );
+        static const OUStringLiteral sNode                ( u"node" );
+        static const OUStringLiteral sName                ( u"oor:name" );
+        static const OUStringLiteral sWhiteSpace          ( u" " );
+        static const OUStringLiteral sUIName              ( u"UIName" );
+        static const OUStringLiteral sComma               ( u"," );
+        static const OUStringLiteral sDelim               ( u";" );
+        static const OUStringLiteral sData                ( u"Data" );
+        static const OUStringLiteral sDocTypePrefix       ( u"doctype:" );
+        static const OUStringLiteral sFilterAdaptorService( u"com.sun.star.comp.Writer.XmlFilterAdaptor" );
+        static const OUStringLiteral sXSLTFilterService   ( u"com.sun.star.documentconversion.XSLTFilter" );
+        static const OUStringLiteral sCdataAttribute      ( u"CDATA" );
 
 
         // set up sax writer and connect to given output stream
@@ -208,10 +208,10 @@ void TypeDetectionExporter::addProperty( const Reference< XWriter >& xHandler, c
 {
     try
     {
-        const OUString sCdataAttribute( "CDATA" );
-        const OUString sProp( "prop" );
-        const OUString sValue( "value" );
-        const OUString sWhiteSpace          ( " " );
+        static const OUStringLiteral sCdataAttribute( u"CDATA" );
+        static const OUStringLiteral sProp( u"prop" );
+        static const OUStringLiteral sValue( u"value" );
+        static const OUStringLiteral sWhiteSpace          ( u" " );
 
         rtl::Reference<::comphelper::AttributeList>pAttrList = new ::comphelper::AttributeList;
         pAttrList->AddAttribute ( "oor:name", sCdataAttribute, rName );
@@ -236,10 +236,10 @@ void TypeDetectionExporter::addLocaleProperty( const Reference< XWriter >& xHand
 {
     try
     {
-        const OUString sCdataAttribute( "CDATA" );
-        const OUString sProp( "prop" );
-        const OUString sValue( "value" );
-        const OUString sWhiteSpace          ( " " );
+        static const OUStringLiteral sCdataAttribute( u"CDATA" );
+        static const OUStringLiteral sProp( u"prop" );
+        static const OUStringLiteral sValue( u"value" );
+        static const OUStringLiteral sWhiteSpace          ( u" " );
 
         rtl::Reference<::comphelper::AttributeList> pAttrList = new ::comphelper::AttributeList;
         pAttrList->AddAttribute ( "oor:name", sCdataAttribute, rName );
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 50a9e05875d6..3195fde4d44e 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -81,8 +81,8 @@ const css::uno::Sequence<OUString>& getColumnTypes()
 
 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 == FRM_COMPONENT_EDIT)
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index fe199ae5a530..98c89e2b2e5e 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -235,7 +235,7 @@ namespace
             if ( xProviderProps.is() )
             {
                 Reference< XPropertySetInfo > xPropInfo = xProviderProps->getPropertySetInfo();
-                const OUString sHomeDirPropertyName( "HomeDirectory" );
+                static const OUStringLiteral sHomeDirPropertyName( u"HomeDirectory" );
                 if ( !xPropInfo.is() || xPropInfo->hasPropertyByName( sHomeDirPropertyName ) )
                 {
                     OUString sHomeDirectory;
diff --git a/fpicker/source/win32/shared.hxx b/fpicker/source/win32/shared.hxx
index 4f822b742149..aa211a6057c1 100644
--- a/fpicker/source/win32/shared.hxx
+++ b/fpicker/source/win32/shared.hxx
@@ -21,9 +21,9 @@
 
 #include <rtl/ustring.hxx>
 
-const OUString BACKSLASH("\\");
-const OUString FILTER_SEPARATOR("------------------------------------------");
-const OUString ALL_FILES_WILDCARD("*.*");
+static const OUStringLiteral BACKSLASH(u"\\");
+static const OUStringLiteral FILTER_SEPARATOR(u"------------------------------------------");
+static const OUStringLiteral ALL_FILES_WILDCARD(u"*.*");
 const bool ALLOW_DUPLICATES = true;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/workbench/Test_fps.cxx b/fpicker/source/win32/workbench/Test_fps.cxx
index 62bc00550cca..899f208f1f61 100644
--- a/fpicker/source/win32/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/workbench/Test_fps.cxx
@@ -78,7 +78,7 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker );
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
-const OUString BMP_EXTENSION( "bmp" );
+static const OUStringLiteral BMP_EXTENSION( u"bmp" );
 
 
 // a test client
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 821b1137259c..35047ef8d3d6 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -957,7 +957,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( bool bPreferred, const css:
     }
 
     const OUString sIsoLang       = impl_ts_getLocale();
-    const OUString sDefaultLocale("en-US");
+    static const OUStringLiteral sDefaultLocale(u"en-US");
 
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameAccess > xCommand;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index a8aed7ab7e4d..49eab738c1cc 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -934,7 +934,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
 
 void AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
 {
-    const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" );
+    static const OUStringLiteral aMenuMergeRootName( u"AddonUI/OfficeMenuBarMerging/" );
 
     Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName );
 
@@ -1011,7 +1011,7 @@ void AddonsOptions_Impl::ReadMergeMenuData( std::u16string_view aMergeAddonInstr
 
 void AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
 {
-    const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" );
+    static const OUStringLiteral aToolbarMergeRootName( u"AddonUI/OfficeToolbarMerging/" );
 
     Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName );
     sal_uInt32           nCount = aAddonMergeNodesSeq.getLength();
@@ -1088,7 +1088,7 @@ bool AddonsOptions_Impl::ReadMergeToolbarData( std::u16string_view aMergeAddonIn
 void AddonsOptions_Impl::ReadNotebookBarMergeInstructions(
     NotebookBarMergingInstructions& rCachedNotebookBarMergingInstructions)
 {
-    const OUString aNotebookBarMergeRootName("AddonUI/OfficeNotebookBarMerging/");
+    static const OUStringLiteral aNotebookBarMergeRootName(u"AddonUI/OfficeNotebookBarMerging/");
 
     Sequence<OUString> aAddonMergeNodesSeq = GetNodeNames(aNotebookBarMergeRootName);
     sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
@@ -1169,7 +1169,7 @@ bool AddonsOptions_Impl::ReadMergeNotebookBarData(
 
 void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
 {
-    const OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
+    static const OUStringLiteral aStatusbarMergeRootName( u"AddonUI/OfficeStatusbarMerging/" );
 
     Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName );
     sal_uInt32  nCount = aAddonMergeNodesSeq.getLength();
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 5b53720852a5..b0fbd9797368 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -105,7 +105,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq
     }
     sort(aVector.begin(), aVector.end(), lcl_I18nCompareString );
 
-    const OUString aFontNameCommandPrefix( ".uno:CharFontName?CharFontName.FamilyName:string=" );
+    static const OUStringLiteral aFontNameCommandPrefix( u".uno:CharFontName?CharFontName.FamilyName:string=" );
     const sal_Int16 nCount = static_cast<sal_Int16>(aVector.size());
     for ( sal_Int16 i = 0; i < nCount; i++ )
     {
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index a217cc8ff9ed..edc17b084069 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -169,7 +169,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co
         nSizeCount++;
 
     sal_uInt16 nPos = 0;
-    const OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" );
+    static const OUStringLiteral aFontHeightCommand( u".uno:FontHeight?FontHeight.Height:float=" );
 
     // first insert font size names (for simplified/traditional chinese)
     float           fPoint;
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 6a049994852f..213aa2a94566 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -102,8 +102,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >&
         aCmd = ".uno:InsertPageFooter";
         aHeaderFooterIsOnStr = "FooterIsOn";
     }
-    const OUString aIsPhysicalStr( "IsPhysical" );
-    const OUString aDisplayNameStr( "DisplayName" );
+    static const OUStringLiteral aIsPhysicalStr( u"IsPhysical" );
+    static const OUStringLiteral aDisplayNameStr( u"DisplayName" );
 
     try
     {
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index d19bf519a28e..edcfbae5c6c2 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -199,7 +199,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     // for aCmd_Dialog and aCmd_Language
 
     sal_Int16 nItemId = 1;  // in this control the item id is not important for executing the command
-    const OUString sAsterisk("*");  // multiple languages in current selection
+    static const OUStringLiteral sAsterisk(u"*");  // multiple languages in current selection
     const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ));
     for (auto const& langItem : aLangItems)
     {
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index deccb5d77bcc..807806364f34 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -133,7 +133,7 @@ void LangSelectionStatusbarController::LangMenu(
 
     // add first few entries to main menu
     sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
-    const OUString sAsterisk("*");  // multiple languages in current selection
+    static const OUStringLiteral sAsterisk(u"*");  // multiple languages in current selection
     const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ));
     std::map< sal_Int16, OUString > aLangMap;
     for (auto const& langItem : aLangItems)
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 0549ff3a0299..856e3985b1cb 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -126,9 +126,9 @@ void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& )
 
 void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
 {
-    const OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
-    const OUString ellipsis( "..." );
-    const OUString providerKey("com.sun.star.script.provider.ScriptProviderFor");
+    static const OUStringLiteral aCmdBase(u".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
+    static const OUStringLiteral ellipsis( u"..." );
+    static const OUStringLiteral providerKey(u"com.sun.star.script.provider.ScriptProviderFor");
     sal_uInt16 itemId = startItemId;
     Reference< XContentEnumerationAccess > xEnumAccess( m_xContext->getServiceManager(), UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( "com.sun.star.script.provider.LanguageScriptProvider" );
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 80215acb8d06..00b0692f1eae 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -93,7 +93,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescri
     if ( !pVCLPopupMenu )
         return;
 
-    const OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" );
+    static const OUStringLiteral aVerbCommand( u".uno:ObjectMenue?VerbID:short=" );
     for ( sal_Int32 i = 0; i < rVerbCommandSeq.getLength(); i++ )
     {
         const css::embed::VerbDescriptor& rVerb = pVerbCommandArray[i];
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 9e1d9d84bfdb..a5792d29b224 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -357,7 +357,7 @@ void SAL_CALL RecentFilesMenuController::dispatch(
     if ( nQueryPart <= 0 )
         return;
 
-    const OUString aEntryArgStr( "entry=" );
+    static const OUStringLiteral aEntryArgStr( u"entry=" );
     sal_Int32 nEntryArg = aURL.Complete.indexOf( aEntryArgStr, nQueryPart );
     sal_Int32 nEntryPos = nEntryArg + aEntryArgStr.getLength();
     if (( nEntryArg <= 0 ) || ( nEntryPos >= aURL.Complete.getLength() ))
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 4b5d36948bc3..0566a90c1db8 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -122,7 +122,7 @@ Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithArgument
     const Sequence< Any >&                  Arguments,
     const Reference< XComponentContext >& )
 {
-    const OUString aPropModuleName( "ModuleIdentifier" );
+    static const OUStringLiteral aPropModuleName( u"ModuleIdentifier" );
 
     OUString   aPropName;
     PropertyValue   aPropValue;
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index d5d9b48bd1ba..729045ac59e0 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -61,7 +61,7 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int
     if( ans != 0 )
         return ans;
 
-    const OUString aAddAllowed("?");
+    static const OUStringLiteral aAddAllowed(u"?");
     ParseResult res1, res2;
     // since parseAnyToken does not take length as parameter, we have to copy
     // it to a temp. string.
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index d289a7d0077b..b4b8d3836f6e 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -712,10 +712,10 @@ void LngSvcMgr::UpdateAll()
 
 void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
 {
-    const OUString aSpellCheckerList( "ServiceManager/SpellCheckerList" );
-    const OUString aGrammarCheckerList( "ServiceManager/GrammarCheckerList" );
-    const OUString aHyphenatorList( "ServiceManager/HyphenatorList" );
-    const OUString aThesaurusList( "ServiceManager/ThesaurusList" );
+    static const OUStringLiteral aSpellCheckerList( u"ServiceManager/SpellCheckerList" );
+    static const OUStringLiteral aGrammarCheckerList( u"ServiceManager/GrammarCheckerList" );
+    static const OUStringLiteral aHyphenatorList( u"ServiceManager/HyphenatorList" );
+    static const OUStringLiteral aThesaurusList( u"ServiceManager/ThesaurusList" );
 
     const uno::Sequence< OUString > aSpellCheckerListEntries( GetNodeNames( aSpellCheckerList ) );
     const uno::Sequence< OUString > aGrammarCheckerListEntries( GetNodeNames( aGrammarCheckerList ) );
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 3e90a66158db..1fd2ebc4f010 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -266,10 +266,10 @@ OUString FilterBase::getAbsoluteUrl( const OUString& rUrl ) const
 {
     // handle some special cases before calling ::rtl::Uri::convertRelToAbs()
 
-    const OUString aFileSchema = "file:";
-    const OUString aFilePrefix = "file:///";
+    static const OUStringLiteral aFileSchema = u"file:";
+    static const OUStringLiteral aFilePrefix = u"file:///";
     const sal_Int32 nFilePrefixLen = aFilePrefix.getLength();
-    const OUString aUncPrefix = "//";
+    static const OUStringLiteral aUncPrefix = u"//";
 
     /*  (1) convert all backslashes to slashes, and check that passed URL is
         not empty. */
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index fd39bb36e30e..1066b67aac76 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -152,8 +152,8 @@ void CustomShapeProperties::pushToPropSet(
         Sequence< PropertyValue > aSeq = aPropertyMap.makePropertyValueSequence();
         aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
 
-        const OUString sCustomShapeGeometry("CustomShapeGeometry");
-        const OUString sAdjustmentValues("AdjustmentValues");
+        static const OUStringLiteral sCustomShapeGeometry(u"CustomShapeGeometry");
+        static const OUStringLiteral sAdjustmentValues(u"AdjustmentValues");
         uno::Any aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry );
         uno::Sequence< beans::PropertyValue > aGeoPropSeq;
 
@@ -177,7 +177,7 @@ void CustomShapeProperties::pushToPropSet(
 
         if ( !maAdjustmentGuideList.empty() )
         {
-            const OUString sType = "Type";
+            static const OUStringLiteral sType = u"Type";
             if ( aGeoPropSet >>= aGeoPropSeq )
             {
                 for ( auto& rGeoProp : aGeoPropSeq )
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index d0a09b140dcf..be2336be5ba7 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -78,7 +78,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper const & rParent,
         // ppaction://macro?name=MACRO_NAME
         // ppaction://program
 
-        const OUString sPPAction( "ppaction://" );
+        static const OUStringLiteral sPPAction( u"ppaction://" );
         if ( aAction.matchIgnoreAsciiCase( sPPAction ) )
         {
             OUString aPPAct( aAction.copy( sPPAction.getLength() ) );
@@ -87,7 +87,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper const & rParent,
 
             if ( aPPAction.match( "hlinkshowjump" ) )
             {
-                const OUString sJump( "jump=" );
+                static const OUStringLiteral sJump( u"jump=" );
                 if ( aPPAct.match( sJump, nIndex + 1 ) )
                 {
                     OUString aDestination( aPPAct.copy( nIndex + 1 + sJump.getLength() ) );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b11ccbb5f97c..bc2d7b59f1d8 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -607,9 +607,9 @@ static void lcl_createPresetShape(const uno::Reference<drawing::XShape>& xShape,
             aGeomPropSeq );
 
     // Reset old properties
-    const OUString sTextPath( "TextPath" );
-    const OUString sAdjustmentValues( "AdjustmentValues" );
-    const OUString sPresetTextWarp( "PresetTextWarp" );
+    static const OUStringLiteral sTextPath( u"TextPath" );
+    static const OUStringLiteral sAdjustmentValues( u"AdjustmentValues" );
+    static const OUStringLiteral sPresetTextWarp( u"PresetTextWarp" );
 
     lcl_resetPropertyValue( aGeomPropVec, "CoordinateSize" );
     lcl_resetPropertyValue( aGeomPropVec, "Equations" );
@@ -1169,7 +1169,7 @@ Reference< XShape > const & Shape::createAndInsert(
                 if(mnRotation)
                 {
                     uno::Reference<beans::XPropertySet> xPropertySet(mxShape, uno::UNO_QUERY);
-                    const OUString aGrabBagPropName = "FrameInteropGrabBag";
+                    static const OUStringLiteral aGrabBagPropName = u"FrameInteropGrabBag";
                     uno::Sequence<beans::PropertyValue> aGrabBag;
                     xPropertySet->getPropertyValue(aGrabBagPropName) >>= aGrabBag;
                     beans::PropertyValue aPair;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e889901c477c..0f9e13fbb6e4 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -635,7 +635,7 @@ static void lcl_AnalyzeHandles( const uno::Sequence<beans::PropertyValues> & rHa
 {
     for ( const Sequence< PropertyValue >& rPropSeq : rHandles )
     {
-        const OUString sPosition( "Position"  );
+        static const OUStringLiteral sPosition( u"Position"  );
         bool bPosition = false;
         EnhancedCustomShapeParameterPair aPosition;
         for ( const PropertyValue& rPropVal: rPropSeq )
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 3bc994aabc19..15d8f65f1175 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -896,7 +896,7 @@ void PropertyMap::dumpCode( const Reference< XPropertySet >& rXPropSet )
 {
     Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
     const Sequence< Property > props = info->getProperties ();
-    const OUString sType = "Type";
+    static const OUStringLiteral sType = u"Type";
 
     for (const Property& rProp : props) {
 
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 07c91483c773..88d7f28617ef 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -800,7 +800,7 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib,
 
     // scan for the line 'Begin {GUID} <FormName>'
     TextInputStream aFrameTextStrm( mxContext, aInStrm, eTextEnc );
-    const OUString aBegin = "Begin";
+    static const OUStringLiteral aBegin = u"Begin";
     OUString aLine;
     bool bBeginFound = false;
     while( !bBeginFound && !aFrameTextStrm.isEof() )
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 4b3e1f092c3c..372f821aa0b7 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -764,7 +764,7 @@ void exportDirStream(SvStream& rStrm, const css::uno::Reference<css::container::
     aDirStream.WriteUInt32(0x00000000); // reserved
 
 #if VBA_EXPORT_DEBUG
-    const OUString aDirFileName("/tmp/vba_dir_out.bin");
+    static const OUStringLiteral aDirFileName(u"/tmp/vba_dir_out.bin");
     SvFileStream aDirStreamDebug(aDirFileName, StreamMode::READWRITE);
     aDirStream.Seek(0);
     aDirStreamDebug.WriteStream(aDirStream);
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 96ca319f2a8e..62a070e5c840 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -134,7 +134,7 @@ void PPTShape::addShape(
         if (sServiceName != "com.sun.star.drawing.GraphicObjectShape" &&
             sServiceName != "com.sun.star.drawing.OLE2Shape")
         {
-            const OUString sOutlinerShapeService("com.sun.star.presentation.OutlinerShape");
+            static const OUStringLiteral sOutlinerShapeService(u"com.sun.star.presentation.OutlinerShape");
             SAL_INFO("oox.ppt","has master: " << std::hex << rSlidePersist.getMasterPersist().get());
             switch (mnSubType)
             {
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 2683905b8a74..aced17a2523b 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -108,7 +108,7 @@ static void ResolveTextFields( XmlFilterBase const & rFilter )
     const Reference< frame::XModel >& xModel( rFilter.getModel() );
     for (auto const& textField : rTextFields)
     {
-        const OUString sURL = "URL";
+        static const OUStringLiteral sURL = u"URL";
         Reference< drawing::XDrawPagesSupplier > xDPS( xModel, uno::UNO_QUERY_THROW );
         Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_SET_THROW );
 
@@ -120,8 +120,8 @@ static void ResolveTextFields( XmlFilterBase const & rFilter )
             OUString aURL;
             if ( xPropSet->getPropertyValue( sURL ) >>= aURL )
             {
-                const OUString sSlide = "#Slide ";
-                const OUString sNotes = "#Notes ";
+                static const OUStringLiteral sSlide = u"#Slide ";
+                static const OUStringLiteral sNotes = u"#Notes ";
                 bool bNotes = false;
                 sal_Int32 nPageNumber = 0;
                 if ( aURL.match( sSlide ) )
@@ -171,7 +171,7 @@ void PresentationFragmentHandler::saveThemeToGrabBag(const oox::drawingml::Theme
         {
             uno::Reference<beans::XPropertySetInfo> xPropsInfo = xDocProps->getPropertySetInfo();
 
-            const OUString aGrabBagPropName = "InteropGrabBag";
+            static const OUStringLiteral aGrabBagPropName = u"InteropGrabBag";
             if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(aGrabBagPropName))
             {
                 // get existing grab bag
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index c6be45e71ce1..2b4169bf6062 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -246,10 +246,10 @@ void SlidePersist::applyTextStyles( const XmlFilterBase& rFilterBase )
             OUString aStyle;
             OUString aFamily;
 
-            const OUString sOutline( "outline1" );
-            const OUString sTitle( "title" );
-            const OUString sStandard( "standard" );
-            const OUString sSubtitle( "subtitle" );
+            static const OUStringLiteral sOutline( u"outline1" );
+            static const OUStringLiteral sTitle( u"title" );
+            static const OUStringLiteral sStandard( u"standard" );
+            static const OUStringLiteral sSubtitle( u"subtitle" );
 
             for( int i = 0; i < 4; i++ )    // todo: aggregation of bodystyle (subtitle)
             {
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 2d4e99c7be3f..d5ad6963ff85 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -311,7 +311,7 @@ void ShapeBase::finalizeFragmentImport()
     else {
         // Temporary fix, shapetype not found if referenced from different substream
         // FIXME: extend scope of ShapeContainer to store all shapetypes from the document
-        const OUString sShapeTypePrefix = "shapetype_";
+        static const OUStringLiteral sShapeTypePrefix = u"shapetype_";
         OUString tmp;
         if (aType.startsWith(sShapeTypePrefix)) {
             maTypeModel.moShapeType = aType.copy(sShapeTypePrefix.getLength()).toInt32();
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index c3c4be339646..7ac46874f7ae 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -89,24 +89,24 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con
     const OUString sAlgorithmAttribute13        ( ATTRIBUTE_ALGORITHM13 );
     const OUString sCipherDataElement13         ( ELEMENT_CIPHERDATA13 );
     const OUString sCipherValueElement13        ( ELEMENT_CIPHERVALUE13 );
-    const OUString sKeyInfo                     ( "KeyInfo" );
-    const OUString sPgpKeyIDProperty            ( "KeyId" );
-    const OUString sPgpKeyPacketProperty        ( "KeyPacket" );
-    const OUString sCipherValueProperty         ( "CipherValue" );
-    const OUString sFullPathProperty     ( "FullPath" );
-    const OUString sVersionProperty  ( "Version" );
-    const OUString sMediaTypeProperty    ( "MediaType" );
-    const OUString sIterationCountProperty   ( "IterationCount" );
-    const OUString sDerivedKeySizeProperty  ( "DerivedKeySize" );
-    const OUString sSaltProperty         ( "Salt" );
-    const OUString sInitialisationVectorProperty( "InitialisationVector" );
-    const OUString sSizeProperty         ( "Size" );
-    const OUString sDigestProperty       ( "Digest" );
-    const OUString sEncryptionAlgProperty    ( "EncryptionAlgorithm" );
-    const OUString sStartKeyAlgProperty  ( "StartKeyAlgorithm" );
-    const OUString sDigestAlgProperty    ( "DigestAlgorithm" );
-
-    const OUString sWhiteSpace           ( " " );
+    static const OUStringLiteral sKeyInfo                     ( u"KeyInfo" );
+    static const OUStringLiteral sPgpKeyIDProperty            ( u"KeyId" );
+    static const OUStringLiteral sPgpKeyPacketProperty        ( u"KeyPacket" );
+    static const OUStringLiteral sCipherValueProperty         ( u"CipherValue" );
+    static const OUStringLiteral sFullPathProperty     ( u"FullPath" );
+    static const OUStringLiteral sVersionProperty  ( u"Version" );
+    static const OUStringLiteral sMediaTypeProperty    ( u"MediaType" );
+    static const OUStringLiteral sIterationCountProperty   ( u"IterationCount" );
+    static const OUStringLiteral sDerivedKeySizeProperty  ( u"DerivedKeySize" );
+    static const OUStringLiteral sSaltProperty         ( u"Salt" );
+    static const OUStringLiteral sInitialisationVectorProperty( u"InitialisationVector" );
+    static const OUStringLiteral sSizeProperty         ( u"Size" );
+    static const OUStringLiteral sDigestProperty       ( u"Digest" );
+    static const OUStringLiteral sEncryptionAlgProperty    ( u"EncryptionAlgorithm" );
+    static const OUStringLiteral sStartKeyAlgProperty  ( u"StartKeyAlgorithm" );
+    static const OUStringLiteral sDigestAlgProperty    ( u"DigestAlgorithm" );
+
+    static const OUStringLiteral sWhiteSpace           ( u" " );
 
     const OUString sSHA256_URL_ODF12     ( SHA256_URL_ODF12 );
     const OUString  sSHA1_Name           ( SHA1_NAME );
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 3de64f6502b2..c31697f24184 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -174,11 +174,11 @@ void ZipPackage::parseManifest()
         return;
 
     bool bManifestParsed = false;
-    const OUString sMeta ("META-INF");
+    static const OUStringLiteral sMeta (u"META-INF");
     if ( m_xRootFolder->hasByName( sMeta ) )
     {
         try {
-            const OUString sManifest ("manifest.xml");
+            static const OUStringLiteral sManifest (u"manifest.xml");
             uno::Reference< XUnoTunnel > xTunnel;
             Any aAny = m_xRootFolder->getByName( sMeta );
             aAny >>= xTunnel;
@@ -192,19 +192,19 @@ void ZipPackage::parseManifest()
                 {
                     uno::Reference < XManifestReader > xReader = ManifestReader::create( m_xContext );
 
-                    const OUString sPropFullPath ("FullPath");
-                    const OUString sPropVersion ("Version");
-                    const OUString sPropMediaType ("MediaType");
-                    const OUString sPropInitialisationVector ("InitialisationVector");
-                    const OUString sPropSalt ("Salt");
-                    const OUString sPropIterationCount ("IterationCount");
-                    const OUString sPropSize ("Size");
-                    const OUString sPropDigest ("Digest");
-                    const OUString sPropDerivedKeySize ("DerivedKeySize");
-                    const OUString sPropDigestAlgorithm ("DigestAlgorithm");
-                    const OUString sPropEncryptionAlgorithm ("EncryptionAlgorithm");
-                    const OUString sPropStartKeyAlgorithm ("StartKeyAlgorithm");
-                    const OUString sKeyInfo ("KeyInfo");
+                    static const OUStringLiteral sPropFullPath (u"FullPath");
+                    static const OUStringLiteral sPropVersion (u"Version");
+                    static const OUStringLiteral sPropMediaType (u"MediaType");
+                    static const OUStringLiteral sPropInitialisationVector (u"InitialisationVector");
+                    static const OUStringLiteral sPropSalt (u"Salt");
+                    static const OUStringLiteral sPropIterationCount (u"IterationCount");
+                    static const OUStringLiteral sPropSize (u"Size");
+                    static const OUStringLiteral sPropDigest (u"Digest");
+                    static const OUStringLiteral sPropDerivedKeySize (u"DerivedKeySize");
+                    static const OUStringLiteral sPropDigestAlgorithm (u"DigestAlgorithm");
+                    static const OUStringLiteral sPropEncryptionAlgorithm (u"EncryptionAlgorithm");
+                    static const OUStringLiteral sPropStartKeyAlgorithm (u"StartKeyAlgorithm");
+                    static const OUStringLiteral sKeyInfo (u"KeyInfo");
 
                     const uno::Sequence < uno::Sequence < PropertyValue > > aManifestSequence = xReader->readManifestSequence ( xSink->getInputStream() );
                     ZipPackageStream *pStream = nullptr;
@@ -380,7 +380,7 @@ void ZipPackage::parseManifest()
         throw ZipIOException(
             THROW_WHERE "Could not parse manifest.xml" );
 
-    const OUString sMimetype ("mimetype");
+    static const OUStringLiteral sMimetype (u"mimetype");
     if ( m_xRootFolder->hasByName( sMimetype ) )
     {
         // get mediatype from the "mimetype" stream
@@ -458,7 +458,7 @@ void ZipPackage::parseContentType()
         return;
 
     try {
-        const OUString aContentTypes("[Content_Types].xml");
+        static const OUStringLiteral aContentTypes(u"[Content_Types].xml");
         // the content type must exist in OFOPXML format!
         if ( !m_xRootFolder->hasByName( aContentTypes ) )
             throw io::IOException(THROW_WHERE "Wrong format!" );
@@ -1015,7 +1015,7 @@ uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( c
 
 void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
 {
-    const OUString sMime ("mimetype");
+    static const OUStringLiteral sMime (u"mimetype");
     if ( m_xRootFolder->hasByName( sMime ) )
         m_xRootFolder->removeByName( sMime );
 
@@ -1229,7 +1229,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
 
             if ( m_xRootFolder->hasByName( sMeta ) )
             {
-                const OUString sManifest ("manifest.xml");
+                static const OUStringLiteral sManifest (u"manifest.xml");
 
                 uno::Reference< XUnoTunnel > xTunnel;
                 Any aAny = m_xRootFolder->getByName( sMeta );
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index fb1794841809..19cc550a3e85 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -452,11 +452,11 @@ bool ZipPackageStream::saveChild(
 {
     bool bSuccess = true;
 
-    const OUString sDigestProperty ("Digest");
-    const OUString sEncryptionAlgProperty    ("EncryptionAlgorithm");
-    const OUString sStartKeyAlgProperty  ("StartKeyAlgorithm");
-    const OUString sDigestAlgProperty    ("DigestAlgorithm");
-    const OUString sDerivedKeySizeProperty  ("DerivedKeySize");
+    static const OUStringLiteral sDigestProperty (u"Digest");
+    static const OUStringLiteral sEncryptionAlgProperty    (u"EncryptionAlgorithm");
+    static const OUStringLiteral sStartKeyAlgProperty  (u"StartKeyAlgorithm");
+    static const OUStringLiteral sDigestAlgProperty    (u"DigestAlgorithm");
+    static const OUStringLiteral sDerivedKeySizeProperty  (u"DerivedKeySize");
 
     uno::Sequence < beans::PropertyValue > aPropSet (PKG_SIZE_NOENCR_MNFST);
 
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index d68c25c95a63..97284c8b0d64 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -71,7 +71,7 @@ namespace rptui
 
         // Okay, let's start with replacing all $$ in our pattern with the actual field data source
         OUString sMatchExpression( m_sPattern );
-        const OUString sFieldDataPattern( "$$" );
+        static const OUStringLiteral sFieldDataPattern( u"$$" );
         sal_Int32 nIndex( sMatchExpression.indexOf( sFieldDataPattern ) );
         while ( nIndex != -1 )
         {
@@ -79,8 +79,8 @@ namespace rptui
             nIndex = sMatchExpression.indexOf( sFieldDataPattern, nIndex + _rFieldDataSource.getLength() );
         }
 
-        const OUString sLHSPattern( "$1" );
-        const OUString sRHSPattern( "$2" );
+        static const OUStringLiteral sLHSPattern( u"$1" );
+        static const OUStringLiteral sRHSPattern( u"$2" );
         sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) );
         sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) );
 
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 195582503839..c4d22941fbf3 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -220,7 +220,7 @@ namespace rptui
                 return;
 
             OUString sDataField( _rxFormatted->getDataField() );
-            const OUString sFieldPrefix( "field:[" );
+            static const OUStringLiteral sFieldPrefix( u"field:[" );
             if ( sDataField.indexOf( sFieldPrefix ) != 0 )
                 // not bound to a table field
                 // TODO: we might also do this kind of thing for functions and expressions ...
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index bcc6be58ff29..dd770ff9fd5b 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -111,11 +111,11 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
     try
     {
         uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY);
-        const OUString sFormComponent("FormComponent");
+        static const OUStringLiteral sFormComponent(u"FormComponent");
         if ( xNameCont->hasByName(sFormComponent) )
         {
             uno::Reference<beans::XPropertySet> xProp(xNameCont->getByName(sFormComponent),uno::UNO_QUERY);
-            const OUString sModel("Model");
+            static const OUStringLiteral sModel(u"Model");
             if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sModel) )
             {
                 m_xChartModel.set(xProp->getPropertyValue(sModel),uno::UNO_QUERY);
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 9ac2957f356e..2392f6e6b6a9 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -282,7 +282,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface >
         const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY );
         m_xReportComponent.set( xObjectAsContainer->getByName("ReportComponent"), uno::UNO_QUERY );
 
-        const OUString sRowSet("RowSet");
+        static const OUStringLiteral sRowSet(u"RowSet");
         if ( xObjectAsContainer->hasByName( sRowSet ) )
         {
             const uno::Any aRowSet( xObjectAsContainer->getByName(sRowSet) );
@@ -2090,8 +2090,8 @@ void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,std::u1
     m_xFunction.set(report::Function::create(m_xContext));
     m_xFunction->setName( _sFunctionName );
 
-    const OUString sPlaceHolder1("%Column");
-    const OUString sPlaceHolder2("%FunctionName");
+    static const OUStringLiteral sPlaceHolder1(u"%Column");
+    static const OUStringLiteral sPlaceHolder2(u"%FunctionName");
     OUString sFormula(_aFunction.m_sFormula);
     sFormula = sFormula.replaceAll(sPlaceHolder1,_sDataField);
     sFormula = sFormula.replaceAll(sPlaceHolder2,_sFunctionName);
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 3e4fe9ae6884..28b33acc4133 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -85,10 +85,10 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf
     try
     {
         uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY);
-        const OUString sFormComponent("FormComponent");
+        static const OUStringLiteral sFormComponent(u"FormComponent");
         if ( xNameCont->hasByName(sFormComponent) )
             xNameCont->getByName(sFormComponent) >>= m_xFormComponent;
-        const OUString sRowSet("RowSet");
+        static const OUStringLiteral sRowSet(u"RowSet");
         if ( xNameCont->hasByName(sRowSet) )
         {
             uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 46a23a3a4f9a..475bef77a29f 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3972,12 +3972,11 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert
     if ( !xSection.is() )
         return;
 
-    const OUString sKeyModifier("KeyModifier");
     const beans::PropertyValue* pIter = _aArgs.getConstArray();
     const beans::PropertyValue* pEnd  = pIter + _aArgs.getLength();
     const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter, pEnd,
-        [&sKeyModifier] (const beans::PropertyValue& x) -> bool {
-            return x.Name == sKeyModifier;
+        [] (const beans::PropertyValue& x) -> bool {
+            return x.Name == "KeyModifier";
         });
     sal_Int16 nKeyModifier = 0;
     if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) )
@@ -4002,7 +4001,7 @@ void OReportController::checkChartEnabled()
             ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, "/org.openoffice.Office.ReportDesign" ) );
 
         bool bChartEnabled = false;
-        const OUString sPropertyName( "UserData/Chart" );
+        static const OUStringLiteral sPropertyName( u"UserData/Chart" );
         if ( aConfiguration.hasByHierarchicalName(sPropertyName) )
             aConfiguration.getNodeValue( sPropertyName ) >>= bChartEnabled;
         m_bChartEnabled = bChartEnabled;
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 5c19760b2313..f117c3a2a959 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -69,9 +69,9 @@ public:
     void getAppCommandArg_001()
     {
 #if defined(_WIN32)
-        const OUString EXECUTABLE_NAME("child_process.exe");
+        static const OUStringLiteral EXECUTABLE_NAME(u"child_process.exe");
 #else
-        const OUString EXECUTABLE_NAME("child_process");
+        static const OUStringLiteral EXECUTABLE_NAME(u"child_process");
 #endif
         OUString suCWD = getModulePath();
         // OUString suCWD2 = getExecutableDirectory();
@@ -194,9 +194,9 @@ public:
     void getGlobalProcessId_002()
     {
 #if defined(_WIN32)
-        const OUString EXEC_NAME("child_process_id.exe");
+        static const OUStringLiteral EXEC_NAME(u"child_process_id.exe");
 #else
-        const OUString EXEC_NAME("child_process_id");
+        static const OUStringLiteral EXEC_NAME(u"child_process_id");
 #endif
         sal_uInt8 pTargetUUID1[16];
         rtl_getGlobalProcessId( pTargetUUID1 );
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 771b71edf399..14cb8c6d8101 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -512,9 +512,9 @@ void ScMacrosTest::testTdf131562()
 void ScMacrosTest::testPasswordProtectedUnicodeString()
 {
     const OUString sCorrectString(u"English Русский 中文");
-    const OUString sMacroURL(
-        "vnd.sun.Star.script:Protected.Module1.TestUnicodeString?language=Basic&location=document");
-    const OUString sLibName("Protected");
+    static const OUStringLiteral sMacroURL(
+        u"vnd.sun.Star.script:Protected.Module1.TestUnicodeString?language=Basic&location=document");
+    static const OUStringLiteral sLibName(u"Protected");
 
     OUString aFileName;
     createFileURL(u"tdf57113.ods", aFileName);
@@ -571,9 +571,9 @@ void ScMacrosTest::testPasswordProtectedUnicodeString()
 
 void ScMacrosTest::testPasswordProtectedArrayInUserType()
 {
-    const OUString sMacroURL(
-        "vnd.sun.Star.script:Protected.Module1.TestMyType?language=Basic&location=document");
-    const OUString sLibName("Protected");
+    static const OUStringLiteral sMacroURL(
+        u"vnd.sun.Star.script:Protected.Module1.TestMyType?language=Basic&location=document");
+    static const OUStringLiteral sLibName(u"Protected");
 
     OUString aFileName;
     createFileURL(u"ProtectedArrayInCustomType.ods", aFileName);
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 2286e0a86955..b22eb2a3ed46 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -132,7 +132,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
 {
     VclPtr<VclAbstractDialog> pReturnDialog;
     ////FIXME: translatable string here
-    const OUString aDefaultSheetName("Sheet1");
+    static const OUStringLiteral aDefaultSheetName(u"Sheet1");
 
     switch ( nID )
     {
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index fd55c00f6a89..0807f29a3587 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1884,7 +1884,7 @@ void ScFiltersTest::testBrokenQuotesCSV()
 
 void ScFiltersTest::testCellValueXLSX()
 {
-    const OUString aFileNameBase("cell-value.");
+    static const OUStringLiteral aFileNameBase(u"cell-value.");
     OUString aFileExtension(getFileFormats()[FORMAT_XLSX].pName, strlen(getFileFormats()[FORMAT_XLSX].pName), RTL_TEXTENCODING_UTF8 );
     OUString aFilterName(getFileFormats()[FORMAT_XLSX].pFilterName, strlen(getFileFormats()[FORMAT_XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
     OUString aFileName;
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index ad829a913f31..fb1a5f35d793 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1912,8 +1912,8 @@ bool XclExpChSeries::ConvertDataSeries(
                     Reference< XColorScheme > xColorScheme = xDiagram->getDefaultColorScheme();
                     if( xColorScheme.is() )
                     {
-                        const OUString aFillStyleName = "FillStyle";
-                        const OUString aColorName = "Color";
+                        static const OUStringLiteral aFillStyleName = u"FillStyle";
+                        static const OUStringLiteral aColorName = u"Color";
                         namespace cssd = ::com::sun::star::drawing;
                         for( sal_Int32 nPointIdx = 0; nPointIdx < nMaxPointCount; ++nPointIdx )
                         {
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 6c6ec113873d..52123b499935 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -994,7 +994,7 @@ void XclImpWebQuery::ReadWqtables( XclImpStream& rStrm )
     OUString aTables( rStrm.ReadUniString() );
 
     const sal_Unicode cSep = ';';
-    const OUString aQuotedPairs( "\"\"" );
+    static const OUStringLiteral aQuotedPairs( u"\"\"" );
     maTables.clear();
     for ( sal_Int32 nStringIx {aTables.isEmpty() ? -1 : 0}; nStringIx>=0; )
     {
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index a3800acd5a81..b6614068c2ff 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -246,7 +246,7 @@ void QueryTable::finalizeImport()
         PropertySet aDocProps( getDocument() );
         Reference< XAreaLinks > xAreaLinks( aDocProps.getAnyProperty( PROP_AreaLinks ), UNO_QUERY_THROW );
         CellAddress aDestPos( aDestRange.aStart.Tab(), aDestRange.aStart.Col(), aDestRange.aStart.Row() );
-        const OUString aFilterName = "calc_HTML_WebQuery";
+        static const OUStringLiteral aFilterName = u"calc_HTML_WebQuery";
         xAreaLinks->insertAtPosition( aDestPos, aFileUrl, aTables, aFilterName, /*aFilterOptions*/"" );
         // set refresh interval (convert minutes to seconds)
         sal_Int32 nRefreshPeriod = xConnection->getModel().mnInterval * 60;
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 97129cdda671..33363d6cdb4a 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -168,7 +168,7 @@ bool lcl_IsFontwork( const SdrObject* pObj )
     bool bIsFontwork = false;
     if( pObj->GetObjIdentifier() == OBJ_CUSTOMSHAPE )
     {
-        const OUString aTextPath = "TextPath";
+        static const OUStringLiteral aTextPath = u"TextPath";
         const SdrCustomShapeGeometryItem& rGeometryItem =
             pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
         if( const Any* pAny = rGeometryItem.GetPropertyValueByName( aTextPath, aTextPath ) )
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index cb00b0074538..cfd41b9be146 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -402,7 +402,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport)
                         // and the property name is "MacroName".
                         bool bScriptURL = SfxApplication::IsXScriptURL( rValidation.sErrorTitle );
 
-                        const OUString sScript("Script");
+                        static const OUStringLiteral sScript(u"Script");
                         uno::Sequence<beans::PropertyValue> aSeq( comphelper::InitPropertySequence({
                                 { "EventType", uno::Any(bScriptURL ? sScript : OUString("StarBasic")) },
                                 { "Library", uno::Any(OUString()) },
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index bb2bf4a1ed49..1b26119f8893 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -71,7 +71,7 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
     output.writeString(getLabel());
     output.nextColumn();
 
-    const OUString strWildcardNumber("%NUMBER%");
+    static const OUStringLiteral strWildcardNumber(u"%NUMBER%");
 
     // write labels to columns
     for (size_t i = 0; i < aRangeList.size(); i++)
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index cd9097c0ff48..2abb8e53e441 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -315,7 +315,7 @@ void lclGetFormulaFromStringList( OUString& rFmlaStr, const OUString& rStringLis
     @return  true = Conversion successful. */
 bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaStr, sal_Unicode cFmlaSep )
 {
-    const OUString aQuotes( "\"\"" );
+    static const OUStringLiteral aQuotes( u"\"\"" );
 
     rStringList.clear();
     bool bIsStringList = !rFmlaStr.isEmpty();
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 1a9e0a0c197b..26a5a77300d7 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list