Resolves: #i121463# Enhanced handle visualization..

and some fixes in that region

(cherry picked from commit 2ece2411aa1ab78e6aec269d08d8a9b526390939)

Conflicts:
default_images/svx/res/cropmarkers.png
default_images/svx/res/cropmarkers2.png
default_images/svx/res/cropmarkersACC.png
default_images/svx/res/markers.png
default_images/svx/res/markers2.png
default_images/svx/res/markersACC.png
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
officecfg/registry/schema/org/openoffice/Office/Draw.xcs
officecfg/registry/schema/org/openoffice/Office/Impress.xcs
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
sc/source/core/tool/viewopti.cxx
sd/source/ui/app/optsitem.cxx
svx/inc/svx/svdhdl.hxx
svx/source/svdraw/svdhdl.cxx
svx/source/svdraw/svdstr.src
sw/source/ui/config/viewopt.cxx
sw/source/ui/docvw/edtwin.cxx

Change-Id: I4094c2ca18a3c29e8e24a15ddeb040808ce4605d

2 files changed, 28 insertions, 8 deletions

diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 09bb78e3834f..83ef2e8a3412 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -171,14 +171,25 @@ SwViewOption::SwViewOption() :
 {
     // Initialisation is a little simpler now
     // all Bits to 0
-    nCoreOptions =  VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH |
-                    VIEWOPT_1_REF |
-                    VIEWOPT_1_GRAPHIC |
-                    VIEWOPT_1_TABLE    | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL |
-                    VIEWOPT_1_PAGEBACK |
-                    VIEWOPT_1_POSTITS;
-    nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA;
-    nUIOptions    = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER;
+    nCoreOptions =
+        VIEWOPT_1_HARDBLANK |
+        VIEWOPT_1_SOFTHYPH |
+        VIEWOPT_1_REF |
+        VIEWOPT_1_GRAPHIC |
+        VIEWOPT_1_TABLE |
+        VIEWOPT_1_DRAW |
+        VIEWOPT_1_CONTROL |
+        VIEWOPT_1_PAGEBACK |
+        VIEWOPT_1_POSTITS;
+
+    nCore2Options =
+        VIEWOPT_CORE2_BLACKFONT |
+        VIEWOPT_CORE2_HIDDENPARA;
+
+    nUIOptions =
+        VIEWOPT_2_MODIFIED |
+        VIEWOPT_2_GRFKEEPZOOM |
+        VIEWOPT_2_ANY_RULER;
 
     if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
         aSnapSize.Width() = aSnapSize.Height() = 720;   // 1/2"
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 152ee16c7cc7..80cac74f6d3e 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -206,6 +206,7 @@ public:
     void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); }
     const Point& GetPos() { return pHdl->GetPos(); }
     const Point& GetHdlPos() { return aHdlPos; }
+    SdrHdl* GetHdl() const { return pHdl; }
     void ChgHdl( SdrHdl* pNew )
     {
         pHdl = pNew;
@@ -2981,6 +2982,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                             ( pHdl->GetKind() == HDL_ANCHOR ||
                               pHdl->GetKind() == HDL_ANCHOR_TR ) )
                     {
+                        // #i121463# Set selected during drag
+                        pHdl->SetSelected(true);
                         m_pAnchorMarker = new SwAnchorMarker( pHdl );
                         UpdatePointer( aDocPos, rMEvt.GetModifier() );
                         return;
@@ -4165,6 +4168,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 
     if( m_pAnchorMarker )
     {
+        if(m_pAnchorMarker->GetHdl())
+        {
+            // #i121463# delete selected after drag
+            m_pAnchorMarker->GetHdl()->SetSelected(false);
+        }
+
         Point aPnt( m_pAnchorMarker->GetLastPos() );
         DELETEZ( m_pAnchorMarker );
         if( aPnt.X() || aPnt.Y() )