summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2014-06-25 15:20:55 +0200
committerLuboš Luňák <l.lunak@collabora.com>2014-06-25 15:22:19 +0200
commit076e4afc61b216e34959bd4e3701f1fa19972d5c (patch)
treee1b538520579278730a804d9fddd5566e4df8643
parent17dc7f1153b20a2b7b757c78237ade22e0e9fad3 (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. Change-Id: Ia14417507b6ddce955fec26142a42ce51f77de4e
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 852879d6a727..b44f8576a130 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1655,6 +1655,7 @@ OUString SwDBManager::GetDBField(uno::Reference<XPropertySet> xColumnProps,
try
{
sRet = xColumn->getString();
+ sRet = sRet.replace( '\xb', '\n' ); // MSWord uses \xb as a newline
}
catch(const SQLException&)
{