diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:41:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:41:42 +0000 |
| commit | f5c452a828922028027a470321ca01b8407fc006 (patch) | |
| tree | 0b7a781dd330233d6fa6cd21e96c57607a980369 /dbaccess/source/ui/relationdesign | |
| parent | 0fa2e5f5b70a2f6d33504b838e2e9bb12fd4a473 (diff) | |
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
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationController.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 2d0924f5f828..e90ebbe9ce25 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -4,9 +4,9 @@ * * $RCSfile: RelationController.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:28:05 $ + * last change: $Author: rt $ $Date: 2007-07-06 08:41:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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,20 +306,8 @@ void ORelationController::impl_initialize() { 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(); - } - throw SQLException(); - } + connectionLostMessage(); + throw SQLException(); } else if(getMetaData().is() && !getMetaData()->supportsIntegrityEnhancementFacility()) {// check if this database supports relations @@ -383,7 +368,7 @@ void ORelationController::updateTitle() // ----------------------------------------------------------------------------- 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(); |