diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-20 13:00:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-20 13:47:41 +0200 |
| commit | d2726959ff54f1c0b19dc4e605bd3ebadbdc0283 (patch) | |
| tree | f02bf22c2fb8dc12f7e8fec8671f1243242ef114 /include/editeng/svxrtf.hxx | |
| parent | 144d82434ddbb77bb3cd722bc7b636a612bb9db7 (diff) | |
editeng: replace boost::ptr_map with std::map<std::unique_ptr>>
Change-Id: Ia6fce8eceb364d83cbbf5abcf734be262614e792
Diffstat (limited to 'include/editeng/svxrtf.hxx')
| -rw-r--r-- | include/editeng/svxrtf.hxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index f96eea6e8d16..c4b1ef73d1f8 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -31,7 +31,6 @@ #include <map> #include <utility> #include <memory> -#include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_vector.hpp> namespace vcl { class Font; } @@ -79,7 +78,7 @@ public: typedef std::deque< Color* > SvxRTFColorTbl; -typedef boost::ptr_map<short, vcl::Font> SvxRTFFontTbl; +typedef std::map<short, std::unique_ptr<vcl::Font>> SvxRTFFontTbl; typedef std::map<sal_uInt16, std::unique_ptr<SvxRTFStyleType>> SvxRTFStyleTbl; // SvxRTFItemStack can't be "std::stack< SvxRTFItemStackType* >" type, because @@ -170,15 +169,11 @@ struct RTFPardAttrMapIds }; - - - - class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser { SvStream &rStrm; SvxRTFColorTbl aColorTbl; - SvxRTFFontTbl aFontTbl; + SvxRTFFontTbl m_FontTable; SvxRTFStyleTbl m_StyleTable; SvxRTFItemStack aAttrStack; SvxRTFItemStackList aAttrSetList; @@ -389,7 +384,6 @@ inline SfxItemSet& SvxRTFParser::GetAttrSet() } -#endif - // INCLUDED_EDITENG_SVXRTF_HXX +#endif // INCLUDED_EDITENG_SVXRTF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |