diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-07 16:15:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 11:57:09 +0200 |
| commit | d608fa64b7ca3af99288ac7b904747cc09b23315 (patch) | |
| tree | ee3b6181da2ae0fd6d9bab67903021e2016804e2 /include | |
| parent | 1b921c2f1ba4bba7e69565fb29cb1738cea25497 (diff) | |
loplugin:inlinefields in PPTTextRulerInterpreter
Change-Id: Ic814a5dce507b5a0cb49a093a60bd71768ee40d5
Reviewed-on: https://gerrit.libreoffice.org/36348
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index a34b601013ae..f554333d26b1 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -46,6 +46,7 @@ #include <tools/ref.hxx> #include <tools/solar.h> #include <vcl/graph.hxx> +#include <salhelper/simplereferenceobject.hxx> namespace boost { template <class T> class optional; @@ -962,10 +963,8 @@ struct PPTTabEntry sal_uInt16 nStyle; }; -struct PPTRuler +struct PPTRuler : public salhelper::SimpleReferenceObject { - sal_uInt32 nRefCount; - sal_Int32 nFlags; sal_uInt16 nDefaultTab; sal_uInt16 nTextOfs[nMaxPPTLevels]; @@ -975,12 +974,12 @@ struct PPTRuler sal_uInt16 nTabCount; PPTRuler(); - ~PPTRuler(); + virtual ~PPTRuler() override; }; struct PPTTextRulerInterpreter { - PPTRuler *mpImplRuler; + rtl::Reference<PPTRuler> mxImplRuler; PPTTextRulerInterpreter(); PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRuler ); @@ -992,12 +991,12 @@ struct PPTTextRulerInterpreter ~PPTTextRulerInterpreter(); sal_uInt16 GetTabOffsetByIndex( sal_uInt16 nIndex ) const - { return mpImplRuler->pTab[ nIndex ].nOffset; }; + { return mxImplRuler->pTab[ nIndex ].nOffset; }; sal_uInt16 GetTabStyleByIndex( sal_uInt16 nIndex ) const - { return mpImplRuler->pTab[ nIndex ].nStyle; }; + { return mxImplRuler->pTab[ nIndex ].nStyle; }; - sal_uInt16 GetTabCount() const { return mpImplRuler->nTabCount; }; + sal_uInt16 GetTabCount() const { return mxImplRuler->nTabCount; }; bool GetDefaultTab( sal_uInt32 nLevel, sal_uInt16& nValue ) const; bool GetTextOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const; bool GetBulletOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const; |