svn commit: r1518188 - in /openoffice/branches/AOO401: ./ main/sw/source/ui/docvw/edtwin.cxx

[orw]

Author: orw
Date: Wed Aug 28 12:50:26 2013
New Revision: 1518188

URL: http://svn.apache.org/r1518188
Log:
123051: handling SHIFT-<arrow key>: huge object move only when object is 
selected.

        cherry-picked from trunk


Modified:
    openoffice/branches/AOO401/   (props changed)
    openoffice/branches/AOO401/main/sw/source/ui/docvw/edtwin.cxx

Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1516741

Modified: openoffice/branches/AOO401/main/sw/source/ui/docvw/edtwin.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/sw/source/ui/docvw/edtwin.cxx?rev=1518188&r1=1518187&r2=1518188&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/branches/AOO401/main/sw/source/ui/docvw/edtwin.cxx Wed Aug 28 
12:50:26 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;