summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-04-11 13:11:46 +0000
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 11:33:12 +0100
commit05038d1bd0a7bc9ecb6676ba1309576ac74f849f (patch)
treecdb6b1d7aa01aed83a2222947e14dfc683a6fe86
parentaa8c54950bc005b83a47fbe184291e84b0cbd09a (diff)
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit f8f9cb1148f70f61f486517a1f353c4a3de8211f) Conflicts: svx/inc/svx/xtable.hxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.hrc svx/source/sidebar/line/LinePropertyPanel.src Change-Id: Ie49b28503e092c6685fb02c00820d4a3eaa3abb6
-rw-r--r--include/svx/xtable.hxx18
-rw-r--r--svx/source/dialog/dlgctrl.cxx4
-rw-r--r--svx/source/dialog/sdstring.src22
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx6
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hrc26
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.src94
6 files changed, 27 insertions, 143 deletions
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 32c4619dd2c2..4ceca46904da 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -66,8 +66,8 @@ public:
, aColor(rColor)
{}
- void SetColor(const Color& rColor) { aColor = rColor; }
- Color& GetColor() { return aColor; }
+ void SetColor(const Color& rColor) { aColor = rColor; }
+ const Color& GetColor() const { return aColor; }
};
// --------------------
@@ -89,7 +89,7 @@ public:
aB2DPolyPolygon = rB2DPolyPolygon;
}
- basegfx::B2DPolyPolygon& GetLineEnd()
+ const basegfx::B2DPolyPolygon& GetLineEnd() const
{
return aB2DPolyPolygon;
}
@@ -107,8 +107,8 @@ public:
XDashEntry(const XDash& rDash, const String& rName) :
XPropertyEntry(rName), aDash(rDash) {}
- void SetDash(const XDash& rDash) { aDash = rDash; }
- XDash& GetDash() { return aDash; }
+ void SetDash(const XDash& rDash) { aDash = rDash; }
+ const XDash& GetDash() const { return aDash; }
};
// ------------------
@@ -123,8 +123,8 @@ public:
XHatchEntry(const XHatch& rHatch, const String& rName) :
XPropertyEntry(rName), aHatch(rHatch) {}
- void SetHatch(const XHatch& rHatch) { aHatch = rHatch; }
- XHatch& GetHatch() { return aHatch; }
+ void SetHatch(const XHatch& rHatch) { aHatch = rHatch; }
+ const XHatch& GetHatch() const { return aHatch; }
};
// ---------------------
@@ -139,8 +139,8 @@ public:
XGradientEntry(const XGradient& rGradient, const String& rName):
XPropertyEntry(rName), aGradient(rGradient) {}
- 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 72f98cc363cc..c12dc7f551b4 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1019,7 +1019,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(),
@@ -1157,7 +1157,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 08cf55078efe..401d6f371b57 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1532,47 +1532,47 @@ String RID_SVXSTR_DASH12_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 74fdb7afbd83..8172091608ee 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -742,7 +742,11 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl)
{
// XLINE_DASH
const XLineStyleItem aItemA(XLINE_DASH);
- const XLineDashItem aItemB(mpLBStyle->GetSelectEntry(), mxLineStyleList->GetDash(nPos - 2)->GetDash());
+ const XDashEntry* pDashEntry = mxLineStyleList->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 81c9e319bb10..740741cdf9ae 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -64,32 +64,6 @@
#define VS_STYLE 1
#define PB_OPTIONS 2
-#define IMG_LINE1 5
-#define IMG_LINE2 7
-#define IMG_LINE3 9
-#define IMG_LINE4 11
-#define IMG_LINE5 13
-#define IMG_LINE6 15
-#define IMG_LINE7 17
-#define IMG_LINE8 19
-#define IMG_LINE9 21
-#define IMG_LINE10 23
-#define IMG_LINE11 25
-
-// #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
-
//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 049c9ad0df2c..7adc42f7441c 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -321,100 +321,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_LINE2
- {
- ImageBitmap = Bitmap{File = "symphony/style_line2.png";};
- };
- Image IMG_LINE3
- {
- ImageBitmap = Bitmap{File = "symphony/style_line3.png";};
- };
- Image IMG_LINE4
- {
- ImageBitmap = Bitmap{File = "symphony/style_line4.png";};
- };
- Image IMG_LINE5
- {
- ImageBitmap = Bitmap{File = "symphony/style_line5.png";};
- };
- Image IMG_LINE6
- {
- ImageBitmap = Bitmap{File = "symphony/style_line6.png";};
- };
- Image IMG_LINE7
- {
- ImageBitmap = Bitmap{File = "symphony/style_line7.png";};
- };
- Image IMG_LINE8
- {
- ImageBitmap = Bitmap{File = "symphony/style_line8.png";};
- };
- Image IMG_LINE9
- {
- ImageBitmap = Bitmap{File = "symphony/style_line9.png";};
- };
- Image IMG_LINE10
- {
- ImageBitmap = Bitmap{File = "symphony/style_line10.png";};
- };
- Image IMG_LINE11
- {
- ImageBitmap = Bitmap{File = "symphony/style_line11.png";};
- };
};
Control RID_POPUPPANEL_LINEPAGE_WIDTH
{