i121791 Corrected names for LineDashes, cleaned up resources

6 files changed, 27 insertions, 256 deletions

diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index fc6d826b9182..6ba0ddedb461 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -64,8 +64,8 @@ public:
             XColorEntry(const XColorEntry& rOther) :
                 XPropertyEntry(rOther), aColor(rOther.aColor) {}
 
-    void    SetColor(const Color& rColor)   { aColor = rColor; }
-    Color&  GetColor()                      { return aColor; }
+    void SetColor(const Color& rColor) { aColor = rColor; }
+    const Color& GetColor() const { return aColor; }
 };
 
 // --------------------
@@ -92,7 +92,7 @@ public:
         aB2DPolyPolygon = rB2DPolyPolygon;
     }
 
-    basegfx::B2DPolyPolygon& GetLineEnd()
+    const basegfx::B2DPolyPolygon& GetLineEnd() const
     {
         return aB2DPolyPolygon;
     }
@@ -112,8 +112,8 @@ public:
             XDashEntry(const XDashEntry& rOther) :
                 XPropertyEntry(rOther), aDash(rOther.aDash) {}
 
-    void    SetDash(const XDash& rDash)    { aDash = rDash; }
-    XDash&  GetDash()                      { return aDash; }
+    void SetDash(const XDash& rDash) { aDash = rDash; }
+    const XDash& GetDash() const { return aDash; }
 };
 
 // ------------------
@@ -130,8 +130,8 @@ public:
             XHatchEntry(const XHatchEntry& rOther) :
                 XPropertyEntry(rOther), aHatch(rOther.aHatch) {}
 
-    void    SetHatch(const XHatch& rHatch)  { aHatch = rHatch; }
-    XHatch& GetHatch()                      { return aHatch; }
+    void SetHatch(const XHatch& rHatch) { aHatch = rHatch; }
+    const XHatch& GetHatch() const { return aHatch; }
 };
 
 // ---------------------
@@ -148,8 +148,8 @@ public:
                 XGradientEntry(const XGradientEntry& rOther) :
                     XPropertyEntry(rOther), aGradient(rOther.aGradient) {}
 
-    void        SetGradient(const XGradient& rGrad) { aGradient = rGrad; }
-    XGradient&  GetGradient()                       { return aGradient; }
+    void SetGradient(const XGradient& rGrad) { aGradient = rGrad; }
+    const XGradient& GetGradient() const { return aGradient; }
 };
 
 // ---------------------
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 54e58a320d31..b17e6aa401a6 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1210,7 +1210,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
             sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode();
             pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
 
-            XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch();
+            const XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch();
             MapMode aMode( MAP_100TH_MM );
             Hatch aHatch( (HatchStyle) rXHatch.GetHatchStyle(),
                           rXHatch.GetColor(),
@@ -1366,7 +1366,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
         {
             OutputDevice* pDevice = rUDEvt.GetDevice();
 
-            XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient();
+            const XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient();
             Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() );
             aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() );
             aGradient.SetBorder( rXGrad.GetBorder() );
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index ff27ca1f0aef..9eb9e27bf12e 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -992,47 +992,47 @@ String RID_SVXSTR_DASH11_DEF
 
 String RID_SVXSTR_DASH0
 {
-    Text [ en-US ] = "Ultrafine dashed";
+    Text [ en-US ] = "Ultrafine Dashed";
 };
 String RID_SVXSTR_DASH1
 {
-    Text [ en-US ] = "Fine dashed";
+    Text [ en-US ] = "Fine Dashed";
 };
 String RID_SVXSTR_DASH2
 {
-    Text [ en-US ] = "Ultrafine 2 dots 3 dashes";
+    Text [ en-US ] = "Ultrafine 2 Dots 3 Dashes";
 };
 String RID_SVXSTR_DASH3
 {
-    Text [ en-US ] = "Fine dotted";
+    Text [ en-US ] = "Fine Dotted";
 };
 String RID_SVXSTR_DASH4
 {
-    Text [ en-US ] = "Line with fine dots";
+    Text [ en-US ] = "Line with Fine Dots";
 };
 String RID_SVXSTR_DASH5
 {
-    Text [ en-US ] = "Fine dashed (variable)";
+    Text [ en-US ] = "Fine Dashed (var)";
 };
 String RID_SVXSTR_DASH6
 {
-    Text [ en-US ] = "3 dashes 3 dots (variable)";
+    Text [ en-US ] = "3 Dashes 3 Dots (var)";
 };
 String RID_SVXSTR_DASH7
 {
-    Text [ en-US ] = "Ultrafine dotted (variable)";
+    Text [ en-US ] = "Ultrafine Dotted (var)";
 };
 String RID_SVXSTR_DASH8
 {
-    Text [ en-US ] = "Line style 9";
+    Text [ en-US ] = "Line Style 9";
 };
 String RID_SVXSTR_DASH9
 {
-    Text [ en-US ] = "2 dots 1 dash";
+    Text [ en-US ] = "2 Dots 1 Dash";
 };
 String RID_SVXSTR_DASH10
 {
-    Text [ en-US ] = "Dashed (variable)";
+    Text [ en-US ] = "Dashed (var)";
 };
 String RID_SVXSTR_DASH11
 {
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index e6234b638aac..8c0811fe06a5 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -760,7 +760,11 @@ IMPL_LINK(LinePropertyPanel, ChangeLineStyleHdl, ToolBox*, /* pToolBox */)
         {
             // XLINE_DASH
             const XLineStyleItem aItemA(XLINE_DASH);
-            const XLineDashItem aItemB(mpLBStyle->GetSelectEntry(), mpLineStyleList->GetDash(nPos - 2)->GetDash());
+            const XDashEntry* pDashEntry = mpLineStyleList->GetDash(nPos - 2);
+            OSL_ENSURE(pDashEntry, "OOps, got empty XDash from XDashList (!)");
+            const XLineDashItem aItemB(
+                pDashEntry ? pDashEntry->GetName() : String(),
+                pDashEntry ? pDashEntry->GetDash() : XDash());
 
             GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L);
             GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aItemB, 0L);
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index 5adb139cded9..e552016aa830 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -77,55 +77,6 @@
 #define VS_STYLE                1
 #define PB_OPTIONS              2
 
-#define IMG_LINE1           5
-#define IMG_LINE1_S         6
-#define IMG_LINE2               7
-#define IMG_LINE2_S         8
-#define IMG_LINE3           9
-#define IMG_LINE3_S         10
-#define IMG_LINE4           11
-#define IMG_LINE4_S         12
-#define IMG_LINE5               13
-#define IMG_LINE5_S         14
-#define IMG_LINE6           15
-#define IMG_LINE6_S     16
-#define IMG_LINE7           17
-#define IMG_LINE7_S         18
-#define IMG_LINE8               19
-#define IMG_LINE8_S             20
-#define IMG_LINE9           21
-#define IMG_LINE9_S         22
-#define IMG_LINE10              23
-#define IMG_LINE10_S            24
-#define IMG_LINE11          25
-#define IMG_LINE11_S            26
-
-// #define STR_STYLE_NONE_TIP       30
-#define STR_STYLE_NONE          31
-#define STR_STYLE_LINE1         32
-#define STR_STYLE_LINE2         33
-#define STR_STYLE_LINE3         34
-#define STR_STYLE_LINE4         35
-#define STR_STYLE_LINE5         36
-#define STR_STYLE_LINE6         37
-#define STR_STYLE_LINE7         38
-#define STR_STYLE_LINE8         39
-#define STR_STYLE_LINE9         40
-#define STR_STYLE_LINE10        41
-#define STR_STYLE_LINE11        42
-
-#define IMG_LINE1_H         43
-#define IMG_LINE2_H         44
-#define IMG_LINE3_H         45
-#define IMG_LINE4_H         46
-#define IMG_LINE5_H         47
-#define IMG_LINE6_H         48
-#define IMG_LINE7_H         49
-#define IMG_LINE8_H         50
-#define IMG_LINE9_H         51
-#define IMG_LINE10_H            52
-#define IMG_LINE11_H        53
-
 //width popup page
 #define VS_WIDTH        1
 #define MF_WIDTH        2
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index acf994c501b2..e4f6fdeee701 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -359,190 +359,6 @@ Control RID_POPUPPANEL_LINEPAGE_STYLE
         TabStop = TRUE;
         Text [ en-US ] = "~More Options...";
     };
-
-    String STR_STYLE_NONE
-    {
-        Text [ en-US ] = "None";
-    };
-    String STR_STYLE_LINE1
-    {
-        Text [ en-US ] = "Continuous";
-    };
-    String STR_STYLE_LINE2
-    {
-        Text [ en-US ] = "Ultrafine dashed";
-    };
-    String STR_STYLE_LINE3
-    {
-        Text [ en-US ] = "Dashed (variable)";
-    };
-    String STR_STYLE_LINE4
-    {
-        Text [ en-US ] = "Fine dashed (variable)";
-    };
-    String STR_STYLE_LINE5
-    {
-        Text [ en-US ] = "Fine dashed";
-    };
-    String STR_STYLE_LINE6
-    {
-        Text [ en-US ] = "Fine dotted";
-    };
-    String STR_STYLE_LINE7
-    {
-        Text [ en-US ] = "Ultrafine dotted (variable)";
-    };
-    String STR_STYLE_LINE8
-    {
-        Text [ en-US ] = "3 dashes 3 dots (variable)";
-    };
-    String STR_STYLE_LINE9
-    {
-        Text [ en-US ] = "2 dots 1 dash";
-    };
-    String STR_STYLE_LINE10
-    {
-        Text [ en-US ] = "Ultrafine 2 dots 3 dashes";
-    };
-    String STR_STYLE_LINE11
-    {
-        Text [ en-US ] = "Line with fine dots";
-    };
-
-    Image IMG_LINE1
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line1.png";};
-    };
-    Image IMG_LINE1_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line1_h.png";};
-    };
-    Image IMG_LINE2
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line2.png";};
-    };
-    Image IMG_LINE2_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line2_h.png";};
-    };
-    Image IMG_LINE3
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line3.png";};
-    };
-    Image IMG_LINE3_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line3_h.png";};
-    };
-    Image IMG_LINE4
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line4.png";};
-    };
-    Image IMG_LINE4_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line4_h.png";};
-    };
-    Image IMG_LINE5
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line5.png";};
-    };
-    Image IMG_LINE5_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line5_h.png";};
-    };
-    Image IMG_LINE6
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line6.png";};
-    };
-    Image IMG_LINE6_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line6_h.png";};
-    };
-    Image IMG_LINE7
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line7.png";};
-    };
-    Image IMG_LINE7_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line7_h.png";};
-    };
-    Image IMG_LINE8
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line8.png";};
-    };
-    Image IMG_LINE8_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line8_h.png";};
-    };
-    Image IMG_LINE9
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line9.png";};
-    };
-    Image IMG_LINE9_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line9_h.png";};
-    };
-    Image IMG_LINE10
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line10.png";};
-    };
-    Image IMG_LINE10_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line10_h.png";};
-    };
-    Image IMG_LINE11
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line11.png";};
-    };
-    Image IMG_LINE11_S
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line11_h.png";};
-    };
-
-    //high contrast
-    Image IMG_LINE1_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line1_hh.png";};
-    };
-    Image IMG_LINE2_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line2_hh.png";};
-    };
-    Image IMG_LINE3_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line3_hh.png";};
-    };
-    Image IMG_LINE4_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line4_hh.png";};
-    };
-    Image IMG_LINE5_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line5_hh.png";};
-    };
-    Image IMG_LINE6_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line6_hh.png";};
-    };
-    Image IMG_LINE7_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line7_hh.png";};
-    };
-    Image IMG_LINE8_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line8_hh.png";};
-    };
-    Image IMG_LINE9_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line9_hh.png";};
-    };
-    Image IMG_LINE10_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line10_hh.png";};
-    };
-    Image IMG_LINE11_H
-    {
-        ImageBitmap = Bitmap{File = "symphony/style_line11_hh.png";};
-    };
 };
 Control RID_POPUPPANEL_LINEPAGE_WIDTH
 {