-Werror,-Wunused-private-field (Clang towards 3.2)

Change-Id: I4b541b2a0de4fd395a613a47c9a3868199f42513

13 files changed, 23 insertions, 53 deletions

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 7e6a912d77a5..a1c66e3808a1 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -435,7 +435,6 @@ public:
 class MergeDataFile
 {
     private:
-        sal_Bool bErrorLog;
         rtl::OString sErrorLog;
         MergeDataHashMap aMap;
         std::set<rtl::OString> aLanguageSet;
@@ -448,7 +447,7 @@ class MergeDataFile
             const rtl::OString &sFilename, bool bCaseSensitive);
     public:
         explicit MergeDataFile(const rtl::OString &rFileName,
-            const rtl::OString& rFile, bool bErrLog, bool bCaseSensitive = false);
+            const rtl::OString& rFile, bool bCaseSensitive);
         ~MergeDataFile();
 
 
@@ -497,7 +496,6 @@ private:
 
     Export& aExport;
     bool bStart;
-    bool bStartNext;
 
     inline void Pop( std::queue<QueueEntry>& aQueue );
 
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 3311e479305b..bc2a6afa253f 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -40,8 +40,6 @@ class HelpParser
 {
 private:
     rtl::OString sHelpFile;
-    bool       bUTF8;
-    bool       bHasInputList;
 
 #if OSL_DEBUG_LEVEL > 2
     /// Debugmethod, prints the content of the map to stdout
@@ -52,7 +50,7 @@ private:
 #endif
 
 public:
-    HelpParser( const rtl::OString &rHelpFile, bool bUTF8 , bool bHasInputList );
+    HelpParser( const rtl::OString &rHelpFile );
     ~HelpParser(){};
 
 /// Method creates/append a SDF file with the content of a parsed XML file
diff --git a/l10ntools/inc/l10ntools/HelpLinker.hxx b/l10ntools/inc/l10ntools/HelpLinker.hxx
index b718623154c3..4befcd4669a1 100644
--- a/l10ntools/inc/l10ntools/HelpLinker.hxx
+++ b/l10ntools/inc/l10ntools/HelpLinker.hxx
@@ -68,14 +68,12 @@ public:
             throw( HelpProcessingException );
 
     HelpLinker()
-        : init(true)
-        , m_pIndexerPreProcessor(NULL)
+        : m_pIndexerPreProcessor(NULL)
     {}
     ~HelpLinker()
         { delete m_pIndexerPreProcessor; }
 
 private:
-    int locCount, totCount;
     Stringtable additionalFiles;
     HashSet helpFiles;
     fs::path sourceRoot;
@@ -93,7 +91,6 @@ private:
     bool bExtensionMode;
     fs::path indexDirName;
     fs::path indexDirParentName;
-    bool init;
     IndexerPreProcessor* m_pIndexerPreProcessor;
     void initIndexerPreProcessor();
     void link() throw( HelpProcessingException );
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 9649c34abe18..dd9cbf6359d0 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -50,9 +50,7 @@ private:
     sal_uInt16 nError;
     LngLineList *pLines;
     rtl::OString sSource;
-    sal_Bool bDBIsUTF8;
     sal_Bool bULF;
-    bool bQuiet;
     std::vector<rtl::OString> aLanguages;
 
     bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in);
@@ -62,7 +60,7 @@ private:
         const rtl::OString &rPrj, const rtl::OString &rRoot,
         const rtl::OString &rActFileName, const rtl::OString &rID);
 public:
-    LngParser(const rtl::OString &rLngFile, sal_Bool bUTF8,
+    LngParser(const rtl::OString &rLngFile,
         sal_Bool bULFFormat);
     ~LngParser();
 
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index d4232c544cf9..b80d37aaa5fa 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -43,8 +43,6 @@ private:
     sal_Bool bError;
     sal_Bool bText;
 
-    bool sLocalized;
-
     rtl::OString sCurrentOpenTag;
     rtl::OString sCurrentCloseTag;
     rtl::OString sCurrentText;
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 92427af36e21..cca19c9bc1b1 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -48,7 +48,6 @@ namespace {
 namespace global {
 
 bool mergeMode = false;
-bool errorLog = true;
 char const * prj = 0;
 char const * prjRoot = 0;
 char const * inputPathname = 0;
@@ -61,7 +60,7 @@ boost::scoped_ptr< CfgParser > parser;
 void handleArguments(int argc, char ** argv) {
     for (int i = 1; i != argc; ++i) {
         if (std::strcmp(argv[i], "-e") == 0) {
-            global::errorLog = false;
+            // ignored, used to be "Disable writing errorlog"
         } else if (std::strcmp(argv[i], "-i") == 0) {
             if (++i == argc) {
                 global::inputPathname = 0; // no valid command line
@@ -114,7 +113,7 @@ void handleArguments(int argc, char ** argv) {
              " FileIn:   Source files (*.src)\n"
              " FileOut:  Destination file (*.*)\n"
              " DataBase: Mergedata (*.sdf)\n"
-             " -e: Disable writing errorlog\n"
+             " -e: ignored\n"
              " -l: Restrict the handled languages; l1, l2, ... are elements of"
              " (de, en-US, ...)\n"));
         std::exit(EXIT_FAILURE);
@@ -547,7 +546,7 @@ CfgMerge::CfgMerge(
     if (rMergeSource.getLength())
     {
         pMergeDataFile = new MergeDataFile(
-            rMergeSource, global::inputPathname, global::errorLog, true );
+            rMergeSource, global::inputPathname, true );
         if (Export::sLanguages.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")))
         {
             Export::SetLanguages( pMergeDataFile->GetLanguages() );
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index fc6f5bcaf5c4..9cc3a56c296a 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -52,7 +52,6 @@ MergeDataFile * pMergeDataFile = 0; //TODO
 namespace global {
 
 bool mergeMode = false;
-bool errorLog = true;
 char const * prj = 0;
 char const * prjRoot = 0;
 char const * inputPathname = 0;
@@ -65,7 +64,7 @@ boost::scoped_ptr< Export > exporter;
 void handleArguments(int argc, char ** argv) {
     for (int i = 1; i != argc; ++i) {
         if (std::strcmp(argv[i], "-e") == 0) {
-            global::errorLog = false;
+            // ingored, used to be "Disable writing errorlog"
         } else if (std::strcmp(argv[i], "-i") == 0) {
             if (++i == argc) {
                 global::inputPathname = 0; // no valid command line
@@ -118,7 +117,7 @@ void handleArguments(int argc, char ** argv) {
              " FileIn:   Source files (*.src)\n"
              " FileOut:  Destination file (*.*)\n"
              " DataBase: Mergedata (*.sdf)\n"
-             " -e: Disable writing errorlog\n"
+             " -e: ignored\n"
              " -l: Restrict the handled languages; l1, l2, ... are elements of"
              " (de, en-US, ...)\n"));
         std::exit(EXIT_FAILURE);
@@ -321,7 +320,7 @@ Export::~Export()
 
     if ( bMergeMode ) {
         if ( !pMergeDataFile )
-            pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, global::errorLog);
+            pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, false);
 
         delete pMergeDataFile;
     }
@@ -1588,7 +1587,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
 
     // search for merge data
     if ( !pMergeDataFile ){
-        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, global::errorLog );
+        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, false );
 
         // Init Languages
         if( Export::sLanguages.equalsIgnoreAsciiCase("ALL") )
@@ -1689,7 +1688,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
 /*****************************************************************************/
 {
     if ( !pMergeDataFile ){
-        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, global::errorLog );
+        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, false );
 
         // Init Languages
         if (Export::sLanguages.equalsIgnoreAsciiCase("ALL"))
@@ -2063,8 +2062,7 @@ ParserQueue::ParserQueue( Export& aExportObj )
           bLastWasM( false ),
           bMflag( false ) ,
           aExport( aExportObj ) ,
-          bStart( false ) ,
-          bStartNext( false )
+          bStart( false )
 {
           aQueueNext = new std::queue<QueueEntry>;
           aQueueCur  = new std::queue<QueueEntry>;
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index cad9c559908e..7896fdd8598a 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -56,8 +56,6 @@
 rtl::OString sInputFile;
 sal_Bool bEnableExport;
 sal_Bool bMergeMode;
-sal_Bool bErrorLog;
-sal_Bool bUTF8;
 rtl::OString sPrj;
 rtl::OString sPrjRoot;
 rtl::OString sOutputFile;
@@ -71,8 +69,6 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
 {
     bEnableExport = sal_False;
     bMergeMode = sal_False;
-    bErrorLog = sal_True;
-    bUTF8 = sal_True;
     sPrj = "";
     sPrjRoot = "";
     Export::sLanguages = "";
@@ -104,7 +100,6 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
         else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-E" )))
         {
             nState = STATE_ERRORLOG;
-            bErrorLog = sal_False;
         }
         else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-L" )))
             nState = STATE_LANGUAGES;
@@ -197,12 +192,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
     bool hasNoError = true;
 
     if ( sOutputFile.getLength() ){                                               // Merge single file ?
-        HelpParser aParser( sInputFile, bUTF8 , false );
+        HelpParser aParser( sInputFile );
 
         if ( bMergeMode )
         {
             //sal_uInt64 startreadloc = Export::startMessure();
-            MergeDataFile aMergeDataFile(sSDFFile, sInputFile, sal_False);
+            MergeDataFile aMergeDataFile(sSDFFile, sInputFile, false);
 
             hasNoError = aParser.Merge( sSDFFile, sOutputFile , Export::sLanguages , aMergeDataFile );
         }
@@ -233,7 +228,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 
             aFStream.close();
             rtl::OString sHelpFile; // dummy
-            MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, sal_False );
+            MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, false );
 
             std::vector<rtl::OString> aLanguages;
             HelpParser::parse_languages( aLanguages , aMergeDataFile );
@@ -243,7 +238,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
             {
                 sHelpFile = *pos;
 
-                HelpParser aParser( sHelpFile , bUTF8 , true );
+                HelpParser aParser( sHelpFile );
                 hasNoError = aParser.Merge( sSDFFile , sOutputFileX , sOutputFileY , true , aLanguages , aMergeDataFile , bCreateDir );
                 bCreateDir = false;
             }
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 3ac3c57839e5..6f4071e32053 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -77,10 +77,8 @@ void HelpParser::Dump(LangHashMap* rElem_in,const rtl::OString & sKey_in)
 }
 #endif
 
-HelpParser::HelpParser( const rtl::OString &rHelpFile, bool rUTF8 , bool rHasInputList  )
-        : sHelpFile( rHelpFile ),
-          bUTF8    ( rUTF8     ),
-          bHasInputList( rHasInputList )
+HelpParser::HelpParser( const rtl::OString &rHelpFile )
+        : sHelpFile( rHelpFile )
           {};
 
 /*****************************************************************************/
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index 5f8f8cd57031..0e910badfff7 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -51,7 +51,6 @@
 rtl::OString sInputFile;
 sal_Bool bEnableExport;
 sal_Bool bMergeMode;
-sal_Bool bErrorLog;
 sal_Bool bUTF8;
 sal_Bool bULF; // ULF = Unicode Language File
 rtl::OString sPrj;
@@ -65,7 +64,6 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
 {
     bEnableExport = sal_False;
     bMergeMode = sal_False;
-    bErrorLog = sal_True;
     bUTF8 = sal_True;
     bULF = sal_False;
     sPrj = "";
@@ -91,7 +89,6 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
         else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-E")))
         {
             nState = STATE_ERRORLOG;
-            bErrorLog = sal_False;
         }
         else if (sSwitch.equalsL(RTL_CONSTASCII_STRINGPARAM("-L")))
             nState = STATE_LANGUAGES;
@@ -166,7 +163,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 
     if (!sOutputFile.isEmpty())
     {
-        LngParser aParser( sInputFile, bUTF8, bULF );
+        LngParser aParser( sInputFile, bULF );
         if ( bMergeMode )
             aParser.Merge(sMergeSrc, sOutputFile);
         else
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 6541bd9ab2ba..09cac112adeb 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -47,12 +47,11 @@ rtl::OString getBracketedContent(rtl::OString text) {
 //
 // class LngParser
 //
-LngParser::LngParser(const rtl::OString &rLngFile, sal_Bool bUTF8,
+LngParser::LngParser(const rtl::OString &rLngFile,
     sal_Bool bULFFormat)
     : nError( LNG_OK )
     , pLines( NULL )
     , sSource( rLngFile )
-    , bDBIsUTF8( bUTF8 )
     , bULF( bULFFormat )
 {
     pLines = new LngLineList();
@@ -189,7 +188,7 @@ sal_Bool LngParser::Merge(
     }
     nError = LNG_OK;
 
-    MergeDataFile aMergeDataFile( rSDFFile, sSource, sal_False );
+    MergeDataFile aMergeDataFile( rSDFFile, sSource, false );
     rtl::OString sTmp( Export::sLanguages );
     if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) )
         Export::SetLanguages( aMergeDataFile.GetLanguages() );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index b77e86b80a46..5da52c57d640 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -139,9 +139,7 @@ sal_Bool MergeData::operator==( ResData *pData )
 MergeDataFile::MergeDataFile(
     const rtl::OString &rFileName,
     const rtl::OString &rFile,
-    bool bErrLog,
     bool bCaseSensitive)
-    : bErrorLog( bErrLog )
 {
     std::ifstream aInputStream(rFileName.getStr());
     const ::rtl::OString sHACK(RTL_CONSTASCII_STRINGPARAM("HACK"));
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index a26e866388af..7d2a01f2215e 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -58,7 +58,6 @@ void YYWarning( const char * );
 // set of global variables
 sal_Bool bEnableExport;
 sal_Bool bMergeMode;
-sal_Bool bErrorLog;
 sal_Bool bUTF8;
 sal_Bool bDisplayName;
 sal_Bool bExtensionDescription;
@@ -81,7 +80,6 @@ extern char *GetOutputFile( int argc, char* argv[])
 {
     bEnableExport = sal_False;
     bMergeMode = sal_False;
-    bErrorLog = sal_True;
     bUTF8 = sal_True;
     bDisplayName = sal_False;
     bExtensionDescription = sal_False;
@@ -112,7 +110,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         }
         else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-E" ) {
             nState = STATE_ERRORLOG;
-            bErrorLog = sal_False;
         }
         else if ( rtl::OString( argv[ i ] ).toAsciiUpperCase() == "-L" ) {
             nState = STATE_LANGUAGES;
@@ -577,7 +574,7 @@ XRMResMerge::XRMResMerge(
 {
     if (!rMergeSource.isEmpty())
         pMergeDataFile = new MergeDataFile(
-            rMergeSource, sInputFileName, bErrorLog);
+            rMergeSource, sInputFileName, false);
     if( Export::sLanguages.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")))
     {
         Export::SetLanguages( pMergeDataFile->GetLanguages() );