callcatcher: remove unused code

15 files changed, 41 insertions, 409 deletions

diff --git a/binfilter/bf_basic/source/classes/image.cxx b/binfilter/bf_basic/source/classes/image.cxx
index cecf102f2..69f61e4d7 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -89,34 +89,6 @@ BOOL SbiGood( SvStream& r )
     return BOOL( !r.IsEof() && r.GetError() == SVSTREAM_OK );
 }
 
-// Oeffnen eines Records
-
-ULONG SbiOpenRecord( SvStream& r, UINT16 nSignature, UINT16 nElem )
-{
-    ULONG nPos = r.Tell();
-    r << nSignature << (INT32) 0 << nElem;
-    return nPos;
-}
-
-// Schliessen eines Records
-
-void SbiCloseRecord( SvStream& r, ULONG nOff )
-{
-    ULONG nPos = r.Tell();
-    r.Seek( nOff + 2 );
-    r << (INT32) ( nPos - nOff - 8 );
-    r.Seek( nPos );
-}
-
-/**************************************************************************
-*
-*	Laden und Speichern
-*
-**************************************************************************/
-
-// Falls die Versionsnummer nicht passt, werden die binaeren Teile
-// nicht geladen, wohl aber Source, Kommentar und Name.
-
 BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
 {
 
diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
index f046cd3c0..a3ab89d69 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
@@ -106,22 +106,6 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-/*N*/ void ScDocument::ImplSaveDocOptions( SvStream& rStream ) const
-/*N*/ {
-/*N*/ 	DBG_ASSERT( pDocOptions, "No DocOptions to save! :-(" );
-/*N*/ 	pDocOptions->Save( rStream );
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-/*N*/ void ScDocument::ImplSaveViewOptions( SvStream& rStream ) const
-/*N*/ {
-/*N*/ 	DBG_ASSERT( pViewOptions, "No ViewOptions to save! :-(" );
-/*N*/ 	rStream << *pViewOptions;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
 /*N*/ void ScDocument::ImplCreateOptions()
 /*N*/ {
 /*N*/ 	pDocOptions  = new ScDocOptions();
@@ -517,47 +501,6 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/     }
 /*N*/ }
 
-/*N*/ void ScDocument::SaveAreaLinks(SvStream& rStream) const
-/*N*/ {
-/*N*/ 	const ::binfilter::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-/*N*/ 	USHORT nCount = rLinks.Count();
-/*N*/ 
-/*N*/ 	//	erstmal zaehlen...
-/*N*/ 
-/*N*/ 	USHORT nAreaCount = 0;
-/*N*/ 	USHORT i;
-/*N*/ 	for (i=0; i<nCount; i++)
-/*N*/ 		if ((*rLinks[i])->ISA(ScAreaLink))		// rLinks[i] = Pointer auf Ref
-/*N*/ 			++nAreaCount;
-/*N*/ 
-/*N*/ 	//	Header
-/*N*/ 
-/*N*/ 	ScMultipleWriteHeader aHdr( rStream );
-/*N*/ 	rStream << nAreaCount;
-/*N*/ 
-/*N*/ 	//	Links speichern
-/*N*/ 
-/*N*/ 	for (i=0; i<nCount; i++)
-/*N*/ 	{
-/*N*/ 		::binfilter::SvBaseLink* pBase = *rLinks[i];
-/*N*/ 		if (pBase->ISA(ScAreaLink))
-/*N*/ 		{
-/*?*/ 			ScAreaLink* pLink = (ScAreaLink*)pBase;
-/*?*/ 
-/*?*/ 			aHdr.StartEntry();
-/*?*/ 
-/*?*/ 			rStream.WriteByteString( pLink->GetFile(), rStream.GetStreamCharSet() );
-/*?*/ 			rStream.WriteByteString( pLink->GetFilter(), rStream.GetStreamCharSet() );
-/*?*/ 			rStream.WriteByteString( pLink->GetSource(), rStream.GetStreamCharSet() );
-/*?*/ 			rStream << pLink->GetDestArea();				// ScRange
-/*?*/ 			rStream.WriteByteString( pLink->GetOptions(), rStream.GetStreamCharSet() );
-/*?*/ 			//	filter options starting from 336
-/*?*/ 
-/*?*/ 			aHdr.EndEntry();
-/*N*/ 		}
-/*N*/ 	}
-/*N*/ }
-
 /*N*/ void ScDocument::LoadAreaLinks(SvStream& rStream)
 /*N*/ {
 /*N*/ 	ScMultipleReadHeader aHdr( rStream );
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index f92fd1b8d..e51e401ae 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -413,19 +413,6 @@ static const sal_Char pFilterRtf[]		= "Rich Text Format (StarCalc)";
                 OSL_FAIL("The Modificator should exist");
 /*N*/ }
 
-/*N*/ BOOL ScDocShell::SaveXML( SfxMedium* pInMedium, SvStorage* pStor )
-/*N*/ {
-/*N*/     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::SaveXML" );
-/*N*/
-/*N*/ 	ScXMLImportWrapper aImport( aDocument, pInMedium, pStor );
-/*N*/ 	sal_Bool bRet(sal_False);
-/*N*/ 	if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
-/*N*/ 		bRet = aImport.Export(sal_False);
-/*N*/ 	else
-/*N*/ 		bRet = aImport.Export(sal_True);
-/*N*/ 	return bRet;
-/*N*/ }
-
 /*N*/ BOOL ScDocShell::Load( SvStorage* pStor )
 /*N*/ {
 /*N*/ 	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" );
diff --git a/binfilter/bf_sc/source/ui/inc/docsh.hxx b/binfilter/bf_sc/source/ui/inc/docsh.hxx
index 8ebdbfc7c..e53c2912c 100644
--- a/binfilter/bf_sc/source/ui/inc/docsh.hxx
+++ b/binfilter/bf_sc/source/ui/inc/docsh.hxx
@@ -121,7 +121,6 @@ class ScDocShell: public SfxObjectShell, public SfxInPlaceObject, public SfxList
     void			ResetDrawObjectShell();
 
     BOOL			LoadCalc( SvStorage* pStor );
-    BOOL			SaveXML( SfxMedium* pMedium, SvStorage* pStor );
     void			UpdateAllRowHeights();
 
     void			RemoveUnknownObjects();
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 23959c3fc..9b2e2a9f5 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -1004,10 +1004,6 @@ namespace binfilter {
 /*N*/ 	}
 /*N*/ 	long nId=pObjId->GetObjId();
 /*N*/
-        #if OSL_DEBUG_LEVEL > 0
-/*N*/ 	CHART_TRACE2( "ChartModel::StoreObjectsAttributes Id=%s %s", GetCHOBJIDName( nId ), bReplaceAll? "ReplaceAll" : "Merge" );
-        #endif
-/*N*/
 /*N*/ 	switch(nId)
 /*N*/ 	{
 /*N*/
@@ -1120,9 +1116,6 @@ namespace binfilter {
 /*N*/ 			ZAxisTitle()=rTitle;
 /*N*/ 			break;
 /*N*/ 		default:
-                        #if OSL_DEBUG_LEVEL > 0
-/*?*/ 			CHART_TRACE2( "SetTitle: Title not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
-                        #endif
 /*N*/ 			break;
 /*N*/ 	}
 /*N*/ }
@@ -1142,9 +1135,6 @@ namespace binfilter {
 /*N*/ 	  case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
 /*N*/ 		  return ZAxisTitle();
 /*N*/ 	  default:
-                  #if OSL_DEBUG_LEVEL > 0
-/*?*/ 		  CHART_TRACE2( "GetTitle: Title not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
-                  #endif
 /*?*/ 		  return String();
 /*N*/ 	}
 /*N*/ }
@@ -1173,9 +1163,6 @@ namespace binfilter {
 /*N*/ 			SetLegendHasBeenMoved(bMoved);
 /*N*/ 			break;
 /*N*/ 		default:
-                        #if OSL_DEBUG_LEVEL > 0
-/*?*/ 			CHART_TRACE2( "SetHasBeenMoved: Object not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
-                        #endif
 /*N*/ 			break;
 /*N*/ 	}
 /*N*/ }
@@ -1184,11 +1171,6 @@ namespace binfilter {
 /*N*/ {
 /*N*/ 	//ToDo: Das hier könnte man auch schöner machen (kein DEEP!)
 /*N*/ 	SdrObject* pObj=(GetObjWithId ((USHORT)nId,*GetPage(0),0,IM_DEEPWITHGROUPS));
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ 	// there is no DBG_ASSERT2
-/*N*/ 	if( !pObj )
-/*N*/ 		OSL_TRACE( "GetObjWithId: Object not found (id=%ld => %s)", nId, GetCHOBJIDName( nId ) );
-/*N*/ #endif
 /*N*/ 	return pObj;
 /*N*/ }
 
diff --git a/binfilter/bf_sch/source/core/sch_objid.cxx b/binfilter/bf_sch/source/core/sch_objid.cxx
index 49d5705c8..ff0aaa1b4 100644
--- a/binfilter/bf_sch/source/core/sch_objid.cxx
+++ b/binfilter/bf_sch/source/core/sch_objid.cxx
@@ -139,78 +139,6 @@ namespace binfilter {
 /*N*/ 
 /*N*/ 	rIn >> nObjId;
 /*N*/ }
-
-/*N*/ #if OSL_DEBUG_LEVEL > 0
-
-// this function is for debugging only
-// therefore it is ok to use char* instead of UniString
-/*N*/ const char* GetCHOBJIDName( const long id )
-/*N*/ {
-/*N*/ 	switch( id )
-/*N*/ 	{
-/*?*/ 		case CHOBJID_ANY:						return "CHOBJID_ANY";
-/*?*/ 		case CHOBJID_TEXT:						return "CHOBJID_TEXT";
-/*?*/ 		case CHOBJID_AREA:						return "CHOBJID_AREA";
-/*?*/ 		case CHOBJID_LINE:						return "CHOBJID_LINE";
-/*?*/ 		case CHOBJID_DIAGRAM_AREA:				return "CHOBJID_DIAGRAM_AREA";
-/*?*/ 		case CHOBJID_TITLE_MAIN:				return "CHOBJID_TITLE_MAIN";
-/*?*/ 		case CHOBJID_TITLE_SUB:					return "CHOBJID_TITLE_SUB";
-/*?*/ 		case CHOBJID_DIAGRAM:					return "CHOBJID_DIAGRAM";
-/*?*/ 		case CHOBJID_DIAGRAM_WALL:				return "CHOBJID_DIAGRAM_WALL";
-/*?*/ 		case CHOBJID_DIAGRAM_FLOOR:				return "CHOBJID_DIAGRAM_FLOOR";
-/*?*/ 		case CHOBJID_DIAGRAM_TITLE_X_AXIS:		return "CHOBJID_DIAGRAM_TITLE_X_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_TITLE_Y_AXIS:		return "CHOBJID_DIAGRAM_TITLE_Y_AXIS";
-/*N*/ 		case CHOBJID_DIAGRAM_TITLE_Z_AXIS:		return "CHOBJID_DIAGRAM_TITLE_Z_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_X_AXIS:			return "CHOBJID_DIAGRAM_X_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_Y_AXIS:			return "CHOBJID_DIAGRAM_Y_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_Z_AXIS:			return "CHOBJID_DIAGRAM_Z_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_A_AXIS:			return "CHOBJID_DIAGRAM_A_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_B_AXIS:			return "CHOBJID_DIAGRAM_B_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_C_AXIS:			return "CHOBJID_DIAGRAM_C_AXIS";
-/*?*/ 		case CHOBJID_DIAGRAM_X_GRID_MAIN:		return "CHOBJID_DIAGRAM_X_GRID_MAIN";
-/*?*/ 		case CHOBJID_DIAGRAM_Y_GRID_MAIN:		return "CHOBJID_DIAGRAM_Y_GRID_MAIN";
-/*?*/ 		case CHOBJID_DIAGRAM_Z_GRID_MAIN:		return "CHOBJID_DIAGRAM_Z_GRID_MAIN";
-/*?*/ 		case CHOBJID_DIAGRAM_Y_GRID_HELP:		return "CHOBJID_DIAGRAM_Y_GRID_HELP";
-/*?*/ 		case CHOBJID_DIAGRAM_Z_GRID_HELP:		return "CHOBJID_DIAGRAM_Z_GRID_HELP";
-/*?*/ 		case CHOBJID_DIAGRAM_ROWGROUP:			return "CHOBJID_DIAGRAM_ROWGROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_ROWS:				return "CHOBJID_DIAGRAM_ROWS";
-/*?*/ 		case CHOBJID_DIAGRAM_ROWSLINE:			return "CHOBJID_DIAGRAM_ROWSLINE";
-/*?*/ 		case CHOBJID_DIAGRAM_DATA:				return "CHOBJID_DIAGRAM_DATA";
-/*?*/ 		case CHOBJID_DIAGRAM_DESCRGROUP:		return "CHOBJID_DIAGRAM_DESCRGROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_DESCR_ROW:			return "CHOBJID_DIAGRAM_DESCR_ROW";
-/*?*/ 		case CHOBJID_DIAGRAM_DESCR_COL:			return "CHOBJID_DIAGRAM_DESCR_COL";
-/*?*/ 		case CHOBJID_DIAGRAM_DESCR_SYMBOL:		return "CHOBJID_DIAGRAM_DESCR_SYMBOL";
-/*?*/ 		case CHOBJID_LEGEND:					return "CHOBJID_LEGEND";
-/*?*/ 		case CHOBJID_LEGEND_BACK:				return "CHOBJID_LEGEND_BACK";
-/*?*/ 		case CHOBJID_LEGEND_SYMBOL_ROW:			return "CHOBJID_LEGEND_SYMBOL_ROW";
-/*?*/ 		case CHOBJID_LEGEND_SYMBOL_COL:			return "CHOBJID_LEGEND_SYMBOL_COL";
-/*?*/ 		case CHOBJID_DIAGRAM_Z_AXIS_GROUP:		return "CHOBJID_DIAGRAM_Z_AXIS_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_NET:				return "CHOBJID_DIAGRAM_NET";
-/*?*/ 		case CHOBJID_DIAGRAM_AVERAGEVALUE:		return "CHOBJID_DIAGRAM_AVERAGEVALUE";
-/*?*/ 		case CHOBJID_DIAGRAM_ERROR:				return "CHOBJID_DIAGRAM_ERROR";
-/*?*/ 		case CHOBJID_DIAGRAM_REGRESSION:		return "CHOBJID_DIAGRAM_REGRESSION";
-/*?*/ 		case CHOBJID_DIAGRAM_STACKEDGROUP:		return "CHOBJID_DIAGRAM_STACKEDGROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_STATISTICS_GROUP:	return "CHOBJID_DIAGRAM_STATISTICS_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_X_GRID_MAIN_GROUP:	return "CHOBJID_DIAGRAM_X_GRID_MAIN_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_Y_GRID_MAIN_GROUP:	return "CHOBJID_DIAGRAM_Y_GRID_MAIN_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_Z_GRID_MAIN_GROUP:	return "CHOBJID_DIAGRAM_Z_GRID_MAIN_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_X_GRID_HELP_GROUP:	return "CHOBJID_DIAGRAM_X_GRID_HELP_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_Y_GRID_HELP_GROUP:	return "CHOBJID_DIAGRAM_Y_GRID_HELP_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_Z_GRID_HELP_GROUP:	return "CHOBJID_DIAGRAM_Z_GRID_HELP_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_SPECIAL_GROUP:		return "CHOBJID_DIAGRAM_SPECIAL_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_STOCKLINE_GROUP:	return "CHOBJID_DIAGRAM_STOCKLINE_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_STOCKLOSS_GROUP:	return "CHOBJID_DIAGRAM_STOCKLOSS_GROUP";
-/*?*/ 		case CHOBJID_DIAGRAM_STOCKPLUS_GROUP:	return "CHOBJID_DIAGRAM_STOCKPLUS_GROUP";
-/*?*/ 
-/*?*/ 		default:
-/*?*/ 			return "unknown Id";
-/*N*/ 	}
-/*N*/ }
-
-/*N*/ #endif	// OSL_DEBUG_LEVEL
-
-
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index f626a4321..9bfa18016 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -813,12 +813,6 @@ using namespace ::com::sun::star::util;
 /*?*/ }
 
 
-/*?*/ Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const
-/*?*/ {
-/*?*/ 	return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos();
-/*?*/ }
-
-
 /*?*/ void SwCrsrShell::UnSetVisCrsr()
 /*?*/ {
 /*?*/ 	pVisCrsr->Hide();
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index 1381dad64..b5d30e72d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -719,24 +719,6 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
 /*N*/ 		}
 /*N*/ 	}
 /*N*/ }
-
-/*
- * SwDoc:
- *  Reading and writing of the layout cache.
- */
-
-/*N*/ void SwDoc::ReadLayoutCache( SvStream& rStream )
-/*N*/ {
-/*N*/     if( !pLayoutCache )
-/*N*/         pLayoutCache = new SwLayoutCache();
-/*N*/     if( !pLayoutCache->IsLocked() )
-/*N*/     {
-/*N*/         pLayoutCache->GetLockCount() |= 0x8000;
-/*N*/         pLayoutCache->Read( rStream );
-/*N*/         pLayoutCache->GetLockCount() &= 0x7fff;
-/*N*/     }
-/*N*/ }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/w4w/makefile.mk b/binfilter/bf_sw/source/filter/w4w/makefile.mk
index cc3f25914..1932a4940 100644
--- a/binfilter/bf_sw/source/filter/w4w/makefile.mk
+++ b/binfilter/bf_sw/source/filter/w4w/makefile.mk
@@ -47,7 +47,6 @@ CDEFS=$(CDEFS) -Dmydebug
 # --- Files --------------------------------------------------------
 
 CXXFILES = \
-        sw_w4watr.cxx \
         sw_w4wgraf.cxx \
         sw_w4wpar1.cxx \
         sw_w4wpar2.cxx \
@@ -57,7 +56,6 @@ CXXFILES = \
 
 
 SLOFILES =  \
-        $(SLO)$/sw_w4watr.obj \
         $(SLO)$/sw_w4wgraf.obj \
         $(SLO)$/sw_w4wpar1.obj \
         $(SLO)$/sw_w4wpar2.obj \
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
deleted file mode 100644
index 6e3bc0466..000000000
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-/*
- * Dieses File enthaelt alle Ausgabe-Funktionen des W4W-Writers;
- * fuer alle Nodes, Attribute, Formate und Chars.
- */
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <hintids.hxx>
-
-#include <bf_svtools/whiter.hxx>
-#include <bf_svx/hyznitem.hxx>
-#include <bf_svx/langitem.hxx>
-#include <bf_svx/orphitem.hxx>
-#include <bf_svx/tstpitem.hxx>
-#include <bf_svx/spltitem.hxx>
-#include <bf_svx/widwitem.hxx>
-#include <bf_svx/adjitem.hxx>
-#include <bf_svx/cmapitem.hxx>
-#include <bf_svx/lspcitem.hxx>
-#include <bf_svx/kernitem.hxx>
-#include <bf_svx/wghtitem.hxx>
-#include <bf_svx/udlnitem.hxx>
-#include <bf_svx/escpitem.hxx>
-#include <bf_svx/crsditem.hxx>
-#include <bf_svx/colritem.hxx>
-#include <bf_svx/brkitem.hxx>
-#include <bf_svx/postitem.hxx>
-#include <bf_svx/shdditem.hxx>
-#include <bf_svx/ulspitem.hxx>
-#include <bf_svx/lrspitem.hxx>
-#include <bf_svx/fontitem.hxx>
-#include <bf_svx/fhgtitem.hxx>
-
-
-#include <fmtftn.hxx>
-#include <txtftn.hxx>
-#include <fmtpdsc.hxx>
-#include <fmthdft.hxx>
-#include <fmtcntnt.hxx>
-#include <fmtfsize.hxx>
-#include <fmtfld.hxx>
-#include <frmatr.hxx>
-#include <charatr.hxx>
-#include <ftninfo.hxx>
-#include <ndtxt.hxx>
-#include <doc.hxx>
-#include <pam.hxx>
-#include <paratr.hxx>
-#include <fldbas.hxx>          // fuer SwField ...
-#include <ndgrf.hxx>
-#include <grfatr.hxx>
-#include <fmtcol.hxx>
-#include <bookmrk.hxx>      // fuer SwBookmark ...
-#include <pagedesc.hxx>     // fuer SwPageDesc...
-#include <pageiter.hxx>
-#include <wrtw4w.hxx>
-namespace binfilter {
-
-
-/*
- * um nicht immer wieder nach einem Update festzustellen, das irgendwelche
- * Hint-Ids dazugekommen sind, wird hier definiert, die Groesse der Tabelle
- * definiert und mit der akt. verglichen. Bei unterschieden wird der
- * Compiler schon meckern.
- *
- * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
- * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
- */
-
-#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MINGW32__) && !defined(OS2)
-
-#define ATTRFNTAB_SIZE 130
-#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
-#error "Attribut-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-
-#ifdef FORMAT_TABELLE
-// da sie nicht benutzt wird!
-#define FORMATTAB_SIZE 7
-#if FORMATTAB_SIZE != RES_FMT_END - RES_FMT_BEGIN
-#error "Format-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-#endif
-
-#define NODETAB_SIZE 3
-#if NODETAB_SIZE != RES_NODE_END - RES_NODE_BEGIN
-#error "Node-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-
-#endif
-
-
-
-//-----------------------------------------------------------------------
-
-// einige Forward Deklarationen
-
-#define OUTRECORD(rStrm,pStr)	rStrm << sW4W_RECBEGIN << pStr << cW4W_RED
-
-inline int HI_BYTE( USHORT n )  { return (int)( ( n >> 8 ) & 0xff );  }
-inline int LO_BYTE( USHORT n )  { return (int)( n & 0xff ); }
-
-
-/* Ausgabe der Nodes */
-
-/*
- *  Ausgabe der Texte-Attribute:
- *      Die Text-Attribute sind in einem VarArray nach ihren Start-Positionen
- *      sortiert. Fuer den W4W-Writer ist aber auch das Ende von Bedeutung.
- *      Darum die Idee, sobald im SwpHints-Array ein Attribut mit der Start-
- *      Position gefunden wurde, in einem Sortierten-Array die Endposition
- *      zu speichern. Sobald der Writer die Position erreicht hat, wird die
- *      schliessende Klammer ausgegeben und die Position aus dem Sort.Array
- *      geloescht.
- */
-
-struct W4WSttEndPos
-{
-    USHORT nFontSize, nFontId;
-    const SwTxtAttr* pTxtAttr;
-    W4WSttEndPos( const SwTxtAttr* pTxtAt, USHORT nFSize, USHORT nFId );
-    W4WSttEndPos( const W4WSttEndPos & rSEPos );
-    BOOL operator<( const W4WSttEndPos & rSEPos );
-};
-
-W4WSttEndPos::W4WSttEndPos( const SwTxtAttr* pTxtAt, USHORT nFSize, USHORT nFId )
-    : nFontSize(nFSize)
-    , nFontId( nFId )
-    , pTxtAttr(pTxtAt)
-{}
-
-W4WSttEndPos::W4WSttEndPos( const W4WSttEndPos & rSEPos )
-    : nFontSize( rSEPos.nFontSize )
-    , nFontId( rSEPos.nFontId )
-    , pTxtAttr( rSEPos.pTxtAttr)
-{}
-
-BOOL W4WSttEndPos::operator<( const W4WSttEndPos & rSEPos )
-{
-    USHORT nEnd1, nEnd2;
-    if( ( nEnd1 = *pTxtAttr->GetEnd() ) < ( nEnd2 = *rSEPos.pTxtAttr->GetEnd() ) )
-        return TRUE;
-    if( nEnd1 == nEnd2 )
-        return *pTxtAttr->GetStart() > *rSEPos.pTxtAttr->GetStart();
-    return FALSE;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index d0f66e011..929187994 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -1284,8 +1284,6 @@ public:
 private: // CLOOK-Impl-Methoden
     void	ImplLoadDocOptions( SvStream& rStream );
     void	ImplLoadViewOptions( SvStream& rStream );
-    void	ImplSaveDocOptions( SvStream& rStream ) const;
-    void	ImplSaveViewOptions( SvStream& rStream ) const;
     void	ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen?
     void	ImplDeleteOptions();
 
@@ -1299,7 +1297,6 @@ private: // CLOOK-Impl-Methoden
 
     void	LoadDdeLinks(SvStream& rStream);
     void	LoadAreaLinks(SvStream& rStream);
-    void	SaveAreaLinks(SvStream& rStream) const;
 
     void	UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
                              const ScRange& r, short nDx, short nDy, short nDz );
diff --git a/binfilter/inc/bf_sch/objid.hxx b/binfilter/inc/bf_sch/objid.hxx
index 7dcda7776..68c98e1d0 100644
--- a/binfilter/inc/bf_sch/objid.hxx
+++ b/binfilter/inc/bf_sch/objid.hxx
@@ -70,11 +70,6 @@ extern SdrObject* GetObjWithId(UINT16 nObjId, const SdrObjList& rObjList,
                                                            ULONG* pIndex = NULL,
                                                            SdrIterMode eMode = IM_FLAT);
 
-//Die hier folgenden Funktionen dienen AUSSCHLIESSLICH zu DEBUG-Zwecken
-#if OSL_DEBUG_LEVEL > 0
-extern const char *GetCHOBJIDName(const long id);
-#endif
-
 } //namespace binfilter
 #endif	// _SCH_OBJID_HXX
 
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index c8495504a..2cffbe63c 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -434,8 +434,6 @@ public:
 
     // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
     CRSR_INLINE const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
-    // erfrage die Document - Layout - Position vom akt. Crsr
-    CRSR_INLINE Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const;
     CRSR_INLINE bool IsCrsrPtAtEnd() const;
 
     CRSR_INLINE const 	SwPaM* GetTblCrs() const;
@@ -612,11 +610,6 @@ inline bool SwCrsrShell::IsCrsrPtAtEnd() const
     return pCurCrsr->End() == pCurCrsr->GetPoint();
 }
 
-inline Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const
-{
-    return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos();
-}
-
 inline const SwPaM* SwCrsrShell::GetTblCrs() const
 {
     return pTblCrsr;
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index a1af1f7f0..d6fc7238d 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1549,7 +1549,6 @@ public:
         else n8Dummy2 &= ~DUMMY_ADD_FLY_OFFSETS;
     }
 
-    void ReadLayoutCache( SvStream& rStream );
     SwLayoutCache* GetLayoutCache() const { return pLayoutCache; }
 
     void SetULongDummy1( sal_uInt32 n ) { n32Dummy1 = n; }
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
new file mode 100644
index 000000000..c24aedc52
--- /dev/null
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BF_STRING_HXX
+#define _BF_STRING_HXX
+
+#include <tools/string.hxx>
+
+namespace binfilter
+{
+    ByteString ByteString_CreateFromInt32(sal_Int32 n, sal_Int16 nRadix = 10);
+}
+
+#endif // _BF_STRING_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */