diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 11:33:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 10:51:53 +0000 |
| commit | 64acc9d576be9166c2da6edc6f8478e2cf31f606 (patch) | |
| tree | 120fd704ef684ec0388c5943f1ac473911086dfa /dbaccess/source/ui/querydesign/QueryDesignView.cxx | |
| parent | 43fbd02a82f9c87c75e83671c95c2617cc30d035 (diff) | |
merge dbaui::OQueryView with dbaui::OQueryDesignView
Change-Id: I9982d6c27863f533bfdb929d99602f0188972950
Reviewed-on: https://gerrit.libreoffice.org/26895
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess/source/ui/querydesign/QueryDesignView.cxx')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 160dca9945f8..b7d4fac51ec0 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2477,7 +2477,7 @@ namespace OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent, OQueryController& _rController, const Reference< XComponentContext >& _rxContext) - :OQueryView( _pParent, _rController, _rxContext ) + :OJoinDesignView( _pParent, _rController, _rxContext ) ,m_aSplitter( VclPtr<Splitter>::Create(this) ) ,m_eChildFocus(NONE) ,m_bInSplitHandler( false ) @@ -2514,7 +2514,7 @@ void OQueryDesignView::dispose() ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pSelectionBox.disposeAndClear(); m_aSplitter.disposeAndClear(); - OQueryView::dispose(); + OJoinDesignView::dispose(); } IMPL_LINK_NOARG_TYPED( OQueryDesignView, SplitHdl, Splitter*, void ) @@ -2534,7 +2534,7 @@ void OQueryDesignView::Construct() { m_pTableView = VclPtr<OQueryTableView>::Create(m_pScrollWindow,this); ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::AddWindow)); - OQueryView::Construct(); + OJoinDesignView::Construct(); } void OQueryDesignView::initialize() @@ -2630,10 +2630,6 @@ void OQueryDesignView::clear() m_pTableView->ClearAll(); } -void OQueryDesignView::setStatement(const OUString& /*_rsStatement*/) -{ -} - void OQueryDesignView::copy() { if( m_eChildFocus == SELECTION) @@ -2780,7 +2776,7 @@ bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt) m_eChildFocus = TABLEVIEW; } - return OQueryView::PreNotify(rNEvt); + return OJoinDesignView::PreNotify(rNEvt); } // check if the statement is correct when not returning false @@ -3094,7 +3090,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(const OTableFieldDesc void OQueryDesignView::GetFocus() { - OQueryView::GetFocus(); + OJoinDesignView::GetFocus(); if ( m_pSelectionBox && !m_pSelectionBox->HasChildPathFocus() ) { // first we have to deactivate the current cell to refill when necessary |