[Libreoffice-commits] core.git: include/svl svl/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Jun 4 00:00:53 PDT 2015
include/svl/srchitem.hxx | 114 +++++++++---------
svl/source/items/srchitem.cxx | 256 +++++++++++++++++++++---------------------
2 files changed, 185 insertions(+), 185 deletions(-)
New commits:
commit 849278b952a3886f0196aac32f6fcf0c7ae72806
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jun 4 08:59:45 2015 +0200
svl: prefix remaining members of SvxSearchItem
Change-Id: Id538ee368de6cd63f08618e6284bca97e20bf7a3
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 9a29858..9c6be0c 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -63,26 +63,26 @@ class SVL_DLLPUBLIC SvxSearchItem :
public SfxPoolItem,
public utl::ConfigItem
{
- com::sun::star::util::SearchOptions aSearchOpt;
+ com::sun::star::util::SearchOptions m_aSearchOpt;
- SfxStyleFamily eFamily; // style family
+ SfxStyleFamily m_eFamily; // style family
- SvxSearchCmd nCommand; // command (Search, Search all, Replace, Replace all)
+ SvxSearchCmd m_nCommand; // command (Search, Search all, Replace, Replace all)
// Calc-specific
- SvxSearchCellType nCellType; // Search in Formulas/Values/Notes
- SvxSearchApp nAppFlag; // application which the dialog is for
- bool bRowDirection; // search direction: row-wise/column-wise
- bool bAllTables; // search in all sheets
- bool bSearchFiltered; // search filtered cells.
+ SvxSearchCellType m_nCellType; // Search in Formulas/Values/Notes
+ SvxSearchApp m_nAppFlag; // application which the dialog is for
+ bool m_bRowDirection; // search direction: row-wise/column-wise
+ bool m_bAllTables; // search in all sheets
+ bool m_bSearchFiltered; // search filtered cells.
// Writer-specific
- bool bNotes;
+ bool m_bNotes;
- bool bBackward; // search backwards
- bool bPattern; // search for styles
- bool bContent; // search in content
- bool bAsianOptions; // use asian options?
+ bool m_bBackward; // search backwards
+ bool m_bPattern; // search for styles
+ bool m_bContent; // search in content
+ bool m_bAsianOptions; // use asian options?
// Start search at this point (absolute twips).
sal_Int32 m_nStartPointX;
@@ -109,8 +109,8 @@ public:
// ConfigItem
virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE;
- SvxSearchCmd GetCommand() const { return nCommand; }
- void SetCommand(SvxSearchCmd nNewCommand) { nCommand = nNewCommand; }
+ SvxSearchCmd GetCommand() const { return m_nCommand; }
+ void SetCommand(SvxSearchCmd nNewCommand) { m_nCommand = nNewCommand; }
inline const OUString GetSearchString() const;
inline void SetSearchString(const OUString& rNewString);
@@ -124,8 +124,8 @@ public:
inline bool GetExact() const;
void SetExact(bool bNewExact);
- bool GetBackward() const { return bBackward; }
- void SetBackward(bool bNewBackward) { bBackward = bNewBackward; }
+ bool GetBackward() const { return m_bBackward; }
+ void SetBackward(bool bNewBackward) { m_bBackward = bNewBackward; }
inline bool GetSelection() const;
void SetSelection(bool bNewSelection);
@@ -133,33 +133,33 @@ public:
inline bool GetRegExp() const;
void SetRegExp( bool bVal );
- bool GetPattern() const { return bPattern; }
- void SetPattern(bool bNewPattern) { bPattern = bNewPattern; }
+ bool GetPattern() const { return m_bPattern; }
+ void SetPattern(bool bNewPattern) { m_bPattern = bNewPattern; }
- bool IsContent() const { return bContent; }
- void SetContent( bool bNew ) { bContent = bNew; }
+ bool IsContent() const { return m_bContent; }
+ void SetContent( bool bNew ) { m_bContent = bNew; }
- SfxStyleFamily GetFamily() const { return eFamily; }
+ SfxStyleFamily GetFamily() const { return m_eFamily; }
void SetFamily( SfxStyleFamily eNewFamily )
- { eFamily = eNewFamily; }
+ { m_eFamily = eNewFamily; }
- bool GetRowDirection() const { return bRowDirection; }
- void SetRowDirection(bool bNewRowDirection) { bRowDirection = bNewRowDirection; }
+ bool GetRowDirection() const { return m_bRowDirection; }
+ void SetRowDirection(bool bNewRowDirection) { m_bRowDirection = bNewRowDirection; }
- bool IsAllTables() const { return bAllTables; }
- void SetAllTables(bool bNew) { bAllTables = bNew; }
+ bool IsAllTables() const { return m_bAllTables; }
+ void SetAllTables(bool bNew) { m_bAllTables = bNew; }
- bool IsSearchFiltered() const { return bSearchFiltered; }
- void SetSearchFiltered(bool b) { bSearchFiltered = b; }
+ bool IsSearchFiltered() const { return m_bSearchFiltered; }
+ void SetSearchFiltered(bool b) { m_bSearchFiltered = b; }
- SvxSearchCellType GetCellType() const { return nCellType; }
- void SetCellType(SvxSearchCellType nNewCellType) { nCellType = nNewCellType; }
+ SvxSearchCellType GetCellType() const { return m_nCellType; }
+ void SetCellType(SvxSearchCellType nNewCellType) { m_nCellType = nNewCellType; }
- bool GetNotes() const { return bNotes; }
- void SetNotes(bool bNew) { bNotes = bNew; }
+ bool GetNotes() const { return m_bNotes; }
+ void SetNotes(bool bNew) { m_bNotes = bNew; }
- SvxSearchApp GetAppFlag() const { return nAppFlag; }
- void SetAppFlag(SvxSearchApp nNewAppFlag) { nAppFlag = nNewAppFlag; }
+ SvxSearchApp GetAppFlag() const { return m_nAppFlag; }
+ void SetAppFlag(SvxSearchApp nNewAppFlag) { m_nAppFlag = nNewAppFlag; }
inline bool IsLevenshtein() const;
void SetLevenshtein( bool bVal );
@@ -186,8 +186,8 @@ public:
inline bool IsMatchFullHalfWidthForms() const;
void SetMatchFullHalfWidthForms( bool bVal );
- inline bool IsUseAsianOptions() const { return bAsianOptions; }
- inline void SetUseAsianOptions( bool bVal ) { bAsianOptions = bVal; }
+ inline bool IsUseAsianOptions() const { return m_bAsianOptions; }
+ inline void SetUseAsianOptions( bool bVal ) { m_bAsianOptions = bVal; }
sal_Int32 GetStartPointX() const;
sal_Int32 GetStartPointY() const;
@@ -197,106 +197,106 @@ public:
const OUString SvxSearchItem::GetSearchString() const
{
- return aSearchOpt.searchString;
+ return m_aSearchOpt.searchString;
}
void SvxSearchItem::SetSearchString(const OUString& rNewString)
{
- aSearchOpt.searchString = rNewString;
+ m_aSearchOpt.searchString = rNewString;
}
const OUString SvxSearchItem::GetReplaceString() const
{
- return aSearchOpt.replaceString;
+ return m_aSearchOpt.replaceString;
}
void SvxSearchItem::SetReplaceString(const OUString& rNewString)
{
- aSearchOpt.replaceString = rNewString;
+ m_aSearchOpt.replaceString = rNewString;
}
bool SvxSearchItem::GetWordOnly() const
{
- return 0 != (aSearchOpt.searchFlag &
+ return 0 != (m_aSearchOpt.searchFlag &
com::sun::star::util::SearchFlags::NORM_WORD_ONLY);
}
bool SvxSearchItem::GetExact() const
{
- return 0 == (aSearchOpt.transliterateFlags &
+ return 0 == (m_aSearchOpt.transliterateFlags &
com::sun::star::i18n::TransliterationModules_IGNORE_CASE);
}
bool SvxSearchItem::GetSelection() const
{
- return 0 != (aSearchOpt.searchFlag &
+ return 0 != (m_aSearchOpt.searchFlag &
com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE);
}
bool SvxSearchItem::GetRegExp() const
{
- return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ;
+ return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ;
}
bool SvxSearchItem::IsLEVRelaxed() const
{
- return 0 != (aSearchOpt.searchFlag &
+ return 0 != (m_aSearchOpt.searchFlag &
com::sun::star::util::SearchFlags::LEV_RELAXED);
}
sal_uInt16 SvxSearchItem::GetLEVOther() const
{
- return (sal_Int16) aSearchOpt.changedChars;
+ return (sal_Int16) m_aSearchOpt.changedChars;
}
void SvxSearchItem::SetLEVOther( sal_uInt16 nVal )
{
- aSearchOpt.changedChars = nVal;
+ m_aSearchOpt.changedChars = nVal;
}
sal_uInt16 SvxSearchItem::GetLEVShorter() const
{
- return (sal_Int16) aSearchOpt.insertedChars;
+ return (sal_Int16) m_aSearchOpt.insertedChars;
}
void SvxSearchItem::SetLEVShorter( sal_uInt16 nVal )
{
- aSearchOpt.insertedChars = nVal;
+ m_aSearchOpt.insertedChars = nVal;
}
sal_uInt16 SvxSearchItem::GetLEVLonger() const
{
- return (sal_Int16) aSearchOpt.deletedChars;
+ return (sal_Int16) m_aSearchOpt.deletedChars;
}
void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal )
{
- aSearchOpt.deletedChars = nVal;
+ m_aSearchOpt.deletedChars = nVal;
}
bool SvxSearchItem::IsLevenshtein() const
{
- return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE;
+ return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE;
}
const com::sun::star::util::SearchOptions & SvxSearchItem::GetSearchOptions() const
{
- return aSearchOpt;
+ return m_aSearchOpt;
}
void SvxSearchItem::SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt )
{
- aSearchOpt = rOpt;
+ m_aSearchOpt = rOpt;
}
sal_Int32 SvxSearchItem::GetTransliterationFlags() const
{
- return aSearchOpt.transliterateFlags;
+ return m_aSearchOpt.transliterateFlags;
}
bool SvxSearchItem::IsMatchFullHalfWidthForms() const
{
- return 0 != (aSearchOpt.transliterateFlags &
+ return 0 != (m_aSearchOpt.transliterateFlags &
com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH);
}
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 986463e..e367b07 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -107,25 +107,25 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
ConfigItem( OUString(CFG_ROOT_NODE ) ),
- aSearchOpt ( SearchAlgorithms_ABSOLUTE,
+ m_aSearchOpt ( SearchAlgorithms_ABSOLUTE,
SearchFlags::LEV_RELAXED,
OUString(),
OUString(),
lang::Locale(),
2, 2, 2,
TransliterationModules_IGNORE_CASE ),
- eFamily ( SFX_STYLE_FAMILY_PARA ),
- nCommand ( SvxSearchCmd::FIND ),
- nCellType ( SvxSearchCellType::FORMULA ),
- nAppFlag ( SvxSearchApp::WRITER ),
- bRowDirection ( true ),
- bAllTables ( false ),
- bSearchFiltered ( false ),
- bNotes ( false),
- bBackward ( false ),
- bPattern ( false ),
- bContent ( false ),
- bAsianOptions ( false ),
+ m_eFamily ( SFX_STYLE_FAMILY_PARA ),
+ m_nCommand ( SvxSearchCmd::FIND ),
+ m_nCellType ( SvxSearchCellType::FORMULA ),
+ m_nAppFlag ( SvxSearchApp::WRITER ),
+ m_bRowDirection ( true ),
+ m_bAllTables ( false ),
+ m_bSearchFiltered ( false ),
+ m_bNotes ( false),
+ m_bBackward ( false ),
+ m_bPattern ( false ),
+ m_bContent ( false ),
+ m_bAsianOptions ( false ),
m_nStartPointX(0),
m_nStartPointY(0)
{
@@ -133,18 +133,18 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SvtSearchOptions aOpt;
- bBackward = aOpt.IsBackwards();
- bAsianOptions = aOpt.IsUseAsianOptions();
- bNotes = aOpt.IsNotes();
+ m_bBackward = aOpt.IsBackwards();
+ m_bAsianOptions = aOpt.IsUseAsianOptions();
+ m_bNotes = aOpt.IsNotes();
if (aOpt.IsUseRegularExpression())
- aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
+ m_aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
if (aOpt.IsSimilaritySearch())
- aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
+ m_aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
if (aOpt.IsWholeWordsOnly())
- aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
+ m_aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
- sal_Int32 &rFlags = aSearchOpt.transliterateFlags;
+ sal_Int32 &rFlags = m_aSearchOpt.transliterateFlags;
if (!aOpt.IsMatchCase())
rFlags |= TransliterationModules_IGNORE_CASE;
@@ -154,7 +154,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
rFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL ;
if ( aOpt.IsIgnoreKashida_CTL())
rFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL ;
- if ( bAsianOptions )
+ if ( m_bAsianOptions )
{
if ( aOpt.IsMatchHiraganaKatakana())
rFlags |= TransliterationModules_IGNORE_KANA;
@@ -201,19 +201,19 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
SfxPoolItem ( rItem ),
ConfigItem( OUString(CFG_ROOT_NODE ) ),
- aSearchOpt ( rItem.aSearchOpt ),
- eFamily ( rItem.eFamily ),
- nCommand ( rItem.nCommand ),
- nCellType ( rItem.nCellType ),
- nAppFlag ( rItem.nAppFlag ),
- bRowDirection ( rItem.bRowDirection ),
- bAllTables ( rItem.bAllTables ),
- bSearchFiltered ( rItem.bSearchFiltered ),
- bNotes ( rItem.bNotes),
- bBackward ( rItem.bBackward ),
- bPattern ( rItem.bPattern ),
- bContent ( rItem.bContent ),
- bAsianOptions ( rItem.bAsianOptions ),
+ m_aSearchOpt ( rItem.m_aSearchOpt ),
+ m_eFamily ( rItem.m_eFamily ),
+ m_nCommand ( rItem.m_nCommand ),
+ m_nCellType ( rItem.m_nCellType ),
+ m_nAppFlag ( rItem.m_nAppFlag ),
+ m_bRowDirection ( rItem.m_bRowDirection ),
+ m_bAllTables ( rItem.m_bAllTables ),
+ m_bSearchFiltered ( rItem.m_bSearchFiltered ),
+ m_bNotes ( rItem.m_bNotes),
+ m_bBackward ( rItem.m_bBackward ),
+ m_bPattern ( rItem.m_bPattern ),
+ m_bContent ( rItem.m_bContent ),
+ m_bAsianOptions ( rItem.m_bAsianOptions ),
m_nStartPointX(rItem.m_nStartPointX),
m_nStartPointY(rItem.m_nStartPointY)
{
@@ -253,19 +253,19 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
const SvxSearchItem &rSItem = static_cast<const SvxSearchItem &>(rItem);
- return ( nCommand == rSItem.nCommand ) &&
- ( bBackward == rSItem.bBackward ) &&
- ( bPattern == rSItem.bPattern ) &&
- ( bContent == rSItem.bContent ) &&
- ( eFamily == rSItem.eFamily ) &&
- ( bRowDirection == rSItem.bRowDirection ) &&
- ( bAllTables == rSItem.bAllTables ) &&
- ( bSearchFiltered == rSItem.bSearchFiltered ) &&
- ( nCellType == rSItem.nCellType ) &&
- ( nAppFlag == rSItem.nAppFlag ) &&
- ( bAsianOptions == rSItem.bAsianOptions ) &&
- ( aSearchOpt == rSItem.aSearchOpt ) &&
- ( bNotes == rSItem.bNotes );
+ return ( m_nCommand == rSItem.m_nCommand ) &&
+ ( m_bBackward == rSItem.m_bBackward ) &&
+ ( m_bPattern == rSItem.m_bPattern ) &&
+ ( m_bContent == rSItem.m_bContent ) &&
+ ( m_eFamily == rSItem.m_eFamily ) &&
+ ( m_bRowDirection == rSItem.m_bRowDirection ) &&
+ ( m_bAllTables == rSItem.m_bAllTables ) &&
+ ( m_bSearchFiltered == rSItem.m_bSearchFiltered ) &&
+ ( m_nCellType == rSItem.m_nCellType ) &&
+ ( m_nAppFlag == rSItem.m_nAppFlag ) &&
+ ( m_bAsianOptions == rSItem.m_bAsianOptions ) &&
+ ( m_aSearchOpt == rSItem.m_aSearchOpt ) &&
+ ( m_bNotes == rSItem.m_bNotes );
}
@@ -296,27 +296,27 @@ void SvxSearchItem::ImplCommit()
void SvxSearchItem::SetMatchFullHalfWidthForms( bool bVal )
{
if (bVal)
- aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_WIDTH;
+ m_aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_WIDTH;
else
- aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_WIDTH;
+ m_aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_WIDTH;
}
void SvxSearchItem::SetWordOnly( bool bVal )
{
if (bVal)
- aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
+ m_aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
else
- aSearchOpt.searchFlag &= ~SearchFlags::NORM_WORD_ONLY;
+ m_aSearchOpt.searchFlag &= ~SearchFlags::NORM_WORD_ONLY;
}
void SvxSearchItem::SetExact( bool bVal )
{
if (!bVal)
- aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE;
+ m_aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE;
else
- aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_CASE;
+ m_aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_CASE;
}
@@ -324,12 +324,12 @@ void SvxSearchItem::SetSelection( bool bVal )
{
if (bVal)
{
- aSearchOpt.searchFlag |= (SearchFlags::REG_NOT_BEGINOFLINE |
+ m_aSearchOpt.searchFlag |= (SearchFlags::REG_NOT_BEGINOFLINE |
SearchFlags::REG_NOT_ENDOFLINE);
}
else
{
- aSearchOpt.searchFlag &= ~(SearchFlags::REG_NOT_BEGINOFLINE |
+ m_aSearchOpt.searchFlag &= ~(SearchFlags::REG_NOT_BEGINOFLINE |
SearchFlags::REG_NOT_ENDOFLINE);
}
}
@@ -338,33 +338,33 @@ void SvxSearchItem::SetSelection( bool bVal )
void SvxSearchItem::SetRegExp( bool bVal )
{
if ( bVal )
- aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
- else if ( SearchAlgorithms_REGEXP == aSearchOpt.algorithmType )
- aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
+ m_aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
+ else if ( SearchAlgorithms_REGEXP == m_aSearchOpt.algorithmType )
+ m_aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
}
void SvxSearchItem::SetLEVRelaxed( bool bVal )
{
if (bVal)
- aSearchOpt.searchFlag |= SearchFlags::LEV_RELAXED;
+ m_aSearchOpt.searchFlag |= SearchFlags::LEV_RELAXED;
else
- aSearchOpt.searchFlag &= ~SearchFlags::LEV_RELAXED;
+ m_aSearchOpt.searchFlag &= ~SearchFlags::LEV_RELAXED;
}
void SvxSearchItem::SetLevenshtein( bool bVal )
{
if ( bVal )
- aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
- else if ( SearchAlgorithms_APPROXIMATE == aSearchOpt.algorithmType )
- aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
+ m_aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
+ else if ( SearchAlgorithms_APPROXIMATE == m_aSearchOpt.algorithmType )
+ m_aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
}
void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags )
{
- aSearchOpt.transliterateFlags = nFlags;
+ m_aSearchOpt.transliterateFlags = nFlags;
}
bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -376,73 +376,73 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
{
Sequence< PropertyValue > aSeq( SRCH_PARAMS );
aSeq[0].Name = SRCH_PARA_OPTIONS;
- aSeq[0].Value <<= aSearchOpt;
+ aSeq[0].Value <<= m_aSearchOpt;
aSeq[1].Name = SRCH_PARA_FAMILY;
- aSeq[1].Value <<= sal_Int16( eFamily );
+ aSeq[1].Value <<= sal_Int16( m_eFamily );
aSeq[2].Name = SRCH_PARA_COMMAND;
- aSeq[2].Value <<= static_cast<sal_uInt16>(nCommand);
+ aSeq[2].Value <<= static_cast<sal_uInt16>(m_nCommand);
aSeq[3].Name = SRCH_PARA_CELLTYPE;
- aSeq[3].Value <<= static_cast<sal_uInt16>(nCellType);
+ aSeq[3].Value <<= static_cast<sal_uInt16>(m_nCellType);
aSeq[4].Name = SRCH_PARA_APPFLAG;
- aSeq[4].Value <<= static_cast<sal_uInt16>(nAppFlag);
+ aSeq[4].Value <<= static_cast<sal_uInt16>(m_nAppFlag);
aSeq[5].Name = SRCH_PARA_ROWDIR;
- aSeq[5].Value <<= bRowDirection;
+ aSeq[5].Value <<= m_bRowDirection;
aSeq[6].Name = SRCH_PARA_ALLTABLES;
- aSeq[6].Value <<= bAllTables;
+ aSeq[6].Value <<= m_bAllTables;
aSeq[6].Name = SRCH_PARA_SEARCHFILTERED;
- aSeq[6].Value <<= bSearchFiltered;
+ aSeq[6].Value <<= m_bSearchFiltered;
aSeq[7].Name = SRCH_PARA_BACKWARD;
- aSeq[7].Value <<= bBackward;
+ aSeq[7].Value <<= m_bBackward;
aSeq[8].Name = SRCH_PARA_PATTERN;
- aSeq[8].Value <<= bPattern;
+ aSeq[8].Value <<= m_bPattern;
aSeq[9].Name = SRCH_PARA_CONTENT;
- aSeq[9].Value <<= bContent;
+ aSeq[9].Value <<= m_bContent;
aSeq[10].Name = SRCH_PARA_ASIANOPT;
- aSeq[10].Value <<= bAsianOptions;
+ aSeq[10].Value <<= m_bAsianOptions;
rVal <<= aSeq;
}
break;
case MID_SEARCH_COMMAND:
- rVal <<= (sal_Int16) nCommand; break;
+ rVal <<= (sal_Int16) m_nCommand; break;
case MID_SEARCH_STYLEFAMILY:
- rVal <<= (sal_Int16) eFamily; break;
+ rVal <<= (sal_Int16) m_eFamily; break;
case MID_SEARCH_CELLTYPE:
- rVal <<= (sal_Int32) nCellType; break;
+ rVal <<= (sal_Int32) m_nCellType; break;
case MID_SEARCH_ROWDIRECTION:
- rVal <<= bRowDirection; break;
+ rVal <<= m_bRowDirection; break;
case MID_SEARCH_ALLTABLES:
- rVal <<= bAllTables; break;
+ rVal <<= m_bAllTables; break;
case MID_SEARCH_SEARCHFILTERED:
- rVal <<= bSearchFiltered; break;
+ rVal <<= m_bSearchFiltered; break;
case MID_SEARCH_BACKWARD:
- rVal <<= bBackward; break;
+ rVal <<= m_bBackward; break;
case MID_SEARCH_PATTERN:
- rVal <<= bPattern; break;
+ rVal <<= m_bPattern; break;
case MID_SEARCH_CONTENT:
- rVal <<= bContent; break;
+ rVal <<= m_bContent; break;
case MID_SEARCH_ASIANOPTIONS:
- rVal <<= bAsianOptions; break;
+ rVal <<= m_bAsianOptions; break;
case MID_SEARCH_ALGORITHMTYPE:
- rVal <<= (sal_Int16) aSearchOpt.algorithmType; break;
+ rVal <<= (sal_Int16) m_aSearchOpt.algorithmType; break;
case MID_SEARCH_FLAGS:
- rVal <<= aSearchOpt.searchFlag; break;
+ rVal <<= m_aSearchOpt.searchFlag; break;
case MID_SEARCH_SEARCHSTRING:
- rVal <<= aSearchOpt.searchString; break;
+ rVal <<= m_aSearchOpt.searchString; break;
case MID_SEARCH_REPLACESTRING:
- rVal <<= aSearchOpt.replaceString; break;
+ rVal <<= m_aSearchOpt.replaceString; break;
case MID_SEARCH_CHANGEDCHARS:
- rVal <<= aSearchOpt.changedChars; break;
+ rVal <<= m_aSearchOpt.changedChars; break;
case MID_SEARCH_DELETEDCHARS:
- rVal <<= aSearchOpt.deletedChars; break;
+ rVal <<= m_aSearchOpt.deletedChars; break;
case MID_SEARCH_INSERTEDCHARS:
- rVal <<= aSearchOpt.insertedChars; break;
+ rVal <<= m_aSearchOpt.insertedChars; break;
case MID_SEARCH_TRANSLITERATEFLAGS:
- rVal <<= aSearchOpt.transliterateFlags; break;
+ rVal <<= m_aSearchOpt.transliterateFlags; break;
case MID_SEARCH_LOCALE:
{
sal_Int16 nLocale;
- if (!aSearchOpt.Locale.Language.isEmpty() || !aSearchOpt.Locale.Country.isEmpty() )
- nLocale = LanguageTag::convertToLanguageType( aSearchOpt.Locale );
+ if (!m_aSearchOpt.Locale.Language.isEmpty() || !m_aSearchOpt.Locale.Country.isEmpty() )
+ nLocale = LanguageTag::convertToLanguageType( m_aSearchOpt.Locale );
else
nLocale = LANGUAGE_NONE;
rVal <<= nLocale;
@@ -476,7 +476,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
{
if ( aSeq[i].Name == SRCH_PARA_OPTIONS )
{
- if ( aSeq[i].Value >>= aSearchOpt )
+ if ( aSeq[i].Value >>= m_aSearchOpt )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_FAMILY )
@@ -484,7 +484,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
sal_uInt16 nTemp( 0 );
if ( aSeq[i].Value >>= nTemp )
{
- eFamily = SfxStyleFamily( nTemp );
+ m_eFamily = SfxStyleFamily( nTemp );
++nConvertedCount;
}
}
@@ -493,7 +493,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
sal_uInt16 nTmp;
if ( aSeq[i].Value >>= nTmp )
{
- nCommand = static_cast<SvxSearchCmd>(nTmp);
+ m_nCommand = static_cast<SvxSearchCmd>(nTmp);
++nConvertedCount;
}
}
@@ -502,7 +502,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
sal_uInt16 nTmp;
if ( aSeq[i].Value >>= nTmp )
{
- nCellType = static_cast<SvxSearchCellType>(nTmp);
+ m_nCellType = static_cast<SvxSearchCellType>(nTmp);
++nConvertedCount;
}
}
@@ -511,43 +511,43 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
sal_uInt16 nTmp;
if ( aSeq[i].Value >>= nTmp )
{
- nAppFlag = static_cast<SvxSearchApp>(nTmp);
+ m_nAppFlag = static_cast<SvxSearchApp>(nTmp);
++nConvertedCount;
}
}
else if ( aSeq[i].Name == SRCH_PARA_ROWDIR )
{
- if ( aSeq[i].Value >>= bRowDirection )
+ if ( aSeq[i].Value >>= m_bRowDirection )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_ALLTABLES )
{
- if ( aSeq[i].Value >>= bAllTables )
+ if ( aSeq[i].Value >>= m_bAllTables )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_SEARCHFILTERED )
{
- if ( aSeq[i].Value >>= bSearchFiltered )
+ if ( aSeq[i].Value >>= m_bSearchFiltered )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_BACKWARD )
{
- if ( aSeq[i].Value >>= bBackward )
+ if ( aSeq[i].Value >>= m_bBackward )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_PATTERN )
{
- if ( aSeq[i].Value >>= bPattern )
+ if ( aSeq[i].Value >>= m_bPattern )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_CONTENT )
{
- if ( aSeq[i].Value >>= bContent )
+ if ( aSeq[i].Value >>= m_bContent )
++nConvertedCount;
}
else if ( aSeq[i].Name == SRCH_PARA_ASIANOPT )
{
- if ( aSeq[i].Value >>= bAsianOptions )
+ if ( aSeq[i].Value >>= m_bAsianOptions )
++nConvertedCount;
}
}
@@ -557,41 +557,41 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
break;
}
case MID_SEARCH_COMMAND:
- bRet = (rVal >>= nInt); nCommand = static_cast<SvxSearchCmd>(nInt); break;
+ bRet = (rVal >>= nInt); m_nCommand = static_cast<SvxSearchCmd>(nInt); break;
case MID_SEARCH_STYLEFAMILY:
- bRet = (rVal >>= nInt); eFamily = (SfxStyleFamily) (sal_Int16) nInt; break;
+ bRet = (rVal >>= nInt); m_eFamily = (SfxStyleFamily) (sal_Int16) nInt; break;
case MID_SEARCH_CELLTYPE:
- bRet = (rVal >>= nInt); nCellType = static_cast<SvxSearchCellType>(nInt); break;
+ bRet = (rVal >>= nInt); m_nCellType = static_cast<SvxSearchCellType>(nInt); break;
case MID_SEARCH_ROWDIRECTION:
- bRet = (rVal >>= bRowDirection); break;
+ bRet = (rVal >>= m_bRowDirection); break;
case MID_SEARCH_ALLTABLES:
- bRet = (rVal >>= bAllTables); break;
+ bRet = (rVal >>= m_bAllTables); break;
case MID_SEARCH_SEARCHFILTERED:
- bRet = (rVal >>= bSearchFiltered); break;
+ bRet = (rVal >>= m_bSearchFiltered); break;
case MID_SEARCH_BACKWARD:
- bRet = (rVal >>= bBackward); break;
+ bRet = (rVal >>= m_bBackward); break;
case MID_SEARCH_PATTERN:
- bRet = (rVal >>= bPattern); break;
+ bRet = (rVal >>= m_bPattern); break;
case MID_SEARCH_CONTENT:
- bRet = (rVal >>= bContent); break;
+ bRet = (rVal >>= m_bContent); break;
case MID_SEARCH_ASIANOPTIONS:
- bRet = (rVal >>= bAsianOptions); break;
+ bRet = (rVal >>= m_bAsianOptions); break;
case MID_SEARCH_ALGORITHMTYPE:
- bRet = (rVal >>= nInt); aSearchOpt.algorithmType = (SearchAlgorithms)(sal_Int16)nInt; break;
+ bRet = (rVal >>= nInt); m_aSearchOpt.algorithmType = (SearchAlgorithms)(sal_Int16)nInt; break;
case MID_SEARCH_FLAGS:
- bRet = (rVal >>= aSearchOpt.searchFlag); break;
+ bRet = (rVal >>= m_aSearchOpt.searchFlag); break;
case MID_SEARCH_SEARCHSTRING:
- bRet = (rVal >>= aSearchOpt.searchString); break;
+ bRet = (rVal >>= m_aSearchOpt.searchString); break;
case MID_SEARCH_REPLACESTRING:
- bRet = (rVal >>= aSearchOpt.replaceString); break;
+ bRet = (rVal >>= m_aSearchOpt.replaceString); break;
case MID_SEARCH_CHANGEDCHARS:
- bRet = (rVal >>= aSearchOpt.changedChars); break;
+ bRet = (rVal >>= m_aSearchOpt.changedChars); break;
case MID_SEARCH_DELETEDCHARS:
- bRet = (rVal >>= aSearchOpt.deletedChars); break;
+ bRet = (rVal >>= m_aSearchOpt.deletedChars); break;
case MID_SEARCH_INSERTEDCHARS:
- bRet = (rVal >>= aSearchOpt.insertedChars); break;
+ bRet = (rVal >>= m_aSearchOpt.insertedChars); break;
case MID_SEARCH_TRANSLITERATEFLAGS:
- bRet = (rVal >>= aSearchOpt.transliterateFlags); break;
+ bRet = (rVal >>= m_aSearchOpt.transliterateFlags); break;
case MID_SEARCH_LOCALE:
{
bRet = (rVal >>= nInt);
@@ -599,11 +599,11 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
{
if ( nInt == LANGUAGE_NONE )
{
- aSearchOpt.Locale = ::com::sun::star::lang::Locale();
+ m_aSearchOpt.Locale = ::com::sun::star::lang::Locale();
}
else
{
- aSearchOpt.Locale = LanguageTag::convertToLocale( nInt);
+ m_aSearchOpt.Locale = LanguageTag::convertToLocale( nInt);
}
}
break;
More information about the Libreoffice-commits
mailing list