User: rt Date: 2007-07-06 08:41:44+0000 Modified: dba/dbaccess/source/ui/relationdesign/RelationController.cxx
Log: INTEGRATION: CWS oj14 (1.42.4); FILE MERGED 2006/11/07 09:47:52 oj 1.42.4.5: RESYNC: (1.43-1.46); FILE MERGED 2006/07/04 08:22:11 oj 1.42.4.4: RESYNC: (1.42-1.43); FILE MERGED 2006/04/25 12:51:11 oj 1.42.4.3: new include 2006/03/20 07:48:56 oj 1.42.4.2: use of module client helper 2006/01/03 07:49:26 oj 1.42.4.1: changed module client File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationController.cxx?r1=1.46&r2=1.47 Delta lines: +3 -18 -------------------- --- RelationController.cxx 2006-09-17 07:28:05+0000 1.46 +++ RelationController.cxx 2007-07-06 08:41:42+0000 1.47 @@ -56,9 +56,6 @@ #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> -#endif #ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> #endif @@ -309,21 +306,9 @@ { setEditable(sal_False); m_bRelationsPossible = sal_False; - { - { - String aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); - Reference< ::com::sun::star::awt::XWindow> xWindow = getTopMostContainerWindow(); - Window* pWin = NULL; - if ( xWindow.is() ) - pWin = VCLUnoHelper::GetWindow(xWindow); - if ( !pWin ) - pWin = getView()->Window::GetParent(); - - InfoBox(pWin, aMessage).Execute(); - } + connectionLostMessage(); throw SQLException(); } - } else if(getMetaData().is() && !getMetaData()->supportsIntegrityEnhancementFacility()) {// check if this database supports relations @@ -383,7 +368,7 @@ // ----------------------------------------------------------------------------- sal_Bool ORelationController::Construct(Window* pParent) { - m_pView = new ORelationDesignView(pParent,this,m_xMultiServiceFacatory); + m_pView = new ORelationDesignView(pParent,this,getORB()); OJoinController::Construct(pParent); // m_pView->Construct(); // m_pView->Show(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
