Author: orw
Date: Fri Aug 23 08:25:14 2013
New Revision: 1516741
URL: http://svn.apache.org/r1516741
Log:
123051: handling SHIFT-<arrow key>: huge object move only when object is
selected.
Modified:
openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
Modified: openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx?rev=1516741&r1=1516740&r2=1516741&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx Fri Aug 23 08:25:14 2013
@@ -1714,8 +1714,10 @@ KEYINPUT_CHECKTABLE:
case KEY_UP | KEY_SHIFT:
case KEY_DOWN | KEY_SHIFT:
{
- if ( pFlyFmt
- || ( (rSh.GetSelectionType() &
(nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM))
+ const int nSelectionType = rSh.GetSelectionType();
+ if ( ( pFlyFmt
+ && ( nSelectionType &
(nsSelectionType::SEL_FRM|nsSelectionType::SEL_OLE|nsSelectionType::SEL_GRF) ) )
+ || ( ( nSelectionType &
(nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM) )
&& rSh.GetDrawView()->AreObjectsMarked() ) )
{
eKeyState = pFlyFmt ? KS_Fly_Change : KS_Draw_Change;