[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - download.lst sw/qa

Kohei Yoshida kohei.yoshida at collabora.com
Thu Dec 18 19:45:35 PST 2014


 download.lst                               |    2 +-
 sw/qa/extras/globalfilter/globalfilter.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eb237aa4e73762569819fc10a2433f4d02a36881
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Dec 18 22:43:35 2014 -0500

    Build fix for gcc 4.7.
    
    Change-Id: Ib2a477319f843c9da4f9fa4cb9e491bef8b3f03b

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index fbb51d7..6185bd5 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -119,10 +119,10 @@ void Test::testSwappedOutImageExport()
 void Test::testLinkedGraphicRT()
 {
     OUString aFilterNames[] = {
-        "writer8",
+        OUString("writer8"),
 //        "Rich Text Format",  Note: picture is there, but SwGrfNode is not found?
-        "MS Word 97",
-        "Office Open XML Text",
+        OUString("MS Word 97"),
+        OUString("Office Open XML Text"),
     };
 
     for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter )
commit 104a4ea1fe05ed8f0d7365b725dbbe9737b97f77
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Dec 18 15:21:12 2014 -0500

    Update mdds to 0.11.2.
    
    Change-Id: I1c331863df2b1e560ba8a3d5b7dde67cce59b2df
    (cherry picked from commit b7e61384f135f9f513659bcfd2502a9d00acd2f9)

diff --git a/download.lst b/download.lst
index 9afac7b..c2e5949 100644
--- a/download.lst
+++ b/download.lst
@@ -99,7 +99,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2
+export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
 export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488


More information about the Libreoffice-commits mailing list