strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

n#676858: ESC key to escape the header / footer edit mode

Browse source 
Fixed another minor issue:
 * cursor remained in header / footer when escaping with a flying object
   selected. Cleared the flys selection before toggling the edition mode
   in the SwFEShell
This commit is contained in:
Cédric Bosdonnat 2011-06-30 15:00:18 +02:00
parent b521123119
commit 3442247f17
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sw/inc/fesh.hxx
View file

@ -772,6 +772,7 @@ public:
bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
const Point& _rDocPos ) const; const Point& _rDocPos ) const;
virtual void ToggleHeaderFooterEdit( );
}; };
#endif #endif

12
sw/source/core/frmedt/fews.cxx
View file

@ -1314,4 +1314,16 @@ void SwFEShell::MoveObjectIfActive( svt::EmbeddedObjectRef&, const Point& )
// does not do anything, only avoids crash if the method is used for wrong shell // does not do anything, only avoids crash if the method is used for wrong shell
} }
void SwFEShell::ToggleHeaderFooterEdit()
{
// Clear objects selection
if ( Imp()->GetDrawView()->AreObjectsMarked() )
{
Imp()->GetDrawView()->UnmarkAll();
ClearMark();
}
SwCrsrShell::ToggleHeaderFooterEdit();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

8
sw/source/ui/docvw/edtwin.cxx
View file

@ -1252,6 +1252,8 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
void SwEditWin::KeyInput(const KeyEvent &rKEvt) void SwEditWin::KeyInput(const KeyEvent &rKEvt)
{ {
SwWrtShell &rSh = rView.GetWrtShell();
if( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE && if( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE &&
pApplyTempl && pApplyTempl->pFormatClipboard ) pApplyTempl && pApplyTempl->pFormatClipboard )
{ {
@ -1259,6 +1261,11 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
SetApplyTemplate(SwApplyTemplate()); SetApplyTemplate(SwApplyTemplate());
rView.GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); rView.GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
} }
else if ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE &&
rSh.IsHeaderFooterEdit( ) )
{
rSh.ToggleHeaderFooterEdit();
}
SfxObjectShell *pObjSh = (SfxObjectShell*)rView.GetViewFrame()->GetObjectShell(); SfxObjectShell *pObjSh = (SfxObjectShell*)rView.GetViewFrame()->GetObjectShell();
if ( bLockInput || (pObjSh && pObjSh->GetProgress()) ) if ( bLockInput || (pObjSh && pObjSh->GetProgress()) )
@ -1270,7 +1277,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
delete pShadCrsr, pShadCrsr = 0; delete pShadCrsr, pShadCrsr = 0;
aKeyInputFlushTimer.Stop(); aKeyInputFlushTimer.Stop();
SwWrtShell &rSh = rView.GetWrtShell();
sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly() && sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly() &&
rSh.IsCrsrReadonly(); rSh.IsCrsrReadonly();