[Libreoffice-commits] .: sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 27 08:08:42 PDT 2012
sc/source/core/inc/adiasync.hxx | 20 ++++++++++----------
sc/source/core/inc/ddelink.hxx | 14 +++++++-------
sc/source/core/inc/interpre.hxx | 26 +++++++++++++-------------
3 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit f5b7fecbc0744e46468d57b8131ea7d768aa96a2
Author: Gerhard Oettl <gerhard.oettl at ogersoft.at>
Date: Mon Aug 27 09:39:35 2012 +0200
fdo#39468: Translated German comments in sc/source/core/inc
Change-Id: I81b7330bf3178b539855f73aac25539013a2bd90
Reviewed-by: Philipp Riemer <ruderphilipp at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/493
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 54625c8..548f58c 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -49,20 +49,20 @@ class ScAddInAsync : public SvtBroadcaster
private:
union
{
- double nVal; // aktueller Wert
+ double nVal; // current value
String* pStr;
};
- ScAddInDocs* pDocs; // Liste der benutzenden Dokumente
- FuncData* mpFuncData; // Zeiger auf die Daten in der Collection
- sal_uLong nHandle; // wird von double auf sal_uLong gecasted
- ParamType meType; // PTR_DOUBLE oder PTR_STRING Ergebnis
- sal_Bool bValid; // ob Wert gueltig
+ ScAddInDocs* pDocs; // List of using documents
+ 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?
public:
- // cTor nur wenn ScAddInAsync::Get fehlschlaegt!
- // nIndex: Index aus der FunctionCollection
+ // cTor only if ScAddInAsync::Get fails.
+ // nIndex: Index from FunctionCollection
ScAddInAsync(sal_uLong nHandle, FuncData* pFuncData, ScDocument* pDoc);
- // default-cTor nur fuer das eine globale aSeekObj !!!
+ // default-cTor only for that single, global aSeekObj!
ScAddInAsync();
virtual ~ScAddInAsync();
static ScAddInAsync* Get( sal_uLong nHandle );
@@ -76,7 +76,7 @@ public:
{ return pDocs->find( pDoc ) != pDocs->end(); }
void AddDocument( ScDocument* pDoc ) { pDocs->insert( pDoc ); }
- // Vergleichsoperatoren fuer PtrArrSort
+ // Comparators for PtrArrSort
bool operator< ( const ScAddInAsync& r ) const { return nHandle < r.nHandle; }
bool operator==( const ScAddInAsync& r ) const { return nHandle == r.nHandle; }
};
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 216d6d6..4f3734f 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -46,14 +46,14 @@ static sal_Bool bIsInUpdate;
ScDocument* pDoc;
- String aAppl; // Verbindungsdaten
+ String aAppl; // connection/ link data
String aTopic;
String aItem;
- sal_uInt8 nMode; // Zahlformat-Modus
+ sal_uInt8 nMode; // number format mode
- sal_Bool bNeedUpdate; // wird gesetzt, wenn Update nicht moeglich war
+ sal_Bool bNeedUpdate; // is set, if update was not possible
- ScMatrixRef pResult; // Ergebnis
+ ScMatrixRef pResult;
public:
TYPEINFO();
@@ -67,14 +67,14 @@ public:
void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
- // von SvBaseLink ueberladen:
+ // overloaded by SvBaseLink:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
- // von SvtBroadcaster ueberladen:
+ // overloaded by SvtBroadcaster:
virtual void ListenersGone();
- // fuer Interpreter:
+ // for interpreter:
const ScMatrix* GetResult() const { return pResult.get(); }
void SetResult( ScMatrixRef pRes ) { pResult = pRes; }
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3affc4e..6ed54c4 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -102,7 +102,7 @@ public:
static void SetGlobalConfig(const ScCalcConfig& rConfig);
static const ScCalcConfig& GetGlobalConfig();
- static void GlobalExit(); // aus ScGlobal::Clear() gerufen
+ static void GlobalExit(); // called by ScGlobal::Clear()
/// Could string be a regular expression?
/// If pDoc!=NULL the document options are taken into account and if
@@ -172,9 +172,9 @@ void PushIllegalParameter();
void PushIllegalArgument();
void PushNoValue();
void PushNA();
-//-------------------------------------------------------------------------
-// Funktionen fuer den Zugriff auf das Document
-//-------------------------------------------------------------------------
+
+// Functions for accessing a document
+
void ReplaceCell( ScAddress& ); // for TableOp
void ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ); // for TableOp
bool IsTableOpInRange( const ScRange& );
@@ -207,9 +207,7 @@ bool CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
bool CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr);
-//-----------------------------------------------------------------------------
// Stack operations
-//-----------------------------------------------------------------------------
/** Does substitute with formula::FormulaErrorToken in case nGlobalError is set and the token
passed is not formula::FormulaErrorToken.
@@ -350,10 +348,12 @@ ScMatrixRef CreateMatrixFromDoubleRef( const formula::FormulaToken* pToken,
inline ScTokenMatrixMap& GetTokenMatrixMap();
ScTokenMatrixMap* CreateTokenMatrixMap();
ScMatrixRef GetMatrix();
-void ScTableOp(); // Mehrfachoperationen
-void ScErrCell(); // Sonderbehandlung
- // Fehlerzelle
-//-----------------------------allgemeine Hilfsfunktionen
+void ScTableOp(); // repeated operations
+void ScErrCell(); // special handling for
+ // error cell
+
+// common helper functions
+
void SetMaxIterationCount(sal_uInt16 n);
inline void CurFmtToFuncFmt()
{ nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }
@@ -615,7 +615,7 @@ void ScDecimal();
void ScConvert();
void ScEuroConvert();
-//----------------------- Finanzfunktionen ------------------------------------
+// financial functions
void ScNPV();
void ScIRR();
void ScMIRR();
@@ -660,8 +660,8 @@ void ScIntercept();
double ScGetGCD(double fx, double fy);
void ScGCD();
void ScLCM();
-//-------------------------- Matrixfunktionen ---------------------------------
+// matrix functions
void ScMatValue();
void MEMat(const ScMatrixRef& mM, SCSIZE n);
void ScMatDet();
@@ -698,7 +698,7 @@ void ScForecast();
//------------------------- Functions in interpr3.cxx -------------------------
void ScNoName();
void ScBadName();
-// Statistik:
+// Statistics:
double phi(double x);
double integralPhi(double x);
double taylor(double* pPolynom, sal_uInt16 nMax, double x);
More information about the Libreoffice-commits
mailing list