diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 16:29:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 19:06:36 +0000 |
| commit | af6bce2e048a6e82754b8a73294ecd0c2780ef35 (patch) | |
| tree | d9f6bc0cc5b96b8ea8da4e1c0de7536271669a34 /svx/source | |
| parent | Extrusion depth is just a simple menu (diff) | |
| download | core-af6bce2e048a6e82754b8a73294ecd0c2780ef35.tar.gz core-af6bce2e048a6e82754b8a73294ecd0c2780ef35.zip | |
put back the images, they were visible in some configurations
I forgot that images in menus are automatically shown/hidden
depending on platform. So put these back again
Change-Id: I617fae15dbb9bd8cdfb04e2ae45fb83b4a7666fb
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 18 | ||||
| -rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.hxx | 7 |
2 files changed, 19 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 4e781c64df62..1d87466f2028 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -317,6 +317,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) , mrController( rController ) + , maImgDepth0(SVX_RES(RID_SVXIMG_DEPTH_0)) + , maImgDepth1(SVX_RES(RID_SVXIMG_DEPTH_1)) + , maImgDepth2(SVX_RES(RID_SVXIMG_DEPTH_2)) + , maImgDepth3(SVX_RES(RID_SVXIMG_DEPTH_3)) + , maImgDepth4(SVX_RES(RID_SVXIMG_DEPTH_4)) + , maImgDepthInfinity(SVX_RES(RID_SVXIMG_DEPTH_INFINITY)) , meUnit(FUNIT_NONE) , mfDepth( -1.0 ) , msExtrusionDepth( ".uno:ExtrusionDepth" ) @@ -325,12 +331,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); OUString aEmpty; - appendEntry(0, aEmpty); - appendEntry(1, aEmpty); - appendEntry(2, aEmpty); - appendEntry(3, aEmpty); - appendEntry(4, aEmpty); - appendEntry(5, SVX_RESSTR(RID_SVXSTR_INFINITY)); + appendEntry(0, aEmpty, maImgDepth0); + appendEntry(1, aEmpty, maImgDepth1); + appendEntry(2, aEmpty, maImgDepth2); + appendEntry(3, aEmpty, maImgDepth3); + appendEntry(4, aEmpty, maImgDepth4); + appendEntry(5, SVX_RESSTR(RID_SVXSTR_INFINITY), maImgDepthInfinity); appendEntry(6, SVX_RESSTR(RID_SVXSTR_CUSTOM)); SetOutputSizePixel( getMenuSize() ); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 60ef7ef8ce5e..4371153b00ea 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -89,6 +89,13 @@ class ExtrusionDepthWindow : public svtools::ToolbarMenu private: svt::ToolboxController& mrController; + Image maImgDepth0; + Image maImgDepth1; + Image maImgDepth2; + Image maImgDepth3; + Image maImgDepth4; + Image maImgDepthInfinity; + FieldUnit meUnit; double mfDepth; |