From a6e682faa612fdb2b669ceaae8c9c3f4964c6b29 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 1 Nov 2019 11:31:11 +0200 Subject: find symbols that can be private update the script and make private standalone functions Change-Id: Icb26ce258107700c90f89ad4e0d3329d075a2eb1 Reviewed-on: https://gerrit.libreoffice.org/81879 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/vcl/animate/Animation.hxx | 4 ++-- include/vcl/bitmapex.hxx | 2 +- include/vcl/checksum.hxx | 2 +- include/vcl/gfxlink.hxx | 4 ++-- include/vcl/hatch.hxx | 4 ++-- include/vcl/layout.hxx | 10 +++++----- include/vcl/lineinfo.hxx | 4 ++-- include/vcl/mapmod.hxx | 4 ++-- include/vcl/status.hxx | 2 +- include/vcl/wall.hxx | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'include/vcl') diff --git a/include/vcl/animate/Animation.hxx b/include/vcl/animate/Animation.hxx index b8b390bb0644..c606fb7a85fe 100644 --- a/include/vcl/animate/Animation.hxx +++ b/include/vcl/animate/Animation.hxx @@ -84,8 +84,8 @@ public: short nChannelGPercent, short nChannelBPercent, double fGamma = 1.0, bool bInvert = false); - friend VCL_DLLPUBLIC SvStream& ReadAnimation(SvStream& rIStream, Animation& rAnimation); - friend VCL_DLLPUBLIC SvStream& WriteAnimation(SvStream& rOStream, const Animation& rAnimation); + friend SvStream& ReadAnimation(SvStream& rIStream, Animation& rAnimation); + friend SvStream& WriteAnimation(SvStream& rOStream, const Animation& rAnimation); public: SAL_DLLPRIVATE static void ImplIncAnimCount() { mnAnimCount++; } diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index f6f12c38618c..dd5c715c01b3 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -518,7 +518,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame( @param rSize The size of the frame in pixels */ -BitmapEx VCL_DLLPUBLIC createBlendFrame( +BitmapEx createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, Color aColorTopLeft, diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index c20cc745328a..34d8ed77ad0f 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -65,7 +65,7 @@ VCL_DLLPUBLIC sal_uInt64 vcl_crc64 ( ) SAL_THROW_EXTERN_C(); -VCL_DLLPUBLIC const sal_uInt64* vcl_get_crc64_table(); +const sal_uInt64* vcl_get_crc64_table(); } diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index c3fca958d176..fc21aa296aae 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -98,8 +98,8 @@ public: bool IsEMF() const; // WMF & EMF stored under the same type (NativeWmf) public: - friend VCL_DLLPUBLIC SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ); - friend VCL_DLLPUBLIC SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink ); + friend SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ); + friend SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink ); }; #endif diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 70286d9cc7ec..c297e30fd414 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -65,8 +65,8 @@ public: void SetAngle( sal_uInt16 nAngle10 ); sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; } - friend VCL_DLLPUBLIC SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ); - friend VCL_DLLPUBLIC SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ); + friend SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ); + friend SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ); private: o3tl::cow_wrapper< ImplHatch > mpImplHatch; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 5fd0a792fe09..b339ef4d4869 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -792,28 +792,28 @@ public: //i.e. acts like pChild = pChild->GetWindow(GetWindowType::FirstChild); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* firstLogicalChildOfParent(const vcl::Window *pTopLevel); +vcl::Window* firstLogicalChildOfParent(const vcl::Window *pTopLevel); //Get last window of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(GetWindowType::LastChild); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* lastLogicalChildOfParent(const vcl::Window *pTopLevel); +vcl::Window* lastLogicalChildOfParent(const vcl::Window *pTopLevel); //Get next window after pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(GetWindowType::Next); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* nextLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); +vcl::Window* nextLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); //Get previous window before pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(GetWindowType::Prev); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* prevLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); +vcl::Window* prevLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); //Returns true is the Window has a single child which is a container VCL_DLLPUBLIC bool isLayoutEnabled(const vcl::Window *pWindow); @@ -837,7 +837,7 @@ inline bool isContainerWindow(const vcl::Window *pWindow) Size getLegacyBestSizeForChildren(const vcl::Window &rWindow); //Get first parent which is not a layout widget -VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent); +vcl::Window* getNonLayoutParent(vcl::Window *pParent); #endif diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 753cc5b54c4f..09cc074075a2 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -92,8 +92,8 @@ public: bool IsDefault() const; - friend VCL_DLLPUBLIC SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ); - friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ); + friend SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ); + friend SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ); // helper to get decomposed polygon data with the LineInfo applied. The source // hairline polygon is given in io_rLinePolyPolygon. Both given polygons may diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index e0be5fa62a41..2851c966c890 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -63,8 +63,8 @@ public: { return !(MapMode::operator==( rMapMode )); } bool IsDefault() const; - friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); - friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); + friend SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); + friend SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); // tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps // vcl::ScopedBitmapAccess in parallelized 3D renderer diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 79497a448014..c67f54bfd792 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -33,7 +33,7 @@ class MouseEvent; class UserDrawEvent; struct ImplStatusItem; -void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, +void DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const tools::Rectangle& rFramePosSize); diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index c6e8e863be3c..3aa0949b90e6 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -104,8 +104,8 @@ public: !IsBitmap() && !IsGradient() && !IsRect(); } - friend VCL_DLLPUBLIC SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); - friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ); + friend SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); + friend SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ); }; #endif // INCLUDED_VCL_WALL_HXX -- cgit