summaryrefslogtreecommitdiff
path: root/scaddins
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-22 16:58:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-22 19:27:42 +0100
commit1376f86f3fdfb80008687d8b5e8db2b5434b9d7e (patch)
treeaaf2bce8628387b618aaad2d5e6e2e879d902a98 /scaddins
parent935763841f8f4423a5afca5da15c874bee02e0d5 (diff)
sal_Char->char in scaddins..sdext
Change-Id: If2456800ace3696c2582e19a4c8612fee7d77f90 Reviewed-on: https://gerrit.libreoffice.org/85700 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'scaddins')
-rw-r--r--scaddins/source/analysis/analysis.cxx6
-rw-r--r--scaddins/source/analysis/analysishelper.cxx10
-rw-r--r--scaddins/source/analysis/analysishelper.hxx8
-rw-r--r--scaddins/source/datefunc/datefunc.cxx6
-rw-r--r--scaddins/source/datefunc/datefunc.hxx2
-rw-r--r--scaddins/source/pricing/pricing.cxx6
-rw-r--r--scaddins/source/pricing/pricing.hxx2
7 files changed, 20 insertions, 20 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 9e7cf05aa91c..36c1356487f1 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -43,7 +43,7 @@ using namespace sca::analysis;
using namespace std;
extern "C" SAL_DLLPUBLIC_EXPORT void* analysis_component_getFactory(
- const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+ const char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
@@ -319,8 +319,8 @@ OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgra
return aRet;
}
-static const sal_Char* pLang[] = { "de", "en" };
-static const sal_Char* pCoun[] = { "DE", "US" };
+static const char* pLang[] = { "de", "en" };
+static const char* pCoun[] = { "DE", "US" };
static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang);
void AnalysisAddIn::InitDefLocales()
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 799f1b801f0e..55520469728c 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -687,9 +687,9 @@ double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim
}
-static sal_Char GetMaxChar( sal_uInt16 nBase )
+static char GetMaxChar( sal_uInt16 nBase )
{
- const sal_Char* const c = "--123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ const char* const c = "--123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
return c[ nBase ];
}
@@ -722,7 +722,7 @@ OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase
else if( ( bNeg && nLen < nMaxPlaces ) || ( !bNeg && nLen < nPlaces ) )
{
sal_Int32 nLeft = nPlaces - nLen;
- std::unique_ptr<sal_Char[]> p( new sal_Char[ nLeft + 1 ] );
+ std::unique_ptr<char[]> p( new char[ nLeft + 1 ] );
memset( p.get(), bNeg ? GetMaxChar( nBase ) : '0', nLeft );
p[ nLeft ] = 0x00;
aRet = OUString( p.get(), nLeft, RTL_TEXTENCODING_MS_1252 ) + aRet;
@@ -944,7 +944,7 @@ bool ParseDouble( const sal_Unicode*& rp, double& rRet )
OUString GetString( double f, bool bLeadingSign, sal_uInt16 nMaxDig )
{
const int nBuff = 256;
- sal_Char aBuff[ nBuff + 1 ];
+ char aBuff[ nBuff + 1 ];
const char* pFormStr = bLeadingSign? "%+.*g" : "%.*g";
int nLen = snprintf( aBuff, nBuff, pFormStr, int( nMaxDig ), f );
// you never know which underlying implementation you get ...
@@ -2040,7 +2040,7 @@ void ComplexList::Append( const uno::Sequence< uno::Any >& aMultPars )
}
}
-ConvertData::ConvertData(const sal_Char p[], double fC, ConvertDataClass e, bool bPrefSupport)
+ConvertData::ConvertData(const char p[], double fC, ConvertDataClass e, bool bPrefSupport)
: fConst(fC)
, aName(p, strlen(p), RTL_TEXTENCODING_MS_1252)
, eClass(e)
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 99a840a95678..73064ebf7cc7 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -188,7 +188,7 @@ enum class FDCategory
struct FuncDataBase
{
- const sal_Char* pIntName;
+ const char* pIntName;
const char* pUINameID; // resource ID to UI name
const char** pDescrID; // resource ID to description, parameter names and ~ description
bool const bDouble; // name already exist in Calc
@@ -509,7 +509,7 @@ protected:
bool const bPrefixSupport;
public:
ConvertData(
- const sal_Char pUnitName[],
+ const char pUnitName[],
double fConvertConstant,
ConvertDataClass eClass,
bool bPrefSupport = false );
@@ -536,7 +536,7 @@ class ConvertDataLinear final : public ConvertData
double const fOffs;
public:
inline ConvertDataLinear(
- const sal_Char pUnitName[],
+ const char pUnitName[],
double fConvertConstant,
double fConvertOffset,
ConvertDataClass eClass,
@@ -718,7 +718,7 @@ inline ConvertDataClass ConvertData::Class() const
return eClass;
}
-inline ConvertDataLinear::ConvertDataLinear( const sal_Char p[], double fC, double fO, ConvertDataClass e,
+inline ConvertDataLinear::ConvertDataLinear( const char p[], double fC, double fO, ConvertDataClass e,
bool bPrefSupport ) :
ConvertData( p, fC, e, bPrefSupport ),
fOffs( fO )
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index f566f3055b6a..b924908a2ec6 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -94,7 +94,7 @@ static uno::Reference< uno::XInterface > ScaDateAddIn_CreateInstance(
extern "C" {
SAL_DLLPUBLIC_EXPORT void * date_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void* pRet = nullptr;
@@ -124,8 +124,8 @@ ScaDateAddIn::ScaDateAddIn()
{
}
-static const sal_Char* pLang[] = { "de", "en" };
-static const sal_Char* pCoun[] = { "DE", "US" };
+static const char* pLang[] = { "de", "en" };
+static const char* pCoun[] = { "DE", "US" };
static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
void ScaDateAddIn::InitDefLocales()
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index b034ba26e2eb..ab49a1bf30c7 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -46,7 +46,7 @@ enum class ScaCategory
struct ScaFuncDataBase
{
- const sal_Char* pIntName; // internal name (get***)
+ const char* pIntName; // internal name (get***)
const char* pUINameID; // resource ID to UI name
const char** pDescrID; // resource ID to description, parameter names and ~ description
const char** pCompListID; // list of valid names
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 97d9401cdc1d..32f4414dd0a0 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -96,7 +96,7 @@ static uno::Reference< uno::XInterface > ScaPricingAddIn_CreateInstance(
extern "C" {
SAL_DLLPUBLIC_EXPORT void * pricing_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void* pRet = nullptr;
@@ -130,8 +130,8 @@ ScaPricingAddIn::~ScaPricingAddIn()
{
}
-static const sal_Char* pLang[] = { "de", "en" };
-static const sal_Char* pCoun[] = { "DE", "US" };
+static const char* pLang[] = { "de", "en" };
+static const char* pCoun[] = { "DE", "US" };
static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
void ScaPricingAddIn::InitDefLocales()
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 874a842a740e..1ce75c1756e1 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -57,7 +57,7 @@ enum class ScaCategory
struct ScaFuncDataBase
{
- const sal_Char* pIntName; // internal name (get***)
+ const char* pIntName; // internal name (get***)
const char* pUINameID; // resource ID to UI name
const char** pDescrID; // resource ID to description, parameter names and ~ description
// pCompName was originally meant to be able to load Excel documents that for