summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2014-06-25 15:20:55 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-06-26 15:41:37 +0000
commitf0c2bb87122307cd7462a84a5196ec24dbfd3fb6 (patch)
treef23ba6cb15e9f3d09aec921d63c99559e1d92c9a
parent44ae2ff6d2271949b2a4d22d017003f948b6aa2a (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 (cherry picked from commit 076e4afc61b216e34959bd4e3701f1fa19972d5c) Reviewed-on: https://gerrit.libreoffice.org/9902 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/uibase/dbui/dbmgr.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
index 4574a91603e5..79d417d7788d 100644
--- a/sw/source/core/uibase/dbui/dbmgr.cxx
+++ b/sw/source/core/uibase/dbui/dbmgr.cxx
@@ -1669,6 +1669,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&)
{