diff options
author | Elton Chung <elton@layerjet.com> | 2012-03-02 01:58:12 +0800 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-01 20:17:14 +0200 |
commit | e8dbf6840ca118222ad95856dc7ea06eaffc3b66 (patch) | |
tree | 9444cd4a544170ad205ae0cd90aa4882d2160d2e /sot | |
parent | bd205223ec029a875c662474bb6d423d3cdd1994 (diff) |
Remove unused code
Diffstat (limited to 'sot')
-rw-r--r-- | sot/inc/sot/exchange.hxx | 17 | ||||
-rw-r--r-- | sot/source/base/formats.cxx | 57 |
2 files changed, 0 insertions, 74 deletions
diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx index 7ab886f314ac..2623ad48534b 100644 --- a/sot/inc/sot/exchange.hxx +++ b/sot/inc/sot/exchange.hxx @@ -224,23 +224,6 @@ public: // In:- optional - check the contents of Xtransferable const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL ); - // same for XTransferable interface - static sal_uInt16 GetExchangeAction( - // XTransferable - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, - // Ziel der Aktion (EXCHG_DEST_*) - sal_uInt16 nDestination, - // Aktionen, die Quelle unterstuetzt (EXCHG_SOURCE_...) - sal_uInt16 nSourceOptions, - // vom Anwender gewaehlte Aktion (EXCHG_IN_*, EXCHG_INOUT_*) - sal_uInt16 nUserAction, - // In:- Out: Zu benutzendes Format - sal_uLong& rFormat, - // In:- Out: Default-Action (EXCHG_IN_*, EXCHG_INOUT_*) - sal_uInt16& rDefaultAction, - // In:- optional - check only for this specific format - sal_uLong nOnlyTestFormat = 0 ); - static sal_uInt16 IsChart( const SvGlobalName& rName ); static sal_uInt16 IsMath( const SvGlobalName& rName ); }; diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index efb34c5428c9..67514735230b 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1548,63 +1548,6 @@ sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavor // ----------------------------------------------------------------------------- -sal_uInt16 SotExchange::GetExchangeAction( - const Reference< XTransferable >& rxTransferable, - sal_uInt16 nDestination, sal_uInt16 nSourceOptions, - sal_uInt16 nUserAction, sal_uLong& rFormat, - sal_uInt16& rDefaultAction, sal_uLong nOnlyTestFormat ) -{ - DataFlavorExVector aVector; - - if( rxTransferable.is() ) - { - try - { - const Sequence< DataFlavor > aFlavors( rxTransferable->getTransferDataFlavors() ); - - for( sal_Int32 i = 0; i < aFlavors.getLength(); i++ ) - { - DataFlavorEx aFlavorEx; - const DataFlavor& rFlavor = aFlavors[ i ]; - - aFlavorEx.MimeType = rFlavor.MimeType; - aFlavorEx.HumanPresentableName = rFlavor.HumanPresentableName; - aFlavorEx.DataType = rFlavor.DataType; - aFlavorEx.mnSotId = SotExchange::RegisterFormat( rFlavor ); - - aVector.push_back( aFlavorEx ); - - if( ( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) && - !IsFormatSupported( aVector, SOT_FORMAT_BITMAP ) ) - { - if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavorEx ) ) - { - aFlavorEx.mnSotId = SOT_FORMAT_BITMAP; - aVector.push_back( aFlavorEx ); - } - } - else if( ( ( SOT_FORMATSTR_ID_WMF == aFlavorEx.mnSotId ) || - ( SOT_FORMATSTR_ID_EMF == aFlavorEx.mnSotId ) ) && - !IsFormatSupported( aVector, SOT_FORMAT_GDIMETAFILE ) ) - { - if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_GDIMETAFILE, aFlavorEx ) ) - { - aFlavorEx.mnSotId = SOT_FORMAT_GDIMETAFILE; - aVector.push_back( aFlavorEx ); - } - } - } - } - catch( const ::com::sun::star::uno::Exception& ) - { - } - } - - return( SotExchange::GetExchangeAction( aVector, nDestination, nSourceOptions, - nUserAction, rFormat, rDefaultAction, - nOnlyTestFormat, &rxTransferable ) ); -} - sal_uInt16 SotExchange::IsChart( const SvGlobalName& rName ) { sal_uInt16 nRet=0; |