diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-19 09:14:00 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-19 09:16:04 -0500 |
commit | 58ce60da28b019be3dcf52c6b9fc51b91361137e (patch) | |
tree | d1fdb6fbb48ef1cdf54dd9d08d5d2dab9898f53c | |
parent | 78ac39dcef36b3881b2574b2db1e0d5a068c7804 (diff) |
Move SdrObjUserDataList out of the header.
It's only used within SdrObject. This also eliminates the need to
include boost's ptr_vector in the header file.
Change-Id: I5ba9b424be21c5ee3280364de1d73b0fa3921129
-rw-r--r-- | include/svx/svdobj.hxx | 18 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 17 |
2 files changed, 18 insertions, 17 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 0f8fa44706f2..9768b9ce41d3 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -42,7 +42,6 @@ #include <vcl/timer.hxx> #include <boost/optional.hpp> -#include <boost/ptr_container/ptr_vector.hpp> // forward declarations @@ -73,6 +72,7 @@ namespace tools { class PolyPolygon; } class SfxPoolItem; class SdrVirtObj; class SdrDragView; +class SdrObjUserDataList; namespace sdr { @@ -208,22 +208,6 @@ public: virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; -class SdrObjUserDataList -{ - typedef boost::ptr_vector<SdrObjUserData> ListType; - ListType maList; - -public: - SdrObjUserDataList(); - ~SdrObjUserDataList(); - - size_t GetUserDataCount() const; - const SdrObjUserData* GetUserData(size_t nNum) const; - SdrObjUserData* GetUserData(size_t nNum); - void AppendUserData(SdrObjUserData* pData); - void DeleteUserData(size_t nNum); -}; - // all geometrical data of an arbitrary object for use in undo/redo class SVX_DLLPUBLIC SdrObjGeoData { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ba3c477202fb..9c251bc8b232 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -130,6 +130,7 @@ #include <rtl/strbuf.hxx> #include <svdoopengl.hxx> #include <boost/scoped_ptr.hpp> +#include <boost/ptr_container/ptr_vector.hpp> using namespace ::com::sun::star; @@ -224,6 +225,22 @@ OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, return OUString(); } +class SdrObjUserDataList +{ + typedef boost::ptr_vector<SdrObjUserData> ListType; + ListType maList; + +public: + SdrObjUserDataList(); + ~SdrObjUserDataList(); + + size_t GetUserDataCount() const; + const SdrObjUserData* GetUserData(size_t nNum) const; + SdrObjUserData* GetUserData(size_t nNum); + void AppendUserData(SdrObjUserData* pData); + void DeleteUserData(size_t nNum); +}; + SdrObjUserDataList::SdrObjUserDataList() {} SdrObjUserDataList::~SdrObjUserDataList() {} |