diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-20 12:54:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-20 13:47:40 +0200 |
| commit | 144d82434ddbb77bb3cd722bc7b636a612bb9db7 (patch) | |
| tree | 3e2600bcecc729ad16ec6285fd2b5c26ff258a3a /include/editeng/svxrtf.hxx | |
| parent | 97a0e7558b24792827d77217fb2d8b1106056963 (diff) | |
editeng: replace boost::ptr_map with std::map<std::unique_ptr>>
Change-Id: Id59fb4ee59872e60094bde85746416c83f058b00
Diffstat (limited to 'include/editeng/svxrtf.hxx')
| -rw-r--r-- | include/editeng/svxrtf.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index fe93c33ae15a..f96eea6e8d16 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -27,8 +27,10 @@ #include <editeng/editengdllapi.h> #include <deque> -#include <utility> #include <vector> +#include <map> +#include <utility> +#include <memory> #include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_vector.hpp> @@ -78,7 +80,7 @@ public: typedef std::deque< Color* > SvxRTFColorTbl; typedef boost::ptr_map<short, vcl::Font> SvxRTFFontTbl; -typedef boost::ptr_map<sal_uInt16, SvxRTFStyleType> SvxRTFStyleTbl; +typedef std::map<sal_uInt16, std::unique_ptr<SvxRTFStyleType>> SvxRTFStyleTbl; // SvxRTFItemStack can't be "std::stack< SvxRTFItemStackType* >" type, because // the methods are using operator[] in sw/source/filter/rtf/rtftbl.cxx file @@ -177,7 +179,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser SvStream &rStrm; SvxRTFColorTbl aColorTbl; SvxRTFFontTbl aFontTbl; - SvxRTFStyleTbl aStyleTbl; + SvxRTFStyleTbl m_StyleTable; SvxRTFItemStack aAttrStack; SvxRTFItemStackList aAttrSetList; @@ -292,7 +294,7 @@ protected: // Query/Set the current insert position void SetInsPos( const SvxPosition& rNew ); - SvxRTFStyleTbl& GetStyleTbl() { return aStyleTbl; } + SvxRTFStyleTbl& GetStyleTbl() { return m_StyleTable; } public: |