diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-13 22:00:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-13 22:48:12 +0200 |
| commit | d037459ca5da62f0ae02a2796c661d41427e67ef (patch) | |
| tree | d0b0dd416376cbb1bab11fd4401827dbad2c2946 /filter/inc | |
| parent | 3a085e0b7e9249310edffeabe1c48b06b9d1fae0 (diff) | |
PPTParagraphObj: replace PPTPortionObj array with boost::ptr_vector
Remove null pointer checks as well, we've been dereferencing them
always since c21c2f82f9451c293c449e4647522d126a0f2bee (2001) already.
Change-Id: I978745ab922f7975a785857f7d17add62e37baba
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 1940e67c50e0..b8d54544ed8b 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -46,6 +46,7 @@ #include <vcl/font.hxx> #include <vector> #include <boost/optional.hpp> +#include <boost/ptr_container/ptr_vector.hpp> class SdrModel; class SdPage; @@ -1100,7 +1101,7 @@ class MSFILTER_DLLPUBLIC PPTPortionObj : public PPTCharPropSet public: - sal_Bool GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet ); + sal_Bool GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet ) const; SvxFieldItem* GetTextField(); PPTPortionObj( const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt32 nDepth ); @@ -1149,8 +1150,7 @@ public: sal_Bool mbTab; // if true, this paragraph has tabulators in text sal_uInt32 mnCurrentObject; - sal_uInt32 mnPortionCount; - PPTPortionObj** mpPortionList; + ::boost::ptr_vector<PPTPortionObj> m_PortionList; void UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const; sal_Bool GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet ); |