diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-04 11:11:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-05 12:18:29 +0100 |
commit | c02c4df9414ed2bef96565522238ca05013d3ac3 (patch) | |
tree | 47e2195f5f1cd183d6939fbe3e9d650b8bc4f71e /include/basic | |
parent | 78d81c2e6ee4eb7caf2d4822657bc4eaa57bfc79 (diff) |
make some classes module-private
Change-Id: Ice9a57eedb166672dbdfae6da2a172ab77566a19
Reviewed-on: https://gerrit.libreoffice.org/81983
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/basic')
-rw-r--r-- | include/basic/sbmeth.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbx.hxx | 6 | ||||
-rw-r--r-- | include/basic/sbxfac.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxform.hxx | 36 | ||||
-rw-r--r-- | include/basic/sbxprop.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxvar.hxx | 2 |
6 files changed, 25 insertions, 25 deletions
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: |