Basic IDE: Docking property browser under object catalog

Now the property browser can be docked in the same way as all other
dialogs in the Basic IDE and the Dialog Editor.
The property browser (PropBrw, for which PropertyBrowser would be a
better and easier-to-remember name IMO) is derived from
basctl::DockingWindow instead of SfxDockingWindow. PropBrwMgr was
removed (it seemed to be only a wrapper), and PropBrw is now a data
member of DialogWindowLayout (aPropertyBrowser).

Change-Id: I06737a5cbc985888432630714cb919d1bbbcbb49
Reviewed-on: https://gerrit.libreoffice.org/518
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

1 files changed, 6 insertions, 24 deletions

diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index ccf2a9ad4768..a3bbad99b862 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -22,33 +22,21 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/stl_types.hxx>
-#include <sfx2/basedlgs.hxx>
-#include <sfx2/dockwin.hxx>
 #include <svl/lstner.hxx>
+#include <svl/brdcst.hxx>
 #include <svx/svdmark.hxx>
+#include "bastypes.hxx"
 
 class SfxBindings;
 class SdrView;
+class SfxViewShell;
 
 namespace basctl
 {
 
-//============================================================================
-// PropBrwMgr
-//============================================================================
+class Layout;
 
-class PropBrwMgr : public SfxChildWindow
-{
-public:
-    PropBrwMgr(Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo);
-    SFX_DECL_CHILDWINDOW(PropBrwMgr);
-};
-
-//============================================================================
-// PropBrw
-//============================================================================
-
-class PropBrw : public SfxDockingWindow , public SfxListener, public SfxBroadcaster
+class PropBrw : public DockingWindow, public SfxListener, public SfxBroadcaster
 {
 private:
     bool        m_bInitialStateChange;
@@ -67,7 +55,6 @@ private:
 protected:
     SdrView*        pView;
     virtual void Resize();
-    virtual void FillInfo( SfxChildWinInfo& rInfo ) const;
     virtual sal_Bool Close();
 
     DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, InterfaceArray);
@@ -84,12 +71,7 @@ protected:
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject);
 
 public:
-    PropBrw( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB,
-             SfxBindings *pBindings,
-             PropBrwMgr* pMgr,
-             Window* pParent,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument
-    );
+    explicit PropBrw (Layout&);
     virtual ~PropBrw();
     using Window::Update;
     // note: changing the Context document to an instance other than the one given in the ctor is not supported