diff options
| author | Adam Co <rattles2013@gmail.com> | 2014-05-08 14:30:24 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-05-08 22:19:03 +0200 |
| commit | 76bd128ff887b017a481f434c7ac9b1130826341 (patch) | |
| tree | 2d8bf4385199fd9963f4eb557a66c2d94bc9c273 /writerfilter | |
| parent | a4e028447e6f06e4d6660dbe95e15dca8cb5cbf2 (diff) | |
Fix 'outset' and 'inset' table border type import in DOCX and RTF
In the past, LO did not support 'outset' and 'inset' border types
for tables, so when encountering them - LO converted them to other
types of border. Now that LO supports it - DOCX and RTF filters
were changed to import these border types correctly.
DOC filter was not changed, because creating a proper DOC sample
file that has these border types (needed for the 'bordertest.hxx'
file) was not possible right now. So at least DOCX and RTF filters
are fixed.
Change-Id: Ida2449d45a0ac138388f3cbfeb41657db1d4cda9
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 4 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 11ed808c5a8c..3fb84af778f7 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -23183,8 +23183,8 @@ <value tokenid="23">dashDotStroked</value> <value tokenid="24">threeDEmboss</value> <value tokenid="25">threeDEngrave</value> - <value tokenid="18">outset</value> - <value tokenid="17">inset</value> + <value tokenid="26">outset</value> + <value tokenid="27">inset</value> <value tokenid="64">apples</value> <value tokenid="65">archedScallops</value> <value tokenid="66">babyPacifier</value> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3f327055244a..38e8653000b8 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2510,10 +2510,10 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) nParam = 25; break; case RTF_BRDROUTSET: - nParam = 18; + nParam = 26; break; case RTF_BRDRINSET: - nParam = 17; + nParam = 27; break; case RTF_BRDRNONE: nParam = 0; |