Resolves: #i122230# Fixed focus traveling in the sidebar

(cherry picked from commit bab3ddce4b3d5330835494f54b68406335821b76)

Conflicts:
sfx2/source/sidebar/FocusManager.cxx

Change-Id: I8853a92da3c4fe41a0110c630cc6af556ffc2ce4

4 files changed, 28 insertions, 24 deletions

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2dbedb588f5a..f4391e69f45e 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1548,18 +1548,22 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
       maFTUL (new FixedText(this, SVX_RES(FT_SPACING))),
       maTbxUL_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
       maTbxUL_IncDec (ControlFactory::CreateToolBox(maTbxUL_IncDecBackground.get(),SVX_RES(TBX_UL_INC_DEC))),
-      maTopDist (new SvxRelativeField(this, SVX_RES(MF_ABOVE_PARASPACING))),
-      maBottomDist (new SvxRelativeField(this, SVX_RES(MF_BELOW_PARASPACING))),
-      maLineSPTbxBackground(ControlFactory::CreateToolBoxBackground(this)),
-      maLineSPTbx (ControlFactory::CreateToolBox(maLineSPTbxBackground.get(),SVX_RES(TBX_LINESP))),
       maFTIndent (new FixedText(this, SVX_RES(FT_INDENT))),
       maTbxIndent_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
       maTbxIndent_IncDec (ControlFactory::CreateToolBox(maTbxIndent_IncDecBackground.get(),SVX_RES(TBX_INDENT_INC_DEC))),
-      maTbxProDemoteBackground(ControlFactory::CreateToolBoxBackground(this)),
-      maTbxProDemote (ControlFactory::CreateToolBox(maTbxProDemoteBackground.get(),SVX_RES(TBX_INDENT_PRO_DEMOTE))),
+
+      maTopDist (new SvxRelativeField(this, SVX_RES(MF_ABOVE_PARASPACING))),
       maLeftIndent (new SvxRelativeField(this, SVX_RES(MF_BEFORE_INDENT))),
+
+      maBottomDist (new SvxRelativeField(this, SVX_RES(MF_BELOW_PARASPACING))),
       maRightIndent (new SvxRelativeField(this, SVX_RES(MF_AFTER_INDENT))),
+
+      maLineSPTbxBackground(ControlFactory::CreateToolBoxBackground(this)),
+      maLineSPTbx (ControlFactory::CreateToolBox(maLineSPTbxBackground.get(),SVX_RES(TBX_LINESP))),
       maFLineIndent (new SvxRelativeField(this, SVX_RES(MF_FL_INDENT))),
+
+      maTbxProDemoteBackground(ControlFactory::CreateToolBoxBackground(this)),
+      maTbxProDemote (ControlFactory::CreateToolBox(maTbxProDemoteBackground.get(),SVX_RES(TBX_INDENT_PRO_DEMOTE))),
       mpColorUpdater (),
       maFISpace1 ( this, SVX_RES( FI_SPACE1)),
       maFISpace2 ( this, SVX_RES( FI_SPACE2)),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index e1701e3c9e97..3ed393b2d63d 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -108,20 +108,20 @@ private:
     ::boost::scoped_ptr<FixedText>          maFTUL;
     ::boost::scoped_ptr<Window>             maTbxUL_IncDecBackground;
     ::boost::scoped_ptr<ToolBox>            maTbxUL_IncDec;
+    ::boost::scoped_ptr<FixedText>          maFTIndent;
+    ::boost::scoped_ptr<Window>             maTbxIndent_IncDecBackground;
+    ::boost::scoped_ptr<ToolBox>            maTbxIndent_IncDec;
     ::boost::scoped_ptr<SvxRelativeField>   maTopDist;
+    ::boost::scoped_ptr<SvxRelativeField>   maLeftIndent;
     ::boost::scoped_ptr<SvxRelativeField>   maBottomDist;
+    ::boost::scoped_ptr<SvxRelativeField>   maRightIndent;
     //Line spacing
     ::boost::scoped_ptr<Window>             maLineSPTbxBackground;
     ::boost::scoped_ptr<ToolBox>            maLineSPTbx;
+    ::boost::scoped_ptr<SvxRelativeField>   maFLineIndent;
     //Indent
-    ::boost::scoped_ptr<FixedText>          maFTIndent;
-    ::boost::scoped_ptr<Window>             maTbxIndent_IncDecBackground;
-    ::boost::scoped_ptr<ToolBox>            maTbxIndent_IncDec;
     ::boost::scoped_ptr<Window>             maTbxProDemoteBackground;
     ::boost::scoped_ptr<ToolBox>            maTbxProDemote;
-    ::boost::scoped_ptr<SvxRelativeField>   maLeftIndent;
-    ::boost::scoped_ptr<SvxRelativeField>   maRightIndent;
-    ::boost::scoped_ptr<SvxRelativeField>   maFLineIndent;
     ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
 
     /**********************************************************
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 575e5dac9c31..3a9d605450f0 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -160,18 +160,14 @@ TextPropertyPanel::TextPropertyPanel (
     :   Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
         mpFontNameBox (new SvxSBFontNameBox(this, SVX_RES(CB_SBFONT_FONT))),
         maFontSizeBox       (this, SVX_RES(MB_SBFONT_FONTSIZE)),
-        mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
-        mpToolBoxIncDec(ControlFactory::CreateToolBox(
-                mpToolBoxIncDecBackground.get(),
-                SVX_RES(TB_INCREASE_DECREASE))),
         mpToolBoxFontBackground(ControlFactory::CreateToolBoxBackground(this)),
         mpToolBoxFont(ControlFactory::CreateToolBox(
                 mpToolBoxFontBackground.get(),
                 SVX_RES(TB_FONT))),
-        mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
-        mpToolBoxFontColor(ControlFactory::CreateToolBox(
-                mpToolBoxFontColorBackground.get(),
-                SVX_RES(TB_FONTCOLOR))),
+        mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
+        mpToolBoxIncDec(ControlFactory::CreateToolBox(
+                mpToolBoxIncDecBackground.get(),
+                SVX_RES(TB_INCREASE_DECREASE))),
         mpToolBoxScriptBackground(ControlFactory::CreateToolBoxBackground(this)),
         mpToolBoxScript(ControlFactory::CreateToolBox(
                 mpToolBoxScriptBackground.get(),
@@ -184,6 +180,10 @@ TextPropertyPanel::TextPropertyPanel (
         mpToolBoxSpacing(ControlFactory::CreateToolBox(
                 mpToolBoxSpacingBackground.get(),
                 SVX_RES(TB_SPACING))),
+        mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
+        mpToolBoxFontColor(ControlFactory::CreateToolBox(
+                mpToolBoxFontColorBackground.get(),
+                SVX_RES(TB_FONTCOLOR))),
         mpToolBoxHighlightBackground(ControlFactory::CreateToolBoxBackground(this)),
         mpToolBoxHighlight(ControlFactory::CreateToolBox(
                 mpToolBoxHighlightBackground.get(),
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 553bc23aa800..cb097d6a5ccc 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -83,18 +83,18 @@ private:
     //ui controls
     ::boost::scoped_ptr<SvxSBFontNameBox> mpFontNameBox;
     FontSizeBox maFontSizeBox;
-    ::boost::scoped_ptr<Window> mpToolBoxIncDecBackground;
-    ::boost::scoped_ptr<ToolBox> mpToolBoxIncDec;
     ::boost::scoped_ptr<Window> mpToolBoxFontBackground;
     ::boost::scoped_ptr<ToolBox> mpToolBoxFont;
-    ::boost::scoped_ptr<Window> mpToolBoxFontColorBackground;
-    ::boost::scoped_ptr<ToolBox> mpToolBoxFontColor;
+    ::boost::scoped_ptr<Window> mpToolBoxIncDecBackground;
+    ::boost::scoped_ptr<ToolBox> mpToolBoxIncDec;
     ::boost::scoped_ptr<Window> mpToolBoxScriptBackground;
     ::boost::scoped_ptr<ToolBox> mpToolBoxScript;
     ::boost::scoped_ptr<Window> mpToolBoxScriptSwBackground;
     ::boost::scoped_ptr<ToolBox> mpToolBoxScriptSw;
     ::boost::scoped_ptr<Window> mpToolBoxSpacingBackground;
     ::boost::scoped_ptr<ToolBox> mpToolBoxSpacing;
+    ::boost::scoped_ptr<Window> mpToolBoxFontColorBackground;
+    ::boost::scoped_ptr<ToolBox> mpToolBoxFontColor;
     ::boost::scoped_ptr<Window> mpToolBoxHighlightBackground;
     ::boost::scoped_ptr<ToolBox> mpToolBoxHighlight;
     ::boost::scoped_ptr<ToolboxButtonColorUpdater> mpFontColorUpdater;