diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-10 19:00:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 09:15:42 +0200 |
| commit | 2da435922f9c1fcf52eb0c1eb3d6f73581e9f793 (patch) | |
| tree | 3d6fef2b96557a76b35eeae48f2df10a0a0511c5 /sw/source/filter | |
| parent | 7823684cb6fbe752dc64300799c5d102f61e0b70 (diff) | |
loplugin:constantparam
Change-Id: Ia11bf93768d5f722b7fe62df15f24809cb7e7f04
Reviewed-on: https://gerrit.libreoffice.org/60280
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 05e4dfdc7bb5..2d4816c50b66 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2382,7 +2382,7 @@ void DocxAttributeOutput::WritePostponedGraphic() { for (const auto & rPostponedDiagram : *m_pPostponedGraphic) FlyFrameGraphic(rPostponedDiagram.grfNode, rPostponedDiagram.size, - rPostponedDiagram.mOLEFrameFormat, rPostponedDiagram.mOLENode, + nullptr, nullptr, rPostponedDiagram.pSdrObj); m_pPostponedGraphic.reset(nullptr); } @@ -5378,7 +5378,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P else // we are writing out attributes, but w:drawing should not be inside w:rPr, { // so write it out later m_bPostponedProcessingFly = true ; - m_pPostponedGraphic->push_back(PostponedGraphic(pGrfNode, rFrame.GetLayoutSize(), nullptr, nullptr, pSdrObj)); + m_pPostponedGraphic->push_back(PostponedGraphic(pGrfNode, rFrame.GetLayoutSize(), pSdrObj)); } } } diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index e4c331ad0dcc..89263c239d6a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -841,13 +841,11 @@ private: struct PostponedGraphic { - PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* sObj ) - : grfNode( n ), size( s ), mOLEFrameFormat( pOLEFrameFormat ), mOLENode( pOLENode ), pSdrObj(sObj) {}; + PostponedGraphic( const SwGrfNode* n, Size s, const SdrObject* sObj ) + : grfNode( n ), size( s ), pSdrObj(sObj) {}; const SwGrfNode* grfNode; Size size; - const SwFlyFrameFormat* mOLEFrameFormat; - SwOLENode* mOLENode; const SdrObject* pSdrObj; }; std::unique_ptr< std::vector<PostponedGraphic> > m_pPostponedGraphic; |