User: vg Date: 05/03/10 08:45:57 Modified: /dba/dbaccess/source/ui/browser/ unodatbr.cxx
Log: INTEGRATION: CWS dba24 (1.165.4); FILE MERGED 2005/03/08 10:17:16 oj 1.165.4.5: RESYNC: (1.166-1.167); FILE MERGED 2005/02/21 13:10:59 oj 1.165.4.4: RESYNC: (1.165-1.166); FILE MERGED 2005/02/18 12:35:38 oj 1.165.4.3: #i42460# changes for the separation of datasource and database document(model) 2005/02/10 11:32:25 oj 1.165.4.2: #i42316# set the model as args for loadComponentFromURL call 2005/02/04 08:47:32 oj 1.165.4.1: #i41967# remove SetCursor 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.167&r2=1.168 Delta lines: +8 -18 -------------------- --- unodatbr.cxx 1 Mar 2005 19:16:06 -0000 1.167 +++ unodatbr.cxx 10 Mar 2005 16:45:54 -0000 1.168 @@ -2932,10 +2932,7 @@ { SvLBoxEntry* pElements = m_pTreeModel->FirstChild(pContainers); if ( pElements ) - { - m_pTreeView->getListBox()->SetCursor( pElements ); m_pTreeView->getListBox()->Collapse(pContainers); - } m_pTreeView->getListBox()->EnableExpandHandler(pContainers); // and delete their children (they are connection-relative) for (; pElements; ) @@ -3382,7 +3379,6 @@ // get the desktop object sal_Int32 nFrameSearchFlag = FrameSearchFlag::ALL | FrameSearchFlag::GLOBAL ; Reference< XComponentLoader > xFrameLoader(getORB()->createInstance(SERVICE_FRAME_DESKTOP),UNO_QUERY); - ::rtl::OUString sTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")); if ( xFrameLoader.is() ) { @@ -3394,25 +3390,19 @@ if (pTopLevelSelected) sInitialSelection = getDataSourceAcessor( pTopLevelSelected ); - INetURLObject aURLParser( sInitialSelection ); - ::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(); - } + Reference< XModel > xDocumentModel( + getDataSourceOrModel(getDataSourceByName_displayError( m_xDatabaseContext, sInitialSelection, getView(), getORB(), true )),UNO_QUERY); - if ( sURL.getLength() ) + if ( xDocumentModel.is() ) { + Sequence<PropertyValue > aArgs(1); + aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")); + aArgs[0].Value <<= xDocumentModel; xFrameLoader->loadComponentFromURL( - sURL, + xDocumentModel->getURL(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), nFrameSearchFlag, - Sequence<PropertyValue >() + aArgs ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
