summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-07 12:04:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-07 12:07:43 +0200
commit3e993a51f14f2a2421ca80128fc9a316042f725b (patch)
treeadbb50036be7b850ea0619ee6649469242b05a62
parent8a3afbee5720d06ad426ba366829b904d7455fd4 (diff)
loplugin:staticmethods: basic
Change-Id: Ic8c8c8ad4470e14d662f478f6b859cd908c9f78c
-rw-r--r--basic/source/sbx/sbxscan.cxx2
-rw-r--r--include/basic/sbmod.hxx2
-rw-r--r--include/basic/sbxform.hxx18
3 files changed, 11 insertions, 11 deletions
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 1dd949e8525b..411d1f01f71e 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -860,7 +860,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
}
else
{
- rRes = rAppData.pBasicFormater->BasicFormatNull( *pFmt );
+ rRes = SbxBasicFormater::BasicFormatNull( *pFmt );
}
}
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index b4d539f11117..e43bf6d67c6c 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -54,7 +54,7 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject
std::vector< OUString > mModuleVariableNames;
- BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
+ BASIC_DLLPRIVATE static void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
SbModule(const SbModule&) = delete;
SbModule& operator=(const SbModule&) = delete;
diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx
index 4832ed310224..74253192a69b 100644
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -103,17 +103,17 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
String containing the formatted output
*/
OUString BasicFormat( double dNumber, const OUString& sFormatStrg );
- OUString BasicFormatNull( const OUString& sFormatStrg );
+ static OUString BasicFormatNull( const OUString& sFormatStrg );
static bool isBasicFormat( const OUString& sFormatStrg );
private:
- BASIC_DLLPRIVATE inline void ShiftString( OUStringBuffer& sStrg, sal_uInt16 nStartPos );
- BASIC_DLLPRIVATE void AppendDigit( OUStringBuffer& sStrg, short nDigit );
+ 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 void ParseBack( OUStringBuffer& sStrg, const OUString& sFormatStrg,
+ BASIC_DLLPRIVATE static void ParseBack( OUStringBuffer& sStrg, const OUString& sFormatStrg,
short nFormatPos );
#ifdef with_sprintf_
// Methods for string conversion with sprintf():
@@ -129,11 +129,11 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short RoundDigit( double dNumber );
#endif
- BASIC_DLLPRIVATE OUString GetPosFormatString( const OUString& sFormatStrg, bool & bFound );
- BASIC_DLLPRIVATE OUString GetNegFormatString( const OUString& sFormatStrg, bool & bFound );
- BASIC_DLLPRIVATE OUString Get0FormatString( const OUString& sFormatStrg, bool & bFound );
- BASIC_DLLPRIVATE OUString GetNullFormatString( const OUString& sFormatStrg, bool & bFound );
- BASIC_DLLPRIVATE void AnalyseFormatString( const OUString& sFormatStrg,
+ 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& nNoOfDigitsLeft, short& nNoOfDigitsRight,
short& nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits,