summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorbrinzing <oliver.brinzing@gmx.de>2019-11-01 16:36:31 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-11-11 09:54:50 +0100
commitfea5c10e222b10d83e0081dc1d1b2e678689d250 (patch)
tree257d63df6dc508092353728c80652a4d4eef0902 /writerfilter
parente4bf92ae344e0db16177de7fc9eed432339d8705 (diff)
tdf#124986: docx: remove trailing quotation marks and spaces from set fields
Change-Id: I6390344b72b0148cff8e0ed5150d7abfc9490a2a Reviewed-on: https://gerrit.libreoffice.org/81892 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 732099649ae4..19f3e67aee73 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3650,9 +3650,13 @@ void DomainMapper_Impl::handleFieldSet
sVariable = lcl_ExctractVariableAndHint(pContext->GetCommand(), sHint);
// remove surrounding "" if exists
- if( sHint.getLength() >= 2 && sHint.startsWith("\"") )
+ if(sHint.getLength() >= 2)
{
- sHint = sHint.trim().copy(1, sHint.getLength() - 2);
+ OUString sTmp = sHint.trim();
+ if (sTmp.startsWith("\"") && sTmp.endsWith("\""))
+ {
+ sHint = sTmp.copy(1, sTmp.getLength() - 2);
+ }
}
// determine field master name