diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-30 22:02:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-31 13:59:10 +0000 |
| commit | 2ed6eba4f99681fe717741ddc1534ed3ccc15e82 (patch) | |
| tree | 7467a1b33164db1297a5286bffb272f654a27cad | |
| parent | 8900a3469e1263280ffc052993ef34e3a4bcd4bc (diff) | |
CurrentTableInPaM->PendingTableInPaM
Change-Id: Ic8b48d3b3e3f87e9ac3e8a6bb832f8e8dfe8ab7d
| -rw-r--r-- | sw/source/filter/html/htmlsect.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 7b256856e4ba..e5c2cf1268f8 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -195,7 +195,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken ) static_cast<const SwStartNode *>( &rContentStIdx.GetNode() ); aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1; - if (!CurrentTableInPaM(aDelPam)) + if (!PendingTableInPaM(aDelPam)) m_xDoc->getIDocumentContentOperations().DelFullPara(aDelPam); // update page style diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 50bcffa1554a..7c6fb3933d16 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -5258,7 +5258,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust, return xRetTable; } -bool SwHTMLParser::CurrentTableInPaM(SwPaM& rPam) const +bool SwHTMLParser::PendingTableInPaM(SwPaM& rPam) const { bool bRet = false; for (const auto& a : m_aTables) diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 0048278e0756..24996cf2d340 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -870,7 +870,7 @@ private: bool HasCurrentParaFlys( bool bNoSurroundOnly = false, bool bSurroundOnly = false ) const; - bool CurrentTableInPaM(SwPaM& rPam) const; + bool PendingTableInPaM(SwPaM& rPam) const; public: // used in tables |