diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-04-22 09:37:11 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-22 10:00:53 +0100 |
commit | 95c04e218782cb198f7851a1d9536058f98cff2a (patch) | |
tree | f4b1b5475ab7e1af6c921070d79a55f8f47a0811 /include/svx/bmpmask.hxx | |
parent | dd7778a76915685d9b334e1f0718f556f6309687 (diff) |
SfxControllerItems shouldn't be SAL_WARN_UNUSED
unwind some removals and some other cleanup
Change-Id: I81a734ed07a05a5922c31003928c493c2df1652f
Diffstat (limited to 'include/svx/bmpmask.hxx')
-rw-r--r-- | include/svx/bmpmask.hxx | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 28736c92b88b..5efdd861b2ba 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -31,6 +31,27 @@ /************************************************************************* |* +|* class SvxBmpMaskSelectItem +|* +\************************************************************************/ +class SvxBmpMask; + +class SvxBmpMaskSelectItem : public SfxControllerItem +{ +private: + SvxBmpMask &rBmpMask; + +protected: + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState ) SAL_OVERRIDE; + +public: + SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask, + SfxBindings& rBindings ); +}; + +/************************************************************************* +|* |* Derivative from SfxChildWindow as 'container' for Float |* \************************************************************************/ @@ -90,11 +111,10 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBmpMask : public SfxDockingWindow XColorListRef pColLst; Color aPipetteColor; + SvxBmpMaskSelectItem aSelItem; virtual bool Close() SAL_OVERRIDE; -#ifdef BMPMASK_PRIVATE - sal_uInt16 InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols ); @@ -111,8 +131,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBmpMask : public SfxDockingWindow GDIMetaFile ImpReplaceTransparency( const GDIMetaFile& rMtf, const Color& rColor ); -#endif // BMPMASK_PRIVATE - public: SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent); @@ -124,6 +142,8 @@ public: bool NeedsColorList() const; void SetColorList( const XColorListRef &pColorList ); + void SetExecState( bool bEnable ); + Graphic Mask( const Graphic& rGraphic ); bool IsEyedropping() const; |