summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx18
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx15
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx182
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx131
-rw-r--r--dbaccess/source/ui/querydesign/makefile.mk46
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx106
-rw-r--r--dbaccess/source/ui/querydesign/queryview.cxx15
8 files changed, 178 insertions, 345 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 2f2fe9827dfd..dfaaf999737e 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.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -201,6 +201,12 @@ void SAL_CALL OJoinController::disposing( const EventObject& _rSource ) throw(Ru
}
// -----------------------------------------------------------------------------
+OJoinDesignView* OJoinController::getJoinView()
+{
+ return static_cast< OJoinDesignView* >( getView() );
+}
+
+// -----------------------------------------------------------------------------
void OJoinController::disposing()
{
OJoinController_BASE::disposing();
@@ -301,7 +307,7 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId)
aReturn.bEnabled = isConnected() && m_bModified;
break;
case ID_BROWSER_ADDTABLE:
- if(aReturn.bEnabled = static_cast<OJoinDesignView*>(m_pView)->getTableView()->IsAddAllowed())
+ if(aReturn.bEnabled = getJoinView()->getTableView()->IsAddAllowed())
aReturn.aState = ::cppu::bool2any(m_pAddTabDlg && m_pAddTabDlg->IsVisible());
else
aReturn.aState = ::cppu::bool2any(sal_False);
@@ -326,7 +332,7 @@ void OJoinController::Execute(sal_uInt16 _nId)
break;
case ID_BROWSER_EDITDOC:
m_bEditable = !m_bEditable;
- static_cast<OJoinDesignView*>(m_pView)->setReadOnly(!m_bEditable);
+ getJoinView()->setReadOnly(!m_bEditable);
break;
case ID_BROWSER_UNDO:
m_aUndoManager.Undo();
@@ -338,13 +344,13 @@ void OJoinController::Execute(sal_uInt16 _nId)
break;
case ID_BROWSER_ADDTABLE:
if(!m_pAddTabDlg)
- m_pAddTabDlg = static_cast<OJoinDesignView*>(m_pView)->getAddTableDialog();
+ m_pAddTabDlg = getJoinView()->getAddTableDialog();
if(m_pAddTabDlg->IsVisible())
{
m_pAddTabDlg->Show(!m_pAddTabDlg->IsVisible());
m_pView->GrabFocus();
}
- else if(static_cast<OJoinDesignView*>(m_pView)->getTableView()->IsAddAllowed())
+ else if(getJoinView()->getTableView()->IsAddAllowed())
m_pAddTabDlg->Show(!m_pAddTabDlg->IsVisible());
break;
}
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 411dd55b736c..8dc76c7ee1ea 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinDesignView.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:41:58 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -149,7 +149,7 @@ OJoinDesignView::~OJoinDesignView()
delete m_pScrollWindow;
}
// -------------------------------------------------------------------------
-void OJoinDesignView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
+void OJoinDesignView::Construct()
{
m_pScrollWindow->setTableView(m_pTableView);
m_pScrollWindow->Show();
@@ -158,7 +158,7 @@ void OJoinDesignView::Construct(const Reference< ::com::sun::star::awt::XControl
m_pAddTabDlg = new OAddTableDlg(m_pTableView);
SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) );
- ODataView::Construct(xModel); // initialize m_xMe
+ ODataView::Construct();
}
// -----------------------------------------------------------------------------
void OJoinDesignView::initialize()
@@ -166,7 +166,7 @@ void OJoinDesignView::initialize()
getAddTableDialog()->Update();
}
// -------------------------------------------------------------------------
-void OJoinDesignView::resizeControl(Rectangle& _rPlayground)
+void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground)
{
m_pScrollWindow->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() );
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 4b5cb4cc2ac2..e2d900465e13 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: QueryDesignView.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:41:58 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -142,6 +142,9 @@
#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
#endif
+#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
+#include "querycontainerwindow.hxx"
+#endif
using namespace ::dbaui;
using namespace ::utl;
@@ -153,7 +156,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-OQueryDesignView::OQueryDesignView(Window* _pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory)
+OQueryDesignView::OQueryDesignView(OQueryContainerWindow* _pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory)
:OQueryView(_pParent,_pController,_rFactory)
,m_aSplitter( this )
,m_eChildFocus(NONE)
@@ -200,10 +203,10 @@ IMPL_LINK( OQueryDesignView, SplitHdl, void*, p )
return 0L;
}
// -------------------------------------------------------------------------
-void OQueryDesignView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
+void OQueryDesignView::Construct()
{
m_pTableView = new OQueryTableView(m_pScrollWindow,this);
- OQueryView::Construct(xModel); // initialize m_xMe
+ OQueryView::Construct();
}
// -----------------------------------------------------------------------------
void OQueryDesignView::initialize()
@@ -219,7 +222,7 @@ void OQueryDesignView::initialize()
m_pSelectionBox->Fill();
}
// -------------------------------------------------------------------------
-void OQueryDesignView::resizeControl(Rectangle& _rPlayground)
+void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground)
{
Point aPlaygroundPos( _rPlayground.TopLeft() );
Size aPlaygroundSize( _rPlayground.GetSize() );
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 873615c92e6a..bbc301a552ab 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.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: oj $ $Date: 2001-08-15 13:19:03 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -58,10 +58,15 @@
*
*
************************************************************************/
-#include "QueryViewSwitch.hxx"
#ifndef DBAUI_QUERYVIEW_TEXT_HXX
#include "QueryTextView.hxx"
#endif
+#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
+#include "querycontainerwindow.hxx"
+#endif
+#ifndef DBAUI_QUERYVIEWSWITCH_HXX
+#include "QueryViewSwitch.hxx"
+#endif
#ifndef _SV_TOOLBOX_HXX
#include <vcl/toolbox.hxx>
#endif
@@ -106,177 +111,28 @@ using namespace dbaui;
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);
- m_pSplitter->Hide();
- m_pSplitter->SetSplitHdl( LINK( this, OQueryContainerWindow, SplitHdl ) );
- m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
-
- // our UNO representation
- m_xMe = VCLUnoHelper::CreateControlContainer(this);
-}
-// -----------------------------------------------------------------------------
-OQueryContainerWindow::~OQueryContainerWindow()
-{
- if(m_xBeamer.is())
- m_xBeamer->setComponent(NULL,NULL);
- m_xBeamer = NULL;
- m_xMe = NULL;
- delete m_pBeamer;
- delete m_pSplitter;
- delete m_pView;
- DBG_DTOR(OQueryContainerWindow,NULL);
-}
-// -----------------------------------------------------------------------------
-void OQueryContainerWindow::switchView()
-{
- m_pView->switchView();
-}
-// -----------------------------------------------------------------------------
-void OQueryContainerWindow::GetFocus()
-{
- m_pView->GetFocus();
-}
-// -----------------------------------------------------------------------------
-IMPL_LINK( OQueryContainerWindow, SplitHdl, void*, p )
-{
- long nTest = m_pSplitter->GetPosPixel().Y();
- m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) );
- Resize();
-
- return 0L;
-}
-// -----------------------------------------------------------------------------
-void OQueryContainerWindow::Resize()
-{
- Window::Resize();
- Size aSize = GetOutputSizePixel();
- if(!m_pBeamer || !m_pBeamer->IsVisible())
- m_pView->SetPosSizePixel(Point(0,0),aSize);
- else
- {
- Point aSplitPos(0,0);
- Size aSplitSize(0,0);
-
- aSplitPos = m_pSplitter->GetPosPixel();
- aSplitSize = m_pSplitter->GetOutputSizePixel();
- aSplitSize.Width() = aSize.Width();
-
- if( ( aSplitPos.Y() + aSplitSize.Height() ) > ( aSize.Height() ))
- aSplitPos.Y() = aSize.Height() - aSplitSize.Height();
-
- if( aSplitPos.Y() <= 0)
- aSplitPos.Y() = LogicToPixel( Size(0,sal_Int32(aSize.Height() * 0.2) ), MAP_APPFONT ).Height();
-
- Size aBeamer(aSize.Width(),aSplitPos.Y());
- m_pBeamer->SetPosSizePixel(Point(0,0),aBeamer);
- //set the size of the splitter
- m_pSplitter->SetPosSizePixel( aSplitPos, Size( aSize.Width(), aSplitSize.Height()) );
- m_pSplitter->SetDragRectPixel( Rectangle( Point( 0, 0 ), aSize) );
-
- Point aPos(0,aSplitPos.Y()+aSplitSize.Height());
- m_pView->SetPosSizePixel(aPos,Size( aSize.Width(), aSize.Height() - aSplitSize.Height() - aSplitPos.Y() ));
- }
-}
-// -----------------------------------------------------------------------------
-void OQueryContainerWindow::initialize(const Reference<XFrame>& _xFrame)
-{
- // append our frame
- Reference < XFramesSupplier > xSup(_xFrame,UNO_QUERY);
- Reference < XFrames > xFrames = xSup->getFrames();
- xFrames->append( m_xBeamer );
-}
-
-// -----------------------------------------------------------------------------
-void OQueryContainerWindow::disposingPreview()
-{
- // here I know that we will be destroyed from the frame
- m_pBeamer = NULL;
- m_xBeamer = NULL;
- m_pSplitter->Hide();
- Resize();
-}
-// -----------------------------------------------------------------------------
-long OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
-{
- if(rNEvt.GetType() == EVENT_GETFOCUS && m_pView)
- {
- m_pView->getRealView()->getController()->InvalidateFeature(SID_CUT);
- m_pView->getRealView()->getController()->InvalidateFeature(SID_COPY);
- m_pView->getRealView()->getController()->InvalidateFeature(SID_PASTE);
- }
- return Window::PreNotify(rNEvt);
-}
-// -----------------------------------------------------------------------------
-void OQueryContainerWindow::showPreview(const Reference<XFrame>& _xFrame)
-{
- if(!m_pBeamer)
- {
- m_pBeamer = new OBeamer(this);
- m_xBeamer = Reference<XFrame>(m_pView->getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")),UNO_QUERY);
- OSL_ENSURE(m_xBeamer.is(),"No frame created!");
- m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) );
- m_xBeamer->setName(FRAME_NAME_QUERY_PREVIEW);
-
- // append our frame
- Reference < XFramesSupplier > xSup(_xFrame,UNO_QUERY);
- Reference < XFrames > xFrames = xSup->getFrames();
- xFrames->append( m_xBeamer );
-
- Size aSize = GetOutputSizePixel();
- Size aBeamer(aSize.Width(),sal_Int32(aSize.Height()*0.33));
-
- const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height();
- Point aPos(0,aBeamer.Height()+nFrameHeight);
-
- m_pBeamer->SetPosSizePixel(Point(0,0),aBeamer);
- m_pBeamer->Show();
-
- m_pSplitter->SetPosSizePixel( Point(0,aBeamer.Height()), Size(aSize.Width(),nFrameHeight) );
- // a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide
- m_pSplitter->SetSplitPosPixel( aBeamer.Height() );
- m_pView->SetPosSizePixel(aPos,Size(aBeamer.Width(),aSize.Height() - aBeamer.Height()-nFrameHeight));
-
- m_pSplitter->Show();
- Resize();
- }
-}
// -----------------------------------------------------------------------------
// end of temp classes
// -------------------------------------------------------------------------
DBG_NAME(OQueryTextView);
-OQueryTextView::OQueryTextView(Window* _pParent,ToolBox* _pToolBox)
+OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
:Window(_pParent)
- ,m_pToolBox(_pToolBox)
{
DBG_CTOR(OQueryTextView,NULL);
m_pEdit = new OSqlEdit(this);
m_pEdit->ClearModifyFlag();
m_pEdit->SaveValue();
+ m_pEdit->SetPosPixel( Point( 0, 0 ) );
m_pEdit->Show();
// 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()
{
@@ -287,16 +143,8 @@ void OQueryTextView::GetFocus()
// -------------------------------------------------------------------------
void OQueryTextView::Resize()
{
- Size aToolBoxSize;
- ToolBox* pToolBox = m_pToolBox;
- if(pToolBox)
- aToolBoxSize = pToolBox->GetOutputSizePixel();
-
- Size aSize = GetOutputSizePixel();
- Point aTopLeft(0,0);
- aTopLeft.Y() += aToolBoxSize.Height();
- m_pEdit->SetPosSizePixel(aTopLeft,Size(aSize.Width(),aSize.Height()-aTopLeft.Y()));
- m_pToolBox->SetPosSizePixel(Point(0,0),Size(aSize.Width(),aToolBoxSize.Height()));
+ Window::Resize();
+ m_pEdit->SetSizePixel( GetOutputSizePixel() );
}
// -----------------------------------------------------------------------------
::rtl::OUString OQueryTextView::getStatement()
@@ -311,7 +159,7 @@ void OQueryTextView::setReadOnly(sal_Bool _bReadOnly)
// -----------------------------------------------------------------------------
void OQueryTextView::clear()
{
- SfxUndoManager* pUndoMgr = static_cast<OQueryContainerWindow*>(GetParent())->getView()->getRealView()->getController()->getUndoMgr();
+ SfxUndoManager* pUndoMgr = getContainerWindow()->getDesignView()->getController()->getUndoMgr();
OSqlEditUndoAct* pUndoAct = new OSqlEditUndoAct( m_pEdit );
pUndoAct->SetOriginalText( m_pEdit->GetText() );
@@ -350,13 +198,13 @@ void OQueryTextView::cut()
{
if(!m_pEdit->IsInAccelAct() )
m_pEdit->Cut();
- static_cast<OQueryContainerWindow*>(GetParent())->getView()->getRealView()->getController()->setModified(sal_True);
+ getContainerWindow()->getDesignView()->getController()->setModified(sal_True);
}
// -----------------------------------------------------------------------------
void OQueryTextView::paste()
{
if(!m_pEdit->IsInAccelAct() )
m_pEdit->Paste();
- static_cast<OQueryContainerWindow*>(GetParent())->getView()->getRealView()->getController()->setModified(sal_True);
+ getContainerWindow()->getDesignView()->getController()->setModified(sal_True);
}
// ----------------------------------------------------------------------------- \ No newline at end of file
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 8f3a48bf3e2d..012e2d5aa14e 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.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:41:58 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,6 +67,9 @@
#ifndef DBAUI_QUERYVIEW_TEXT_HXX
#include "QueryTextView.hxx"
#endif
+#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
+#include "querycontainerwindow.hxx"
+#endif
#ifndef _SV_TOOLBOX_HXX
#include <vcl/toolbox.hxx>
#endif
@@ -88,67 +91,48 @@
#ifndef DBAUI_SQLEDIT_HXX
#include "sqledit.hxx"
#endif
-
+#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
+#include "querycontainerwindow.hxx"
+#endif
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)
+OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory)
{
DBG_CTOR(OQueryViewSwitch,NULL);
- ToolBox* pToolBox = new ToolBox(_pParent, ModuleRes(RID_BRW_QUERYDESIGN_TOOLBOX));
- m_pTextView = new OQueryTextView(_pParent,pToolBox);
+ m_pTextView = new OQueryTextView(_pParent);
m_pDesignView = new OQueryDesignView(_pParent,_pController,_rFactory);
- m_pDesignView->setToolBox(pToolBox);
+ // initially be in SQL mode
m_pTextView->Show();
- pToolBox->SetParent(m_pTextView); // change owner ship
- pToolBox->Show();
-
- if(pToolBox && m_pTextView->IsVisible())
- {
- pToolBox->HideItem(ID_BROWSER_QUERY_DISTINCT_VALUES);
- pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_ALIASES);
- pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_TABLES);
- pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_FUNCTIONS);
- pToolBox->HideItem(ID_BROWSER_ADDTABLE);
- pToolBox->HideItem(ID_QUERY_ZOOM_IN);
- pToolBox->HideItem(ID_QUERY_ZOOM_OUT);
- // ToolBoxItemType eType = pToolBox->GetItemType(pToolBox->GetItemPos(ID_BROWSER_SQL)+1);
- // pToolBox->HideItem(pToolBox->GetItemId(pToolBox->GetItemPos(ID_BROWSER_SQL))+1); // hide the separator
- }
}
// -----------------------------------------------------------------------------
OQueryViewSwitch::~OQueryViewSwitch()
{
- ToolBox* pToolBox = m_pDesignView->getToolBox();
- pToolBox->SetParent(m_pDesignView); // change owner ship again to real owner
+ DELETEZ( m_pTextView );
+ DELETEZ( m_pDesignView );
- 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)
+void OQueryViewSwitch::Construct()
{
- m_pDesignView->Construct(xModel); // initialize the table view
- // OQueryView::Construct(xModel); // initialize m_xMe
- // m_pTextView->Construct(xModel);
+ m_pDesignView->Construct( );
}
// -----------------------------------------------------------------------------
void OQueryViewSwitch::initialize()
{
m_pDesignView->initialize();
- if(static_cast<OQueryController*>(m_pDesignView->getController())->isDesignMode())
+ if (static_cast<OQueryController*>(m_pDesignView->getController())->isDesignMode())
switchView();
}
// -------------------------------------------------------------------------
-void OQueryViewSwitch::resizeControl(Rectangle& _rPlayground)
+void OQueryViewSwitch::resizeDocumentView(Rectangle& _rPlayground)
{
m_pTextView->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() );
m_pDesignView->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() );
@@ -183,9 +167,9 @@ void OQueryViewSwitch::clear()
// -----------------------------------------------------------------------------
void OQueryViewSwitch::GetFocus()
{
- if(m_pTextView->IsVisible())
+ if ( m_pTextView && m_pTextView->IsVisible() )
m_pTextView->GetFocus();
- else
+ else if ( m_pDesignView && m_pDesignView->IsVisible() )
m_pDesignView->GetFocus();
}
// -----------------------------------------------------------------------------
@@ -242,54 +226,70 @@ void OQueryViewSwitch::paste()
m_pDesignView->paste();
}
// -----------------------------------------------------------------------------
+OQueryContainerWindow* OQueryViewSwitch::getContainer() const
+{
+ Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL;
+ return static_cast< OQueryContainerWindow* >( pDesignParent );
+}
+
+// -----------------------------------------------------------------------------
void OQueryViewSwitch::switchView()
{
- m_pTextView->Show(!static_cast<OQueryController*>(m_pDesignView->getController())->isDesignMode());
+ sal_Bool bGraphicalDesign = static_cast<OQueryController*>(m_pDesignView->getController())->isDesignMode();
- ToolBox* pToolBox = m_pDesignView->getToolBox();
- if(pToolBox && m_pTextView->IsVisible())
+ m_pTextView->Show ( !bGraphicalDesign );
+ m_pDesignView->Show ( bGraphicalDesign );
+
+ OQueryContainerWindow* pContainer = getContainer();
+ ToolBox* pToolBox = pContainer ? pContainer->getToolBox() : NULL;
+ DBG_ASSERT( pToolBox, "OQueryViewSwitch::switchView: no toolbox!" );
+
+ if ( m_pTextView->IsVisible() )
{
m_pDesignView->stopTimer();
m_pTextView->getSqlEdit()->startTimer();
- pToolBox->SetParent(m_pTextView); // change owner ship
- m_pDesignView->Show(FALSE);
- pToolBox->HideItem(ID_BROWSER_QUERY_DISTINCT_VALUES);
- pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_ALIASES);
- pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_TABLES);
- pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_FUNCTIONS);
- pToolBox->HideItem(ID_BROWSER_ADDTABLE);
- pToolBox->HideItem(ID_QUERY_ZOOM_IN);
- pToolBox->HideItem(ID_QUERY_ZOOM_OUT);
- pToolBox->ShowItem(ID_BROWSER_ESACPEPROCESSING);
- // ToolBoxItemType eType = pToolBox->GetItemType(pToolBox->GetItemPos(ID_BROWSER_SQL)+1);
- // pToolBox->HideItem(pToolBox->GetItemId(pToolBox->GetItemPos(ID_BROWSER_SQL))+1); // hide the separator
+
m_pTextView->clear();
m_pTextView->setStatement(static_cast<OQueryController*>(m_pDesignView->getController())->getStatement());
+
+ if ( pToolBox )
+ {
+ pToolBox->HideItem(ID_BROWSER_QUERY_DISTINCT_VALUES);
+ pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_ALIASES);
+ pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_TABLES);
+ pToolBox->HideItem(ID_BROWSER_QUERY_VIEW_FUNCTIONS);
+ pToolBox->HideItem(ID_BROWSER_ADDTABLE);
+ pToolBox->HideItem(ID_QUERY_ZOOM_IN);
+ pToolBox->HideItem(ID_QUERY_ZOOM_OUT);
+ pToolBox->ShowItem(ID_BROWSER_ESACPEPROCESSING);
+ }
}
- else if(pToolBox)
+ else
{
// we have to stop the sqledit from our textview
-
- pToolBox->SetParent(m_pDesignView); // change owner ship
m_pTextView->getSqlEdit()->stopTimer();
- // pToolBox->ShowItem(pToolBox->GetItemId(pToolBox->GetItemPos(ID_BROWSER_ADDTABLE)-1)); // hide the separator
- pToolBox->HideItem(ID_BROWSER_ESACPEPROCESSING);
- pToolBox->ShowItem(ID_BROWSER_ADDTABLE);
- pToolBox->ShowItem(ID_BROWSER_QUERY_VIEW_FUNCTIONS);
- pToolBox->ShowItem(ID_BROWSER_QUERY_VIEW_TABLES);
- pToolBox->ShowItem(ID_BROWSER_QUERY_VIEW_ALIASES);
- pToolBox->ShowItem(ID_BROWSER_QUERY_DISTINCT_VALUES);
- pToolBox->ShowItem(ID_QUERY_ZOOM_IN);
- pToolBox->ShowItem(ID_QUERY_ZOOM_OUT);
- // m_pDesignView->clear();
+ if ( pToolBox )
+ {
+ pToolBox->HideItem(ID_BROWSER_ESACPEPROCESSING);
+ pToolBox->ShowItem(ID_BROWSER_ADDTABLE);
+ pToolBox->ShowItem(ID_BROWSER_QUERY_VIEW_FUNCTIONS);
+ pToolBox->ShowItem(ID_BROWSER_QUERY_VIEW_TABLES);
+ pToolBox->ShowItem(ID_BROWSER_QUERY_VIEW_ALIASES);
+ pToolBox->ShowItem(ID_BROWSER_QUERY_DISTINCT_VALUES);
+ pToolBox->ShowItem(ID_QUERY_ZOOM_IN);
+ pToolBox->ShowItem(ID_QUERY_ZOOM_OUT);
+ }
+
getAddTableDialog()->Update();
m_pDesignView->InitFromParseNode();
+
// only show the view when the data is inserted
- m_pDesignView->Show(static_cast<OQueryController*>(m_pDesignView->getController())->isDesignMode());
m_pDesignView->startTimer();
}
- m_pDesignView->Resize();
+
+ if ( pContainer )
+ pContainer->Resize();
m_pDesignView->getController()->getUndoMgr()->Clear();
m_pDesignView->getController()->InvalidateFeature(ID_BROWSER_UNDO);
@@ -335,6 +335,7 @@ void OQueryViewSwitch::SaveUIConfig()
void OQueryViewSwitch::SetPosSizePixel( Point _rPt,Size _rSize)
{
m_pDesignView->SetPosSizePixel( _rPt,_rSize);
+ m_pDesignView->Resize();
m_pTextView->SetPosSizePixel( _rPt,_rSize);
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/makefile.mk b/dbaccess/source/ui/querydesign/makefile.mk
index b636da054be1..1607cf7aa38a 100644
--- a/dbaccess/source/ui/querydesign/makefile.mk
+++ b/dbaccess/source/ui/querydesign/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: oj $ $Date: 2001-05-23 14:16:41 $
+# last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,22 +71,18 @@ TARGET=querydesign
# IMGLST_SRS=$(SRS)$/$(TARGET).srs
# --- Files --------------------------------------------------------
-SLOFILES =\
+EXCEPTIONSFILES =\
$(SLO)$/JoinDesignView.obj \
$(SLO)$/JoinController.obj \
- $(SLO)$/ParseContext.obj \
$(SLO)$/QueryDesignView.obj \
$(SLO)$/TableFieldData.obj \
$(SLO)$/SelectionBrowseBox.obj \
- $(SLO)$/TableFieldInfo.obj \
$(SLO)$/querydlg.obj \
$(SLO)$/QueryTabWinUndoAct.obj \
$(SLO)$/QueryMoveTabWinUndoAct.obj \
$(SLO)$/QueryTabConnUndoAction.obj \
$(SLO)$/TableFieldDescription.obj \
- $(SLO)$/QTableConnectionData.obj \
$(SLO)$/JoinTableView.obj \
- $(SLO)$/QTableWindowData.obj \
$(SLO)$/QueryViewSwitch.obj \
$(SLO)$/QueryTableView.obj \
$(SLO)$/TableWindowData.obj \
@@ -95,37 +91,21 @@ SLOFILES =\
$(SLO)$/JoinExchange.obj \
$(SLO)$/TableWindowListBox.obj \
$(SLO)$/TableWindowTitle.obj \
+ $(SLO)$/QueryTextView.obj \
+ $(SLO)$/querycontroller.obj \
+ $(SLO)$/querycontainerwindow.obj
+
+SLOFILES =\
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/ParseContext.obj \
+ $(SLO)$/TableFieldInfo.obj \
+ $(SLO)$/QTableConnectionData.obj \
+ $(SLO)$/QTableWindowData.obj \
$(SLO)$/QTableConnection.obj \
$(SLO)$/TableConnection.obj \
$(SLO)$/TableConnectionData.obj \
$(SLO)$/ConnectionLine.obj \
$(SLO)$/ConnectionLineData.obj \
- $(SLO)$/QueryTextView.obj \
- $(SLO)$/querycontroller.obj \
- $(SLO)$/queryview.obj
-
-EXCEPTIONSFILES =\
- $(SLO)$/JoinDesignView.obj \
- $(SLO)$/JoinController.obj \
- $(SLO)$/QueryDesignView.obj \
- $(SLO)$/TableFieldData.obj \
- $(SLO)$/SelectionBrowseBox.obj \
- $(SLO)$/querydlg.obj \
- $(SLO)$/QueryTabWinUndoAct.obj \
- $(SLO)$/QueryMoveTabWinUndoAct.obj \
- $(SLO)$/QueryTabConnUndoAction.obj \
- $(SLO)$/TableFieldDescription.obj \
- $(SLO)$/JoinTableView.obj \
- $(SLO)$/QueryViewSwitch.obj \
- $(SLO)$/QueryTableView.obj \
- $(SLO)$/TableWindowData.obj \
- $(SLO)$/QTableWindow.obj \
- $(SLO)$/TableWindow.obj \
- $(SLO)$/JoinExchange.obj \
- $(SLO)$/TableWindowListBox.obj \
- $(SLO)$/TableWindowTitle.obj \
- $(SLO)$/QueryTextView.obj \
- $(SLO)$/querycontroller.obj \
$(SLO)$/queryview.obj
SRCFILES = query.src \
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 3a363ed6cb1f..93e8f0c881ec 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.52 $
+ * $Revision: 1.53 $
*
- * last change: $Author: fs $ $Date: 2001-08-15 13:42:43 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,6 +79,9 @@
#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
#endif
+#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
+#include "querycontainerwindow.hxx"
+#endif
#ifndef DBAUI_QUERYVIEW_TEXT_HXX
#include "QueryTextView.hxx"
#endif
@@ -303,7 +306,6 @@ void OQueryController::disposing()
}
m_pView = NULL;
- m_pWindow = NULL; // don't delete this window it will be deleted by the frame
::comphelper::disposeComponent(m_xComposer);
OJoinController::disposing();
@@ -333,13 +335,13 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId)
case SID_PRINTDOCDIRECT:
break;
case ID_BROWSER_CUT:
- aReturn.bEnabled = m_bEditable && m_pWindow && m_pWindow->getView()->isCutAllowed();
+ aReturn.bEnabled = m_bEditable && getContainer() && getContainer()->isCutAllowed();
break;
case ID_BROWSER_COPY:
- aReturn.bEnabled = m_pWindow && m_pWindow->getView()->isCopyAllowed();
+ aReturn.bEnabled = getContainer() && getContainer()->isCopyAllowed();
break;
case ID_BROWSER_PASTE:
- aReturn.bEnabled = m_bEditable && m_pWindow && m_pWindow->getView()->isPasteAllowed();
+ aReturn.bEnabled = m_bEditable && getContainer() && getContainer()->isPasteAllowed();
break;
case ID_BROWSER_SQL:
aReturn.bEnabled = m_bEsacpeProcessing && m_pSqlIterator;
@@ -351,7 +353,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId)
case ID_BROWSER_QUERY_VIEW_FUNCTIONS:
case ID_BROWSER_QUERY_VIEW_TABLES:
case ID_BROWSER_QUERY_VIEW_ALIASES:
- aReturn.aState = ::cppu::bool2any(m_pWindow && m_pWindow->getView()->isSlotEnabled(_nId));
+ aReturn.aState = ::cppu::bool2any(getContainer() && getContainer()->isSlotEnabled(_nId));
break;
case ID_BROWSER_QUERY_DISTINCT_VALUES:
aReturn.aState = ::cppu::bool2any(m_bDistinct);
@@ -376,7 +378,7 @@ void OQueryController::Execute(sal_uInt16 _nId)
break;
case ID_BROWSER_EDITDOC:
m_bEditable = !m_bEditable;
- m_pWindow->getView()->setReadOnly(!m_bEditable);
+ getContainer()->setReadOnly(!m_bEditable);
InvalidateFeature(ID_BROWSER_PASTE);
InvalidateFeature(ID_BROWSER_CLEAR_QUERY);
break;
@@ -390,27 +392,27 @@ void OQueryController::Execute(sal_uInt16 _nId)
case SID_PRINTDOCDIRECT:
break;
case ID_BROWSER_CUT:
- m_pWindow->getView()->cut();
+ getContainer()->cut();
break;
case ID_BROWSER_COPY:
- m_pWindow->getView()->copy();
+ getContainer()->copy();
break;
case ID_BROWSER_PASTE:
- m_pWindow->getView()->paste();
+ getContainer()->paste();
break;
case ID_BROWSER_SQL:
{
try
{
::rtl::OUString aErrorMsg;
- m_sStatement = m_pWindow->getView()->getStatement();
+ m_sStatement = getContainer()->getStatement();
if(!m_sStatement.getLength() && m_pSqlIterator)
{
// change the view of the data
delete m_pSqlIterator->getParseTree();
m_pSqlIterator->setParseTree(NULL);
m_bDesign = !m_bDesign;
- m_pWindow->switchView();
+ getContainer()->switchView();
}
else
{
@@ -429,7 +431,7 @@ void OQueryController::Execute(sal_uInt16 _nId)
const OSQLTables& xTabs = m_pSqlIterator->getTables();
if( m_pSqlIterator->getStatementType() != SQL_STATEMENT_SELECT && m_pSqlIterator->getStatementType() != SQL_STATEMENT_SELECT_COUNT || xTabs.begin() == xTabs.end())
{
- ErrorBox aBox( getQueryView(), ModuleRes( ERR_QRY_NOSELECT ) );
+ ErrorBox aBox( getView(), ModuleRes( ERR_QRY_NOSELECT ) );
aBox.Execute();
}
else
@@ -441,14 +443,14 @@ void OQueryController::Execute(sal_uInt16 _nId)
getMetaData(),
&getParser()->getContext(),
sal_True,sal_True);
- m_pWindow->getView()->SaveUIConfig();
- m_pWindow->switchView();
+ getContainer()->SaveUIConfig();
+ getContainer()->switchView();
}
}
}
else
{
- ErrorBox aBox( getQueryView(), ModuleRes( ERR_QRY_SYNTAX ) );
+ ErrorBox aBox( getView(), ModuleRes( ERR_QRY_SYNTAX ) );
aBox.Execute();
}
}
@@ -468,7 +470,7 @@ void OQueryController::Execute(sal_uInt16 _nId)
case ID_BROWSER_CLEAR_QUERY:
{
m_aUndoManager.EnterListAction( String( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), String() );
- m_pWindow->getView()->clear();
+ getContainer()->clear();
m_aUndoManager.LeaveListAction();
m_sStatement = ::rtl::OUString();
@@ -480,7 +482,7 @@ void OQueryController::Execute(sal_uInt16 _nId)
case ID_BROWSER_QUERY_VIEW_FUNCTIONS:
case ID_BROWSER_QUERY_VIEW_TABLES:
case ID_BROWSER_QUERY_VIEW_ALIASES:
- m_pWindow->getView()->setSlotEnabled(_nId,!m_pWindow->getView()->isSlotEnabled(_nId));
+ getContainer()->setSlotEnabled(_nId,!getContainer()->isSlotEnabled(_nId));
break;
case ID_BROWSER_QUERY_DISTINCT_VALUES:
m_bDistinct = !m_bDistinct;
@@ -495,14 +497,14 @@ void OQueryController::Execute(sal_uInt16 _nId)
case ID_QUERY_ZOOM_IN:
{
// m_aZoom *= Fraction(1,10);
-// static_cast<OQueryViewSwitch*>(getQueryView())->zoomTableView(m_aZoom);
+// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom);
}
break;
case ID_QUERY_ZOOM_OUT:
{
// if(m_aZoom != Fraction(1,1))
// m_aZoom /= Fraction(1,10);
-// static_cast<OQueryViewSwitch*>(getQueryView())->zoomTableView(m_aZoom);
+// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom);
}
break;
default:
@@ -686,7 +688,7 @@ void SAL_CALL OQueryController::initialize( const Sequence< Any >& aArguments )
}
OSL_ENSURE(m_xFormatter.is(),"No NumberFormatter!");
}
- m_pWindow->getView()->initialize();
+ getContainer()->initialize();
getUndoMgr()->Clear();
if(m_bDesign && !m_sName.getLength())
Execute(ID_BROWSER_ADDTABLE);
@@ -725,7 +727,7 @@ void OQueryController::setQueryComposer()
try
{
m_xComposer = xFactory->createQueryComposer();
- m_pWindow->getView()->setStatement(m_sStatement);
+ getContainer()->setStatement(m_sStatement);
}
catch (Exception&)
{
@@ -739,24 +741,21 @@ void OQueryController::setQueryComposer()
}
}
// -----------------------------------------------------------------------------
-Reference< XWindow > OQueryController::getComponentWindow()
+sal_Bool OQueryController::Construct(Window* pParent)
{
- return VCLUnoHelper::GetInterface(m_pWindow);
+ // TODO: we have to check if we should create the text- or the design- view
+
+ m_pView = new OQueryContainerWindow(pParent,this,m_xMultiServiceFacatory);
+
+ return OSingleDocumentController::Construct(pParent);
}
+
// -----------------------------------------------------------------------------
-sal_Bool OQueryController::Construct(Window* pParent)
+OJoinDesignView* OQueryController::getJoinView()
{
- // TODO: we have to check if we should create the text- or the design- view
- m_pWindow = new OQueryContainerWindow(pParent,this,m_xMultiServiceFacatory);
- // OQueryTextView *pView = new OQueryTextView(pParent,this,m_xMultiServiceFacatory);
- m_pWindow->getView()->Construct(NULL);
- // m_pView = pView;
- m_pView = m_pWindow->getView()->getRealView();
- OSingleDocumentController::Construct(pParent);
- // getView()->Show();
- m_pWindow->Show();
- return sal_True;
+ return getContainer()->getDesignView();
}
+
// -----------------------------------------------------------------------------
sal_Bool SAL_CALL OQueryController::suspend(sal_Bool bSuspend) throw( RuntimeException )
{
@@ -790,9 +789,16 @@ void OQueryController::AddSupportedFeatures()
// -----------------------------------------------------------------------------
ToolBox* OQueryController::CreateToolBox(Window* _pParent)
{
- if(m_pView)
- return m_pView->getToolBox();
- return new ToolBox(_pParent, ModuleRes(RID_BRW_QUERYDESIGN_TOOLBOX));
+// if ( getContainer() && getContainer()->getDesignView() )
+// return getContainer()->getDesignView()->getToolBox();
+// return new ToolBox(_pParent, ModuleRes(RID_BRW_QUERYDESIGN_TOOLBOX));
+
+ ToolBox* pToolBox = new ToolBox(_pParent, ModuleRes(RID_BRW_QUERYDESIGN_TOOLBOX));
+
+// if ( getContainer() && getContainer()->getDesignView() )
+// getContainer()->getDesignView()->setToolBox(pToolBox);
+
+ return pToolBox;
}
// -----------------------------------------------------------------------------
void OQueryController::setModified(sal_Bool _bModified)
@@ -806,15 +812,15 @@ void OQueryController::setModified(sal_Bool _bModified)
void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(RuntimeException)
{
Reference< XFrame > xSource(Source.Source, UNO_QUERY);
- if (xSource.is() && m_pWindow)
+ if (xSource.is() && getContainer())
{
if (xSource.get() == m_xCurrentFrame.get())
{ // our frame is beeing disposed -> close the preview window (if we have one)
- ::comphelper::disposeComponent(m_pWindow->getPreviewFrame());
+ ::comphelper::disposeComponent(getContainer()->getPreviewFrame());
}
- else if (xSource.get() == m_pWindow->getPreviewFrame().get())
+ else if (xSource.get() == getContainer()->getPreviewFrame().get())
{
- m_pWindow->disposingPreview();
+ getContainer()->disposingPreview();
}
}
@@ -842,7 +848,7 @@ void OQueryController::reconnect(sal_Bool _bUI)
{
m_bDesign = sal_False;
// don't call Execute(SQL) because this changes the sql statement
- m_pWindow->switchView();
+ getContainer()->switchView();
}
InvalidateAll();
}
@@ -938,7 +944,7 @@ void OQueryController::executeQuery()
{
try
{
- m_pWindow->showPreview(m_xCurrentFrame);
+ getContainer()->showPreview(m_xCurrentFrame);
URL aWantToDispatch;
aWantToDispatch.Complete = ::rtl::OUString::createFromAscii(".component:DB/DataSourceBrowser");
@@ -998,7 +1004,7 @@ void OQueryController::executeQuery()
Reference< XComponent > xComponent(m_xCurrentFrame->findFrame(sFrameName,nSearchFlags), UNO_QUERY);
if (xComponent.is())
{
- OSL_ENSURE(Reference< XFrame >(xComponent, UNO_QUERY).get() == m_pWindow->getPreviewFrame().get(),
+ OSL_ENSURE(Reference< XFrame >(xComponent, UNO_QUERY).get() == getContainer()->getPreviewFrame().get(),
"OQueryController::executeQuery: oops ... which window do I have here?");
Reference< ::com::sun::star::lang::XEventListener> xEvtL((::cppu::OWeakObject*)this,UNO_QUERY);
xComponent->addEventListener(xEvtL);
@@ -1021,7 +1027,7 @@ void OQueryController::executeQuery()
// for(;bAllEmpty && aIter != m_vTableFieldDesc.end();++aIter)
// bAllEmpty = (*aIter)->IsEmpty();
//
-// ErrorBox aBox(getQueryView(), ModuleRes(bAllEmpty ? ERR_QRY_NOCRITERIA : ERR_QRY_NOSTATEMENT));
+// ErrorBox aBox(getView(), ModuleRes(bAllEmpty ? ERR_QRY_NOCRITERIA : ERR_QRY_NOSTATEMENT));
// aBox.Execute();
// }
}
@@ -1157,7 +1163,7 @@ void OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
// now we save the layout information
// create the output stream
- m_pWindow->getView()->SaveUIConfig();
+ getContainer()->SaveUIConfig();
Sequence< sal_Int8 > aOutputSeq;
{
Reference< XOutputStream> xOutStreamHelper = new OSequenceOutputStream(aOutputSeq);
@@ -1276,7 +1282,7 @@ void OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
::rtl::OUString OQueryController::translateStatement()
{
// now set the properties
- m_sStatement = m_pWindow->getView()->getStatement();
+ m_sStatement = getContainer()->getStatement();
::rtl::OUString sTranslatedStmt;
if(m_sStatement.getLength() && m_xComposer.is() && m_bEsacpeProcessing)
{
@@ -1302,7 +1308,7 @@ void OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
}
else if(!m_sStatement.getLength())
{
- ErrorBox aBox( getQueryView(), ModuleRes( ERR_QRY_NOSELECT ) );
+ ErrorBox aBox( getView(), ModuleRes( ERR_QRY_NOSELECT ) );
aBox.Execute();
}
else
diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx
index f5366adb8945..4b1f0b2a1d2e 100644
--- a/dbaccess/source/ui/querydesign/queryview.cxx
+++ b/dbaccess/source/ui/querydesign/queryview.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: queryview.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:18:26 $
+ * last change: $Author: fs $ $Date: 2001-08-23 14:39:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -87,17 +87,6 @@ OQueryView::OQueryView(Window* _pParent, OQueryController* _pController,const Re
OQueryView::~OQueryView()
{
}
-// -------------------------------------------------------------------------
-void OQueryView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
-{
- OJoinDesignView::Construct(xModel); // initialize m_xMe
-
-}
-// -------------------------------------------------------------------------
-void OQueryView::resizeControl(Rectangle& _rRect)
-{
- OJoinDesignView::resizeControl(_rRect);
-}
// -----------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 05:06:40 +0000