diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-04 14:56:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-04 15:07:36 +0100 |
| commit | 35c31f5f4017fac3a3ea37ee1b3e7cf6b60c53c6 (patch) | |
| tree | cc7497f31a4c11432a4110b601093f9c01d9c5d4 /svx/source/sidebar/line | |
| parent | 8fd0320e8a890b559ec7c0b498c17e87a1a38ea5 (diff) | |
convert document recovery dialog to .ui
and move sidebar global resource defines up to the toplevel so its harder to
collide with them and adjust the define to indicate the next free resource
id.
and simplify the dialog down a good bit and remove intermediate classes
etc.
Change-Id: I8d6db17fcdfc86457368d7f432bd96f6f3aa182d
Diffstat (limited to 'svx/source/sidebar/line')
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.hrc | 12 | ||||
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.src | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index e59b992cbf96..eaa79bbe118e 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -178,7 +178,7 @@ LinePropertyPanel::LinePropertyPanel( mpEndItem(0), maColorPopup(this, ::boost::bind(&LinePropertyPanel::CreateColorPopupControl, this, _1)), maLineWidthPopup(this, ::boost::bind(&LinePropertyPanel::CreateLineWidthPopupControl, this, _1)), - maIMGColor(SVX_RES(IMG_COLOR)), + maIMGColor(SVX_RES(IMG_LINE_COLOR)), maIMGNone(SVX_RES(IMG_NONE_ICON)), mpIMGWidthIcon(), mxFrame(rxFrame), diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc index bff5bb9cbfb3..636c412cc9f3 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hrc +++ b/svx/source/sidebar/line/LinePropertyPanel.hrc @@ -25,18 +25,6 @@ #define STR_QH_TB_WIDTH 15 #define STR_QH_TB_COLOR 16 -#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 e5f4b7c4af43..c13dfa793524 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.src +++ b/svx/source/sidebar/line/LinePropertyPanel.src @@ -25,7 +25,7 @@ #define TOOLBOX_HEIGHT 14 #define LISTBOX_HEIGHT 99 -Image IMG_COLOR +Image IMG_LINE_COLOR { ImageBitmap = Bitmap{File = "symphony/Line_color.png";}; }; |