diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-07 01:07:02 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-07 01:09:05 -0500 |
| commit | 9dd8413a61301305d1bafacc5d3511cf3c3129e2 (patch) | |
| tree | f508e8ad890789445ca29dbd86316ff4ecaebe6d /include | |
| parent | f28ee9e4004ebf51332a998638aea779e07f6450 (diff) | |
Forward-declare MarkedUndoAction.
Change-Id: I1c36077cada47bacfb8436cf3fb659e47d02da60
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/undo.hxx | 22 | ||||
| -rw-r--r-- | include/svx/svddrag.hxx | 2 |
2 files changed, 7 insertions, 17 deletions
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index d63a69b950f7..24fcbbc60110 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -25,10 +25,9 @@ #include <boost/scoped_ptr.hpp> -#include <vector> #include <limits> - +struct MarkedUndoAction; class SVL_DLLPUBLIC SfxRepeatTarget { @@ -84,21 +83,7 @@ private: typedef sal_Int32 UndoStackMark; #define MARK_INVALID ::std::numeric_limits< UndoStackMark >::max() - - -struct MarkedUndoAction -{ - SfxUndoAction* pAction; - ::std::vector< UndoStackMark > aMarks; - - MarkedUndoAction( SfxUndoAction* i_action ) - :pAction( i_action ) - ,aMarks() - { - } -}; - -class SfxUndoActions +class SVL_DLLPUBLIC SfxUndoActions { struct Impl; Impl* mpImpl; @@ -114,6 +99,9 @@ public: const MarkedUndoAction& operator[]( size_t i ) const; MarkedUndoAction& operator[]( size_t i ); + const SfxUndoAction* GetUndoAction( size_t i ) const; + SfxUndoAction* GetUndoAction( size_t i ); + void Remove( size_t i_pos ); void Remove( size_t i_pos, size_t i_count ); void Insert( SfxUndoAction* i_action, size_t i_pos ); diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index fd43db2bf1d7..b622999d889f 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -25,6 +25,8 @@ #include <tools/fract.hxx> #include <svx/svxdllapi.h> +#include <vector> + // Status information for specialized object dragging. In order for the model // to stay status free, the status data is kept on the View // and handed over to the object at the appropriate time as a parameter. |