summaryrefslogtreecommitdiff
path: root/scaddins
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /scaddins
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'scaddins')
-rw-r--r--scaddins/source/analysis/analysis.cxx6
-rw-r--r--scaddins/source/analysis/analysis.hxx6
-rw-r--r--scaddins/source/analysis/analysishelper.cxx34
-rw-r--r--scaddins/source/analysis/analysishelper.hxx86
4 files changed, 66 insertions, 66 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index a5b84f6d6a85..6a2b61ae2a26 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -64,7 +64,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
return pRet;
}
-ResMgr& AnalysisAddIn::GetResMgr( void ) throw( uno::RuntimeException )
+ResMgr& AnalysisAddIn::GetResMgr() throw( uno::RuntimeException )
{
if( !pResMgr )
{
@@ -119,7 +119,7 @@ OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex
return aRet;
}
-void AnalysisAddIn::InitData( void )
+void AnalysisAddIn::InitData()
{
delete pResMgr;
pResMgr = ResMgr::CreateResMgr("analysis", LanguageTag(aFuncLoc));
@@ -394,7 +394,7 @@ static const sal_Char* pLang[] = { "de", "en" };
static const sal_Char* pCoun[] = { "DE", "US" };
static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang);
-void AnalysisAddIn::InitDefLocales( void )
+void AnalysisAddIn::InitDefLocales()
{
pDefLocales = new lang::Locale[ nNumOfLoc ];
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index a1ef342e5566..8c682ecc3cf3 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -62,12 +62,12 @@ private:
sca::analysis::ScaAnyConverter aAnyConv;
- ResMgr& GetResMgr( void ) throw( css::uno::RuntimeException );
+ ResMgr& GetResMgr() throw( css::uno::RuntimeException );
OUString GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( css::uno::RuntimeException );
OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException );
- void InitDefLocales( void );
+ void InitDefLocales();
inline const css::lang::Locale& GetLocale( sal_uInt32 nInd );
- void InitData( void );
+ void InitData();
/// Converts an Any to sal_Int32 in the range from 0 to 4 (date calculation mode).
sal_Int32 getDateMode(
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index f47409dd8942..9c26c7ee8403 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1800,7 +1800,7 @@ OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalA
}
-double Complex::Arg( void ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
+double Complex::Arg() const throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( r == 0.0 && i == 0.0 )
throw lang::IllegalArgumentException();
@@ -1843,7 +1843,7 @@ void Complex::Power( double fPower ) throw( uno::RuntimeException, lang::Illegal
}
-void Complex::Sqrt( void )
+void Complex::Sqrt()
{
static const double fMultConst = 0.7071067811865475; // ...2440084436210485 = 1/sqrt(2)
double p = Abs();
@@ -1854,7 +1854,7 @@ void Complex::Sqrt( void )
}
-void Complex::Sin( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sin() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( !::rtl::math::isValidArcArg( r ) )
throw lang::IllegalArgumentException();
@@ -1872,7 +1872,7 @@ void Complex::Sin( void ) throw( uno::RuntimeException, lang::IllegalArgumentExc
}
-void Complex::Cos( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Cos() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( !::rtl::math::isValidArcArg( r ) )
throw lang::IllegalArgumentException();
@@ -1909,7 +1909,7 @@ void Complex::Div( const Complex& z ) throw( uno::RuntimeException, lang::Illega
}
-void Complex::Exp( void )
+void Complex::Exp()
{
double fE = exp( r );
r = fE * cos( i );
@@ -1917,7 +1917,7 @@ void Complex::Exp( void )
}
-void Complex::Ln( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Ln() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( r == 0.0 && i == 0.0 )
throw lang::IllegalArgumentException();
@@ -1934,21 +1934,21 @@ void Complex::Ln( void ) throw( uno::RuntimeException, lang::IllegalArgumentExce
}
-void Complex::Log10( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Log10() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
Ln();
Mult( 0.434294481903251828 ); // * log10( e )
}
-void Complex::Log2( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Log2() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
Ln();
Mult( 1.442695040888963407 ); // * log2( e )
}
-void Complex::Tan(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Tan() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if ( i )
{
@@ -1967,7 +1967,7 @@ void Complex::Tan(void) throw( uno::RuntimeException, lang::IllegalArgumentExcep
}
-void Complex::Sec( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sec() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( i )
{
@@ -1988,7 +1988,7 @@ void Complex::Sec( void ) throw( uno::RuntimeException, lang::IllegalArgumentExc
}
-void Complex::Csc( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Csc() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( i )
{
@@ -2009,7 +2009,7 @@ void Complex::Csc( void ) throw( uno::RuntimeException, lang::IllegalArgumentExc
}
-void Complex::Cot(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Cot() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if ( i )
{
@@ -2028,7 +2028,7 @@ void Complex::Cot(void) throw( uno::RuntimeException, lang::IllegalArgumentExcep
}
-void Complex::Sinh( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sinh() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( !::rtl::math::isValidArcArg( r ) )
throw lang::IllegalArgumentException();
@@ -2045,7 +2045,7 @@ void Complex::Sinh( void ) throw( uno::RuntimeException, lang::IllegalArgumentEx
}
-void Complex::Cosh( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Cosh() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if( !::rtl::math::isValidArcArg( r ) )
throw lang::IllegalArgumentException();
@@ -2062,7 +2062,7 @@ void Complex::Cosh( void ) throw( uno::RuntimeException, lang::IllegalArgumentEx
}
-void Complex::Sech(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sech() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if ( i )
{
@@ -2083,7 +2083,7 @@ void Complex::Sech(void) throw( uno::RuntimeException, lang::IllegalArgumentExce
}
-void Complex::Csch(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Csch() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
if ( i )
{
@@ -2386,7 +2386,7 @@ double ConvertDataLinear::ConvertFromBase( double f, sal_Int16 n ) const
}
-ConvertDataList::ConvertDataList( void )
+ConvertDataList::ConvertDataList()
{
#define NEWD(str,unit,cl) maVector.push_back(new ConvertData(str,unit,cl))
#define NEWDP(str,unit,cl) maVector.push_back(new ConvertData(str,unit,cl,true))
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index c0fadc5cf3fc..1f94bb41f142 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -188,18 +188,18 @@ public:
FuncData( const FuncDataBase& rBaseData, ResMgr& );
virtual ~FuncData();
- inline sal_uInt16 GetUINameID( void ) const;
- inline sal_uInt16 GetDescrID( void ) const;
- inline bool IsDouble( void ) const;
- inline bool HasIntParam( void ) const;
+ inline sal_uInt16 GetUINameID() const;
+ inline sal_uInt16 GetDescrID() const;
+ inline bool IsDouble() const;
+ inline bool HasIntParam() const;
sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const;
inline bool Is( const OUString& rCompareTo ) const;
inline const std::vector<OUString> &
- GetCompNameList( void ) const;
+ GetCompNameList() const;
- inline FDCategory GetCategory( void ) const;
+ inline FDCategory GetCategory() const;
};
@@ -378,35 +378,35 @@ public:
static bool ParseString( const OUString& rComplexAsString, Complex& rReturn );
OUString GetString() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- inline double Real( void ) const;
- inline double Imag( void ) const;
+ inline double Real() const;
+ inline double Imag() const;
- double Arg( void ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- inline double Abs( void ) const;
+ double Arg() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ inline double Abs() const;
// following functions change the complex number itself to avoid unnecessary copy actions!
void Power( double fPower ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Sqrt( void );
- void Sin( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Cos( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Sqrt();
+ void Sin() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Cos() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
void Div( const Complex& rDivisor ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Exp( void );
- inline void Conjugate( void );
- void Ln( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Log10( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Log2( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Exp();
+ inline void Conjugate();
+ void Ln() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Log10() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Log2() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
inline void Mult( double fFact );
inline void Mult( const Complex& rMult );
inline void Sub( const Complex& rMult );
inline void Add( const Complex& rAdd );
- void Tan( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Sec( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Csc( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Cot( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Sinh( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Cosh( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Sech( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
- void Csch( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Tan() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Sec() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Csc() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Cot() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Sinh() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Cosh() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Sech() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ void Csch() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
};
@@ -428,9 +428,9 @@ public:
inline const Complex* Get( sal_uInt32 nIndex ) const;
- inline bool empty( void ) const
+ inline bool empty() const
{ return maVector.empty(); }
- inline sal_uInt32 Count( void ) const
+ inline sal_uInt32 Count() const
{ return maVector.size(); }
inline void Append( Complex* pNew );
@@ -482,8 +482,8 @@ public:
virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const;
virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const;
- inline ConvertDataClass Class( void ) const;
- inline bool IsPrefixSupport( void ) const;
+ inline ConvertDataClass Class() const;
+ inline bool IsPrefixSupport() const;
};
class ConvertDataLinear : public ConvertData
@@ -514,7 +514,7 @@ class ConvertDataList
private:
std::vector<ConvertData*> maVector;
public:
- ConvertDataList( void );
+ ConvertDataList();
virtual ~ConvertDataList();
double Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
@@ -554,25 +554,25 @@ inline void AlignDate( sal_uInt16& rD, sal_uInt16 nM, sal_uInt16 nY )
}
-inline sal_uInt16 FuncData::GetUINameID( void ) const
+inline sal_uInt16 FuncData::GetUINameID() const
{
return nUINameID;
}
-inline sal_uInt16 FuncData::GetDescrID( void ) const
+inline sal_uInt16 FuncData::GetDescrID() const
{
return nDescrID;
}
-inline bool FuncData::IsDouble( void ) const
+inline bool FuncData::IsDouble() const
{
return bDouble;
}
-inline bool FuncData::HasIntParam( void ) const
+inline bool FuncData::HasIntParam() const
{
return bWithOpt;
}
@@ -584,13 +584,13 @@ inline bool FuncData::Is( const OUString& r ) const
}
-inline const std::vector<OUString> & FuncData::GetCompNameList( void ) const
+inline const std::vector<OUString> & FuncData::GetCompNameList() const
{
return aCompList;
}
-inline FDCategory FuncData::GetCategory( void ) const
+inline FDCategory FuncData::GetCategory() const
{
return eCat;
}
@@ -614,25 +614,25 @@ inline Complex::Complex( double fReal, double fImag, sal_Unicode cC ) :
}
-inline double Complex::Real( void ) const
+inline double Complex::Real() const
{
return r;
}
-inline double Complex::Imag( void ) const
+inline double Complex::Imag() const
{
return i;
}
-inline double Complex::Abs( void ) const
+inline double Complex::Abs() const
{
return sqrt( r * r + i * i );
}
-void Complex::Conjugate( void )
+void Complex::Conjugate()
{
i = -i;
}
@@ -685,12 +685,12 @@ inline void ComplexList::Append( Complex* p )
}
-inline ConvertDataClass ConvertData::Class( void ) const
+inline ConvertDataClass ConvertData::Class() const
{
return eClass;
}
-inline bool ConvertData::IsPrefixSupport( void ) const
+inline bool ConvertData::IsPrefixSupport() const
{
return bPrefixSupport;
}