only one use of ScPrivatSplit, and that's for vertical split

Change-Id: I942907d6af150818cb1e9a0f1d3f4cd036d0503e

3 files changed, 33 insertions, 102 deletions

diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 8a0b5ecba453..d10ae1fbe914 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -90,7 +90,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
                 SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ) :
 
     SfxDockingWindow( pBindingsP, pCW, pParent, rResId ),
-    aPrivatSplit    ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr()  ),SC_SPLIT_VERT) ),
+    aPrivatSplit    ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr() ) ) ),
     aCatBox         ( VclPtr<ListBox>::Create( this, ResId( CB_CAT, *rResId.GetResMgr() ) ) ),
     aFuncList       ( VclPtr<ListBox>::Create( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ) ),
     aDDFuncList     ( VclPtr<ListBox>::Create( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ) ),
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index 311c0787541b..bb7ca44df7d2 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -34,8 +34,7 @@
 #*
 #************************************************************************/
 
-ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId,
-                             SC_SPLIT_DIRECTION eSplit)
+ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId)
     : Control(pParent, rResId)
     , nDeltaX(0)
     , nDeltaY(0)
@@ -45,7 +44,6 @@ ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId,
     nOldY=(short)aPos.Y();
     nNewX=(short)aPos.X();
     nNewY=(short)aPos.Y();
-    eScSplit=eSplit;
     aXMovingRange.Min()=nNewX;
     aXMovingRange.Max()=nNewX;
     aYMovingRange.Min()=nNewY;
@@ -54,14 +52,7 @@ ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId,
     aWinPointer=GetPointer();
 
     aMovingFlag=false;
-    if(eScSplit==SC_SPLIT_HORZ)
-    {
-        aWinPointer=Pointer(PointerStyle::HSplit);
-    }
-    else
-    {
-        aWinPointer=Pointer(PointerStyle::VSplit);
-    }
+    aWinPointer=Pointer(PointerStyle::VSplit);
     SetPointer(aWinPointer);
 }
 
@@ -114,38 +105,20 @@ void ScPrivatSplit::MouseButtonUp( const MouseEvent& rMEvt )
     Point a2Pos=GetPosPixel();
     Point a3Pos=a2Pos;
 
-    if(eScSplit==SC_SPLIT_HORZ)
+    nNewY=(short)aPos.Y();
+    nDeltaY=nNewY-nOldY;
+    a2Pos.Y()+=nDeltaY;
+    if(a2Pos.Y()<aYMovingRange.Min())
     {
-        nNewX=(short)aPos.X();
-        nDeltaX=nNewX-nOldX;
-        a2Pos.X()+=nDeltaX;
-        if(a2Pos.X()<aXMovingRange.Min())
-        {
-            nDeltaX=(short)(aXMovingRange.Min()-a3Pos.X());
-            a2Pos.X()=aXMovingRange.Min();
-        }
-        else if(a2Pos.X()>aXMovingRange.Max())
-        {
-            nDeltaX=(short)(aXMovingRange.Max()-a3Pos.X());
-            a2Pos.X()=aXMovingRange.Max();
-        }
+        nDeltaY=(short)(aYMovingRange.Min()-a3Pos.Y());
+        a2Pos.Y()=aYMovingRange.Min();
     }
-    else
+    else if(a2Pos.Y()>aYMovingRange.Max())
     {
-        nNewY=(short)aPos.Y();
-        nDeltaY=nNewY-nOldY;
-        a2Pos.Y()+=nDeltaY;
-        if(a2Pos.Y()<aYMovingRange.Min())
-        {
-            nDeltaY=(short)(aYMovingRange.Min()-a3Pos.Y());
-            a2Pos.Y()=aYMovingRange.Min();
-        }
-        else if(a2Pos.Y()>aYMovingRange.Max())
-        {
-            nDeltaY=(short)(aYMovingRange.Max()-a3Pos.Y());
-            a2Pos.Y()=aYMovingRange.Max();
-        }
+        nDeltaY=(short)(aYMovingRange.Max()-a3Pos.Y());
+        a2Pos.Y()=aYMovingRange.Max();
     }
+
     SetPosPixel(a2Pos);
     Invalidate();
     Update();
@@ -175,38 +148,18 @@ void ScPrivatSplit::MouseMove( const MouseEvent& rMEvt )
     Point a3Pos=a2Pos;
     if(rMEvt.IsLeft())
     {
-        if(eScSplit==SC_SPLIT_HORZ)
+        nNewY=(short)aPos.Y();
+        nDeltaY=nNewY-nOldY;
+        a2Pos.Y()+=nDeltaY;
+        if(a2Pos.Y()<aYMovingRange.Min())
         {
-            nNewX=(short)aPos.X();
-            nDeltaX=nNewX-nOldX;
-            a2Pos.X()+=nDeltaX;
-
-            if(a2Pos.X()<aXMovingRange.Min())
-            {
-                nDeltaX=(short)(aXMovingRange.Min()-a3Pos.X());
-                a2Pos.X()=aXMovingRange.Min();
-            }
-            else if(a2Pos.X()>aXMovingRange.Max())
-            {
-                nDeltaX=(short)(aXMovingRange.Max()-a3Pos.X());
-                a2Pos.X()=aXMovingRange.Max();
-            }
+            nDeltaY=(short)(aYMovingRange.Min()-a3Pos.Y());
+            a2Pos.Y()=aYMovingRange.Min();
         }
-        else
+        else if(a2Pos.Y()>aYMovingRange.Max())
         {
-            nNewY=(short)aPos.Y();
-            nDeltaY=nNewY-nOldY;
-            a2Pos.Y()+=nDeltaY;
-            if(a2Pos.Y()<aYMovingRange.Min())
-            {
-                nDeltaY=(short)(aYMovingRange.Min()-a3Pos.Y());
-                a2Pos.Y()=aYMovingRange.Min();
-            }
-            else if(a2Pos.Y()>aYMovingRange.Max())
-            {
-                nDeltaY=(short)(aYMovingRange.Max()-a3Pos.Y());
-                a2Pos.Y()=aYMovingRange.Max();
-            }
+            nDeltaY=(short)(aYMovingRange.Max()-a3Pos.Y());
+            a2Pos.Y()=aYMovingRange.Max();
         }
 
         SetPosPixel(a2Pos);
@@ -279,38 +232,20 @@ void ScPrivatSplit::MoveSplitTo(Point aPos)
     nOldY=(short)a2Pos.Y();
     Point a3Pos=a2Pos;
 
-    if(eScSplit==SC_SPLIT_HORZ)
+    nNewY=(short)aPos.Y();
+    nDeltaY=nNewY-nOldY;
+    a2Pos.Y()+=nDeltaY;
+    if(a2Pos.Y()<aYMovingRange.Min())
     {
-        nNewX=(short)aPos.X();
-        nDeltaX=nNewX-nOldX;
-        a2Pos.X()+=nDeltaX;
-        if(a2Pos.X()<aXMovingRange.Min())
-        {
-            nDeltaX=(short)(aXMovingRange.Min()-a3Pos.X());
-            a2Pos.X()=aXMovingRange.Min();
-        }
-        else if(a2Pos.X()>aXMovingRange.Max())
-        {
-            nDeltaX=(short)(aXMovingRange.Max()-a3Pos.X());
-            a2Pos.X()=aXMovingRange.Max();
-        }
+        nDeltaY=(short)(aYMovingRange.Min()-a3Pos.Y());
+        a2Pos.Y()=aYMovingRange.Min();
     }
-    else
+    else if(a2Pos.Y()>aYMovingRange.Max())
     {
-        nNewY=(short)aPos.Y();
-        nDeltaY=nNewY-nOldY;
-        a2Pos.Y()+=nDeltaY;
-        if(a2Pos.Y()<aYMovingRange.Min())
-        {
-            nDeltaY=(short)(aYMovingRange.Min()-a3Pos.Y());
-            a2Pos.Y()=aYMovingRange.Min();
-        }
-        else if(a2Pos.Y()>aYMovingRange.Max())
-        {
-            nDeltaY=(short)(aYMovingRange.Max()-a3Pos.Y());
-            a2Pos.Y()=aYMovingRange.Max();
-        }
+        nDeltaY=(short)(aYMovingRange.Max()-a3Pos.Y());
+        a2Pos.Y()=aYMovingRange.Max();
     }
+
     SetPosPixel(a2Pos);
     Invalidate();
     Update();
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index 7137cbdd8e40..fb2edaa57987 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -22,8 +22,6 @@
 
 #include <vcl/ctrl.hxx>
 
-enum SC_SPLIT_DIRECTION {SC_SPLIT_HORZ,SC_SPLIT_VERT };
-
 class ScPrivatSplit : public Control
 {
 private:
@@ -31,7 +29,6 @@ private:
         Link<>              aCtrModifiedLink;
         bool                aMovingFlag;
         Pointer             aWinPointer;
-        SC_SPLIT_DIRECTION  eScSplit;
         short               nOldX;
         short               nOldY;
         short               nNewX;
@@ -51,8 +48,7 @@ protected:
 
 public:
 
-        ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId,
-                        SC_SPLIT_DIRECTION eScSplit);
+        ScPrivatSplit(vcl::Window* pWindow, const ResId& rResId);
 
         short           GetDeltaY();