diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /starmath/qa | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'starmath/qa')
-rw-r--r-- | starmath/qa/cppunit/mock-visitor.hxx | 58 | ||||
-rw-r--r-- | starmath/qa/cppunit/test_nodetotextvisitors.cxx | 4 | ||||
-rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 4 | ||||
-rw-r--r-- | starmath/qa/extras/mmlimport-test.cxx | 4 |
4 files changed, 35 insertions, 35 deletions
diff --git a/starmath/qa/cppunit/mock-visitor.hxx b/starmath/qa/cppunit/mock-visitor.hxx index 88ca742e3ece..63134cab648c 100644 --- a/starmath/qa/cppunit/mock-visitor.hxx +++ b/starmath/qa/cppunit/mock-visitor.hxx @@ -19,175 +19,175 @@ class MockVisitor : public SmVisitor public: virtual ~MockVisitor() {} - void Visit( SmTableNode* pNode ) SAL_OVERRIDE { + void Visit( SmTableNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmTableNode should have type NTABLE", NTABLE, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmBraceNode* pNode ) SAL_OVERRIDE { + void Visit( SmBraceNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmBraceNode should have type NBRACE", NBRACE, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE { + void Visit( SmBracebodyNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmBracebodyNode should have type NBRACEBODY", NBRACEBODY, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmOperNode* pNode ) SAL_OVERRIDE { + void Visit( SmOperNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmOperNode should have type NOPER", NOPER, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmAlignNode* pNode ) SAL_OVERRIDE { + void Visit( SmAlignNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmAlignNode should have type NALIGN", NALIGN, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmAttributNode* pNode ) SAL_OVERRIDE { + void Visit( SmAttributNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmAttributNode should have type NATTRIBUT", NATTRIBUT, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmFontNode* pNode ) SAL_OVERRIDE { + void Visit( SmFontNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmFontNode should have type NFONT", NFONT, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE { + void Visit( SmUnHorNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmUnHorNode should have type NUNHOR", NUNHOR, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE { + void Visit( SmBinHorNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmBinHorNode should have type NBINHOR", NBINHOR, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE { + void Visit( SmBinVerNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmBinVerNode should have type NBINVER", NBINVER, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE { + void Visit( SmBinDiagonalNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmBinDiagonalNode should have type NBINDIAGONAL", NBINDIAGONAL, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE { + void Visit( SmSubSupNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmSubSupNode should have type NSUBSUP", NSUBSUP, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE { + void Visit( SmMatrixNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmMatrixNode should have type NMATRIX", NMATRIX, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE { + void Visit( SmPlaceNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmPlaceNode should have type NPLACE", NPLACE, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmTextNode* pNode ) SAL_OVERRIDE { + void Visit( SmTextNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmTextNode should have type NTEXT", NTEXT, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmSpecialNode* pNode ) SAL_OVERRIDE { + void Visit( SmSpecialNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmSpecialNode should have type NSPECIAL", NSPECIAL, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmGlyphSpecialNode* pNode ) SAL_OVERRIDE { + void Visit( SmGlyphSpecialNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmGlyphSpecialNode should have type NGLYPH_SPECIAL", NGLYPH_SPECIAL, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmMathSymbolNode* pNode ) SAL_OVERRIDE { + void Visit( SmMathSymbolNode* pNode ) override { CPPUNIT_ASSERT_MESSAGE("SmMathSymbolNode should have type NMATH or NMATHIDENT", pNode->GetType() == NMATH || pNode->GetType() == NMATHIDENT); VisitChildren( pNode ); } - void Visit( SmBlankNode* pNode ) SAL_OVERRIDE { + void Visit( SmBlankNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmBlankNode should have type NBLANK", NBLANK, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmErrorNode* pNode ) SAL_OVERRIDE { + void Visit( SmErrorNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmErrorNode should have type NERROR", NERROR, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmLineNode* pNode ) SAL_OVERRIDE { + void Visit( SmLineNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmLineNode should have type NLINE", NLINE, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE { + void Visit( SmExpressionNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmExpressionNode should have type NEXPRESSION", NEXPRESSION, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmPolyLineNode* pNode ) SAL_OVERRIDE { + void Visit( SmPolyLineNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmPolyLineNode should have type NPOLYLINE", NPOLYLINE, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmRootNode* pNode ) SAL_OVERRIDE { + void Visit( SmRootNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmRootNode should have type NROOT", NROOT, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmRootSymbolNode* pNode ) SAL_OVERRIDE { + void Visit( SmRootSymbolNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmRootSymbolNode should have type NROOTSYMBOL", NROOTSYMBOL, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmDynIntegralNode* pNode ) SAL_OVERRIDE { + void Visit( SmDynIntegralNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmDynIntegralNode should have type NDYNINT", NDYNINT, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmDynIntegralSymbolNode* pNode ) SAL_OVERRIDE { + void Visit( SmDynIntegralSymbolNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmDynIntegralSymbolNode should have type NDYNINTSYMBOL", NDYNINTSYMBOL, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmRectangleNode* pNode ) SAL_OVERRIDE { + void Visit( SmRectangleNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmRectangleNode should have type NRECTANGLE", NRECTANGLE, pNode->GetType()); VisitChildren( pNode ); } - void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE { + void Visit( SmVerticalBraceNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmVerticalBraceNode should have type NVERTICAL_BRACE", NVERTICAL_BRACE, pNode->GetType()); VisitChildren( pNode ); diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index 2b105cbca164..a539761f43ab 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -32,8 +32,8 @@ class Test : public test::BootstrapFixture { public: // init - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; // tests void SimpleUnaryOp(); diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 2a19ac6d5fae..7e344529c8ae 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -37,8 +37,8 @@ public: Test(); // init - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; // tests void editUndoRedo(); diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx index d0cccd782102..43130190c6e4 100644 --- a/starmath/qa/extras/mmlimport-test.cxx +++ b/starmath/qa/extras/mmlimport-test.cxx @@ -26,8 +26,8 @@ typedef tools::SvRef<SmDocShell> SmDocShellRef; class Test : public test::BootstrapFixture { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testSimple(); void testNsPrefixMath(); |