INTEGRATION: CWS dba25 (1.38.4); FILE MERGED

2005/03/14 13:34:50 fs 1.38.4.2: RESYNC: (1.38-1.39); FILE MERGED
2005/03/04 07:19:45 oj 1.38.4.1: #i43912# use set connection as activeconnection

1 files changed, 13 insertions, 4 deletions

diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 6ca5307cf6e6..ba2014c33b99 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RelationController.cxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 16:54:14 $
+ *  last change: $Author: obo $ $Date: 2005-03-18 10:11:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,9 @@
 #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
@@ -342,8 +345,14 @@ void ORelationController::impl_initialize( const Sequence< Any >& aArguments )
         {
             {
                 String aMessage(ModuleRes(RID_STR_CONNECTION_LOST));
-                ODataView* pWindow = getView();
-                InfoBox(pWindow, aMessage).Execute();
+                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();
         }