diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 00:50:08 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 01:15:34 +0200 |
| commit | 7f8e721e0536e68fca4d7abdf9711427eb1c576e (patch) | |
| tree | 21456eaa9b89d10de1581e2b4d9ec7a12c12d6b4 /sw/source/ui/inc/swdtflvr.hxx | |
| parent | remove XACC macro (diff) | |
| download | core-7f8e721e0536e68fca4d7abdf9711427eb1c576e.tar.gz core-7f8e721e0536e68fca4d7abdf9711427eb1c576e.zip | |
sw: remove macros
Change-Id: Iec447843f4f314bbd562f2e4821b4bcfadeeb565
Diffstat (limited to 'sw/source/ui/inc/swdtflvr.hxx')
| -rw-r--r-- | sw/source/ui/inc/swdtflvr.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index c4610263246b..e790297a7b1d 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -52,7 +52,6 @@ namespace nsTransferBufferType const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too! } -#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor class SwTransferable : public TransferableHelper { @@ -78,7 +77,7 @@ class SwTransferable : public TransferableHelper sal_Bool bCleanUp :1; //D&D cleanup after Drop (not by internal Drop) // helper methods for the copy - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const; + css::uno::Reference < css::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const; const Graphic* FindOLEReplacementGraphic() const; void DeleteSelection(); @@ -139,11 +138,11 @@ class SwTransferable : public TransferableHelper protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor ); + virtual sal_Bool GetData( const css::datatransfer::DataFlavor& rFlavor ); virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, - const DATA_FLAVOR& rFlavor ); + const css::datatransfer::DataFlavor& rFlavor ); virtual void DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); @@ -205,9 +204,9 @@ public: // the related SwView is being closed and the SwTransferable is invalid now void Invalidate() {pWrtShell = 0;} - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException ); }; |