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>

4 files changed, 22 insertions, 20 deletions

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 0a9ad85582e3..09d5dd63060d 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -176,7 +176,6 @@ struct XmlFilterBaseImpl
     typedef RefMap< OUString, Relations > RelationsMap;
 
     FastParser                     maFastParser;
-    const OUString                 maBinSuffix;
     RelationsMap                   maRelationsMap;
     TextFieldStack                 maTextFieldStack;
     const NamespaceMap&            mrNamespaceMap;
@@ -185,8 +184,9 @@ struct XmlFilterBaseImpl
     explicit            XmlFilterBaseImpl();
 };
 
+static const OUStringLiteral gaBinSuffix( ".bin" );
+
 XmlFilterBaseImpl::XmlFilterBaseImpl() :
-    maBinSuffix( ".bin" ),
     mrNamespaceMap(StaticNamespaceMap::get())
 {
     // register XML namespaces
@@ -348,7 +348,7 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
         return false;
 
     // try to import binary streams (fragment extension must be '.bin')
-    if (aFragmentPath.endsWith(mxImpl->maBinSuffix))
+    if (aFragmentPath.endsWith(gaBinSuffix))
     {
         try
         {
@@ -420,7 +420,7 @@ Reference<XDocument> XmlFilterBase::importFragment( const OUString& aFragmentPat
         return xRet;
 
     // binary streams (fragment extension is '.bin') currently not supported
-    if (aFragmentPath.endsWith(mxImpl->maBinSuffix))
+    if (aFragmentPath.endsWith(gaBinSuffix))
         return xRet;
 
     // try to import XML stream
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 4929dc26749f..32557dd8dc1c 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -88,16 +88,17 @@ void ObjectContainer::createContainer() const
     OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
 }
 
+static const OUStringLiteral gaDashNameBase(      "msLineDash " );      ///< Base name for all named line dashes.
+static const OUStringLiteral gaGradientNameBase(  "msFillGradient " );  ///< Base name for all named fill gradients.
+static const OUStringLiteral gaTransGradNameBase( "msTransGradient " ); ///< Base name for all named fill gradients.
+static const OUStringLiteral gaBitmapUrlNameBase( "msFillBitmap " );    ///< Base name for all named fill bitmap URLs.
+
 ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     maMarkerContainer(    rxModelFactory, "com.sun.star.drawing.MarkerTable" ),
     maDashContainer(      rxModelFactory, "com.sun.star.drawing.DashTable" ),
     maGradientContainer(  rxModelFactory, "com.sun.star.drawing.GradientTable" ),
     maTransGradContainer(  rxModelFactory, "com.sun.star.drawing.TransparencyGradientTable" ),
-    maBitmapUrlContainer( rxModelFactory, "com.sun.star.drawing.BitmapTable" ),
-    maDashNameBase(      "msLineDash " ),
-    maGradientNameBase(  "msFillGradient " ),
-    maTransGradNameBase( "msTransGradient " ),
-    maBitmapUrlNameBase( "msFillBitmap " )
+    maBitmapUrlContainer( rxModelFactory, "com.sun.star.drawing.BitmapTable" )
 {
 }
 
@@ -116,24 +117,24 @@ bool ModelObjectHelper::insertLineMarker( const OUString& rMarkerName, const Pol
 
 OUString ModelObjectHelper::insertLineDash( const LineDash& rDash )
 {
-    return maDashContainer.insertObject( maDashNameBase, Any( rDash ), true );
+    return maDashContainer.insertObject( gaDashNameBase, Any( rDash ), true );
 }
 
 OUString ModelObjectHelper::insertFillGradient( const awt::Gradient& rGradient )
 {
-    return maGradientContainer.insertObject( maGradientNameBase, Any( rGradient ), true );
+    return maGradientContainer.insertObject( gaGradientNameBase, Any( rGradient ), true );
 }
 
 OUString ModelObjectHelper::insertTransGrandient( const awt::Gradient& rGradient )
 {
-    return maTransGradContainer.insertObject( maTransGradNameBase, Any( rGradient ), true );
+    return maTransGradContainer.insertObject( gaTransGradNameBase, Any( rGradient ), true );
 }
 
 OUString ModelObjectHelper::insertFillBitmapXGraphic(uno::Reference<graphic::XGraphic> const & rxGraphic)
 {
     uno::Reference<awt::XBitmap> xBitmap(rxGraphic, uno::UNO_QUERY);
     if (xBitmap.is())
-        return maBitmapUrlContainer.insertObject(maBitmapUrlNameBase, Any(xBitmap), true);
+        return maBitmapUrlContainer.insertObject(gaBitmapUrlNameBase, Any(xBitmap), true);
     return OUString();
 }
 
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index ada01ab5f022..6a6de0cbfe52 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -98,12 +98,12 @@ public:
 private:
     ::std::set< OUString >
                         maCtrlNames;
-    const OUString      maDummyBaseName;
     sal_Int32           mnIndex;
 };
 
+static const OUStringLiteral gaDummyBaseName( "DummyGroupSep" );
+
 VbaControlNamesSet::VbaControlNamesSet() :
-    maDummyBaseName( "DummyGroupSep" ),
     mnIndex( 0 )
 {
 }
@@ -120,7 +120,7 @@ OUString VbaControlNamesSet::generateDummyName()
     OUString aCtrlName;
     do
     {
-        aCtrlName = maDummyBaseName + OUString::number( ++mnIndex );
+        aCtrlName = gaDummyBaseName + OUString::number( ++mnIndex );
     }
     while( maCtrlNames.count( aCtrlName ) > 0 );
     maCtrlNames.insert( aCtrlName );
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 4545b6924a41..0dcb588bf931 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -258,13 +258,14 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars )
 
 } // namespace
 
+static const OString gaOpeningCData( "<![CDATA[" );
+static const OString gaClosingCData( "]]>" );
+
 InputStream::InputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm ) :
     // use single-byte ISO-8859-1 encoding which maps all byte characters to the first 256 Unicode characters
     mxTextStrm( TextInputStream::createXTextInputStream( rxContext, rxInStrm, RTL_TEXTENCODING_ISO_8859_1 ) ),
     maOpeningBracket( 1 ),
     maClosingBracket( 1 ),
-    maOpeningCData( "<![CDATA[" ),
-    maClosingCData( "]]>" ),
     mnBufferPos( 0 )
 {
     if (!mxTextStrm.is())
@@ -352,10 +353,10 @@ void InputStream::updateBuffer()
             // read the element text (add the leading opening bracket manually)
             OString aElement = OString( '<' ) + readToElementEnd();
             // check for CDATA part, starting with '<![CDATA['
-            if( aElement.match( maOpeningCData ) )
+            if( aElement.match( gaOpeningCData ) )
             {
                 // search the end tag ']]>'
-                while( ((aElement.getLength() < maClosingCData.getLength()) || !aElement.endsWith( maClosingCData )) && !mxTextStrm->isEOF() )
+                while( ((aElement.getLength() < gaClosingCData.getLength()) || !aElement.endsWith( gaClosingCData )) && !mxTextStrm->isEOF() )
                     aElement += readToElementEnd();
                 // copy the entire CDATA part
                 aBuffer.append( aElement );