diff options
author | gerhard oettl <lodev@ogersoft.at> | 2012-09-08 13:15:19 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-09-09 09:14:52 +0000 |
commit | 1e7e6647be5392dae58f5c67f64521d6fbf7b327 (patch) | |
tree | 4a494d691aa78bd24841744cc4293aea51e88f84 /sc | |
parent | 337ef5808dd8e55c06d00b222e69c5ba287acab5 (diff) |
fdo#39468: Translated German comments in sc/source/core/tool
Change-Id: I8e31d452a10f1f3f9e10e270f87a13cc64eb5e71
Reviewed-on: https://gerrit.libreoffice.org/586
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/hints.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/inputopt.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/interpr5.cxx | 14 | ||||
-rw-r--r-- | sc/source/core/tool/progress.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/rangenam.cxx | 16 | ||||
-rw-r--r-- | sc/source/core/tool/rangeutl.cxx | 24 | ||||
-rw-r--r-- | sc/source/core/tool/rechead.cxx | 10 | ||||
-rw-r--r-- | sc/source/core/tool/reffind.cxx | 14 |
8 files changed, 46 insertions, 48 deletions
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx index c0a7876eda5c..9a00b3f5b558 100644 --- a/sc/source/core/tool/hints.cxx +++ b/sc/source/core/tool/hints.cxx @@ -30,7 +30,7 @@ TYPEINIT1(ScDBRangeRefreshedHint, SfxHint); TYPEINIT1(ScDataPilotModifiedHint, SfxHint); // ----------------------------------------------------------------------- -// ScPaintHint - Angabe, was neu gezeichnet werden muss +// ScPaintHint - info what has to be repainted // ----------------------------------------------------------------------- ScPaintHint::ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint ) : @@ -45,7 +45,7 @@ ScPaintHint::~ScPaintHint() } // ----------------------------------------------------------------------- -// ScUpdateRefHint - Referenz-Updaterei +// ScUpdateRefHint - update references // ----------------------------------------------------------------------- ScUpdateRefHint::ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR, @@ -63,7 +63,7 @@ ScUpdateRefHint::~ScUpdateRefHint() } // ----------------------------------------------------------------------- -// ScPointerChangedHint - Pointer ist ungueltig geworden +// ScPointerChangedHint - pointer has become invalid // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 82981a5af262..757eb1a7c52e 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -44,12 +44,12 @@ using ::rtl::OUString; //------------------------------------------------------------------ -// Version, ab der das Item kompatibel ist +// version from which on the item is compatible #define SC_VERSION ((sal_uInt16)351) //======================================================================== -// ScInputOptions - Eingabe-Optionen +// ScInputOptions - input options //======================================================================== ScInputOptions::ScInputOptions() diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 227186ba2446..0b9eb3bd258f 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1215,7 +1215,7 @@ ScMatrixRef ScInterpreter::MatConcat(const ScMatrixRef& pMat1, const ScMatrixRef } -// fuer DATE, TIME, DATETIME +// for DATE, TIME, DATETIME void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 ) { if ( nFmt1 != NUMBERFORMAT_UNDEFINED || nFmt2 != NUMBERFORMAT_UNDEFINED ) @@ -1223,11 +1223,11 @@ void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 ) if ( nFmt1 == nFmt2 ) { if ( nFmt1 == NUMBERFORMAT_TIME || nFmt1 == NUMBERFORMAT_DATETIME ) - nFuncFmt = NUMBERFORMAT_TIME; // Zeiten ergeben Zeit - // else: nichts besonderes, Zahl (Datum - Datum := Tage) + nFuncFmt = NUMBERFORMAT_TIME; // times result in time + // else: nothing special, number (date - date := days) } else if ( nFmt1 == NUMBERFORMAT_UNDEFINED ) - nFuncFmt = nFmt2; // z.B. Datum + Tage := Datum + nFuncFmt = nFmt2; // e.g. date + days := date else if ( nFmt2 == NUMBERFORMAT_UNDEFINED ) nFuncFmt = nFmt1; else @@ -1236,7 +1236,7 @@ void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 ) nFmt1 == NUMBERFORMAT_DATETIME || nFmt2 == NUMBERFORMAT_DATETIME ) { if ( nFmt1 == NUMBERFORMAT_TIME || nFmt2 == NUMBERFORMAT_TIME ) - nFuncFmt = NUMBERFORMAT_DATETIME; // Datum + Zeit + nFuncFmt = NUMBERFORMAT_DATETIME; // date + time } } } @@ -1573,7 +1573,7 @@ void ScInterpreter::ScDiv() else { fVal2 = GetDouble(); - // hier kein Currency uebernehmen, 123kg/456DM sind nicht DM + // do not take over currency, 123kg/456USD is not USD nFmtCurrencyType2 = nCurFmtType; } if ( GetStackType() == svMatrix ) @@ -1643,7 +1643,7 @@ void ScInterpreter::ScDiv() PushDouble( div( fVal1, fVal2) ); } if ( nFmtCurrencyType == NUMBERFORMAT_CURRENCY && nFmtCurrencyType2 != NUMBERFORMAT_CURRENCY ) - { // auch DM/DM ist nicht DM bzw. DEM/EUR nicht DEM + { // even USD/USD is not USD nFuncFmtType = nFmtCurrencyType; nFuncFmtIndex = nFmtCurrencyIndex; } diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index b70b7dd34350..b5d9846c80a8 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -100,9 +100,9 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText, } else if ( SFX_APP()->IsDowning() ) { - // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden - // Dann wuerde ein SfxProgress wild im Speicher rummuellen - //! Soll das so sein ??? + // This happens. E.g. when saving the clipboard-content as OLE when closing the app. + // In this case a SfxProgress would produce dirt in memory. + //! Should that be this way ??? pProgress = NULL; } diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index dc2efe54d4eb..a2f67a27d986 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -104,7 +104,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, { pCode->Reset(); FormulaToken* p = pCode->GetNextReference(); - if( p )// genau eine Referenz als erstes + if( p ) // exact one reference at first { if( p->GetType() == svSingleRef ) eType = eType | RT_ABSPOS; @@ -143,7 +143,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, ScRangeData::ScRangeData(const ScRangeData& rScRangeData, ScDocument* pDocument) : aName (rScRangeData.aName), aUpperName (rScRangeData.aUpperName), - pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // echte Kopie erzeugen (nicht copy-ctor) + pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // make real copy (not copy-ctor) aPos (rScRangeData.aPos), eType (rScRangeData.eType), pDoc (pDocument ? pDocument : rScRangeData.pDoc), @@ -217,8 +217,8 @@ void ScRangeData::CompileUnresolvedXML() void ScRangeData::GuessPosition() { - // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel - // ohne Fehler verabsolutiert werden koennen + // set a position that allows "absoluting" of all relative references + // in CalcAbsIfRel without errors OSL_ENSURE(aPos == ScAddress(), "die Position geht jetzt verloren"); @@ -369,10 +369,10 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) } } - bModified = bChanged; // muss direkt hinterher ausgewertet werden + bModified = bChanged; // has to be evaluated immediately afterwards } -bool ScRangeData::operator== (const ScRangeData& rData) const // fuer Undo +bool ScRangeData::operator== (const ScRangeData& rData) const // for Undo { if ( nIndex != rData.nIndex || aName != rData.aName || @@ -445,10 +445,10 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, sal_uInt16 nFlag, SCTAB nNewTabl aComp.SetGrammar(pDoc->GetGrammar()); switch (nFlag) { - case 1: // einfache InsertTab (doc.cxx) + case 1: // simple InsertTab (doc.cxx) pRangeData = aComp.UpdateInsertTab(nOldTable, true, nNewSheets ); // und CopyTab (doc2.cxx) break; - case 2: // einfaches delete (doc.cxx) + case 2: // simple delete (doc.cxx) pRangeData = aComp.UpdateDeleteTab(nOldTable, false, true, bChanged); break; case 3: // move (doc2.cxx) diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 957015948128..10014104daa3 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -50,7 +50,7 @@ sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr, SCTAB nTab, ScAddress::Details const & rDetails ) const { - // Eingabe in rAreaStr: "$Tabelle1.$A1:$D17" + // Input in rAreaStr: "$Tabelle1.$A1:$D17" // BROKEN BROKEN BROKEN // but it is only used in the consolidate dialog. Ignore for now. @@ -66,7 +66,7 @@ sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr, if ( nPointPos != STRING_NOTFOUND ) { aStrArea += ':'; - aStrArea += rAreaStr.Copy( nPointPos+1 ); // '.' nicht mitkopieren + aStrArea += rAreaStr.Copy( nPointPos+1 ); // do not include '.' in copy } nSuccess = ConvertDoubleRef( pDoc, aStrArea, nTab, startPos, endPos, rDetails ); @@ -91,7 +91,7 @@ void ScRangeUtil::CutPosString( const String& theAreaStr, sal_uInt16 nColonPos = theAreaStr.Search(':'); if ( nColonPos != STRING_NOTFOUND ) - aPosStr = theAreaStr.Copy( 0, nColonPos ); // ':' nicht mitkopieren + aPosStr = theAreaStr.Copy( 0, nColonPos ); // do not include ':' in copy else aPosStr = theAreaStr; @@ -115,15 +115,13 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr, // but it is only used in the consolidate dialog. Ignore for now. /* - * Erwartet wird ein String der Form + * Expects strings like: * "$Tabelle1.$A$1:$Tabelle3.$D$17" - * Wenn bAcceptCellRef == sal_True ist, wird auch ein String der Form + * If bAcceptCellRef == sal_True then also accept strings like: * "$Tabelle1.$A$1" - * akzeptiert. * - * als Ergebnis wird ein ScArea-Array angelegt, - * welches ueber ppAreas bekannt gegeben wird und auch - * wieder geloescht werden muss! + * as result a ScArea-Array is created, + * which is published via ppAreas and also has to be deleted this route. */ sal_Bool bStrOk = false; @@ -161,7 +159,7 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr, bStrOk = sal_True; - if ( pppAreas && pAreaCount ) // Array zurueckgegeben? + if ( pppAreas && pAreaCount ) // Array returned ? { SCTAB nStartTab = aStartPos.Tab(); SCTAB nEndTab = aEndPos.Tab(); @@ -1109,7 +1107,7 @@ bool ScAreaNameIterator::Next( String& rName, ScRange& rRange ) if (bValid) { rName = rData.GetName(); - return true; // gefunden + return true; // found } } else @@ -1132,10 +1130,10 @@ bool ScAreaNameIterator::Next( String& rName, ScRange& rRange ) ++maDBPos; rData.GetArea(rRange); rName = rData.GetName(); - return true; // gefunden + return true; // found } else - return false; // gibt nichts mehr + return false; // nothing left } } } diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 1933251c5ec5..fb83f3f1699c 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -51,7 +51,7 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) : if ( rStream.GetError() == SVSTREAM_OK ) rStream.SetError( SVSTREAM_FILEFORMAT_ERROR ); - // alles auf 0, damit BytesLeft() wenigstens abbricht + // everything to 0, so BytesLeft() aborts at least pBuf = NULL; pMemStream = NULL; nEntryEnd = nDataPos; } @@ -90,10 +90,10 @@ void ScMultipleReadHeader::EndEntry() { if ( rStream.GetError() == SVSTREAM_OK ) rStream.SetError( SCWARN_IMPORT_INFOLOST ); - rStream.Seek( nEntryEnd ); // Rest ueberspringen + rStream.Seek( nEntryEnd ); // ignore the rest } - nEntryEnd = nTotalEnd; // den ganzen Rest, wenn kein StartEntry kommt + nEntryEnd = nTotalEnd; // all remaining, if no StartEntry follows } void ScMultipleReadHeader::StartEntry() @@ -137,12 +137,12 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() rStream << static_cast<sal_uInt32>(aMemStream.Tell()); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); - if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? + if ( nDataEnd - nDataPos != nDataSize ) // matched default ? { nDataSize = nDataEnd - nDataPos; sal_uLong nPos = rStream.Tell(); rStream.Seek(nDataPos-sizeof(sal_uInt32)); - rStream << nDataSize; // Groesse am Anfang eintragen + rStream << nDataSize; // record size at the beginning rStream.Seek(nPos); } } diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 88af930e0b0b..8593dde47a5f 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -37,7 +37,7 @@ namespace { -// incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt +// include colon -> duplicate referenced are handled individual const sal_Unicode pDelimiters[] = { '=','(',')','+','-','*','/','^','&',' ','{','}','<','>',':', 0 }; @@ -224,7 +224,7 @@ sal_uInt16 lcl_NextFlags( sal_uInt16 nOld ) nNew = ( nNew - 1 ) & 7; // weiterzaehlen if (!(nOld & SCA_TAB_3D)) - nNew &= ~SCA_TAB_ABSOLUTE; // nicht 3D -> nie absolut! + nNew &= ~SCA_TAB_ABSOLUTE; // not 3D -> never absolute! return ( nOld & 0xfff8 ) | nNew; } @@ -234,9 +234,9 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ) xub_StrLen nLen = aFormula.Len(); if (!nLen) return; - const sal_Unicode* pSource = aFormula.GetBuffer(); // fuer schnellen Zugriff + const sal_Unicode* pSource = aFormula.GetBuffer(); // for quick access - // Selektion erweitern, und statt Selektion Start- und Endindex + // expand selection, and instead of selection start- and end-index if ( nEndPos < nStartPos ) ::std::swap(nEndPos, nStartPos); @@ -269,13 +269,13 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ) xub_StrLen nAbsStart = nStartPos+aResult.Len()+aSep.Len(); - if (!nFound) // erste Referenz ? + if (!nFound) // first reference ? nSelStart = nAbsStart; - nSelEnd = nAbsStart+aExpr.Len(); // Selektion, keine Indizes + nSelEnd = nAbsStart+aExpr.Len(); // selection, no indizes ++nFound; } - // zusammenbauen + // assemble aResult += aSep; aResult += aExpr; |