ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

replace VCL_DLLPRIVATE with SAL_DLLPRIVATE

Browse Source 
it is always SAL_DLLPRIVATE, and we are already using SAL_DLLPRIVATE
mostly, so just be consistent

Change-Id: I7df969506a9b7a078921400cf245cede3c60c5f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164805
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2024-03-14 14:31:37 +01:00
parent 873af30a36
commit fbb3b083d4
12 changed files with 78 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/GraphicObject.hxx
+6 -6
View File
@@ -59,7 +59,7 @@ private:
OUString maUserData;
std::unique_ptr<GrfSimpleCacheObj> mxSimpleCache;
bool VCL_DLLPRIVATE ImplGetCropParams(
bool SAL_DLLPRIVATE ImplGetCropParams(
const OutputDevice& rOut,
Point& rPt,
Size& rSz,
@@ -106,7 +106,7 @@ private:
@return true, if everything was successfully rendered.
*/
bool VCL_DLLPRIVATE ImplRenderTempTile(
bool SAL_DLLPRIVATE ImplRenderTempTile(
VirtualDevice& rVDev,
int nNumTilesX,
int nNumTilesY,
@@ -115,7 +115,7 @@ private:
);
/// internally called by ImplRenderTempTile()
bool VCL_DLLPRIVATE ImplRenderTileRecursive(
bool SAL_DLLPRIVATE ImplRenderTileRecursive(
VirtualDevice& rVDev,
int nExponent,
int nMSBFactor,
@@ -128,7 +128,7 @@ private:
ImplTileInfo& rTileInfo
);
bool VCL_DLLPRIVATE ImplDrawTiled(
bool SAL_DLLPRIVATE ImplDrawTiled(
OutputDevice& rOut,
const tools::Rectangle& rArea,
const Size& rSizePixel,
@@ -137,7 +137,7 @@ private:
int nTileCacheSize1D
);
bool VCL_DLLPRIVATE ImplDrawTiled(
bool SAL_DLLPRIVATE ImplDrawTiled(
OutputDevice& rOut,
const Point& rPos,
int nNumTilesX,
@@ -146,7 +146,7 @@ private:
const GraphicAttr* pAttr
) const;
void VCL_DLLPRIVATE ImplTransformBitmap(
void SAL_DLLPRIVATE ImplTransformBitmap(
BitmapEx& rBmpEx,
const GraphicAttr& rAttr,
const Size& rCropLeftTop,
include/vcl/dllapi.h
-1
View File
@@ -28,7 +28,6 @@
#else
#define VCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define VCL_DLLPRIVATE SAL_DLLPRIVATE
#if defined DLLIMPLEMENTATION_UITEST
#define UITEST_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
include/vcl/headbar.hxx
+12 -12
View File
@@ -231,21 +231,21 @@ private:
mxAccessible;
using Window::ImplInit;
VCL_DLLPRIVATE void ImplInit( WinBits nWinStyle );
VCL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
VCL_DLLPRIVATE tools::Long ImplGetItemPos( sal_uInt16 nPos ) const;
VCL_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
VCL_DLLPRIVATE sal_uInt16 ImplDoHitTest( const Point& rPos, tools::Long& nMouseOff, sal_uInt16& nPos ) const;
VCL_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
SAL_DLLPRIVATE void ImplInit( WinBits nWinStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SAL_DLLPRIVATE tools::Long ImplGetItemPos( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE sal_uInt16 ImplDoHitTest( const Point& rPos, tools::Long& nMouseOff, sal_uInt16& nPos ) const;
SAL_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
const tools::Rectangle& rItemRect, const tools::Rectangle* pRect);
VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
const tools::Rectangle* pRect);
VCL_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
SAL_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
bool bEnd = false );
VCL_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
VCL_DLLPRIVATE void ImplDrag( const Point& rPos );
VCL_DLLPRIVATE void ImplEndDrag( bool bCancel );
SAL_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
SAL_DLLPRIVATE void ImplDrag( const Point& rPos );
SAL_DLLPRIVATE void ImplEndDrag( bool bCancel );
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
include/vcl/imappoly.hxx
+1 -1
View File
@@ -31,7 +31,7 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) IMapPolygonObject final : public IMapObjec
tools::Rectangle aEllipse;
bool bEllipse;
VCL_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
SAL_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
// binary import/export
virtual void WriteIMapObject( SvStream& rOStm ) const override;
include/vcl/imaprect.hxx
+1 -1
View File
@@ -29,7 +29,7 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) IMapRectangleObject final : public IMapObj
{
tools::Rectangle aRect;
VCL_DLLPRIVATE void ImpConstruct( const tools::Rectangle& rRect, bool bPixel );
SAL_DLLPRIVATE void ImpConstruct( const tools::Rectangle& rRect, bool bPixel );
// binary import/export
virtual void WriteIMapObject( SvStream& rOStm ) const override;
include/vcl/print.hxx
+31 -31
View File
@@ -95,18 +95,18 @@ private:
bool mbUsePrintSetting;
bool mbResetPrintArea;
VCL_DLLPRIVATE void ImplInitData();
VCL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
VCL_DLLPRIVATE void ImplInitDisplay();
VCL_DLLPRIVATE static SalPrinterQueueInfo*
SAL_DLLPRIVATE void ImplInitData();
SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
SAL_DLLPRIVATE void ImplInitDisplay();
SAL_DLLPRIVATE static SalPrinterQueueInfo*
ImplGetQueueInfo( const OUString& rPrinterName, const OUString* pDriver );
VCL_DLLPRIVATE void ImplUpdatePageData();
VCL_DLLPRIVATE void ImplUpdateFontList();
VCL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup& );
SAL_DLLPRIVATE void ImplUpdatePageData();
SAL_DLLPRIVATE void ImplUpdateFontList();
SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup& );
VCL_DLLPRIVATE bool StartJob( const OUString& rJobName, std::shared_ptr<vcl::PrinterController> const & );
SAL_DLLPRIVATE bool StartJob( const OUString& rJobName, std::shared_ptr<vcl::PrinterController> const & );
static VCL_DLLPRIVATE ErrCode
static SAL_DLLPRIVATE ErrCode
ImplSalPrinterErrorCodeToVCL( SalPrinterError nError );
SAL_DLLPRIVATE void ImplPrintTransparent (
@@ -115,13 +115,13 @@ private:
const Point& rSrcPtPixel, const Size& rSrcSizePixel );
private:
VCL_DLLPRIVATE void EndJob();
SAL_DLLPRIVATE void EndJob();
Printer( const Printer& rPrinter ) = delete;
Printer& operator =( const Printer& rPrinter ) = delete;
public:
VCL_DLLPRIVATE void ImplStartPage();
VCL_DLLPRIVATE void ImplEndPage();
SAL_DLLPRIVATE void ImplStartPage();
SAL_DLLPRIVATE void ImplEndPage();
protected:
virtual bool AcquireGraphics() const override;
@@ -220,7 +220,7 @@ public:
should the need arise to set the printer options outside vcl, also a method would have to be devised
to not override these again internally
*/
VCL_DLLPRIVATE void SetPrinterOptions( const vcl::printer::Options& rOptions );
SAL_DLLPRIVATE void SetPrinterOptions( const vcl::printer::Options& rOptions );
const vcl::printer::Options& GetPrinterOptions() const { return( *mpPrinterOptions ); }
void ResetPrintArea(bool bReset) { mbResetPrintArea = bReset; }
@@ -311,7 +311,7 @@ public:
not exported, not usable outside vcl
*/
static void VCL_DLLPRIVATE ImplPrintJob( const std::shared_ptr<vcl::PrinterController>& i_pController,
static void SAL_DLLPRIVATE ImplPrintJob( const std::shared_ptr<vcl::PrinterController>& i_pController,
const JobSetup& i_rInitSetup );
};
@@ -465,37 +465,37 @@ public:
// the benefit of vcl's plugins.
// Still: DO NOT USE OUTSIDE VCL
int getFilteredPageCount() const;
VCL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf,
SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf,
bool i_bMayUseCache = false );
PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf,
bool i_bMayUseCache = false );
void printFilteredPage( int i_nPage );
VCL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& );
SAL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& );
void createProgressDialog();
bool isProgressCanceled() const;
VCL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
VCL_DLLPRIVATE const MultiPageSetup&
SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
SAL_DLLPRIVATE const MultiPageSetup&
getMultipage() const;
void setLastPage( bool i_bLastPage );
VCL_DLLPRIVATE void setReversePrint( bool i_bReverse );
VCL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup );
VCL_DLLPRIVATE bool getPapersizeFromSetup() const;
VCL_DLLPRIVATE void setPaperSizeFromUser( Size i_aUserSize );
VCL_DLLPRIVATE void setOrientationFromUser( Orientation eOrientation, bool set );
SAL_DLLPRIVATE void setReversePrint( bool i_bReverse );
SAL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup );
SAL_DLLPRIVATE bool getPapersizeFromSetup() const;
SAL_DLLPRIVATE void setPaperSizeFromUser( Size i_aUserSize );
SAL_DLLPRIVATE void setOrientationFromUser( Orientation eOrientation, bool set );
void setPrinterModified( bool i_bPapersizeFromSetup );
bool getPrinterModified() const;
VCL_DLLPRIVATE void pushPropertiesToPrinter();
VCL_DLLPRIVATE void resetPaperToLastConfigured();
VCL_DLLPRIVATE void resetPrintArea();
SAL_DLLPRIVATE void pushPropertiesToPrinter();
SAL_DLLPRIVATE void resetPaperToLastConfigured();
SAL_DLLPRIVATE void resetPrintArea();
void setJobState( css::view::PrintableState );
VCL_DLLPRIVATE void setupPrinter( weld::Window* i_pDlgParent );
SAL_DLLPRIVATE void setupPrinter( weld::Window* i_pDlgParent );
VCL_DLLPRIVATE int getPageCountProtected() const;
VCL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue >
SAL_DLLPRIVATE int getPageCountProtected() const;
SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue >
getPageParametersProtected( int i_nPage ) const;
VCL_DLLPRIVATE DrawModeFlags removeTransparencies( GDIMetaFile const & i_rIn, GDIMetaFile& o_rOut );
VCL_DLLPRIVATE void resetPrinterOptions( bool i_bFileOutput );
SAL_DLLPRIVATE DrawModeFlags removeTransparencies( GDIMetaFile const & i_rIn, GDIMetaFile& o_rOut );
SAL_DLLPRIVATE void resetPrinterOptions( bool i_bFileOutput );
};
class VCL_DLLPUBLIC PrinterOptionsHelper
include/vcl/roadmapwizard.hxx
+1 -1
View File
@@ -179,7 +179,7 @@ namespace vcl
/** updates the roadmap control to show the given path, as far as possible
(modulo conflicts with other paths)
*/
VCL_DLLPRIVATE void implUpdateRoadmap( );
SAL_DLLPRIVATE void implUpdateRoadmap( );
};
} // namespace vcl
include/vcl/toolkit/treelist.hxx
+5 -5
View File
@@ -95,25 +95,25 @@ class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvTreeList final
sal_uInt32 GetChildSelectionCount( const SvListView*,SvTreeListEntry* pParent ) const;
VCL_DLLPRIVATE void SetAbsolutePositions();
SAL_DLLPRIVATE void SetAbsolutePositions();
VCL_DLLPRIVATE void CloneChildren(
SAL_DLLPRIVATE void CloneChildren(
SvTreeListEntries& rDst, sal_uInt32& rCloneCount, SvTreeListEntries& rSrc, SvTreeListEntry& rNewParent) const;
/**
* Invalidate the cached position data to have them re-generated before
* the next access.
*/
VCL_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
SAL_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
// rPos is not changed for SortModeNone
VCL_DLLPRIVATE void GetInsertionPos(
SAL_DLLPRIVATE void GetInsertionPos(
SvTreeListEntry const * pEntry,
SvTreeListEntry* pParent,
sal_uInt32& rPos
);
VCL_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
SAL_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
SvTreeList(const SvTreeList&) = delete;
SvTreeList& operator= (const SvTreeList&) = delete;
include/vcl/toolkit/treelistbox.hxx
+16 -16
View File
@@ -263,16 +263,16 @@ private:
// call. The AddBox method is called from the GetDragFinishedHdl() and the
// remove is called in the link callback and in the dtor. So it can't be
// called for a deleted object.
VCL_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB );
VCL_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB );
SAL_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB );
SAL_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB );
DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8, void );
// after a checkbox entry is inserted, use this to get its width to support
// autowidth for the 1st checkbox column
VCL_DLLPRIVATE void CheckBoxInserted(SvTreeListEntry* pEntry);
SAL_DLLPRIVATE void CheckBoxInserted(SvTreeListEntry* pEntry);
VCL_DLLPRIVATE void DrawCustomEntry(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const SvTreeListEntry& rEntry);
VCL_DLLPRIVATE Size MeasureCustomEntry(vcl::RenderContext& rRenderContext, const SvTreeListEntry& rEntry) const;
SAL_DLLPRIVATE void DrawCustomEntry(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const SvTreeListEntry& rEntry);
SAL_DLLPRIVATE Size MeasureCustomEntry(vcl::RenderContext& rRenderContext, const SvTreeListEntry& rEntry) const;
/** Handles the given key event.
@@ -281,7 +281,7 @@ private:
@return
<TRUE/> if the event has been consumed, <FALSE/> otherwise.
*/
VCL_DLLPRIVATE bool HandleKeyInput(const KeyEvent& rKEvt);
SAL_DLLPRIVATE bool HandleKeyInput(const KeyEvent& rKEvt);
void UnsetDropTarget();
@@ -472,22 +472,22 @@ public:
virtual bool set_property(const OUString &rKey, const OUString &rValue) override;
VCL_DLLPRIVATE void SetCollapsedNodeBmp( const Image& );
VCL_DLLPRIVATE void SetExpandedNodeBmp( const Image& );
VCL_DLLPRIVATE Image const & GetExpandedNodeBmp( ) const;
SAL_DLLPRIVATE void SetCollapsedNodeBmp( const Image& );
SAL_DLLPRIVATE void SetExpandedNodeBmp( const Image& );
SAL_DLLPRIVATE Image const & GetExpandedNodeBmp( ) const;
protected:
virtual void CalcEntryHeight(SvTreeListEntry const* pEntry);
void AdjustEntryHeight( const Image& rBmp );
VCL_DLLPRIVATE void AdjustEntryHeight();
SAL_DLLPRIVATE void AdjustEntryHeight();
VCL_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry );
VCL_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, tools::Long nLine, vcl::RenderContext& rRenderContext );
SAL_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry );
SAL_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, tools::Long nLine, vcl::RenderContext& rRenderContext );
VCL_DLLPRIVATE void InitTreeView();
VCL_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, tools::Long nX, SvLBoxTab** ppTab );
VCL_DLLPRIVATE void ImplInitStyle();
SAL_DLLPRIVATE void InitTreeView();
SAL_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, tools::Long nX, SvLBoxTab** ppTab );
SAL_DLLPRIVATE void ImplInitStyle();
void SetupDragOrigin();
void EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
@@ -529,7 +529,7 @@ protected:
// true if rPos is over the SvTreeListBox body, i.e. not over a
// scrollbar
VCL_DLLPRIVATE bool PosOverBody(const Point& rPos) const;
SAL_DLLPRIVATE bool PosOverBody(const Point& rPos) const;
public:
void SetNoAutoCurEntry( bool b );
include/vcl/transfer.hxx
+2 -2
View File
@@ -134,7 +134,7 @@ class VCL_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datat
private:
// nested class to implement the XTerminateListener interface
class VCL_DLLPRIVATE TerminateListener final : public cppu::WeakImplHelper< css::frame::XTerminateListener, css::lang::XServiceInfo >
class SAL_DLLPRIVATE TerminateListener final : public cppu::WeakImplHelper< css::frame::XTerminateListener, css::lang::XServiceInfo >
{
private:
@@ -219,7 +219,7 @@ protected:
private:
VCL_DLLPRIVATE void ImplFlush();
SAL_DLLPRIVATE void ImplFlush();
protected:
include/vcl/wizardmachine.hxx
+2 -2
View File
@@ -326,8 +326,8 @@ namespace vcl
DECL_DLLPRIVATE_LINK(OnFinish, weld::Button&, void);
DECL_DLLPRIVATE_LINK(OnCancel, weld::Button&, void);
VCL_DLLPRIVATE void implUpdateTitle();
VCL_DLLPRIVATE void implConstruct( const WizardButtonFlags _nButtonFlags );
SAL_DLLPRIVATE void implUpdateTitle();
SAL_DLLPRIVATE void implConstruct( const WizardButtonFlags _nButtonFlags );
};
vcl/inc/unx/fontmanager.hxx
+1 -1
View File
@@ -62,7 +62,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
struct PrintFont;
friend struct PrintFont;
struct VCL_DLLPRIVATE PrintFont
struct SAL_DLLPRIVATE PrintFont
{
FontAttributes m_aFontAttributes;