User: rt Date: 2008-01-30 08:41:09+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: INTEGRATION: CWS dba24d (1.48.2); FILE MERGED 2007/12/01 13:40:24 fs 1.48.2.4: RESYNC: (1.48-1.50); FILE MERGED 2007/11/29 08:50:12 oj 1.48.2.3: #i84051# return title when state is asked for OpenURL 2007/11/08 14:14:39 fs 1.48.2.2: #i81658# re-factoring of the Copy Table wizard 2007/11/07 14:54:00 oj 1.48.2.1: #i78231# use treelistbox as drag window and not the parent File Changes: 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.52&r2=1.53 Delta lines: +20 -22 --------------------- --- AppController.cxx 2008-01-29 14:07:00+0000 1.52 +++ AppController.cxx 2008-01-30 08:41:07+0000 1.53 @@ -624,6 +624,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(); @@ -1015,37 +1020,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: { @@ -1062,7 +1058,7 @@ ) sFolderNameToInsertInto = *aList.begin(); } - paste( eType,OComponentTransferable::extractComponentDescriptor(aTransferData),sFolderNameToInsertInto ); + paste( eType, OComponentTransferable::extractComponentDescriptor( rTransferData ), sFolderNameToInsertInto ); } break; } @@ -1483,6 +1479,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); @@ -2293,7 +2291,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& ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
