diff options
| author | Lennard <Wasserthal@nefkom.net> | 2012-12-09 16:29:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-11 16:27:03 +0000 |
| commit | b44bf22ae9c1602d8ff38d90068f6e553dfdc7c5 (patch) | |
| tree | b71a7b30f87ef30b30727e1f3eb01d9e05088306 /sw/source/filter/ww8 | |
| parent | 4b96890c181a05d354cf09a315b70fc8f634f6c4 (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>
(cherry picked from commit 1b0d9fa747c4a7fcdcd1c057bc2b31345f4bfe76)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b4dbee9b670d..3cdc325eb32c 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 { |