diff options
66 files changed, 140 insertions, 140 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 64c5784d7b0b..5d2561fd84df 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -31,7 +31,7 @@ // Basic-Module for excel object. -class BASIC_DLLPUBLIC SbObjModule : public SbModule +class SbObjModule : public SbModule { protected: virtual ~SbObjModule() override; @@ -50,7 +50,7 @@ public: class FormObjEventListenerImpl; -class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule +class SbUserFormModule : public SbObjModule { css::script::ModuleInfo m_mInfo; ::rtl::Reference< FormObjEventListenerImpl > m_DialogListener; @@ -84,7 +84,7 @@ public: class SbUserFormModuleInstance* CreateInstance(); }; -class BASIC_DLLPUBLIC SbUserFormModuleInstance : public SbUserFormModule +class SbUserFormModuleInstance : public SbUserFormModule { SbUserFormModule* m_pParentModule; diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index ba2190b143e2..6fe0d5412554 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -26,7 +26,7 @@ #include <basic/basicdllapi.h> // class SbStdFactory -class BASIC_DLLPUBLIC SbStdFactory : public SbxFactory +class SbStdFactory : public SbxFactory { public: SbStdFactory(); @@ -35,7 +35,7 @@ public: }; // class SbStdPicture -class BASIC_DLLPUBLIC SbStdPicture final : public SbxObject +class SbStdPicture final : public SbxObject { Graphic aGraphic; @@ -55,7 +55,7 @@ public: }; // class SbStdFont -class BASIC_DLLPUBLIC SbStdFont final : public SbxObject +class SbStdFont final : public SbxObject { bool bBold; bool bItalic; @@ -92,7 +92,7 @@ public: }; // class SbStdClipboard -class BASIC_DLLPUBLIC SbStdClipboard final : public SbxObject +class SbStdClipboard final : public SbxObject { virtual ~SbStdClipboard() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index c788f2dc9312..4a1eda136f69 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -60,7 +60,7 @@ struct SbClassData // #115824: Factory class to create class objects (type command) // Implementation: sb.cxx -class BASIC_DLLPUBLIC SbClassFactory : public SbxFactory +class SbClassFactory : public SbxFactory { SbxObjectRef xClassModules; 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<SbMethod> 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 <rtl/ustrbuf.hxx> #include <basic/basicdllapi.h> -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 <basic/sbxvar.hxx> #include <basic/basicdllapi.h> -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<SbxVariable> 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<TemplateItemProperties > 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<bool (const ThumbnailViewItem*)> maFilterFunc; }; -class SFX2_DLLPUBLIC SfxThumbnailView : public weld::CustomWidgetController, public ThumbnailViewBase +class SfxThumbnailView : public weld::CustomWidgetController, public ThumbnailViewBase { public: SfxThumbnailView(std::unique_ptr<weld::ScrolledWindow> xWindow, std::unique_ptr<weld::Menu> 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<SvLBoxItem> 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<RadioButton> 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<SpinButton> 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<SpinField> 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 <em>not</em> be written. </p> */ -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, diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index b342be84f7ac..c06400c34c69 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -55,7 +55,7 @@ public: void SetRowText(SCROW nRow, const OUString& rText) { pRowText[nRow] = rText; } }; -class SC_DLLPUBLIC ScChartArray // only parameter-struct +class ScChartArray // only parameter-struct { ScDocument* pDocument; ScChartPositioner aPositioner; diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index aa4f88e3d685..6eb38f669c41 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -45,7 +45,7 @@ enum ScDetectiveObjType SC_DETOBJ_CIRCLE }; -class SC_DLLPUBLIC ScDetectiveFunc +class ScDetectiveFunc { static Color nArrowColor; static Color nErrorColor; diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index f110131180c5..3cf13951609a 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -42,7 +42,7 @@ struct ScQueryParam; * This class is only a wrapper to the actual cache, to provide filtering on * the raw data based on the query filter and/or page field filters. */ -class SC_DLLPUBLIC ScDPFilteredCache +class ScDPFilteredCache { typedef mdds::flat_segment_tree<SCROW, bool> RowFlagType; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 609f3e848e0d..a5eb7f74ecc1 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -291,7 +291,7 @@ public: ScDPDimension* CreateCloneObject(); ScDPHierarchies* GetHierarchiesObject(); - SC_DLLPUBLIC const boost::optional<OUString> & GetLayoutName() const; + const boost::optional<OUString> & GetLayoutName() const; const boost::optional<OUString> & GetSubtotalName() const; // XNamed @@ -622,7 +622,7 @@ public: SCROW GetItemDataId() const { return mnDataId; } bool IsNamedItem(SCROW nIndex) const; - SC_DLLPUBLIC const boost::optional<OUString> & GetLayoutName() const; + const boost::optional<OUString> & GetLayoutName() const; long GetDim() const { return nDim;} sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index d6e9293569ac..32134b460182 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -179,7 +179,7 @@ public: left result is modified instead, but only if it was of type formula::svDouble before or not set at all. */ - SC_DLLPUBLIC void SetDouble( double f ); + void SetDouble( double f ); /** Return value if type formula::svDouble or formula::svHybridCell or formula::svMatrixCell and upper left formula::svDouble, else 0.0 */ @@ -198,24 +198,24 @@ public: /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridDouble( double f ); + void SetHybridDouble( double f ); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridString( const svl::SharedString & rStr ); + void SetHybridString( const svl::SharedString & rStr ); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridFormula(), SetHybridEmptyDisplayedAsString() must be last. */ - SC_DLLPUBLIC void SetHybridEmptyDisplayedAsString(); + void SetHybridEmptyDisplayedAsString(); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridFormula( const OUString & rFormula ); + void SetHybridFormula( const OUString & rFormula ); - SC_DLLPUBLIC void SetMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); + void SetMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); /** Get the const ScMatrixFormulaCellToken* if token is of that type, else NULL. */ diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 8d312a133806..4cff5d14cf48 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -23,7 +23,7 @@ #include "scdllapi.h" #include <unotools/configitem.hxx> -class SC_DLLPUBLIC ScInputOptions +class ScInputOptions { private: sal_uInt16 nMoveDir; // enum ScDirection diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 86515562c463..367659959891 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -141,7 +141,7 @@ private: }; /** Internal data for a cell annotation. */ -struct SC_DLLPUBLIC ScNoteData +struct ScNoteData { typedef std::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 9756930b08e1..4126d4640942 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -803,7 +803,7 @@ public: sal_uInt16 GetColWidth( SCCOL nCol, bool bHiddenAsZero = true ) const; sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol ) const; - SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; + sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero = true ) const; sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; sal_uLong GetColOffset( SCCOL nCol, bool bHiddenAsZero = true ) const; diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 965d7a81485b..317dc9b25bcd 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -271,7 +271,7 @@ public: virtual FormulaToken* Clone() const override { return new ScRefListToken(*this); } }; -class SC_DLLPUBLIC ScEmptyCellToken final : public formula::FormulaToken +class ScEmptyCellToken final : public formula::FormulaToken { bool const bInherited :1; bool const bDisplayedAsString :1; @@ -289,7 +289,7 @@ public: }; /** Transports the result from the interpreter to the formula cell. */ -class SC_DLLPUBLIC ScMatrixCellResultToken : public formula::FormulaToken +class ScMatrixCellResultToken : public formula::FormulaToken { // No non-const access implemented, silence down unxsols4 complaining about // the public GetMatrix() hiding the one from FormulaToken. @@ -319,7 +319,7 @@ public: /** Stores the matrix result at the formula cell, additionally the range the matrix formula occupies. */ -class SC_DLLPUBLIC ScMatrixFormulaCellToken final : public ScMatrixCellResultToken +class ScMatrixFormulaCellToken final : public ScMatrixCellResultToken { private: SCROW nRows; @@ -373,7 +373,7 @@ private: void CloneUpperLeftIfNecessary(); }; -class SC_DLLPUBLIC ScHybridCellToken final : public formula::FormulaToken +class ScHybridCellToken final : public formula::FormulaToken { private: double const mfDouble; diff --git a/sc/source/core/inc/grouptokenconverter.hxx b/sc/source/core/inc/grouptokenconverter.hxx index cc09addfe609..6f43f9b14cdf 100644 --- a/sc/source/core/inc/grouptokenconverter.hxx +++ b/sc/source/core/inc/grouptokenconverter.hxx @@ -19,7 +19,7 @@ class ScFormulaCell; class ScTokenArray; namespace sc { struct FormulaGroupContext; } -class SC_DLLPUBLIC ScGroupTokenConverter +class ScGroupTokenConverter { ScTokenArray& mrGroupTokens; ScDocument& mrDoc; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index d5e3d85ec20d..3b902524d901 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -148,8 +148,8 @@ class ScInterpreter friend class ScChiSqDistFunction; public: - static SC_DLLPUBLIC void SetGlobalConfig(const ScCalcConfig& rConfig); - static SC_DLLPUBLIC const ScCalcConfig& GetGlobalConfig(); + static void SetGlobalConfig(const ScCalcConfig& rConfig); + static const ScCalcConfig& GetGlobalConfig(); static void GlobalExit(); // called by ScGlobal::Clear() diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 4684bdaf2031..2aa5b84ceee7 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -81,7 +81,7 @@ public: bool CanInputDone(bool bForced) { return m_pRefEdit && (bForced || !m_pRefBtn); } }; -class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog +class ScRefHandler : public IAnyRefDialog { weld::DialogController* m_pController; bool m_bInRefMode; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index cca33ba9094f..a244e9816504 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -110,11 +110,11 @@ protected: void CancelPressed(); public: - SC_DLLPUBLIC ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pWindow, + ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pWindow, ScViewData* pViewData, const ScCondFormatDlgItem* pDlgItem); virtual ~ScCondFormatDlg() override; - SC_DLLPUBLIC std::unique_ptr<ScConditionalFormat> GetConditionalFormat() const; + std::unique_ptr<ScConditionalFormat> GetConditionalFormat() const; virtual void SetReference(const ScRange&, ScDocument*) override; virtual bool IsRefInputMode() const override; diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index 1d5f0784efed..32d72ef93b8f 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -31,7 +31,7 @@ class ScCsvTableBox; /** A ruler control for the CSV import dialog. Supports setting and moving splits (which divide lines of data into several columns). */ -class SC_DLLPUBLIC ScCsvRuler : public ScCsvControl +class ScCsvRuler : public ScCsvControl { private: ScCsvTableBox* mpTableBox; /// Grid Parent @@ -70,19 +70,19 @@ public: private: /** Reads colors from system settings. */ - SAL_DLLPRIVATE void InitColors(); + void InitColors(); /** Initializes all data dependent from the control's size. */ - SAL_DLLPRIVATE void InitSizeData(); + void InitSizeData(); /** Moves cursor to a new position. @param bScroll sal_True = The method may scroll the ruler. */ - SAL_DLLPRIVATE void MoveCursor( sal_Int32 nPos, bool bScroll = true ); + void MoveCursor( sal_Int32 nPos, bool bScroll = true ); /** Moves cursor to the given direction. */ - SAL_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir ); + void MoveCursorRel( ScMoveMode eDir ); /** Sets cursor to an existing split, according to eDir. */ - SAL_DLLPRIVATE void MoveCursorToSplit( ScMoveMode eDir ); + void MoveCursorToSplit( ScMoveMode eDir ); /** Scrolls data grid vertically. */ - SAL_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir ); + void ScrollVertRel( ScMoveMode eDir ); // split handling --------------------------------------------------------- public: @@ -110,12 +110,12 @@ public: private: /** Finds next position without a split. */ - SAL_DLLPRIVATE sal_Int32 FindEmptyPos( sal_Int32 nPos, ScMoveMode eDir ) const; + sal_Int32 FindEmptyPos( sal_Int32 nPos, ScMoveMode eDir ) const; /** Moves split and cursor to nNewPos and commits event. */ - SAL_DLLPRIVATE void MoveCurrSplit( sal_Int32 nNewPos ); + void MoveCurrSplit( sal_Int32 nNewPos ); /** Moves split and cursor to the given direction and commits event. */ - SAL_DLLPRIVATE void MoveCurrSplitRel( ScMoveMode eDir ); + void MoveCurrSplitRel( ScMoveMode eDir ); // event handling --------------------------------------------------------- protected: @@ -134,12 +134,12 @@ protected: private: /** Starts tracking at the specified position. */ - SAL_DLLPRIVATE void StartMouseTracking( sal_Int32 nPos ); + void StartMouseTracking( sal_Int32 nPos ); /** Moves tracking to a new position. */ - SAL_DLLPRIVATE void MoveMouseTracking( sal_Int32 nPos ); + void MoveMouseTracking( sal_Int32 nPos ); /** Applies tracking action for the current tracking position. @param bApply sal_True = apply action, sal_False = cancel action. */ - SAL_DLLPRIVATE void EndMouseTracking( bool bApply ); + void EndMouseTracking( bool bApply ); // painting --------------------------------------------------------------- protected: @@ -156,22 +156,22 @@ private: sal_Int32 GetHeight() const { return maWinSize.Height(); } /** Draws the background and active area to maBackgrDev (only the given X range). */ - SAL_DLLPRIVATE void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth ); + void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth ); /** Draws the entire ruler background with scaling to maBackgrDev. */ - SAL_DLLPRIVATE void ImplDrawBackgrDev(); + void ImplDrawBackgrDev(); /** Draws a split to maRulerDev. */ - SAL_DLLPRIVATE void ImplDrawSplit( sal_Int32 nPos ); + void ImplDrawSplit( sal_Int32 nPos ); /** Erases a split from maRulerDev. */ - SAL_DLLPRIVATE void ImplEraseSplit( sal_Int32 nPos ); + void ImplEraseSplit( sal_Int32 nPos ); /** Draws the ruler background, all splits and the cursor to maRulerDev. */ - SAL_DLLPRIVATE void ImplDrawRulerDev(); + void ImplDrawRulerDev(); /** Inverts the cursor bar at the specified position in maRulerDev. */ - SAL_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos ); + void ImplInvertCursor( sal_Int32 nPos ); /** Sets arrow or horizontal split pointer. */ - SAL_DLLPRIVATE void ImplSetMousePointer( sal_Int32 nPos ); + void ImplSetMousePointer( sal_Int32 nPos ); // accessibility ---------------------------------------------------------- protected: diff --git a/sc/source/ui/inc/datatableview.hxx b/sc/source/ui/inc/datatableview.hxx index 690a088368f4..df0bf376885e 100644 --- a/sc/source/ui/inc/datatableview.hxx +++ b/sc/source/ui/inc/datatableview.hxx @@ -78,7 +78,7 @@ public: * This class should only depend on ScDocument and not * on some of the Calc view shells. */ -class SC_DLLPUBLIC ScDataTableView : public Control +class ScDataTableView : public Control { std::shared_ptr<ScDocument> mpDoc; std::unique_ptr<SelectionEngine> mpSelectionEngine; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 528f85e3a830..a519f4c87d04 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -447,7 +447,7 @@ typedef tools::SvRef<ScDocShell> ScDocShellRef; methods to avoid multiple modified status changes, only the last instance destroyed calls ScDocShell::SetDocumentModified(). */ -class SC_DLLPUBLIC ScDocShellModificator +class ScDocShellModificator { ScDocShell& rDocShell; std::unique_ptr<ScRefreshTimerProtector> mpProtector; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index a1b4260ac3d3..f3d7ee0b6638 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -32,7 +32,7 @@ class ScTabView; class SelectionEngine; -class SC_DLLPUBLIC ScHeaderControl : public vcl::Window +class ScHeaderControl : public vcl::Window { private: SelectionEngine* pSelEngine; diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index ff3a41f4d797..b3db92440d1b 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -29,7 +29,7 @@ class ScTableProtectionDlg : public weld::GenericDialogController { public: ScTableProtectionDlg() = delete; - explicit SC_DLLPUBLIC ScTableProtectionDlg(weld::Window* pParent); + explicit ScTableProtectionDlg(weld::Window* pParent); virtual ~ScTableProtectionDlg() override; void SetDialogData(const ScTableProtection& rData); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 1aa2bd37eedd..f30cdf73c077 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -181,7 +181,7 @@ public: void StartRefInput(); }; -class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow +class ScValidityRefChildWin : public SfxChildWindow { bool m_bVisibleLock:1; bool m_bFreeWindowLock:1; diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index 02bdfd4a414b..bda896e25a66 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -45,7 +45,7 @@ private: DECL_LINK(SizeAllocated, const Size&, void); public: - SC_DLLPUBLIC ScShareDocumentDlg(weld::Window* pParent, const ScViewData* pViewData); + ScShareDocumentDlg(weld::Window* pParent, const ScViewData* pViewData); virtual ~ScShareDocumentDlg() override; bool IsShareDocumentChecked() const; diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index eebe5695748d..3f77b5efd3b5 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -169,7 +169,7 @@ protected: class SdAbstractDialogFactory { public: - SD_DLLPUBLIC static SdAbstractDialogFactory* Create(); + static SdAbstractDialogFactory* Create(); virtual VclPtr<AbstractSvxBulletAndPositionDlg> CreateSvxBulletAndPositionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0; virtual VclPtr<VclAbstractDialog> CreateBreakDlg(weld::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 5a37851bcf15..b8bd942474fa 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -34,7 +34,7 @@ namespace sd { class SlideShow; } -class SD_DLLPUBLIC SdDocPreviewWin final : public Control, public SfxListener +class SdDocPreviewWin final : public Control, public SfxListener { rtl::Reference< sd::SlideShow > mxSlideShow; diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 70a946271ed8..f4adedf0cb4f 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -25,7 +25,7 @@ #include <vcl/weld.hxx> // SdInsertPasteDlg -class SD_DLLPUBLIC SdInsertPasteDlg : public weld::GenericDialogController +class SdInsertPasteDlg : public weld::GenericDialogController { private: std::unique_ptr<weld::RadioButton> m_xRbBefore; diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx index 6b9f6e2e783e..e1fa57af65df 100644 --- a/sfx2/inc/autoredactdialog.hxx +++ b/sfx2/inc/autoredactdialog.hxx @@ -100,7 +100,7 @@ enum class StartFileDialogType SaveAs }; -class SFX2_DLLPUBLIC SfxAutoRedactDialog : public SfxDialogController +class SfxAutoRedactDialog : public SfxDialogController { SfxObjectShellLock m_xDocShell; std::vector<std::pair<RedactionTarget*, OUString>> m_aTableTargets; diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index 8f6c27e83831..9cefc3f6abe3 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -19,7 +19,7 @@ // class SfxBluetoothModel_Impl ----------------------------------------------- -class SFX2_DLLPUBLIC SfxBluetoothModel:public SfxMailModel +class SfxBluetoothModel:public SfxMailModel { public: SendMailResult SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame ); diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index af3a0c17a9bd..a6d8fcaa8ad1 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -63,7 +63,7 @@ typedef ::cppu::WeakComponentImplHelper< #define BASE_URL "private:factory/sdatabase?Interactive" #define STARTMODULE_URL ".uno:ShowStartModule" -class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase +class ShutdownIcon : public ShutdownIconServiceBase { ::osl::Mutex m_aMutex; bool m_bVeto; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 760b6f9a43a5..6673a9d5287a 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -26,7 +26,7 @@ class SalGraphics; -class VCL_DLLPUBLIC SvpSalObject : public SalObject +class SvpSalObject : public SalObject { public: SystemEnvData m_aSystemChildData; @@ -45,7 +45,7 @@ public: virtual const SystemEnvData* GetSystemData() const override; }; -class VCL_DLLPUBLIC SvpSalSystem : public SalGenericSystem +class SvpSalSystem : public SalGenericSystem { public: SvpSalSystem() {} diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index bf48b07005a9..3869f25a3442 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -35,7 +35,7 @@ class SvpSalInstance; class SvpSalGraphics; -class VCL_DLLPUBLIC SvpSalFrame : public SalFrame +class SvpSalFrame : public SalFrame { SvpSalInstance* m_pInstance; SvpSalFrame* m_pParent; // pointer to parent frame diff --git a/vcl/inc/svmconverter.hxx b/vcl/inc/svmconverter.hxx index 7240ef57c71c..459f327d409c 100644 --- a/vcl/inc/svmconverter.hxx +++ b/vcl/inc/svmconverter.hxx @@ -72,10 +72,10 @@ /** * Converts old SVGDI aka SVM1 format data to current VCLMTF aka SVM2 format metafile data. */ -class VCL_PLUGIN_PUBLIC SVMConverter +class SVMConverter { private: - SAL_DLLPRIVATE static void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); + static void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); public: SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf ); diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index eb4b774f21d3..2539ab2da77b 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -26,7 +26,7 @@ #define bUseInputMethodDefault True -class VCLPLUG_GEN_PUBLIC SalI18N_InputMethod +class SalI18N_InputMethod { bool mbUseable; // system supports locale as well as status // and preedit style ? diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index 69baaf32c756..473251b48b1d 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -24,7 +24,7 @@ #include <vclpluginapi.h> -class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension +class SalI18N_KeyboardExtension { private: diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 56006781f8f8..cc34a7762270 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -163,7 +163,7 @@ class SalI18N_InputMethod; typedef int(*YieldFunc)(int fd, void* data); -class VCLPLUG_GEN_PUBLIC SalXLib +class SalXLib { protected: timeval m_aTimeout; @@ -396,7 +396,7 @@ public: inline Display *SalColormap::GetXDisplay() const { return m_pDisplay->GetDisplay(); } -class VCLPLUG_GEN_PUBLIC SalX11Display : public SalDisplay +class SalX11Display : public SalDisplay { public: SalX11Display( Display* pDisp ); diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 5a12ed951f73..164fd4f6df68 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -73,7 +73,7 @@ public: static void interactionDone( bool bCancelShutdown ); static OUString getExecName(); - static VCLPLUG_GEN_PUBLIC const OString& getSessionID(); + static const OString& getSessionID(); }; #endif diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index 024c0bff4c74..d91612380e45 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -40,7 +40,7 @@ namespace com::sun::star::xml::crypto::sax { class XSAXEventKeeperStatusChangeLi namespace com::sun::star::xml::csax { class XCompressedDocumentHandler; } namespace com::sun::star::xml::wrapper { class XXMLDocumentWrapper; } -class XMLSECURITY_DLLPUBLIC SAXEventKeeperImpl : public cppu::WeakImplHelper +class SAXEventKeeperImpl : public cppu::WeakImplHelper < css::xml::crypto::sax::XSecuritySAXEventKeeper, css::xml::crypto::sax::XReferenceResolvedBroadcaster, diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx index ca47389c427b..980d61a6570a 100644 --- a/xmlsecurity/inc/framework/securityengine.hxx +++ b/xmlsecurity/inc/framework/securityengine.hxx @@ -31,7 +31,7 @@ #include <xmlsecuritydllapi.h> -class XMLSECURITY_DLLPUBLIC SecurityEngine : public cppu::WeakImplHelper +class SAL_DLLPUBLIC_RTTI SecurityEngine : public cppu::WeakImplHelper < css::xml::crypto::sax::XReferenceResolvedListener, css::xml::crypto::sax::XKeyCollector, diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index fe7fb5669d0e..6554bb572c4c 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper css::lang::XServiceInfo > SignatureCreatorImpl_Base; -class XMLSECURITY_DLLPUBLIC SignatureCreatorImpl : public SignatureCreatorImpl_Base +class SignatureCreatorImpl : public SignatureCreatorImpl_Base /****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl ******************* * * NAME diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index 56fc057ebf39..2d4e674859a0 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -39,7 +39,7 @@ namespace rtl { template <class reference_type> class Reference; } class XMLSignatureTemplateImpl; -class XMLSECURITY_DLLPUBLIC SignatureEngine : public cppu::ImplInheritanceHelper +class SignatureEngine : public cppu::ImplInheritanceHelper < SecurityEngine, css::xml::crypto::sax::XReferenceCollector, diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index 7b022afd1f0c..6103cabbbe8e 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -39,7 +39,7 @@ typedef cppu::ImplInheritanceHelper css::lang::XServiceInfo > SignatureVerifierImpl_Base; -class XMLSECURITY_DLLPUBLIC SignatureVerifierImpl : public SignatureVerifierImpl_Base +class SignatureVerifierImpl : public SignatureVerifierImpl_Base /****** SignatureVerifier.hxx/CLASS SignatureVerifierImpl ********************* * * NAME |