User: kz Date: 05/01/21 09:09:37 Modified: /dba/dbaccess/source/ui/browser/ unodatbr.cxx
Log: INTEGRATION: CWS dba22 (1.163.2); FILE MERGED 2005/01/11 15:47:04 fs 1.163.2.3: #i39187# +getDataSourceByName_displayError 2005/01/07 07:54:37 oj 1.163.2.2: RESYNC: (1.163-1.164); FILE MERGED 2005/01/03 12:50:49 oj 1.163.2.1: #i39146# renable DnD in beamer File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.164&r2=1.165 Delta lines: +20 -12 --------------------- --- unodatbr.cxx 5 Jan 2005 12:34:02 -0000 1.164 +++ unodatbr.cxx 21 Jan 2005 17:09:34 -0000 1.165 @@ -426,6 +426,8 @@ ,m_bInSuspend(sal_False) ,m_bEnableBrowser(sal_True) ,m_nBorder(1) + ,m_aTableCopyHelper(this) + ,m_nAsyncDrop(0) { DBG_CTOR(SbaTableQueryBrowser,NULL); } @@ -3391,20 +3393,26 @@ if (pTopLevelSelected) sInitialSelection = getDataSourceAcessor( pTopLevelSelected ); - Reference<XModel> xDS; INetURLObject aURLParser( sInitialSelection ); - if ( ( aURLParser.GetProtocol() != INET_PROT_NOT_VALID ) || m_xDatabaseContext->hasByName( sInitialSelection ) ) - { - xDS.set(m_xDatabaseContext->getByName(sInitialSelection),UNO_QUERY); - if ( xDS.is() ) + ::rtl::OUString sURL; + if ( aURLParser.GetProtocol() != INET_PROT_NOT_VALID ) + sURL = aURLParser.GetMainURL( INetURLObject::NO_DECODE ); + else if ( m_xDatabaseContext->hasByName( sInitialSelection ) ) + { + Reference< XModel > xDocumentModel = + getDataSourceByName_displayError( m_xDatabaseContext, sInitialSelection, getView(), getORB(), true ); + if ( xDocumentModel.is() ) + sURL = xDocumentModel->getURL(); + } + + if ( sURL.getLength() ) { xFrameLoader->loadComponentFromURL( - xDS->getURL(), + sURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), nFrameSearchFlag, Sequence<PropertyValue >() ); - } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
