summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorPatrick J <patj@mail.de>2017-01-30 17:02:49 +0100
committerMichael Stahl <mstahl@redhat.com>2017-02-06 22:05:43 +0000
commitb322fbc548479e09db8a437764a4089652ffbca2 (patch)
tree0e242efb6305905d5505d2ce23d3ecc4542c7ef7 /writerfilter
parenta34d9150b419ee7471b96599d877ff1091d6b567 (diff)
tdf#101626: replace soft-hyphen by hard-hyphen in ooxml import
If a list bulletChar is a soft-hyphen, it will disappear in PDF export. Therefore, replace it by a hard-hyphen. Change-Id: If0b535e7d2e23454136f25a2b7acf4b294b8dd27 Reviewed-on: https://gerrit.libreoffice.org/33707 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 3867b00754bf..965fd2705550 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -724,7 +724,13 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
//the Writer supports only a number of upper levels to show, separators is always a dot
//and each level can have a prefix and a suffix
if(pCurrentLvl.get())
- pCurrentLvl->SetBulletChar( rVal.getString() );
+ {
+ //if the BulletChar is a soft-hyphen (0xad)
+ //replace it with a hard-hyphen (0x2d)
+ //-> this fixes missing hyphen export in PDF etc.
+ // see tdf#101626
+ pCurrentLvl->SetBulletChar( rVal.getString().replace( 0xad, 0x2d ) );
+ }
}
break;
case NS_ooxml::LN_CT_Lvl_start: