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>

5 files changed, 24 insertions, 24 deletions

diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 644d98b865bf..421be60cc5ee 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -42,7 +42,7 @@ class XMLOFF_DLLPUBLIC AnimationsExporter final : public salhelper::SimpleRefere
 
 public:
     AnimationsExporter( SvXMLExport& rExport, const css::uno::Reference< css::beans::XPropertySet >& xPageProps  );
-    virtual ~AnimationsExporter() override;
+    SAL_DLLPRIVATE virtual ~AnimationsExporter() override;
 
     void prepare( const css::uno::Reference< css::animations::XAnimationNode >& xRootNode );
     void exportAnimations( const css::uno::Reference< css::animations::XAnimationNode >& xRootNode );
diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 6ec2cb2dab1e..ce8a2da13459 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -39,10 +39,10 @@ namespace xmloff
     class XMLOFF_DLLPUBLIC ORotationAngleHandler final : public XMLPropertyHandler
     {
     public:
-        ORotationAngleHandler();
+        SAL_DLLPRIVATE ORotationAngleHandler();
 
-        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        SAL_DLLPRIVATE virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        SAL_DLLPRIVATE virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
     };
 
 
@@ -51,10 +51,10 @@ namespace xmloff
     class XMLOFF_DLLPUBLIC OFontWidthHandler final : public XMLPropertyHandler
     {
     public:
-        OFontWidthHandler();
+        SAL_DLLPRIVATE OFontWidthHandler();
 
-        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        SAL_DLLPRIVATE virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        SAL_DLLPRIVATE virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
     };
 
 
@@ -69,10 +69,10 @@ namespace xmloff
             COLOR
         };
 
-        OControlBorderHandler( const BorderFacet _eFacet );
+        SAL_DLLPRIVATE OControlBorderHandler( const BorderFacet _eFacet );
 
-        virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
-        virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        SAL_DLLPRIVATE virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
+        SAL_DLLPRIVATE virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
 
     private:
         BorderFacet m_eFacet;
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index bd0b72e24e46..823e99875104 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -54,10 +54,10 @@ namespace xmloff
         // impl class
         std::unique_ptr<OFormLayerXMLExport_Impl> m_pImpl;
 
-        virtual ~OFormLayerXMLExport() override;
+        SAL_DLLPRIVATE virtual ~OFormLayerXMLExport() override;
 
     public:
-        OFormLayerXMLExport(SvXMLExport& _rContext);
+        SAL_DLLPRIVATE OFormLayerXMLExport(SvXMLExport& _rContext);
 
         /** initializes some internal structures for fast access to the given page
 
@@ -84,7 +84,7 @@ namespace xmloff
             @see seekPage
 
         */
-        OUString getControlId(
+        SAL_DLLPRIVATE OUString getControlId(
             const css::uno::Reference< css::beans::XPropertySet >& _rxControl);
 
         /** retrieves the style name for the control's number style.
@@ -98,7 +98,7 @@ namespace xmloff
             @see examineForms
             @see seekPage
         */
-        OUString getControlNumberStyle(
+        SAL_DLLPRIVATE OUString getControlNumberStyle(
             const css::uno::Reference< css::beans::XPropertySet >& _rxControl );
 
         /** examines the forms collection given.
@@ -146,7 +146,7 @@ namespace xmloff
 
         /** exports the automatic controls number styles
         */
-        void exportAutoControlNumberStyles();
+        SAL_DLLPRIVATE void exportAutoControlNumberStyles();
 
         /** exports the auto-styles collected during the examineForms calls
         */
@@ -159,7 +159,7 @@ namespace xmloff
             to the form layer exporter.<br/>
             Of course you have to do this before calling <member>exportForms</member></p>
         */
-        void excludeFromExport( const css::uno::Reference< css::awt::XControlModel >& _rxControl );
+        SAL_DLLPRIVATE void excludeFromExport( const css::uno::Reference< css::awt::XControlModel >& _rxControl );
     };
 
 
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index 984e0081e111..ae9c5ed7e336 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -51,8 +51,8 @@ namespace xmloff
         std::unique_ptr<OFormLayerXMLImport_Impl>   m_pImpl;
 
     public:
-        OFormLayerXMLImport(SvXMLImport& _rImporter);
-        virtual ~OFormLayerXMLImport() override;
+        SAL_DLLPRIVATE OFormLayerXMLImport(SvXMLImport& _rImporter);
+        SAL_DLLPRIVATE virtual ~OFormLayerXMLImport() override;
 
         /** start importing the forms of the given page
 
@@ -76,7 +76,7 @@ namespace xmloff
             @see startPage
             @see endPage
         */
-        SvXMLImportContext* createContext(
+        SAL_DLLPRIVATE SvXMLImportContext* createContext(
             const sal_Int32 _nElement,
             const css::uno::Reference< css::xml::sax::XFastAttributeList >& _rxAttribs);
 
@@ -88,7 +88,7 @@ namespace xmloff
 
             @see startPage
         */
-        css::uno::Reference< css::beans::XPropertySet >
+        SAL_DLLPRIVATE css::uno::Reference< css::beans::XPropertySet >
                 lookupControl(const OUString& _rId);
 
         /** end importing the forms of the current page
@@ -102,7 +102,7 @@ namespace xmloff
 
         /** announces the auto-style context to the form importer
         */
-        void setAutoStyleContext(SvXMLStylesContext* _pNewContext);
+        SAL_DLLPRIVATE void setAutoStyleContext(SvXMLStylesContext* _pNewContext);
 
         /** sets the given number style on the given control
             @param _rxControlModel
@@ -110,7 +110,7 @@ namespace xmloff
             @param _rControlNumberStyleName
                 the style name for the control's number style
         */
-        void applyControlNumberStyle(
+        SAL_DLLPRIVATE void applyControlNumberStyle(
             const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel,
             const OUString& _rControlNumberStyleName
         );
@@ -121,7 +121,7 @@ namespace xmloff
             do to a post processing, since not all information from the file can be processed
             if the document is not completed, yet.</p>
         */
-        void documentDone( );
+        SAL_DLLPRIVATE void documentDone( );
     };
 
 
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index c510b8cab00d..26a4c050f78a 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3454,7 +3454,7 @@ namespace xmloff::token {
         enum XMLTokenEnum eToken );
 
     /// compare eToken to the string
-    XMLOFF_DLLPUBLIC bool IsXMLToken(
+    bool IsXMLToken(
         std::string_view rString,
         enum XMLTokenEnum eToken );