Kaydet (Commit) 1cd9c19b authored tarafından Christian M. Heller's avatar Christian M. Heller Kaydeden (comit) Samuel Mehrbrodt

fdo#39468 Translate German Comments - sc/source/core/data/documen2.cxx

Change-Id: I9a426f40f8cdce1f1ebe207dd9ada8154d8fde46
Reviewed-on: https://gerrit.libreoffice.org/12195Reviewed-by: 's avatarSamuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: 's avatarSamuel Mehrbrodt <s.mehrbrodt@gmail.com>
üst 656ffdd4
...@@ -114,7 +114,7 @@ struct ScLookupCacheMapImpl ...@@ -114,7 +114,7 @@ struct ScLookupCacheMapImpl
void clear() void clear()
{ {
freeCaches(); freeCaches();
// Zap map. // free mapping
ScLookupCacheMap aTmp; ScLookupCacheMap aTmp;
aCacheMap.swap( aTmp); aCacheMap.swap( aTmp);
} }
...@@ -330,11 +330,11 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) ...@@ -330,11 +330,11 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack )
IMPL_LINK_NOARG(ScDocument, TrackTimeHdl) IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
{ {
if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln if ( ScDdeLink::IsInUpdate() ) // do not nest
{ {
aTrackTimer.Start(); // spaeter nochmal versuchen aTrackTimer.Start(); // try again later
} }
else if (pShell) // ausfuehren else if (pShell) // execute
{ {
TrackFormulas(); TrackFormulas();
pShell->Broadcast( SfxSimpleHint( FID_DATACHANGED ) ); pShell->Broadcast( SfxSimpleHint( FID_DATACHANGED ) );
...@@ -363,7 +363,7 @@ void ScDocument::SetExpandRefs( bool bVal ) ...@@ -363,7 +363,7 @@ void ScDocument::SetExpandRefs( bool bVal )
void ScDocument::StartTrackTimer() void ScDocument::StartTrackTimer()
{ {
if (!aTrackTimer.IsActive()) // nicht ewig aufschieben if (!aTrackTimer.IsActive()) // do not postpone for forever
aTrackTimer.Start(); aTrackTimer.Start();
} }
...@@ -388,10 +388,9 @@ ScDocument::~ScDocument() ...@@ -388,10 +388,9 @@ ScDocument::~ScDocument()
ScAddInAsync::RemoveDocument( this ); ScAddInAsync::RemoveDocument( this );
ScAddInListener::RemoveDocument( this ); ScAddInListener::RemoveDocument( this );
DELETEZ( pChartListenerCollection); // vor pBASM wg. evtl. Listener! DELETEZ( pChartListenerCollection); // before pBASM because of potential Listener!
DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners
// BroadcastAreas vor allen Zellen zerstoeren um unnoetige // destroy BroadcastAreas first to avoid un-needed Single-EndListenings of Formula-Cells
// Einzel-EndListenings der Formelzellen zu vermeiden
delete pBASM; // BroadcastAreaSlotMachine delete pBASM; // BroadcastAreaSlotMachine
pBASM = NULL; pBASM = NULL;
...@@ -421,11 +420,11 @@ ScDocument::~ScDocument() ...@@ -421,11 +420,11 @@ ScDocument::~ScDocument()
ImplDeleteOptions(); ImplDeleteOptions();
delete pConsolidateDlgData; delete pConsolidateDlgData;
delete pClipData; delete pClipData;
delete pDetOpList; // loescht auch die Eintraege delete pDetOpList; // also deletes entries
delete pChangeTrack; delete pChangeTrack;
delete pEditEngine; delete pEditEngine;
delete pNoteEngine; delete pNoteEngine;
delete pChangeViewSettings; // und weg damit delete pChangeViewSettings; // and delete
delete pVirtualDevice_100th_mm; delete pVirtualDevice_100th_mm;
delete pDPCollection; delete pDPCollection;
...@@ -463,13 +462,13 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc ) ...@@ -463,13 +462,13 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc )
SharePooledResources(pSourceDoc); SharePooledResources(pSourceDoc);
// bedingte Formate / Gueltigkeiten // conditional Formats / validations
//! Vorlagen kopieren? // TODO: Copy Templates?
const ScValidationDataList* pSourceValid = pSourceDoc->pValidationList; const ScValidationDataList* pSourceValid = pSourceDoc->pValidationList;
if ( pSourceValid ) if ( pSourceValid )
pValidationList = new ScValidationDataList(this, *pSourceValid); pValidationList = new ScValidationDataList(this, *pSourceValid);
// Links in Stream speichern // store Links in Stream
delete pClipData; delete pClipData;
if (pSourceDoc->GetDocLinkManager().hasDdeLinks()) if (pSourceDoc->GetDocLinkManager().hasDdeLinks())
{ {
...@@ -591,7 +590,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab ) ...@@ -591,7 +590,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab )
void ScDocument::EnsureTable( SCTAB nTab ) void ScDocument::EnsureTable( SCTAB nTab )
{ {
bool bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags bool bExtras = !bIsUndo; // Column-Widths, Row-Heights, Flags
if (static_cast<size_t>(nTab) >= maTabs.size()) if (static_cast<size_t>(nTab) >= maTabs.size())
maTabs.resize(nTab+1, NULL); maTabs.resize(nTab+1, NULL);
...@@ -728,8 +727,8 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress ) ...@@ -728,8 +727,8 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress )
if (nNewPos == SC_TAB_APPEND || nNewPos >= nTabCount) if (nNewPos == SC_TAB_APPEND || nNewPos >= nTabCount)
nNewPos = nTabCount-1; nNewPos = nTabCount-1;
// Referenz-Updaterei // Update Reference
//! mit UpdateReference zusammenfassen! // TODO: combine with UpdateReference!
sc::RefUpdateMoveTabContext aCxt(nOldPos, nNewPos); sc::RefUpdateMoveTabContext aCxt(nOldPos, nNewPos);
...@@ -792,8 +791,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM ...@@ -792,8 +791,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
OUString aName; OUString aName;
GetName(nOldPos, aName); GetName(nOldPos, aName);
// vorneweg testen, ob der Prefix als gueltig erkannt wird // check first if Prefix is valid; if not, then only avoid duplicates
// wenn nicht, nur doppelte vermeiden
bool bPrefix = ValidTabName( aName ); bool bPrefix = ValidTabName( aName );
OSL_ENSURE(bPrefix, "invalid table name"); OSL_ENSURE(bPrefix, "invalid table name");
SCTAB nDummy; SCTAB nDummy;
...@@ -885,7 +883,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM ...@@ -885,7 +883,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
maTabs[nNewPos]->UpdateReference(aRefCxt, NULL); maTabs[nNewPos]->UpdateReference(aRefCxt, NULL);
sc::RefUpdateInsertTabContext aInsTabCxt(nNewPos, 1); sc::RefUpdateInsertTabContext aInsTabCxt(nNewPos, 1);
maTabs[nNewPos]->UpdateInsertTabAbs(nNewPos); // alle abs. um eins hoch!! maTabs[nNewPos]->UpdateInsertTabAbs(nNewPos); // move all paragraphs up by one!!
maTabs[nOldPos]->UpdateInsertTab(aInsTabCxt); maTabs[nOldPos]->UpdateInsertTab(aInsTabCxt);
maTabs[nOldPos]->UpdateCompile(); maTabs[nOldPos]->UpdateCompile();
...@@ -921,9 +919,9 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ...@@ -921,9 +919,9 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
SCTAB nDestPos, bool bInsertNew, SCTAB nDestPos, bool bInsertNew,
bool bResultsOnly ) bool bResultsOnly )
{ {
sal_uLong nRetVal = 1; // 0 => Fehler 1 = ok sal_uLong nRetVal = 1; // 0 => error 1 = ok
// 3 => NameBox // 3 => NameBox
// 4 => beides // 4 => both
if (pSrcDoc->pShell->GetMedium()) if (pSrcDoc->pShell->GetMedium())
{ {
...@@ -938,7 +936,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ...@@ -938,7 +936,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
} }
bool bValid = true; bool bValid = true;
if (bInsertNew) // neu einfuegen if (bInsertNew) // re-insert
{ {
OUString aName; OUString aName;
pSrcDoc->GetName(nSrcPos, aName); pSrcDoc->GetName(nSrcPos, aName);
...@@ -949,7 +947,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ...@@ -949,7 +947,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
maTabs[nDestPos]->SetLayoutRTL(pSrcDoc->maTabs[nSrcPos]->IsLayoutRTL()); maTabs[nDestPos]->SetLayoutRTL(pSrcDoc->maTabs[nSrcPos]->IsLayoutRTL());
maTabs[nDestPos]->SetLoadingRTL(pSrcDoc->maTabs[nSrcPos]->IsLoadingRTL()); maTabs[nDestPos]->SetLoadingRTL(pSrcDoc->maTabs[nSrcPos]->IsLoadingRTL());
} }
else // bestehende Tabelle ersetzen else // replace existing tables
{ {
if (ValidTab(nDestPos) && nDestPos < static_cast<SCTAB>(maTabs.size()) && maTabs[nDestPos]) if (ValidTab(nDestPos) && nDestPos < static_cast<SCTAB>(maTabs.size()) && maTabs[nDestPos])
{ {
...@@ -963,12 +961,12 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ...@@ -963,12 +961,12 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
{ {
bool bOldAutoCalcSrc = false; bool bOldAutoCalcSrc = false;
bool bOldAutoCalc = GetAutoCalc(); bool bOldAutoCalc = GetAutoCalc();
SetAutoCalc( false ); // Mehrfachberechnungen vermeiden SetAutoCalc( false ); // avoid repeated calculations
SetNoListening( true ); SetNoListening( true );
if ( bResultsOnly ) if ( bResultsOnly )
{ {
bOldAutoCalcSrc = pSrcDoc->GetAutoCalc(); bOldAutoCalcSrc = pSrcDoc->GetAutoCalc();
pSrcDoc->SetAutoCalc( true ); // falls was berechnet werden muss pSrcDoc->SetAutoCalc( true ); // in case something needs calculation
} }
{ {
...@@ -1009,7 +1007,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ...@@ -1009,7 +1007,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
pSrcDoc->SetAutoCalc( bOldAutoCalcSrc ); pSrcDoc->SetAutoCalc( bOldAutoCalcSrc );
SetAutoCalc( bOldAutoCalc ); SetAutoCalc( bOldAutoCalc );
// Drawing kopieren // copy Drawing
if (bInsertNew) if (bInsertNew)
TransferDrawPage( pSrcDoc, nSrcPos, nDestPos ); TransferDrawPage( pSrcDoc, nSrcPos, nDestPos );
...@@ -1219,10 +1217,10 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder) ...@@ -1219,10 +1217,10 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
ScChangeTrack* pTrack = GetChangeTrack(); ScChangeTrack* pTrack = GetChangeTrack();
ScChangeViewSettings* pSettings = GetChangeViewSettings(); ScChangeViewSettings* pSettings = GetChangeViewSettings();
if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() ) if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() )
return false; // nix da oder abgeschaltet return false; // missing or turned-off
ScActionColorChanger aColorChanger(*pTrack); ScActionColorChanger aColorChanger(*pTrack);
// Clipping passiert von aussen // Clipping happens from outside
//! ohne Clipping, nur betroffene Zeilen painten ??!??!? //! TODO: without Clipping; only paint affected cells ??!??!?
const ScChangeAction* pAction = pTrack->GetFirst(); const ScChangeAction* pAction = pTrack->GetFirst();
while (pAction) while (pAction)
{ {
...@@ -1307,7 +1305,7 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT ...@@ -1307,7 +1305,7 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT
aRange.aEnd.SetCol( aRange.aStart.Col() ); aRange.aEnd.SetCol( aRange.aStart.Col() );
if ( aRange.In( aCellPos ) ) if ( aRange.In( aCellPos ) )
{ {
pFound = pAction; // der letzte gewinnt pFound = pAction; // the last wins
switch ( eType ) switch ( eType )
{ {
case SC_CAT_CONTENT : case SC_CAT_CONTENT :
...@@ -1339,12 +1337,12 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT ...@@ -1339,12 +1337,12 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT
if ( pFound ) if ( pFound )
{ {
if ( pFoundContent && pFound->GetType() != SC_CAT_CONTENT ) if ( pFoundContent && pFound->GetType() != SC_CAT_CONTENT )
pFound = pFoundContent; // Content gewinnt pFound = pFoundContent; // Content wins
if ( pFoundMove && pFound->GetType() != SC_CAT_MOVE && if ( pFoundMove && pFound->GetType() != SC_CAT_MOVE &&
pFoundMove->GetActionNumber() > pFoundMove->GetActionNumber() >
pFound->GetActionNumber() ) pFound->GetActionNumber() )
pFound = pFoundMove; // Move gewinnt pFound = pFoundMove; // Move wins
// bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle // for deleted columns: arrow on left side of row
if ( pFound->GetType() == SC_CAT_DELETE_COLS ) if ( pFound->GetType() == SC_CAT_DELETE_COLS )
bLeftEdge = true; bLeftEdge = true;
DateTime aDT = pFound->GetDateTime(); DateTime aDT = pFound->GetDateTime();
......
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