diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-15 10:04:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-19 09:09:06 +0100 |
commit | 3ba92b5f1eaf7d4447a0943ea260db515ca799dc (patch) | |
tree | c9d872596ba8c5d57f6a30761d5ce1052972735a /vcl | |
parent | 5f0021cdd0b84fccaecf23a014622f0aca86430c (diff) |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/headless/CairoCommon.cxx | 6 | ||||
-rw-r--r-- | vcl/inc/canvasbitmap.hxx | 26 | ||||
-rw-r--r-- | vcl/inc/headless/CairoCommon.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/headless/SvpGraphicsBackend.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/impgraph.hxx | 6 | ||||
-rw-r--r-- | vcl/source/accessibility/AccessibleTextAttributeHelper.cxx | 7 |
6 files changed, 26 insertions, 29 deletions
diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx index 1a364bb53787..00122dfce3da 100644 --- a/vcl/headless/CairoCommon.cxx +++ b/vcl/headless/CairoCommon.cxx @@ -143,9 +143,9 @@ basegfx::B2DRange getClippedStrokeDamage(cairo_t* cr) // for Chart-content visualization. CAUTION: It's not the same as PixelSnap (!) // tdf#129845 add reply value to allow counting a point/byte/size measurement to // be included -size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, - const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap, - bool bPixelSnapHairline) +static size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap, + bool bPixelSnapHairline) { // short circuit if there is nothing to do const sal_uInt32 nPointCount(rPolygon.count()); diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 9460dcec96fc..16f283c038a2 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -30,7 +30,7 @@ namespace vcl::unotools { - class VCL_DLLPUBLIC VclCanvasBitmap final : + class VclCanvasBitmap final : public cppu::WeakImplHelper< css::rendering::XIntegerReadOnlyBitmap, css::rendering::XBitmapPalette, css::rendering::XIntegerBitmapColorSpace > @@ -55,7 +55,7 @@ namespace vcl::unotools sal_Int32 m_nIndexIndex; bool m_bPalette; - SAL_DLLPRIVATE void setComponentInfo( sal_uInt32 redShift, sal_uInt32 greenShift, sal_uInt32 blueShift ); + void setComponentInfo( sal_uInt32 redShift, sal_uInt32 greenShift, sal_uInt32 blueShift ); BitmapScopedReadAccess& getBitmapReadAccess(); BitmapScopedReadAccess& getAlphaReadAccess(); @@ -63,15 +63,15 @@ namespace vcl::unotools public: // XBitmap - virtual css::geometry::IntegerSize2D SAL_CALL getSize() override; - virtual sal_Bool SAL_CALL hasAlpha( ) override; - virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) override; + VCL_DLLPUBLIC virtual css::geometry::IntegerSize2D SAL_CALL getSize() override; + VCL_DLLPUBLIC virtual sal_Bool SAL_CALL hasAlpha( ) override; + VCL_DLLPUBLIC virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) override; // XIntegerReadOnlyBitmap - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override; + VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override; + VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override; /// @throws css::uno::RuntimeException - css::uno::Reference< css::rendering::XBitmapPalette > getPalette( ); + VCL_DLLPUBLIC css::uno::Reference< css::rendering::XBitmapPalette > getPalette( ); virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) override; // XBitmapPalette @@ -97,11 +97,11 @@ namespace vcl::unotools virtual ::sal_Int8 SAL_CALL getEndianness( ) override; virtual css::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) override; virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override; - virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; - virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; + VCL_DLLPUBLIC virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; + VCL_DLLPUBLIC virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; + VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override; + VCL_DLLPUBLIC virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; /** Create API wrapper for given BitmapEx @@ -110,7 +110,7 @@ namespace vcl::unotools Bitmap to wrap. As usual, changes to the original bitmap are not reflected in this object (copy on write). */ - explicit VclCanvasBitmap( const BitmapEx& rBitmap ); + VCL_DLLPUBLIC explicit VclCanvasBitmap( const BitmapEx& rBitmap ); /// Retrieve contained bitmap. Call me with locked Solar mutex! const BitmapEx& getBitmapEx() const { return m_aBmpEx; } diff --git a/vcl/inc/headless/CairoCommon.hxx b/vcl/inc/headless/CairoCommon.hxx index 80ada0dd2c61..ac56d5d05924 100644 --- a/vcl/inc/headless/CairoCommon.hxx +++ b/vcl/inc/headless/CairoCommon.hxx @@ -85,10 +85,6 @@ public: virtual sal_Int64 estimateUsageInBytes() const override; }; -VCL_DLLPUBLIC size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, - const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap, - bool bPixelSnapHairline); - class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PixelSnapper { public: diff --git a/vcl/inc/headless/SvpGraphicsBackend.hxx b/vcl/inc/headless/SvpGraphicsBackend.hxx index 6a68899c8a27..c193fbee4465 100644 --- a/vcl/inc/headless/SvpGraphicsBackend.hxx +++ b/vcl/inc/headless/SvpGraphicsBackend.hxx @@ -27,7 +27,7 @@ #include <headless/CairoCommon.hxx> -class VCL_DLLPUBLIC SvpGraphicsBackend final : public SalGraphicsImpl +class SvpGraphicsBackend final : public SalGraphicsImpl { CairoCommon& m_rCairoCommon; @@ -132,8 +132,8 @@ public: bool supportsOperation(OutDevSupportType eType) const override; - void drawBitmapBuffer(const SalTwoRect& rPosAry, const BitmapBuffer* pBuffer, - cairo_operator_t eOp); + void VCL_DLLPUBLIC drawBitmapBuffer(const SalTwoRect& rPosAry, const BitmapBuffer* pBuffer, + cairo_operator_t eOp); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 2e2b00640a20..15d68d00157c 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -56,7 +56,7 @@ enum class GraphicContentType : sal_Int32 Vector }; -class VCL_DLLPUBLIC ImpGraphic final +class ImpGraphic final { friend class Graphic; friend class GraphicID; @@ -215,9 +215,9 @@ private: public: void resetChecksum() { mnChecksum = 0; } bool swapIn(); - bool swapOut(); + VCL_DLLPUBLIC bool swapOut(); bool isSwappedOut() const { return mbSwapOut; } - SvStream* getSwapFileStream() const; + VCL_DLLPUBLIC SvStream* getSwapFileStream() const; // public only because of use in GraphicFilter void updateFromLoadedGraphic(const ImpGraphic* graphic); void dumpState(rtl::OStringBuffer &rState); diff --git a/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx b/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx index 5647dc972ba5..39a77d2476b4 100644 --- a/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx +++ b/vcl/source/accessibility/AccessibleTextAttributeHelper.cxx @@ -241,7 +241,7 @@ OUString lcl_ConvertParagraphAdjust(css::style::ParagraphAdjust eParaAdjust) } } -OUString AccessibleTextAttributeHelper::ConvertUnoToIAccessible2TextAttributes( +static OUString ConvertUnoToIAccessible2TextAttributes( const css::uno::Sequence<css::beans::PropertyValue>& rUnoAttributes, IA2AttributeType eAttributeType) { @@ -336,8 +336,9 @@ OUString AccessibleTextAttributeHelper::ConvertUnoToIAccessible2TextAttributes( } OUString AccessibleTextAttributeHelper::GetIAccessible2TextAttributes( - css::uno::Reference<css::accessibility::XAccessibleText> xText, IA2AttributeType eAttributeType, - sal_Int32 nOffset, sal_Int32& rStartOffset, sal_Int32& rEndOffset) + const css::uno::Reference<css::accessibility::XAccessibleText>& xText, + IA2AttributeType eAttributeType, sal_Int32 nOffset, sal_Int32& rStartOffset, + sal_Int32& rEndOffset) { assert(xText.is()); |