ditch unused code

25 files changed, 43 insertions, 346 deletions

diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index a15ab3fc4..a94800132 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -199,14 +199,6 @@ SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
         if( pNew )
             break;
     }
-#ifdef DBG_UTIL
-    if( !pNew )
-    {
-        ByteString aMsg( "SBX: Keine Factory fuer SBX-ID " );
-        aMsg += ByteString::CreateFromInt32(nSbxId);
-        DbgError( aMsg.GetBuffer() );
-    }
-#endif
     return pNew;
 }
 
diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
index 7b6ff974f..7b1300810 100644
--- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
@@ -95,28 +95,6 @@ namespace binfilter {
 #ifdef DBG_UTIL
 /*N*/ void ScAttrArray::TestData() const
 /*N*/ {
-/*N*/ 	USHORT nErr = 0;
-/*N*/ 	if (pData)
-/*N*/ 	{
-/*N*/ 		USHORT nPos=0;
-/*N*/ 		for (nPos=0; nPos<nCount; nPos++)
-/*N*/ 		{
-/*N*/ 			if (nPos)
-/*N*/ 				if (pData[nPos].pPattern == pData[nPos-1].pPattern || pData[nPos].nRow <= pData[nPos-1].nRow)
-/*N*/ 					++nErr;
-/*N*/ 			if (pData[nPos].pPattern->Which() != ATTR_PATTERN)
-/*N*/ 				++nErr;
-/*N*/ 		}
-/*N*/         if ( nPos && pData[nPos-1].nRow != MAXROW )
-/*N*/             ++nErr;
-/*N*/ 	}
-/*N*/ 	if (nErr)
-/*N*/ 	{
-/*?*/ 		ByteString aMsg = ByteString::CreateFromInt32(nErr);
-/*?*/ 		aMsg += " errors in attribute array, column ";
-/*?*/ 		aMsg += ByteString::CreateFromInt32(nCol);
-/*?*/ 		OSL_FAIL( aMsg.GetBuffer() );
-/*N*/ 	}
 /*N*/ }
 #endif
 
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index 6f0e48e54..a17e53628 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -477,27 +477,6 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
 /*N*/ 				if ( !nEdges )
 /*N*/ 					nEdges = 1;				// mittendrin
 /*N*/ 			}
-/*N*/ #ifdef DBG_UTIL
-/*N*/ 			else
-/*N*/ 			{
-/*?*/ 				String aTmp;
-/*?*/ 				ByteString aMsg( "broken Matrix, Pos: " );
-/*?*/ 				aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
-/*?*/ 				aMsg += ByteString( aTmp, RTL_TEXTENCODING_ASCII_US );
-/*?*/ 				aMsg += ", MatOrg: ";
-/*?*/ 				aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
-/*?*/ 				aMsg += ByteString( aTmp, RTL_TEXTENCODING_ASCII_US );
-/*?*/ 				aMsg += ", MatCols: ";
-/*?*/ 				aMsg += ByteString::CreateFromInt32( nC );
-/*?*/ 				aMsg += ", MatRows: ";
-/*?*/ 				aMsg += ByteString::CreateFromInt32( nR );
-/*?*/ 				aMsg += ", DiffCols: ";
-/*?*/ 				aMsg += ByteString::CreateFromInt32( dC );
-/*?*/ 				aMsg += ", DiffRows: ";
-/*?*/ 				aMsg += ByteString::CreateFromInt32( dR );
-/*?*/ 				DBG_ERRORFILE( aMsg.GetBuffer() );
-/*N*/ 			}
-/*N*/ #endif
 /*N*/ 			return nEdges;
 /*N*/ 			break;
 /*N*/ 		}
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 05dacdc16..364c804ad 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -551,14 +551,6 @@ void SfxFilterMatcher::AddContainer( SfxFilterContainer* pC )
 #define CHECKERROR()											\
 if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX )		\
 {																\
-    ByteString aText = "Fehler in FilterDetection: Returnwert ";\
-    aText += ByteString::CreateFromInt32(nErr);					\
-    if( pFilter )												\
-    {															\
-        aText += ' ';											\
-        aText += ByteString(U2S(pFilter->GetFilterName()));     \
-    }															\
-    OSL_FAIL( aText.GetBuffer() );								\
     nErr = ERRCODE_ABORT;										\
 }
 
diff --git a/binfilter/bf_so3/source/inplace/client.cxx b/binfilter/bf_so3/source/inplace/client.cxx
index 72d487143..903b8bc40 100644
--- a/binfilter/bf_so3/source/inplace/client.cxx
+++ b/binfilter/bf_so3/source/inplace/client.cxx
@@ -243,36 +243,13 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvEmbeddedClient,SvEmbeddedClientFactory,SvObject,
     return NULL;
 }
 
-void SvEmbeddedClient::TestMemberObjRef( BOOL bFree )
+void SvEmbeddedClient::TestMemberObjRef( BOOL )
 {
-    (void)bFree;
-
-#ifdef DBG_UTIL
-    if( GetEmbedObj() )
-    {
-        ByteString aTest = "\t\tGetEmbedObj() == ";
-        aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetEmbedObj() ) );
-        OSL_TRACE( "%s", aTest.GetBuffer() );
-    }
-#endif
 }
 
 #ifdef TEST_INVARIANT
-void SvEmbeddedClient::TestMemberInvariant( BOOL bPrint )
+void SvEmbeddedClient::TestMemberInvariant( BOOL )
 {
-#ifdef DBG_UTIL
-    if( bPrint )
-    {
-        if( HasViewData() )
-        {
-            ByteString aTest( "\t\tSvClientData == " );
-            aTest.Append( ByteString::CreateFromInt32(  (ULONG)GetClientData() ) );
-            OSL_TRACE( "%s", aTest.GetBuffer() );
-        }
-    }
-#else
-    (void)bPrint;
-#endif
 }
 #endif
 
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index e7d656e17..ea357245d 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -200,14 +200,6 @@ SO2_IMPL_CLASS2_DLL(SvEmbeddedObject,SvFactory,SvPersist,SvPseudoObject,
 
 void SvEmbeddedObject::TestMemberObjRef( BOOL /*bFree*/ )
 {
-#ifdef DBG_UTIL
-    if( GetClient() )
-    {
-        ByteString aTest = "\t\tGetClient() == ";
-        aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetClient() ) );
-        OSL_TRACE( "%s", aTest.GetBuffer() );
-    }
-#endif
 }
 
 #ifdef TEST_INVARIANT
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx b/binfilter/bf_so3/source/inplace/ipclient.cxx
index fc3410dab..c1905f653 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.cxx
@@ -99,14 +99,6 @@ SvInPlaceClient::~SvInPlaceClient()
 void SvInPlaceClient::TestMemberObjRef( BOOL bFree )
 {
     (void)bFree;
-#ifdef DBG_UTIL
-    if( GetIPObj() )
-    {
-        ByteString aTest = "\t\tGetIPObj() == ";
-        aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetIPObj() ) );
-        OSL_TRACE( "%s", aTest.GetBuffer() );
-    }
-#endif
 }
 
 //=========================================================================
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 6ac70c713..db5979ab3 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -59,33 +59,12 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvInPlaceObject,SvInPlaceObjectFactory,SvEmbeddedOb
 void SvInPlaceObject::TestMemberObjRef( BOOL bFree )
 {
     (void)bFree;
-
-#ifdef DBG_UTIL
-    if( GetIPClient() )
-    {
-        ByteString aTest = "\t\tGetIPClient() == ";
-        aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetIPClient() ) );
-        OSL_TRACE( "%s", aTest.GetBuffer() );
-    }
-#endif
 }
 
 #ifdef TEST_INVARIANT
 void SvInPlaceObject::TestMemberInvariant( BOOL bPrint )
 {
-#ifdef DBG_UTIL
-    if( bPrint )
-    {
-        if( pIPEnv )
-        {
-            ByteString aTest( "\t\tSvInPlaceEnvironment == " );
-            aTest.Append( ByteString::CreateFromInt32( (ULONG)pIPEnv ) );
-            OSL_TRACE( "%s", aTest.GetBuffer() );
-        }
-    }
-#else
     (void)bPrint;
-#endif
 }
 #endif
 
diff --git a/binfilter/bf_so3/source/inplace/protocol.cxx b/binfilter/bf_so3/source/inplace/protocol.cxx
index dec1faa7c..eba79c605 100644
--- a/binfilter/bf_so3/source/inplace/protocol.cxx
+++ b/binfilter/bf_so3/source/inplace/protocol.cxx
@@ -39,17 +39,6 @@
 
 namespace binfilter {
 
-#define DBG_PROTLOG(FuncName,bVal)              \
-{                                               \
-    ByteString aTS( ByteString::CreateFromInt32( (ULONG)this ) );        			\
-    aTS += "-Obj Edit Prot --- ";               \
-    aTS += FuncName;                            \
-    aTS += "( ";                                \
-    aTS += bVal ? "TRUE" : "FALSE";             \
-    aTS += " )";                                \
-    OSL_TRACE( "%s", aTS.GetBuffer() );               \
-}
-
 #define DBG_PROTREC(FuncName)                   \
     OSL_TRACE( FuncName )
 
@@ -742,7 +731,6 @@ void ImplSvEditObjectProtocol::Connected( BOOL bConnectP )
                     "connect assert failed" );
         DBG_ASSERT( aClient.Is(), "connect assert failed" );
         bCliConnect = TRUE;
-        DBG_PROTLOG( "Cli - Connected", bConnectP )
         aClient->Connected( TRUE );
     }
 
@@ -756,7 +744,6 @@ void ImplSvEditObjectProtocol::Connected( BOOL bConnectP )
                     || (!bConnect && !bConnectP && !bLastActionConnect && bSvrConnect),
                     "connect assert failed" );
         bSvrConnect = bConnect;
-        DBG_PROTLOG( "Obj - Connected", bConnectP )
         aObj->Connect( bConnect );
     }
 
@@ -769,7 +756,6 @@ void ImplSvEditObjectProtocol::Connected( BOOL bConnectP )
                     "connect assert failed" );
         DBG_ASSERT( aClient.Is(), "connect assert failed" );
         bCliConnect = FALSE;
-        DBG_PROTLOG( "Cli - Connected", bConnectP )
         aClient->Connected( FALSE );
     }
 
@@ -820,7 +806,6 @@ void ImplSvEditObjectProtocol::Opened( BOOL bOpenP )
         DBG_ASSERT( bOpen && bOpenP && bLastActionOpen && !bCliOpen,
                     "open assert failed" );
         bCliOpen = TRUE;
-        DBG_PROTLOG( "Cli - Opened", bOpenP )
         aClient->Opened( TRUE );
     }
 
@@ -834,7 +819,6 @@ void ImplSvEditObjectProtocol::Opened( BOOL bOpenP )
                     || (!bOpen && !bOpenP && !bLastActionOpen && bSvrOpen),
                     "open assert failed" );
         bSvrOpen = bOpen;
-        DBG_PROTLOG( "Svr - Opened", bOpenP )
         aObj->Open( bOpen );
     }
 
@@ -847,7 +831,6 @@ void ImplSvEditObjectProtocol::Opened( BOOL bOpenP )
                     "open assert failed" );
         DBG_ASSERT( aClient.Is(), "open assert failed" );
         bCliOpen = FALSE;
-        DBG_PROTLOG( "Cli - Opened", bOpenP )
         aClient->Opened( FALSE );
     }
     CLASS_INVARIANT
@@ -889,7 +872,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
         DBG_ASSERT( bEmbed && bEmbedP && bLastActionEmbed && !bCliEmbed,
                     "embed assert failed" );
         bCliEmbed = TRUE;
-        DBG_PROTLOG( "Cli - Embedded", bEmbedP )
         aClient->Embedded( TRUE );
     }
 
@@ -903,7 +885,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
                     || (!bEmbed && !bEmbedP && !bLastActionEmbed && bSvrEmbed),
                     "embed assert failed" );
         bSvrEmbed = bEmbed;
-        DBG_PROTLOG( "Svr - Embedded", bEmbedP )
         aObj->Embed( bEmbed );
         if( bEmbed && aObj->GetDocumentName().Len() )
             aObj->DocumentNameChanged( aObj->GetDocumentName() );
@@ -917,7 +898,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
         DBG_ASSERT( !bEmbed && !bEmbedP && !bLastActionEmbed && bCliEmbed,
                     "embed assert failed" );
         bCliEmbed = FALSE;
-        DBG_PROTLOG( "Cli - Embedded", bEmbedP )
         aClient->Embedded( FALSE );
     }
     CLASS_INVARIANT
@@ -964,7 +944,6 @@ void ImplSvEditObjectProtocol::PlugIn
         DBG_ASSERT( bPlugIn && bPlugInP && bLastActionPlugIn && !bCliPlugIn,
                     "PlugIn assert failed" );
         bCliPlugIn = TRUE;
-        DBG_PROTLOG( "Cli - PlugIn", bPlugInP )
         aClient->PlugIn( TRUE );
     }
 
@@ -978,7 +957,6 @@ void ImplSvEditObjectProtocol::PlugIn
                     || (!bPlugIn && !bPlugInP && !bLastActionPlugIn && bSvrPlugIn),
                     "PlugIn assert failed" );
         bSvrPlugIn = bPlugIn;
-        DBG_PROTLOG( "Svr - PlugIn", bPlugInP )
         aObj->PlugIn( bPlugIn );
         if( bPlugIn && aObj->GetDocumentName().Len() )
             aObj->DocumentNameChanged( aObj->GetDocumentName() );
@@ -992,7 +970,6 @@ void ImplSvEditObjectProtocol::PlugIn
         DBG_ASSERT( !bPlugIn && !bPlugInP && !bLastActionPlugIn && bCliPlugIn,
                     "PlugIn assert failed" );
         bCliPlugIn = FALSE;
-        DBG_PROTLOG( "Cli - PlugIn", bPlugInP )
         aClient->PlugIn( FALSE );
     }
     CLASS_INVARIANT
@@ -1037,7 +1014,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
                     "inplace assert failed" );
         DBG_ASSERT( aIPClient.Is(), "inplace assert failed" );
         bCliIPActive = TRUE;
-        DBG_PROTLOG( "Cli - InPlaceActivate", bIPActiveP )
         if( aIPClient->Owner() )
             SvInPlaceClient::GetIPActiveClientList().Insert( aIPClient, LIST_APPEND );
         aIPClient->InPlaceActivate( TRUE );
@@ -1054,7 +1030,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
                     "inplace assert failed" );
         DBG_ASSERT( aIPObj.Is(), "inplace assert failed" );
         bSvrIPActive = bIPActive;
-        DBG_PROTLOG( "Svr - InPlaceActivate", bIPActiveP )
         if( bIPActive )
         {
             aIPObj->InPlaceActivate( bIPActive );
@@ -1080,7 +1055,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
                     "open assert failed" );
         bCliIPActive = FALSE;
         DBG_ASSERT( aIPClient.Is(), "inplace assert failed" );
-        DBG_PROTLOG( "Cli - InPlaceActivate", bIPActiveP )
         if( aIPClient->Owner() )
             SvInPlaceClient::GetIPActiveClientList().Remove( aIPClient );
         aIPClient->InPlaceActivate( FALSE );
@@ -1112,7 +1086,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
     bLastActionUIActive = bUIActiveP;
     if( bUIActiveP )
         InPlaceActivate( bUIActiveP );
-    DBG_PROTLOG( "UIActivate", bUIActiveP )
     DBG_ASSERT( !bEmbed && !bPlugIn, "ui assert failed" );
     bUIActive = bUIActiveP; // vor der Aktion den Status setzen
     if( bLastActionUIActive && !bCliUIActive )
@@ -1154,7 +1127,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
         if( bLastActionUIActive && !bCliUIActive )
         { // wer weis was DoInPlaceActivate getan hat
             bCliUIActive = TRUE;
-            DBG_PROTLOG( "Cli - UIActivate", bUIActiveP )
             aIPClient->UIActivate( TRUE );
             if( aIPObj.Is() && aIPObj->Owner() )
             { // Tools anordnen anstossen, aber nur wenn selbst
@@ -1174,7 +1146,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
                     "ui assert failed" );
         DBG_ASSERT( aIPObj.Is(), "inplace assert failed" );
         bSvrUIActive = bUIActive;
-        DBG_PROTLOG( "Obj - UIActivate", bUIActiveP )
         if( aIPClient->Owner() )
         {
             if( aIPClient->GetEnv()->GetDocWin() )
@@ -1194,7 +1165,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
                     "open assert failed" );
         bCliUIActive = FALSE;
         DBG_ASSERT( aIPClient.Is(), "inplace assert failed" );
-        DBG_PROTLOG( "Cli - UIActivate", bUIActiveP )
         aIPClient->UIActivate( FALSE );
     }
 
diff --git a/binfilter/bf_so3/source/misc/iface.cxx b/binfilter/bf_so3/source/misc/iface.cxx
index 4344f230e..5346541fc 100644
--- a/binfilter/bf_so3/source/misc/iface.cxx
+++ b/binfilter/bf_so3/source/misc/iface.cxx
@@ -79,20 +79,6 @@ void SvObject::TestMemberObjRef( BOOL /*bFree*/ )
 #ifdef TEST_INVARIANT
 void SvObject::TestMemberInvariant( BOOL /*bPrint*/ )
 {
-#ifdef DBG_UTIL
-    if( !Owner() && pClient )
-    {
-        ByteString aTest( "\t\tpClient == " );
-        aTest += ByteString::CreateFromInt32( (ULONG)pClient );
-        OSL_TRACE( "%s", aTest.GetBuffer() );
-    }
-    if( Owner() && pService )
-    {
-        ByteString aTest( "\t\tpService == " );
-        aTest += ByteString::CreateFromInt32( (ULONG)pService );
-        OSL_TRACE( "%s", aTest.GetBuffer() );
-    }
-#endif
 }
 #endif
 
@@ -123,16 +109,6 @@ SvObject::~SvObject()
 *************************************************************************/
 UINT32 SvObject::ReleaseRef()
 {
-#ifdef DBG_UTIL
-    if( GetRefCount() == nExtCount )
-    {
-        ByteString aStr( "Internal RefCount underflow: Count == " );
-        aStr += ByteString::CreateFromInt32( GetRefCount() );
-        aStr += ", ExtCount == ";
-        aStr += ByteString::CreateFromInt32( nExtCount );
-        OSL_FAIL( aStr.GetBuffer() );
-    }
-#endif
     return SotObject::ReleaseRef();
 }
 
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index f4e0e65a6..f473e9956 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -39,6 +39,7 @@
 #include <sot/formats.hxx>
 
 #include <tools/debug.hxx>
+#include <bf_tools/string.hxx>
 
 #include <unotools/ucbhelper.hxx>
 #include <unotools/tempfile.hxx>
@@ -297,9 +298,9 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
             if( pEle->GetObj() )
             {
                 ByteString aTest( "\t\tpChildList[ " );
-                aTest += ByteString::CreateFromInt32( i );
+                aTest += ByteString_CreateFromInt32( i );
                 aTest += " ] == ";
-                aTest += ByteString::CreateFromInt32( (ULONG)pEle->GetObj() );
+                aTest += ByteString_CreateFromInt32( (ULONG)pEle->GetObj() );
                 OSL_TRACE( "%s", aTest.GetBuffer() );
             }
         }
@@ -307,7 +308,7 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
     if( aStorage.Is() )
     {
         ByteString aTest( "\t\taStorage == " );
-        aTest += ByteString::CreateFromInt32( (ULONG)&aStorage );
+        aTest += ByteString_CreateFromInt32( (ULONG)&aStorage );
         OSL_TRACE( "%s", aTest.GetBuffer() );
     }
 }
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx
index 59ae7215a..200574f39 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -36,20 +36,6 @@
 
 namespace binfilter {
 
-
-////////////////////////////////////////
-
-/*N*/ SvStream& operator << (SvStream& rStream, const SmFace& rFont)
-/*N*/ {
-/*N*/ 	rStream.WriteByteString(ExportString(rFont.GetName()));
-/*N*/ 	rStream << (sal_uInt32)rFont.GetFamily();
-/*N*/     rStream << (sal_uInt32)GetSOStoreTextEncoding( rFont.GetCharSet() );
-/*N*/ 	rStream << (sal_uInt32)rFont.GetWeight();
-/*N*/ 	rStream << (sal_uInt32)rFont.GetItalic();
-/*N*/ 
-/*N*/ 	return rStream;
-/*N*/ }
-
 /*N*/ SvStream& operator >> (SvStream& rStream, SmFace& rFont)
 /*N*/ {
 /*N*/ 	sal_uInt32 nData;
@@ -150,41 +136,6 @@ namespace binfilter {
 #define PRE_TE      "<?"
 #define POST_TE     ")>"
 
-
-ByteString ConvertUnknownCharacter(sal_Unicode ch)
-{
-    ByteString aString( RTL_CONSTASCII_STRINGPARAM( PRE_TE TE_UCS2 ) );
-    aString.Append( "(" );
-    aString += ByteString::CreateFromInt32(ch);
-    aString += POST_TE;
-    return aString;
-}
-
-
-/*N*/ const ByteString ExportString( const String& rString )
-/*N*/ {
-/*N*/ 	ByteString	aString;
-/*N*/ 
-/*N*/     rtl_TextEncoding nEnc = RTL_TEXTENCODING_MS_1252;
-/*N*/ 	for (xub_StrLen i = 0; i < rString.Len(); i++)
-/*N*/ 	{
-/*N*/         sal_Unicode ch = rString.GetChar(i);
-/*N*/ 		if ((ch != '\r') && (ch != '\n') && (ch != '\t'))
-/*N*/ 		{
-/*N*/             sal_Char cChar = ByteString::ConvertFromUnicode( ch, nEnc, FALSE );
-/*N*/ 			if (cChar == 0)
-/*?*/               aString += ConvertUnknownCharacter(ch);
-/*N*/ 			else
-/*N*/ 				aString += cChar;
-/*N*/ 		}
-/*N*/ 		else
-/*N*/             aString += (sal_Char) ch;
-/*N*/ 	}
-/*N*/ 
-/*N*/ 	aString.ConvertLineEnd(LINEEND_CRLF);
-/*N*/     return aString;
-/*N*/ }
-
 #define TEXTENCODINGTAB_LEN     12
 
 static const struct
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
index c61b8a476..7b8b752c9 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
@@ -1282,7 +1282,6 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             break;
 
             default:
-                OSL_FAIL( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() );
             break;
         }
     }
diff --git a/binfilter/bf_svtools/source/items1/whassert.hxx b/binfilter/bf_svtools/source/items1/whassert.hxx
index 1942162a7..5514fdbb1 100644
--- a/binfilter/bf_svtools/source/items1/whassert.hxx
+++ b/binfilter/bf_svtools/source/items1/whassert.hxx
@@ -29,7 +29,7 @@
 #define _SFX_WHASSERT_HXX
 
 #include <tools/debug.hxx>
-#include <tools/string.hxx>
+#include <rtl/strbuf.hxx>
 
 namespace binfilter
 {
@@ -43,10 +43,10 @@ namespace binfilter
     {																		\
         if ( !(bCondition) )												\
         {																	\
-            ByteString aMsg( sMessage );									\
-            aMsg.Append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: "));     \
-            aMsg += ByteString::CreateFromInt32( nId );						\
-            DbgOut( aMsg.GetBuffer(), DBG_OUT_ERROR, __FILE__, __LINE__);	\
+            rtl::OStringBuffer aMsg( sMessage );									\
+            aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: "));     \
+            aMsg.append(static_cast<sal_Int32>(nId));						\
+            DbgOut(aMsg.getStr(), DBG_OUT_ERROR, __FILE__, __LINE__);	\
         }																	\
     }																		\
 }
diff --git a/binfilter/bf_svtools/source/misc/makefile.mk b/binfilter/bf_svtools/source/misc/makefile.mk
index fc882f309..62ce32eb3 100644
--- a/binfilter/bf_svtools/source/misc/makefile.mk
+++ b/binfilter/bf_svtools/source/misc/makefile.mk
@@ -57,7 +57,8 @@ SLOFILES=\
     $(SLO)$/svt_imap3.obj               \
     $(SLO)$/svt_ownlist.obj             \
     $(SLO)$/svt_vcldata.obj             \
-    $(SLO)$/svt_restrictedpaths.obj
+    $(SLO)$/svt_restrictedpaths.obj	\
+    $(SLO)$/tl_tstring.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index b87bdc834..a8f08e3eb 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -57,6 +57,7 @@
 #include <bf_svtools/syslocaleoptions.hxx>
 #include "listener.hxx"
 #include <bf_svtools/smplhint.hxx>
+#include <bf_tools/string.hxx>
 
 #include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
@@ -1803,7 +1804,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
             {
                 aMsg.Insert( "SvNumberFormatter::ImpAdjustFormatCodeDefault: ", 0 );
                 aMsg += "\nXML locale data FormatElement formatindex: ";
-                aMsg += ByteString::CreateFromInt32( pFormatArr[nElem].Index );
+                aMsg += ByteString_CreateFromInt32( pFormatArr[nElem].Index );
                 String aUMsg( aMsg, RTL_TEXTENCODING_ASCII_US);
                 LocaleDataWrapper::outputCheckMessage(
                         xLocaleData->appendLocaleInfo( aUMsg));
@@ -3160,14 +3161,14 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr )
     if ( nPos >= 0 && nNeg >= 0 && nPos != nNeg )
     {
         ByteString aStr( "positions of currency symbols differ\nLanguage: " );
-        aStr += ByteString::CreateFromInt32( rCurr.GetLanguage() );
+        aStr += ByteString_CreateFromInt32( rCurr.GetLanguage() );
         aStr += " <";
         aStr += ByteString( rCurr.GetSymbol(), RTL_TEXTENCODING_UTF8 );
         aStr += "> positive: ";
-        aStr += ByteString::CreateFromInt32( rCurr.GetPositiveFormat() );
+        aStr += ByteString_CreateFromInt32( rCurr.GetPositiveFormat() );
         aStr += ( nPos ? " (postfix)" : " (prefix)" );
         aStr += ", negative: ";
-        aStr += ByteString::CreateFromInt32( rCurr.GetNegativeFormat() );
+        aStr += ByteString_CreateFromInt32( rCurr.GetNegativeFormat() );
         aStr += ( nNeg ? " (postfix)" : " (prefix)" );
     }
 }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
index 366862bdb..759cb49b8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
@@ -68,8 +68,8 @@
 #include "writingmodeitem.hxx"
 
 #include <tools/bigint.hxx>
-
 #include <tools/stream.hxx>
+#include <bf_tools/string.hxx>
 
 #include <xtxasit.hxx>
 #include <xfillit0.hxx>
@@ -380,9 +380,9 @@ void SdrItemPool::Ctor(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEn
             ByteString aStr("PoolDefaultItem not set: ");
 
             aStr += "Num=";
-            aStr += ByteString::CreateFromInt32( nNum );
+            aStr += ByteString_CreateFromInt32( nNum );
             aStr += "Which=";
-            aStr += ByteString::CreateFromInt32( nNum + 1000 );
+            aStr += ByteString_CreateFromInt32( nNum + 1000 );
 
             OSL_FAIL(aStr.GetBuffer());
         }
@@ -391,9 +391,9 @@ void SdrItemPool::Ctor(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEn
             ByteString aStr("PoolDefaultItem has wrong WhichId: ");
 
             aStr += "Num=";
-            aStr += ByteString::CreateFromInt32( nNum );
+            aStr += ByteString_CreateFromInt32( nNum );
             aStr += " Which=";
-            aStr += ByteString::CreateFromInt32( pItem->Which() );
+            aStr += ByteString_CreateFromInt32( pItem->Which() );
 
             OSL_FAIL(aStr.GetBuffer());
         }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
index c716eaf4c..ad55c8176 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 #include <tools/debug.hxx>
-
+#include <bf_tools/string.hxx>
 #include "svdio.hxx"
 #include "svdobj.hxx"
 #include <osl/endian.h>
@@ -226,14 +226,14 @@ namespace binfilter {
 /*N*/ 		
 /*N*/ 		if(nSubRecReadCount != -1) 
 /*N*/ 		{
-/*N*/ 			rStr += ByteString::CreateFromInt32( nSubRecReadCount );
+/*N*/ 			rStr += ByteString_CreateFromInt32( nSubRecReadCount );
 /*N*/ 			rStr += " von ";
-/*N*/ 			rStr += ByteString::CreateFromInt32( nSubRecCount );
+/*N*/ 			rStr += ByteString_CreateFromInt32( nSubRecCount );
 /*N*/ 			rStr += " Records gelesen)";
 /*N*/ 		} 
 /*N*/ 		else 
 /*N*/ 		{
-/*N*/ 			rStr += ByteString::CreateFromInt32( nSubRecCount );
+/*N*/ 			rStr += ByteString_CreateFromInt32( nSubRecCount );
 /*N*/ 			rStr += " Records)";
 /*N*/ 		}
 /*N*/ 	}
@@ -301,7 +301,7 @@ namespace binfilter {
 /*?*/ 				aStr += "1 Byte";
 /*?*/ 			else 
 /*?*/ 			{
-/*?*/ 				aStr += ByteString::CreateFromInt32( nToMuch );
+/*?*/ 				aStr += ByteString_CreateFromInt32( nToMuch );
 /*?*/ 				aStr += " Bytes";
 /*?*/ 			}
 /*?*/ 
@@ -337,7 +337,7 @@ namespace binfilter {
 /*?*/ 			else 
 /*?*/ 			{
 /*?*/ 				aStr += "n ";
-/*?*/ 				aStr += ByteString::CreateFromInt32( nToMuch );
+/*?*/ 				aStr += ByteString_CreateFromInt32( nToMuch );
 /*?*/ 				aStr += " Bytes";
 /*?*/ 			}
 /*?*/ 
@@ -539,7 +539,7 @@ namespace binfilter {
 /*?*/ 			else 
 /*?*/ 			{
 /*?*/ 				aErrMsg += "n ";
-/*?*/ 				aErrMsg += ByteString::CreateFromInt32( nToMuch );
+/*?*/ 				aErrMsg += ByteString_CreateFromInt32( nToMuch );
 /*?*/ 				aErrMsg += " Bytes";
 /*?*/ 			}
 /*?*/ 
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 25fd57597..9d6ef4423 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -73,6 +73,7 @@
 
 #include <bf_so3/persist.hxx>
 #include <bf_svtools/zforlist.hxx>
+#include <bf_tools/string.hxx>
 #include <tools/tenccvt.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/endian.h>
@@ -1406,7 +1407,7 @@ using namespace ::com::sun::star;
 /*N*/ 
 /*N*/ #ifdef DBG_UTIL
 /*?*/ 			ByteString aMsg("Das Format dieser Datei ist noch von April '95 (Version ");
-/*?*/ 			aMsg += ByteString::CreateFromInt32( rHead.GetVersion() );
+/*?*/ 			aMsg += ByteString_CreateFromInt32( rHead.GetVersion() );
 /*?*/ 			aMsg += "). Mit dieser Programmversion kann das nicht mehr gelesen werden";
 /*?*/ 
 /*?*/ 			OSL_FAIL(aMsg.GetBuffer());
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
index 244ce52e4..fe6d26c06 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
@@ -46,14 +46,9 @@
 #include "svditer.hxx"
 #include "svdpagv.hxx"
 #include "polysc3d.hxx"
-
-#ifndef SVX_LIGHT
 #include "fmdpage.hxx"
-#else
-#endif
-
-
 #include "xoutx.hxx"
+#include <bf_tools/string.hxx>
 
 namespace binfilter {
 
@@ -174,7 +169,7 @@ using namespace ::com::sun::star;
 /*?*/ 		else
 /*?*/ 		{
 /*?*/ 			aStr += "von ";
-/*?*/ 			aStr += ByteString::CreateFromInt32( nCloneErrCnt );
+/*?*/ 			aStr += ByteString_CreateFromInt32( nCloneErrCnt );
 /*?*/ 			aStr += " Zeichenobjekten.";
 /*?*/ 		}
 /*?*/ 
@@ -914,18 +909,18 @@ using namespace ::com::sun::star;
 /*?*/ 				UINT32 nPos(GetObjCount());
 /*?*/ 
 /*?*/ 				aStr += "Listenposition: ";
-/*?*/ 				aStr += ByteString::CreateFromInt32( nPos );
+/*?*/ 				aStr += ByteString_CreateFromInt32( nPos );
 /*?*/ 				aStr += "\n";
 /*?*/ 				aStr += "Inventor: ";
 /*?*/                 sal_Int32 nInv = SWAPLONG( aHead.nInventor );
-/*?*/                 aStr += ByteString::CreateFromInt32( nInv );
+/*?*/                 aStr += ByteString_CreateFromInt32( nInv );
 /*?*/ 				aStr += ", Identifier: ";
-/*?*/ 				aStr += ByteString::CreateFromInt32( aHead.nIdentifier );
+/*?*/ 				aStr += ByteString_CreateFromInt32( aHead.nIdentifier );
 /*?*/ 				aStr += "\n";
 /*?*/ 				aStr += "FilePos: ";
-/*?*/ 				aStr += ByteString::CreateFromInt32( aHead.GetFilePos() );
+/*?*/ 				aStr += ByteString_CreateFromInt32( aHead.GetFilePos() );
 /*?*/ 				aStr += ", BlockSize: ";
-/*?*/ 				aStr += ByteString::CreateFromInt32( aHead.GetBlockSize() );
+/*?*/ 				aStr += ByteString_CreateFromInt32( aHead.GetBlockSize() );
 /*?*/ 
 /*?*/ 				OSL_FAIL(aStr.GetBuffer());
 /*?*/ #endif
diff --git a/binfilter/bf_sw/source/core/text/porlay.hxx b/binfilter/bf_sw/source/core/text/porlay.hxx
index 68eb63869..f142312aa 100644
--- a/binfilter/bf_sw/source/core/text/porlay.hxx
+++ b/binfilter/bf_sw/source/core/text/porlay.hxx
@@ -200,11 +200,6 @@ public:
 
     void CreateSpaceAdd( const short nInit = 0 );
 
-#ifdef DBG_UTIL
-    void DebugPortions( SvStream &rOs, const XubString &rTxt,
-                        const xub_StrLen nStart ); //$ ostream
-#endif
-
     OUTPUT_OPERATOR
     DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
 };
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index ba269c12f..95cba6f74 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -352,10 +352,6 @@ namespace binfilter {
 /*N*/ 	return 0;
 /*N*/ }
 
-/*N*/ void SwLineLayout::DebugPortions( SvStream &, const XubString &, const xub_StrLen )
-/*N*/ {
-/*N*/ }
-
 /*N*/ const char *GetLangName( const MSHORT )
 /*N*/ {
 /*N*/ 	return 0;
@@ -471,48 +467,6 @@ namespace binfilter {
 /*N*/ 	return( ppNameArr[ePrep] );
 /*N*/ }
 
-/*************************************************************************
- *                    SwLineLayout::DebugPortions()
- *
- * DebugPortion() iteriert ueber alle Portions einer Zeile und deckt die
- * internen Strukturen auf.
- * Im Gegensatz zum Ausgabe-Operator werden auch die Textteile ausgegeben.
- *************************************************************************/
-
-/*N*/ void SwLineLayout::DebugPortions( SvStream &rOs, const XubString &rTxt, //$ ostream
-/*N*/ 												const xub_StrLen nStart )
-/*N*/ {
-/*N*/ 	SwLinePortion *pPortion = GetPortion();
-/*N*/
-/*N*/ 	xub_StrLen nPos = 0;
-/*N*/ 	MSHORT nNr = 0;
-/*N*/ 	KSHORT nPrtWidth, nLastPrt;
-/*N*/ 	nPrtWidth = nLastPrt = 0;
-/*N*/
-/*N*/ 	SwLinePortion::operator<<( rOs );
-/*N*/ 	rOs << '\"' << endl;
-/*N*/
-/*N*/ 	while( pPortion )
-/*N*/ 	{
-///*N*/ 		DBG_LOOP;
-/*N*/ 		SwTxtPortion *pTxtPor = pPortion->InTxtGrp() ?
-/*N*/ 								(SwTxtPortion *)pPortion : NULL ;
-/*N*/ 		++nNr;
-/*N*/ 		nLastPrt = nPrtWidth;
-/*N*/ 		nPrtWidth += pPortion->PrtWidth();
-/*N*/ 		rOs << "\tNr:"  << nNr
-/*N*/ 			<< " Pos:" << nPos
-/*N*/ 			<< " Org:" << nLastPrt
-/*N*/ 			<< endl;
-/*N*/
-/*N*/ 		rOs << "\t";
-/*N*/ 		pPortion->operator<<( rOs );
-/*N*/ 		rOs << endl;
-/*N*/ 		nPos += pPortion->GetLen();
-/*N*/ 		pPortion = pPortion->GetPortion();
-/*N*/ 	}
-/*N*/ }
-
 /*N*/ #ifdef USED
 /*N*/ CONSTCHAR( pRES_LNG_ALBANIAN, "ALBANIAN" );
 /*N*/ CONSTCHAR( pRES_LNG_ARABIC, "ARABIC" );
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index a24f8ab19..8d3e3c317 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -44,6 +44,8 @@
 #include <paratr.hxx>
 #include <bf_svx/tstpitem.hxx>
 #include <SwStyleNameMapper.hxx>
+#include <bf_tools/string.hxx>
+
 namespace binfilter {
 
 /*N*/ const sal_Char* SwForm::aFormEntry 		= "<E>";
@@ -301,14 +303,14 @@ String lcl_GetAuthPattern(USHORT nTypeId)
 /*N*/ 			if(TOX_CONTENT == nType)
 /*N*/ 			{
 /*N*/ 				//the most right tab stop is "most_right_aligned"
-/*N*/ 				sTmp += ByteString::CreateFromInt32( SVX_TAB_ADJUST_END );
+/*N*/ 				sTmp += ByteString_CreateFromInt32( SVX_TAB_ADJUST_END );
 /*N*/ 				//and has a dot as FillChar
 /*N*/ 				sTmp.Append( RTL_CONSTASCII_STRINGPARAM( ",." ));
 /*N*/ 				sBStr.Insert(sTmp, sBStr.Len() - 1);
 /*N*/ 			}
 /*N*/ 			else
 /*N*/ 			{
-/*N*/ 				sTmp += ByteString::CreateFromInt32( SVX_TAB_ADJUST_LEFT );
+/*N*/ 				sTmp += ByteString_CreateFromInt32( SVX_TAB_ADJUST_LEFT );
 /*N*/ 				//and has a space as FillChar
 /*N*/ 				sTmp.Append( RTL_CONSTASCII_STRINGPARAM( ", " ));
 /*N*/ 			}
@@ -426,24 +428,6 @@ String lcl_GetAuthPattern(USHORT nTypeId)
 /*N*/ 	return sRet;
 /*N*/ }
 
-/*N*/ USHORT SwForm::GetFirstTabPos() const  	//{ return nFirstTabPos; }
-/*N*/ {
-/*N*/ 	DBG_WARNING("compatibility");
-/*N*/ 	String sFirstLevelPattern = aPattern[ 1 ];
-/*N*/ 	USHORT nRet = 0;
-/*N*/ 	if( 2 <= ::binfilter::lcl_GetPatternCount( sFirstLevelPattern, SwForm::aFormTab ))
-/*N*/ 	{
-/*N*/ 		//sTab is in the Form "<T ,,value>" where value is the tab position an may be empty
-/*N*/ 		String sTab = lcl_GetPattern( sFirstLevelPattern, SwForm::aFormTab );
-/*N*/ 		if( 3 <= sTab.GetTokenCount(',') )
-/*N*/ 		{
-/*N*/ 			sTab = sTab.GetToken( 2, ',');
-/*N*/ 			sTab.Erase( sTab.Len() - 1, 1 );
-/*N*/ 			nRet = sTab.ToInt32();
-/*N*/ 		}
-/*N*/ 	}
-/*N*/ 	return nRet;
-/*N*/ }
 void SwForm::SetFirstTabPos( USHORT n )     //{ nFirstTabPos = n; }
 {
     // the tab stop token looks like: <T ,,1234,0,.> <T> <T ,,1234>
@@ -608,13 +592,6 @@ void SwForm::SetFirstTabPos( USHORT n )     //{ nFirstTabPos = n; }
 /*N*/ 		}
 /*N*/ 	}
 /*N*/ }
-//-----------------------------------------------------------------------------
-
-/*N*/ BOOL SwForm::IsFirstTabPosFlag() const 		//{ return bHasFirstTabPos; }
-/*N*/ {
-/*N*/ 	//rturn true if the first level contains two ore more tabstops
-/*N*/ 	return 2 <= lcl_GetPatternCount(aPattern[ 1 ], SwForm::aFormTab);
-/*N*/ }
 
 /*N*/ String	SwForm::ConvertPatternFrom51(const String& rSource, TOXTypes eType)
 /*N*/ {
diff --git a/binfilter/inc/bf_starmath/utility.hxx b/binfilter/inc/bf_starmath/utility.hxx
index a2b292f17..5b41d8b19 100644
--- a/binfilter/inc/bf_starmath/utility.hxx
+++ b/binfilter/inc/bf_starmath/utility.hxx
@@ -47,7 +47,6 @@ class SmRect;
 
 /////////////////////////////////////////////////////////////////
 
-const ByteString    ExportString( const String& rString );
 const String        ImportString( const ByteString& rByteString );
 
 /////////////////////////////////////////////////////////////////
@@ -99,7 +98,6 @@ SmViewShell * SmGetActiveView();
 
 class SmFace;
 
-SvStream& operator << (SvStream& rStream, const SmFace& rFont);
 SvStream& operator >> (SvStream& rStream, SmFace& rFont);
 
 void ReadSM20Font(SvStream& rStream, Font& rFont);
diff --git a/binfilter/inc/bf_sw/tox.hxx b/binfilter/inc/bf_sw/tox.hxx
index b6b8a8e6a..f7874abd2 100644
--- a/binfilter/inc/bf_sw/tox.hxx
+++ b/binfilter/inc/bf_sw/tox.hxx
@@ -262,11 +262,8 @@ public:
     inline USHORT	GetTOXType() const;
     inline USHORT	GetFormMax() const;
 
-    USHORT GetFirstTabPos() const  ;	//{ return nFirstTabPos; }
     void SetFirstTabPos( USHORT n );    //{ nFirstTabPos = n; }
 
-    BOOL IsFirstTabPosFlag() const 	;	//{ return bHasFirstTabPos; }
-
     BOOL IsGenerateTabPos() const 		{ return bGenerateTabPos; }
     void SetGenerateTabPos( BOOL b ) 	{ bGenerateTabPos = b; }