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.

9 files changed, 135 insertions, 183 deletions

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 4160e190062c..7a4f2e42e9d5 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -174,8 +174,7 @@ private:
 
 protected:
                     // Implementation
-                    FileStat( const void *pInfo,      // CInfoPBRec
-                              const void *pVolInfo ); // ParamBlockRec
+                    FileStat( SAL_UNUSED_PARAMETER const void *pInfo ); // CInfoPBRec
 
 public:
                     FileStat();
@@ -229,27 +228,18 @@ friend class FileCopier;
 
 private:
     TOOLS_DLLPRIVATE            DirEntry( const rtl::OString& rInitName,
-                                  DirEntryFlag aDirFlag,
-                                  FSysPathStyle eStyle );
+                                  DirEntryFlag aDirFlag );
 
     friend class Dir;
     friend class FileStat;
     friend const char* ImpCheckDirEntry( const void* p );
 
-    TOOLS_DLLPRIVATE FSysError          ImpParseName( const rtl::OString& rIntiName,
-                                      FSysPathStyle eParser );
-#if defined(WNT)
-    TOOLS_DLLPRIVATE FSysError          ImpParseOs2Name( const rtl::OString& rPfad,
-                                         FSysPathStyle eStyle );
-#else
-    TOOLS_DLLPRIVATE FSysError          ImpParseUnixName( const rtl::OString& rPfad,
-                                          FSysPathStyle eStyle );
-#endif
+    TOOLS_DLLPRIVATE FSysError          ImpParseName( const rtl::OString& rIntiName );
     TOOLS_DLLPRIVATE const DirEntry*    ImpGetTopPtr() const;
     TOOLS_DLLPRIVATE DirEntry*          ImpGetTopPtr();
 
 protected:
-    void                ImpTrim( FSysPathStyle eStyle );
+    void                ImpTrim();
     const rtl::OString& ImpTheName() const;
     DirEntryFlag        ImpTheFlag() const { return eFlag; };
     DirEntry*           ImpChangeParent( DirEntry* pNewParent, sal_Bool bNormalize = sal_True );
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index c6587cc5c12f..f0bf3e7a0625 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.hxx
@@ -41,12 +41,14 @@ struct ImpSvGlobalName
     sal_uInt8       szData[ 16 ];
     sal_uInt16      nRefCount;
 
+    enum Empty { EMPTY };
+
                 ImpSvGlobalName()
                 {
                     nRefCount = 0;
                 }
                 ImpSvGlobalName( const ImpSvGlobalName & rObj );
-                ImpSvGlobalName( int );
+                ImpSvGlobalName( Empty );
 
     sal_Bool    operator == ( const ImpSvGlobalName & rObj ) const;
 };
diff --git a/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx
index 02187e339187..974119355359 100644
--- a/tools/inc/tools/link.hxx
+++ b/tools/inc/tools/link.hxx
@@ -66,7 +66,7 @@ typedef long (*PSTUB)( void*, void* );
     long Class::Method( Class* pThis, ArgType ArgName )
 
 #define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
-    long Class::Method( Class*, ArgType ArgName )
+    long Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )
 
 #define LINK( Inst, Class, Member ) \
     Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member )
diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx
index a5840d77b34d..e89136317a6d 100644
--- a/tools/inc/tools/tenccvt.hxx
+++ b/tools/inc/tools/tenccvt.hxx
@@ -29,7 +29,6 @@
 #define _TOOLS_TENCCVT_HXX
 
 #include <rtl/textenc.h>
-#include <tools/solar.h>
 #include "tools/toolsdllapi.h"
 
 // ----------------------------------------
@@ -51,8 +50,8 @@ TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedTextEncoding( rtl_TextEncoding eEnco
 // is returned (normally windows-1252).
 TOOLS_DLLPUBLIC rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding );
 
-TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 nVersion = SOFFICE_FILEFORMAT_50 );
-TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 nVersion = SOFFICE_FILEFORMAT_50 );
+TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding );
+TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding );
 
 /*
  * Given a Unicode character, return a legacy Microsoft Encoding which
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 2f726d03fe66..df3f16392a01 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -335,15 +335,9 @@ rtl::OString ImplCutPath( const rtl::OString& rStr, sal_Int32 nMax, char cAccDel
     return aCutPath.makeStringAndClear();
 }
 
-#if defined(WNT)
-/*************************************************************************
-|*
-|*    DirEntry::ImpParseOs2Name()
-|*
-*************************************************************************/
-
-FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eStyle  )
+FSysError DirEntry::ImpParseName( const rtl::OString& rPfad )
 {
+#if defined(WNT)
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
     // die einzelnen Namen auf einen Stack packen
@@ -374,7 +368,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS
                 if ( aPfad.GetChar(nPos) == '\\' || aPfad.GetChar(nPos) == '/' )
                     break;
             aName = rtl::OUStringToOString(aPfad.Copy( 2, nPos-2 ), osl_getThreadTextEncoding());
-            aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT, eStyle ) );
+            aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT ) );
         }
         // ist der Name die Root des aktuellen Drives?
         else if ( nPos == 0 && aPfad.Len() > 0 &&
@@ -402,7 +396,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS
                         return FSYS_ERR_MISPLACEDCHAR;
                     }
                     // Root-Directory des Drive
-                    aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT, eStyle ) );
+                    aStack.Push( new DirEntry( aName, FSYS_FLAG_ABSROOT ) );
                 }
                 else
                 {
@@ -419,7 +413,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS
 
                     // liegt jetzt nichts mehr auf dem Stack?
                     if ( aStack.Empty() )
-                        aStack.Push( new DirEntry( aName, FSYS_FLAG_RELROOT, eStyle ) );
+                        aStack.Push( new DirEntry( aName, FSYS_FLAG_RELROOT ) );
                 }
             }
 
@@ -459,7 +453,7 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS
                 else
                 {
                     // normalen Entries kommen auf den Stack
-                    DirEntry *pNew = new DirEntry( aName, FSYS_FLAG_NORMAL, eStyle );
+                    DirEntry *pNew = new DirEntry( aName, FSYS_FLAG_NORMAL );
                     if ( !pNew->IsValid() )
                     {
                         aName = rPfad;
@@ -512,27 +506,115 @@ FSysError DirEntry::ImpParseOs2Name( const rtl::OString& rPfad, FSysPathStyle eS
     if ( nErr )
         aName = rPfad;
     return nErr;
-}
-#endif
+#else
+    DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
-/*************************************************************************
-|*
-|*    DirEntry::ImpParseName()
-|*
-*************************************************************************/
+    // die einzelnen Namen auf einen Stack packen
+    DirEntryStack   aStack;
+    rtl::OString aPfad(rPfad);
+    do
+    {
+        // den Namen vor dem ersten "/" abspalten,
+        // falls '/' am Anfang, ist der Name '/',
+        // der Rest immer ohne die fuehrenden '/'.
+        // den ersten '/' suchen
+        sal_uInt16 nPos;
+        for ( nPos = 0;
+              nPos < aPfad.getLength() && aPfad[nPos] != '/';
+              nPos++ )
+            /* do nothing */;
 
-FSysError DirEntry::ImpParseName( const rtl::OString& rbInitName,
-                                  FSysPathStyle eStyle )
-{
-    if ( eStyle == FSYS_STYLE_HOST )
-        eStyle = DEFSTYLE;
+            // ist der Name die Root des aktuellen Drives?
+        if ( nPos == 0 && !aPfad.isEmpty() && ( aPfad[0] == '/' ) )
+        {
+            // Root-Directory des aktuellen Drives
+            aStack.Push( new DirEntry( FSYS_FLAG_ABSROOT ) );
+        }
+        else
+        {
+            // den Namen ohne Trenner abspalten
+            aName = aPfad.copy(0, nPos);
 
-#if defined(WNT)
-    return ImpParseOs2Name( rbInitName, eStyle );
-#else
-    return ImpParseUnixName( rbInitName, eStyle );
+                        // stellt der Name die aktuelle Directory dar?
+            if ( aName == "." )
+                /* do nothing */;
+
+#ifdef UNX
+            // stellt der Name das User-Dir dar?
+            else if ( aName == "~" )
+            {
+                DirEntry aHome( String( (const char *) getenv( "HOME" ), osl_getThreadTextEncoding()) );
+                for ( sal_uInt16 n = aHome.Level(); n; --n )
+                    aStack.Push( new DirEntry( aHome[ (sal_uInt16) n-1 ] ) );
+            }
 #endif
+            // stellt der Name die Parent-Directory dar?
+            else if ( aName == ".." )
+            {
+                // ist nichts, ein Parent oder eine relative Root
+                // auf dem Stack?
+                if ( ( aStack.Empty() ) || ( aStack.Top()->eFlag == FSYS_FLAG_PARENT ) )
+                {
+                    // fuehrende Parents kommen auf den Stack
+                    aStack.Push( new DirEntry(rtl::OString(), FSYS_FLAG_PARENT) );
+                }
+                // ist es eine absolute Root
+                else if ( aStack.Top()->eFlag == FSYS_FLAG_ABSROOT )
+                {
+                    // die hat keine Parent-Directory
+                    return FSYS_ERR_NOTEXISTS;
+                }
+                else
+                    // sonst hebt der Parent den TOS auf
+                    delete aStack.Pop();
+            }
+            else
+            {
+                DirEntry *pNew = NULL;
+                // normalen Entries kommen auf den Stack
+                pNew = new DirEntry( aName, FSYS_FLAG_NORMAL );
+                if ( !pNew->IsValid() )
+                {
+                    aName = rPfad;
+                    ErrCode eErr = pNew->GetError();
+                    delete pNew;
+                    return eErr;
+                }
+                aStack.Push( pNew );
+            }
+        }
+
+        // den Restpfad bestimmen
+        aPfad = nPos < aPfad.getLength()
+            ? aPfad.copy(nPos + 1) : rtl::OString();
+        while ( !aPfad.isEmpty() && ( aPfad[0] == '/' ) )
+            aPfad = aPfad.copy(1);
+    }
+    while (!aPfad.isEmpty());
+
+    // Haupt-Entry (selbst) zuweisen
+    if ( aStack.Empty() )
+    {
+        eFlag = FSYS_FLAG_CURRENT;
+        aName = rtl::OString();
+    }
+    else
+    {
+        eFlag = aStack.Top()->eFlag;
+        aName = aStack.Top()->aName;
+        delete aStack.Pop();
+    }
+
+    // die Parent-Entries vom Stack holen
+    DirEntry** pTemp = &pParent;
+    while ( !aStack.Empty() )
+    {
+        *pTemp = aStack.Pop();
+        pTemp = &( (*pTemp)->pParent );
+    }
 
+    return FSYS_ERR_OK;
+#endif
 }
 
 /*************************************************************************
@@ -559,7 +641,7 @@ static FSysPathStyle GetStyle( FSysPathStyle eStyle )
 |*
 *************************************************************************/
 
-void DirEntry::ImpTrim( FSysPathStyle /* eStyle */ )
+void DirEntry::ImpTrim()
 {
     // Wildcards werden nicht geclipt
     if ( ( aName.indexOf( '*' ) != -1 ) ||
@@ -588,8 +670,7 @@ void DirEntry::ImpTrim( FSysPathStyle /* eStyle */ )
 |*
 *************************************************************************/
 
-DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag,
-                    FSysPathStyle eStyle ) :
+DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
 #ifdef FEAT_FSYS_DOUBLESPEED
             pStat( 0 ),
 #endif
@@ -601,7 +682,7 @@ DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag,
     eFlag           = eDirFlag;
     nError          = FSYS_ERR_OK;
 
-    ImpTrim( eStyle );
+    ImpTrim();
 }
 
 /*************************************************************************
@@ -683,7 +764,7 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
 #endif
     }
 
-    nError  = ImpParseName( aTmpName, eStyle );
+    nError  = ImpParseName( aTmpName );
 
     if ( nError != FSYS_ERR_OK )
         eFlag = FSYS_FLAG_INVALID;
@@ -729,7 +810,7 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle )
     }
 #endif
 
-    nError  = ImpParseName( aTmpName, eStyle );
+    nError  = ImpParseName( aTmpName );
 
     if ( nError != FSYS_ERR_OK )
         eFlag = FSYS_FLAG_INVALID;
@@ -1700,125 +1781,6 @@ const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const
     return *pRes;
 }
 
-#if !defined(WNT)
-/*************************************************************************
-|*
-|*    DirEntry::ImpParseUnixName()
-|*
-*************************************************************************/
-
-FSysError DirEntry::ImpParseUnixName( const rtl::OString& rPfad, FSysPathStyle eStyle )
-{
-    DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
-    // die einzelnen Namen auf einen Stack packen
-    DirEntryStack   aStack;
-    rtl::OString aPfad(rPfad);
-    do
-    {
-        // den Namen vor dem ersten "/" abspalten,
-        // falls '/' am Anfang, ist der Name '/',
-        // der Rest immer ohne die fuehrenden '/'.
-        // den ersten '/' suchen
-        sal_uInt16 nPos;
-        for ( nPos = 0;
-              nPos < aPfad.getLength() && aPfad[nPos] != '/';
-              nPos++ )
-            /* do nothing */;
-
-            // ist der Name die Root des aktuellen Drives?
-        if ( nPos == 0 && !aPfad.isEmpty() && ( aPfad[0] == '/' ) )
-        {
-            // Root-Directory des aktuellen Drives
-            aStack.Push( new DirEntry( FSYS_FLAG_ABSROOT ) );
-        }
-        else
-        {
-            // den Namen ohne Trenner abspalten
-            aName = aPfad.copy(0, nPos);
-
-                        // stellt der Name die aktuelle Directory dar?
-            if ( aName == "." )
-                /* do nothing */;
-
-#ifdef UNX
-            // stellt der Name das User-Dir dar?
-            else if ( aName == "~" )
-            {
-                DirEntry aHome( String( (const char *) getenv( "HOME" ), osl_getThreadTextEncoding()) );
-                for ( sal_uInt16 n = aHome.Level(); n; --n )
-                    aStack.Push( new DirEntry( aHome[ (sal_uInt16) n-1 ] ) );
-            }
-#endif
-            // stellt der Name die Parent-Directory dar?
-            else if ( aName == ".." )
-            {
-                // ist nichts, ein Parent oder eine relative Root
-                // auf dem Stack?
-                if ( ( aStack.Empty() ) || ( aStack.Top()->eFlag == FSYS_FLAG_PARENT ) )
-                {
-                    // fuehrende Parents kommen auf den Stack
-                    aStack.Push( new DirEntry(rtl::OString(), FSYS_FLAG_PARENT, eStyle) );
-                }
-                // ist es eine absolute Root
-                else if ( aStack.Top()->eFlag == FSYS_FLAG_ABSROOT )
-                {
-                    // die hat keine Parent-Directory
-                    return FSYS_ERR_NOTEXISTS;
-                }
-                else
-                    // sonst hebt der Parent den TOS auf
-                    delete aStack.Pop();
-            }
-            else
-            {
-                DirEntry *pNew = NULL;
-                // normalen Entries kommen auf den Stack
-                pNew = new DirEntry( aName, FSYS_FLAG_NORMAL, eStyle );
-                if ( !pNew->IsValid() )
-                {
-                    aName = rPfad;
-                    ErrCode eErr = pNew->GetError();
-                    delete pNew;
-                    return eErr;
-                }
-                aStack.Push( pNew );
-            }
-        }
-
-        // den Restpfad bestimmen
-        aPfad = nPos < aPfad.getLength()
-            ? aPfad.copy(nPos + 1) : rtl::OString();
-        while ( !aPfad.isEmpty() && ( aPfad[0] == '/' ) )
-            aPfad = aPfad.copy(1);
-    }
-    while (!aPfad.isEmpty());
-
-    // Haupt-Entry (selbst) zuweisen
-    if ( aStack.Empty() )
-    {
-        eFlag = FSYS_FLAG_CURRENT;
-        aName = rtl::OString();
-    }
-    else
-    {
-        eFlag = aStack.Top()->eFlag;
-        aName = aStack.Top()->aName;
-        delete aStack.Pop();
-    }
-
-    // die Parent-Entries vom Stack holen
-    DirEntry** pTemp = &pParent;
-    while ( !aStack.Empty() )
-    {
-        *pTemp = aStack.Pop();
-        pTemp = &( (*pTemp)->pParent );
-    }
-
-    return FSYS_ERR_OK;
-}
-#endif
-
 #define MAX_EXT_MAX       250
 #define MAX_LEN_MAX       255
 #define INVALID_CHARS_DEF   "\\/\"':|^<>?*"
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 9cea604c99a4..b53caac54763 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -324,7 +324,7 @@ sal_uInt16 DirReader_Impl::Read()
                     0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT
                 :   0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
                 :   FSYS_FLAG_NORMAL;
-            DirEntry *pTemp = new DirEntry(rtl::OString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX);
+            DirEntry *pTemp = new DirEntry(rtl::OString(pDosEntry->d_name), eFlag);
             if ( pParent )
                 pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False);
             FileStat aStat( *pTemp );
@@ -356,7 +356,7 @@ sal_uInt16 DirReader_Impl::Read()
 |*
 *************************************************************************/
 
-FileStat::FileStat( const void *, const void * ):
+FileStat::FileStat( const void * ):
     aDateCreated(0),
     aTimeCreated(0),
     aDateModified(0),
@@ -371,7 +371,7 @@ FileStat::FileStat( const void *, const void * ):
 |*    FileStat::Update()
 |*
 *************************************************************************/
-sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool )
+sal_Bool FileStat::Update( const DirEntry& rDirEntry, SAL_UNUSED_PARAMETER sal_Bool )
 {
 
     nSize = 0;
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 932973cb82e5..98784801a026 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -238,7 +238,7 @@ USHORT DirReader_Impl::Init()
         {
             sDrive[0] = c;
             sRoot[0] = c;
-            DirEntry* pDrive = new DirEntry( sDrive, FSYS_FLAG_VOLUME, FSYS_STYLE_HOST );
+            DirEntry* pDrive = new DirEntry( sDrive, FSYS_FLAG_VOLUME );
             if ( pDir->aNameMask.Matches( String(rtl::OStringToOUString(sDrive, osl_getThreadTextEncoding())) ) && GetDriveType( sRoot ) != 1 )
             {
                 if ( pDir->pStatLst ) //Status fuer Sort gewuenscht?
@@ -313,7 +313,7 @@ USHORT DirReader_Impl::Read()
                 :   0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
                 :   FSYS_FLAG_NORMAL;
             DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry->d_name),
-                                            eFlag, FSYS_STYLE_NTFS );
+                                            eFlag );
 #ifdef FEAT_FSYS_DOUBLESPEED
             pTemp->ImpSetStat( new FileStat( (void*) pDosDir, (void*) 0 ) );
 #endif
@@ -404,8 +404,7 @@ void FileStat::ImpInit( void* p )
 |*
 *************************************************************************/
 
-FileStat::FileStat( const void *pInfo,      // struct dirent
-                    const void * ):         // dummy
+FileStat::FileStat( const void *pInfo ): // struct dirent
     aDateCreated(0),
     aTimeCreated(0),
     aDateModified(0),
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 12333c6a94f5..6a57099b0db7 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -44,7 +44,7 @@ ImpSvGlobalName::ImpSvGlobalName( const ImpSvGlobalName & rObj )
 }
 
 /************** class ImpSvGlobalName ************************************/
-ImpSvGlobalName::ImpSvGlobalName( int )
+ImpSvGlobalName::ImpSvGlobalName( Empty )
 {
     nRefCount = 1;
     memset( szData, 0, sizeof( szData ) );
@@ -63,7 +63,7 @@ sal_Bool ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
 *************************************************************************/
 SvGlobalName::SvGlobalName()
 {
-    static ImpSvGlobalName aNoName( 0 );
+    static ImpSvGlobalName aNoName( ImpSvGlobalName::EMPTY );
 
     pImp = &aNoName;
     pImp->nRefCount++;
diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx
index 7abb0c4b5327..6022443f6421 100644
--- a/tools/source/string/tenccvt.cxx
+++ b/tools/source/string/tenccvt.cxx
@@ -83,14 +83,14 @@ rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding )
 
 // -----------------------------------------------------------------------
 
-rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ )
+rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding )
 {
     return GetExtendedCompatibilityTextEncoding( GetOneByteTextEncoding( eEncoding ) );
 }
 
 // -----------------------------------------------------------------------
 
-rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ )
+rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding )
 {
     return GetExtendedTextEncoding( GetOneByteTextEncoding( eEncoding ) );
 }