User: obo Date: 05/03/18 02:07:41 Modified: /dba/dbaccess/source/ui/app/ AppControllerGen.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.11&r2=1.12 Delta lines: +6 -1 ------------------- --- AppControllerGen.cxx 10 Mar 2005 16:44:07 -0000 1.11 +++ AppControllerGen.cxx 18 Mar 2005 10:07:38 -0000 1.12 @@ -268,7 +268,8 @@ ::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 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
