diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
| commit | 749c27fafbe1e57b7ba25f759272c02de20469e0 (patch) | |
| tree | d6bc9b5fe3a595ee6e0edd5ef07b042bd61992f0 /sw/inc/swcrsr.hxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/inc/swcrsr.hxx')
| -rw-r--r-- | sw/inc/swcrsr.hxx | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index d9cb307e5ad8..01087cf0b3ef 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -127,17 +127,6 @@ public: const SfxItemSet* rReplSet = 0 ); // UI versions -<<<<<<< local - BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsStartEndSentence( bool bEnd ) const; - BOOL GoStartWord(); - BOOL GoEndWord(); - BOOL GoNextWord(); - BOOL GoPrevWord(); - BOOL SelectWord( ViewShell* pViewShell, const Point* pPt = 0 ); -======= sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; @@ -147,20 +136,9 @@ public: sal_Bool GoNextWord(); sal_Bool GoPrevWord(); sal_Bool SelectWord( const Point* pPt = 0 ); ->>>>>>> other // API versions of above functions (will be used with a different // WordType for the break iterator) -<<<<<<< local - BOOL IsStartWordWT( sal_Int16 nWordType ) const; - BOOL IsEndWordWT( sal_Int16 nWordType ) const; - BOOL IsInWordWT( sal_Int16 nWordType ) const; - BOOL GoStartWordWT( sal_Int16 nWordType ); - BOOL GoEndWordWT( sal_Int16 nWordType ); - BOOL GoNextWordWT( sal_Int16 nWordType ); - BOOL GoPrevWordWT( sal_Int16 nWordType ); - BOOL SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 ); -======= sal_Bool IsStartWordWT( sal_Int16 nWordType ) const; sal_Bool IsEndWordWT( sal_Int16 nWordType ) const; sal_Bool IsInWordWT( sal_Int16 nWordType ) const; @@ -169,7 +147,6 @@ public: sal_Bool GoNextWordWT( sal_Int16 nWordType ); sal_Bool GoPrevWordWT( sal_Int16 nWordType ); sal_Bool SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 ); ->>>>>>> other enum SentenceMoveType { |