User: obo Date: 05/03/18 02:11:39 Modified: /dba/dbaccess/source/ui/relationdesign/ RelationController.cxx
Log: 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 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.39&r2=1.40 Delta lines: +11 -2 -------------------- --- RelationController.cxx 10 Mar 2005 16:54:14 -0000 1.39 +++ RelationController.cxx 18 Mar 2005 10:11:36 -0000 1.40 @@ -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 @@ { { 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(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
