instsetoo_native/util/openoffice.lst | 24 ++++++++++++------------ solenv/inc/minor.mk | 4 ++-- sw/source/ui/dbui/dbmgr.cxx | 1 + 3 files changed, 15 insertions(+), 14 deletions(-)
New commits: commit b1ca297fa9b79c2350c212a7a1ec697a22d0dce7 Author: Andras Timar <[email protected]> Date: Wed Jun 25 06:46:06 2014 -0700 Bump for 4.0-25 Change-Id: I0f4aeb1eed11f95c9d401c4d762755256cfa58ab diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index c18b5e2..acfcea3 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -33,7 +33,7 @@ Globals CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 24 + WINDOWSPATCHLEVEL 25 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -50,13 +50,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-324 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-325 BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -100,14 +100,14 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-324 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-325 BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -161,7 +161,7 @@ URE PRODUCTVERSION 4.0 PACKAGEVERSION 4.0 PACKAGEREVISION 1 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -192,7 +192,7 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 @@ -231,7 +231,7 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -276,7 +276,7 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 @@ -315,7 +315,7 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -359,13 +359,13 @@ OxygenOffice { PRODUCTNAME OxygenOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -24 + PRODUCTEXTENSION -25 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-324 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-325 BASEPRODUCTVERSION 4.0 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index e5b5a7f..4f5726a 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=400 -RSCREVISION=400m1(Build:324) -BUILD=324 +RSCREVISION=400m1(Build:325) +BUILD=325 LAST_MINOR=m0 SOURCEVERSION=OOO400 commit 47cd690e1f0411705d2d28e2c83a789f2935f789 Author: LuboÅ¡ LuÅák <[email protected]> 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 8b5dcdb..24d2890 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&) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
