loplugin:ostr in sdext

Change-Id: I0b67b8c8f9dbdf2fdc8192e22b838c15db960cfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167704
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 155 insertions, 155 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 55e60c52ca96..de2a582a93eb 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::container;
 
 static OUString GetPathToConfigurationRoot()
 {
-    return "org.openoffice.Office.PresentationMinimizer";
+    return u"org.openoffice.Office.PresentationMinimizer"_ustr;
 }
 
 void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAccess >& rSettings )
@@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
         return;
 
     OUString pNames[] = {
-        OUString("Name"),
-        OUString("JPEGCompression"),
-        OUString("JPEGQuality"),
-        OUString("RemoveCropArea"),
-        OUString("ImageResolution"),
-        OUString("EmbedLinkedGraphics"),
-        OUString("OLEOptimization"),
-        OUString("OLEOptimizationType"),
-        OUString("DeleteUnusedMasterPages"),
-        OUString("DeleteHiddenSlides"),
-        OUString("DeleteNotesPages"),
-        OUString("SaveAs"),
+        u"Name"_ustr,
+        u"JPEGCompression"_ustr,
+        u"JPEGQuality"_ustr,
+        u"RemoveCropArea"_ustr,
+        u"ImageResolution"_ustr,
+        u"EmbedLinkedGraphics"_ustr,
+        u"OLEOptimization"_ustr,
+        u"OLEOptimizationType"_ustr,
+        u"DeleteUnusedMasterPages"_ustr,
+        u"DeleteHiddenSlides"_ustr,
+        u"DeleteNotesPages"_ustr,
+        u"SaveAs"_ustr,
 //          OUString("SaveAsURL"),
 //          OUString("FilterName"),
-        OUString("OpenNewDocument") };
+        u"OpenNewDocument"_ustr };
 
     Any pValues[] = {
         Any( maName ),
@@ -170,7 +170,7 @@ void ConfigurationAccess::LoadStrings()
             Reference< XInterface > xRoot( OpenConfiguration( true ) );
             if ( !xRoot.is() )
                 break;
-            Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, "Strings" ), UNO_QUERY );
+            Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, u"Strings"_ustr ), UNO_QUERY );
             if ( xSet.is() )
             {
                 const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -204,13 +204,13 @@ void ConfigurationAccess::LoadConfiguration()
             Reference< XInterface > xRoot( OpenConfiguration( true ) );
             if ( !xRoot.is() )
                 break;
-            Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, "LastUsedSettings" ), UNO_QUERY );
+            Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, u"LastUsedSettings"_ustr ), UNO_QUERY );
             if ( xSet.is() )
             {
                 OptimizerSettings& rCurrent( maSettings.front() );
                 rCurrent.LoadSettingsFromConfiguration( xSet );
             }
-            xSet.set( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY );
+            xSet.set( GetConfigurationNode( xRoot, u"Settings/Templates"_ustr ), UNO_QUERY );
             if ( xSet.is() )
             {
                 const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -248,12 +248,12 @@ void ConfigurationAccess::SaveConfiguration()
             Reference<util::XChangesBatch> xRoot( OpenConfiguration( false ), UNO_QUERY_THROW );
 
             // storing the last used settings
-            Reference< container::XNameReplace > xSet( GetConfigurationNode( xRoot, "LastUsedSettings" ), UNO_QUERY_THROW );
+            Reference< container::XNameReplace > xSet( GetConfigurationNode( xRoot, u"LastUsedSettings"_ustr ), UNO_QUERY_THROW );
             OptimizerSettings& rCurrent( maSettings.front() );
             rCurrent.SaveSettingsToConfiguration( xSet );
 
             // updating template elements
-            xSet.set( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY_THROW );
+            xSet.set( GetConfigurationNode( xRoot, u"Settings/Templates"_ustr ), UNO_QUERY_THROW );
             Reference< container::XNameContainer > xNameContainer( xSet, UNO_QUERY_THROW );
 
             const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -428,21 +428,21 @@ Sequence< PropertyValue > ConfigurationAccess::GetConfigurationSequence()
 {
     OptimizerSettings& rSettings( maSettings.front() );
     Sequence< PropertyValue > aRet{
-        comphelper::makePropertyValue("JPEGCompression", rSettings.mbJPEGCompression),
-        comphelper::makePropertyValue("JPEGQuality", rSettings.mnJPEGQuality),
-        comphelper::makePropertyValue("RemoveCropArea", rSettings.mbRemoveCropArea),
-        comphelper::makePropertyValue("ImageResolution", rSettings.mnImageResolution),
-        comphelper::makePropertyValue("EmbedLinkedGraphics", rSettings.mbEmbedLinkedGraphics),
-        comphelper::makePropertyValue("OLEOptimization", rSettings.mbOLEOptimization),
-        comphelper::makePropertyValue("OLEOptimizationType", rSettings.mnOLEOptimizationType),
-        comphelper::makePropertyValue("DeleteUnusedMasterPages", rSettings.mbDeleteUnusedMasterPages),
-        comphelper::makePropertyValue("DeleteHiddenSlides", rSettings.mbDeleteHiddenSlides),
-        comphelper::makePropertyValue("DeleteNotesPages", rSettings.mbDeleteNotesPages),
-        comphelper::makePropertyValue("CustomShowName", rSettings.maCustomShowName),
-        comphelper::makePropertyValue("SaveAsURL", rSettings.maSaveAsURL),
-        comphelper::makePropertyValue("FilterName", rSettings.maFilterName),
-        comphelper::makePropertyValue("OpenNewDocument", rSettings.mbOpenNewDocument),
-        comphelper::makePropertyValue("EstimatedFileSize", rSettings.mnEstimatedFileSize)
+        comphelper::makePropertyValue(u"JPEGCompression"_ustr, rSettings.mbJPEGCompression),
+        comphelper::makePropertyValue(u"JPEGQuality"_ustr, rSettings.mnJPEGQuality),
+        comphelper::makePropertyValue(u"RemoveCropArea"_ustr, rSettings.mbRemoveCropArea),
+        comphelper::makePropertyValue(u"ImageResolution"_ustr, rSettings.mnImageResolution),
+        comphelper::makePropertyValue(u"EmbedLinkedGraphics"_ustr, rSettings.mbEmbedLinkedGraphics),
+        comphelper::makePropertyValue(u"OLEOptimization"_ustr, rSettings.mbOLEOptimization),
+        comphelper::makePropertyValue(u"OLEOptimizationType"_ustr, rSettings.mnOLEOptimizationType),
+        comphelper::makePropertyValue(u"DeleteUnusedMasterPages"_ustr, rSettings.mbDeleteUnusedMasterPages),
+        comphelper::makePropertyValue(u"DeleteHiddenSlides"_ustr, rSettings.mbDeleteHiddenSlides),
+        comphelper::makePropertyValue(u"DeleteNotesPages"_ustr, rSettings.mbDeleteNotesPages),
+        comphelper::makePropertyValue(u"CustomShowName"_ustr, rSettings.maCustomShowName),
+        comphelper::makePropertyValue(u"SaveAsURL"_ustr, rSettings.maSaveAsURL),
+        comphelper::makePropertyValue(u"FilterName"_ustr, rSettings.maFilterName),
+        comphelper::makePropertyValue(u"OpenNewDocument"_ustr, rSettings.mbOpenNewDocument),
+        comphelper::makePropertyValue(u"EstimatedFileSize"_ustr, rSettings.mnEstimatedFileSize)
     };
     return aRet;
 }
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 7ae877b13549..3f14b14c2e44 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -55,7 +55,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
 
     // collecting a list of impress filters
     Reference< XNameAccess > xFilters( rxContext->getServiceManager()->createInstanceWithContext(
-        "com.sun.star.document.FilterFactory", rxContext ), UNO_QUERY_THROW );
+        u"com.sun.star.document.FilterFactory"_ustr, rxContext ), UNO_QUERY_THROW );
     const Sequence< OUString > aFilterList( xFilters->getElementNames() );
     for ( const auto& rFilter : aFilterList )
     {
@@ -103,7 +103,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
     }
 
     Reference< XNameAccess > xTypes( rxContext->getServiceManager()->createInstanceWithContext(
-        "com.sun.star.document.TypeDetection", rxContext ), UNO_QUERY_THROW );
+        u"com.sun.star.document.TypeDetection"_ustr, rxContext ), UNO_QUERY_THROW );
 
     for (auto& rFilterEntry : aFilterEntryList)
     {
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index c307b04b09a1..ec7171a89ecf 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -84,7 +84,7 @@ static void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Re
 {
     Reference< XGraphic > xGraphic;
     Reference< XPropertySet > xShapePropertySet( rxShape, UNO_QUERY_THROW );
-    if ( !(xShapePropertySet->getPropertyValue( "Graphic" ) >>= xGraphic) )
+    if ( !(xShapePropertySet->getPropertyValue( u"Graphic"_ustr ) >>= xGraphic) )
         return;
 
     text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
@@ -93,7 +93,7 @@ static void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Re
     aUser.mxShape = rxShape;
     aUser.mbFillBitmap = false;
     aUser.mxGraphic = xGraphic;
-    xShapePropertySet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropLogic;
+    xShapePropertySet->getPropertyValue( u"GraphicCrop"_ustr ) >>= aGraphicCropLogic;
     awt::Size aLogicalSize( rxShape->getSize() );
 
     // calculating the logical size, as if there were no cropping
@@ -123,30 +123,30 @@ static void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF,
     try
     {
         FillStyle eFillStyle;
-        if ( rxPropertySet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
+        if ( rxPropertySet->getPropertyValue( u"FillStyle"_ustr ) >>= eFillStyle )
         {
             if ( eFillStyle == FillStyle_BITMAP )
             {
                 Reference< XBitmap > xFillBitmap;
-                if ( rxPropertySet->getPropertyValue( "FillBitmap" ) >>= xFillBitmap )
+                if ( rxPropertySet->getPropertyValue( u"FillBitmap"_ustr ) >>= xFillBitmap )
                 {
                     Reference< XGraphic > xGraphic( xFillBitmap, UNO_QUERY_THROW );
                     awt::Size aLogicalSize( rLogicalSize );
                     Reference< XPropertySetInfo > axPropSetInfo( rxPropertySet->getPropertySetInfo() );
                     if ( axPropSetInfo.is() )
                     {
-                        if ( axPropSetInfo->hasPropertyByName( "FillBitmapMode" ) )
+                        if ( axPropSetInfo->hasPropertyByName( u"FillBitmapMode"_ustr ) )
                         {
                             BitmapMode eBitmapMode;
-                            if ( rxPropertySet->getPropertyValue( "FillBitmapMode" ) >>= eBitmapMode )
+                            if ( rxPropertySet->getPropertyValue( u"FillBitmapMode"_ustr ) >>= eBitmapMode )
                             {
                                 if ( ( eBitmapMode == BitmapMode_REPEAT ) || ( eBitmapMode == BitmapMode_NO_REPEAT ) )
                                 {
                                     bool bLogicalSize = false;
                                     awt::Size aSize( 0, 0 );
-                                    if ( ( rxPropertySet->getPropertyValue( "FillBitmapLogicalSize" ) >>= bLogicalSize )
-                                      && ( rxPropertySet->getPropertyValue( "FillBitmapSizeX" ) >>= aSize.Width )
-                                      && ( rxPropertySet->getPropertyValue( "FillBitmapSizeY" ) >>= aSize.Height ) )
+                                    if ( ( rxPropertySet->getPropertyValue( u"FillBitmapLogicalSize"_ustr ) >>= bLogicalSize )
+                                      && ( rxPropertySet->getPropertyValue( u"FillBitmapSizeX"_ustr ) >>= aSize.Width )
+                                      && ( rxPropertySet->getPropertyValue( u"FillBitmapSizeY"_ustr ) >>= aSize.Height ) )
                                     {
                                         if ( bLogicalSize )
                                         {
@@ -191,11 +191,11 @@ static void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& r
     {
         awt::Size aLogicalSize( 28000, 21000 );
         Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
-        xPropertySet->getPropertyValue( "Width" ) >>= aLogicalSize.Width;
-        xPropertySet->getPropertyValue( "Height" ) >>= aLogicalSize.Height;
+        xPropertySet->getPropertyValue( u"Width"_ustr ) >>= aLogicalSize.Width;
+        xPropertySet->getPropertyValue( u"Height"_ustr ) >>= aLogicalSize.Height;
 
         Reference< XPropertySet > xBackgroundPropSet;
-        if ( xPropertySet->getPropertyValue( "Background" ) >>= xBackgroundPropSet )
+        if ( xPropertySet->getPropertyValue( u"Background"_ustr ) >>= xBackgroundPropSet )
             ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet );
     }
     catch( Exception& )
@@ -238,12 +238,12 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext
 {
     awt::Size aSize100thMM( 0, 0 );
     Reference< XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW );
-    if ( xGraphicPropertySet->getPropertyValue( "Size100thMM" ) >>= aSize100thMM )
+    if ( xGraphicPropertySet->getPropertyValue( u"Size100thMM"_ustr ) >>= aSize100thMM )
     {
         if ( !aSize100thMM.Width && !aSize100thMM.Height )
         {   // MAPMODE_PIXEL USED :-(
             awt::Size aSourceSizePixel( 0, 0 );
-            if ( xGraphicPropertySet->getPropertyValue( "SizePixel" ) >>= aSourceSizePixel )
+            if ( xGraphicPropertySet->getPropertyValue( u"SizePixel"_ustr ) >>= aSourceSizePixel )
             {
                 const DeviceInfo& rDeviceInfo( GraphicCollector::GetDeviceInfo( rxMSF ) );
                 if ( rDeviceInfo.PixelPerMeterX && rDeviceInfo.PixelPerMeterY )
@@ -345,7 +345,7 @@ static void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF,
             // now check for a fillstyle
             Reference< XPropertySet > xShapePropertySet( xShape, UNO_QUERY_THROW );
             FillStyle eFillStyle;
-            if ( xShapePropertySet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
+            if ( xShapePropertySet->getPropertyValue( u"FillStyle"_ustr ) >>= eFillStyle )
             {
                 if ( eFillStyle == FillStyle_BITMAP )
                 {
@@ -366,14 +366,14 @@ static void ImpCountBackgroundGraphic(
     {
         awt::Size aLogicalSize( 28000, 21000 );
         Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
-        xPropertySet->getPropertyValue( "Width" ) >>= aLogicalSize.Width;
-        xPropertySet->getPropertyValue( "Height" ) >>= aLogicalSize.Height;
+        xPropertySet->getPropertyValue( u"Width"_ustr ) >>= aLogicalSize.Width;
+        xPropertySet->getPropertyValue( u"Height"_ustr ) >>= aLogicalSize.Height;
 
         Reference< XPropertySet > xBackgroundPropSet;
-        if ( xPropertySet->getPropertyValue( "Background" ) >>= xBackgroundPropSet )
+        if ( xPropertySet->getPropertyValue( u"Background"_ustr ) >>= xBackgroundPropSet )
         {
             FillStyle eFillStyle;
-            if ( xBackgroundPropSet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
+            if ( xBackgroundPropSet->getPropertyValue( u"FillStyle"_ustr ) >>= eFillStyle )
             {
                 if ( eFillStyle == FillStyle_BITMAP )
                 {
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index abf54e296a77..aba148cc6f39 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -110,7 +110,7 @@ static void ImpDeleteHiddenSlides(  const Reference< XModel >& rxModel )
             Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
 
             bool bVisible = true;
-            if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
+            if ( xPropSet->getPropertyValue( u"Visible"_ustr ) >>= bVisible )
             {
                 if (!bVisible )
                 {
@@ -140,7 +140,7 @@ static void ImpDeleteNotesPages( const Reference< XModel >& rxModel )
             while( xShapes->getCount() )
                 xShapes->remove( Reference< XShape >( xShapes->getByIndex( xShapes->getCount() - 1 ), UNO_QUERY_THROW ) );
 
-            xPropSet->setPropertyValue( "Layout", Any( sal_Int16(21) ) );
+            xPropSet->setPropertyValue( u"Layout"_ustr, Any( sal_Int16(21) ) );
         }
     }
     catch( Exception& )
@@ -168,23 +168,23 @@ static void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOpt
                     if ( nOLEOptimizationType == 1 )
                     {
                         bool bIsInternal = true;
-                        xPropSet->getPropertyValue( "IsInternal" ) >>= bIsInternal;
+                        xPropSet->getPropertyValue( u"IsInternal"_ustr ) >>= bIsInternal;
                         bConvertOLE = !bIsInternal;
                     }
                     if ( bConvertOLE )
                     {
                         Reference< XGraphic > xGraphic;
-                        if ( xPropSet->getPropertyValue( "Graphic" ) >>= xGraphic )
+                        if ( xPropSet->getPropertyValue( u"Graphic"_ustr ) >>= xGraphic )
                         {
                             Reference< XMultiServiceFactory > xFact( rxModel, UNO_QUERY_THROW );
-                            Reference< XShape > xShape2( xFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), UNO_QUERY_THROW );
+                            Reference< XShape > xShape2( xFact->createInstance( u"com.sun.star.drawing.GraphicObjectShape"_ustr ), UNO_QUERY_THROW );
                             xShapes->add( xShape2 );
                             xShape2->setPosition( xShape->getPosition() );
                             xShape2->setSize( xShape->getSize() );
                             Reference< XPropertySet > xPropSet2( xShape2, UNO_QUERY_THROW );
-                            xPropSet2->setPropertyValue( "Graphic", Any( xGraphic ) );
+                            xPropSet2->setPropertyValue( u"Graphic"_ustr, Any( xGraphic ) );
                             xShapes->remove( xShape );
-                            xPropSet2->setPropertyValue( "ZOrder", Any( j ) );
+                            xPropSet2->setPropertyValue( u"ZOrder"_ustr, Any( j ) );
                         }
                     }
                 }
@@ -204,20 +204,20 @@ static void ImpCompressGraphic( Reference< XGraphicProvider > const & rxGraphicP
         if ( rxGraphicProvider.is() && rxOutputStream.is() )
         {
             Sequence< PropertyValue > aFilterData{
-                comphelper::makePropertyValue("ImageResolution", nImageResolution),
-                comphelper::makePropertyValue("ColorMode", sal_Int32(0)), // todo: jpeg color mode (0->true color, 1->greyscale)
-                comphelper::makePropertyValue("Quality", nJPEGQuality), // quality that is used if we export to jpeg
-                comphelper::makePropertyValue("Compression", sal_Int32(6)), // compression that is used if we export to png
-                comphelper::makePropertyValue("Interlaced", sal_Int32(0)), // interlaced is turned off if we export to png
-                comphelper::makePropertyValue("LogicalSize", rLogicalSize),
-                comphelper::makePropertyValue("RemoveCropArea", bRemoveCropping),
-                comphelper::makePropertyValue("GraphicCropLogic", rGraphicCropLogic)
+                comphelper::makePropertyValue(u"ImageResolution"_ustr, nImageResolution),
+                comphelper::makePropertyValue(u"ColorMode"_ustr, sal_Int32(0)), // todo: jpeg color mode (0->true color, 1->greyscale)
+                comphelper::makePropertyValue(u"Quality"_ustr, nJPEGQuality), // quality that is used if we export to jpeg
+                comphelper::makePropertyValue(u"Compression"_ustr, sal_Int32(6)), // compression that is used if we export to png
+                comphelper::makePropertyValue(u"Interlaced"_ustr, sal_Int32(0)), // interlaced is turned off if we export to png
+                comphelper::makePropertyValue(u"LogicalSize"_ustr, rLogicalSize),
+                comphelper::makePropertyValue(u"RemoveCropArea"_ustr, bRemoveCropping),
+                comphelper::makePropertyValue(u"GraphicCropLogic"_ustr, rGraphicCropLogic)
             };
 
             Sequence< PropertyValue > aArgs{
-                comphelper::makePropertyValue("MimeType", rDestMimeType), // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
-                comphelper::makePropertyValue("OutputStream", rxOutputStream),
-                comphelper::makePropertyValue("FilterData", aFilterData)
+                comphelper::makePropertyValue(u"MimeType"_ustr, rDestMimeType), // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
+                comphelper::makePropertyValue(u"OutputStream"_ustr, rxOutputStream),
+                comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData)
             };
 
             rxGraphicProvider->storeGraphic( rxGraphic, aArgs );
@@ -237,7 +237,7 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont
     {
         OUString aSourceMimeType;
         Reference< XPropertySet > xGraphicPropertySet( xGraphic, UNO_QUERY_THROW );
-        if ( xGraphicPropertySet->getPropertyValue( "MimeType" ) >>= aSourceMimeType )
+        if ( xGraphicPropertySet->getPropertyValue( u"MimeType"_ustr ) >>= aSourceMimeType )
         {
             sal_Int8 nGraphicType( xGraphic->getType() );
             if ( nGraphicType == css::graphic::GraphicType::PIXEL )
@@ -249,10 +249,10 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont
                 awt::Size aSourceSizePixel( 0, 0 );
                 text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 );
 
-                if ( ( xGraphicPropertySet->getPropertyValue( "SizePixel" ) >>= aSourceSizePixel ) &&
-                    ( xGraphicPropertySet->getPropertyValue( "Transparent" ) >>= bTransparent ) &&
-                    ( xGraphicPropertySet->getPropertyValue( "Alpha" ) >>= bAlpha ) &&
-                    ( xGraphicPropertySet->getPropertyValue( "Animated" ) >>= bAnimated ) )
+                if ( ( xGraphicPropertySet->getPropertyValue( u"SizePixel"_ustr ) >>= aSourceSizePixel ) &&
+                    ( xGraphicPropertySet->getPropertyValue( u"Transparent"_ustr ) >>= bTransparent ) &&
+                    ( xGraphicPropertySet->getPropertyValue( u"Alpha"_ustr ) >>= bAlpha ) &&
+                    ( xGraphicPropertySet->getPropertyValue( u"Animated"_ustr ) >>= bAnimated ) )
                 {
                     awt::Size aDestSizePixel( aSourceSizePixel );
                     if ( !bAnimated )
@@ -286,7 +286,7 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont
                         }
                         if ( ( aSourceSizePixel.Width > 0 ) && ( aSourceSizePixel.Height > 0 ) )
                         {
-                            OUString aDestMimeType( "image/png"  );
+                            OUString aDestMimeType( u"image/png"_ustr  );
                             if (rGraphicSettings.mbJPEGCompression && !bTransparent && !bAlpha)
                             {
                                 aDestMimeType = "image/jpeg";
@@ -321,7 +321,7 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont
                                 Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
                                 xSeekable->seek( 0 );
                                 Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
-                                    "InputStream", xInputStream) };
+                                    u"InputStream"_ustr, xInputStream) };
                                 xNewGraphic = xGraphicProvider->queryGraphic( aArgs );
                             }
                         }
@@ -338,7 +338,7 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont
                 Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
                 Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
                 xSeekable->seek( 0 );
-                Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue("InputStream",
+                Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(u"InputStream"_ustr,
                                                                                xInputStream) };
                 xNewGraphic = xGraphicProvider->queryGraphic( aArgs );
             }
@@ -372,13 +372,13 @@ static void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XCompon
                 if ( rGraphic.maUser[ 0 ].mbFillBitmap && rGraphic.maUser[ 0 ].mxPropertySet.is() )
                 {
                     Reference< rendering::XBitmap > xFillBitmap;
-                    if ( rGraphic.maUser[ 0 ].mxPropertySet->getPropertyValue( "FillBitmap" ) >>= xFillBitmap )
+                    if ( rGraphic.maUser[ 0 ].mxPropertySet->getPropertyValue( u"FillBitmap"_ustr ) >>= xFillBitmap )
                         xGraphic.set( xFillBitmap, UNO_QUERY_THROW );
                 }
                 else if ( rGraphic.maUser[ 0 ].mxShape.is() )
                 {
                     Reference< XPropertySet > xShapePropertySet( rGraphic.maUser[ 0 ].mxShape, UNO_QUERY_THROW );
-                    xShapePropertySet->getPropertyValue( "Graphic" ) >>= xGraphic;
+                    xShapePropertySet->getPropertyValue( u"Graphic"_ustr ) >>= xGraphic;
                 }
                 if ( xGraphic.is() )
                 {
@@ -393,7 +393,7 @@ static void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XCompon
                             if ( rGraphicUser.mxShape.is() )
                             {
                                 Reference< XPropertySet > xShapePropertySet( rGraphicUser.mxShape, UNO_QUERY_THROW );
-                                xShapePropertySet->setPropertyValue( "Graphic", Any( xNewGraphic ) );
+                                xShapePropertySet->setPropertyValue( u"Graphic"_ustr, Any( xNewGraphic ) );
 
                                 if ( rGraphicUser.maGraphicCropLogic.Left || rGraphicUser.maGraphicCropLogic.Top
                                 || rGraphicUser.maGraphicCropLogic.Right || rGraphicUser.maGraphicCropLogic.Bottom )
@@ -407,7 +407,7 @@ static void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XCompon
                                         aGraphicCropLogic.Right = static_cast<sal_Int32>(static_cast<double>(rGraphicUser.maGraphicCropLogic.Right) * (static_cast<double>(aNewSize.Width) / static_cast<double>(aSize100thMM.Width)));
                                         aGraphicCropLogic.Bottom = static_cast<sal_Int32>(static_cast<double>(rGraphicUser.maGraphicCropLogic.Bottom) * (static_cast<double>(aNewSize.Height) / static_cast<double>(aSize100thMM.Height)));
                                     }
-                                    xShapePropertySet->setPropertyValue( "GraphicCrop", Any( aGraphicCropLogic ) );
+                                    xShapePropertySet->setPropertyValue( u"GraphicCrop"_ustr, Any( aGraphicCropLogic ) );
                                 }
                             }
                             else if ( rGraphicUser.mxPropertySet.is() )
@@ -419,20 +419,20 @@ static void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XCompon
                                     bool bLogicalSize;
 
                                     Reference< XPropertySet >& rxPropertySet( rGraphicUser.mxPropertySet );
-                                    rxPropertySet->setPropertyValue( "FillBitmap", Any( xFillBitmap ) );
-                                    if ( ( rxPropertySet->getPropertyValue( "FillBitmapLogicalSize" ) >>= bLogicalSize )
-                                        && ( rxPropertySet->getPropertyValue( "FillBitmapSizeX" ) >>= aSize.Width )
-                                        && ( rxPropertySet->getPropertyValue( "FillBitmapSizeY" ) >>= aSize.Height ) )
+                                    rxPropertySet->setPropertyValue( u"FillBitmap"_ustr, Any( xFillBitmap ) );
+                                    if ( ( rxPropertySet->getPropertyValue( u"FillBitmapLogicalSize"_ustr ) >>= bLogicalSize )
+                                        && ( rxPropertySet->getPropertyValue( u"FillBitmapSizeX"_ustr ) >>= aSize.Width )
+                                        && ( rxPropertySet->getPropertyValue( u"FillBitmapSizeY"_ustr ) >>= aSize.Height ) )
                                     {
                                         if ( !aSize.Width || !aSize.Height )
                                         {
-                                            rxPropertySet->setPropertyValue( "FillBitmapLogicalSize", Any( true ) );
-                                            rxPropertySet->setPropertyValue( "FillBitmapSizeX", Any( rGraphicUser.maLogicalSize.Width ) );
-                                            rxPropertySet->setPropertyValue( "FillBitmapSizeY", Any( rGraphicUser.maLogicalSize.Height ) );
+                                            rxPropertySet->setPropertyValue( u"FillBitmapLogicalSize"_ustr, Any( true ) );
+                                            rxPropertySet->setPropertyValue( u"FillBitmapSizeX"_ustr, Any( rGraphicUser.maLogicalSize.Width ) );
+                                            rxPropertySet->setPropertyValue( u"FillBitmapSizeY"_ustr, Any( rGraphicUser.maLogicalSize.Height ) );
                                         }
                                     }
                                     if ( rGraphicUser.mxPagePropertySet.is() )
-                                        rGraphicUser.mxPagePropertySet->setPropertyValue( "Background", Any( rxPropertySet ) );
+                                        rGraphicUser.mxPagePropertySet->setPropertyValue( u"Background"_ustr, Any( rxPropertySet ) );
                                 }
                             }
                         }
@@ -491,14 +491,14 @@ void ImpOptimizer::Optimize()
     if ( mbDeleteHiddenSlides )
     {
         SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
-        SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
+        SetStatusValue( TK_Status, Any( u"STR_DELETING_SLIDES"_ustr ) );
         DispatchStatus();
         ImpDeleteHiddenSlides( mxModel );
     }
 
     if ( mbDeleteNotesPages )
     {
-        SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
+        SetStatusValue( TK_Status, Any( u"STR_DELETING_SLIDES"_ustr ) );
         DispatchStatus();
         ImpDeleteNotesPages( mxModel );
     }
@@ -506,7 +506,7 @@ void ImpOptimizer::Optimize()
     if ( mbDeleteUnusedMasterPages )
     {
         SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
-        SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
+        SetStatusValue( TK_Status, Any( u"STR_DELETING_SLIDES"_ustr ) );
         DispatchStatus();
         ImpDeleteUnusedMasterPages( mxModel );
     }
@@ -514,7 +514,7 @@ void ImpOptimizer::Optimize()
     if ( mbOLEOptimization )
     {
         SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) );
-        SetStatusValue( TK_Status, Any( OUString("STR_CREATING_OLE_REPLACEMENTS") ) );
+        SetStatusValue( TK_Status, Any( u"STR_CREATING_OLE_REPLACEMENTS"_ustr ) );
         DispatchStatus();
         ImpConvertOLE( mxModel, mnOLEOptimizationType );
     }
@@ -522,7 +522,7 @@ void ImpOptimizer::Optimize()
     if ( mbJPEGCompression || mbRemoveCropArea || mnImageResolution )
     {
         SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 50 ) ) );
-        SetStatusValue( TK_Status, Any( OUString("STR_OPTIMIZING_GRAPHICS") ) );
+        SetStatusValue( TK_Status, Any( u"STR_OPTIMIZING_GRAPHICS"_ustr ) );
         DispatchStatus();
 
         std::vector< GraphicCollector::GraphicEntity > aGraphicList;
@@ -610,7 +610,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
     {
 
         SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) );
-        SetStatusValue( TK_Status, Any( OUString("STR_DUPLICATING_PRESENTATION") ) );
+        SetStatusValue( TK_Status, Any( u"STR_DUPLICATING_PRESENTATION"_ustr ) );
         DispatchStatus();
 
         Reference< XStorable >xStorable( mxModel, UNO_QUERY );
@@ -633,16 +633,16 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
                 nSourceSize = PPPOptimizer::GetFileSize( maSaveAsURL );
 
             SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 30 ) ) );
-            SetStatusValue( TK_Status, Any( OUString("STR_DUPLICATING_PRESENTATION") ) );
+            SetStatusValue( TK_Status, Any( u"STR_DUPLICATING_PRESENTATION"_ustr ) );
             DispatchStatus();
 
             Reference< XDesktop2 > xDesktop = Desktop::create( mxContext );
-            xSelf = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE );
+            xSelf = xDesktop->findFrame( u"_blank"_ustr, FrameSearchFlag::CREATE );
             Reference< XComponentLoader > xComponentLoader( xSelf, UNO_QUERY );
 
-            Sequence< PropertyValue > aLoadProps{ comphelper::makePropertyValue("Hidden", true) };
+            Sequence< PropertyValue > aLoadProps{ comphelper::makePropertyValue(u"Hidden"_ustr, true) };
             mxModel.set( xComponentLoader->loadComponentFromURL(
-                maSaveAsURL, "_self", 0, aLoadProps ), UNO_QUERY );
+                maSaveAsURL, u"_self"_ustr, 0, aLoadProps ), UNO_QUERY );
         }
     }
 
@@ -658,7 +658,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
         Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxDocumentFrame );
         if ( xFrame.is() )
         {
-            DispatchURL(mxContext, ".uno:ClearUndoStack", xFrame);
+            DispatchURL(mxContext, u".uno:ClearUndoStack"_ustr, xFrame);
         }
     }
 
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 9872990a0f45..252863231bff 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -92,8 +92,8 @@ void InformationDialog::InitDialog()
     OUString sSecondary( getString( eInfoString ) );
     static constexpr OUString aOldSizePlaceholder( u"%OLDFILESIZE"_ustr  );
     static constexpr OUString aNewSizePlaceholder( u"%NEWFILESIZE"_ustr  );
-    const OUString aTitlePlaceholder( !aTitle.isEmpty() ? OUString("%TITLE"  )
-                                                         : OUString("'%TITLE'") );
+    const OUString aTitlePlaceholder( !aTitle.isEmpty() ? u"%TITLE"_ustr
+                                                         : u"'%TITLE'"_ustr );
 
     sal_Int32 i = sSecondary.indexOf( aOldSizePlaceholder );
     if ( i >= 0 )
@@ -116,9 +116,9 @@ void InformationDialog::InitDialog()
 InformationDialog::InformationDialog(const Reference< XComponentContext > &rxContext, const Reference<XWindow>& rxDialogParent,
                                      const OUString& rSaveAsURL, bool& rbOpenNewDocument,
                                      sal_Int64 rSourceSize, sal_Int64 rDestSize, sal_Int64 rApproxSize)
-    : MessageDialogController(Application::GetFrameWeld(rxDialogParent), "modules/simpress/ui/pminfodialog.ui", "PMInfoDialog", "ask")
+    : MessageDialogController(Application::GetFrameWeld(rxDialogParent), u"modules/simpress/ui/pminfodialog.ui"_ustr, u"PMInfoDialog"_ustr, u"ask"_ustr)
     , ConfigurationAccess(rxContext)
-    , mxCheckBox(m_xBuilder->weld_check_button("ask"))
+    , mxCheckBox(m_xBuilder->weld_check_button(u"ask"_ustr))
     , mnSourceSize(rSourceSize)
     , mnDestSize(rDestSize)
     , mnApproxSize(rApproxSize)
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 7efef618af9b..8c85d14fcaec 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -53,10 +53,10 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 
 IntroPage::IntroPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
-    : vcl::OWizardPage(pPage, &rOptimizerDialog, "modules/simpress/ui/pmintropage.ui", "PMIntroPage")
+    : vcl::OWizardPage(pPage, &rOptimizerDialog, u"modules/simpress/ui/pmintropage.ui"_ustr, u"PMIntroPage"_ustr)
     , mrOptimizerDialog(rOptimizerDialog)
-    , mxComboBox(m_xBuilder->weld_combo_box("LB_SETTINGS"))
-    , mxButton(m_xBuilder->weld_button("STR_REMOVE"))
+    , mxComboBox(m_xBuilder->weld_combo_box(u"LB_SETTINGS"_ustr))
+    , mxButton(m_xBuilder->weld_button(u"STR_REMOVE"_ustr))
 {
     rOptimizerDialog.SetIntroPage(this);
     mxComboBox->connect_changed(LINK(this, IntroPage, ComboBoxActionPerformed));
@@ -73,13 +73,13 @@ void IntroPage::UpdateControlStates(const std::vector<OUString>& rItemList, int
 }
 
 SlidesPage::SlidesPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
-    : vcl::OWizardPage(pPage, &rOptimizerDialog, "modules/simpress/ui/pmslidespage.ui", "PMSlidesPage")
+    : vcl::OWizardPage(pPage, &rOptimizerDialog, u"modules/simpress/ui/pmslidespage.ui"_ustr, u"PMSlidesPage"_ustr)
     , mrOptimizerDialog(rOptimizerDialog)
-    , mxMasterSlides(m_xBuilder->weld_check_button("STR_DELETE_MASTER_PAGES"))
-    , mxHiddenSlides(m_xBuilder->weld_check_button("STR_DELETE_HIDDEN_SLIDES"))
-    , mxUnusedSlides(m_xBuilder->weld_check_button("STR_CUSTOM_SHOW"))
-    , mxComboBox(m_xBuilder->weld_combo_box("LB_SLIDES"))
-    , mxClearNodes(m_xBuilder->weld_check_button("STR_DELETE_NOTES_PAGES"))
+    , mxMasterSlides(m_xBuilder->weld_check_button(u"STR_DELETE_MASTER_PAGES"_ustr))
+    , mxHiddenSlides(m_xBuilder->weld_check_button(u"STR_DELETE_HIDDEN_SLIDES"_ustr))
+    , mxUnusedSlides(m_xBuilder->weld_check_button(u"STR_CUSTOM_SHOW"_ustr))
+    , mxComboBox(m_xBuilder->weld_combo_box(u"LB_SLIDES"_ustr))
+    , mxClearNodes(m_xBuilder->weld_check_button(u"STR_DELETE_NOTES_PAGES"_ustr))
 {
     rOptimizerDialog.SetSlidesPage(this);
     mxMasterSlides->connect_toggled(LINK(this, SlidesPage, UnusedMasterPagesActionPerformed));
@@ -105,15 +105,15 @@ void SlidesPage::UpdateControlStates(bool bDeleteUnusedMasterPages, bool bDelete
 }
 
 ImagesPage::ImagesPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
-    : vcl::OWizardPage(pPage, &rOptimizerDialog, "modules/simpress/ui/pmimagespage.ui", "PMImagesPage")
+    : vcl::OWizardPage(pPage, &rOptimizerDialog, u"modules/simpress/ui/pmimagespage.ui"_ustr, u"PMImagesPage"_ustr)
     , mrOptimizerDialog(rOptimizerDialog)
-    , m_xLossLessCompression(m_xBuilder->weld_radio_button("STR_LOSSLESS_COMPRESSION"))
-    , m_xQualityLabel(m_xBuilder->weld_label("STR_QUALITY"))
-    , m_xQuality(m_xBuilder->weld_spin_button("SB_QUALITY"))
-    , m_xJpegCompression(m_xBuilder->weld_radio_button("STR_JPEG_COMPRESSION"))
-    , m_xResolution(m_xBuilder->weld_combo_box("LB_RESOLUTION"))
-    , m_xRemoveCropArea(m_xBuilder->weld_check_button("STR_REMOVE_CROP_AREA"))
-    , m_xEmbedLinkedGraphics(m_xBuilder->weld_check_button("STR_EMBED_LINKED_GRAPHICS"))
+    , m_xLossLessCompression(m_xBuilder->weld_radio_button(u"STR_LOSSLESS_COMPRESSION"_ustr))
+    , m_xQualityLabel(m_xBuilder->weld_label(u"STR_QUALITY"_ustr))
+    , m_xQuality(m_xBuilder->weld_spin_button(u"SB_QUALITY"_ustr))
+    , m_xJpegCompression(m_xBuilder->weld_radio_button(u"STR_JPEG_COMPRESSION"_ustr))
+    , m_xResolution(m_xBuilder->weld_combo_box(u"LB_RESOLUTION"_ustr))
+    , m_xRemoveCropArea(m_xBuilder->weld_check_button(u"STR_REMOVE_CROP_AREA"_ustr))
+    , m_xEmbedLinkedGraphics(m_xBuilder->weld_check_button(u"STR_EMBED_LINKED_GRAPHICS"_ustr))
 {
     rOptimizerDialog.SetImagesPage(this);
     m_xRemoveCropArea->connect_toggled(LINK(this, ImagesPage, RemoveCropAreaActionPerformed));
@@ -139,12 +139,12 @@ void ImagesPage::UpdateControlStates(bool bJPEGCompression, int nJPEGQuality, bo
 }
 
 ObjectsPage::ObjectsPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
-    : vcl::OWizardPage(pPage, &rOptimizerDialog, "modules/simpress/ui/pmobjectspage.ui", "PMObjectsPage")
+    : vcl::OWizardPage(pPage, &rOptimizerDialog, u"modules/simpress/ui/pmobjectspage.ui"_ustr, u"PMObjectsPage"_ustr)
     , mrOptimizerDialog(rOptimizerDialog)
-    , m_xCreateStaticImage(m_xBuilder->weld_check_button("STR_OLE_REPLACE"))
-    , m_xAllOLEObjects(m_xBuilder->weld_radio_button("STR_ALL_OLE_OBJECTS"))
-    , m_xForeignOLEObjects(m_xBuilder->weld_radio_button("STR_ALIEN_OLE_OBJECTS_ONLY"))
-    , m_xLabel(m_xBuilder->weld_label("STR_OLE_OBJECTS_DESC"))
+    , m_xCreateStaticImage(m_xBuilder->weld_check_button(u"STR_OLE_REPLACE"_ustr))
+    , m_xAllOLEObjects(m_xBuilder->weld_radio_button(u"STR_ALL_OLE_OBJECTS"_ustr))
+    , m_xForeignOLEObjects(m_xBuilder->weld_radio_button(u"STR_ALIEN_OLE_OBJECTS_ONLY"_ustr))
+    , m_xLabel(m_xBuilder->weld_label(u"STR_OLE_OBJECTS_DESC"_ustr))
 {
     rOptimizerDialog.SetObjectsPage(this);
     m_xCreateStaticImage->connect_toggled(LINK(this, ObjectsPage, OLEOptimizationActionPerformed));
@@ -167,19 +167,19 @@ void ObjectsPage::UpdateControlStates(bool bConvertOLEObjects, int nOLEOptimizat
 }
 
 SummaryPage::SummaryPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
-    : vcl::OWizardPage(pPage, &rOptimizerDialog, "modules/simpress/ui/pmsummarypage.ui", "PMSummaryPage")
+    : vcl::OWizardPage(pPage, &rOptimizerDialog, u"modules/simpress/ui/pmsummarypage.ui"_ustr, u"PMSummaryPage"_ustr)
     , mrOptimizerDialog(rOptimizerDialog)
-    , m_xLabel1(m_xBuilder->weld_label("LABEL1"))
-    , m_xLabel2(m_xBuilder->weld_label("LABEL2"))
-    , m_xLabel3(m_xBuilder->weld_label("LABEL3"))
-    , m_xCurrentSize(m_xBuilder->weld_label("CURRENT_FILESIZE"))
-    , m_xEstimatedSize(m_xBuilder->weld_label("ESTIMATED_FILESIZE"))
-    , m_xStatus(m_xBuilder->weld_label("STR_STATUS"))
-    , m_xProgress(m_xBuilder->weld_progress_bar("PROGRESS"))
-    , m_xApplyToCurrent(m_xBuilder->weld_radio_button("STR_APPLY_TO_CURRENT"))
-    , m_xSaveToNew(m_xBuilder->weld_radio_button("STR_SAVE_AS"))
-    , m_xComboBox(m_xBuilder->weld_combo_box("MY_SETTINGS"))
-    , m_xSaveSettings(m_xBuilder->weld_check_button("STR_SAVE_SETTINGS"))
+    , m_xLabel1(m_xBuilder->weld_label(u"LABEL1"_ustr))
+    , m_xLabel2(m_xBuilder->weld_label(u"LABEL2"_ustr))
+    , m_xLabel3(m_xBuilder->weld_label(u"LABEL3"_ustr))
+    , m_xCurrentSize(m_xBuilder->weld_label(u"CURRENT_FILESIZE"_ustr))
+    , m_xEstimatedSize(m_xBuilder->weld_label(u"ESTIMATED_FILESIZE"_ustr))
+    , m_xStatus(m_xBuilder->weld_label(u"STR_STATUS"_ustr))
+    , m_xProgress(m_xBuilder->weld_progress_bar(u"PROGRESS"_ustr))
+    , m_xApplyToCurrent(m_xBuilder->weld_radio_button(u"STR_APPLY_TO_CURRENT"_ustr))
+    , m_xSaveToNew(m_xBuilder->weld_radio_button(u"STR_SAVE_AS"_ustr))
+    , m_xComboBox(m_xBuilder->weld_combo_box(u"MY_SETTINGS"_ustr))
+    , m_xSaveSettings(m_xBuilder->weld_check_button(u"STR_SAVE_SETTINGS"_ustr))
 {
     rOptimizerDialog.SetSummaryPage(this);
     m_xApplyToCurrent->connect_toggled(LINK(this, SummaryPage, SaveAsNewActionPerformed));
@@ -244,7 +244,7 @@ void OptimizerDialog::InitRoadmap()
          ITEM_ID_SUMMARY}
     );
 
-    m_xAssistant->set_page_side_image(BMP_PRESENTATION_MINIMIZER);
+    m_xAssistant->set_page_side_image(u"" BMP_PRESENTATION_MINIMIZER ""_ustr);
 }
 
 void OptimizerDialog::UpdateConfiguration()
@@ -579,10 +579,10 @@ bool OptimizerDialog::onFinish()
         aURL.Path = "optimize";
 
         Sequence< PropertyValue > lArguments{
-            comphelper::makePropertyValue("Settings", GetConfigurationSequence()),
-            comphelper::makePropertyValue("StatusDispatcher", GetStatusDispatcher()),
-            comphelper::makePropertyValue("DocumentFrame", GetFrame()),
-            comphelper::makePropertyValue("DialogParentWindow", m_xAssistant->GetXWindow())
+            comphelper::makePropertyValue(u"Settings"_ustr, GetConfigurationSequence()),
+            comphelper::makePropertyValue(u"StatusDispatcher"_ustr, GetStatusDispatcher()),
+            comphelper::makePropertyValue(u"DocumentFrame"_ustr, GetFrame()),
+            comphelper::makePropertyValue(u"DialogParentWindow"_ustr, m_xAssistant->GetXWindow())
         };
 
         ErrCode errorCode;
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index d2c4e49f3b95..99f7740be9fa 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -211,7 +211,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
             Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
 
             bool bVisible = true;
-            if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
+            if ( xPropSet->getPropertyValue( u"Visible"_ustr ) >>= bVisible )
             {
                 if (!bVisible )
                     nDeletedSlides++;
@@ -230,7 +230,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
     if ( nDeletedSlides > 1 )
     {
         OUString aStr( getString( STR_DELETE_SLIDES ) );
-        OUString aPlaceholder( "%SLIDES"  );
+        OUString aPlaceholder( u"%SLIDES"_ustr  );
         sal_Int32 i = aStr.indexOf( aPlaceholder );
         if ( i >= 0 )
             aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::number( nDeletedSlides ) );
@@ -248,9 +248,9 @@ void OptimizerDialog::UpdateControlStatesPage4()
     if ( nGraphics > 1 )
     {
         OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );
-        OUString aImagePlaceholder( "%IMAGES"  );
-        OUString aQualityPlaceholder( "%QUALITY"  );
-        OUString aResolutionPlaceholder( "%RESOLUTION"  );
+        OUString aImagePlaceholder( u"%IMAGES"_ustr  );
+        OUString aQualityPlaceholder( u"%QUALITY"_ustr  );
+        OUString aResolutionPlaceholder( u"%RESOLUTION"_ustr  );
         sal_Int32 i = aStr.indexOf( aImagePlaceholder );
         if ( i >= 0 )
             aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::number( nGraphics ) );
@@ -284,7 +284,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
         if ( nOLEReplacements > 1 )
         {
             OUString aStr( getString( STR_CREATE_REPLACEMENT ) );
-            OUString aPlaceholder( "%OLE"  );
+            OUString aPlaceholder( u"%OLE"_ustr  );
             sal_Int32 i = aStr.indexOf( aPlaceholder );
             if ( i >= 0 )
                 aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::number( nOLEReplacements ) );
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 74a89bfbac1a..889bf3a85190 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -51,7 +51,7 @@ void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments
 
 OUString SAL_CALL PPPOptimizerDialog::getImplementationName()
 {
-    return "com.sun.star.comp.PresentationMinimizerImp";
+    return u"com.sun.star.comp.PresentationMinimizerImp"_ustr;
 }
 
 sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName )
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceNa
 
 Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
 {
-    return { "com.sun.star.comp.PresentationMinimizer" };
+    return { u"com.sun.star.comp.PresentationMinimizer"_ustr };
 }
 
 Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch(