[Libreoffice-commits] .: sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 5 13:23:49 PDT 2012
sc/source/core/inc/adiasync.hxx | 7 ++-----
sc/source/core/inc/ddelink.hxx | 13 ++++++-------
sc/source/core/inc/interpre.hxx | 25 +++----------------------
sc/source/core/tool/ddelink.cxx | 9 ++++-----
4 files changed, 15 insertions(+), 39 deletions(-)
New commits:
commit 79874397bbc891939ebd402a4af85fa1406604fd
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Sep 3 15:37:04 2012 +0200
Cleanup files touched by f5b7fecbc0744e46468d57b8131ea7d768aa96a2
Change-Id: I00c2ccb0be18bb574b2494b035b48c6f37128c72
Reviewed-on: https://gerrit.libreoffice.org/494
Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 548f58c..e9f0198 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -38,7 +38,6 @@ extern "C" {
void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData );
}
-
class ScDocument;
class ScAddInDocs : public std::set<ScDocument*> {};
@@ -56,7 +55,7 @@ private:
FuncData* mpFuncData; // Pointer to files in collection
sal_uLong nHandle; // is casted from double to sal_uLong
ParamType meType; // result of type PTR_DOUBLE or PTR_STRING
- sal_Bool bValid; // is value valid?
+ bool bValid; // is value valid?
public:
// cTor only if ScAddInAsync::Get fails.
@@ -68,7 +67,7 @@ public:
static ScAddInAsync* Get( sal_uLong nHandle );
static void CallBack( sal_uLong nHandle, void* pData );
static void RemoveDocument( ScDocument* pDocument );
- sal_Bool IsValid() const { return bValid; }
+ bool IsValid() const { return bValid; }
ParamType GetType() const { return meType; }
double GetValue() const { return nVal; }
const String& GetString() const { return *pStr; }
@@ -89,8 +88,6 @@ class ScAddInAsyncs : public std::set<ScAddInAsync*, CompareScAddInAsync> {};
extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 4f3734f..9d347c1 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -42,7 +42,7 @@ class SvStream;
class ScDdeLink : public ::sfx2::SvBaseLink, public SvtBroadcaster
{
private:
-static sal_Bool bIsInUpdate;
+static bool bIsInUpdate;
ScDocument* pDoc;
@@ -51,7 +51,7 @@ static sal_Bool bIsInUpdate;
String aItem;
sal_uInt8 nMode; // number format mode
- sal_Bool bNeedUpdate; // is set, if update was not possible
+ bool bNeedUpdate; // is set, if update was not possible
ScMatrixRef pResult;
@@ -79,22 +79,21 @@ public:
const ScMatrix* GetResult() const { return pResult.get(); }
void SetResult( ScMatrixRef pRes ) { pResult = pRes; }
- // XML and Excel import after NewData()
+ // XML and Excel import after NewData()
ScMatrixRef GetModifiableResult() { return pResult; }
const String& GetAppl() const { return aAppl; }
const String& GetTopic() const { return aTopic; }
const String& GetItem() const { return aItem; }
- sal_uInt8 GetMode() const { return nMode; }
+ sal_uInt8 GetMode() const { return nMode; }
void TryUpdate();
- sal_Bool NeedsUpdate() const { return bNeedUpdate; }
+ bool NeedsUpdate() const { return bNeedUpdate; }
- static sal_Bool IsInUpdate() { return bIsInUpdate; }
+ static bool IsInUpdate() { return bIsInUpdate; }
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6ed54c4..b0cfa6a 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -40,7 +40,6 @@
#include "externalrefmgr.hxx"
#include "calcconfig.hxx"
-#include <math.h>
#include <map>
class ScDocument;
@@ -96,7 +95,6 @@ class ScInterpreter
friend class ScChiSqDistFunction;
public:
-
DECL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
static void SetGlobalConfig(const ScCalcConfig& rConfig);
@@ -162,7 +160,6 @@ private:
VolatileType meVolatileType;
-//---------------------------------Funktionen in interpre.cxx---------
// nMust <= nAct <= nMax ? ok : PushError
inline bool MustHaveParamCount( short nAct, short nMust );
inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
@@ -309,7 +306,7 @@ inline void MatrixDoubleRefToMatrix(); // if MatrixFormula: PopDoubleRefPus
inline bool MatrixParameterConversion();
ScMatrixRef PopMatrix();
void QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_uLong& rRetIndexExpr);
-//void PushByte(BYTE nVal);
+
void PushDouble(double nVal);
void PushInt( int nVal );
void PushStringBuffer( const sal_Unicode* pString );
@@ -331,7 +328,7 @@ formula::StackVar GetStackType();
// peek StackType of Parameter, Parameter 1 == TOS, 2 == TOS-1, ...
formula::StackVar GetStackType( sal_uInt8 nParam );
sal_uInt8 GetByte() { return cPar; }
-// generiert aus DoubleRef positionsabhaengige SingleRef
+// generates a position-dependent SingleRef out of a DoubleRef
bool DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr );
double GetDoubleFromMatrix(const ScMatrixRef& pMat);
double GetDouble();
@@ -366,7 +363,6 @@ inline void TreatDoubleError( double& rVal );
bool LookupQueryWithCache( ScAddress & o_rResultPos,
const ScQueryParam & rParam ) const;
-//---------------------------------Funktionen in interpr1.cxx---------
void ScIfJump();
void ScChoseJump();
@@ -553,8 +549,6 @@ void ScBitRshift();
void ScBitLshift();
void ScTTT();
-//----------------Funktionen in interpr2.cxx---------------
-
/** Obtain the date serial number for a given date.
@param bStrict
If FALSE, nYear < 100 takes the two-digit year setting into account,
@@ -656,7 +650,6 @@ void ScNominal();
void ScMod();
void ScBackSolver();
void ScIntercept();
-//-------------------------Funktionen in interpr5.cxx--------------------------
double ScGetGCD(double fx, double fy);
void ScGCD();
void ScLCM();
@@ -695,7 +688,6 @@ bool CheckMatrix(bool _bLOG,sal_uInt8& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX
void ScRGP();
void ScRKP();
void ScForecast();
-//------------------------- Functions in interpr3.cxx -------------------------
void ScNoName();
void ScBadName();
// Statistics:
@@ -791,9 +783,7 @@ void ScSlope();
void ScTrend();
void ScInfo();
-//------------------------ Functions in interpr6.cxx -------------------------
-
-static const double fMaxGammaArgument; // defined in interpr3.cxx
+static const double fMaxGammaArgument;
double GetGammaContFraction(double fA,double fX);
double GetGammaSeries(double fA,double fX);
@@ -823,7 +813,6 @@ public:
sal_uLong GetRetFormatIndex() const { return nRetFmtIndex; }
};
-
inline void ScInterpreter::MatrixDoubleRefToMatrix()
{
if ( bMatrixFormula && GetStackType() == formula::svDoubleRef )
@@ -833,7 +822,6 @@ inline void ScInterpreter::MatrixDoubleRefToMatrix()
}
}
-
inline bool ScInterpreter::MatrixParameterConversion()
{
if ( (bMatrixFormula || pCur->HasForceArray()) && !pJumpMatrix && sp > 0 )
@@ -841,7 +829,6 @@ inline bool ScInterpreter::MatrixParameterConversion()
return false;
}
-
inline ScTokenMatrixMap& ScInterpreter::GetTokenMatrixMap()
{
if (!pTokenMatrixMap)
@@ -849,7 +836,6 @@ inline ScTokenMatrixMap& ScInterpreter::GetTokenMatrixMap()
return *pTokenMatrixMap;
}
-
inline bool ScInterpreter::MustHaveParamCount( short nAct, short nMust )
{
if ( nAct == nMust )
@@ -861,7 +847,6 @@ inline bool ScInterpreter::MustHaveParamCount( short nAct, short nMust )
return false;
}
-
inline bool ScInterpreter::MustHaveParamCount( short nAct, short nMust, short nMax )
{
if ( nMust <= nAct && nAct <= nMax )
@@ -873,7 +858,6 @@ inline bool ScInterpreter::MustHaveParamCount( short nAct, short nMust, short nM
return false;
}
-
inline bool ScInterpreter::MustHaveParamCountMin( short nAct, short nMin )
{
if ( nAct >= nMin )
@@ -882,7 +866,6 @@ inline bool ScInterpreter::MustHaveParamCountMin( short nAct, short nMin )
return false;
}
-
inline bool ScInterpreter::CheckStringResultLen( String& rResult, const String& rAdd )
{
if ( (sal_uLong) rResult.Len() + rAdd.Len() > STRING_MAXLEN )
@@ -894,7 +877,6 @@ inline bool ScInterpreter::CheckStringResultLen( String& rResult, const String&
return true;
}
-
inline void ScInterpreter::TreatDoubleError( double& rVal )
{
if ( !::rtl::math::isFinite( rVal ) )
@@ -908,7 +890,6 @@ inline void ScInterpreter::TreatDoubleError( double& rVal )
}
}
-
inline double ScInterpreter::div( const double& fNumerator, const double& fDenominator )
{
return (fDenominator != 0.0) ? (fNumerator / fDenominator) :
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index aef6b49..0a431ae 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -46,7 +46,7 @@ TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster);
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
-sal_Bool ScDdeLink::bIsInUpdate = false;
+bool ScDdeLink::bIsInUpdate = false;
//------------------------------------------------------------------------
@@ -230,8 +230,8 @@ sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged(
void ScDdeLink::ListenersGone()
{
- sal_Bool bWas = bIsInUpdate;
- bIsInUpdate = sal_True; // Remove() kann Reschedule ausloesen??!?
+ bool bWas = bIsInUpdate;
+ bIsInUpdate = true; // Remove() kann Reschedule ausloesen??!?
ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing the link
@@ -251,7 +251,7 @@ void ScDdeLink::ListenersGone()
void ScDdeLink::TryUpdate()
{
if (bIsInUpdate)
- bNeedUpdate = sal_True; // kann jetzt nicht ausgefuehrt werden
+ bNeedUpdate = true; // kann jetzt nicht ausgefuehrt werden
else
{
bIsInUpdate = true;
@@ -263,5 +263,4 @@ void ScDdeLink::TryUpdate()
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list