summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-05-27 20:30:19 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-05-28 10:28:35 -0500
commit090c66b2c91378a83e294e872d6c8cb2a497eb80 (patch)
tree6b360a9f1bc015310ae2c6bd455d053f444b0814
parent20857b5d7536b3fcafa16ca6527ba459032933d7 (diff)
fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()
Setting 3 separators instead of 2 does not work. (regression from 263153842741d7ce21cc0bf1c5296a55a1138024) Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff (cherry picked from commit 747bcdc14386978f2a98a452e52c8dcc2459d319) Reviewed-on: https://gerrit.libreoffice.org/9513 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/fields/ddefld.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 9b0bf972161a..37d6f50898e1 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -367,7 +367,8 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
{
rVal >>= sToken;
}
- sNewCmd += sToken + OUString(sfx2::cTokenSeparator);
+ sNewCmd += (i < 2)
+ ? sToken + OUString(sfx2::cTokenSeparator) : sToken;
}
SetCmd( sNewCmd );
}