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

[Tor Lillqvist]

 editeng/qa/unit/core-test.cxx |    2 +-
 sw/inc/ring.hxx               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5b829710d65310c6082c2c65ec1239515e319a8e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 2 08:21:46 2014 +0200

    Blind fix for C2491: definition of dllimport function not allowed
    
    Change-Id: I81e89126a7721e50fb07a99e582de792cdc480dd

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index e8e0f9c..e364be8 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -30,7 +30,7 @@ namespace sw
     template <class T> class RingIterator;
 
     template <class T>
-    class SW_DLLPUBLIC Ring
+    class Ring
     {
         struct Ring_node_traits
         {
commit f1e7489d98a1d1fd9e261e4a7e83fff03e5daf63
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 2 08:21:31 2014 +0200

    Adapt to int/sal_Int32 mismatch on 32-bit build
    
    Change-Id: I9c5cb458ea7595c1b623ce14ed58fd3d5b3d961e

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4674311..81d5ab7 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -591,7 +591,7 @@ void Test::testSectionAttributes()
 
         // now delete & join the paragraphs - this is fdo#85496 scenario
         aEngine.QuickDelete(ESelection(0,0,1,3));
-        CPPUNIT_ASSERT_EQUAL(1, aEngine.GetParagraphCount());
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEngine.GetParagraphCount());
 
         boost::scoped_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
         CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());