[Libreoffice-commits] .: basctl/source

[Noel Power]

 basctl/source/dlged/propbrw.cxx |    8 ++++----
 basctl/source/inc/propbrw.hxx   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f24cd7aadcd2eae3598f084804acb43c74835210
Author: Noel Power <noel.power at novell.com>
Date:   Wed Aug 8 09:40:47 2012 +0100

    make property browser dockable in basic IDE
    
    very basic support for this, basicially you can dock the browser anywhere now
    hence lots of behaviour niggles remain, e.g
    1) it probably doesn't make sense to be able to dock the browser into top or bottom quadrants ( we need to implement the Docking ( maybe PrepareToggleFloating mode ) method(s) in PropBrw ( propbrw.cxx )
    2) open floating or not ( if propertybrowswer is open )
    3) should we leave the 'properties' context menu when selecting shapes in place or not
    4) switching between Module and Dialog tabs, we probably should 'remember' docked position and state
    
    Change-Id: Ibea4be3397eeac613642934662c3a9868fdf783b

diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 3af451b..0c976ba 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -62,7 +62,7 @@ PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
         );
 
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-    ((SfxFloatingWindow*)pWindow)->Initialize( pInfo );
+    ((SfxDockingWindow*)pWindow)->Initialize( pInfo );
 
     ((PropBrw*)pWindow)->Update( pShell );
 }
@@ -100,7 +100,7 @@ DBG_NAME(PropBrw)
 
 PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _pBindings, PropBrwMgr* _pMgr, Window* _pParent,
             const Reference< XModel >& _rxContextDocument )
-    :SfxFloatingWindow( _pBindings, _pMgr, _pParent, WinBits( WB_STDMODELESS | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE ) )
+    :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits( WB_DOCKABLE | WB_STDMODELESS | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE ) )
     ,m_bInitialStateChange(true)
     ,m_xORB(_xORB)
     ,m_xContextDocument( _rxContextDocument )
@@ -257,7 +257,7 @@ sal_Bool PropBrw::Close()
     if( IsRollUp() )
         RollDown();
 
-    return SfxFloatingWindow::Close();
+    return SfxDockingWindow::Close();
 }
 
 
@@ -455,7 +455,7 @@ void PropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 
 void PropBrw::Resize()
 {
-    SfxFloatingWindow::Resize();
+    SfxDockingWindow::Resize();
 
     // adjust size
     Size aSize_ = GetOutputSizePixel();
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 87c2e6c..0e7c2fc 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/stl_types.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <sfx2/childwin.hxx>
+#include <sfx2/dockwin.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svdmark.hxx>
 
@@ -45,7 +45,7 @@ public:
 class SfxBindings;
 class SdrView;
 
-class PropBrw : public SfxFloatingWindow , public SfxListener, public SfxBroadcaster
+class PropBrw : public SfxDockingWindow , public SfxListener, public SfxBroadcaster
 {
 private:
     bool        m_bInitialStateChange;