Tag: cws_src680_asyncdialogs2 User: pb Date: 2008-02-04 05:19:58+0000 Removed: dba/dbaccess/source/inc/dba_reghelper.hxx dba/dbaccess/source/shared/dba_reghelper.cxx
Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/app/AppController.hxx Log: RESYNC:; FILE REMOVED File Changes: Directory: /dba/dbaccess/source/inc/ ==================================== File [removed]: dba_reghelper.hxx Directory: /dba/dbaccess/source/shared/ ======================================= File [removed]: dba_reghelper.cxx Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.37.34.10&r2=1.37.34.11 Delta lines: +48 -35 --------------------- --- AppController.cxx 2007-12-10 09:25:19+0000 1.37.34.10 +++ AppController.cxx 2008-02-04 05:19:31+0000 1.37.34.11 @@ -425,6 +425,14 @@ if ( m_xDataSource.is() ) { m_xDataSource->removePropertyChangeListener(::rtl::OUString(), this); + m_xDataSource->removePropertyChangeListener(PROPERTY_INFO, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_URL, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_ISPASSWORDREQUIRED, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_LAYOUTINFORMATION, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_SUPPRESSVERSIONCL, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_TABLEFILTER, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_TABLETYPEFILTER, this); + m_xDataSource->removePropertyChangeListener(PROPERTY_USER, this); // otherwise we may delete our datasource twice Reference<XPropertySet> xProp = m_xDataSource; m_xDataSource = NULL; @@ -462,7 +470,7 @@ } m_pView = NULL; - OApplicationController_CBASE::disposing(); + OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5 } //-------------------------------------------------------------------- @@ -522,13 +530,11 @@ "OApplicationController::disposing: the below code will ignore this call - why?" ); if ( getContainer() && getContainer()->getElementType() == E_TABLE ) - { + getContainer()->clearPages(); if ( m_xDataSourceConnection == xCon ) { - getContainer()->clearPages(); - m_xDataSourceConnection.clear(); m_xMetaData.clear(); - } + m_xDataSourceConnection.clear(); } } else if ( _rSource.Source == m_xModel ) @@ -622,6 +628,11 @@ { switch (_nId) { + case SID_OPENURL: + aReturn.bEnabled = sal_True; + if ( m_xModel.is() ) + aReturn.sTitle = m_xModel->getURL(); + break; case ID_BROWSER_COPY: { sal_Int32 nCount = getContainer()->getSelectionCount(); @@ -683,11 +694,15 @@ aReturn.bEnabled = xEnumAccess.is(); if ( aReturn.bEnabled ) { - static ::rtl::OUString s_sReportDesign(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory")); - Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(s_sReportDesign); + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xServiceFactory); + aReturn.bEnabled = sReportEngineServiceName.getLength() != 0; + if ( aReturn.bEnabled ) + { + const Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); aReturn.bEnabled = xEnumDrivers.is() && xEnumDrivers->hasMoreElements(); } } + } break; case SID_DB_APP_VIEW_TABLES: aReturn.bEnabled = sal_True; @@ -1009,37 +1024,28 @@ break; case ID_BROWSER_PASTE: { - TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(getView())); + const TransferableDataHelper& rTransferData( getViewClipboard() ); ElementType eType = getContainer()->getElementType(); switch( eType ) { case E_TABLE: { - //dyf add - //for get the selected tablename - ::std::vector< ::rtl::OUString> aList; - getSelectionElementNames(aList); - ::rtl::OUString sTableNameToInsertInto; - + // get the selected tablename + ::std::vector< ::rtl::OUString > aList; + getSelectionElementNames( aList ); if ( !aList.empty() ) - { - sTableNameToInsertInto = *aList.begin(); - m_aTableCopyHelper.SetDefaultTableName(sTableNameToInsertInto); - m_aTableCopyHelper.SetIsSelectCopytable(true); - } + m_aTableCopyHelper.SetTableNameForAppend( *aList.begin() ); else - { - m_aTableCopyHelper.SetIsSelectCopytable(false); - } - //dyf add end - m_aTableCopyHelper.pasteTable( aTransferData , getDatabaseName(), ensureConnection()); + m_aTableCopyHelper.ResetTableNameForAppend(); + + m_aTableCopyHelper.pasteTable( rTransferData , getDatabaseName(), ensureConnection() ); } break; case E_QUERY: - if ( getViewClipboard().HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) ) - paste( E_QUERY,ODataAccessObjectTransferable::extractObjectDescriptor(aTransferData) ); + if ( rTransferData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) ) + paste( E_QUERY, ODataAccessObjectTransferable::extractObjectDescriptor( rTransferData ) ); break; default: { @@ -1056,7 +1062,7 @@ ) sFolderNameToInsertInto = *aList.begin(); } - paste( eType,OComponentTransferable::extractComponentDescriptor(aTransferData),sFolderNameToInsertInto ); + paste( eType, OComponentTransferable::extractComponentDescriptor( rTransferData ), sFolderNameToInsertInto ); } break; } @@ -1497,6 +1503,8 @@ implDescribeSupportedFeature( ".uno:DBShowDocPreview", SID_DB_APP_VIEW_DOC_PREVIEW, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:OpenUrl", SID_OPENURL, CommandGroup::APPLICATION ); + // this one should not appear under Tools->Customize->Keyboard implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); @@ -1719,6 +1727,9 @@ } InvalidateAll(); + EventObject aEvent(*this); + m_aSelectionListeners.forEach<XSelectionChangeListener>( + ::boost::bind(&XSelectionChangeListener::selectionChanged,_1,boost::cref(aEvent))); } m_eOldType = _eType; @@ -1892,10 +1903,12 @@ ::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { + Reference< XComponent > xComponent,xDefinition; if ( E_QUERY == _eType ) - aHelper->newQueryWithPilot( ); + xComponent = aHelper->newQueryWithPilot( ); else - aHelper->newTableWithPilot( ); + xComponent = aHelper->newTableWithPilot( ); + addDocumentListener(xComponent,xDefinition); } } break; @@ -2302,7 +2315,7 @@ if ( pTransfer && getContainer()->getDetailView() ) { ElementType eType = getContainer()->getElementType(); - pTransfer->StartDrag( getContainer()->getDetailView(), ((eType == E_FORM || eType == E_REPORT) ? DND_ACTION_COPYMOVE : DND_ACTION_COPY) ); + pTransfer->StartDrag( getContainer()->getDetailView()->getTreeWindow(), ((eType == E_FORM || eType == E_REPORT) ? DND_ACTION_COPYMOVE : DND_ACTION_COPY) ); } } catch(const Exception& ) Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.hxx?r1=1.15.38.7&r2=1.15.38.8 Delta lines: +1 -1 ------------------- --- AppController.hxx 2007-12-10 09:25:22+0000 1.15.38.7 +++ AppController.hxx 2008-02-04 05:19:34+0000 1.15.38.8 @@ -396,7 +396,7 @@ @return <TRUE/> if the document could be suspended, otherwise <FALSE/>. */ - sal_Bool suspendDocument(const TDocuments::key_type& _xComponent,sal_Bool _bSuspend); + sal_Bool suspendDocument(const TDocuments::value_type& _xComponent,sal_Bool _bSuspend); /** suspend all open documents. @return --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
