[Libreoffice-commits] .: unotools/inc unotools/source

[Libreoffice Gerrit user]

 unotools/inc/unotools/textsearch.hxx |   34 +++++++++++++++++-----------------
 unotools/source/i18n/textsearch.cxx  |   12 ++++++------
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit c6189b43f3103300dd03375a4bd6a5589708d8c9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 18 15:10:41 2012 -0500

    WAE parameter shadow member
    
    Change-Id: Icf41caa23ce9a548223da4613a199116641e7fe5

diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx
index be34f6f..dd34f09 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -57,9 +57,9 @@ private:
 
     SearchType eSrchType;       // search normal/regular/LevDist
 
-    int bWordOnly   : 1;        // used by normal search
-    int bSrchInSel  : 1;        // search only in the selection
-    int bCaseSense  : 1;        //
+    int m_bWordOnly   : 1;        // used by normal search
+    int m_bSrchInSel  : 1;        // search only in the selection
+    int m_bCaseSense  : 1;        //
 
     // values for the "weight Levenshtein-Distance"
     int bLEV_Relaxed : 1;
@@ -73,19 +73,19 @@ private:
 public:
     SearchParam( const String &rText,
                     SearchType eSrchType = SearchParam::SRCH_NORMAL,
-                    sal_Bool bCaseSens = sal_True,
-                    sal_Bool bWrdOnly = sal_False,
-                    sal_Bool bSrchInSel = sal_False );
+                    sal_Bool bCaseSensitive = sal_True,
+                    sal_Bool bWordOnly = sal_False,
+                    sal_Bool bSearchInSelection = sal_False );
 
     // Wrapper to use OUString as parameter
-    SearchParam( const OUString &rText,
+    SearchParam( const ::rtl::OUString &rText,
                     SearchType eSrchType = SearchParam::SRCH_NORMAL,
-                    sal_Bool bCaseSens = sal_True,
-                    sal_Bool bWrdOnly = sal_False,
-                    sal_Bool bSrchInSel = sal_False )
+                    sal_Bool bCaseSensitive = sal_True,
+                    sal_Bool bWordOnly = sal_False,
+                    sal_Bool bSearchInSelection = sal_False )
     {
         String rText2(rText);
-        SearchParam( rText2, eSrchType, bCaseSens, bWrdOnly, bSrchInSel );
+        SearchParam( rText2, eSrchType, bCaseSensitive, bWordOnly, bSearchInSelection );
     }
 
     SearchParam( const SearchParam& );
@@ -94,18 +94,18 @@ public:
     const String&   GetReplaceStr() const       { return sReplaceStr; }
     SearchType      GetSrchType() const         { return eSrchType; }
 
-    int             IsCaseSensitive() const     { return bCaseSense; }
-    int             IsSrchInSelection() const   { return bSrchInSel; }
-    int             IsSrchWordOnly() const      { return bWordOnly; }
+    int             IsCaseSensitive() const     { return m_bCaseSense; }
+    int             IsSrchInSelection() const   { return m_bSrchInSel; }
+    int             IsSrchWordOnly() const      { return m_bWordOnly; }
 
 
     void SetSrchStr( const String& rStr )       { sSrchStr = rStr; }
     void SetReplaceStr( const String& rStr )    { sReplaceStr = rStr; }
     void SetSrchType( SearchType eType )        { eSrchType = eType; }
 
-    void SetCaseSensitive( int bFlag )          { bCaseSense = bFlag; }
-    void SetSrchInSelection( int bFlag )        { bSrchInSel = bFlag; }
-    void SetSrchWordOnly( int bFlag )           { bWordOnly = bFlag; }
+    void SetCaseSensitive( int bFlag )          { m_bCaseSense = bFlag; }
+    void SetSrchInSelection( int bFlag )        { m_bSrchInSel = bFlag; }
+    void SetSrchWordOnly( int bFlag )           { m_bWordOnly = bFlag; }
 
     int             IsSrchRelaxed() const       { return bLEV_Relaxed; }
     int             GetLEVOther() const         { return nLEV_OtherX; }
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 0583597..13636b9 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -45,9 +45,9 @@ SearchParam::SearchParam( const String &rText,
     sSrchStr        = rText;
     eSrchType       = eType;
 
-    bWordOnly       = bWrdOnly;
-    bSrchInSel      = bSearchInSel;
-    bCaseSense      = bCaseSensitive;
+    m_bWordOnly       = bWrdOnly;
+    m_bSrchInSel      = bSearchInSel;
+    m_bCaseSense      = bCaseSensitive;
 
     nTransliterationFlags = 0;
 
@@ -64,9 +64,9 @@ SearchParam::SearchParam( const SearchParam& rParam )
     sReplaceStr     = rParam.sReplaceStr;
     eSrchType       = rParam.eSrchType;
 
-    bWordOnly       = rParam.bWordOnly;
-    bSrchInSel      = rParam.bSrchInSel;
-    bCaseSense      = rParam.bCaseSense;
+    m_bWordOnly       = rParam.m_bWordOnly;
+    m_bSrchInSel      = rParam.m_bSrchInSel;
+    m_bCaseSense      = rParam.m_bCaseSense;
 
     bLEV_Relaxed    = rParam.bLEV_Relaxed;
     nLEV_OtherX     = rParam.nLEV_OtherX;