sidebar: Re-introduce the promote/demote toolbar in ParaPropertyPanel.

For the moment it is easier to do it as it was done before, and cleanup later.

Change-Id: I122870ffb51a7ee61825a3ac9e83e9e0a3335c4f

2 files changed, 67 insertions, 29 deletions

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 1d11ebb7b414..07e3cf49ca5e 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -64,8 +64,8 @@ const char UNO_INCREMENTINDENT[]  = ".uno:IncrementIndent";
 const char UNO_DECREMENTINDENT[]  = ".uno:DecrementIndent";
 const char UNO_HANGINGINDENT[]    = ".uno:HangingIndent";
 
-const char UNO_INCREMENTINDENT2[] = ".uno:IncrementIndent2";
-const char UNO_DECREMENTINDENT2[] = ".uno:DecrementIndent2";
+const char UNO_PROMOTE[]          = ".uno:IncrementIndent2";
+const char UNO_DEMOTE[]           = ".uno:DecrementIndent2";
 const char UNO_HANGINGINDENT2[]   = ".uno:HangingIndent2";
 
 const char UNO_LINESPACING[]      = ".uno:LineSpacing";
@@ -304,37 +304,40 @@ void ParaPropertyPanel::InitToolBoxIndent()
     mpRightIndent->SetAccessibleName(mpRightIndent->GetQuickHelpText());
     mpFLineIndent->SetAccessibleName(mpFLineIndent->GetQuickHelpText());
 
-    const sal_uInt16 nIdLeft   = mpAlignToolBox->GetItemId(UNO_LEFTPARA);
-    const sal_uInt16 nIdCenter = mpAlignToolBox->GetItemId(UNO_CENTERPARA);
-    const sal_uInt16 nIdRight  = mpAlignToolBox->GetItemId(UNO_RIGHTPARA);
+    const sal_uInt16 nIdIncrement = mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT);
+    const sal_uInt16 nIdDecrement = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT);
+    const sal_uInt16 nIdHanging   = mpTbxIndent_IncDec->GetItemId(UNO_HANGINGINDENT);
 
     if( Application::GetSettings().GetLayoutRTL())
     {
-        mpTbxIndent_IncDec->SetItemImage(nIdLeft, maIncIndentControl.GetIcon());
-        mpTbxIndent_IncDec->SetItemImage(nIdCenter, maDecIndentControl.GetIcon());
+        mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
+        mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
     }
     else
     {
-        mpTbxIndent_IncDec->SetItemImage(nIdLeft, maIncIndentControl.GetIcon());
-        mpTbxIndent_IncDec->SetItemImage(nIdCenter, maDecIndentControl.GetIcon());
+        mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
+        mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
     }
-    mpTbxIndent_IncDec->SetItemImage(nIdRight, maIndHang);
+    mpTbxIndent_IncDec->SetItemImage(nIdHanging, maIndHang);
 
     aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl );
     mpTbxIndent_IncDec->SetSelectHdl(aLink);
     m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
 
+    const sal_uInt16 nIdPromote  = mpTbxProDemote->GetItemId(UNO_PROMOTE);
+    const sal_uInt16 nIdDemote   = mpTbxProDemote->GetItemId(UNO_DEMOTE);
+    const sal_uInt16 nIdHanging2 = mpTbxProDemote->GetItemId(UNO_HANGINGINDENT2);
     if( Application::GetSettings().GetLayoutRTL())
     {
-        mpTbxProDemote->SetItemImage(nIdLeft, maOutLineLeftControl.GetIcon());
-        mpTbxProDemote->SetItemImage(nIdCenter, maOutLineRightControl.GetIcon());
+        mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
+        mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
     }
     else
     {
-        mpTbxProDemote->SetItemImage(nIdLeft, maOutLineLeftControl.GetIcon());
-        mpTbxProDemote->SetItemImage(nIdCenter, maOutLineRightControl.GetIcon());
+        mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
+        mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
     }
-    mpTbxProDemote->SetItemImage(nIdRight, maIndHang);
+    mpTbxProDemote->SetItemImage(nIdHanging2, maIndHang);
     aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl );
     mpTbxProDemote->SetSelectHdl(aLink);
     m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
@@ -1530,6 +1533,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
     get(mpTopDist,      "aboveparaspacing");
     get(mpBottomDist,   "belowparaspacing");
     get(mpTbxIndent_IncDec, "indent");
+    get(mpTbxProDemote, "promotedemote");
     get(mpLineSPTbx,    "linespacing");
     get(mpTbxUL_IncDec, "paraspacing");
     get(mpLeftIndent,   "beforetextindent");
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index b5b4a8f36f67..82b0d0e7243e 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -101,7 +101,6 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Align Top</property>
                     <property name="action_name">.uno:CellVertTop</property>
-                    <property name="label" translatable="yes">toolbutton1</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -115,7 +114,6 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
                     <property name="action_name">.uno:CellVertCenter</property>
-                    <property name="label" translatable="yes">toolbutton2</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -130,7 +128,6 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Align Bottom</property>
                     <property name="action_name">.uno:CellVertBottom</property>
-                    <property name="label" translatable="yes">toolbutton3</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -216,7 +213,6 @@
                     <property name="valign">start</property>
                     <property name="margin_left">35</property>
                     <property name="action_name">.uno:ParaBackColor</property>
-                    <property name="label" translatable="yes">toolbutton1</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -305,7 +301,6 @@
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">Increase Spacing</property>
                         <property name="action_name">.uno:ParaspaceIncrease</property>
-                        <property name="label" translatable="yes">toolbutton1</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -320,7 +315,6 @@
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">Decrease Spacing</property>
                         <property name="action_name">.uno:ParaSpaceDecrease</property>
-                        <property name="label" translatable="yes">toolbutton1</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -343,7 +337,7 @@
                     <property name="margin_left">63</property>
                     <property name="show_arrow">False</property>
                     <child>
-                      <object class="GtkToolButton" id="increaseindent1">
+                      <object class="GtkToolButton" id="increaseindent">
                         <property name="width_request">15</property>
                         <property name="height_request">25</property>
                         <property name="visible">True</property>
@@ -351,7 +345,6 @@
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">Increase Indent</property>
                         <property name="action_name">.uno:IncrementIndent</property>
-                        <property name="label" translatable="yes">toolbutton1</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -360,13 +353,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="decreaseindent1">
+                      <object class="GtkToolButton" id="decreaseindent">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">Decrease Indent</property>
                         <property name="action_name">.uno:DecrementIndent</property>
-                        <property name="label" translatable="yes">toolbutton1</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -375,13 +367,56 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="hangingindent1">
+                      <object class="GtkToolButton" id="hangingindent">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
                         <property name="action_name">.uno:HangingIndent</property>
-                        <property name="label" translatable="yes">toolbutton1</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolbar" id="promotedemote">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Indent</property>
+                    <property name="margin_left">63</property>
+                    <property name="show_arrow">False</property>
+                    <child>
+                      <object class="GtkToolButton" id="promote">
+                        <property name="width_request">15</property>
+                        <property name="height_request">25</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                        <property name="action_name">.uno:Promote</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="demote">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                        <property name="action_name">.uno:Demote</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -393,9 +428,9 @@
                       <object class="GtkToolButton" id="hangingindent2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
                         <property name="action_name">.uno:HangingIndent2</property>
-                        <property name="label" translatable="yes">toolbutton3</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -517,7 +552,6 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Line Spacing</property>
                     <property name="action_name">.uno:LineSpacing</property>
-                    <property name="label" translatable="yes">toolbutton1</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>