sw/source/core/fields/ddefld.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit eb3709fd1f94213336d9bbd444b6e054721632a5
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 27 20:30:19 2014 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 090c66b2c91378a83e294e872d6c8cb2a497eb80)
Reviewed-on: https://gerrit.libreoffice.org/9530
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 9b0bf97..37d6f50 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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
