diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2022-08-24 21:03:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-25 07:57:57 +0200 |
commit | 3369a24c48781fd5b8afe9bb707f92588825f6c3 (patch) | |
tree | 2de3c836288eed0bc6debd1b9722a663b4e0442a /sw/source/filter/html/htmlflywriter.cxx | |
parent | f7e170eb084cd4e92818de966b287330184749a8 (diff) |
Use SwNode instead of SwNodeIndex in SwPosFlyFrame
part of hiding the internals of SwPosition.
Also
(*) Just define the whole class in the header, it is a
dead simple data carrier.
Then the virtual destructor and the SAL_DLLPUBLIC_RTTI
becomes unnecessary.
(*) No need to use shared_ptr, these are never
shared, the call sites read the data and then discard
them.
Change-Id: I7fb64fd2bfa3469a7dfa4a325bb508457ca759a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138776
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/html/htmlflywriter.cxx')
-rw-r--r-- | sw/source/filter/html/htmlflywriter.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 4efee1377701..425cce1d5095 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -296,9 +296,9 @@ void SwHTMLWriter::CollectFlyFrames() SwPosFlyFrames aFlyPos( m_pDoc->GetAllFlyFormats(m_bWriteAll ? nullptr : m_pCurrentPam.get(), true)); - for(const auto& rpItem : aFlyPos) + for(const SwPosFlyFrame& rItem : aFlyPos) { - const SwFrameFormat& rFrameFormat = rpItem->GetFormat(); + const SwFrameFormat& rFrameFormat = rItem.GetFormat(); const SdrObject *pSdrObj = nullptr; const SwPosition *pAPos; const SwContentNode *pACNd; @@ -348,7 +348,7 @@ void SwHTMLWriter::CollectFlyFrames() if( !m_pHTMLPosFlyFrames ) m_pHTMLPosFlyFrames.reset(new SwHTMLPosFlyFrames); - m_pHTMLPosFlyFrames->insert( std::make_unique<SwHTMLPosFlyFrame>(*rpItem, pSdrObj, nMode) ); + m_pHTMLPosFlyFrames->insert( std::make_unique<SwHTMLPosFlyFrame>(rItem, pSdrObj, nMode) ); } } |