From 3ba92b5f1eaf7d4447a0943ea260db515ca799dc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 15 Feb 2024 10:04:51 +0200 Subject: hide more symbols using the bin/find-can-be-private-symbols.py script to find classes with large numbers of exported symbols that can hidden. before exported = 58104 imported = 30810 unused_exports = 35433 after exported = 55094 imported = 31073 unused_exports = 32423 Change-Id: Idd0a70ee3740afd5ca1a86771e0e2ff8090d102d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163456 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/oox/export/chartexport.hxx | 10 +++++----- include/oox/export/drawingml.hxx | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'include/oox') diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 0bf4196a9800..640415003d15 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -128,7 +128,7 @@ private: }; -class OOX_DLLPUBLIC ChartExport final : public DrawingML { +class ChartExport final : public DrawingML { public: // first: data sequence for label, second: data sequence for values. @@ -257,18 +257,18 @@ private: public: - ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel, + OOX_DLLPUBLIC ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel, ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType ); virtual ~ChartExport() {} - void SetURLTranslator(const std::shared_ptr& pTransformer); + OOX_DLLPUBLIC void SetURLTranslator(const std::shared_ptr& pTransformer); const css::uno::Reference< css::frame::XModel >& getModel() const { return mxChartModel; } - void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount ); + OOX_DLLPUBLIC void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount ); void exportTextProps(const css::uno::Reference< css::beans::XPropertySet >& xPropSet); - void ExportContent(); + OOX_DLLPUBLIC void ExportContent(); void InitRangeSegmentationProperties( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 5f7d0565cb50..2ea0fa616dac 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -280,12 +280,12 @@ public: void writeSvgExtension(OUString const& rSvgRelId); }; -class OOX_DLLPUBLIC DrawingML +class DrawingML { private: - static sal_Int32 mnDrawingMLCount; - static sal_Int32 mnVmlCount; + OOX_DLLPUBLIC static sal_Int32 mnDrawingMLCount; + OOX_DLLPUBLIC static sal_Int32 mnVmlCount; /// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC). DocumentType meDocumentType; @@ -300,7 +300,7 @@ protected: /// If set, this is the parent of the currently handled shape. css::uno::Reference m_xParent; bool mbIsBackgroundDark; - static sal_Int32 mnChartCount; + OOX_DLLPUBLIC static sal_Int32 mnChartCount; /// True when exporting presentation placeholder shape. bool mbPlaceholder; @@ -325,7 +325,7 @@ protected: @param eDate LO Date format @param eTime LO Time format */ - static OUString GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeFormat eTime); + OOX_DLLPUBLIC static OUString GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeFormat eTime); /// Output the media (including copying a video from vnd.sun.star.Package: to the output if necessary). void WriteMediaNonVisualProperties(const css::uno::Reference& xShape); @@ -362,7 +362,7 @@ public: void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; } /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship - OUString writeGraphicToStorage(const Graphic &rGraphic , bool bRelPathToMedia = false, GraphicExport::TypeHint eHint = GraphicExport::TypeHint::Detect); + OOX_DLLPUBLIC OUString writeGraphicToStorage(const Graphic &rGraphic , bool bRelPathToMedia = false, GraphicExport::TypeHint eHint = GraphicExport::TypeHint::Detect); void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT ); void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT ); @@ -379,7 +379,7 @@ public: void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT ); void WriteSolidFill( const ::Color nColor, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT ); void WriteSolidFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); - void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); + OOX_DLLPUBLIC void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); /* New API for WriteGradientFill: If a BGradient is given, it will be used. Else, the 'Fix' entry will be used for @@ -395,7 +395,7 @@ public: void WriteBlipOrNormalFill(const css::uno::Reference& rXPropSet, const OUString& rURLPropName, const css::awt::Size& rSize = {}); - void WriteBlipFill(const css::uno::Reference& rXPropSet, + OOX_DLLPUBLIC void WriteBlipFill(const css::uno::Reference& rXPropSet, const OUString& sURLPropName, const css::awt::Size& rSize = {}); void WriteBlipFill(const css::uno::Reference& rXPropSet, const css::awt::Size& rSize, const OUString& sURLPropName, @@ -416,7 +416,7 @@ public: void WriteSrcRectXGraphic(css::uno::Reference const & rxPropertySet, css::uno::Reference const & rxGraphic); - void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, + OOX_DLLPUBLIC void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, css::uno::Reference< css::frame::XModel> const & xModel = nullptr ); void WriteXGraphicStretch(css::uno::Reference const & rXPropSet, @@ -442,7 +442,7 @@ public: css::uno::Reference const& rxGraphic, css::awt::Size const& rSize); - void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape, + OOX_DLLPUBLIC void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape, sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false, bool bSuppressFlipping = false, bool bFlippedBeforeRotation = false); void WriteTransformation(const css::uno::Reference< css::drawing::XShape >& xShape, const tools::Rectangle& rRectangle, sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0, bool bIsGroupShape = false); @@ -472,7 +472,7 @@ public: const css::uno::Reference< css::beans::XPropertySet >& rXShapePropSet = {}); void WritePresetShape( const OString& pShape , std::vector< std::pair> & rAvList ); - void WritePresetShape( const OString& pShape ); + OOX_DLLPUBLIC void WritePresetShape( const OString& pShape ); void WritePresetShape( const OString& pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, const css::beans::PropertyValue& rProp ); bool WriteCustomGeometry( const css::uno::Reference& rXShape, @@ -480,19 +480,19 @@ public: void WriteEmptyCustomGeometry(); void WritePolyPolygon(const css::uno::Reference& rXShape, const bool bClosed); - void WriteFill(const css::uno::Reference& xPropSet, + OOX_DLLPUBLIC void WriteFill(const css::uno::Reference& xPropSet, const css::awt::Size& rSize = {}); void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); - void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); + OOX_DLLPUBLIC void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteShapeEffect( std::u16string_view sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps ); /** Populates scene3d tag @param rXPropSet Prop set @param bIsText True if the 3D effects are for a text body, false if it is for a shape */ - void Write3DEffects(const css::uno::Reference& rXPropSet, bool bIsText); + OOX_DLLPUBLIC void Write3DEffects(const css::uno::Reference& rXPropSet, bool bIsText); void WriteArtisticEffect( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData ); - void WriteDiagram(const css::uno::Reference& rXShape, int nDiagramId); + OOX_DLLPUBLIC void WriteDiagram(const css::uno::Reference& rXShape, int nDiagramId); void writeDiagramRels(const css::uno::Sequence>& xRelSeq, const css::uno::Reference& xOutStream, std::u16string_view sGrabBagProperyName, int nDiagramId); @@ -502,7 +502,7 @@ public: static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape ); sal_Int32 getBulletMarginIndentation (const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, std::u16string_view propName); - static void ResetMlCounters(); + OOX_DLLPUBLIC static void ResetMlCounters(); static sal_Int32 getNewDrawingUniqueId() { return ++mnDrawingMLCount; } static sal_Int32 getNewVMLUniqueId() { return ++mnVmlCount; } @@ -525,7 +525,7 @@ public: const OUString& sRelationshipType, OUString* pRelationshipId ); - std::shared_ptr createGraphicExport(); + OOX_DLLPUBLIC std::shared_ptr createGraphicExport(); }; } -- cgit v1.2.3