sidebar: Images have to be global in LinePropertyPanel.

Change-Id: I8cdb6321dbfa6860855e24bad03974de668c56eb

2 files changed, 50 insertions, 83 deletions

diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index 245c6824285d..02547f7effad 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -30,17 +30,17 @@
 #define FT_CAPSTYLE         20
 #define LB_CAPSTYLE         21
 
-#define IMG_COLOR           23
-#define IMG_NONE_ICON       36
-
-#define IMG_WIDTH1_ICON     41
-#define IMG_WIDTH2_ICON     42
-#define IMG_WIDTH3_ICON     43
-#define IMG_WIDTH4_ICON     44
-#define IMG_WIDTH5_ICON     45
-#define IMG_WIDTH6_ICON     46
-#define IMG_WIDTH7_ICON     47
-#define IMG_WIDTH8_ICON     48
+#define IMG_COLOR           (RID_SVX_SIDEBAR_BEGIN + 20)
+#define IMG_NONE_ICON       (RID_SVX_SIDEBAR_BEGIN + 21)
+
+#define IMG_WIDTH1_ICON     (RID_SVX_SIDEBAR_BEGIN + 22)
+#define IMG_WIDTH2_ICON     (RID_SVX_SIDEBAR_BEGIN + 23)
+#define IMG_WIDTH3_ICON     (RID_SVX_SIDEBAR_BEGIN + 24)
+#define IMG_WIDTH4_ICON     (RID_SVX_SIDEBAR_BEGIN + 25)
+#define IMG_WIDTH5_ICON     (RID_SVX_SIDEBAR_BEGIN + 26)
+#define IMG_WIDTH6_ICON     (RID_SVX_SIDEBAR_BEGIN + 27)
+#define IMG_WIDTH7_ICON     (RID_SVX_SIDEBAR_BEGIN + 28)
+#define IMG_WIDTH8_ICON     (RID_SVX_SIDEBAR_BEGIN + 29)
 
 //color popup page
 #define VS_COLOR        1
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index c1cda86027b3..c067c4010d66 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -24,81 +24,48 @@
 #define TOOLBOX_HEIGHT      14
 #define LISTBOX_HEIGHT      99
 
-Control RID_SIDEBAR_LINE_PANEL
+Image IMG_COLOR
 {
-    OutputSize = TRUE;
-    DialogControl = TRUE;
-    Border = FALSE;
-    Text = "Line";
-
-    Size = MAP_APPFONT(
-        PROPERTYPAGE_WIDTH,
-        SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*4 + TEXT_CONTROL_SPACING_VERTICAL*4 + TOOLBOX_HEIGHT*3  + CONTROL_SPACING_VERTICAL*3 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT );
-    HelpID = HID_PROPERTYPANEL_LINE_SECTION ;
-
-/*
-    MetricField MF_TRANSPARENT
-    {
-        Border = TRUE ;
-        HelpID = HID_PPROPERTYPANEL_LINE_MTR_TRANCEPARENCE;
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3 , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*2 + TEXT_CONTROL_SPACING_VERTICAL*2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL) ;
-        Size = MAP_APPFONT ( TOOLBOX_WIDTH + 1 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-        QuickHelpText [ en-US ] = "Specify the transparency of the line.";
-    };
-*/
-    Image IMG_COLOR
-    {
-        ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
-    };
-    Image IMG_NONE_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/blank.png";};
-    };
-
-    //WIDTH ICON
-    Image IMG_WIDTH1_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width1.png";};
-    };
-    Image IMG_WIDTH2_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width2.png";};
-    };
-    Image IMG_WIDTH3_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width3.png";};
-    };
-    Image IMG_WIDTH4_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width4.png";};
-    };
-    Image IMG_WIDTH5_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width5.png";};
-    };
-    Image IMG_WIDTH6_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width6.png";};
-    };
-    Image IMG_WIDTH7_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width7.png";};
-    };
-    Image IMG_WIDTH8_ICON
-    {
-        ImageBitmap = Bitmap{File = "symphony/width8.png";};
-    };
+    ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
+};
+Image IMG_NONE_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/blank.png";};
+};
 
+Image IMG_WIDTH1_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width1.png";};
+};
+Image IMG_WIDTH2_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width2.png";};
 };
+Image IMG_WIDTH3_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width3.png";};
+};
+Image IMG_WIDTH4_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width4.png";};
+};
+Image IMG_WIDTH5_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width5.png";};
+};
+Image IMG_WIDTH6_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width6.png";};
+};
+Image IMG_WIDTH7_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width7.png";};
+};
+Image IMG_WIDTH8_ICON
+{
+    ImageBitmap = Bitmap{File = "symphony/width8.png";};
+};
+
 Control RID_POPUPPANEL_LINEPAGE_COLOR
 {
     OutputSize = TRUE;