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

[Caolán McNamara]

 helpcontent2                                |    2 +-
 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3c0ba9c3206670169d6a7b48713c8db5ca10e34
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 6 13:40:26 2014 +0100

    Updated core
    Project: help  a87da6b2546423f1727b2d857dcfe78aa6bf53af

diff --git a/helpcontent2 b/helpcontent2
index 2a0b474..a87da6b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2a0b4747b5a83386f1b9c3935d5eb484429c6050
+Subproject commit a87da6b2546423f1727b2d857dcfe78aa6bf53af
commit d4259530a627733f1034dbd4cf15b6f1142121c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 6 14:40:23 2014 +0200

    loplugin:saloverride
    
    Change-Id: I67ce0ceea8ee022493311d58acd0211897208631

diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index 7ef8506..0d7d75d 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -113,7 +113,7 @@ public:
 private:
     SwChapterField
     ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
-            const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const {
+            const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const SAL_OVERRIDE {
         // get rid of 'unused-parameters' warnings
         (void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
         return mChapterField;