diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-15 21:06:24 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-16 08:05:27 +0200 |
| commit | 9e9f310648992e103d664a82a96ed5bdee1db4ad (patch) | |
| tree | bdb03dd35ebf2b043bb68ef25196b435dafe01f7 /sw/source/filter | |
| parent | 5e8eb215d9709c384f0f84c339d03e5d9c60c43c (diff) | |
sw RTF filter: more cleanup of redundant virtual keywords
Change-Id: Ia2596e11f303edf5e1b81ab90062fd93df42159b
Reviewed-on: https://gerrit.libreoffice.org/38847
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/rtfexportfilter.hxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfstringbuffer.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfstringbuffer.hxx | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 473c9b2680fc..c58bf2b89554 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -48,14 +48,14 @@ protected: css::uno::Reference<css::lang::XComponent> m_xSrcDoc; public: explicit RtfExportFilter(css::uno::Reference<css::uno::XComponentContext> xCtx); - virtual ~RtfExportFilter() override; + ~RtfExportFilter() override; // XFilter - virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) override; - virtual void SAL_CALL cancel() override; + sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) override; + void SAL_CALL cancel() override; // XExporter - virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) override; + void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) override; RtfWriter m_aWriter; }; diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx index 3d7cffc76a7d..cd6c3eb6c4c2 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.cxx +++ b/sw/source/filter/ww8/rtfstringbuffer.cxx @@ -9,11 +9,7 @@ #include "rtfstringbuffer.hxx" #include "rtfattributeoutput.hxx" -RtfStringBufferValue::RtfStringBufferValue() - : m_pFlyFrameFormat(nullptr), - m_pGrfNode(nullptr) -{ -} +RtfStringBufferValue::RtfStringBufferValue() = default; RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode) : m_pFlyFrameFormat(pFlyFrameFormat), diff --git a/sw/source/filter/ww8/rtfstringbuffer.hxx b/sw/source/filter/ww8/rtfstringbuffer.hxx index c1d90041e33b..e8e5580569f2 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.hxx +++ b/sw/source/filter/ww8/rtfstringbuffer.hxx @@ -31,8 +31,8 @@ public: bool isGraphic() const; OStringBuffer m_aBuffer; - const SwFlyFrameFormat* m_pFlyFrameFormat; - const SwGrfNode* m_pGrfNode; + const SwFlyFrameFormat* m_pFlyFrameFormat = nullptr; + const SwGrfNode* m_pGrfNode = nullptr; }; /// Wrapper around OStringBuffers, so less hexdump of graphics have to be kept in memory during RTF export. |