Cleanup PaM related code a little.

10 files changed, 10 insertions, 320 deletions

diff --git a/binfilter/bf_sw/source/core/crsr/makefile.mk b/binfilter/bf_sw/source/core/crsr/makefile.mk
index 120d5d030..e92a1d6f9 100644
--- a/binfilter/bf_sw/source/core/crsr/makefile.mk
+++ b/binfilter/bf_sw/source/core/crsr/makefile.mk
@@ -48,11 +48,9 @@ CDEFS+=-Dmydebug
 SLOFILES =	\
         $(SLO)$/sw_bookmrk.obj \
         $(SLO)$/sw_crsrsh.obj \
-        $(SLO)$/sw_findattr.obj \
         $(SLO)$/sw_pam.obj \
         $(SLO)$/sw_paminit.obj \
         $(SLO)$/sw_swcrsr.obj \
-        $(SLO)$/sw_trvlreg.obj \
         $(SLO)$/sw_trvltbl.obj \
         $(SLO)$/sw_unocrsr.obj \
         $(SLO)$/sw_viscrs.obj
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
deleted file mode 100644
index 3aa82e247..000000000
--- a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
+++ /dev/null
@@ -1,70 +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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-
-#include <hintids.hxx>
-#include <txatbase.hxx>
-#include <horiornt.hxx>
-#include <doc.hxx>
-#include <swcrsr.hxx>
-#include <pamtyp.hxx>
-
-namespace binfilter {
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-
-
-    // Sonderbehandlung fuer SvxFontItem, nur den Namen vergleichen:
-
-
-/*N*/ const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& /*rHtsArr*/, USHORT& /*rPos*/,
-/*N*/   xub_StrLen /*nCntntPos*/ )
-/*N*/ {
-        DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return 0;                   // kein gueltiges TextAttribut
-/*N*/ }
-
-
-/*N*/ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& /*rHtsArr*/, USHORT& /*rPos*/,
-/*N*/       xub_StrLen /*nCntntPos*/ )
-/*N*/ {
-        DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return 0;                   // kein gueltiges TextAttribut
-/*N*/ }
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
index f47906e2e..c0f081534 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
@@ -475,17 +475,9 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 /*N*/ }
 
 
-/*N*/ void GoStartSection( SwPosition* /*pPos*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-// gehe an das Ende der akt. Grund-Section
-
-
-/*N*/ void GoEndSection( SwPosition* /*pPos*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
+// These are used in bf_sw/source/core/crsr/sw_paminit.cxx
+bool GoInCntntCells( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ ) { return FALSE; } // DBG_BF_ASSERT
+bool GoPrevPara( SwPaM & /*rPam*/, SwPosPara /*aPosPara*/) { return FALSE; } // DBG_BF_ASSERT
 
 
 /*N*/ bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
@@ -495,12 +487,6 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 /*N*/ }
 
 
-/*N*/ bool GoInSection( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return TRUE;
-/*N*/ }
-
-
 /*N*/ bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
 /*N*/ {
 /*N*/   SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, TRUE );
@@ -519,19 +505,8 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 /*N*/   return GoInNode( rPam, fnMove );
 /*N*/ }
 
-/*N*/ bool GoInCntntCells( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
 // --------- Funktionsdefinitionen fuer die SwCrsrShell --------------
 
-
-/*N*/ bool GoPrevPara( SwPaM & /*rPam*/, SwPosPara /*aPosPara*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return FALSE;
-/*N*/ }
-
-
 /*N*/ bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
 /*N*/ {
 /*N*/   SwPosition& rPos = *rPam.GetPoint();
@@ -596,18 +571,6 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
 /*N*/   return aSavePos != rPos;
 /*N*/ }
 
-
-/*N*/ bool GoNextSection( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return TRUE;
-/*N*/ }
-
-
-/*N*/ bool GoPrevSection( SwPaM & /*rPam*/, SwMoveFn /*fnMove*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return TRUE;
-/*N*/ }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx b/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx
index afab4ec68..2db5f08a3 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx
@@ -41,10 +41,6 @@ namespace binfilter {
 /*N*/   /* fnNd         */  &GoNext,
 /*N*/   /* fnNds        */  &GoNextNds,
 /*N*/   /* fnDoc        */  &GoEndDoc,
-/*N*/   /* fnSections   */  &GoEndSection,
-/*N*/   /* fnCmpOp      */  &SwPosition::operator<,
-/*N*/   /* fnGetHint    */  &GetFrwrdTxtHint,
-/*N*/   /* fnSearch     */  &::utl::TextSearch::SearchFrwrd,
 /*N*/   /* fnSection    */  &SwNodes::GoStartOfSection
 /*N*/ };
 
@@ -52,15 +48,10 @@ namespace binfilter {
 /*N*/   /* fnNd         */  &GoPrevious,
 /*N*/   /* fnNds        */  &GoPreviousNds,
 /*N*/   /* fnDoc        */  &GoStartDoc,
-/*N*/   /* fnSections   */  &GoStartSection,
-/*N*/   /* fnCmpOp      */  &SwPosition::operator>,
-/*N*/   /* fnGetHint    */  &GetBkwrdTxtHint,
-/*N*/   /* fnSearch     */  &::utl::TextSearch::SearchBkwrd,
 /*N*/   /* fnSection    */  &SwNodes::GoEndOfSection
 /*N*/ };
 
 /*N*/ SwGoInDoc fnGoDoc         = &GoInDoc;
-/*N*/ SwGoInDoc fnGoSection     = &GoInSection;
 /*N*/ SwGoInDoc fnGoNode        = &GoInNode;
 /*N*/ SwGoInDoc fnGoCntnt       = &GoInCntnt;
 /*N*/ SwGoInDoc fnGoCntntCells  = &GoInCntntCells;
@@ -71,69 +62,21 @@ namespace binfilter {
 /*N*/ SwPosPara fnParaStart     = &aFwrd;
 /*N*/ SwPosPara fnParaEnd       = &aBwrd;
 
-/*N*/ SwWhichSection fnSectionPrev  = &GoPrevSection;
 /*N*/ SwWhichSection fnSectionCurr  = &GoCurrSection;
-/*N*/ SwWhichSection fnSectionNext  = &GoNextSection;
 /*N*/ SwPosSection fnSectionStart   = &aFwrd;
 /*N*/ SwPosSection fnSectionEnd     = &aBwrd;
 
 // Travelling in Tabellen
-/*N*/ bool GotoPrevTable( SwPaM&, SwPosTable, bool bInReadOnly );
 /*N*/ bool GotoCurrTable( SwPaM&, SwPosTable, bool bInReadOnly );
-/*N*/ bool GotoNextTable( SwPaM&, SwPosTable, bool bInReadOnly );
 
-/*N*/ SwWhichTable fnTablePrev  = &GotoPrevTable;
 /*N*/ SwWhichTable fnTableCurr  = &GotoCurrTable;
-/*N*/ SwWhichTable fnTableNext  = &GotoNextTable;
 /*N*/ SwPosTable fnTableStart   = &aFwrd;
 /*N*/ SwPosTable fnTableEnd     = &aBwrd;
 
 // Travelling in Bereichen
-/*N*/ bool GotoPrevRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
-/*N*/ bool GotoCurrRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
-/*N*/ bool GotoCurrRegionAndSkip( SwPaM&, SwPosRegion, bool bInReadOnly );
-/*N*/ bool GotoNextRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
-
-/*N*/ SwWhichRegion fnRegionPrev    = &GotoPrevRegion;
-/*N*/ SwWhichRegion fnRegionCurr    = &GotoCurrRegion;
-/*N*/ SwWhichRegion fnRegionCurrAndSkip = &GotoCurrRegionAndSkip;
-/*N*/ SwWhichRegion fnRegionNext    = &GotoNextRegion;
-/*N*/ SwPosRegion fnRegionStart     = &aFwrd;
-/*N*/ SwPosRegion fnRegionEnd       = &aBwrd;
-/*N*/
 /*N*/ SwMoveFn fnMoveBackward   = &aBwrd;
 /*N*/ SwMoveFn fnMoveForward    = &aFwrd;
 
-
-#ifdef USED
-
-// JP 30.11.95:
-//  war fuer die CFRONT-Compiler noetig, jetzt sollte das nicht mehr
-//  benoetigt werden.
-
-/*N*/ void _InitPam()
-/*N*/ {
-/*N*/   aBwrd.fnNd      =  &GoPrevious;
-/*N*/   aBwrd.fnNds     =  &GoPreviousNds;
-/*N*/   aBwrd.fnDoc     =  &GoStartDoc;
-/*N*/   aBwrd.fnSections=  &GoStartSection;
-/*N*/   aBwrd.fnCmpOp   =  &SwPosition::operator>;
-/*N*/   aBwrd.fnGetHint =  &GetBkwrdTxtHint;
-/*N*/   aBwrd.fnSearch  =  &SearchText::SearchBkwrd;
-/*N*/   aBwrd.fnSection =  &SwNodes::GoEndOfSection;
-/*N*/
-/*N*/   aFwrd.fnNd      =  &GoNext;
-/*N*/   aFwrd.fnNds     =  &GoNextNds;
-/*N*/   aFwrd.fnDoc     =  &GoEndDoc;
-/*N*/   aFwrd.fnSections=  &GoEndSection;
-/*N*/   aFwrd.fnCmpOp   =  &SwPosition::operator<;
-/*N*/   aFwrd.fnGetHint =  &GetFrwrdTxtHint;
-/*N*/   aFwrd.fnSearch  =  &SearchText::SearchFrwrd;
-/*N*/   aFwrd.fnSection =  &SwNodes::GoStartOfSection;
-/*N*/ }
-#endif
-
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx
deleted file mode 100644
index a97f5879e..000000000
--- a/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx
+++ /dev/null
@@ -1,69 +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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <horiornt.hxx>
-
-#include <crsrsh.hxx>
-#include <viscrs.hxx>
-namespace binfilter {
-
-
-
-/*N*/ bool GotoPrevRegion( SwPaM& /*rCurCrsr*/, SwPosRegion /*fnPosRegion*/,
-/*N*/                       bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return FALSE;
-/*N*/ }
-
-
-/*N*/ bool GotoNextRegion( SwPaM& /*rCurCrsr*/, SwPosRegion /*fnPosRegion*/,
-/*N*/                       bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return FALSE;
-/*N*/ }
-
-
-/*N*/ bool GotoCurrRegion( SwPaM& /*rCurCrsr*/, SwPosRegion /*fnPosRegion*/,
-/*N*/                       bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-
-/*N*/ bool GotoCurrRegionAndSkip( SwPaM& /*rCurCrsr*/, SwPosRegion /*fnPosRegion*/,
-/*N*/                               bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return FALSE;
-/*N*/ }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
index 9b4d6ccda..aa439a52b 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
@@ -31,9 +31,7 @@
 #endif
 
 #include <hintids.hxx>
-
 #include <horiornt.hxx>
-
 #include <doc.hxx>
 #include <cntfrm.hxx>
 #include <crsrsh.hxx>
@@ -42,6 +40,7 @@
 #include <ndtxt.hxx>
 #include <shellres.hxx>
 #include <cellfrm.hxx>
+
 namespace binfilter {
 
 // setze Crsr in die naechsten/vorherigen Celle
@@ -62,29 +61,8 @@ namespace binfilter {
 //      0   - Idx steht auf/in einer nicht geschuetzten Zelle
 //      !0  - Node hinter der Tabelle
 
-/*N*/ bool GotoPrevTable( SwPaM& /*rCurCrsr*/, SwPosTable /*fnPosTbl*/,
-/*N*/                       bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return FALSE;
-/*N*/ }
-
-/*N*/ bool GotoNextTable( SwPaM& /*rCurCrsr*/, SwPosTable /*fnPosTbl*/,
-/*N*/                       bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return FALSE;
-/*N*/ }
-
-/*N*/ bool GotoCurrTable( SwPaM& /*rCurCrsr*/, SwPosTable /*fnPosTbl*/,
-/*N*/                       bool /*bInReadOnly*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return TRUE;
-/*N*/ }
-
-/*N*/ bool SwCursor::MoveTable( SwWhichTable /*fnWhichTbl*/, SwPosTable /*fnPosTbl*/ )
-/*N*/ {
-/*N*/   bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/   return bRet;
-/*N*/ }
+bool GotoCurrTable( SwPaM&, SwPosTable, bool ) { return true; } // DBG_BF_ASSERT
+bool SwCursor::MoveTable( SwWhichTable, SwPosTable ) { return false; } // DBG_BF_ASSERT
 
 /*N*/ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
 /*N*/ {
@@ -141,13 +119,6 @@ namespace binfilter {
 /*?*/           pChkBox = 0;
 /*?*/   }
 /*?*/
-/*?*/   if( pChkBox )
-/*?*/   {
-/*?*/       // jetzt sollten wir mal die Pointer zerstoeren, bevor ein weiterer
-/*?*/       // aufruf kommt.
-/*?*/       DBG_BF_ASSERT(0, "STRIP");
-/*?*/   }
-/*?*/
 /*?*/   return 0 != pChkBox;
 /*N*/ }
 
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index 859204cf8..20e9533d4 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -131,11 +131,6 @@ Verhalten von Delete-Redline:
 /*N*/   return 0;
 /*N*/ }
 
-typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
-                        BOOL bCallDelete,
-                        const SwPosition* pSttRng,
-                        const SwPosition* pEndRng);
-
 // Kommentar am Redline setzen
 
     // fuer die Reader usw. - neuen Author in die Tabelle eintragen
@@ -207,7 +202,6 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
 /*N*/           }
 /*N*/
 /*N*/           pNew->SetMark();
-/*N*/           GoEndSection( pNew->GetPoint() );
 /*N*/           if( *pNew->GetPoint() > *pEnd )
 /*N*/           {
 /*N*/               pC = 0;
diff --git a/binfilter/bf_sw/source/core/inc/pamtyp.hxx b/binfilter/bf_sw/source/core/inc/pamtyp.hxx
index 3f8a0b112..b2f3c4385 100644
--- a/binfilter/bf_sw/source/core/inc/pamtyp.hxx
+++ b/binfilter/bf_sw/source/core/inc/pamtyp.hxx
@@ -30,31 +30,24 @@
 #define _PAMTYP_HXX
 
 #include <bf_svtools/bf_solar.h>
-
 #include <unotools/textsearch.hxx>
 #include <pam.hxx>
 #include <node.hxx>
 #include <tools/string.hxx>
+
 namespace binfilter {
 
-class SwpHints;
 struct SwPosition;
 class SwPaM;
-class SwTxtAttr;
 
 // Funktions-Deklarationen fuer die Move/Find-Methoden vom SwPaM
 
 void GoStartDoc( SwPosition*);
 void GoEndDoc( SwPosition*);
-void GoStartSection( SwPosition*);
-void GoEndSection( SwPosition*);
 bool GoInDoc( SwPaM&, SwMoveFn);
-bool GoInSection( SwPaM&, SwMoveFn);
 bool GoInNode( SwPaM&, SwMoveFn);
 bool GoInCntnt( SwPaM&, SwMoveFn);
 bool GoInCntntCells( SwPaM&, SwMoveFn);
-const SwTxtAttr* GetFrwrdTxtHint( const SwpHints&, USHORT&, xub_StrLen );
-const SwTxtAttr* GetBkwrdTxtHint( const SwpHints&, USHORT&, xub_StrLen );
 
 bool GoNext(SwNode* pNd, SwIndex * pIdx, USHORT nMode );
 bool GoPrevious(SwNode* pNd, SwIndex * pIdx, USHORT nMode );
@@ -66,9 +59,7 @@ SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
 bool GoPrevPara( SwPaM&, SwPosPara);
 bool GoCurrPara( SwPaM&, SwPosPara);
 bool GoNextPara( SwPaM&, SwPosPara);
-bool GoPrevSection( SwPaM&, SwPosSection);
 bool GoCurrSection( SwPaM&, SwPosSection);
-bool GoNextSection( SwPaM&, SwPosSection);
 
 
 // ------------ Typedefiniton fuer Funktionen ----------------------
@@ -76,11 +67,6 @@ bool GoNextSection( SwPaM&, SwPosSection);
 typedef bool (*GoNd)( SwNode*, SwIndex*, USHORT );
 typedef SwCntntNode* (*GoNds)( SwNodeIndex*, bool );
 typedef void (*GoDoc)( SwPosition* );
-typedef void (*GoSection)( SwPosition* );
-typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
-typedef const SwTxtAttr* (*GetHint)( const SwpHints&, USHORT&, xub_StrLen );
-typedef int (::utl::TextSearch:: *SearchTxt)( const String&, xub_StrLen*,
-                    xub_StrLen*, ::com::sun::star::util::SearchResult* );
 typedef void (SwNodes:: *MvSection)( SwNodeIndex * ) const;
 
 
@@ -89,10 +75,6 @@ struct SwMoveFnCollection
     GoNd      fnNd;
     GoNds     fnNds;
     GoDoc     fnDoc;
-    GoSection fnSections;
-    CmpOp     fnCmpOp;
-    GetHint   fnGetHint;
-    SearchTxt fnSearch;
     MvSection fnSection;
 };
 
diff --git a/binfilter/inc/bf_sw/cshtyp.hxx b/binfilter/inc/bf_sw/cshtyp.hxx
index 61841ceab..be42830f8 100644
--- a/binfilter/inc/bf_sw/cshtyp.hxx
+++ b/binfilter/inc/bf_sw/cshtyp.hxx
@@ -60,13 +60,13 @@ extern SwPosPara fnParaStart, fnParaEnd;
 // Richtungsparameter fuer MoveSection
 typedef SwMoveFnCollection* SwPosSection;
 typedef bool (*SwWhichSection)( SwPaM&, SwPosSection );
-extern SwWhichSection fnSectionPrev, fnSectionCurr, fnSectionNext;
+extern SwWhichSection fnSectionCurr;
 extern SwPosSection fnSectionStart, fnSectionEnd;
 
 // Richtungsparameter fuer MoveTable
 typedef SwMoveFnCollection* SwPosTable;
 typedef bool (*SwWhichTable)( SwPaM&, SwPosTable, bool bInReadOnly );
-extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext;
+extern SwWhichTable fnTableCurr;
 extern SwPosTable fnTableStart, fnTableEnd;
 
 // Richtungsparameter fuer MoveColumn
@@ -75,13 +75,6 @@ typedef SwCntntFrm  * (*SwPosColumn)( const SwLayoutFrm * );
 extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext;
 extern SwPosColumn fnColumnStart, fnColumnEnd;
 
-// Richtungsparameter fuer MoveRegion   (Bereiche!)
-typedef SwMoveFnCollection* SwPosRegion;
-typedef bool (*SwWhichRegion)( SwPaM&, SwPosRegion, bool bInReadOnly );
-extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip;
-extern SwPosRegion fnRegionStart, fnRegionEnd;
-
-
 
 /*
  * folgende Kombinationen sind erlaubt:
diff --git a/binfilter/inc/bf_sw/pam.hxx b/binfilter/inc/bf_sw/pam.hxx
index 21d1eb426..2c3a63ce7 100644
--- a/binfilter/inc/bf_sw/pam.hxx
+++ b/binfilter/inc/bf_sw/pam.hxx
@@ -81,28 +81,13 @@ struct SwPosition
 };
 
 
-// das Ergebnis eines Positions Vergleiches
-enum SwComparePosition {
-    POS_BEFORE,             // Pos1 liegt vor Pos2
-    POS_BEHIND,             // Pos1 liegt hinter Pos2
-    POS_INSIDE,             // Pos1 liegt vollstaendig in Pos2
-    POS_OUTSIDE,            // Pos2 liegt vollstaendig in Pos1
-    POS_EQUAL,              // Pos1 ist genauso gross wie Pos2
-    POS_OVERLAP_BEFORE,     // Pos1 ueberlappt Pos2 am Anfang
-    POS_OVERLAP_BEHIND,     // Pos1 ueberlappt Pos2 am Ende
-    POS_COLLIDE_START,      // Pos1 Start stoesst an Pos2 Ende
-    POS_COLLIDE_END         // Pos1 End stoesst an Pos2 Start
-};
-
 // SwPointAndMark / SwPaM
 struct SwMoveFnCollection;
 typedef SwMoveFnCollection* SwMoveFn;
 extern SwMoveFn fnMoveForward, fnMoveBackward;
 
 typedef bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove );
-extern SwGoInDoc fnGoDoc, fnGoSection, fnGoNode, fnGoCntnt, fnGoCntntCells;
-
-void _InitPam();
+extern SwGoInDoc fnGoDoc, fnGoNode, fnGoCntnt, fnGoCntntCells;
 
 class SwPaM : public Ring
 {