diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 16:05:03 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 19:06:35 +0000 |
commit | 974a70ccb78e36f4aecd641dfb84bcc3dd77a48d (patch) | |
tree | da9870e83770852c731f425fe63199f5150969ff /svx | |
parent | provide a route to load ToolbarMenu things via .ui (diff) | |
download | core-974a70ccb78e36f4aecd641dfb84bcc3dd77a48d.tar.gz core-974a70ccb78e36f4aecd641dfb84bcc3dd77a48d.zip |
these images never appear in the extrusion depth menu, drop them
Change-Id: If038dcd198bd9ef8c7057a549b6bf4776c28843d
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 38 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.hrc | 7 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.hxx | 12 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.src | 36 |
4 files changed, 6 insertions, 87 deletions
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 6e50dda3d948..4a8497f1b2e8 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -317,12 +317,6 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) , mrController( rController ) - , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) - , maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ) - , maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ) - , maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ) - , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) - , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) , meUnit(FUNIT_NONE) , mfDepth( -1.0 ) , msExtrusionDepth( ".uno:ExtrusionDepth" ) @@ -333,12 +327,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); OUString aEmpty; - appendEntry( 0, aEmpty, maImgDepth0 ); - appendEntry( 1, aEmpty, maImgDepth1 ); - appendEntry( 2, aEmpty, maImgDepth2 ); - appendEntry( 3, aEmpty, maImgDepth3 ); - appendEntry( 4, aEmpty, maImgDepth4 ); - appendEntry( 5, SVX_RESSTR( STR_INFINITY ), maImgDepthInfinity ); + appendEntry( 0, aEmpty ); + appendEntry( 1, aEmpty ); + appendEntry( 2, aEmpty ); + appendEntry( 3, aEmpty ); + appendEntry( 4, aEmpty ); + appendEntry( 5, SVX_RESSTR( STR_INFINITY ) ); appendEntry( 6, SVX_RESSTR( STR_CUSTOM ) ); SetOutputSizePixel( getMenuSize() ); @@ -416,26 +410,6 @@ void ExtrusionDepthWindow::statusChanged( } } - - -void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) -{ - ToolbarMenu::DataChanged( rDCEvt ); - - if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - { - setEntryImage( 0, maImgDepth0 ); - setEntryImage( 1, maImgDepth1 ); - setEntryImage( 2, maImgDepth2 ); - setEntryImage( 3, maImgDepth3 ); - setEntryImage( 4, maImgDepth4 ); - setEntryImage( 5, maImgDepthInfinity ); - } -} - - - - IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) { int nSelected = getSelectedEntryId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc index 96bf7e674a89..04b3aa6d5180 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hrc +++ b/svx/source/tbxctrls/extrusioncontrols.hrc @@ -57,13 +57,6 @@ #define IMG_DIRECTION 1 // needs 10 resource ids -#define IMG_DEPTH_0 19 -#define IMG_DEPTH_1 20 -#define IMG_DEPTH_2 21 -#define IMG_DEPTH_3 22 -#define IMG_DEPTH_4 23 -#define IMG_DEPTH_INFINITY 24 - #define IMG_PERSPECTIVE 31 #define IMG_PARALLEL 33 diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index e3b4bfa78624..60ef7ef8ce5e 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -84,20 +84,11 @@ public: using svt::PopupWindowController::createPopupWindow; }; - - 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; @@ -113,11 +104,8 @@ public: ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - - class ExtrusionDepthController : public svt::PopupWindowController { public: diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index cb7afff74e17..87e666feb642 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -160,42 +160,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH { Text [ en-US ] = "~Infinity"; }; - - Image IMG_DEPTH_0 - { - ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; }; - MASKCOLOR - }; - - Image IMG_DEPTH_1 - { - ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; }; - MASKCOLOR - }; - - Image IMG_DEPTH_2 - { - ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; }; - MASKCOLOR - }; - - Image IMG_DEPTH_3 - { - ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; }; - MASKCOLOR - }; - - Image IMG_DEPTH_4 - { - ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; }; - MASKCOLOR - }; - - Image IMG_DEPTH_INFINITY - { - ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; }; - MASKCOLOR - }; }; DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING |