User: obo Date: 2006/07/10 08:40:23 Modified: dba/dbaccess/source/ui/querydesign/JoinDesignView.cxx
Log: INTEGRATION: CWS qiq (1.17.118); FILE MERGED 2006/06/28 10:31:11 fs 1.17.118.4: #i10000# 2006/06/27 12:51:59 fs 1.17.118.3: RESYNC: (1.17-1.18); FILE MERGED 2006/05/17 11:45:29 fs 1.17.118.2: #i51143# AddTableDialog is now in the responsibility of the controller, not the view (allows late construction as needed) 2006/05/12 11:11:02 fs 1.17.118.1: #i51143# callback from the AddTabDialog now via dedicated interface File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinDesignView.cxx?r1=1.18&r2=1.19 Delta lines: +10 -12 --------------------- --- JoinDesignView.cxx 20 Jun 2006 03:25:36 -0000 1.18 +++ JoinDesignView.cxx 10 Jul 2006 15:40:20 -0000 1.19 @@ -97,7 +97,6 @@ #endif // #include <com/sun/star/util/URL.hdl> -using namespace ::dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; @@ -105,31 +104,28 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -DBG_NAME(OJoinDesignView) +namespace dbaui +{ + +// ============================================================================= +// = OJoinDesignView +// ============================================================================= +// ----------------------------------------------------------------------------- OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController* _pController,const Reference< XMultiServiceFactory >& _rFactory) :ODataView(_pParent,_pController,_rFactory) ,m_pTableView(NULL) - ,m_pAddTabDlg(NULL) ,m_pController(_pController) { - DBG_CTOR(OJoinDesignView,NULL); - m_pScrollWindow = new OScrollWindowHelper(this); } // ----------------------------------------------------------------------------- OJoinDesignView::~OJoinDesignView() { - if ( m_pController ) - m_pController->clearAddTableDialog(); ::std::auto_ptr<Window> aT3(m_pScrollWindow); m_pScrollWindow = NULL; ::std::auto_ptr<Window> aT2(m_pTableView); m_pTableView = NULL; - ::std::auto_ptr<Window> aT1(m_pAddTabDlg); - m_pAddTabDlg = NULL; - - DBG_DTOR(OJoinDesignView,NULL); } // ------------------------------------------------------------------------- void OJoinDesignView::Construct() @@ -138,7 +134,6 @@ m_pScrollWindow->Show(); m_pTableView->Show(); - m_pAddTabDlg = new OAddTableDlg(m_pScrollWindow,m_pTableView); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); ODataView::Construct(); @@ -191,3 +186,6 @@ ODataView::KeyInput(rEvt); } // ----------------------------------------------------------------------------- + +} // namespace dbaui + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
