From d2726959ff54f1c0b19dc4e605bd3ebadbdc0283 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 20 Jul 2015 13:00:22 +0200 Subject: editeng: replace boost::ptr_map with std::map> Change-Id: Ia6fce8eceb364d83cbbf5abcf734be262614e792 --- include/editeng/svxrtf.hxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'include/editeng/svxrtf.hxx') 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 #include #include -#include #include namespace vcl { class Font; } @@ -79,7 +78,7 @@ public: typedef std::deque< Color* > SvxRTFColorTbl; -typedef boost::ptr_map SvxRTFFontTbl; +typedef std::map> SvxRTFFontTbl; typedef std::map> 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: */ -- cgit