loplugin:mergeclasses SdrItemBrowser

Change-Id: I90c6006be05f182fd442ce8d3641f4f17cdb6793

1 files changed, 14 insertions, 22 deletions

diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 2826441b2fbb..45ab770115ac 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1037,51 +1037,43 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS
     SetMode(MYBROWSEMODE);
 }
 
-// - SdrItemBrowserWindow -
-
-SdrItemBrowserWindow::SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits):
-    FloatingWindow(pParent,nBits),
-    aBrowse(VclPtr<SdrItemBrowserControl>::Create(this))
+SdrItemBrowser::SdrItemBrowser(SdrView& rView):
+    FloatingWindow(ImpGetViewWin(rView), WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE),
+    aBrowse(VclPtr<SdrItemBrowserControl>::Create(this)),
+    aIdle("svx svdraw SdrItemBrowser"),
+    pView(&rView),
+    bDirty(false)
 {
     SetOutputSizePixel(aBrowse->GetSizePixel());
     SetText("Joe's ItemBrowser");
     aBrowse->Show();
+    aIdle.SetIdleHdl(LINK(this,SdrItemBrowser,IdleHdl));
+    GetBrowserControl()->SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
+    GetBrowserControl()->SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl));
+    SetDirty();
 }
 
-SdrItemBrowserWindow::~SdrItemBrowserWindow()
+SdrItemBrowser::~SdrItemBrowser()
 {
     disposeOnce();
 }
 
-void SdrItemBrowserWindow::dispose()
+void SdrItemBrowser::dispose()
 {
     aBrowse.disposeAndClear();
     FloatingWindow::dispose();
 }
 
-void SdrItemBrowserWindow::Resize()
+void SdrItemBrowser::Resize()
 {
     aBrowse->SetSizePixel(GetOutputSizePixel());
 }
 
-void SdrItemBrowserWindow::GetFocus()
+void SdrItemBrowser::GetFocus()
 {
     aBrowse->GrabFocus();
 }
 
-
-SdrItemBrowser::SdrItemBrowser(SdrView& rView):
-    SdrItemBrowserWindow(ImpGetViewWin(rView)),
-    aIdle("svx svdraw SdrItemBrowser"),
-    pView(&rView),
-    bDirty(false)
-{
-    aIdle.SetIdleHdl(LINK(this,SdrItemBrowser,IdleHdl));
-    GetBrowserControl()->SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
-    GetBrowserControl()->SetSetDirtyHdl(LINK(this,SdrItemBrowser,SetDirtyHdl));
-    SetDirty();
-}
-
 vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView)
 {
     const sal_uInt32 nWinCount(rView.PaintWindowCount());