summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2022-03-21 10:20:34 +0100
committerMiklos Vajna <vmiklos@collabora.com>2022-03-21 11:23:32 +0100
commit3afe4f66f7266ede9922ce0682db38c9369349b7 (patch)
treee29c66fb0abe74b2d3ff709dcc494891f79f669b /writerfilter
parenta13faccd7e8c6503e96e9342a8615b4542b0601f (diff)
sw clearing breaks: add RTF filter
Map between SwLineBreakClear and \lbr<N>. Change-Id: Ibed94ad74157a08787212a34176590a1dc4d5547 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131886 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfdispatchsymbol.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdispatchvalue.cxx23
2 files changed, 24 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index df02f36fc18a..9167c5479317 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -35,7 +35,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
if (RTFKeyword::LINE == nKeyword)
{
// very special handling since text() will eat lone '\n'
- singleChar('\n');
+ singleChar('\n', /*bRunProps=*/true);
return RTFError::OK;
}
// Trivial symbols
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 14d0b3993a54..f12c90575c33 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -1789,6 +1789,29 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
}
}
break;
+ case RTFKeyword::LBR:
+ {
+ Id nId = 0;
+ switch (nParam)
+ {
+ case 1:
+ nId = NS_ooxml::LN_Value_ST_BrClear_left;
+ break;
+ case 2:
+ nId = NS_ooxml::LN_Value_ST_BrClear_right;
+ break;
+ case 3:
+ nId = NS_ooxml::LN_Value_ST_BrClear_all;
+ break;
+ }
+
+ if (nId > 0)
+ {
+ m_aStates.top().getCharacterAttributes().set(NS_ooxml::LN_CT_Br_clear,
+ new RTFValue(nId));
+ }
+ }
+ break;
default:
{
SAL_INFO("writerfilter", "TODO handle value '" << keywordToString(nKeyword) << "'");