summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLennard <Wasserthal@nefkom.net>2012-12-09 16:29:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-12-10 14:53:05 +0000
commit1b0d9fa747c4a7fcdcd1c057bc2b31345f4bfe76 (patch)
tree2ffe192deb83b91916b9da10f420399367a409c2 /sw
parent34c157e0032e182a044979ce210009decb20e755 (diff)
docx import/export non-breaking hyphen and soft hyphen
God made non-breaking hyphen and saw that it was gone he told us to fix it as soon as hell we promised that we would Change-Id: I1d2bb8f7542f5ffec36fafdbdb07ace1cb62fb4a Signed-off-by: Lennard <Wasserthal@nefkom.net> Reviewed-on: https://gerrit.libreoffice.org/1279 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8414e6032df9..29bef4a79bfe 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1062,6 +1062,14 @@ void DocxAttributeOutput::RunText( const String& rText, rtl_TextEncoding /*eChar
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_br, FSEND );
break;
+ case 0x1E: //non-breaking hyphen
+ impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
+ m_pSerializer->singleElementNS( XML_w, XML_noBreakHyphen, FSEND );
+ break;
+ case 0x1F: //soft (on demand) hyphen
+ impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
+ m_pSerializer->singleElementNS( XML_w, XML_softHyphen, FSEND );
+ break;
default:
if ( *pIt < 0x0020 ) // filter out the control codes
{