Kaydet (Commit) 5605a36a authored tarafından Jennifer Liebel's avatar Jennifer Liebel Kaydeden (comit) Thomas Arnhold

fdo#39674: Improved translation

Conflicts:

	sc/source/core/tool/interpr2.cxx

Change-Id: Ib80472a1670b61fdea61bdee4d52b19e28b85d63
Reviewed-on: https://gerrit.libreoffice.org/11192Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
üst 675073a7
...@@ -94,8 +94,6 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int1 ...@@ -94,8 +94,6 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int1
} }
} }
// Funktionen
void ScInterpreter::ScGetActDate() void ScInterpreter::ScGetActDate()
{ {
nFuncFmtType = NUMBERFORMAT_DATE; nFuncFmtType = NUMBERFORMAT_DATE;
...@@ -1399,9 +1397,9 @@ void ScInterpreter::ScVDB() ...@@ -1399,9 +1397,9 @@ void ScInterpreter::ScVDB()
else else
{ {
double fDauer1=fDauer; double fTimeLength1=fTimeLength;
//@Die Frage aller Fragen: "Ist das hier richtig" //@ The question of all questions: 'Is this right'
if(!::rtl::math::approxEqual(fAnfang,::rtl::math::approxFloor(fAnfang))) if(!::rtl::math::approxEqual(fAnfang,::rtl::math::approxFloor(fAnfang)))
{ {
if(fFactor>1) if(fFactor>1)
...@@ -2173,18 +2171,18 @@ void ScInterpreter::ScStyle() ...@@ -2173,18 +2171,18 @@ void ScInterpreter::ScStyle()
sal_uInt8 nParamCount = GetByte(); sal_uInt8 nParamCount = GetByte();
if (nParamCount >= 1 && nParamCount <= 3) if (nParamCount >= 1 && nParamCount <= 3)
{ {
OUString aStyle2; // Vorlage nach Timer OUString aStyle2; // Template after timer
if (nParamCount >= 3) if (nParamCount >= 3)
aStyle2 = GetString().getString(); aStyle2 = GetString().getString();
long nTimeOut = 0; // Timeout long nTimeOut = 0; // Timeout
if (nParamCount >= 2) if (nParamCount >= 2)
nTimeOut = (long)(GetDouble()*1000.0); nTimeOut = (long)(GetDouble()*1000.0);
OUString aStyle1 = GetString().getString(); // Vorlage fuer sofort OUString aStyle1 = GetString().getString(); // Template for immediate
if (nTimeOut < 0) if (nTimeOut < 0)
nTimeOut = 0; nTimeOut = 0;
// Request ausfuehren, um Vorlage anzuwenden // Execute request to apply template
if ( !pDok->IsClipOrUndo() ) if ( !pDok->IsClipOrUndo() )
{ {
...@@ -2254,7 +2252,7 @@ void ScInterpreter::ScDde() ...@@ -2254,7 +2252,7 @@ void ScInterpreter::ScDde()
return; return;
} }
// Nach dem Laden muss neu interpretiert werden (Verknuepfungen aufbauen) // Need to reinterpret after loading (build links)
if ( rArr.IsRecalcModeNormal() ) if ( rArr.IsRecalcModeNormal() )
rArr.SetExclusiveRecalcModeOnLoad(); rArr.SetExclusiveRecalcModeOnLoad();
...@@ -2265,7 +2263,7 @@ void ScInterpreter::ScDde() ...@@ -2265,7 +2263,7 @@ void ScInterpreter::ScDde()
bool bOldEnabled = pDok->IsIdleEnabled(); bool bOldEnabled = pDok->IsIdleEnabled();
pDok->EnableIdle(false); pDok->EnableIdle(false);
// Link-Objekt holen / anlegen // Get/ Create link object
ScDdeLink* pLink = lcl_GetDdeLink( pLinkMgr, aAppl, aTopic, aItem, nMode ); ScDdeLink* pLink = lcl_GetDdeLink( pLinkMgr, aAppl, aTopic, aItem, nMode );
...@@ -2285,8 +2283,8 @@ void ScInterpreter::ScDde() ...@@ -2285,8 +2283,8 @@ void ScInterpreter::ScDde()
pBindings->Invalidate( SID_LINKS ); // Link-Manager enablen pBindings->Invalidate( SID_LINKS ); // Link-Manager enablen
} }
//! asynchron auswerten ??? //! evaluate asynchron ???
pLink->TryUpdate(); // TryUpdate ruft Update nicht mehrfach auf pLink->TryUpdate(); // TryUpdate doesn't call Update multiple times
if (pMyFormulaCell) if (pMyFormulaCell)
{ {
...@@ -2392,9 +2390,9 @@ void ScInterpreter::ScBase() ...@@ -2392,9 +2390,9 @@ void ScInterpreter::ScBase()
bool bDirt = false; bool bDirt = false;
while ( fVal && p > pBuf ) while ( fVal && p > pBuf )
{ {
//! mit fmod Rundungsfehler ab 2**48 //! roundoff error starting with numbers greater than 2**48
// double fDig = ::rtl::math::approxFloor( fmod( fVal, fBase ) ); // double fDig = ::rtl::math::approxFloor( fmod( fVal, fBase ) );
// so ist es etwas besser // a little bit better:
double fInt = ::rtl::math::approxFloor( fVal / fBase ); double fInt = ::rtl::math::approxFloor( fVal / fBase );
double fMult = fInt * fBase; double fMult = fInt * fBase;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
...@@ -2523,7 +2521,8 @@ void ScInterpreter::ScConvert() ...@@ -2523,7 +2521,8 @@ void ScInterpreter::ScConvert()
if ( nGlobalError ) if ( nGlobalError )
PushError( nGlobalError); PushError( nGlobalError);
else else
{ // erst die angegebene Reihenfolge suchen, wenn nicht gefunden den Kehrwert {
// first of all search for the given order; if it can't be found then search for the inverse
double fConv; double fConv;
if ( ScGlobal::GetUnitConverter()->GetValue( fConv, aFromUnit, aToUnit ) ) if ( ScGlobal::GetUnitConverter()->GetValue( fConv, aFromUnit, aToUnit ) )
PushDouble( fVal * fConv ); PushDouble( fVal * fConv );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment