diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:07:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:07:38 +0000 |
| commit | 11170ac35ea79fd216a9eb2fde5be75f640bf9fb (patch) | |
| tree | e05e5447d7a84cf1a60a2d3a659bb2caf4e78648 | |
| parent | 975ac9fe43ccb202cbe3e6fcab234200a2d9aef0 (diff) | |
INTEGRATION: CWS dba25 (1.9.38); FILE MERGED
2005/03/14 13:29:44 fs 1.9.38.3: RESYNC: (1.10-1.11); FILE MERGED
2005/03/08 09:00:57 fs 1.9.38.2: RESYNC: (1.9-1.10); FILE MERGED
2005/03/04 07:19:26 oj 1.9.38.1: #i43880# #i43912# use set connection as activeconnection
| -rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 66296ad3f..6fe4647c6 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AppControllerGen.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2005-03-10 16:44:07 $ + * last change: $Author: obo $ $Date: 2005-03-18 10:07:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -268,7 +268,8 @@ void OApplicationController::openDialog(const ::rtl::OUString& _sServiceName) ::osl::MutexGuard aGuard(m_aMutex); WaitObject aWO(getView()); - Sequence< Any > aArgs(2); + Reference<XConnection> xConnection = getActiveConnection(); + Sequence< Any > aArgs(xConnection.is() ? 3 : 2); Reference< ::com::sun::star::awt::XWindow> xWindow = getTopMostContainerWindow(); if ( !xWindow.is() ) @@ -290,6 +291,10 @@ void OApplicationController::openDialog(const ::rtl::OUString& _sServiceName) aArgs[1] <<= PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), 0, makeAny(sInitialSelection), PropertyState_DIRECT_VALUE); + if ( xConnection.is() ) + aArgs[2] <<= PropertyValue( + PROPERTY_ACTIVECONNECTION, 0, + makeAny(xConnection), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xAdminDialog; |