diff options
Diffstat (limited to 'sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 0bdbd7cb569f..9b7b1f5ec2d3 100644..100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -24,11 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef SD_SLIDESORTER_CLIPBOARD #define SD_SLIDESORTER_CLIPBOARD #include "ViewClipboard.hxx" - +#include "controller/SlsSelectionObserver.hxx" #include <sal/types.h> #include <tools/solar.h> #include <svx/svdpage.hxx> @@ -96,6 +97,8 @@ public: USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); + void Abort (void); + protected: virtual USHORT DetermineInsertPosition ( const SdTransferable& rTransferable); @@ -127,6 +130,15 @@ private: */ bool mbUpdateSelectionPending; + /** Used when a drop is executed to combine all undo actions into one. + Typically created in ExecuteDrop() and released in DragFinish(). + */ + class UndoContext; + ::boost::scoped_ptr<UndoContext> mpUndoContext; + + ::boost::scoped_ptr<SelectionObserver::Context> mpSelectionObserverContext; + ULONG mnDragFinishedUserEventId; + void CreateSlideTransferable ( ::Window* pWindow, bool bDrag); @@ -208,6 +220,11 @@ private: ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer); + + /** Asynchronous part of DragFinished. The argument is the sal_Int8 + nDropAction, disguised as void*. + */ + DECL_LINK(ProcessDragFinished, void*); }; } } } // end of namespace ::sd::slidesorter::controller |