summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx6
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx14
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx39
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx13
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx8
8 files changed, 59 insertions, 45 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 0f01291e38bc..76b3bd0ee867 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: brwctrlr.cxx,v $
*
- * $Revision: 1.49 $
+ * $Revision: 1.50 $
*
- * last change: $Author: fs $ $Date: 2001-08-16 10:59:42 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:41:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2373,7 +2373,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
}
catch(Exception&)
{
- DBG_WARNING("SbaXDataBrowserController::Construct : something went wrong while creating the parser !");
+ DBG_WARNING("SbaXDataBrowserController::LoadFinished: something went wrong while creating the parser !");
m_xParser = NULL;
// no further handling, we ignore the error
}
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index dec0b49bfb09..e14c68f52233 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: brwview.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:40:00 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:41:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -120,7 +120,11 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont
{
try
{
- ODataView::Construct(xModel);
+ ODataView::Construct();
+
+ // our UNO representation
+ m_xMe = VCLUnoHelper::CreateControlContainer(this);
+
// create the (UNO-) control
m_xGrid = new SbaXGridControl(getORB());
DBG_ASSERT(m_xGrid.is(), "UnoDataBrowserView::Construct : could not create a grid control !");
@@ -172,7 +176,9 @@ UnoDataBrowserView::~UnoDataBrowserView()
delete m_pStatus;
m_pStatus = NULL;
}
+
::comphelper::disposeComponent(m_xGrid);
+ ::comphelper::disposeComponent(m_xMe);
}
// -----------------------------------------------------------------------------
IMPL_LINK( UnoDataBrowserView, SplitHdl, void*, p )
@@ -228,7 +234,7 @@ void UnoDataBrowserView::hideStatus()
}
// -------------------------------------------------------------------------
-void UnoDataBrowserView::resizeControl(Rectangle& _rPlayground)
+void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
{
Point aSplitPos;
Size aSplitSize;
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index a3f2b45f9dfa..3150d1fcb215 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dataview.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hr $ $Date: 2001-08-16 14:22:02 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:41:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -122,21 +122,12 @@ namespace dbaui
{
DBG_CTOR(ODataView,NULL);
}
+
// -------------------------------------------------------------------------
- void ODataView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
+ void ODataView::Construct()
{
- try
- {
- // our UNO representation
- m_xMe = VCLUnoHelper::CreateControlContainer(this);
- DBG_ASSERT(m_xMe.is(), "ODataView::Construct : no UNO representation");
- }
- catch(Exception&)
- {
- ::comphelper::disposeComponent(m_xMe);
- throw;
- }
}
+
// -------------------------------------------------------------------------
ODataView::~ODataView()
{
@@ -144,7 +135,6 @@ namespace dbaui
enableSeparator( sal_False );
- ::comphelper::disposeComponent(m_xMe);
DBG_DTOR(ODataView,NULL);
}
@@ -189,7 +179,7 @@ namespace dbaui
Resize();
}
// -------------------------------------------------------------------------
- void ODataView::resizeControl( Rectangle& _rPlayground )
+ void ODataView::resizeDocumentView( Rectangle& _rPlayground )
{
}
@@ -208,11 +198,11 @@ namespace dbaui
}
// -------------------------------------------------------------------------
- void ODataView::Resize()
+ void ODataView::resizeAll( const Rectangle& _rPlayground )
{
- Window::Resize();
- Rectangle aPlayground( Point(0, 0), GetOutputSizePixel() );
+ Rectangle aPlayground( _rPlayground );
+ // position thew separator
if ( m_pSeparator )
{
Size aSeparatorSize = Size( aPlayground.GetWidth(), 2 );
@@ -222,6 +212,7 @@ namespace dbaui
aPlayground.Top() += aSeparatorSize.Height() + 1;
}
+ // position the tool box
if ( m_pToolBox )
{
m_pToolBox->SetPosPixel( aPlayground.TopLeft() );
@@ -232,7 +223,15 @@ namespace dbaui
aPlayground.Top() += aToolboxSize.Height();
}
- resizeControl( aPlayground );
+ // position the controls of the document's view
+ resizeDocumentView( aPlayground );
+ }
+
+ // -------------------------------------------------------------------------
+ void ODataView::Resize()
+ {
+ Window::Resize();
+ resizeAll( Rectangle( Point( 0, 0), GetSizePixel() ) );
}
//.........................................................................
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 637517b4606d..1ababccd46bb 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: genericcontroller.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: fs $ $Date: 2001-08-16 10:39:41 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:41:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -167,7 +167,14 @@ OGenericUnoController::OGenericUnoController(const Reference< ::com::sun::star::
// -----------------------------------------------------------------------------
sal_Bool OGenericUnoController::Construct(Window* pParent)
{
- OSL_ENSURE(m_pView,"the view is NULL!");
+ OSL_ENSURE( getView(), "the view is NULL!" );
+
+ if ( getView() )
+ {
+ getView()->Construct();
+ getView()->Show();
+ }
+
// want to have a toolbox ?
ToolBox* pTB = CreateToolBox(getView());
getView()->setToolBox(pTB);
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 1b87501aa04a..dd2c1f9f3131 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RelationController.cxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:43:04 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:46:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -447,8 +447,8 @@ sal_Bool ORelationController::Construct(Window* pParent)
{
m_pView = new ORelationDesignView(pParent,this,m_xMultiServiceFacatory);
OJoinController::Construct(pParent);
- m_pView->Construct(NULL);
- m_pView->Show();
+// m_pView->Construct();
+// m_pView->Show();
return sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 5f28e4104a4f..2ce5db8adb04 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RelationDesignView.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-06-28 14:24:04 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:46:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -145,10 +145,10 @@ ORelationDesignView::~ORelationDesignView()
DBG_DTOR(ORelationDesignView,NULL);
}
// -------------------------------------------------------------------------
-void ORelationDesignView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
+void ORelationDesignView::Construct()
{
m_pTableView = new ORelationTableView(m_pScrollWindow,this);
- OJoinDesignView::Construct(xModel); // initialize m_xMe
+ OJoinDesignView::Construct();
}
// -----------------------------------------------------------------------------
void ORelationDesignView::initialize()
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index d42ccdefb9ca..673fabce41e3 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: TableController.cxx,v $
*
- * $Revision: 1.50 $
+ * $Revision: 1.51 $
*
- * last change: $Author: fs $ $Date: 2001-08-14 12:03:52 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:44:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -738,8 +738,8 @@ sal_Bool OTableController::Construct(Window* pParent)
{
m_pView = new OTableDesignView(pParent,m_xMultiServiceFacatory,this);
OTableController_BASE::Construct(pParent);
- m_pView->Construct(NULL);
- m_pView->Show();
+// m_pView->Construct();
+// m_pView->Show();
return sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 9b3dff491905..24f4eab5b2c2 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: TableDesignView.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:43:46 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:44:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -137,7 +137,9 @@ OTableBorderWindow::~OTableBorderWindow()
m_pFieldDescWin->Hide();
delete m_pEditorCtrl;
+ m_pEditorCtrl = NULL;
delete m_pFieldDescWin;
+ m_pFieldDescWin = NULL;
}
// -----------------------------------------------------------------------------
void OTableBorderWindow::Resize()
@@ -288,7 +290,7 @@ void OTableDesignView::initialize()
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-void OTableDesignView::resizeControl(Rectangle& _rPlayground)
+void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground)
{
m_pWin->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() );
generated by cgit (git 2.34.1) at 2025-05-19 04:23:27 +0000