loplugin:unusedfields

Change-Id: I852e98b16fdcb88b04e39d11e3101d502c918c24
Reviewed-on: https://gerrit.libreoffice.org/29078
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 9 insertions, 12 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 92b9b96f8c86..6dd8a782c4e1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -225,7 +225,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
       m_xFrame(xFrame),
       m_xStatusIndicator(xStatusIndicator),
       m_pMapperStream(nullptr),
-      m_aDefaultState(this),
+      m_aDefaultState(),
       m_bSkipUnknown(false),
       m_aFontIndexes(),
       m_aColorTable(),
@@ -3181,9 +3181,8 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
     }
 }
 
-RTFParserState::RTFParserState(RTFDocumentImpl* pDocumentImpl)
-    : m_pDocumentImpl(pDocumentImpl),
-      nInternalState(RTFInternalState::NORMAL),
+RTFParserState::RTFParserState()
+    : nInternalState(RTFInternalState::NORMAL),
       eDestination(Destination::NORMAL),
       eFieldStatus(RTFFieldStatus::NONE),
       nBorderState(RTFBorderState::NONE),
@@ -3212,7 +3211,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl* pDocumentImpl)
       aPicture(),
       aShape(),
       aDrawingObject(),
-      aFrame(this),
+      aFrame(),
       eRunType(RunType::LOCH),
       isRightToLeft(false),
       nYear(0),
@@ -3237,7 +3236,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl* pDocumentImpl)
 
 void RTFDocumentImpl::resetFrame()
 {
-    m_aStates.top().aFrame = RTFFrame(&m_aStates.top());
+    m_aStates.top().aFrame = RTFFrame();
 }
 
 RTFColorTableEntry::RTFColorTableEntry()
@@ -3293,9 +3292,8 @@ RTFDrawingObject::RTFDrawingObject()
 {
 }
 
-RTFFrame::RTFFrame(RTFParserState* pParserState)
-    : m_pDocumentImpl(pParserState->m_pDocumentImpl),
-      m_nX(0),
+RTFFrame::RTFFrame()
+    : m_nX(0),
       m_nY(0),
       m_nW(0),
       m_nH(0),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d1b5ca1f1bad..10b47bacc116 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -195,7 +195,7 @@ private:
     Id m_nHRule;
     boost::optional<Id> m_oWrap;
 public:
-    RTFFrame(RTFParserState* pParserState);
+    RTFFrame();
     sal_Int16 m_nAnchorType;
 
     /// Convert the stored properties to Sprms
@@ -213,9 +213,8 @@ class RTFDocumentImpl;
 class RTFParserState
 {
 public:
-    RTFParserState(RTFDocumentImpl* pDocumentImpl);
+    RTFParserState();
 
-    RTFDocumentImpl* m_pDocumentImpl;
     RTFInternalState nInternalState;
     Destination eDestination;
     RTFFieldStatus eFieldStatus;