Kaydet (Commit) 3f736b99 authored tarafından Noel Grandin's avatar Noel Grandin

fix build

by reverting part of commit b18e1bc6
"loplugin:unusedfields"

Change-Id: I69274b54f65e22ec15a053b54af84635d245f51b
üst 0a6c8bde
......@@ -225,7 +225,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
m_xFrame(xFrame),
m_xStatusIndicator(xStatusIndicator),
m_pMapperStream(nullptr),
m_aDefaultState(),
m_aDefaultState(this),
m_bSkipUnknown(false),
m_aFontIndexes(),
m_aColorTable(),
......@@ -3181,8 +3181,9 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
}
}
RTFParserState::RTFParserState()
: nInternalState(RTFInternalState::NORMAL),
RTFParserState::RTFParserState(RTFDocumentImpl* pDocumentImpl)
: m_pDocumentImpl(pDocumentImpl),
nInternalState(RTFInternalState::NORMAL),
eDestination(Destination::NORMAL),
eFieldStatus(RTFFieldStatus::NONE),
nBorderState(RTFBorderState::NONE),
......@@ -3211,7 +3212,7 @@ RTFParserState::RTFParserState()
aPicture(),
aShape(),
aDrawingObject(),
aFrame(),
aFrame(this),
eRunType(RunType::LOCH),
isRightToLeft(false),
nYear(0),
......@@ -3236,7 +3237,7 @@ RTFParserState::RTFParserState()
void RTFDocumentImpl::resetFrame()
{
m_aStates.top().aFrame = RTFFrame();
m_aStates.top().aFrame = RTFFrame(&m_aStates.top());
}
RTFColorTableEntry::RTFColorTableEntry()
......@@ -3292,8 +3293,9 @@ RTFDrawingObject::RTFDrawingObject()
{
}
RTFFrame::RTFFrame()
: m_nX(0),
RTFFrame::RTFFrame(RTFParserState* pParserState)
: m_pDocumentImpl(pParserState->m_pDocumentImpl),
m_nX(0),
m_nY(0),
m_nW(0),
m_nH(0),
......
......@@ -195,7 +195,7 @@ private:
Id m_nHRule;
boost::optional<Id> m_oWrap;
public:
RTFFrame();
RTFFrame(RTFParserState* pParserState);
sal_Int16 m_nAnchorType;
/// Convert the stored properties to Sprms
......@@ -213,8 +213,9 @@ class RTFDocumentImpl;
class RTFParserState
{
public:
RTFParserState();
RTFParserState(RTFDocumentImpl* pDocumentImpl);
RTFDocumentImpl* m_pDocumentImpl;
RTFInternalState nInternalState;
Destination eDestination;
RTFFieldStatus eFieldStatus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment