summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx7
-rw-r--r--dbaccess/source/ui/querydesign/JoinExchange.cxx7
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx7
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx24
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx16
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx7
6 files changed, 54 insertions, 14 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index e1c1639f884d..2f2fe9827dfd 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinController.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: fs $ $Date: 2001-08-14 12:05:21 $
+ * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -179,16 +179,19 @@ using namespace ::dbtools;
using namespace ::dbaui;
using namespace ::comphelper;
+DBG_NAME(OJoinController);
// -----------------------------------------------------------------------------
OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM) : OJoinController_BASE(_rM)
,m_bEditable(sal_True)
,m_bModified(sal_False)
,m_pAddTabDlg(NULL)
{
+ DBG_CTOR(OJoinController,NULL);
}
// -----------------------------------------------------------------------------
OJoinController::~OJoinController()
{
+ DBG_DTOR(OJoinController,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 08d480334b12..54eb77903714 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinExchange.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: hr $ $Date: 2001-08-14 14:51:05 $
+ * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,17 +85,20 @@ namespace dbaui
//==================================================================
// class OJoinExchObj
//==================================================================
+ DBG_NAME(OJoinExchObj);
//------------------------------------------------------------------------
OJoinExchObj::OJoinExchObj(const OJoinExchangeData& jxdSource)
:m_jxdSourceDescription(jxdSource)
,m_pDragListener(NULL)
{
+ DBG_CTOR(OJoinExchObj,NULL);
// Verfuegbare Typen in Liste einfuegen
}
//------------------------------------------------------------------------
OJoinExchObj::~OJoinExchObj()
{
+ DBG_DTOR(OJoinExchObj,NULL);
}
//------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index e48a234f0c55..20752a09147c 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinTableView.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: oj $ $Date: 2001-08-09 09:59:51 $
+ * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -123,12 +123,14 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
const long LINE_SIZE = 50;
+DBG_NAME(OScrollWindowHelper);
OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
,m_aHScrollBar( this, WB_HSCROLL|WB_REPEAT|WB_DRAG )
,m_aVScrollBar( this, WB_VSCROLL|WB_REPEAT|WB_DRAG )
,m_pTableView(NULL)
,m_pCornerWindow(new ScrollBarBox(this, WB_3DLOOK))
{
+ DBG_CTOR(OScrollWindowHelper,NULL);
//////////////////////////////////////////////////////////////////////
// ScrollBars
@@ -147,6 +149,7 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
OScrollWindowHelper::~OScrollWindowHelper()
{
delete m_pCornerWindow;
+ DBG_DTOR(OScrollWindowHelper,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 078ddfab9ad6..873615c92e6a 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: QueryTextView.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: oj $ $Date: 2001-08-15 11:15:33 $
+ * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -107,11 +107,13 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
// temporary class
+DBG_NAME(OQueryContainerWindow);
OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory)
: Window(pParent)
,m_pBeamer(NULL)
,m_pView(NULL)
{
+ DBG_CTOR(OQueryContainerWindow,NULL);
m_pView = new OQueryViewSwitch(this,_pController,_rFactory);
m_pSplitter = new Splitter(this,WB_VSCROLL);
@@ -132,6 +134,7 @@ OQueryContainerWindow::~OQueryContainerWindow()
delete m_pBeamer;
delete m_pSplitter;
delete m_pView;
+ DBG_DTOR(OQueryContainerWindow,NULL);
}
// -----------------------------------------------------------------------------
void OQueryContainerWindow::switchView()
@@ -139,6 +142,11 @@ void OQueryContainerWindow::switchView()
m_pView->switchView();
}
// -----------------------------------------------------------------------------
+void OQueryContainerWindow::GetFocus()
+{
+ m_pView->GetFocus();
+}
+// -----------------------------------------------------------------------------
IMPL_LINK( OQueryContainerWindow, SplitHdl, void*, p )
{
long nTest = m_pSplitter->GetPosPixel().Y();
@@ -246,26 +254,36 @@ void OQueryContainerWindow::showPreview(const Reference<XFrame>& _xFrame)
// end of temp classes
// -------------------------------------------------------------------------
+DBG_NAME(OQueryTextView);
OQueryTextView::OQueryTextView(Window* _pParent,ToolBox* _pToolBox)
:Window(_pParent)
,m_pToolBox(_pToolBox)
{
+ DBG_CTOR(OQueryTextView,NULL);
m_pEdit = new OSqlEdit(this);
m_pEdit->ClearModifyFlag();
m_pEdit->SaveValue();
m_pEdit->Show();
- m_pEdit->GrabFocus();
+ // m_pEdit->GrabFocus();
}
// -----------------------------------------------------------------------------
OQueryTextView::~OQueryTextView()
{
m_pToolBox = NULL;
delete m_pEdit;
+ DBG_DTOR(OQueryTextView,NULL);
}
// -------------------------------------------------------------------------
void OQueryTextView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
{
}
+// -----------------------------------------------------------------------------
+void OQueryTextView::GetFocus()
+{
+ OSL_ENSURE(m_pEdit,"Edit is null");
+ if(m_pEdit)
+ m_pEdit->GrabFocus();
+}
// -------------------------------------------------------------------------
void OQueryTextView::Resize()
{
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 3dc80c67bbea..132e1d9b4dd2 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: QueryViewSwitch.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-04-18 13:16:33 $
+ * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,10 +94,11 @@ using namespace dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-
+DBG_NAME(OQueryViewSwitch);
OQueryViewSwitch::OQueryViewSwitch(Window* _pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory)
// :OQueryView(_pParent,_pController,_rFactory)
{
+ DBG_CTOR(OQueryViewSwitch,NULL);
ToolBox* pToolBox = new ToolBox(_pParent, ModuleRes(RID_BRW_QUERYDESIGN_TOOLBOX));
m_pTextView = new OQueryTextView(_pParent,pToolBox);
@@ -129,6 +130,7 @@ OQueryViewSwitch::~OQueryViewSwitch()
delete m_pTextView;
// delete m_pDesignView; // will be deleted by XFrame
+ DBG_DTOR(OQueryViewSwitch,NULL);
}
// -------------------------------------------------------------------------
void OQueryViewSwitch::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
@@ -186,6 +188,14 @@ void OQueryViewSwitch::clear()
m_pDesignView->clear();
}
// -----------------------------------------------------------------------------
+void OQueryViewSwitch::GetFocus()
+{
+ if(m_pTextView->IsVisible())
+ m_pTextView->GetFocus();
+ else
+ m_pDesignView->GetFocus();
+}
+// -----------------------------------------------------------------------------
void OQueryViewSwitch::setStatement(const ::rtl::OUString& _rsStatement)
{
if(m_pTextView->IsVisible())
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 729ac21a1e89..ead6c9b55c34 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querycontroller.cxx,v $
*
- * $Revision: 1.50 $
+ * $Revision: 1.51 $
*
- * last change: $Author: fs $ $Date: 2001-08-14 12:08:52 $
+ * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -251,6 +251,7 @@ Reference< XInterface > SAL_CALL OQueryController::Create(const Reference<XMulti
{
return *(new OQueryController(_rxFactory));
}
+DBG_NAME(OQueryController);
// -----------------------------------------------------------------------------
OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM)
: OJoinController(_rM)
@@ -265,6 +266,7 @@ OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM)
,m_nVisibleRows(0x400)
,m_bCreateView(sal_False)
{
+ DBG_CTOR(OQueryController,NULL);
m_pParseContext = new OQueryParseContext();
m_pSqlParser = new OSQLParser(_rM,m_pParseContext);
InvalidateAll();
@@ -272,6 +274,7 @@ OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM)
// -----------------------------------------------------------------------------
OQueryController::~OQueryController()
{
+ DBG_DTOR(OQueryController,NULL);
}
// -----------------------------------------------------------------------------
void OQueryController::deleteIterator()
generated by cgit (git 2.34.1) at 2025-05-07 15:03:49 +0000