diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-29 12:52:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-29 14:45:32 +0300 |
| commit | 6f9750ef54f7e0f2c1345b39dcf45bdf589630d8 (patch) | |
| tree | bad8db239238254daa1a6107dccae1245dfea172 /sw/inc/pam.hxx | |
| parent | bdd60f1f5e0b995572321fd0865ccb8849d8ed76 (diff) | |
Get rid of pointless indirect function pointer variables
Change-Id: Ic8eddec51d59b531ae22421b796a148267b9f3c1
Diffstat (limited to 'sw/inc/pam.hxx')
| -rw-r--r-- | sw/inc/pam.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 6c9edb1367cc..05852095d627 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -146,13 +146,13 @@ SW_DLLPUBLIC extern SwMoveFn fnMoveBackward; // also works: using SwGoInDoc = bool (*) (SwPaM& rPam, SwMoveFn fnMove); // no works: using SwGoInDoc = [](SwPaM& rPam, SwMoveFn fnMove) -> bool; using SwGoInDoc = auto (*)(SwPaM& rPam, SwMoveFn fnMove) -> bool; -SW_DLLPUBLIC extern SwGoInDoc fnGoDoc; -extern SwGoInDoc fnGoSection; -SW_DLLPUBLIC extern SwGoInDoc fnGoNode; -SW_DLLPUBLIC extern SwGoInDoc fnGoContent; ///< SwPam::Move() default argument. -extern SwGoInDoc fnGoContentCells; -extern SwGoInDoc fnGoContentSkipHidden; -extern SwGoInDoc fnGoContentCellsSkipHidden; +SW_DLLPUBLIC bool GoInDoc( SwPaM&, SwMoveFn); +SW_DLLPUBLIC bool GoInSection( SwPaM&, SwMoveFn); +SW_DLLPUBLIC bool GoInNode( SwPaM&, SwMoveFn); +SW_DLLPUBLIC bool GoInContent( SwPaM&, SwMoveFn); +SW_DLLPUBLIC bool GoInContentCells( SwPaM&, SwMoveFn); +SW_DLLPUBLIC bool GoInContentSkipHidden( SwPaM&, SwMoveFn); +SW_DLLPUBLIC bool GoInContentCellsSkipHidden( SwPaM&, SwMoveFn); /// PaM is Point and Mark: a selection of the document model. class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM> @@ -190,7 +190,7 @@ public: /// Movement of cursor. bool Move( SwMoveFn fnMove = fnMoveForward, - SwGoInDoc fnGo = fnGoContent ); + SwGoInDoc fnGo = GoInContent ); /// Search. bool Find( const css::util::SearchOptions2& rSearchOpt, |