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

[Libreoffice Gerrit user]

 unotools/inc/unotools/textsearch.hxx |    6 +++---
 unotools/source/i18n/textsearch.cxx  |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit aa767cc26534f374c00dc35038a38f0d146f0d06
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 18 22:31:19 2012 -0500

    WaE parameter shadow member
    
    Change-Id: I231e41771e81f7e6f2939468e6b2175f2bc10101

diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx
index dd34f09..42a9e27 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -55,7 +55,7 @@ private:
     String sSrchStr;            // the search string
     String sReplaceStr;         // the replace string
 
-    SearchType eSrchType;       // search normal/regular/LevDist
+    SearchType m_eSrchType;       // search normal/regular/LevDist
 
     int m_bWordOnly   : 1;        // used by normal search
     int m_bSrchInSel  : 1;        // search only in the selection
@@ -92,7 +92,7 @@ public:
 
     const String&   GetSrchStr() const          { return sSrchStr; }
     const String&   GetReplaceStr() const       { return sReplaceStr; }
-    SearchType      GetSrchType() const         { return eSrchType; }
+    SearchType      GetSrchType() const         { return m_eSrchType; }
 
     int             IsCaseSensitive() const     { return m_bCaseSense; }
     int             IsSrchInSelection() const   { return m_bSrchInSel; }
@@ -101,7 +101,7 @@ public:
 
     void SetSrchStr( const String& rStr )       { sSrchStr = rStr; }
     void SetReplaceStr( const String& rStr )    { sReplaceStr = rStr; }
-    void SetSrchType( SearchType eType )        { eSrchType = eType; }
+    void SetSrchType( SearchType eType )        { m_eSrchType = eType; }
 
     void SetCaseSensitive( int bFlag )          { m_bCaseSense = bFlag; }
     void SetSrchInSelection( int bFlag )        { m_bSrchInSel = bFlag; }
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 13636b9..f6d606c 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -43,7 +43,7 @@ SearchParam::SearchParam( const String &rText,
                                 sal_Bool bSearchInSel )
 {
     sSrchStr        = rText;
-    eSrchType       = eType;
+    m_eSrchType       = eType;
 
     m_bWordOnly       = bWrdOnly;
     m_bSrchInSel      = bSearchInSel;
@@ -62,7 +62,7 @@ SearchParam::SearchParam( const SearchParam& rParam )
 {
     sSrchStr        = rParam.sSrchStr;
     sReplaceStr     = rParam.sReplaceStr;
-    eSrchType       = rParam.eSrchType;
+    m_eSrchType       = rParam.m_eSrchType;
 
     m_bWordOnly       = rParam.m_bWordOnly;
     m_bSrchInSel      = rParam.m_bSrchInSel;