diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-18 09:44:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-18 10:37:35 +0000 |
| commit | 66e8e2488bb777e04cf403b588e5ff05db07fffe (patch) | |
| tree | de92705cd0986dcea62fc68670b58f81fb50c3aa /sw/source/uibase/uno/unotxdoc.cxx | |
| parent | b1a6d157683b8182089ed5854179c8da8c416304 (diff) | |
sw: prefix members of SwXTextSearch
Change-Id: I3231605c0468462a36d75318d0070e5e3c36f4d6
Reviewed-on: https://gerrit.libreoffice.org/27276
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/uibase/uno/unotxdoc.cxx')
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 9093b7d4215c..a4290b8c94a3 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -761,8 +761,8 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > util::SearchOptions2 aSearchOpt; pSearch->FillSearchOptions( aSearchOpt ); - SwDocPositions eStart = pSearch->bBack ? DOCPOS_END : DOCPOS_START; - SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END; + SwDocPositions eStart = pSearch->m_bBack ? DOCPOS_END : DOCPOS_START; + SwDocPositions eEnd = pSearch->m_bBack ? DOCPOS_START : DOCPOS_END; // Search should take place anywhere pUnoCursor->SetRemainInSection(false); @@ -784,16 +784,16 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > pSearch->FillSearchItemSet(aSearch); pSearch->FillReplaceItemSet(aReplace); bool bCancel; - nResult = (sal_Int32)pUnoCursor->Find( aSearch, !pSearch->bStyles, + nResult = (sal_Int32)pUnoCursor->Find( aSearch, !pSearch->m_bStyles, eStart, eEnd, bCancel, (FindRanges)eRanges, - !pSearch->sSearchText.isEmpty() ? &aSearchOpt : nullptr, + !pSearch->m_sSearchText.isEmpty() ? &aSearchOpt : nullptr, &aReplace ); } - else if(pSearch->bStyles) + else if(pSearch->m_bStyles) { - SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCursor->GetDoc()); - SwTextFormatColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCursor->GetDoc()); + SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->m_sSearchText, pUnoCursor->GetDoc()); + SwTextFormatColl *pReplaceColl = lcl_GetParaStyle(pSearch->m_sReplaceText, pUnoCursor->GetDoc()); bool bCancel; nResult = pUnoCursor->Find( *pSearchColl, @@ -897,8 +897,8 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > eRanges = FND_IN_OTHER; if(bAll) //always - everywhere? eRanges = FND_IN_SELALL; - SwDocPositions eStart = !bAll ? DOCPOS_CURR : pSearch->bBack ? DOCPOS_END : DOCPOS_START; - SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END; + SwDocPositions eStart = !bAll ? DOCPOS_CURR : pSearch->m_bBack ? DOCPOS_END : DOCPOS_START; + SwDocPositions eEnd = pSearch->m_bBack ? DOCPOS_START : DOCPOS_END; nResult = 0; for (int nSearchProc = 0; nSearchProc < 2; ++nSearchProc) @@ -914,14 +914,14 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > 0); pSearch->FillSearchItemSet(aSearch); bool bCancel; - nResult = (sal_Int32)pUnoCursor->Find( aSearch, !pSearch->bStyles, + nResult = (sal_Int32)pUnoCursor->Find( aSearch, !pSearch->m_bStyles, eStart, eEnd, bCancel, (FindRanges)eRanges, - !pSearch->sSearchText.isEmpty() ? &aSearchOpt : nullptr ); + !pSearch->m_sSearchText.isEmpty() ? &aSearchOpt : nullptr ); } - else if(pSearch->bStyles) + else if(pSearch->m_bStyles) { - SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCursor->GetDoc()); + SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->m_sSearchText, pUnoCursor->GetDoc()); //pSearch->sReplaceText SwTextFormatColl *pReplaceColl = nullptr; bool bCancel; |