sw/qa/cppunit/tox/test_ToxTextGenerator.cxx | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
New commits: commit 4ee265eeaeb268504233d6c130b5944ca8d8887e Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jun 6 10:32:40 2014 +0100 loplugin:saloverride + loplugin:unreffun Change-Id: If7d24294e0b62b47c5cbe9271dff948a70cb477a diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx index 12dea3d..c2e1dcb 100644 --- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx +++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx @@ -25,7 +25,6 @@ public: void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem(); void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem(); void EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet(); - void EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty(); CPPUNIT_TEST_SUITE(ToxTextGeneratorTest); CPPUNIT_TEST(EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems); @@ -40,10 +39,10 @@ struct MockedSortTab : public SwTOXSortTabBase { MockedSortTab() : SwTOXSortTabBase(TOX_SORT_INDEX,0,0,0) {;} - /*virtual*/ TextAndReading GetText_Impl() const { + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE { return TextAndReading(); } - /*virtual*/ sal_uInt16 GetLevel() const { + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE { return 0; } }; @@ -83,17 +82,6 @@ ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet() CPPUNIT_ASSERT_EQUAL(expected, actual); } -void -ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty() -{ - MockedSortTab sortTab; - sortTab.pTxtMark = reinterpret_cast<SwTxtTOXMark*>(1); - - OUString expected(""); - OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0); - CPPUNIT_ASSERT_EQUAL(expected, actual); -} - // Put the test suite in the registry CPPUNIT_TEST_SUITE_REGISTRATION(ToxTextGeneratorTest);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits