sidebar: Use images directly in the .ui, no need to go trough .src.

Change-Id: I41cecd6b4a1ce5789638df04d27a08f158356b81

5 files changed, 70 insertions, 55 deletions

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 8b26ac9e23f8..83e2a609a9ba 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1465,12 +1465,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
     : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame),
 
       mpColorUpdater (),
-      maSpace1 (SVX_RES(IMG_SPACE1)),
-      maSpace2 (SVX_RES(IMG_SPACE2)),
       maSpace3 (SVX_RES(IMG_SPACE3)),
-      maIndent1 (SVX_RES(IMG_INDENT1)),
-      maIndent2 (SVX_RES(IMG_INDENT2)),
-      maIndent3 (SVX_RES(IMG_INDENT3)),
       maIndHang (SVX_RES(IMG_INDENT_HANG)),
       maNumBImageList (SVX_RES(IL_NUM_BULLET)),
       maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 04e077b1e56c..ab039716d319 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -20,25 +20,20 @@
 
 #define IMG_BACK_COLOR      (RID_SVX_SIDEBAR_BEGIN +  0)
 #define IMG_BACK_COLOR_H    (RID_SVX_SIDEBAR_BEGIN +  1)
-#define IMG_SPACE1          (RID_SVX_SIDEBAR_BEGIN +  2)
-#define IMG_SPACE2          (RID_SVX_SIDEBAR_BEGIN +  3)
-#define IMG_SPACE3          (RID_SVX_SIDEBAR_BEGIN +  4)
-#define IMG_INDENT1         (RID_SVX_SIDEBAR_BEGIN +  5)
-#define IMG_INDENT2         (RID_SVX_SIDEBAR_BEGIN +  6)
-#define IMG_INDENT3         (RID_SVX_SIDEBAR_BEGIN +  7)
-#define IMG_INDENT_HANG     (RID_SVX_SIDEBAR_BEGIN +  8)
-#define IMG_SPACING1        (RID_SVX_SIDEBAR_BEGIN +  9)
-#define IMG_SPACING115      (RID_SVX_SIDEBAR_BEGIN + 10)
-#define IMG_SPACING15       (RID_SVX_SIDEBAR_BEGIN + 11)
-#define IMG_SPACING2        (RID_SVX_SIDEBAR_BEGIN + 12)
-#define IMG_SEL_SPACING1    (RID_SVX_SIDEBAR_BEGIN + 13)
-#define IMG_SEL_SPACING115  (RID_SVX_SIDEBAR_BEGIN + 14)
-#define IMG_SEL_SPACING15   (RID_SVX_SIDEBAR_BEGIN + 15)
-#define IMG_SEL_SPACING2    (RID_SVX_SIDEBAR_BEGIN + 16)
-#define IMG_CUSTOM          (RID_SVX_SIDEBAR_BEGIN + 17)
-#define IMG_CUSTOM_GRAY     (RID_SVX_SIDEBAR_BEGIN + 18)
-#define IL_NUM_BULLET       (RID_SVX_SIDEBAR_BEGIN + 19)
-#define IL_NUM_BULLET_RTL   (RID_SVX_SIDEBAR_BEGIN + 20)
+#define IMG_SPACE3          (RID_SVX_SIDEBAR_BEGIN +  2)
+#define IMG_INDENT_HANG     (RID_SVX_SIDEBAR_BEGIN +  3)
+#define IMG_SPACING1        (RID_SVX_SIDEBAR_BEGIN +  4)
+#define IMG_SPACING115      (RID_SVX_SIDEBAR_BEGIN +  5)
+#define IMG_SPACING15       (RID_SVX_SIDEBAR_BEGIN +  6)
+#define IMG_SPACING2        (RID_SVX_SIDEBAR_BEGIN +  7)
+#define IMG_SEL_SPACING1    (RID_SVX_SIDEBAR_BEGIN +  8)
+#define IMG_SEL_SPACING115  (RID_SVX_SIDEBAR_BEGIN +  9)
+#define IMG_SEL_SPACING15   (RID_SVX_SIDEBAR_BEGIN + 10)
+#define IMG_SEL_SPACING2    (RID_SVX_SIDEBAR_BEGIN + 11)
+#define IMG_CUSTOM          (RID_SVX_SIDEBAR_BEGIN + 12)
+#define IMG_CUSTOM_GRAY     (RID_SVX_SIDEBAR_BEGIN + 13)
+#define IL_NUM_BULLET       (RID_SVX_SIDEBAR_BEGIN + 14)
+#define IL_NUM_BULLET_RTL   (RID_SVX_SIDEBAR_BEGIN + 15)
 
 //for numbering and bullet
 #define IID_BULLET          1
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 8452ce74d066..054485046037 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -120,13 +120,7 @@ private:
      **
     ***********************************************************/
 
-    Image  maSpace1;
-    Image  maSpace2;
     Image  maSpace3;
-    Image  maIndent1;
-    Image  maIndent2;
-    Image  maIndent3;
-
     Image  maIndHang;
 
     ImageList   maNumBImageList;
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 9471ab0b7079..7dc425cd1f66 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -55,30 +55,10 @@ Image IMG_BACK_COLOR_H
 {
     ImageBitmap = Bitmap{File = "symphony/sch_backgroundcolor.bmp";};
 };
-Image IMG_SPACE1
-{
-    ImageBitmap = Bitmap{File = "symphony/spacing1.png";};
-};
-Image IMG_SPACE2
-{
-    ImageBitmap = Bitmap{File = "symphony/spacing2.png";};
-};
 Image IMG_SPACE3
 {
     ImageBitmap = Bitmap{File = "symphony/spacing3.png";};
 };
-Image IMG_INDENT1
-{
-    ImageBitmap = Bitmap{File = "symphony/Indent2.png";};
-};
-Image IMG_INDENT2
-{
-    ImageBitmap = Bitmap{File = "symphony/Indent3.png";};
-};
-Image IMG_INDENT3
-{
-    ImageBitmap = Bitmap{File = "symphony/Indent4.png";};
-};
 Image IMG_INDENT_HANG
 {
     ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 05fd23ce19a8..691ee14b17d1 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -459,8 +459,19 @@
           <object class="GtkBox" id="box6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">6</property>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="ypad">15</property>
+                <property name="pixbuf">svx/res/symphony/spacing1.png</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
@@ -491,8 +502,18 @@
           <object class="GtkBox" id="box7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">6</property>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixbuf">svx/res/symphony/spacing2.png</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="belowparaspacing">
@@ -523,8 +544,18 @@
           <object class="GtkBox" id="box8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">6</property>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixbuf">svx/res/symphony/Indent4.png</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="beforetextindent">
@@ -552,8 +583,18 @@
           <object class="GtkBox" id="box9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">6</property>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixbuf">svx/res/symphony/Indent3.png</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="aftertextindent">
@@ -581,8 +622,18 @@
           <object class="GtkBox" id="box10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">6</property>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="firstlineindent">