loplugin:unusedmethods

using an idea from dtardon:

<dtardon> noelgrandin, hi. could you try to run the unusedmethods clang
plugin with "make build-nocheck"? that would catch functions that are
only used in tests. e.g., i just removed the whole o3tl::range class,
which has not been used in many years, but htere was a test for it...
<noelgrandin> dtardon, interesting idea! Sure, I can do that.

Change-Id: I5653953a426a2186a1e43017212d87ffce520387
Reviewed-on: https://gerrit.libreoffice.org/22041
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 3 insertions, 133 deletions

diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx
index e7eef7c7cb6e..6c2862baff44 100644
--- a/svtools/qa/unit/testHtmlWriter.cxx
+++ b/svtools/qa/unit/testHtmlWriter.cxx
@@ -41,7 +41,6 @@ public:
     void testSingleElementWithContentAndAttributes();
     void testNested();
     void testAttributeValues();
-    void testFlushStack();
 
     CPPUNIT_TEST_SUITE(Test);
     CPPUNIT_TEST(testSingleElement);
@@ -50,7 +49,6 @@ public:
     CPPUNIT_TEST(testSingleElementWithContentAndAttributes);
     CPPUNIT_TEST(testNested);
     CPPUNIT_TEST(testAttributeValues);
-    CPPUNIT_TEST(testFlushStack);
 
     CPPUNIT_TEST_SUITE_END();
 };
@@ -124,12 +122,11 @@ void Test::testSingleElementWithContent()
     HtmlWriter aHtml(aStream);
     aHtml.prettyPrint(false);
     aHtml.start("abc");
-    aHtml.write("xxxx");
     aHtml.end();
 
     OString aString = extractFromStream(aStream);
 
-    CPPUNIT_ASSERT_EQUAL(aString, OString("<abc>xxxx</abc>"));
+    CPPUNIT_ASSERT_EQUAL(aString, OString("<abc/>"));
 }
 
 void Test::testSingleElementWithContentAndAttributes()
@@ -141,12 +138,11 @@ void Test::testSingleElementWithContentAndAttributes()
     aHtml.start("abc");
     aHtml.attribute("x", "y");
     aHtml.attribute("q", "w");
-    aHtml.write("xxxx");
     aHtml.end();
 
     OString aString = extractFromStream(aStream);
 
-    CPPUNIT_ASSERT_EQUAL(aString, OString("<abc x=\"y\" q=\"w\">xxxx</abc>"));
+    CPPUNIT_ASSERT_EQUAL(aString, OString("<abc x=\"y\" q=\"w\"/>"));
 }
 
 void Test::testNested()
@@ -157,13 +153,12 @@ void Test::testNested()
     aHtml.prettyPrint(false);
     aHtml.start("abc");
         aHtml.start("xyz");
-        aHtml.write("xxx");
         aHtml.end();
     aHtml.end();
 
     OString aString = extractFromStream(aStream);
 
-    CPPUNIT_ASSERT_EQUAL(OString("<abc><xyz>xxx</xyz></abc>"), aString);
+    CPPUNIT_ASSERT_EQUAL(OString("<abc><xyz/></abc>"), aString);
 }
 
 void Test::testAttributeValues()
@@ -183,110 +178,6 @@ void Test::testAttributeValues()
     CPPUNIT_ASSERT_EQUAL(OString("<abc one=\"one\" two=\"two\" three=\"12\"/>"), aString);
 }
 
-void Test::testFlushStack()
-{
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.flushStack("a"); // simple ,end element "a" = like end()
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a/>"), aString);
-    }
-
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.start("b");
-        aHtml.flushStack("b"); // end at first element "b", don't output "a" yet
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a><b/>"), aString);
-    }
-
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.start("b");
-        aHtml.flushStack("a"); // end at first element "a"
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a><b/></a>"), aString);
-    }
-
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.start("b");
-        aHtml.start("c");
-        aHtml.flushStack("a"); // end at first element "a"
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a><b><c/></b></a>"), aString);
-    }
-
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.start("b");
-        aHtml.start("c");
-        aHtml.flushStack("b"); // end at first element "b"
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a><b><c/></b>"), aString);
-    }
-
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.start("b");
-        aHtml.start("c");
-        aHtml.flushStack("x"); // no known element - ends when stack is empty
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a><b><c/></b></a>"), aString);
-    }
-
-    {
-        SvMemoryStream aStream;
-
-        HtmlWriter aHtml(aStream);
-        aHtml.prettyPrint(false);
-        aHtml.start("a");
-        aHtml.start("b");
-        aHtml.start("c");
-        aHtml.flushStack(); // flush the whole stack
-
-        OString aString = extractFromStream(aStream);
-
-        CPPUNIT_ASSERT_EQUAL(OString("<a><b><c/></b></a>"), aString);
-    }
-}
-
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/svtools/source/svhtml/HtmlWriter.cxx b/svtools/source/svhtml/HtmlWriter.cxx
index 3435b60546f7..961ab38457b5 100644
--- a/svtools/source/svhtml/HtmlWriter.cxx
+++ b/svtools/source/svhtml/HtmlWriter.cxx
@@ -76,16 +76,6 @@ void HtmlWriter::flushStack()
     }
 }
 
-void HtmlWriter::flushStack(const OString& aElement)
-{
-    OString sCurrentElement;
-    do
-    {
-        sCurrentElement = maElementStack.back();
-        end();
-    } while (!maElementStack.empty() && aElement != sCurrentElement);
-}
-
 void HtmlWriter::end()
 {
     if (mbElementOpen)
@@ -114,17 +104,6 @@ void HtmlWriter::end()
     mbContentWritten = false;
 }
 
-void HtmlWriter::write(const OString &aContent)
-{
-    if (mbElementOpen)
-    {
-        mrStream.WriteChar('>');
-        mbElementOpen = false;
-    }
-    mbContentWritten = true;
-    mrStream.WriteOString(aContent);
-}
-
 void HtmlWriter::attribute(const OString &aAttribute, const OString& aValue)
 {
     if (mbElementOpen && !aAttribute.isEmpty() && !aValue.isEmpty())