[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/source

[Luboš Luňák]

 sw/source/ui/dbui/dbmgr.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d69c8d1151ceb8e4c7cf650efd36a2b10058c4d2
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Wed Jun 25 15:20:55 2014 +0200

    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

diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index c1ab684..f587f78 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1674,6 +1674,7 @@ OUString SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
             try
             {
                 sRet = xColumn->getString();
+                sRet = sRet.replace( '\xb', '\n' ); // MSWord uses \xb as a newline
             }
             catch(const SQLException&)
             {