improve the script for reducing symbol exports

And apply some of the results

Change-Id: If555476fdd951cbc1d01fb3ef3ab1cbca2b64960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124896
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 19 insertions, 14 deletions

diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index 200fa0d09db2..c45209333bf5 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -37,11 +37,12 @@ public:
     css::uno::Reference<css::ucb::XContent> getContent() const;
 
     virtual bool isStructured() override;
-    virtual unsigned subStreamCount() override;
-    virtual const char* subStreamName(unsigned id) override;
-    virtual bool existsSubStream(const char* name) override;
-    virtual librevenge::RVNGInputStream* getSubStreamByName(const char* name) override;
-    virtual librevenge::RVNGInputStream* getSubStreamById(unsigned id) override;
+    SAL_DLLPRIVATE virtual unsigned subStreamCount() override;
+    SAL_DLLPRIVATE virtual const char* subStreamName(unsigned id) override;
+    SAL_DLLPRIVATE virtual bool existsSubStream(const char* name) override;
+    SAL_DLLPRIVATE virtual librevenge::RVNGInputStream*
+    getSubStreamByName(const char* name) override;
+    SAL_DLLPRIVATE virtual librevenge::RVNGInputStream* getSubStreamById(unsigned id) override;
 
     virtual const unsigned char* read(unsigned long numBytes, unsigned long& numBytesRead) override;
     virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override;
diff --git a/writerperfect/inc/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx
index dfe035d6515b..a79b114f3784 100644
--- a/writerperfect/inc/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -36,11 +36,12 @@ class WRITERPERFECT_DLLPUBLIC DocumentHandler final : public OdfDocumentHandler
 {
 public:
     DocumentHandler(css::uno::Reference<css::xml::sax::XDocumentHandler> const& xHandler);
-    void startDocument() override;
-    void endDocument() override;
-    void startElement(const char* psName, const librevenge::RVNGPropertyList& xPropList) override;
-    void endElement(const char* psName) override;
-    void characters(const librevenge::RVNGString& sCharacters) override;
+    SAL_DLLPRIVATE void startDocument() override;
+    SAL_DLLPRIVATE void endDocument() override;
+    SAL_DLLPRIVATE void startElement(const char* psName,
+                                     const librevenge::RVNGPropertyList& xPropList) override;
+    SAL_DLLPRIVATE void endElement(const char* psName) override;
+    SAL_DLLPRIVATE void characters(const librevenge::RVNGString& sCharacters) override;
 
 private:
     css::uno::Reference<css::xml::sax::XDocumentHandler> mxHandler;
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 1bf6a14937e0..5ccb983bef21 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -25,11 +25,12 @@ namespace writerperfect
 {
 class WPXSvInputStreamImpl;
 
-class WRITERPERFECT_DLLPUBLIC WPXSvInputStream final : public librevenge::RVNGInputStream
+class WPXSvInputStream final : public librevenge::RVNGInputStream
 {
 public:
+    WRITERPERFECT_DLLPUBLIC
     WPXSvInputStream(css::uno::Reference<css::io::XInputStream> const& xStream);
-    virtual ~WPXSvInputStream() override;
+    WRITERPERFECT_DLLPUBLIC virtual ~WPXSvInputStream() override;
 
     virtual bool isStructured() override;
     virtual unsigned subStreamCount() override;
@@ -38,8 +39,10 @@ public:
     virtual librevenge::RVNGInputStream* getSubStreamByName(const char* name) override;
     virtual librevenge::RVNGInputStream* getSubStreamById(unsigned id) override;
 
-    virtual const unsigned char* read(unsigned long numBytes, unsigned long& numBytesRead) override;
-    virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override;
+    WRITERPERFECT_DLLPUBLIC virtual const unsigned char* read(unsigned long numBytes,
+                                                              unsigned long& numBytesRead) override;
+    WRITERPERFECT_DLLPUBLIC virtual int seek(long offset,
+                                             librevenge::RVNG_SEEK_TYPE seekType) override;
     virtual long tell() override;
     virtual bool isEnd() override;