undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will

be derived from) and the still-so-named OSingleDocumentController.
Module reportdesign does not compile with this change, this is yet to come.

1 files changed, 6 insertions, 33 deletions

diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 382aac477727..8112250ad23e 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -44,9 +44,6 @@
 #ifndef _SFXIMGMGR_HXX
 #include <sfx2/imgmgr.hxx>
 #endif
-#ifndef _SV_FIXED_HXX
-#include <vcl/fixed.hxx>
-#endif
 #ifndef DBAUI_ICONTROLLER_HXX
 #include "IController.hxx"
 #endif
@@ -103,11 +100,12 @@ namespace dbaui
         :Window(pParent,nStyle)
         ,m_xServiceFactory(_rFactory)
         ,m_rController( _rController )
-        ,m_pSeparator( NULL )
+        ,m_aSeparator( this )
     {
         DBG_CTOR(ODataView,NULL);
         m_rController.acquire();
         m_pAccel.reset(::svt::AcceleratorExecute::createAcceleratorHelper());
+        m_aSeparator.Show();
     }
 
     // -------------------------------------------------------------------------
@@ -120,30 +118,10 @@ namespace dbaui
     {
         DBG_DTOR(ODataView,NULL);
 
-        enableSeparator( sal_False );
         m_rController.release();
     }
 
     // -------------------------------------------------------------------------
-    void ODataView::enableSeparator( const sal_Bool _bEnable )
-    {
-        if ( _bEnable == isSeparatorEnabled() )
-            // nothing to do
-            return;
-
-        if ( _bEnable )
-        {
-            m_pSeparator = new FixedLine( this );
-            m_pSeparator->Show( );
-        }
-        else
-        {
-            ::std::auto_ptr<FixedLine> aTemp(m_pSeparator);
-            m_pSeparator = NULL;
-        }
-        Resize();
-    }
-    // -------------------------------------------------------------------------
     void ODataView::resizeDocumentView( Rectangle& /*_rPlayground*/ )
     {
     }
@@ -167,15 +145,10 @@ namespace dbaui
     {
         Rectangle aPlayground( _rPlayground );
 
-        // position thew separator
-        if ( m_pSeparator )
-        {
-            Size aSeparatorSize = Size( aPlayground.GetWidth(), 2 );
-
-            m_pSeparator->SetPosSizePixel( aPlayground.TopLeft(), aSeparatorSize );
-
-            aPlayground.Top() += aSeparatorSize.Height() + 1;
-        }
+        // position the separator
+        const Size aSeparatorSize = Size( aPlayground.GetWidth(), 2 );
+        m_aSeparator.SetPosSizePixel( aPlayground.TopLeft(), aSeparatorSize );
+        aPlayground.Top() += aSeparatorSize.Height() + 1;
 
         // position the controls of the document's view
         resizeDocumentView( aPlayground );