[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/qa

[Caolán McNamara]

 helpcontent2                             |    2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a9a197d9e23c3494047af8e7c377a90b3ca12fef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 14 12:01:09 2013 +0000

    fix build: int->sal_Int32
    
    Change-Id: I20b2dff7bef115b2eab8e6fdba9a836612134d48

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 30ed0f1..d2efe7c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1670,7 +1670,7 @@ DECLARE_OOXML_TEST(testFdo70838, "fdo70838.docx")
     {
         CPPUNIT_ASSERT(!aStyles[i].isEmpty());
 
-        int nextTokenPos = 0;
+        sal_Int32 nextTokenPos = 0;
         do
         {
             OUString aStyleCommand = aStyles[i].getToken( 0, ';', nextTokenPos );
commit 55a5416d7e15b627bea0d2c25fd43f4992039efe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 14 11:59:02 2013 +0000

    Updated core
    Project: help  39f6e246dc6790f93511d3f7f7e08861f160d400

diff --git a/helpcontent2 b/helpcontent2
index 42f290e..39f6e24 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 42f290e423e49da0283dcd00a66f17cf1d201456
+Subproject commit 39f6e246dc6790f93511d3f7f7e08861f160d400