loplugin:mergeclasses SdrItemBrowser

Change-Id: I90c6006be05f182fd442ce8d3641f4f17cdb6793

1 files changed, 8 insertions, 17 deletions

diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index ff0bee4f3278..c64a5e26708c 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -94,37 +94,28 @@ public:
     void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink)        { aSetDirtyHdl=rLink; }
 };
 
-#define WB_STDSIZEABLEDOCKWIN  (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
-#define WB_STDSIZEABLEFLOATWIN (WB_STDFLOATWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
-
-class SdrItemBrowserWindow: public FloatingWindow {
-    VclPtr<SdrItemBrowserControl> aBrowse;
-public:
-    SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN);
-    virtual ~SdrItemBrowserWindow();
-    virtual void dispose() override;
-    virtual void Resize() override;
-    virtual void GetFocus() override;
-    void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr) { aBrowse->SetAttributes(pAttr,p2ndSet); }
-    SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
-};
-
 class SdrView;
 
-class SdrItemBrowser: public SdrItemBrowserWindow {
+class SdrItemBrowser: public FloatingWindow {
+    VclPtr<SdrItemBrowserControl> aBrowse;
     Idle aIdle;
     SdrView* pView;
     bool bDirty;
-private:
     static vcl::Window* ImpGetViewWin(SdrView& rView);
     DECL_LINK_TYPED(IdleHdl, Idle *, void);
     DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void);
     DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void);
 public:
     SdrItemBrowser(SdrView& rView);
+    virtual ~SdrItemBrowser();
     void ForceParent();
     void SetDirty();
     void Undirty();
+    virtual void dispose() override;
+    virtual void Resize() override;
+    virtual void GetFocus() override;
+    void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr) { aBrowse->SetAttributes(pAttr,p2ndSet); }
+    SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
 };
 
 #endif // INCLUDED_SVX_INC_SVDIBROW_HXX