From c02c4df9414ed2bef96565522238ca05013d3ac3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Nov 2019 11:11:50 +0200 Subject: make some classes module-private Change-Id: Ice9a57eedb166672dbdfae6da2a172ab77566a19 Reviewed-on: https://gerrit.libreoffice.org/81983 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/basic/sbmeth.hxx | 2 +- include/basic/sbx.hxx | 6 +++--- include/basic/sbxfac.hxx | 2 +- include/basic/sbxform.hxx | 36 ++++++++++++++++++------------------ include/basic/sbxprop.hxx | 2 +- include/basic/sbxvar.hxx | 2 +- include/sfx2/charmapcontrol.hxx | 2 +- include/sfx2/emojicontrol.hxx | 2 +- include/sfx2/templatedlg.hxx | 2 +- include/sfx2/templatelocalview.hxx | 2 +- include/sfx2/thumbnailview.hxx | 20 ++++++++++---------- include/sot/stg.hxx | 2 +- include/svx/sdginitm.hxx | 2 +- include/svx/svddrag.hxx | 2 +- include/svx/svddrgmt.hxx | 2 +- include/svx/svdhdl.hxx | 2 +- include/svx/svdobj.hxx | 2 +- include/svx/sxmtfitm.hxx | 4 ++-- include/svx/sxmtritm.hxx | 2 +- include/vcl/fixed.hxx | 2 +- include/vcl/salnativewidgets.hxx | 6 +++--- include/vcl/svlbitm.hxx | 2 +- include/vcl/treelistbox.hxx | 2 +- include/vcl/uitest/uiobject.hxx | 6 +++--- include/xmloff/xmlmetae.hxx | 8 ++++---- 25 files changed, 61 insertions(+), 61 deletions(-) (limited to 'include') diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 56770fa19fcc..5fa65b79b37c 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -67,7 +67,7 @@ public: typedef tools::SvRef SbMethodRef; -class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod +class SbIfaceMapperMethod : public SbMethod { friend class SbiRuntime; diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index d80de9838d1c..2cdf24117001 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -182,9 +182,9 @@ public: void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; }; }; -class BASIC_DLLPUBLIC SbxCollection : public SbxObject +class SbxCollection : public SbxObject { - BASIC_DLLPRIVATE void Initialize(); + void Initialize(); protected: virtual ~SbxCollection() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; @@ -203,7 +203,7 @@ public: virtual void Clear() override; }; -class BASIC_DLLPUBLIC SbxStdCollection final : public SbxCollection +class SbxStdCollection final : public SbxCollection { OUString aElemClass; bool bAddRemoveOk; diff --git a/include/basic/sbxfac.hxx b/include/basic/sbxfac.hxx index 5192cc858fd8..a525aa55241a 100644 --- a/include/basic/sbxfac.hxx +++ b/include/basic/sbxfac.hxx @@ -26,7 +26,7 @@ class SbxBase; class SbxObject; -class BASIC_DLLPUBLIC SbxFactory +class SbxFactory { public: virtual ~SbxFactory(); diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx index 6ef7734eb8c1..b07a1945c7c7 100644 --- a/include/basic/sbxform.hxx +++ b/include/basic/sbxform.hxx @@ -71,7 +71,7 @@ #include #include -class BASIC_DLLPUBLIC SbxBasicFormater { +class SbxBasicFormater { public: // Constructor takes signs for decimal point, thousand separation sign // and necessary resource strings. @@ -100,25 +100,25 @@ class BASIC_DLLPUBLIC SbxBasicFormater { static bool isBasicFormat( const OUString& sFormatStrg ); private: - BASIC_DLLPRIVATE static inline void ShiftString( OUStringBuffer& sStrg, sal_uInt16 nStartPos ); - BASIC_DLLPRIVATE static void AppendDigit( OUStringBuffer& sStrg, short nDigit ); - BASIC_DLLPRIVATE void LeftShiftDecimalPoint( OUStringBuffer& sStrg ); - BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos, bool& bOverflow ); - BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos ); - BASIC_DLLPRIVATE static void ParseBack( OUStringBuffer& sStrg, const OUString& sFormatStrg, + static inline void ShiftString( OUStringBuffer& sStrg, sal_uInt16 nStartPos ); + static void AppendDigit( OUStringBuffer& sStrg, short nDigit ); + void LeftShiftDecimalPoint( OUStringBuffer& sStrg ); + void StrRoundDigit( OUStringBuffer& sStrg, short nPos, bool& bOverflow ); + void StrRoundDigit( OUStringBuffer& sStrg, short nPos ); + static void ParseBack( OUStringBuffer& sStrg, const OUString& sFormatStrg, short nFormatPos ); // Methods for string conversion with sprintf(): - BASIC_DLLPRIVATE void InitScan( double _dNum ); - BASIC_DLLPRIVATE void InitExp( double _dNewExp ); - BASIC_DLLPRIVATE short GetDigitAtPosScan( short nPos, bool& bFoundFirstDigit ); - BASIC_DLLPRIVATE short GetDigitAtPosExpScan( double dNewExponent, short nPos, + void InitScan( double _dNum ); + void InitExp( double _dNewExp ); + short GetDigitAtPosScan( short nPos, bool& bFoundFirstDigit ); + short GetDigitAtPosExpScan( double dNewExponent, short nPos, bool& bFoundFirstDigit ); - BASIC_DLLPRIVATE short GetDigitAtPosExpScan( short nPos, bool& bFoundFirstDigit ); - BASIC_DLLPRIVATE static OUString GetPosFormatString( const OUString& sFormatStrg, bool & bFound ); - BASIC_DLLPRIVATE static OUString GetNegFormatString( const OUString& sFormatStrg, bool & bFound ); - BASIC_DLLPRIVATE static OUString Get0FormatString( const OUString& sFormatStrg, bool & bFound ); - BASIC_DLLPRIVATE static OUString GetNullFormatString( const OUString& sFormatStrg, bool & bFound ); - BASIC_DLLPRIVATE static void AnalyseFormatString( const OUString& sFormatStrg, + short GetDigitAtPosExpScan( short nPos, bool& bFoundFirstDigit ); + static OUString GetPosFormatString( const OUString& sFormatStrg, bool & bFound ); + static OUString GetNegFormatString( const OUString& sFormatStrg, bool & bFound ); + static OUString Get0FormatString( const OUString& sFormatStrg, bool & bFound ); + static OUString GetNullFormatString( const OUString& sFormatStrg, bool & bFound ); + static void AnalyseFormatString( const OUString& sFormatStrg, short& nNoOfDigitsLeft, short& nNoOfDigitsRight, short& nNoOfOptionalDigitsLeft, short& nNoOfExponentDigits, @@ -126,7 +126,7 @@ class BASIC_DLLPUBLIC SbxBasicFormater { bool& bPercent, bool& bCurrency, bool& bScientific, bool& bGenerateThousandSeparator, short& nMultipleThousandSeparators ); - BASIC_DLLPRIVATE void ScanFormatString( double dNumber, const OUString& sFormatStrg, + void ScanFormatString( double dNumber, const OUString& sFormatStrg, OUString& sReturnStrg, bool bCreateSign ); //*** Data *** diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx index 4f23088273b3..34557ad599d8 100644 --- a/include/basic/sbxprop.hxx +++ b/include/basic/sbxprop.hxx @@ -23,7 +23,7 @@ #include #include -class BASIC_DLLPUBLIC SbxProperty : public SbxVariable +class SbxProperty : public SbxVariable { public: SBX_DECL_PERSIST_NODATA(SBXID_PROPERTY,1); diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 8aa27e9f960b..4ab7052cc2dd 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -304,7 +304,7 @@ typedef tools::SvRef SbxVariableRef; //tdf#59222 SbxEnsureParentVariable is a SbxVariable which keeps a reference to //its parent, ensuring it always exists while this SbxVariable exists -class BASIC_DLLPUBLIC SbxEnsureParentVariable final : public SbxVariable +class SbxEnsureParentVariable final : public SbxVariable { SbxObjectRef xParent; public: diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx index 4984fca53b31..4c0501c0abfd 100644 --- a/include/sfx2/charmapcontrol.hxx +++ b/include/sfx2/charmapcontrol.hxx @@ -29,7 +29,7 @@ namespace com::sun::star::frame { class XFrame; } -class SFX2_DLLPUBLIC SfxCharmapCtrl final : public SfxPopupWindow +class SfxCharmapCtrl final : public SfxPopupWindow { public: explicit SfxCharmapCtrl(sal_uInt16 nId, vcl::Window* pParent, diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx index 0af0510fde2e..4026a31954ab 100644 --- a/include/sfx2/emojicontrol.hxx +++ b/include/sfx2/emojicontrol.hxx @@ -23,7 +23,7 @@ class EmojiView; class ThumbnailViewItem; enum class FILTER_CATEGORY; -class SFX2_DLLPUBLIC SfxEmojiControl final : public SfxPopupWindow +class SfxEmojiControl final : public SfxPopupWindow { public: explicit SfxEmojiControl(sal_uInt16 nId, vcl::Window* pParent, diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 85e56da5fdca..ad910e2dd664 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -142,7 +142,7 @@ protected: // class SfxTemplateCategoryDialog ------------------------------------------------------------------- -class SFX2_DLLPUBLIC SfxTemplateCategoryDialog final : public weld::GenericDialogController +class SfxTemplateCategoryDialog final : public weld::GenericDialogController { private: OUString msSelectedCategory; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 07b3fd0cf052..f5a797f25ae5 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -136,7 +136,7 @@ protected: std::vector maAllTemplates; }; -class SFX2_DLLPUBLIC SfxTemplateLocalView final : public SfxThumbnailView +class SfxTemplateLocalView final : public SfxThumbnailView { typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 19190bf605c8..81d16bd2eb80 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -314,7 +314,7 @@ protected: std::function maFilterFunc; }; -class SFX2_DLLPUBLIC SfxThumbnailView : public weld::CustomWidgetController, public ThumbnailViewBase +class SfxThumbnailView : public weld::CustomWidgetController, public ThumbnailViewBase { public: SfxThumbnailView(std::unique_ptr xWindow, std::unique_ptr xMenu); @@ -415,16 +415,16 @@ protected: void CalculateItemPositions (bool bScrollBarUsed = false); void MakeItemVisible( sal_uInt16 nId ); - SFX2_DLLPRIVATE void ImplInit(); + void ImplInit(); - SFX2_DLLPRIVATE void ImplDeleteItems(); - SFX2_DLLPRIVATE size_t ImplGetItem( const Point& rPoint ) const; - SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetItem( size_t nPos ); - SFX2_DLLPRIVATE virtual sal_uInt16 ImplGetVisibleItemCount() const override; - SFX2_DLLPRIVATE virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos) override; - SFX2_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); - SFX2_DLLPRIVATE bool ImplHasAccessibleListeners(); - DECL_DLLPRIVATE_LINK( ImplScrollHdl, weld::ScrolledWindow&, void ); + void ImplDeleteItems(); + size_t ImplGetItem( const Point& rPoint ) const; + ThumbnailViewItem* ImplGetItem( size_t nPos ); + virtual sal_uInt16 ImplGetVisibleItemCount() const override; + virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos) override; + void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); + bool ImplHasAccessibleListeners(); + DECL_LINK( ImplScrollHdl, weld::ScrolledWindow&, void ); protected: diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 1d3dae861046..c6bcb6183c84 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -34,7 +34,7 @@ class StgIo; class StgDirEntry; typedef struct SvGUID ClsId; -class SOT_DLLPUBLIC StorageBase : public SvRefBase +class StorageBase : public SvRefBase { protected: mutable ErrCode m_nError; // error code diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index ff5a8a30e551..99c9bc1b2b9a 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -28,7 +28,7 @@ // SdrGrafInvertItem - -class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem +class SdrGrafInvertItem : public SdrOnOffItem { public: diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index 7bedb45fc5b9..d1fde32edda0 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -38,7 +38,7 @@ class SdrView; class SdrPageView; class SdrDragMethod; -struct SVX_DLLPUBLIC SdrDragStatUserData +struct SdrDragStatUserData { virtual ~SdrDragStatUserData() = 0; }; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index dbf77d78c530..03dba575f277 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -28,7 +28,7 @@ class SdrDragView; class SdrDragStat; -class SVX_DLLPUBLIC SdrDragEntry +class SdrDragEntry { private: bool mbAddToTransparent : 1; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 446497b83922..2aaa3b7f7bc7 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -507,7 +507,7 @@ private: }; -class SVX_DLLPUBLIC SdrCropViewHdl final : public SdrHdl +class SdrCropViewHdl final : public SdrHdl { private: basegfx::B2DHomMatrix const maObjectTransform; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 3d0699b3f63c..24dd38a9044e 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -223,7 +223,7 @@ public: /** * All geometrical data of an arbitrary object for use in undo/redo */ -class SVX_DLLPUBLIC SdrObjGeoData +class SdrObjGeoData { public: tools::Rectangle aBoundRect; diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index c2847663e2c0..b3a1daddeb6a 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -27,7 +27,7 @@ // Nail text down to a fix angle. // The text angle is independent of the dimension line. // Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.) -class SVX_DLLPUBLIC SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { +class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { public: SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} virtual ~SdrMeasureTextIsFixedAngleItem() override; @@ -40,7 +40,7 @@ public: }; //Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.) -class SVX_DLLPUBLIC SdrMeasureTextFixedAngleItem: public SdrAngleItem { +class SdrMeasureTextFixedAngleItem: public SdrAngleItem { public: SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} virtual ~SdrMeasureTextFixedAngleItem() override; diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index a54787746223..826e224dc319 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -37,7 +37,7 @@ public: // Turn the calculated TextRect through 180 deg // Text is also switched to the other side of the dimension line, if not Rota90 -class SVX_DLLPUBLIC SdrMeasureTextUpsideDownItem final : public SdrYesNoItem { +class SdrMeasureTextUpsideDownItem final : public SdrYesNoItem { public: SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {} virtual ~SdrMeasureTextUpsideDownItem() override; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 289402b43440..fc1563962df5 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -75,7 +75,7 @@ public: vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; -class VCL_DLLPUBLIC SelectableFixedText final : public Edit +class SelectableFixedText final : public Edit { public: explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 8108abe046dc..ef333a9bd196 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -289,7 +289,7 @@ class VCL_DLLPUBLIC ImplControlValue * * Value container for scrollbars. */ -class VCL_DLLPUBLIC ScrollbarValue final : public ImplControlValue +class ScrollbarValue final : public ImplControlValue { public: long mnMin; @@ -319,7 +319,7 @@ class VCL_DLLPUBLIC ScrollbarValue final : public ImplControlValue ScrollbarValue & operator =(ScrollbarValue &&) = delete; // due to ImplControlValue }; -class VCL_DLLPUBLIC SliderValue final : public ImplControlValue +class SliderValue final : public ImplControlValue { public: long mnMin; @@ -418,7 +418,7 @@ class VCL_DLLPUBLIC TabitemValue final : public ImplControlValue * Note: the other parameters of DrawNativeControl will have no meaning * all parameters for spinbuttons are carried here */ -class VCL_DLLPUBLIC SpinbuttonValue final : public ImplControlValue +class SpinbuttonValue final : public ImplControlValue { public: tools::Rectangle maUpperRect; diff --git a/include/vcl/svlbitm.hxx b/include/vcl/svlbitm.hxx index 4411045e8f6f..b5d00aa95f6b 100644 --- a/include/vcl/svlbitm.hxx +++ b/include/vcl/svlbitm.hxx @@ -140,7 +140,7 @@ public: virtual std::unique_ptr Clone(SvLBoxItem const * pSource) const override; }; -class VCL_DLLPUBLIC SvLBoxButton : public SvLBoxItem +class SvLBoxButton : public SvLBoxItem { bool isVis; SvLBoxButtonData* pData; diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index 847fda6b71d4..37ee71a9e56e 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -100,7 +100,7 @@ namespace o3tl enum class SvLBoxItemType {String, Button, ContextBmp}; -class VCL_DLLPUBLIC SvLBoxTab +class SvLBoxTab { long nPos; public: diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index 34aa048e5abd..07f4e287e211 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -243,7 +243,7 @@ private: virtual OUString get_name() const override; }; -class UITEST_DLLPUBLIC RadioButtonUIObject final : public WindowUIObject +class RadioButtonUIObject final : public WindowUIObject { private: VclPtr mxRadioButton; @@ -335,7 +335,7 @@ private: virtual OUString get_name() const override; }; -class UITEST_DLLPUBLIC SpinUIObject final : public WindowUIObject +class SpinUIObject final : public WindowUIObject { private: VclPtr mxSpinButton; @@ -359,7 +359,7 @@ private: virtual OUString get_name() const override; }; -class UITEST_DLLPUBLIC SpinFieldUIObject final : public EditUIObject +class SpinFieldUIObject final : public EditUIObject { VclPtr mxSpinField; diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index c2424bbf0e60..505d31382266 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -47,7 +47,7 @@ class SvXMLExport; office:meta must not be written.

*/ -class XMLOFF_DLLPUBLIC SvXMLMetaExport final : public cppu::WeakImplHelper< +class SvXMLMetaExport final : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { private: @@ -58,15 +58,15 @@ private: /// preserved namespaces. necessary because we do not write the root node. std::vector< css::beans::StringPair > m_preservedNSs; - SAL_DLLPRIVATE void SimpleStringElement( + void SimpleStringElement( const OUString& rText, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eElementName ); - SAL_DLLPRIVATE void SimpleDateTimeElement( + void SimpleDateTimeElement( const css::util::DateTime & rDate, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eElementName ); /// currently unused; for exporting via the XDocumentProperties interface - SAL_DLLPRIVATE void MExport_(); + void MExport_(); public: SvXMLMetaExport( SvXMLExport& i_rExport, -- cgit