must change: SearchText->TextSearch and use namespace

15 files changed, 94 insertions, 84 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 63f30dbf6f21..3d0db3c3d849 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: crsrsh.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-25 11:53:57 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:20:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,7 +140,9 @@ class SwCellFrms;
 class SwTOXMark;
 struct SwPosition;
 
-class SearchParam;
+namespace utl {
+    class SearchParam;
+};
 class SwRedline;
 
 // enum und struktur, um ueber die Doc-Position Informationen zu erfragen
@@ -397,7 +399,7 @@ public:
     FASTBOOL MoveRegion( SwWhichRegion, SwPosRegion );
 
     // die Suchfunktionen
-    ULONG Find( const SearchParam& rParam,
+    ULONG Find( const utl::SearchParam& rParam,
                 SwDocPositions eStart, SwDocPositions eEnde,
                 FindRanges eRng, int bReplace = FALSE );
 
@@ -407,7 +409,7 @@ public:
 
     ULONG Find( const SfxItemSet& rSet, FASTBOOL bNoCollections,
                 SwDocPositions eStart, SwDocPositions eEnde,
-                FindRanges eRng, const SearchParam* pTextPara = 0,
+                FindRanges eRng, const utl::SearchParam* pTextPara = 0,
                 const SfxItemSet* rReplSet = 0 );
 
     // Positionieren des Cursors
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index c0959fb3f235..12f7b74d4b55 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pam.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:27 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:20:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,11 +89,13 @@ class SfxItemSet;
 class SwDoc;
 class SwNode;
 class SwCntntNode;
-class SearchParam;
-class SearchText;
 class SwNodes;
 class SwPaM;
 
+namespace utl {
+    class SearchParam;
+    class TextSearch;
+};
 
 struct SwPosition
 {
@@ -182,7 +184,7 @@ public:
                     SwGoInDoc fnGo = fnGoCntnt );
 
     // Suchen
-    BYTE Find(  const SearchParam& rParam, SearchText& rSTxt,
+    BYTE Find(  const utl::SearchParam& rParam, utl::TextSearch& rSTxt,
                 SwMoveFn fnMove = fnMoveForward,
                 const SwPaM *pPam =0, FASTBOOL bInReadOnly = FALSE);
     FASTBOOL Find(  const SwFmt& rFmt,
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 1a22bed6c721..87ed114e7537 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swcrsr.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-25 15:39:12 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:20:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -141,7 +141,7 @@ public:
     SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions,
                                         SwPaM* ) const;
 
-    ULONG Find( const SearchParam& rParam,
+    ULONG Find( const utl::SearchParam& rParam,
                 SwDocPositions nStart, SwDocPositions nEnde,
                 FindRanges = FND_IN_BODY,
                 int bReplace = FALSE );
@@ -154,7 +154,7 @@ public:
     ULONG Find( const SfxItemSet& rSet, FASTBOOL bNoCollections,
                 SwDocPositions nStart, SwDocPositions nEnde,
                 FindRanges = FND_IN_BODY,
-                const SearchParam* pTextPara = 0,
+                const utl::SearchParam* pTextPara = 0,
                 const SfxItemSet* rReplSet = 0 );
 
     FASTBOOL IsStartWord()const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 2462a1ec8038..c704db3b22a3 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: crsrsh.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-25 12:01:23 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:22:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2674,7 +2674,7 @@ FASTBOOL SwCrsrShell::IsSelFullPara() const
 /*  */
 
     // die Suchfunktionen
-ULONG SwCrsrShell::Find( const SearchParam& rParam,
+ULONG SwCrsrShell::Find( const utl::SearchParam& rParam,
                             SwDocPositions eStart, SwDocPositions eEnde,
                             FindRanges eRng, int bReplace )
 {
@@ -2704,7 +2704,7 @@ ULONG SwCrsrShell::Find( const SwTxtFmtColl& rFmtColl,
 
 ULONG SwCrsrShell::Find( const SfxItemSet& rSet, FASTBOOL bNoCollections,
                             SwDocPositions eStart, SwDocPositions eEnde,
-                            FindRanges eRng, const SearchParam* pTextPara,
+                            FindRanges eRng, const utl::SearchParam* pTextPara,
                             const SfxItemSet* rReplSet )
 {
     if( pTblCrsr )
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 34e65905851c..bcbbe4246f52 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: findattr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:17 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:22:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,7 +120,6 @@
 #endif
 
 
-
 SV_DECL_PTRARR_SORT( SwpFmts, SwFmt*, 0, 4 )
 SV_IMPL_PTRARR_SORT( SwpFmts, SwFmt* )
 
@@ -1252,12 +1251,12 @@ struct SwFindParaAttr : public SwFindParas
 {
     BOOL bValue;
     const SfxItemSet *pSet, *pReplSet;
-    const SearchParam *pTxtPara;
+    const utl::SearchParam *pTxtPara;
     SwCursor& rCursor;
-    SearchText* pSTxt;
+    utl::TextSearch* pSTxt;
 
     SwFindParaAttr( const SfxItemSet& rSet, BOOL bNoCollection,
-                    const SearchParam* pTextParam, const SfxItemSet* pRSet,
+                    const utl::SearchParam* pTextParam, const SfxItemSet* pRSet,
                     SwCursor& rCrsr )
         : pSet( &rSet ), pReplSet( pRSet ), rCursor( rCrsr ),
             bValue( bNoCollection ), pTxtPara( pTextParam ), pSTxt( 0 )
@@ -1306,9 +1305,9 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
             // dann darin den Text
             if( !pSTxt )
             {
-                SearchParam aTmp( *pTxtPara );
+                utl::SearchParam aTmp( *pTxtPara );
                 aTmp.SetSrchInSelection( TRUE );
-                pSTxt = new SearchText( aTmp, Application::GetAppInternational());
+                pSTxt = new utl::TextSearch( aTmp, LANGUAGE_SYSTEM );
             }
             // Bug 24665: suche im richtigen Bereich weiter (pTextRegion!)
             if( pCrsr->Find( *pTxtPara, *pSTxt, fnMove, pTextRegion, bInReadOnly ) &&
@@ -1347,7 +1346,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
 
     if( bReplaceTxt )
     {
-        int bRegExp = SearchParam::SRCH_REGEXP == pTxtPara->GetSrchType();
+        int bRegExp = utl::SearchParam::SRCH_REGEXP == pTxtPara->GetSrchType();
         SwIndex& rSttCntIdx = pCrsr->Start()->nContent;
         xub_StrLen nSttCnt = rSttCntIdx.GetIndex();
 
@@ -1431,7 +1430,7 @@ int SwFindParaAttr::IsReplaceMode() const
 ULONG SwCursor::Find( const SfxItemSet& rSet, FASTBOOL bNoCollections,
                     SwDocPositions nStart, SwDocPositions nEnde,
                     FindRanges eFndRngs,
-                    const SearchParam* pTextPara, const SfxItemSet* pReplSet )
+                    const utl::SearchParam* pTextPara, const SfxItemSet* pReplSet )
 {
     // OLE-Benachrichtigung abschalten !!
     SwDoc* pDoc = GetDoc();
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 708c1218a6f1..29bd96add5f5 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: findtxt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:17 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:22:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -191,7 +191,7 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
 
 
 
-BYTE SwPaM::Find( const SearchParam& rParam, SearchText& rSTxt,
+BYTE SwPaM::Find( const utl::SearchParam& rParam, utl::TextSearch& rSTxt,
                     SwMoveFn fnMove, const SwPaM * pRegion,
                     FASTBOOL bInReadOnly )
 {
@@ -304,7 +304,7 @@ BYTE SwPaM::Find( const SearchParam& rParam, SearchText& rSTxt,
                     if( !Move( fnMoveForward, fnGoCntnt ) )
                         GetPoint()->nContent = nTxtLen;
                 }
-                if( SearchParam::SRCH_REGEXP == rParam.GetSrchType() &&
+                if( utl::SearchParam::SRCH_REGEXP == rParam.GetSrchType() &&
                     1 < Abs( (int)(GetPoint()->nNode.GetIndex() - GetMark()->nNode.GetIndex())))
                     // Fehler: es koennen maximal 2 Nodes selektiert werden !!
                     continue;
@@ -324,14 +324,14 @@ BYTE SwPaM::Find( const SearchParam& rParam, SearchText& rSTxt,
 // Parameter fuers Suchen und Ersetzen von Text
 struct SwFindParaText : public SwFindParas
 {
-    const SearchParam& rParam;
+    const utl::SearchParam& rParam;
     SwCursor& rCursor;
-    SearchText aSTxt;
+    utl::TextSearch aSTxt;
     BOOL bReplace;
 
-    SwFindParaText( const SearchParam& rPara, int bRepl, SwCursor& rCrsr )
+    SwFindParaText( const utl::SearchParam& rPara, int bRepl, SwCursor& rCrsr )
         : rCursor( rCrsr ), bReplace( bRepl ), rParam( rPara ),
-        aSTxt( rPara, Application::GetAppInternational() )
+        aSTxt( rPara, LANGUAGE_SYSTEM )
     {}
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, FASTBOOL bInReadOnly );
     virtual int IsReplaceMode() const;
@@ -352,7 +352,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
     if( bFnd && bReplace )          // String ersetzen ??
     {
         // Replace-Methode vom SwDoc benutzen
-        int bRegExp = SearchParam::SRCH_REGEXP == rParam.GetSrchType();
+        int bRegExp = utl::SearchParam::SRCH_REGEXP == rParam.GetSrchType();
         SwIndex& rSttCntIdx = pCrsr->Start()->nContent;
         xub_StrLen nSttCnt = rSttCntIdx.GetIndex();
         // damit die Region auch verschoben wird, in den Shell-Cursr-Ring
@@ -390,7 +390,7 @@ int SwFindParaText::IsReplaceMode() const
 }
 
 
-ULONG SwCursor::Find( const SearchParam& rParam,
+ULONG SwCursor::Find( const utl::SearchParam& rParam,
                         SwDocPositions nStart, SwDocPositions nEnde,
                         FindRanges eFndRngs, int bReplace )
 {
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index a370da342fbf..6c9768189d17 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paminit.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:17 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:22:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,7 @@ static SwMoveFnCollection aFwrd = {
     /* fnSections   */  &GoEndSection,
     /* fnCmpOp      */  &SwPosition::operator<,
     /* fnGetHint    */  &GetFrwrdTxtHint,
-    /* fnSearch     */  &SearchText::SearchFrwrd,
+    /* fnSearch     */  &utl::TextSearch::SearchFrwrd,
     /* fnSection    */  &SwNodes::GoStartOfSection
 };
 
@@ -88,7 +88,7 @@ static SwMoveFnCollection aBwrd = {
     /* fnSections   */  &GoStartSection,
     /* fnCmpOp      */  &SwPosition::operator>,
     /* fnGetHint    */  &GetBkwrdTxtHint,
-    /* fnSearch     */  &SearchText::SearchBkwrd,
+    /* fnSearch     */  &utl::TextSearch::SearchBkwrd,
     /* fnSection    */  &SwNodes::GoEndOfSection
 };
 
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 85f5782e180c..e664407f1d20 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: edtox.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-31 20:30:14 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:24:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -498,7 +498,7 @@ void SwEditShell::ApplyAutoMark()
                     String sWordOnly    = sLine.GetToken(0, ';', nTokenPos);
 
                     //3.
-                    SearchParam aParam( sToSelect, SearchParam::SRCH_NORMAL,
+                    utl::SearchParam aParam( sToSelect, utl::SearchParam::SRCH_NORMAL,
                                                 TRUE, FALSE, FALSE );
                     BOOL bCaseSensitive = sCase.Len() && sCase != sZero;
                     BOOL bWordOnly = sWordOnly.Len() && sWordOnly != sZero;
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index c63f613ad6ef..40fa6d59d140 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pamtyp.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:21 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:21:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,7 +116,8 @@ typedef void (*GoDoc)( SwPosition* );
 typedef void (*GoSection)( SwPosition* );
 typedef FASTBOOL (SwPosition:: *CmpOp)( const SwPosition& ) const;
 typedef const SwTxtAttr* (*GetHint)( const SwpHints&, USHORT&, xub_StrLen );
-typedef int (SearchText:: *SearchTxt)( const String&, xub_StrLen*, xub_StrLen* );
+typedef int (utl::TextSearch:: *SearchTxt)( const String&, xub_StrLen*,
+                    xub_StrLen*, ::com::sun::star::util::SearchResult* =0 );
 typedef void (SwNodes:: *MvSection)( SwNodeIndex * ) const;
 
 
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 8e63d7f15bc4..807e562e27ec 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtsh.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-25 12:04:43 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:21:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -351,7 +351,7 @@ typedef FASTBOOL (SwWrtShell:: *FNSimpleMove)();
     String  GetRepeatString() const;
 
     //Suchen oder Ersetzen
-    ULONG SearchPattern(const SearchParam& rParam,
+    ULONG SearchPattern(const utl::SearchParam& rParam,
                          SwDocPositions eStart, SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
                          int bReplace = FALSE );
@@ -365,7 +365,7 @@ typedef FASTBOOL (SwWrtShell:: *FNSimpleMove)();
                          BOOL bNoColls,
                          SwDocPositions eStart,SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
-                         const SearchParam* pParam = 0,
+                         const utl::SearchParam* pParam = 0,
                          const SfxItemSet* pReplaceSet = 0);
 
     void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar = ' ' );
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index fbab42da33be..3d71f07d8f5f 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: srcview.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-15 14:55:38 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:26:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -827,14 +827,14 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
             pTextView->SetSelection( TextSelection( TextPaM( 0xFFFFFFFF, 0xFFFF ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
     }
 
-    SearchParam aSearchParam( rSearchItem.GetSearchString(),
-                        SearchParam::SRCH_NORMAL, rSearchItem.GetExact(),
+    utl::SearchParam    aSearchParam( rSearchItem.GetSearchString(),
+                        utl::SearchParam::SRCH_NORMAL, rSearchItem.GetExact(),
                         rSearchItem.GetWordOnly(), rSearchItem.GetSelection() );
     if ( rSearchItem.GetRegExp() )
-        aSearchParam.SetSrchType( SearchParam::SRCH_REGEXP );
+        aSearchParam.SetSrchType( utl::SearchParam::SRCH_REGEXP );
     else if ( rSearchItem.IsLevenshtein() )
     {
-        aSearchParam.SetSrchType( SearchParam::SRCH_LEVDIST );
+        aSearchParam.SetSrchType( utl::SearchParam::SRCH_LEVDIST );
         aSearchParam.SetSrchRelaxed( rSearchItem.IsLEVRelaxed() ? TRUE : FALSE );
         aSearchParam.SetLEVOther( rSearchItem.GetLEVOther() );
         aSearchParam.SetLEVShorter( rSearchItem.GetLEVShorter() );
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index b3b4ce0c2167..1f6f50a142b4 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: view2.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-23 12:02:01 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:26:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1157,7 +1157,7 @@ BOOL SwView::JumpToSwMark( const String& rMark )
             {
                 // Normale Textsuche
                 pWrtShell->EnterStdMode();
-                SearchParam aParam( sName, SearchParam::SRCH_NORMAL,
+                utl::SearchParam aParam( sName, utl::SearchParam::SRCH_NORMAL,
                                     TRUE, FALSE, FALSE );
 
                 if( pWrtShell->SearchPattern( aParam, DOCPOS_START, DOCPOS_END ))
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 55901d59b403..11c83b785342 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewsrch.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-20 14:52:05 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:26:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -667,16 +667,16 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
     if( aSrchSet.Count() || ( pReplSet && pReplSet->Count() ))
     {
         // Suche nach Attributen
-        SearchParam aPar( pSrchItem->GetSearchString() );
+        utl::SearchParam aPar( pSrchItem->GetSearchString() );
         if( aPar.GetSrchStr().Len() )
         {
             if( bDoReplace )
                 aPar.SetReplaceStr( pSrchItem->GetReplaceString() );
             aPar.SetSrchType( pSrchItem->GetRegExp()
-                                ? SearchParam::SRCH_REGEXP :
+                                ? utl::SearchParam::SRCH_REGEXP :
                                 pSrchItem->IsLevenshtein() ?
-                                    SearchParam::SRCH_LEVDIST :
-                                    SearchParam::SRCH_NORMAL );
+                                    utl::SearchParam::SRCH_LEVDIST :
+                                    utl::SearchParam::SRCH_NORMAL );
             aPar.SetCaseSensitive( pSrchItem->GetExact() );
             aPar.SetSrchInSelection( pSrchItem->GetSelection() );
             aPar.SetSrchWordOnly( pSrchItem->GetWordOnly() );
@@ -709,12 +709,12 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
     {
         // Normale Suche
 
-        SearchParam aParam( pSrchItem->GetSearchString(),
+        utl::SearchParam aParam( pSrchItem->GetSearchString(),
                             pSrchItem->GetRegExp()
-                                ? SearchParam::SRCH_REGEXP :
+                                ? utl::SearchParam::SRCH_REGEXP :
                                 pSrchItem->IsLevenshtein() ?
-                                    SearchParam::SRCH_LEVDIST :
-                                        SearchParam::SRCH_NORMAL,
+                                    utl::SearchParam::SRCH_LEVDIST :
+                                        utl::SearchParam::SRCH_NORMAL,
                             pSrchItem->GetExact(),
                             pSrchItem->GetWordOnly(),
                             pSrchItem->GetSelection() );
@@ -834,6 +834,9 @@ void SwView::StateSearch(SfxItemSet &rSet)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/20 14:52:05  jp
+    Bug #79645#: ExecSearch - RepeatSearch without SearchItem must create it's own item
+
     Revision 1.1.1.1  2000/09/18 17:14:49  hr
     initial import
 
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index deddf4a8bb17..d874ba3cf748 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unotxdoc.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2000-10-23 12:09:20 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:27:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -735,7 +735,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
     const SwXTextSearch* pSearch = (const SwXTextSearch*)
             xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId());
 
-    SearchParam aSrchParam(pSearch->sSearchText);
+    utl::SearchParam aSrchParam(pSearch->sSearchText);
     aSrchParam.SetReplaceStr(pSearch->sReplaceText);
     sal_Bool bBackward = sal_False;
     int eRanges(FND_IN_BODY|FND_IN_SELALL);
@@ -751,10 +751,10 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
     aSrchParam.SetLEVShorter(pSearch->nLevRemove);
     aSrchParam.SetLEVLonger(pSearch->nLevAdd);
     if(pSearch->bExpr)
-        aSrchParam.SetSrchType(SearchParam::SRCH_REGEXP);
+        aSrchParam.SetSrchType(utl::SearchParam::SRCH_REGEXP);
     // similarity setzt sich gegen RegExp durch!
     if(pSearch->bSimilarity)
-        aSrchParam.SetSrchType(SearchParam::SRCH_LEVDIST);
+        aSrchParam.SetSrchType(utl::SearchParam::SRCH_LEVDIST);
     SwDocPositions eStart = pSearch->bBack ? DOCPOS_END : DOCPOS_START;
     SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END;
 
@@ -874,7 +874,7 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
         bParentInExtra = SwNormalStartNode != pTmp->GetStartNodeType();
     }
 
-    SearchParam aSrchParam(pSearch->sSearchText);
+    utl::SearchParam aSrchParam(pSearch->sSearchText);
     sal_Bool bBackward = sal_False;
 /*
  * folgende Kombinationen sind erlaubt:
@@ -900,10 +900,10 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
     aSrchParam.SetLEVShorter(pSearch->nLevRemove);
     aSrchParam.SetLEVLonger(pSearch->nLevAdd);
     if(pSearch->bExpr)
-        aSrchParam.SetSrchType(SearchParam::SRCH_REGEXP);
+        aSrchParam.SetSrchType(utl::SearchParam::SRCH_REGEXP);
     // similarity setzt sich gegen RegExp durch!
     if(pSearch->bSimilarity)
-        aSrchParam.SetSrchType(SearchParam::SRCH_LEVDIST);
+        aSrchParam.SetSrchType(utl::SearchParam::SRCH_LEVDIST);
     SwDocPositions eStart = !bAll ? DOCPOS_CURR : pSearch->bBack ? DOCPOS_END : DOCPOS_START;
     SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END;
 
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index c5665550c521..05926fa5d3d2 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: select.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-25 15:36:07 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 09:25:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -235,7 +235,7 @@ long SwWrtShell::SelAll()
 ------------------------------------------------------------------------*/
 
 
-ULONG SwWrtShell::SearchPattern( const SearchParam& rParam,
+ULONG SwWrtShell::SearchPattern( const utl::SearchParam& rParam,
                                 SwDocPositions eStt, SwDocPositions eEnd,
                                 FindRanges eFlags, int bReplace )
 {
@@ -272,7 +272,7 @@ ULONG SwWrtShell::SearchTempl( const String &rTempl,
 
 ULONG SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, BOOL bNoColls,
                                 SwDocPositions eStart, SwDocPositions eEnde,
-                                FindRanges eFlags, const SearchParam* pParam,
+                                FindRanges eFlags, const utl::SearchParam* pParam,
                                 const SfxItemSet* pReplaceSet )
 {
     // Keine Erweiterung bestehender Selektionen
@@ -961,11 +961,14 @@ long SwWrtShell::MoveText(const Point *pPt,BOOL)
 
           Source Code Control System - Header
 
-          $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/ui/wrtsh/select.cxx,v 1.2 2000-10-25 15:36:07 jp Exp $
+          $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/ui/wrtsh/select.cxx,v 1.3 2000-11-20 09:25:03 jp Exp $
 
           Source Code Control System - Update
 
           $Log: not supported by cvs2svn $
+          Revision 1.2  2000/10/25 15:36:07  jp
+          use CharClass/BreakIt instead of old WordSelection
+
           Revision 1.1.1.1  2000/09/18 17:14:53  hr
           initial import