From 83c00b33594a59157ed483eb11c3c5022c978939 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 4 Oct 2017 15:31:35 +0200 Subject: loplugin:mergerclass merge FillAttrLB with SvxFillAttrBox Change-Id: I5dfa7689eb219548bde7ce181a0a453c84b0f066 Reviewed-on: https://gerrit.libreoffice.org/43136 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/svx/dlgctrl.hxx | 16 ---------------- include/svx/itemwin.hxx | 9 ++++++--- 2 files changed, 6 insertions(+), 19 deletions(-) (limited to 'include') diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 0f2bc33f0e18..13387f123317 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -229,22 +229,6 @@ public: /************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC FillAttrLB : public ListBox -{ -private: - BitmapEx maBitmapEx; - -public: - FillAttrLB( vcl::Window* pParent, WinBits aWB ); - - void Fill( const XHatchListRef &pList ); - void Fill( const XGradientListRef &pList ); - void Fill( const XBitmapListRef &pList ); - void Fill( const XPatternListRef &pList ); -}; - -/************************************************************************/ - class SAL_WARN_UNUSED SVX_DLLPUBLIC FillTypeLB : public ListBox { diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index d0dd8826bc3e..e82c3ca944b9 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -108,19 +108,22 @@ private: static void ReleaseFocus_Impl(); }; -// class SvxFillAttrBox -------------------------------------------------- - -class SVX_DLLPUBLIC SvxFillAttrBox : public FillAttrLB +class SVX_DLLPUBLIC SvxFillAttrBox : public ListBox { public: SvxFillAttrBox( vcl::Window* pParent ); + void Fill( const XHatchListRef &pList ); + void Fill( const XGradientListRef &pList ); + void Fill( const XBitmapListRef &pList ); + void Fill( const XPatternListRef &pList ); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: sal_uInt16 nCurPos; + BitmapEx maBitmapEx; static void ReleaseFocus_Impl(); }; -- cgit