diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-09-13 14:05:45 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-09-13 14:11:14 +0200 |
| commit | 59585dab4bf00e4979fdfd8ce6c038ead143996e (patch) | |
| tree | ebbfb65aa5bfb2d5f37ac4c2589f98cd9fff2b3e /sw/inc | |
| parent | c0251bf65d1e972be395514724a413995ef53af8 (diff) | |
Header/Footer: fixed the Ctrl+PgUp and Ctrl+PdDown behaviors
When in a header and hitting Ctrl+PgDown, go to the end of the page if
there is no footer in it instead of staying in the header. The same case
for footers has been fixed too.
Removed the cursor positioning hackery in ToggleHeaderFooterEdit(): this
is now handled by the caller.
Show the Header/Footer edition when hitting Ctrl+PgUp and Ctrl+PgDown
and actually landing into a header or footer.
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/crsrsh.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/viewsh.hxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 3dc677e81e54..780e1d8046ff 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -190,7 +190,6 @@ private: SwShellCrsr* pCurCrsr; // current cursor SwShellCrsr* pCrsrStk; // stack for the cursor SwVisCrsr *pVisCrsr; // the visible cursor - SwShellCrsr* pCrsrBack; // Backup cursor for header/footer edit mode IBlockCursor *pBlockCrsr; // interface of cursor for block (=rectangular) selection @@ -851,8 +850,6 @@ public: String GetCrsrDescr() const; SwRect GetRectOfCurrentChar(); - - virtual void ToggleHeaderFooterEdit( ); }; // Cursor Inlines: diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 3cb4748bc96c..8c2cab872725 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -565,7 +565,7 @@ public: const SwPostItMgr* GetPostItMgr() const { return (const_cast<ViewShell*>(this))->GetPostItMgr(); } SwPostItMgr* GetPostItMgr(); - virtual void ToggleHeaderFooterEdit( ); + void ToggleHeaderFooterEdit( ); sal_Bool IsHeaderFooterEdit( ) const { return bHeaderFooterEdit; } sal_Bool IsShowHeaderFooterSeparator( ) { return bShowHeaderFooterSeparator; } void SetShowHeaderFooterSeparator( sal_Bool bShow ) { bShowHeaderFooterSeparator = bShow; } |