From aa767cc26534f374c00dc35038a38f0d146f0d06 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 18 Aug 2012 22:31:19 -0500 Subject: [PATCH] WaE parameter shadow member Change-Id: I231e41771e81f7e6f2939468e6b2175f2bc10101 --- unotools/inc/unotools/textsearch.hxx | 6 +++--- unotools/source/i18n/textsearch.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx index dd34f09d6dde..42a9e2738a35 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 13636b940d15..f6d606cd26ff 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;