Kaydet (Commit) edf26ccc authored tarafından Jan Holesovsky's avatar Jan Holesovsky

sw: Prefix a member that may conflict after a rename.

Change-Id: I083dfbb768df0ba2a6bd6a396cf33ab1e2e09f4b
üst 92798feb
...@@ -1057,14 +1057,14 @@ struct SwFindParaAttr : public SwFindParas ...@@ -1057,14 +1057,14 @@ struct SwFindParaAttr : public SwFindParas
bool bValue; bool bValue;
const SfxItemSet *pSet, *pReplSet; const SfxItemSet *pSet, *pReplSet;
const SearchOptions *pSearchOpt; const SearchOptions *pSearchOpt;
SwCursor& rCursor; SwCursor& m_rCursor;
utl::TextSearch* pSText; utl::TextSearch* pSText;
SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection, SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection,
const SearchOptions* pOpt, const SfxItemSet* pRSet, const SearchOptions* pOpt, const SfxItemSet* pRSet,
SwCursor& rCrsr ) SwCursor& rCrsr )
: bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ), : bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ),
pSearchOpt( pOpt ), rCursor( rCrsr ),pSText( nullptr ) {} pSearchOpt( pOpt ), m_rCursor( rCrsr ),pSText( nullptr ) {}
virtual ~SwFindParaAttr() { delete pSText; } virtual ~SwFindParaAttr() { delete pSText; }
...@@ -1150,15 +1150,15 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, ...@@ -1150,15 +1150,15 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
if( bRegExp ) if( bRegExp )
{ {
pPrevRing = const_cast< SwPaM* >(pRegion)->GetPrev(); pPrevRing = const_cast< SwPaM* >(pRegion)->GetPrev();
const_cast< SwPaM* >(pRegion)->GetRingContainer().merge( rCursor.GetRingContainer() ); const_cast< SwPaM* >(pRegion)->GetRingContainer().merge( m_rCursor.GetRingContainer() );
} }
std::unique_ptr<OUString> pRepl( (bRegExp) ? std::unique_ptr<OUString> pRepl( (bRegExp) ?
ReplaceBackReferences( *pSearchOpt, pCrsr ) : nullptr ); ReplaceBackReferences( *pSearchOpt, pCrsr ) : nullptr );
rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange( *pCrsr, m_rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange( *pCrsr,
(pRepl.get()) ? *pRepl : pSearchOpt->replaceString, (pRepl.get()) ? *pRepl : pSearchOpt->replaceString,
bRegExp ); bRegExp );
rCursor.SaveTableBoxContent( pCrsr->GetPoint() ); m_rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
if( bRegExp ) if( bRegExp )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment