Resolves: #i122270# paragraph property panel, line spacing control

do not directly select item via cursor travelling; removing obsolete code

(cherry picked from commit 6ca31d904b343c76899dfa2bfef3e7d20db23364)

Conflicts:
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx

Change-Id: I8b8ff06008dc0fdfc617f83a4a9c0f9569a8bd36

3 files changed, 15 insertions, 49 deletions

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index cbb93209e4f2..e2fc0930313a 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -67,7 +67,6 @@ ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::Pa
     , maSpacing115     (SVX_RES(IMG_SPACING115))
     , maSpacing15      (SVX_RES(IMG_SPACING15))
     , maSpacing2       (SVX_RES(IMG_SPACING2))
-    , maLPCustom       (SVX_RES(IMG_SPACINGLCUSTOM))
     , maSelSpacing1    (SVX_RES(IMG_SEL_SPACING1))
     , maSelSpacing115  (SVX_RES(IMG_SEL_SPACING115))
     , maSelSpacing15   (SVX_RES(IMG_SEL_SPACING15))
@@ -100,26 +99,20 @@ ParaLineSpacingControl::~ParaLineSpacingControl()
 
 void ParaLineSpacingControl::initial()
 {
-    //maLineSpacing.SetStyle( maLineSpacing.GetStyle()| WB_3DLOOK |  WB_NO_DIRECTSELECT  );
-    //maLineSpacing.SetControlBackground(GetSettings().GetStyleSettings().GetMenuColor());
-    //maLineSpacing.SetColor(GetSettings().GetStyleSettings().GetMenuColor());
-    //maLineSpacing.SetMinFont();
-
-    maLineSpacing.SetControlBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-    GetSettings().GetStyleSettings().GetMenuColor():
-    sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
-    maLineSpacing.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
-    GetSettings().GetStyleSettings().GetMenuColor():
-    sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
-    maLineSpacing.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-    GetSettings().GetStyleSettings().GetMenuColor():
-    sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
-    //maFTSpacing.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-    //GetSettings().GetStyleSettings().GetMenuColor():
-    //sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
-    //maFTBy.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-    //GetSettings().GetStyleSettings().GetMenuColor():
-    //sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
+    maLineSpacing.SetStyle( maLineSpacing.GetStyle()| WB_3DLOOK |  WB_NO_DIRECTSELECT  );
+
+    maLineSpacing.SetControlBackground(
+        GetSettings().GetStyleSettings().GetHighContrastMode()
+        ? GetSettings().GetStyleSettings().GetMenuColor()
+        : sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
+    maLineSpacing.SetColor(
+        GetSettings().GetStyleSettings().GetHighContrastMode()
+        ? GetSettings().GetStyleSettings().GetMenuColor()
+        : sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
+    maLineSpacing.SetBackground(
+        GetSettings().GetStyleSettings().GetHighContrastMode()
+        ? GetSettings().GetStyleSettings().GetMenuColor()
+        : sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
 
     mpImg = new Image[4];
     mpImg[0] = maSpacing1;
@@ -162,13 +155,7 @@ void ParaLineSpacingControl::initial()
     aLineDistAtPercentBox.SetModifyHdl( aLink );
     aLineDistAtMetricBox.SetModifyHdl( aLink );
 }
-void ParaLineSpacingControl::ToGetFocus(bool bType)
-{
-    if(!bType)
-        aLineDist.GrabFocus();
-    else
-        maLineSpacing.GrabFocus();  //wj
-}
+
 
 void ParaLineSpacingControl::PopupModeEndCallback()
 {
@@ -483,24 +470,6 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
 
     aLineDist.SaveValue();
 
-    /*sal_uInt16 nID = pBox->GetCurItemId();
-    pBox->SetItemDown(nID, sal_True);
-
-    Size aFloatSz = GetOutputSizePixel();
-
-    GetLineSPFloatWin()->SetSizePixel( aFloatSz );
-
-    Point aPos=maLineSPTbx->GetPosPixel();
-    aPos.setX(aPos.getX());
-    aPos = OutputToScreenPixel( aPos );
-    Size aSize = maLineSPTbx->GetSizePixel();
-    Rectangle aRect( aPos, aSize );
-
-    GetLineSPFloatWin()->StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_NOFOCUSCLOSE);
-    GetLineSPFloatWin()->SetPopupModeFlags(GetLineSPFloatWin()->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
-
-    pLineSPPage->ToGetFocus(bValueSetFocus);
-    */
     sal_uInt16 uCount = aLineDist.GetEntryCount();
     if( uCount == LLINESPACE_FIX + 1 )
     {
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index ed3f643fb406..fc540c044971 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -40,7 +40,6 @@ class ParaLineSpacingControl:public svx::sidebar::PopupControl
 public:
     ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel);
     ~ParaLineSpacingControl();
-    void ToGetFocus(bool bType);
     void Rearrange(SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem,const ::sfx2::sidebar::EnumContext currentContext);
     //virtual void Paint(const Rectangle& rect);
 
@@ -81,7 +80,6 @@ private:
     Image  maSpacing115;
     Image  maSpacing15;
     Image  maSpacing2;
-    Image  maLPCustom;
 
     Image  maSelSpacing1;
     Image  maSelSpacing115;
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 030d4522e9a4..6ffb875f4ae0 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -113,7 +113,6 @@
 #define IMG_SPACING115                     19
 #define IMG_SPACING15                      20
 #define IMG_SPACING2                       21
-#define IMG_SPACINGLCUSTOM                 22
 #define IMG_SEL_SPACING1                   23
 #define IMG_SEL_SPACING115                 24
 #define IMG_SEL_SPACING15                  25