diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-09 15:12:37 +0900 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-10 14:04:34 +0900 |
commit | 9364aee03b195422367026979940135429b40ffa (patch) | |
tree | 6f1039c21774561c5af597a8c9c3167e6acc1c44 /sc | |
parent | 2e293978d80c5113ea37f4c7f4b18ee01f2022e1 (diff) |
translate some comments
Change-Id: Ia050a9a0fe5219964ba4d1460260e07fc4ab4fbb
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin3.cxx | 29 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 28 |
3 files changed, 33 insertions, 36 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 47a482571104..298162fc0cbb 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -161,9 +161,9 @@ enum ScFilterBoxMode SC_FILTERBOX_PAGEFIELD }; -extern SfxViewShell* pScActiveViewShell; // global.cxx -extern sal_uInt16 nScClickMouseModifier; // global.cxx -extern sal_uInt16 nScFillModeMouseModifier; // global.cxx +extern SfxViewShell* pScActiveViewShell; // global.cxx +extern sal_uInt16 nScClickMouseModifier; // global.cxx +extern sal_uInt16 nScFillModeMouseModifier; // global.cxx struct ScGridWindow::MouseEventState { @@ -281,17 +281,17 @@ bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); vcl::KeyCode aCode = aKeyEvt.GetKeyCode(); - if ( !aCode.GetModifier() ) // ohne alle Modifiers + if ( !aCode.GetModifier() ) // no modifiers { sal_uInt16 nKey = aCode.GetCode(); if ( nKey == KEY_RETURN ) { - SelectHdl(); // auswaehlen + SelectHdl(); // select nDone = true; } else if ( nKey == KEY_ESCAPE ) { - pGridWin->ClickExtern(); // loescht die List-Box !!! + pGridWin->ClickExtern(); // clears the listbox nDone = true; } } diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index e9ac6ca2054a..9b87a7b2ea09 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -64,8 +64,7 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) } } - // bei rechter Taste Draw-Aktion abbrechen - + // cancel draw with right key ScDrawView* pDrView = pViewData->GetScDrawView(); if ( pDrView && !rMEvt.IsLeft() && !bRet ) { @@ -97,7 +96,7 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt) } if ( !pView->IsPaintBrushLocked() ) - pView->ResetBrushDocument(); // end paint brush mode if not locked + pView->ResetBrushDocument(); // end paint brush mode if not locked } } @@ -144,7 +143,7 @@ bool ScGridWindow::DrawCommand(const CommandEvent& rCEvt) pDraw->SetWindow( this ); sal_uInt8 nUsed = pDraw->Command( rCEvt ); if( nUsed == SC_CMD_USED ) - nButtonDown = 0; // MouseButtonUp wird verschluckt... + nButtonDown = 0; // MouseButtonUp wird verschluckt... if( nUsed || pDrView->IsAction() ) return true; } @@ -172,12 +171,12 @@ bool ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt) bLeaveDraw = true; if ( !bOldMarked && rKEvt.GetKeyCode().GetCode() == KEY_DELETE ) - bUsed = false; // nichts geloescht + bUsed = false; // nothing deleted if(bOldMarked) GetFocus(); } if (!bLeaveDraw) - UpdateStatusPosSize(); // for moving/resizing etc. by keyboard + UpdateStatusPosSize(); // for moving/resizing etc. by keyboard return bUsed; } } @@ -220,13 +219,13 @@ void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, sa void ScGridWindow::DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ) { - // Draw-Gitterlinien + // Draw grid lines ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if ( pDrView && pDrView->IsGridVisible() ) { SdrPageView* pPV = pDrView->GetSdrPageView(); - OSL_ENSURE(pPV, "keine PageView"); + OSL_ENSURE(pPV, "PageView not available"); if (pPV) { pContentDev->SetLineColor(COL_GRAY); @@ -280,14 +279,14 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) void ScGridWindow::DrawAfterScroll() { - Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist + Update(); // always, so the the behaviour with and without DrawingLayer is the same ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if (pDrView) { OutlinerView* pOlView = pDrView->GetTextEditOutlinerView(); if (pOlView && pOlView->GetWindow() == this) - pOlView->ShowCursor(false); // ist beim Scrollen weggekommen + pOlView->ShowCursor(false); // was removed at scrolling } } @@ -324,11 +323,11 @@ void ScGridWindow::UpdateStatusPosSize() { ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if (!pDrView) - return; // shouldn't be called in that case + return; // shouldn't be called in that case SdrPageView* pPV = pDrView->GetSdrPageView(); if (!pPV) - return; // shouldn't be called in that case either + return; // shouldn't be called in that case either SfxItemSet aSet(pViewData->GetViewShell()->GetPool(), SID_ATTR_POSITION, SID_ATTR_SIZE); @@ -338,7 +337,7 @@ void ScGridWindow::UpdateStatusPosSize() // mouse position otherwise bool bActionItem = false; - if ( pDrView->IsAction() ) // action rectangle + if ( pDrView->IsAction() ) // action rectangle { Rectangle aRect; pDrView->TakeActionRect( aRect ); @@ -357,7 +356,7 @@ void ScGridWindow::UpdateStatusPosSize() } if ( !bActionItem ) { - if ( pDrView->AreObjectsMarked() ) // selected objects + if ( pDrView->AreObjectsMarked() ) // selected objects { Rectangle aRect = pDrView->GetAllMarkedRect(); // mouse position will have been adjusted for offset @@ -369,7 +368,7 @@ void ScGridWindow::UpdateStatusPosSize() aSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ) ) ); } - else // mouse position + else // mouse position { Point aPos = PixelToLogic(aCurMousePos); pPV->LogicToPagePos(aPos); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 22d4171fd439..c291370ca257 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -373,13 +373,11 @@ void ScGridWindow::Paint( const Rectangle& rRect ) ScViewData::AddPixelsWhile( nScrY, aPixRect.Bottom(), nY2, MAXROW, nPPTY, pDoc, nTab); } - Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen + Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // don't continue with painting bIsInPaint = false; } -// Draw ---------------------------------------------------------------- - void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -401,13 +399,13 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod PutInOrder( nX1, nX2 ); PutInOrder( nY1, nY2 ); - OSL_ENSURE( ValidCol(nX2) && ValidRow(nY2), "GridWin Draw Bereich zu gross" ); + OSL_ENSURE( ValidCol(nX2) && ValidRow(nY2), "GridWin Draw area too big" ); UpdateVisibleRange(); if (nX2 < maVisibleRange.mnCol1 || nY2 < maVisibleRange.mnRow1) return; - // unsichtbar + // invisible if (nX1 < maVisibleRange.mnCol1) nX1 = maVisibleRange.mnCol1; if (nY1 < maVisibleRange.mnRow1) @@ -422,11 +420,11 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod nY2 = maVisibleRange.mnRow2; if ( eMode != SC_UPDATE_MARKS && nX2 < maVisibleRange.mnCol2) - nX2 = maVisibleRange.mnCol2; // zum Weiterzeichnen + nX2 = maVisibleRange.mnCol2; // zum Weiterzeichnen - // ab hier kein return mehr + // point of no return - ++nPaintCount; // merken, dass gemalt wird (wichtig beim Invertieren) + ++nPaintCount; // mark that painting is in progress SCTAB nTab = pViewData->GetTabNo(); rDoc.ExtendHidden( nX1, nY1, nX2, nY2, nTab ); @@ -460,7 +458,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod SCROW nHdlY = aAutoMarkPos.Row(); rDoc.ExtendMerge( nHdlX, nHdlY, nHdlX, nHdlY, nTab ); bCurVis = ( nHdlX+1 >= nX1 && nHdlX <= nX2 && nHdlY+1 >= nY1 && nHdlY <= nY2 ); - // links und oben ist nicht betroffen + // left and top is unaffected //! AutoFill-Anfasser alleine (ohne Cursor) zeichnen ??? } @@ -470,7 +468,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod const ScViewOptions& rOpts = pViewData->GetOptions(); - // Datenblock + // data block ScTableInfo aTabInfo; rDoc.FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, @@ -480,14 +478,14 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod Fraction aZoomX = pViewData->GetZoomX(); Fraction aZoomY = pViewData->GetZoomY(); ScOutputData aOutputData( this, OUTTYPE_WINDOW, aTabInfo, &rDoc, nTab, - nScrX, nScrY, nX1, nY1, nX2, nY2, nPPTX, nPPTY, - &aZoomX, &aZoomY ); + nScrX, nScrY, nX1, nY1, nX2, nY2, nPPTX, nPPTY, + &aZoomX, &aZoomY ); - aOutputData.SetMirrorWidth( nMirrorWidth ); // needed for RTL + aOutputData.SetMirrorWidth( nMirrorWidth ); // needed for RTL aOutputData.SetSpellCheckContext(mpSpellCheckCxt.get()); boost::scoped_ptr< VirtualDevice > xFmtVirtDev; - bool bLogicText = bTextWysiwyg; // call DrawStrings in logic MapMode? + bool bLogicText = bTextWysiwyg; // call DrawStrings in logic MapMode? if ( bTextWysiwyg ) { @@ -506,7 +504,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod xFmtVirtDev->SetMapMode( MAP_100TH_MM ); aOutputData.SetFmtDevice( xFmtVirtDev.get() ); - bLogicText = true; // use logic MapMode + bLogicText = true; // use logic MapMode } DrawContent(*this, aTabInfo, aOutputData, bLogicText, eMode); |