diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-04 14:20:02 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-18 17:55:29 +0100 |
| commit | 92560b2d0149397ac5417522a37ce995691c7050 (patch) | |
| tree | e27dac9af0d0c99d5a2e19da6747a797412491c7 /sw/inc/crsrsh.hxx | |
| parent | 1b4fdcf1b13c0be54cd4c4423122580948445069 (diff) | |
sw: refactor a confusing thicket of overloads, all named Find()
Also, some of these don't really make much sense as member functions of
SwPaM, so make them plain functions instead.
Also, some pointer parameters are never null, but there is code to
handle that case in MakeRegion(); simplify that.
Change-Id: I822e814b0cab14f7f31cfa33478ed15774405a61
Diffstat (limited to 'sw/inc/crsrsh.hxx')
| -rw-r--r-- | sw/inc/crsrsh.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 327674e3c547..fca0cc4f78f5 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -358,18 +358,19 @@ public: void MoveColumn( SwWhichColumn, SwPosColumn ); bool MoveRegion( SwWhichRegion, SwMoveFnCollection const & ); - sal_uLong Find( const i18nutil::SearchOptions2& rSearchOpt, + // note: DO NOT call it FindText because windows.h + sal_uLong Find_Text( const i18nutil::SearchOptions2& rSearchOpt, bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, FindRanges eRng, bool bReplace = false ); - sal_uLong Find( const SwTextFormatColl& rFormatColl, + sal_uLong FindFormat( const SwTextFormatColl& rFormatColl, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, FindRanges eRng, const SwTextFormatColl* pReplFormat ); - sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, + sal_uLong FindAttrs( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, FindRanges eRng, |