callcatcher: regenerate list

7 files changed, 3 insertions, 94 deletions

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index b1fcc1ec9f1f..6ad3de9889c2 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -280,7 +280,6 @@ public:
                                  sal_uInt16 nMaxChars = STRING_MAXLEN ) const;
 
     DirEntry            TempName( DirEntryKind = FSYS_KIND_NONE ) const;
-    static const DirEntry& SetTempNameBase( const String &rBaseName );
     sal_Bool                MakeShortName( const String& rLongName,
                                        DirEntryKind eCreateKind = FSYS_KIND_NONE,
                                        sal_Bool bUseTilde = sal_True,
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index e0a55099cf6e..c598efd42c70 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -380,7 +380,6 @@ public:
     // next Tell() <= nSize
     sal_Bool        SetStreamSize( sal_Size nSize );
 
-    sal_Bool        ReadLine( ByteString& rStr );
     sal_Bool        ReadLine( rtl::OString& rStr );
     sal_Bool        WriteLine( const rtl::OString& rStr );
 
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 22aecff2038e..b91170a5249b 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -246,7 +246,6 @@ public:
     void                SearchAndReplaceAll( const ByteString& rStr, const ByteString& rRepStr );
     void                SearchAndReplaceAll( const sal_Char* pCharStr, const ByteString& rRepStr );
 
-    xub_StrLen          GetTokenCount( sal_Char cTok = ';' ) const;
     void                SetToken( xub_StrLen nToken, sal_Char cTok, const ByteString& rStr,
                                   xub_StrLen nIndex = 0 );
     ByteString          GetToken( xub_StrLen nToken, sal_Char cTok, xub_StrLen& rIndex ) const;
@@ -354,6 +353,9 @@ private:
                                      // Append(sal_Unicode)
     void                operator +=(int); // not implemented; to detect misuses
                                           // of operator +=(sal_Unicode)
+                        UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
+                                   rtl_TextEncoding eTextEncoding,
+                                   sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); //not implemented, removed
 
     //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
     TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 );
@@ -370,9 +372,6 @@ public:
                         UniString( const ByteString& rByteStr,
                                    rtl_TextEncoding eTextEncoding,
                                    sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
-                        UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
-                                   rtl_TextEncoding eTextEncoding,
-                                   sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
                         UniString( const sal_Char* pByteStr,
                                    rtl_TextEncoding eTextEncoding,
                                    sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
@@ -508,7 +507,6 @@ public:
     void                SearchAndReplaceAll( const UniString& rStr, const UniString& rRepStr );
     void                SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const UniString& rRepStr );
 
-    xub_StrLen          GetTokenCount( sal_Unicode cTok = ';' ) const;
     void                SetToken( xub_StrLen nToken, sal_Unicode cTok, const UniString& rStr,
                                   xub_StrLen nIndex = 0 );
     UniString           GetToken( xub_StrLen nToken, sal_Unicode cTok, xub_StrLen& rIndex ) const;
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 38138f80c08a..20251dfeee40 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1569,34 +1569,6 @@ String DirEntry::GetSearchDelimiter( FSysPathStyle eFormatter )
 *************************************************************************/
 namespace { struct TempNameBase_Impl : public rtl::Static< DirEntry, TempNameBase_Impl > {}; }
 
-const DirEntry& DirEntry::SetTempNameBase( const String &rBase )
-{
-        DirEntry aTempDir = DirEntry().TempName().GetPath();
-        aTempDir += DirEntry( rBase );
-#ifdef UNX
-        rtl::OString aName(rtl::OUStringToOString(aTempDir.GetFull(), osl_getThreadTextEncoding()));
-        if ( access( aName.getStr(), W_OK | X_OK | R_OK ) )
-        {
-            // Create the directory and only on success give all rights to
-            // everyone. Use mkdir instead of DirEntry::MakeDir because
-            // this returns sal_True even if directory already exists.
-
-            if ( !mkdir( aName.getStr(), S_IRWXU | S_IRWXG | S_IRWXO ) )
-                chmod( aName.getStr(), S_IRWXU | S_IRWXG | S_IRWXO );
-
-            // This will not create a directory but perhaps FileStat called
-            // there modifies the DirEntry
-
-            aTempDir.MakeDir();
-        }
-#else
-        aTempDir.MakeDir();
-#endif
-        DirEntry &rEntry = TempNameBase_Impl::get();
-        rEntry = aTempDir.TempName( FSYS_KIND_DIR );
-        return rEntry;
-}
-
 DirEntry DirEntry::TempName( DirEntryKind eKind ) const
 {
         // ggf. Base-Temp-Dir verwenden (macht Remote keinen Sinn => vorher)
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index ee7803c2b58e..b1c939a40c91 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -723,14 +723,6 @@ sal_Bool SvStream::ReadLine(rtl::OString& rStr)
     return bEnd;
 }
 
-sal_Bool SvStream::ReadLine( ByteString& rStr )
-{
-    rtl::OString aFoo;
-    sal_Bool ret = ReadLine(aFoo);
-    rStr = aFoo;
-    return ret;
-}
-
 sal_Bool SvStream::ReadUniStringLine( String& rStr )
 {
     sal_Unicode buf[256+1];
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index 32913e0d2331..97344b3eb194 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -1135,32 +1135,6 @@ void STRING::SearchAndReplaceAll( const STRING& rStr, const STRING& rRepStr )
 
 // -----------------------------------------------------------------------
 
-xub_StrLen STRING::GetTokenCount( STRCODE cTok ) const
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    // Leerer String: TokenCount per Definition 0
-    if ( !mpData->mnLen )
-        return 0;
-
-    xub_StrLen      nTokCount       = 1;
-    sal_Int32       nLen            = mpData->mnLen;
-    const STRCODE*  pStr            = mpData->maStr;
-    sal_Int32       nIndex          = 0;
-    while ( nIndex < nLen )
-    {
-        // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount
-        if ( *pStr == cTok )
-            ++nTokCount;
-        ++pStr,
-        ++nIndex;
-    }
-
-    return nTokCount;
-}
-
-// -----------------------------------------------------------------------
-
 void STRING::SetToken( xub_StrLen nToken, STRCODE cTok, const STRING& rStr,
                        xub_StrLen nIndex )
 {
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index e16e60d24fb3..d047cb4ba3b5 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -58,31 +58,6 @@ UniString::UniString( const ByteString& rByteStr, rtl_TextEncoding eTextEncoding
 
 // -----------------------------------------------------------------------
 
-UniString::UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
-                      rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
-{
-    DBG_CTOR( UniString, DbgCheckUniString );
-    DBG_CHKOBJ( &rByteStr, ByteString, DbgCheckByteString );
-
-    // Stringlaenge ermitteln
-    if ( nPos > rByteStr.mpData->mnLen )
-        nLen = 0;
-    else
-    {
-        // Laenge korrigieren, wenn noetig
-        sal_Int32 nMaxLen = rByteStr.mpData->mnLen-nPos;
-        if ( nLen > nMaxLen )
-            nLen = static_cast< xub_StrLen >(nMaxLen);
-    }
-
-    mpData = NULL;
-    rtl_string2UString( (rtl_uString **)(&mpData),
-                        rByteStr.mpData->maStr+nPos, nLen,
-                        eTextEncoding, nCvtFlags );
-}
-
-// -----------------------------------------------------------------------
-
 UniString::UniString( const char* pByteStr,
                       rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
 {