diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-25 21:54:46 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-03-12 18:09:50 +0100 |
| commit | b9d4c7af35f682a850ae4333738d2b0f922b9468 (patch) | |
| tree | 535742ed71223ce825aeaeacec5c8b4c7c82d741 /sw/source/filter/html | |
| parent | fc4f7d03446722442f0564a1268bb3e62dd17b06 (diff) | |
RES_LR_SPACE should fall through to default not RES_BACKGROUND
due to
commit 29dfcc7521311e547fc069466cc3edc9fcbdbe03
Date: Mon Nov 23 16:17:37 2015 +0100
tdf#94088 add import of HTML inline graphics
splitting the condition that used to fall through to default handling
with an unrelated RES_BACKGROUND case instead
Change-Id: I26a077c755f214cf35582ec146fcf34f87cc4494
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147689
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 6f9c71494461..16c4d6115c90 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2952,18 +2952,6 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable, pAttr = pPrev; continue; - case RES_LR_SPACE: - if( aAttrPam.GetPoint()->GetNodeIndex() == - aAttrPam.GetMark()->GetNodeIndex()) - { - // because of numbering set this attribute directly at node - pCNd->SetAttr( *pAttr->m_pItem ); - break; - } - OSL_ENSURE( false, - "LRSpace set over multiple paragraphs!" ); - [[fallthrough]]; // (shouldn't reach this point anyway) - // tdf#94088 expand RES_BACKGROUND to the new fill attribute // definitions in the range [XATTR_FILL_FIRST .. XATTR_FILL_LAST]. // This is the right place in the future if the adapted fill attributes @@ -2977,6 +2965,18 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable, m_xDoc->getIDocumentContentOperations().InsertItemSet(aAttrPam, aNewSet, SetAttrMode::DONTREPLACE); break; } + + case RES_LR_SPACE: + if( aAttrPam.GetPoint()->GetNodeIndex() == + aAttrPam.GetMark()->GetNodeIndex()) + { + // because of numbering set this attribute directly at node + pCNd->SetAttr( *pAttr->m_pItem ); + break; + } + OSL_ENSURE( false, + "LRSpace set over multiple paragraphs!" ); + [[fallthrough]]; // (shouldn't reach this point anyway) default: // maybe jump to a bookmark |