diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-14 17:24:23 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-15 01:26:23 +0300 |
| commit | a3050f632517137f809d76662170726b518f043a (patch) | |
| tree | 8c495db0069afe7612091edb2b95be8e8f4a525a /svx | |
| parent | d311b65f277cce83557dd59f95e9295bc7781cee (diff) | |
Convert filters button to the generic controller
Change-Id: I6d3c76c0aafe0ad77b597a2cb8331e6f8219e2d2
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 26 |
2 files changed, 1 insertions, 27 deletions
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 51072b6cb437..fe52a8c12291 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5561,7 +5561,7 @@ SfxVoidItem GraphicFilterSolarize SID_GRFFILTER_SOLARIZE ] -TbxImageItem GraphicFilterToolbox SID_GRFFILTER +SfxVoidItem GraphicFilterToolbox SID_GRFFILTER [ /* flags: */ diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 1b6a4f2563a1..6f434e6834ce 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -423,32 +423,6 @@ void ImplGrafModeControl::Update( const SfxPoolItem* pItem ) SetNoSelection(); } -SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem ); - -SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : - SfxToolBoxControl( nSlotId, nId, rTbx ) -{ - rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) ); - rTbx.Invalidate(); -} - -SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl() -{ -} - -void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) -{ - GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) ); -} - -VclPtr<SfxPopupWindow> SvxGrafFilterToolBoxControl::CreatePopupWindow() -{ - OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); - createAndPositionSubToolBar( aSubTbxResName ); - - return NULL; -} - SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) : SfxToolBoxControl( nSlotId, nId, rTbx ) { |