new loplugin:conststringfield

Look for const string fields which can be static, and
mostly convert them to OUStringLiteral

And add a getLength() method to OUStringLiteral to make
the transition easier.

Remove dead code in XclExpRoot::GenerateDefaultEncryptionData,
default password is never empty.

Change-Id: Iae75514d9dbb87289fd5b016222f640abe755091
Reviewed-on: https://gerrit.libreoffice.org/59204
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 42 insertions, 50 deletions

diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 49d0cf9dfa65..bbca0cc47d30 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -51,10 +51,10 @@ namespace sdr { namespace table {
 
 static SvxBorderLine gEmptyBorder;
 
+static const OUStringLiteral gsSize( "Size" );
 
 TableLayouter::TableLayouter( const TableModelRef& xTableModel )
 : mxTable( xTableModel )
-, msSize( "Size" )
 {
 }
 
@@ -572,7 +572,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
             }
             else
             {
-                xColSet->getPropertyValue( msSize ) >>= nColWidth;
+                xColSet->getPropertyValue( gsSize ) >>= nColWidth;
             }
 
             maColumns[nCol].mnSize = nColWidth;
@@ -650,7 +650,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
         if( bFit )
         {
             Reference< XPropertySet > xColSet( xCols->getByIndex(nCol), UNO_QUERY_THROW );
-            xColSet->setPropertyValue( msSize, Any( maColumns[nCol].mnSize ) );
+            xColSet->setPropertyValue( gsSize, Any( maColumns[nCol].mnSize ) );
         }
     }
 
@@ -732,7 +732,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
             }
             else
             {
-                xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
+                xRowSet->getPropertyValue( gsSize ) >>= nRowHeight;
             }
 
             maRows[nRow].mnSize = nRowHeight;
@@ -807,7 +807,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
         if( bFit )
         {
             Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow), UNO_QUERY_THROW );
-            xRowSet->setPropertyValue( msSize, Any( maRows[nRow].mnSize ) );
+            xRowSet->setPropertyValue( gsSize, Any( maRows[nRow].mnSize ) );
         }
     }
 
@@ -1070,7 +1070,7 @@ void TableLayouter::DistributeColumns( ::tools::Rectangle& rArea, sal_Int32 nFir
                 nWidth = nAllWidth; // last column get round errors
 
             Reference< XPropertySet > xColSet( xCols->getByIndex( nCol ), UNO_QUERY_THROW );
-            xColSet->setPropertyValue( msSize, Any( nWidth ) );
+            xColSet->setPropertyValue( gsSize, Any( nWidth ) );
 
             nAllWidth -= nWidth;
         }
@@ -1120,7 +1120,7 @@ void TableLayouter::DistributeRows( ::tools::Rectangle& rArea, sal_Int32 nFirstR
                 nHeight = nAllHeight; // last row get round errors
 
             Reference< XPropertySet > xRowSet( xRows->getByIndex( nRow ), UNO_QUERY_THROW );
-            xRowSet->setPropertyValue( msSize, Any( nHeight ) );
+            xRowSet->setPropertyValue( gsSize, Any( nHeight ) );
 
             nAllHeight -= nHeight;
         }
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index b664daa505c1..b411b5a48883 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -138,8 +138,6 @@ private:
 
     BorderLineMap maHorizontalBorders;
     BorderLineMap maVerticalBorders;
-
-    const OUString msSize;
 };
 
 } }
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 1cfaa372da6a..edd0ff610beb 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -60,7 +60,6 @@ private:
     SvStream& mrStrm;
     SdrTableObj& mrObj;
     Reference< XTable > mxTable;
-    const OUString msSize;
 };
 
 void SdrTableObj::ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj )
@@ -69,11 +68,12 @@ void SdrTableObj::ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj )
     aEx.Write();
 }
 
+static const OUStringLiteral gsSize( "Size" );
+
 SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj )
 : mrStrm( rStrm )
 , mrObj( rObj )
 , mxTable( rObj.getTable() )
-, msSize( "Size" )
 {
 }
 
@@ -100,7 +100,7 @@ void SdrTableRtfExporter::Write()
     {
         Reference< XPropertySet > xSet( xColumns->getByIndex(nCol), UNO_QUERY_THROW );
         sal_Int32 nWidth = 0;
-        xSet->getPropertyValue( msSize ) >>= nWidth;
+        xSet->getPropertyValue( gsSize ) >>= nWidth;
         nPos += HundMMToTwips( nWidth );
         aColumnStart.push_back( nPos );
     }
@@ -129,7 +129,7 @@ void SdrTableRtfExporter::Write()
 void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart )
 {
     sal_Int32 nRowHeight = 0;
-    xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
+    xRowSet->getPropertyValue( gsSize ) >>= nRowHeight;
 
     mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" );
     mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteCharPtr( OString::number(nRowHeight).getStr() );
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 69f26bcfb673..438aa466b89c 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -360,6 +360,9 @@ double ExtrusionDepthDialog::getDepth() const
 double const aDepthListInch[] = { 0, 1270,2540,5080,10160 };
 double const aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
 
+static const OUStringLiteral gsExtrusionDepth( ".uno:ExtrusionDepth" );
+static const OUStringLiteral gsMetricUnit(     ".uno:MetricUnit"     );
+
 ExtrusionDepthWindow::ExtrusionDepthWindow(
     svt::ToolboxController& rController,
     vcl::Window* pParentWindow
@@ -367,8 +370,6 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
     , mrController( rController )
     , meUnit(FUNIT_NONE)
     , mfDepth( -1.0 )
-    , msExtrusionDepth( ".uno:ExtrusionDepth" )
-    , msMetricUnit(     ".uno:MetricUnit"     )
 {
     SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
 
@@ -389,8 +390,8 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
 
     SetOutputSizePixel( getMenuSize() );
 
-    AddStatusListener( msExtrusionDepth );
-    AddStatusListener( msMetricUnit );
+    AddStatusListener( gsExtrusionDepth );
+    AddStatusListener( gsMetricUnit );
 }
 
 void ExtrusionDepthWindow::implSetDepth( double fDepth )
@@ -447,7 +448,7 @@ void ExtrusionDepthWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
 )
 {
-    if( Event.FeatureURL.Main == msExtrusionDepth )
+    if( Event.FeatureURL.Main == gsExtrusionDepth )
     {
         if( !Event.IsEnabled )
         {
@@ -460,7 +461,7 @@ void ExtrusionDepthWindow::statusChanged(
                 implSetDepth( fValue );
         }
     }
-    else if( Event.FeatureURL.Main == msMetricUnit )
+    else if( Event.FeatureURL.Main == gsMetricUnit )
     {
         if( Event.IsEnabled )
         {
@@ -509,10 +510,10 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl, ToolbarMenu*, void)
             }
 
             Sequence< PropertyValue > aArgs( 1 );
-            aArgs[0].Name = msExtrusionDepth.copy(5);
+            aArgs[0].Name = OUString(gsExtrusionDepth).copy(5);
             aArgs[0].Value <<= fDepth;
 
-            mrController.dispatchCommand( msExtrusionDepth,  aArgs );
+            mrController.dispatchCommand( gsExtrusionDepth,  aArgs );
             implSetDepth( fDepth );
 
             if ( IsInPopupMode() )
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index eec41088e312..2f0d58c1c3b0 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -107,8 +107,6 @@ private:
     svt::ToolboxController& mrController;
     FieldUnit   meUnit;
     double      mfDepth;
-    const OUString msExtrusionDepth;
-    const OUString msMetricUnit;
 
     DECL_LINK( SelectHdl, ToolbarMenu*, void );
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index f29a4bbe33d5..e5e40c9e06a8 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -283,17 +283,16 @@ public:
 private:
     svt::ToolboxController& mrController;
 
-    const OUString msFontworkAlignment;
-
     DECL_LINK( SelectHdl, ToolbarMenu*, void );
 
     void    implSetAlignment( int nAlignmentMode, bool bEnabled );
 };
 
+static const OUStringLiteral gsFontworkAlignment(".uno:FontworkAlignment");
+
 FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rController, vcl::Window* pParentWindow)
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , msFontworkAlignment(".uno:FontworkAlignment")
 {
     SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) );
 
@@ -311,7 +310,7 @@ FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rContro
 
     SetOutputSizePixel( getMenuSize() );
 
-    AddStatusListener( msFontworkAlignment );
+    AddStatusListener( gsFontworkAlignment );
 }
 
 void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
@@ -326,7 +325,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
 
 void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event )
 {
-    if( Event.FeatureURL.Main == msFontworkAlignment )
+    if( Event.FeatureURL.Main == gsFontworkAlignment )
     {
         if( !Event.IsEnabled )
         {
@@ -350,10 +349,10 @@ IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void)
     if( nAlignment >= 0 )
     {
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = msFontworkAlignment.copy(5);
+        aArgs[0].Name = OUString(gsFontworkAlignment).copy(5);
         aArgs[0].Value <<= nAlignment;
 
-        mrController.dispatchCommand( msFontworkAlignment, aArgs );
+        mrController.dispatchCommand( gsFontworkAlignment, aArgs );
 
         implSetAlignment( nAlignment, true );
     }
@@ -433,21 +432,18 @@ public:
 private:
     svt::ToolboxController& mrController;
 
-    const OUString msFontworkCharacterSpacing;
-    const OUString msFontworkKernCharacterPairs;
-
     DECL_LINK( SelectHdl, ToolbarMenu*, void );
 
     void    implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
     void    implSetKernCharacterPairs( bool bEnabled );
 
 };
+static const OUStringLiteral gsFontworkCharacterSpacing(".uno:FontworkCharacterSpacing");
+static const OUStringLiteral gsFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs");
 
 FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::ToolboxController& rController, vcl::Window* pParentWindow)
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , msFontworkCharacterSpacing(".uno:FontworkCharacterSpacing")
-    , msFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs")
 {
     SetSelectHdl( LINK( this, FontworkCharacterSpacingWindow, SelectHdl ) );
 
@@ -462,8 +458,8 @@ FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::ToolboxContr
 
     SetOutputSizePixel( getMenuSize() );
 
-    AddStatusListener( msFontworkCharacterSpacing );
-    AddStatusListener( msFontworkKernCharacterPairs );
+    AddStatusListener( gsFontworkCharacterSpacing );
+    AddStatusListener( gsFontworkKernCharacterPairs );
 }
 
 void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled )
@@ -500,7 +496,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool bEnabled )
 
 void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event )
 {
-    if( Event.FeatureURL.Main == msFontworkCharacterSpacing )
+    if( Event.FeatureURL.Main == gsFontworkCharacterSpacing )
     {
         if( !Event.IsEnabled )
         {
@@ -513,7 +509,7 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta
                 implSetCharacterSpacing( nValue, true );
         }
     }
-    else if( Event.FeatureURL.Main == msFontworkKernCharacterPairs )
+    else if( Event.FeatureURL.Main == gsFontworkKernCharacterPairs )
     {
         if( !Event.IsEnabled )
         {
@@ -548,7 +544,7 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void)
     if ( nSelection == 5 )  // custom spacing
     {
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = msFontworkCharacterSpacing.copy(5);
+        aArgs[0].Name = OUString(gsFontworkCharacterSpacing).copy(5);
         aArgs[0].Value <<= nCharacterSpacing;
 
         mrController.dispatchCommand( ".uno:FontworkCharacterSpacingDialog", aArgs );
@@ -556,20 +552,20 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void)
     else if ( nSelection == 6 ) // KernCharacterPairs
     {
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = msFontworkKernCharacterPairs.copy(5);
+        aArgs[0].Name = OUString(gsFontworkKernCharacterPairs).copy(5);
         aArgs[0].Value <<= true;
 
-        mrController.dispatchCommand( msFontworkKernCharacterPairs, aArgs );
+        mrController.dispatchCommand( gsFontworkKernCharacterPairs, aArgs );
 
         implSetKernCharacterPairs( true );
     }
     else if( nSelection >= 0 )
     {
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = msFontworkCharacterSpacing.copy(5);
+        aArgs[0].Name = OUString(gsFontworkCharacterSpacing).copy(5);
         aArgs[0].Value <<= nCharacterSpacing;
 
-        mrController.dispatchCommand( msFontworkCharacterSpacing,  aArgs );
+        mrController.dispatchCommand( gsFontworkCharacterSpacing,  aArgs );
 
         implSetCharacterSpacing( nCharacterSpacing, true );
     }
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index b3859a92acfd..03cb04a7b17b 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -120,10 +120,11 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
     bStreamClosed = true;
 }
 
+static const OUStringLiteral gaReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME );
+static const OUStringLiteral gaReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 );
+
 SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
     WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
-    maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
-    maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ),
     mpDocPersist( nullptr ),
     meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ),
     mpStreamMap( nullptr )
@@ -132,8 +133,6 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
 
 SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) :
     WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
-    maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
-    maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ),
     mpDocPersist( nullptr ),
     meCreateMode( SvXMLEmbeddedObjectHelperMode::Read ),
     mpStreamMap( nullptr )
@@ -282,8 +281,8 @@ bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
             bool bOASIS = mxRootStorage.is() &&
                 ( SotStorage::GetVersion( mxRootStorage ) > SOFFICE_FILEFORMAT_60 );
             rContainerStorageName = bOASIS
-                    ? maReplacementGraphicsContainerStorageName
-                    : maReplacementGraphicsContainerStorageName60;
+                    ? gaReplacementGraphicsContainerStorageName
+                    : gaReplacementGraphicsContainerStorageName60;
 
             if( pGraphicRepl )
                 *pGraphicRepl = true;