[Libreoffice-commits] core.git: sc/inc sc/source
Winfried Donkers
winfrieddonkers at libreoffice.org
Wed Aug 12 13:37:10 PDT 2015
sc/inc/callform.hxx | 22 +++++++++++-----------
sc/inc/global.hxx | 6 +++---
sc/source/core/data/funcdesc.cxx | 22 ++++++++++++----------
sc/source/core/data/global.cxx | 12 ++++++------
sc/source/core/inc/adiasync.hxx | 4 ++--
sc/source/core/tool/adiasync.cxx | 2 +-
sc/source/core/tool/callform.cxx | 32 ++++++++++++++++----------------
sc/source/core/tool/compiler.cxx | 4 ++--
sc/source/core/tool/interpr4.cxx | 20 ++++++++++----------
sc/source/core/tool/parclass.cxx | 8 ++++----
sc/source/ui/unoobj/funcuno.cxx | 2 +-
11 files changed, 68 insertions(+), 66 deletions(-)
New commits:
commit ca6c2bab8771a209fde937599bf9cecea2b77104
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date: Wed Aug 12 12:50:11 2015 +0200
rename confusing classes
In module sc classes FuncData and FuncCollection are used for
legacy binary AddIn functions. In module scaddins also exist
classes FuncData. This can be confusing, so the classes and relevant
members/variables have been renamed in module sc.
Change-Id: Ib0700ed1177b760a4d46312b8578ca8b55882c53
Reviewed-on: https://gerrit.libreoffice.org/17670
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index a24122c..a883ec5 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -49,9 +49,9 @@ enum class ParamType
class ModuleData;
-class FuncData
+class LegacyFuncData
{
- friend class FuncCollection;
+ friend class LegacyFuncCollection;
const ModuleData* pModuleData;
OUString aInternalName;
@@ -61,14 +61,14 @@ class FuncData
ParamType eAsyncType;
ParamType eParamType[MAXFUNCPARAM];
public:
- FuncData(const ModuleData*pModule,
+ LegacyFuncData(const ModuleData*pModule,
const OUString& rIName,
const OUString& rFName,
sal_uInt16 nNo,
sal_uInt16 nCount,
const ParamType* peType,
ParamType eType);
- FuncData(const FuncData& rData);
+ LegacyFuncData(const LegacyFuncData& rData);
const OUString& GetModuleName() const;
const OUString& GetInternalName() const { return aInternalName; }
@@ -84,19 +84,19 @@ public:
bool getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const;
};
-class FuncCollection
+class LegacyFuncCollection
{
- typedef boost::ptr_map<OUString, FuncData> MapType;
+ typedef boost::ptr_map<OUString, LegacyFuncData> MapType;
MapType maData;
public:
typedef MapType::const_iterator const_iterator;
- FuncCollection();
- FuncCollection(const FuncCollection& r);
+ LegacyFuncCollection();
+ LegacyFuncCollection(const LegacyFuncCollection& r);
- const FuncData* findByName(const OUString& rName) const;
- FuncData* findByName(const OUString& rName);
- void insert(FuncData* pNew);
+ const LegacyFuncData* findByName(const OUString& rName) const;
+ LegacyFuncData* findByName(const OUString& rName);
+ void insert(LegacyFuncData* pNew);
const_iterator begin() const;
const_iterator end() const;
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index c3b672c8..0faaab6 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -464,7 +464,7 @@ class ScDocument;
class ScDocShell;
class SvxSearchItem;
class ScAutoFormat;
-class FuncCollection;
+class LegacyFuncCollection;
class ScUnoAddInCollection;
class ScUserList;
class SvxBrushItem;
@@ -502,7 +502,7 @@ class ScGlobal
{
static SvxSearchItem* pSearchItem;
static ScAutoFormat* pAutoFormat;
- static FuncCollection* pFuncCollection;
+ static LegacyFuncCollection* pLegacyFuncCollection;
static ScUnoAddInCollection* pAddInCollection;
static ScUserList* pUserList;
static OUString** ppRscString;
@@ -561,7 +561,7 @@ public:
SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat();
SC_DLLPUBLIC static ScAutoFormat* GetOrCreateAutoFormat();
static void ClearAutoFormat(); //BugId 54209
- static FuncCollection* GetFuncCollection();
+ static LegacyFuncCollection* GetLegacyFuncCollection();
SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
SC_DLLPUBLIC static ScUserList* GetUserList();
static void SetUserList( const ScUserList* pNewList );
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 5e90a8f..8749059 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -428,6 +428,8 @@ ScFunctionList::ScFunctionList() :
}
}
+ // legacy binary AddIn functions
+
sal_uInt16 nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions
// Interpretation of AddIn list
@@ -445,22 +447,22 @@ ScFunctionList::ScFunctionList() :
OUString aDefArgDescNone = "none";
OUString aArgName, aArgDesc;
- const FuncCollection& rFuncColl = *ScGlobal::GetFuncCollection();
- FuncCollection::const_iterator it = rFuncColl.begin(), itEnd = rFuncColl.end();
+ const LegacyFuncCollection& rLegacyFuncColl = *ScGlobal::GetLegacyFuncCollection();
+ LegacyFuncCollection::const_iterator it = rLegacyFuncColl.begin(), itEnd = rLegacyFuncColl.end();
for (; it != itEnd; ++it)
{
- const FuncData* pAddInFuncData = it->second;
+ const LegacyFuncData* pLegacyFuncData = it->second;
pDesc = new ScFuncDesc;
- sal_uInt16 nArgs = pAddInFuncData->GetParamCount() - 1;
- pAddInFuncData->getParamDesc( aArgName, aArgDesc, 0 );
+ sal_uInt16 nArgs = pLegacyFuncData->GetParamCount() - 1;
+ pLegacyFuncData->getParamDesc( aArgName, aArgDesc, 0 );
pDesc->nFIndex = nNextId++; // ??? OpCode vergeben
pDesc->nCategory = ID_FUNCTION_GRP_ADDINS;
- pDesc->pFuncName = new OUString(pAddInFuncData->GetInternalName().toAsciiUpperCase());
+ pDesc->pFuncName = new OUString(pLegacyFuncData->GetInternalName().toAsciiUpperCase());
OUStringBuffer aBuf(aArgDesc);
aBuf.append('\n');
aBuf.appendAscii("( AddIn: ");
- aBuf.append(pAddInFuncData->GetModuleName());
+ aBuf.append(pLegacyFuncData->GetModuleName());
aBuf.appendAscii(" )");
pDesc->pFuncDesc = new OUString(aBuf.makeStringAndClear());
@@ -476,12 +478,12 @@ ScFunctionList::ScFunctionList() :
{
pDesc->pDefArgFlags[j].bOptional = false;
pDesc->pDefArgFlags[j].bSuppress = false;
- pAddInFuncData->getParamDesc( aArgName, aArgDesc, j+1 );
+ pLegacyFuncData->getParamDesc( aArgName, aArgDesc, j+1 );
if ( !aArgName.isEmpty() )
pDesc->maDefArgNames[j] = aArgName;
else
{
- switch (pAddInFuncData->GetParamType(j+1))
+ switch (pLegacyFuncData->GetParamType(j+1))
{
case ParamType::PTR_DOUBLE:
pDesc->maDefArgNames[j] = aDefArgNameValue;
@@ -507,7 +509,7 @@ ScFunctionList::ScFunctionList() :
pDesc->maDefArgDescs[j] = aArgDesc;
else
{
- switch (pAddInFuncData->GetParamType(j+1))
+ switch (pLegacyFuncData->GetParamType(j+1))
{
case ParamType::PTR_DOUBLE:
pDesc->maDefArgDescs[j] = aDefArgDescValue;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 12b7cbb..46cd6bd 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -85,7 +85,7 @@
tools::SvRef<ScDocShell>* ScGlobal::pDrawClipDocShellRef = NULL;
SvxSearchItem* ScGlobal::pSearchItem = NULL;
ScAutoFormat* ScGlobal::pAutoFormat = NULL;
-FuncCollection* ScGlobal::pFuncCollection = NULL;
+LegacyFuncCollection* ScGlobal::pLegacyFuncCollection = NULL;
ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL;
ScUserList* ScGlobal::pUserList = NULL;
OUString** ScGlobal::ppRscString = NULL;
@@ -274,11 +274,11 @@ ScAutoFormat* ScGlobal::GetOrCreateAutoFormat()
return pAutoFormat;
}
-FuncCollection* ScGlobal::GetFuncCollection()
+LegacyFuncCollection* ScGlobal::GetLegacyFuncCollection()
{
- if (!pFuncCollection)
- pFuncCollection = new FuncCollection();
- return pFuncCollection;
+ if (!pLegacyFuncCollection)
+ pLegacyFuncCollection = new LegacyFuncCollection();
+ return pLegacyFuncCollection;
}
ScUnoAddInCollection* ScGlobal::GetAddInCollection()
@@ -608,7 +608,7 @@ void ScGlobal::Clear()
ExitExternalFunc();
DELETEZ(pAutoFormat);
DELETEZ(pSearchItem);
- DELETEZ(pFuncCollection);
+ DELETEZ(pLegacyFuncCollection);
DELETEZ(pAddInCollection);
DELETEZ(pUserList);
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 4a25e10..337b576 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -41,7 +41,7 @@ private:
OUString* pStr;
};
ScAddInDocs* pDocs; // List of using documents
- FuncData* mpFuncData; // Pointer to data in collection
+ LegacyFuncData* mpFuncData; // Pointer to data in collection
sal_uLong nHandle; // is casted from double to sal_uLong
ParamType meType; // result of type PTR_DOUBLE or PTR_STRING
bool bValid; // is value valid?
@@ -49,7 +49,7 @@ private:
public:
// cTor only if ScAddInAsync::Get fails.
// nIndex: Index from FunctionCollection
- ScAddInAsync(sal_uLong nHandle, FuncData* pFuncData, ScDocument* pDoc);
+ ScAddInAsync(sal_uLong nHandle, LegacyFuncData* pFuncData, ScDocument* pDoc);
// default-cTor only for that single, global aSeekObj!
ScAddInAsync();
virtual ~ScAddInAsync();
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 5daecfa..2609011 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -47,7 +47,7 @@ ScAddInAsync::ScAddInAsync() :
{ // nur fuer aSeekObj !
}
-ScAddInAsync::ScAddInAsync(sal_uLong nHandleP, FuncData* pFuncData, ScDocument* pDoc) :
+ScAddInAsync::ScAddInAsync(sal_uLong nHandleP, LegacyFuncData* pFuncData, ScDocument* pDoc) :
SvtBroadcaster(),
pStr( NULL ),
mpFuncData(pFuncData),
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index bc0bcb3..90d3afa 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -88,7 +88,7 @@ public:
osl::Module* GetInstance() const { return pInstance; }
};
-FuncData::FuncData(const ModuleData*pModule,
+LegacyFuncData::LegacyFuncData(const ModuleData*pModule,
const OUString& rIName,
const OUString& rFName,
sal_uInt16 nNo,
@@ -106,7 +106,7 @@ FuncData::FuncData(const ModuleData*pModule,
eParamType[i] = peType[i];
}
-FuncData::FuncData(const FuncData& rData) :
+LegacyFuncData::LegacyFuncData(const LegacyFuncData& rData) :
pModuleData (rData.pModuleData),
aInternalName (rData.aInternalName),
aFuncName (rData.aFuncName),
@@ -194,7 +194,7 @@ bool InitExternalFunc(const OUString& rModuleName)
// Schnittstelle initialisieren
AdvData pfCallBack = &ScAddInAsyncCallBack;
- FuncCollection* pFuncCol = ScGlobal::GetFuncCollection();
+ LegacyFuncCollection* pLegacyFuncCol = ScGlobal::GetLegacyFuncCollection();
sal_uInt16 nCount;
(*reinterpret_cast<GetFuncCountPtr>(fpGetCount))(nCount);
for (sal_uInt16 i=0; i < nCount; i++)
@@ -222,14 +222,14 @@ bool InitExternalFunc(const OUString& rModuleName)
}
OUString aInternalName( cInternalName, strlen(cInternalName), osl_getThreadTextEncoding() );
OUString aFuncName( cFuncName, strlen(cFuncName), osl_getThreadTextEncoding() );
- FuncData* pFuncData = new FuncData( pModuleData,
+ LegacyFuncData* pLegacyFuncData = new LegacyFuncData( pModuleData,
aInternalName,
aFuncName,
i,
nParamCount,
eParamType,
eAsyncType );
- pFuncCol->insert(pFuncData);
+ pLegacyFuncCol->insert(pLegacyFuncData);
}
bRet = true;
}
@@ -247,7 +247,7 @@ void ExitExternalFunc()
aModuleCollection.clear();
}
-bool FuncData::Call(void** ppParam) const
+bool LegacyFuncData::Call(void** ppParam) const
{
#ifdef DISABLE_DYNLOADING
(void) ppParam;
@@ -345,7 +345,7 @@ bool FuncData::Call(void** ppParam) const
#endif
}
-bool FuncData::Unadvice( double nHandle )
+bool LegacyFuncData::Unadvice( double nHandle )
{
#ifdef DISABLE_DYNLOADING
(void) nHandle;
@@ -363,12 +363,12 @@ bool FuncData::Unadvice( double nHandle )
#endif
}
-const OUString& FuncData::GetModuleName() const
+const OUString& LegacyFuncData::GetModuleName() const
{
return pModuleData->GetName();
}
-bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const
+bool LegacyFuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const
{
#ifdef DISABLE_DYNLOADING
(void) aName;
@@ -402,33 +402,33 @@ bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam
#endif
}
-FuncCollection::FuncCollection() {}
-FuncCollection::FuncCollection(const FuncCollection& r) : maData(r.maData) {}
+LegacyFuncCollection::LegacyFuncCollection() {}
+LegacyFuncCollection::LegacyFuncCollection(const LegacyFuncCollection& r) : maData(r.maData) {}
-const FuncData* FuncCollection::findByName(const OUString& rName) const
+const LegacyFuncData* LegacyFuncCollection::findByName(const OUString& rName) const
{
MapType::const_iterator it = maData.find(rName);
return it == maData.end() ? NULL : it->second;
}
-FuncData* FuncCollection::findByName(const OUString& rName)
+LegacyFuncData* LegacyFuncCollection::findByName(const OUString& rName)
{
MapType::iterator it = maData.find(rName);
return it == maData.end() ? NULL : it->second;
}
-void FuncCollection::insert(FuncData* pNew)
+void LegacyFuncCollection::insert(LegacyFuncData* pNew)
{
OUString aName = pNew->GetInternalName();
maData.insert(aName, pNew);
}
-FuncCollection::const_iterator FuncCollection::begin() const
+LegacyFuncCollection::const_iterator LegacyFuncCollection::begin() const
{
return maData.begin();
}
-FuncCollection::const_iterator FuncCollection::end() const
+LegacyFuncCollection::const_iterator LegacyFuncCollection::end() const
{
return maData.end();
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index dc46edb..7c2e6aa 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -178,7 +178,7 @@ bool ScCompiler::IsEnglishSymbol( const OUString& rName )
return true;
}
// 2. old add in functions
- if (ScGlobal::GetFuncCollection()->findByName(aUpper))
+ if (ScGlobal::GetLegacyFuncCollection()->findByName(aUpper))
{
return true;
}
@@ -2673,7 +2673,7 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
if (aIntName.isEmpty())
{
// Old (deprecated) addins first for legacy.
- if (ScGlobal::GetFuncCollection()->findByName(cSymbol))
+ if (ScGlobal::GetLegacyFuncCollection()->findByName(cSymbol))
{
maRawToken.SetExternal( cSymbol );
}
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 08c76b8..8548f8e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2498,13 +2498,13 @@ void ScInterpreter::ScExternal()
sal_uInt8 nParamCount = GetByte();
OUString aUnoName;
OUString aFuncName( ScGlobal::pCharClass->uppercase( pCur->GetExternal() ) );
- FuncData* pFuncData = ScGlobal::GetFuncCollection()->findByName(aFuncName);
- if (pFuncData)
+ LegacyFuncData* pLegacyFuncData = ScGlobal::GetLegacyFuncCollection()->findByName(aFuncName);
+ if (pLegacyFuncData)
{
// Old binary non-UNO add-in function.
// NOTE: parameter count is 1-based with the 0th "parameter" being the
- // return value, included in pFuncDatat->GetParamCount()
- if (nParamCount < MAXFUNCPARAM && nParamCount == pFuncData->GetParamCount() - 1)
+ // return value, included in pLegacyFuncDatat->GetParamCount()
+ if (nParamCount < MAXFUNCPARAM && nParamCount == pLegacyFuncData->GetParamCount() - 1)
{
ParamType eParamType[MAXFUNCPARAM];
void* ppParam[MAXFUNCPARAM];
@@ -2515,7 +2515,7 @@ void ScInterpreter::ScExternal()
for (i = 0; i < MAXFUNCPARAM; i++)
{
- eParamType[i] = pFuncData->GetParamType(i);
+ eParamType[i] = pLegacyFuncData->GetParamType(i);
ppParam[i] = NULL;
nVal[i] = 0.0;
pStr[i] = NULL;
@@ -2605,7 +2605,7 @@ void ScInterpreter::ScExternal()
if (nGlobalError == 0)
{
- if ( pFuncData->GetAsyncType() == ParamType::NONE )
+ if ( pLegacyFuncData->GetAsyncType() == ParamType::NONE )
{
switch ( eParamType[0] )
{
@@ -2613,7 +2613,7 @@ void ScInterpreter::ScExternal()
{
double nErg = 0.0;
ppParam[0] = &nErg;
- pFuncData->Call(ppParam);
+ pLegacyFuncData->Call(ppParam);
PushDouble(nErg);
}
break;
@@ -2621,7 +2621,7 @@ void ScInterpreter::ScExternal()
{
std::unique_ptr<sal_Char[]> pcErg(new sal_Char[ADDIN_MAXSTRLEN]);
ppParam[0] = pcErg.get();
- pFuncData->Call(ppParam);
+ pLegacyFuncData->Call(ppParam);
OUString aUni( pcErg.get(), strlen(pcErg.get()), osl_getThreadTextEncoding() );
PushString( aUni );
}
@@ -2638,14 +2638,14 @@ void ScInterpreter::ScExternal()
// assure identical handler with identical call?
double nErg = 0.0;
ppParam[0] = &nErg;
- pFuncData->Call(ppParam);
+ pLegacyFuncData->Call(ppParam);
sal_uLong nHandle = sal_uLong( nErg );
if ( nHandle >= 65536 )
{
ScAddInAsync* pAs = ScAddInAsync::Get( nHandle );
if ( !pAs )
{
- pAs = new ScAddInAsync(nHandle, pFuncData, pDok);
+ pAs = new ScAddInAsync(nHandle, pLegacyFuncData, pDok);
pMyFormulaCell->StartListening( *pAs );
}
else
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 7f6705f..d02ceef 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -355,14 +355,14 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken
// similar to ScInterpreter::ScExternal()
OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal());
{
- const FuncData* pFuncData = ScGlobal::GetFuncCollection()->findByName(aFuncName);
- if (pFuncData)
+ const LegacyFuncData* pLegacyFuncData = ScGlobal::GetLegacyFuncCollection()->findByName(aFuncName);
+ if (pLegacyFuncData)
{
- if ( nParameter >= pFuncData->GetParamCount() )
+ if ( nParameter >= pLegacyFuncData->GetParamCount() )
eRet = Bounds;
else
{
- switch ( pFuncData->GetParamType( nParameter) )
+ switch ( pLegacyFuncData->GetParamType( nParameter) )
{
case ParamType::PTR_DOUBLE:
case ParamType::PTR_STRING:
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 00d9e79..fd077f6 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -308,7 +308,7 @@ static bool lcl_AddFunctionToken( ScTokenArray& rArray, const OUString& rName,co
// 2. old add in functions
- if (ScGlobal::GetFuncCollection()->findByName(aUpper))
+ if (ScGlobal::GetLegacyFuncCollection()->findByName(aUpper))
{
rArray.AddExternal(aUpper.getStr());
return true;
More information about the Libreoffice-commits
mailing list