diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-06-25 15:20:55 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-25 06:43:18 -0700 |
| commit | 47cd690e1f0411705d2d28e2c83a789f2935f789 (patch) | |
| tree | c52652cbc87c64c9ee4b1d1238b81d26ff91c40a | |
| parent | 93260d8a53abf4e55920c0722f7438a58f2b5565 (diff) | |
MSWord uses \xb for linebreaks in DB fields, take 2 (bnc#878854)
This commit also does the conversion when reading the data from a data source
using the mail merge wizard.
(cherry picked from commit 076e4afc61b216e34959bd4e3701f1fa19972d5c)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: Ia14417507b6ddce955fec26142a42ce51f77de4e
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 8b5dcdb0d7f3..24d289004373 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1652,6 +1652,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, try { sRet = xColumn->getString(); + sRet = sRet.replace( '\xb', '\n' ); // MSWord uses \xb as a newline } catch(const SQLException&) { |