must change: SearchText->TextSearch and use namespace

6 files changed, 34 insertions, 34 deletions

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;