Kaydet (Commit) 24782e31 authored tarafından Albert Thuswaldner's avatar Albert Thuswaldner Kaydeden (comit) Eike Rathke

tdf#39468 translated german comments in tabview.cxx and tabview2.cxx

Change-Id: I37d8752fa6a5b532c8fce3175bf42d3c8c93b3a8
Reviewed-on: https://gerrit.libreoffice.org/18360Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst 33ca9693
This diff is collapsed.
...@@ -337,8 +337,7 @@ void ScTabView::InitOwnBlockMode() ...@@ -337,8 +337,7 @@ void ScTabView::InitOwnBlockMode()
{ {
if (!IsBlockMode()) if (!IsBlockMode())
{ {
// Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen: // when there is no (old) selection anynmore, delete anchor in SelectionEngine:
ScMarkData& rMark = aViewData.GetMarkData(); ScMarkData& rMark = aViewData.GetMarkData();
if (!rMark.IsMarked() && !rMark.IsMultiMarked()) if (!rMark.IsMarked() && !rMark.IsMultiMarked())
GetSelEngine()->CursorPosChanging( false, false ); GetSelEngine()->CursorPosChanging( false, false );
...@@ -351,7 +350,7 @@ void ScTabView::InitOwnBlockMode() ...@@ -351,7 +350,7 @@ void ScTabView::InitOwnBlockMode()
nBlockEndY = 0; nBlockEndY = 0;
nBlockEndZ = 0; nBlockEndZ = 0;
SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt SelectionChanged(); // status is checked with mark set
} }
} }
...@@ -366,7 +365,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -366,7 +365,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
ScMarkData& rMark = aViewData.GetMarkData(); ScMarkData& rMark = aViewData.GetMarkData();
SCTAB nTab = aViewData.GetTabNo(); SCTAB nTab = aViewData.GetTabNo();
// Teil von Markierung aufheben? // unmark part?
if (bForceNeg) if (bForceNeg)
bBlockNeg = true; bBlockNeg = true;
else if (bTestNeg) else if (bTestNeg)
...@@ -412,9 +411,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -412,9 +411,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
void ScTabView::DoneBlockMode( bool bContinue ) void ScTabView::DoneBlockMode( bool bContinue )
{ {
// Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird, // When switching between sheet and header SelectionEngine DeselectAll may be called,
// wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat. // because the other engine does not have any anchor.
// Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird. // bMoveIsShift prevents the selection to be canceled.
if (IsBlockMode() && !bMoveIsShift) if (IsBlockMode() && !bMoveIsShift)
{ {
...@@ -429,14 +428,12 @@ void ScTabView::DoneBlockMode( bool bContinue ) ...@@ -429,14 +428,12 @@ void ScTabView::DoneBlockMode( bool bContinue )
rMark.MarkToMulti(); rMark.MarkToMulti();
else else
{ {
// Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode // the sheet may be invalid at this point because DoneBlockMode from SetTabNo is
// aus SetTabNo aufgerufen wird // called (for example, when the current sheet is closed from another View)
// (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird)
SCTAB nTab = aViewData.GetTabNo(); SCTAB nTab = aViewData.GetTabNo();
ScDocument* pDoc = aViewData.GetDocument(); ScDocument* pDoc = aViewData.GetDocument();
if ( pDoc->HasTable(nTab) ) if ( pDoc->HasTable(nTab) )
PaintBlock( true ); // true -> Block loeschen PaintBlock( true ); // true -> delete block
else else
rMark.ResetMark(); rMark.ResetMark();
} }
...@@ -460,7 +457,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -460,7 +457,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
if (!IsBlockMode()) if (!IsBlockMode())
{ {
OSL_FAIL( "MarkCursor nicht im BlockMode" ); OSL_FAIL( "MarkCursor not in BlockMode" );
InitBlockMode( nCurX, nCurY, nCurZ, false, bCols, bRows ); InitBlockMode( nCurX, nCurY, nCurZ, false, bCols, bRows );
} }
...@@ -477,13 +474,12 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -477,13 +474,12 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
( aMarkRange.aStart.Row() != nBlockStartY && aMarkRange.aEnd.Row() != nBlockStartY ) || ( aMarkRange.aStart.Row() != nBlockStartY && aMarkRange.aEnd.Row() != nBlockStartY ) ||
( meBlockMode == Own )) ( meBlockMode == Own ))
{ {
// Markierung ist veraendert worden // Mark has been changed
// (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde) // (Eg MarkToSimple if by negative everything was erased, except for a rectangle)
// oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert... // or after InitOwnBlockMode is further marked with shift-
bool bOldShift = bMoveIsShift; bool bOldShift = bMoveIsShift;
bMoveIsShift = false; // wirklich umsetzen bMoveIsShift = false; // really move
DoneBlockMode(); //! direkt Variablen setzen? (-> kein Geflacker) DoneBlockMode(); //! Set variables directly? (-> no flicker)
bMoveIsShift = bOldShift; bMoveIsShift = bOldShift;
InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
...@@ -683,7 +679,7 @@ void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode ...@@ -683,7 +679,7 @@ void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode
ScDocument* pDoc = aViewData.GetDocument(); ScDocument* pDoc = aViewData.GetDocument();
SCTAB nTab = aViewData.GetTabNo(); SCTAB nTab = aViewData.GetTabNo();
// FindAreaPos kennt nur -1 oder 1 als Richtung // FindAreaPos knows only -1 or 1 as direction
ScModule* pScModule = SC_MOD(); ScModule* pScModule = SC_MOD();
bool bLegacyCellSelection = pScModule->GetInputOptions().GetLegacyCellSelection(); bool bLegacyCellSelection = pScModule->GetInputOptions().GetLegacyCellSelection();
SCCOL nVirtualX = bLegacyCellSelection ? nNewX : nCurX; SCCOL nVirtualX = bLegacyCellSelection ? nNewX : nCurX;
...@@ -703,7 +699,7 @@ void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode ...@@ -703,7 +699,7 @@ void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode
for ( i=0; i<-nMovY; i++ ) for ( i=0; i<-nMovY; i++ )
pDoc->FindAreaPos( nVirtualX, nNewY, nTab, SC_MOVE_UP ); pDoc->FindAreaPos( nVirtualX, nNewY, nTab, SC_MOVE_UP );
if (eMode==SC_FOLLOW_JUMP) // unten/rechts nicht zuviel grau anzeigen if (eMode==SC_FOLLOW_JUMP) // bottom right do not show to much grey
{ {
if (nMovX != 0 && nNewX == MAXCOL) if (nMovX != 0 && nNewX == MAXCOL)
eMode = SC_FOLLOW_LINE; eMode = SC_FOLLOW_LINE;
...@@ -996,7 +992,7 @@ void ScTabView::UpdateAllOverlays() ...@@ -996,7 +992,7 @@ void ScTabView::UpdateAllOverlays()
} }
//! //!
//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae. //! divide PaintBlock in to two methods: RepaintBlock and RemoveBlock or similar
//! //!
void ScTabView::PaintBlock( bool bReset ) void ScTabView::PaintBlock( bool bReset )
...@@ -1033,7 +1029,7 @@ void ScTabView::PaintBlock( bool bReset ) ...@@ -1033,7 +1029,7 @@ void ScTabView::PaintBlock( bool bReset )
{ {
if ( bReset ) if ( bReset )
{ {
// Invertieren beim Loeschen nur auf aktiver View // Inverting when deleting only on active View
if ( aViewData.IsActive() ) if ( aViewData.IsActive() )
{ {
rMark.ResetMark(); rMark.ResetMark();
...@@ -1174,11 +1170,11 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) ...@@ -1174,11 +1170,11 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
switch ( eType ) switch ( eType )
{ {
case SvxZoomType::PERCENT: // rZoom ist kein besonderer prozentualer Wert case SvxZoomType::PERCENT: // rZoom is no particular percent value
nZoom = nOldZoom; nZoom = nOldZoom;
break; break;
case SvxZoomType::OPTIMAL: // nZoom entspricht der optimalen Gr"o\se case SvxZoomType::OPTIMAL: // nZoom corresponds to the optimal size
{ {
ScMarkData& rMark = aViewData.GetMarkData(); ScMarkData& rMark = aViewData.GetMarkData();
ScDocument* pDoc = aViewData.GetDocument(); ScDocument* pDoc = aViewData.GetDocument();
...@@ -1254,7 +1250,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) ...@@ -1254,7 +1250,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
else else
nMax = nTest-1; nMax = nTest-1;
} }
OSL_ENSURE( nMin == nMax, "Schachtelung ist falsch" ); OSL_ENSURE( nMin == nMax, "Nesting is wrong" );
nZoom = nMin; nZoom = nMin;
if ( nZoom != nOldZoom ) if ( nZoom != nOldZoom )
...@@ -1272,8 +1268,8 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) ...@@ -1272,8 +1268,8 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
} }
break; break;
case SvxZoomType::WHOLEPAGE: // nZoom entspricht der ganzen Seite oder case SvxZoomType::WHOLEPAGE: // nZoom corresponds to the whole page or
case SvxZoomType::PAGEWIDTH: // nZoom entspricht der Seitenbreite case SvxZoomType::PAGEWIDTH: // nZoom corresponds to the page width
{ {
SCTAB nCurTab = aViewData.GetTabNo(); SCTAB nCurTab = aViewData.GetTabNo();
ScDocument* pDoc = aViewData.GetDocument(); ScDocument* pDoc = aViewData.GetDocument();
...@@ -1357,7 +1353,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) ...@@ -1357,7 +1353,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
return nZoom; return nZoom;
} }
// wird z.B. gerufen, wenn sich das View-Fenster verschiebt: // is called for instance when the view window is shifted:
void ScTabView::StopMarking() void ScTabView::StopMarking()
{ {
...@@ -1387,8 +1383,8 @@ void ScTabView::MakeDrawLayer() ...@@ -1387,8 +1383,8 @@ void ScTabView::MakeDrawLayer()
{ {
aViewData.GetDocShell()->MakeDrawLayer(); aViewData.GetDocShell()->MakeDrawLayer();
// pDrawView wird per Notify gesetzt // pDrawView is set per Notify
OSL_ENSURE(pDrawView,"ScTabView::MakeDrawLayer funktioniert nicht"); OSL_ENSURE(pDrawView,"ScTabView::MakeDrawLayer does not work");
// #114409# // #114409#
for(sal_uInt16 a(0); a < 4; a++) for(sal_uInt16 a(0); a < 4; a++)
...@@ -1409,7 +1405,7 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId ) ...@@ -1409,7 +1405,7 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
return; return;
} }
StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen StopMarking(); // if called by Focus from MouseButtonDown
vcl::Window* pParent = aViewData.GetDialogParent(); vcl::Window* pParent = aViewData.GetDialogParent();
ScWaitCursorOff aWaitOff( pParent ); ScWaitCursorOff aWaitOff( pParent );
...@@ -1445,14 +1441,14 @@ void ScTabView::UpdatePageBreakData( bool bForcePaint ) ...@@ -1445,14 +1441,14 @@ void ScTabView::UpdatePageBreakData( bool bForcePaint )
pNewData = new ScPageBreakData(nCount); pNewData = new ScPageBreakData(nCount);
ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab, 0,0,NULL, NULL, pNewData ); ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab, 0,0,NULL, NULL, pNewData );
// ScPrintFunc fuellt im ctor die PageBreakData // ScPrintFunc fills the PageBreakData in ctor
if ( nCount > 1 ) if ( nCount > 1 )
{ {
aPrintFunc.ResetBreaks(nTab); aPrintFunc.ResetBreaks(nTab);
pNewData->AddPages(); pNewData->AddPages();
} }
// Druckbereiche veraendert? // print area changed?
if ( bForcePaint || ( pPageBreakData && !( *pPageBreakData == *pNewData ) ) ) if ( bForcePaint || ( pPageBreakData && !( *pPageBreakData == *pNewData ) ) )
PaintGrid(); PaintGrid();
} }
......
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