diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-10 11:47:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-12 08:42:31 +0000 |
| commit | 68be1d3a8964d548a0113fe28a70e09349ddd0d7 (patch) | |
| tree | fbaf7d88cb7241e57a86d6f267822a0079cab6fa /writerfilter | |
| parent | c97f1aff7077959e65852f65e3217e5dffd262ce (diff) | |
fftester: use of deleted RTFParserState
but we only use the RTFParserState to use its m_pDocumentImpl and
the m_pDocumentImpl is never changed for the RTFParserState lifetime,
so take the m_pDocumentImpl at ctor time instead and use that
directly later
Change-Id: I15152e3f6d9008553b4a384a5e5da21373904cc9
Reviewed-on: https://gerrit.libreoffice.org/28803
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf | bin | 0 -> 1546 bytes | |||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf Binary files differnew file mode 100644 index 000000000000..3fe4b287640c --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 53f3fc26ab33..a1df2d08ee76 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3291,7 +3291,7 @@ RTFDrawingObject::RTFDrawingObject() } RTFFrame::RTFFrame(RTFParserState* pParserState) - : m_pParserState(pParserState), + : m_pDocumentImpl(pParserState->m_pDocumentImpl), m_nX(0), m_nY(0), m_nW(0), @@ -3309,10 +3309,10 @@ RTFFrame::RTFFrame(RTFParserState* pParserState) void RTFFrame::setSprm(Id nId, Id nValue) { - if (m_pParserState->m_pDocumentImpl->getFirstRun() && !m_pParserState->m_pDocumentImpl->isStyleSheetImport()) + if (m_pDocumentImpl->getFirstRun() && !m_pDocumentImpl->isStyleSheetImport()) { - m_pParserState->m_pDocumentImpl->checkFirstRun(); - m_pParserState->m_pDocumentImpl->setNeedPar(false); + m_pDocumentImpl->checkFirstRun(); + m_pDocumentImpl->setNeedPar(false); } switch (nId) { diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 32bbe4ab7b15..062cae249d90 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -182,12 +182,13 @@ public: }; class RTFParserState; +class RTFDocumentImpl; /// Stores the properties of a frame class RTFFrame { private: - RTFParserState* m_pParserState; + RTFDocumentImpl* m_pDocumentImpl; sal_Int32 m_nX, m_nY, m_nW, m_nH; sal_Int32 m_nHoriPadding, m_nVertPadding; sal_Int32 m_nHoriAlign, m_nHoriAnchor, m_nVertAlign, m_nVertAnchor; |