loplugin:constfields in reportdesign,sal,sax

and improve the rewriter so I spend less time fixing formatting

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

6 files changed, 66 insertions, 66 deletions

diff --git a/sal/textenc/convertbig5hkscs.hxx b/sal/textenc/convertbig5hkscs.hxx
index 089ac5845c95..1a2d1d689e47 100644
--- a/sal/textenc/convertbig5hkscs.hxx
+++ b/sal/textenc/convertbig5hkscs.hxx
@@ -34,7 +34,7 @@ struct ImplBig5HkscsConverterData
     sal_Int32 const * m_pUnicodeToBig5Hkscs2001PlaneOffsets;
     ImplUniToDBCSHighTab const * m_pUnicodeToBig5Data;
     ImplDBCSEUDCData const * m_pEudcData;
-    int m_nEudcCount;
+    int const m_nEudcCount;
 };
 
 void * ImplCreateBig5HkscsToUnicodeContext();
diff --git a/sal/textenc/convertgb18030.hxx b/sal/textenc/convertgb18030.hxx
index 680384794eb4..d3b3621dab24 100644
--- a/sal/textenc/convertgb18030.hxx
+++ b/sal/textenc/convertgb18030.hxx
@@ -26,18 +26,18 @@
 
 struct ImplGb180302000ToUnicodeRange
 {
-    sal_Int32 m_nNonRangeDataIndex;
-    sal_uInt32 m_nFirstLinear;
-    sal_uInt32 m_nPastLinear;
-    sal_Unicode m_nFirstUnicode;
+    sal_Int32 const m_nNonRangeDataIndex;
+    sal_uInt32 const m_nFirstLinear;
+    sal_uInt32 const m_nPastLinear;
+    sal_Unicode const m_nFirstUnicode;
 };
 
 struct ImplUnicodeToGb180302000Range
 {
-    sal_Int32 m_nNonRangeDataIndex;
-    sal_Unicode m_nFirstUnicode;
-    sal_Unicode m_nLastUnicode;
-    sal_uInt32 m_nFirstLinear;
+    sal_Int32 const m_nNonRangeDataIndex;
+    sal_Unicode const m_nFirstUnicode;
+    sal_Unicode const m_nLastUnicode;
+    sal_uInt32 const m_nFirstLinear;
 };
 
 struct ImplGb18030ConverterData
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
index 635a881432fd..9eb6b928021c 100644
--- a/sal/textenc/convertsimple.cxx
+++ b/sal/textenc/convertsimple.cxx
@@ -22,8 +22,8 @@ namespace {
 
 struct ImplReplaceCharData
 {
-    sal_uInt16      mnUniChar;
-    sal_uInt16      mnReplaceChar;
+    sal_uInt16 const mnUniChar;
+    sal_uInt16 const mnReplaceChar;
 };
 
 static ImplReplaceCharData const aImplRepCharTab[] =
@@ -353,8 +353,8 @@ sal_uInt16 ImplGetReplaceChar( sal_Unicode c )
 
 struct ImplReplaceCharStrData
 {
-    sal_uInt16      mnUniChar;
-    sal_uInt16      maReplaceChars[IMPL_MAX_REPLACECHAR];
+    sal_uInt16 const mnUniChar;
+    sal_uInt16 const maReplaceChars[IMPL_MAX_REPLACECHAR];
 };
 
 static ImplReplaceCharStrData const aImplRepCharStrTab[] =
diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx
index 2a22ce82026b..53749db49d46 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.hxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.hxx
@@ -40,7 +40,7 @@ struct BmpUnicodeToSingleByteRange {
     /**
        The start of the range of BMP Unicode code points.
      */
-    sal_Unicode unicode;
+    sal_Unicode const unicode;
 
     /**
        The extend of the range of BMP Unicode code points.
@@ -49,7 +49,7 @@ struct BmpUnicodeToSingleByteRange {
        inclusive.  It is an error if <code>unicode + range</code> is greater
        than <code>0xFFFF</code>.</p>
      */
-    sal_uInt8 range;
+    sal_uInt8 const range;
 
     /**
        The start of the corresponding range of individual bytes.
@@ -57,7 +57,7 @@ struct BmpUnicodeToSingleByteRange {
        <p>It is an error if <code>byte + range</code> is greater than
        <code>0xFF</code>.</p>
      */
-    sal_uInt8 byte;
+    sal_uInt8 const byte;
 };
 
 /**
@@ -77,12 +77,12 @@ struct BmpUnicodeToSingleByteConverterData {
        <p>Illegal units from the single-byte character set are mapped to
        <code>0xFFFF</code>.</p>
      */
-    sal_Unicode byteToUnicode[256];
+    sal_Unicode const byteToUnicode[256];
 
     /**
        The number of Unicode-to-byte conversion ranges.
      */
-    std::size_t unicodeToByteEntries;
+    std::size_t const unicodeToByteEntries;
 
     /**
        The array of Unicode-to-byte conversion ranges, sorted by increasing
diff --git a/sal/textenc/tenchelp.hxx b/sal/textenc/tenchelp.hxx
index 901156730da5..655641ab606c 100644
--- a/sal/textenc/tenchelp.hxx
+++ b/sal/textenc/tenchelp.hxx
@@ -73,14 +73,14 @@ typedef void (* ImplResetUnicodeContextProc)(void * pContext);
 struct ImplTextConverter
 {
     void const * mpConvertData;
-    ImplConvertToUnicodeProc mpConvertTextToUnicodeProc;
-    ImplConvertToTextProc mpConvertUnicodeToTextProc;
-    ImplCreateTextContextProc mpCreateTextToUnicodeContext;
-    ImplDestroyTextContextProc mpDestroyTextToUnicodeContext;
-    ImplResetTextContextProc mpResetTextToUnicodeContext;
-    ImplCreateUnicodeContextProc mpCreateUnicodeToTextContext;
-    ImplDestroyUnicodeContextProc mpDestroyUnicodeToTextContext;
-    ImplResetUnicodeContextProc mpResetUnicodeToTextContext;
+    ImplConvertToUnicodeProc const mpConvertTextToUnicodeProc;
+    ImplConvertToTextProc const mpConvertUnicodeToTextProc;
+    ImplCreateTextContextProc const mpCreateTextToUnicodeContext;
+    ImplDestroyTextContextProc const mpDestroyTextToUnicodeContext;
+    ImplResetTextContextProc const mpResetTextToUnicodeContext;
+    ImplCreateUnicodeContextProc const mpCreateUnicodeToTextContext;
+    ImplDestroyUnicodeContextProc const mpDestroyUnicodeToTextContext;
+    ImplResetUnicodeContextProc const mpResetUnicodeToTextContext;
 };
 
 /* ----------------------------- */
@@ -90,13 +90,13 @@ struct ImplTextConverter
 struct SAL_DLLPUBLIC_RTTI ImplTextEncodingData
 {
     ImplTextConverter maConverter;
-    sal_uInt8 mnMinCharSize;
-    sal_uInt8 mnMaxCharSize;
-    sal_uInt8 mnAveCharSize;
-    sal_uInt8 mnBestWindowsCharset;
+    sal_uInt8 const mnMinCharSize;
+    sal_uInt8 const mnMaxCharSize;
+    sal_uInt8 const mnAveCharSize;
+    sal_uInt8 const mnBestWindowsCharset;
     char const * mpBestUnixCharset;
     char const * mpBestMimeCharset;
-    sal_uInt32 mnInfoFlags;
+    sal_uInt32 const mnInfoFlags;
 };
 
 /* ----------------------------------- */
@@ -105,9 +105,9 @@ struct SAL_DLLPUBLIC_RTTI ImplTextEncodingData
 
 struct ImplUniCharTabData
 {
-    sal_uInt16                      mnUniChar;
-    unsigned char                       mnChar;
-    unsigned char                       mnChar2;
+    sal_uInt16 const                mnUniChar;
+    unsigned char const                 mnChar;
+    unsigned char const                 mnChar2;
         // to cater for mappings like MS1258 with 1--2 bytes per Unicode char,
         // 0 if unused
 };
@@ -116,18 +116,18 @@ struct ImplByteConvertData
 {
     const sal_uInt16*               mpToUniTab1;
     const sal_uInt16*               mpToUniTab2;
-    unsigned char                       mnToUniStart1;
-    unsigned char                       mnToUniEnd1;
-    unsigned char                       mnToUniStart2;
-    unsigned char                       mnToUniEnd2;
+    unsigned char const                 mnToUniStart1;
+    unsigned char const                 mnToUniEnd1;
+    unsigned char const                 mnToUniStart2;
+    unsigned char const                 mnToUniEnd2;
     const unsigned char*                mpToCharTab1;
     const unsigned char*                mpToCharTab2;
     const ImplUniCharTabData*       mpToCharExTab;
-    sal_uInt16                      mnToCharStart1;
-    sal_uInt16                      mnToCharEnd1;
-    sal_uInt16                      mnToCharStart2;
-    sal_uInt16                      mnToCharEnd2;
-    sal_uInt16                      mnToCharExCount;
+    sal_uInt16 const                mnToCharStart1;
+    sal_uInt16 const                mnToCharEnd1;
+    sal_uInt16 const                mnToCharStart2;
+    sal_uInt16 const                mnToCharEnd2;
+    sal_uInt16 const                mnToCharExCount;
 };
 
 /* ----------------------------------- */
@@ -136,32 +136,32 @@ struct ImplByteConvertData
 
 struct ImplDBCSEUDCData
 {
-    unsigned char                       mnLeadStart;
-    unsigned char                       mnLeadEnd;
-    unsigned char                       mnTrail1Start;
-    unsigned char                       mnTrail1End;
-    unsigned char                       mnTrail2Start;
-    unsigned char                       mnTrail2End;
-    unsigned char                       mnTrail3Start;
-    unsigned char                       mnTrail3End;
-    unsigned char                       mnTrailCount;
-    sal_uInt16                      mnTrailRangeCount;
-    sal_uInt16                      mnUniStart;
-    sal_uInt16                      mnUniEnd;
+    unsigned char const                 mnLeadStart;
+    unsigned char const                 mnLeadEnd;
+    unsigned char const                 mnTrail1Start;
+    unsigned char const                 mnTrail1End;
+    unsigned char const                 mnTrail2Start;
+    unsigned char const                 mnTrail2End;
+    unsigned char const                 mnTrail3Start;
+    unsigned char const                 mnTrail3End;
+    unsigned char const                 mnTrailCount;
+    sal_uInt16 const                mnTrailRangeCount;
+    sal_uInt16 const                mnUniStart;
+    sal_uInt16 const                mnUniEnd;
 };
 
 struct ImplDBCSToUniLeadTab
 {
-    sal_uInt16                      mnUniChar;
-    sal_uInt8                       mnTrailStart;
-    sal_uInt8                       mnTrailEnd;
+    sal_uInt16 const                mnUniChar;
+    sal_uInt8 const                 mnTrailStart;
+    sal_uInt8 const                 mnTrailEnd;
     const sal_uInt16*               mpToUniTrailTab;
 };
 
 struct ImplUniToDBCSHighTab
 {
-    sal_uInt8                       mnLowStart;
-    sal_uInt8                       mnLowEnd;
+    sal_uInt8 const                 mnLowStart;
+    sal_uInt8 const                 mnLowEnd;
     const sal_uInt16*               mpToUniTrailTab;
 };
 
@@ -169,12 +169,12 @@ struct ImplDBCSConvertData
 {
     const ImplDBCSToUniLeadTab*     mpToUniLeadTab;
     const ImplUniToDBCSHighTab*     mpToDBCSHighTab;
-    unsigned char                       mnLeadStart;
-    unsigned char                       mnLeadEnd;
-    unsigned char                       mnTrailStart;
-    unsigned char                       mnTrailEnd;
+    unsigned char const                 mnLeadStart;
+    unsigned char const                 mnLeadEnd;
+    unsigned char const                 mnTrailStart;
+    unsigned char const                 mnTrailEnd;
     const ImplDBCSEUDCData*         mpEUDCTab;
-    sal_uInt16                      mnEUDCCount;
+    sal_uInt16 const                mnEUDCCount;
 };
 
 /* ---------------------------------- */
diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index 1e285652e080..91b98c056f68 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -105,7 +105,7 @@ static bool Impl_matchString( const char* pCompStr, const char* pMatchStr )
 struct ImplStrCharsetDef
 {
     const char*             mpCharsetStr;
-    rtl_TextEncoding            meTextEncoding;
+    rtl_TextEncoding const  meTextEncoding;
 };
 
 struct ImplStrFirstPartCharsetDef