Removed some unused parameters; added SAL_UNUSED_PARAMETER.

SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC)
is used to annotate legitimately unused parameters, so that static
analysis tools can tell legitimately unused parameters from truly
unnecessary ones.  To that end, some patches for external modules
are also added, that are only applied when compiling with GCC and
add necessary __attribute__ ((unused)) in headers.

4 files changed, 11 insertions, 11 deletions

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a4d2f8002da7..6b749fca29bc 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -469,9 +469,9 @@ public:
     MergeData( const ByteString &rTyp, const ByteString &rGID, const ByteString &rLID , const ByteString &rFilename )
             : sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename ) {};
     ~MergeData();
-    PFormEntrys* GetPFormEntrys( ResData *pResData );
+    PFormEntrys* GetPFormEntries();
 
-    void Insert( const ByteString& rPFO , PFormEntrys* pfEntrys );
+    void Insert( PFormEntrys* pfEntrys );
     PFormEntrys* GetPFObject( const ByteString& rPFO );
 
     ByteString Dump();
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index da78d3994132..b98d7297d6e4 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -124,7 +124,7 @@ public:
 
     void WriteError( LazySvFileStream &aErrOut, sal_Bool bRequireSourceLine );
     void WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLine );
-    void WriteFixed( LazySvFileStream &aFixOut, sal_Bool bRequireSourceLine );
+    void WriteFixed( LazySvFileStream &aFixOut );
 };
 
 #endif
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index f8ee2e0a1726..354bb8d65c97 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -720,7 +720,7 @@ void GSIBlock::WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLi
     }
 }
 
-void GSIBlock::WriteFixed( LazySvFileStream &aFixOut, sal_Bool /*bRequireSourceLine*/ )
+void GSIBlock::WriteFixed( LazySvFileStream &aFixOut )
 {
     if ( pSourceLine && !pSourceLine->IsFixed() && bCheckSourceLang )
         return;
@@ -1100,7 +1100,7 @@ int _cdecl main( int argc, char *argv[] )
                         if ( bWriteCorrect )
                             pBlock->WriteCorrect( aOkOut, aSourceLang.Len() != 0 );
                         if ( bWriteFixed )
-                            pBlock->WriteFixed( aFixOut, aSourceLang.Len() != 0 );
+                            pBlock->WriteFixed( aFixOut );
 
                         delete pBlock;
                     }
@@ -1168,7 +1168,7 @@ int _cdecl main( int argc, char *argv[] )
         if ( bWriteCorrect )
             pBlock->WriteCorrect( aOkOut, aSourceLang.Len() != 0 );
         if ( bWriteFixed )
-            pBlock->WriteFixed( aFixOut, aSourceLang.Len() != 0 );
+            pBlock->WriteFixed( aFixOut );
 
         delete pBlock;
     }
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index db31f186abeb..a2c7f8e67dfd 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -122,14 +122,14 @@ MergeData::~MergeData()
 {
 }
 
-PFormEntrys* MergeData::GetPFormEntrys(ResData*)
+PFormEntrys* MergeData::GetPFormEntries()
 {
     if( aMap.find( ByteString("HACK") ) != aMap.end() )
         return aMap[ ByteString("HACK") ];
     return NULL;
 }
 
-void MergeData::Insert(const ByteString&, PFormEntrys* pfEntrys )
+void MergeData::Insert(PFormEntrys* pfEntrys )
 {
     aMap.insert( PFormEntrysHashMap::value_type( ByteString("HACK") , pfEntrys ) );
 }
@@ -291,7 +291,7 @@ PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData )
     // search for requested PFormEntrys
     MergeData *pData = GetMergeData( pResData );
     if ( pData )
-        return pData->GetPFormEntrys( pResData );
+        return pData->GetPFormEntries();
     return NULL;
 }
 
@@ -300,7 +300,7 @@ PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData )
     // search for requested PFormEntrys
     MergeData *pData = GetMergeData( pResData , true );
     if ( pData )
-        return pData->GetPFormEntrys( pResData );
+        return pData->GetPFormEntries();
     return NULL;
 }
 
@@ -336,7 +336,7 @@ void MergeDataFile::InsertEntry(
     {
         // create new PFormEntrys, cause no one exists with current properties
         pFEntrys = new PFormEntrys( rPFO );
-        pData->Insert( rPFO , pFEntrys );
+        pData->Insert( pFEntrys );
     }
 
     // finaly insert the cur string