diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/svtools/transfer.hxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/svtools/transfer.hxx')
| -rw-r--r-- | include/svtools/transfer.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 03932c561600..3013a62a28eb 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -48,7 +48,7 @@ class ImageMap; class INetBookmark; class INetImage; class FileList; -class Window; +namespace vcl { class Window; } class Link; // Drag&Drop defines @@ -251,13 +251,13 @@ public: void PrepareOLE( const TransferableObjectDescriptor& rObjDesc ); - void CopyToClipboard( Window *pWindow ) const; - void CopyToSelection( Window *pWindow ) const; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void CopyToClipboard( vcl::Window *pWindow ) const; + void CopyToSelection( vcl::Window *pWindow ) const; + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); - static void ClearSelection( Window *pWindow ); + static void ClearSelection( vcl::Window *pWindow ); static ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSystemClipboard(); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); @@ -367,8 +367,8 @@ public: public: - static TransferableDataHelper CreateFromSystemClipboard( Window * pWindow ); - static TransferableDataHelper CreateFromSelection( Window * pWindow ); + static TransferableDataHelper CreateFromSystemClipboard( vcl::Window * pWindow ); + static TransferableDataHelper CreateFromSelection( vcl::Window * pWindow ); static bool IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, bool bCompareParameters = false ); @@ -416,7 +416,7 @@ public: // to be overridden by the application virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - DragSourceHelper( Window* pWindow ); + DragSourceHelper( vcl::Window* pWindow ); virtual ~DragSourceHelper(); }; @@ -475,7 +475,7 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - DropTargetHelper( Window* pWindow ); + DropTargetHelper( vcl::Window* pWindow ); DropTargetHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget ); virtual ~DropTargetHelper(); @@ -519,7 +519,7 @@ public: bool HasAnyData() const; using TransferableHelper::StartDrag; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link& rCallbck, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); |