diff options
author | Jens Carl <j.carl43@gmx.de> | 2017-04-06 08:13:18 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-04-06 15:04:12 +0000 |
commit | a6ac1545f79440ad31317ec975754eba57649ee7 (patch) | |
tree | 6a55276f10247607c48367d28732daf02c9b3358 /sc | |
parent | 26fb00ec6d8dec52a4ec4c0f194a9da6f310b7e3 (diff) |
tdf#39468 Translate German comments
Translate German comments and terms in sc/
Change-Id: I93c7cf423325715435910a89420e7522b440c81e
Reviewed-on: https://gerrit.libreoffice.org/36192
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/rtf/rtfparse.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/dbgui/outline.src | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fusel.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/formdlg/dwfunctr.cxx | 25 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/formatsh.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin2.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/output2.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/view/printfun.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/tabview4.cxx | 30 | ||||
-rw-r--r-- | sc/source/ui/view/tabview5.cxx | 32 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh5.cxx | 72 |
22 files changed, 118 insertions, 123 deletions
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 87b2b5cac34a..1ee195fb3d8b 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -325,7 +325,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo ) { OSL_ENSURE( pActDefault, "RTF_CELL: pActDefault==0" ); if ( bNewDef || !pActDefault ) - NewCellRow( pInfo ); // davor war kein \intbl, bad behavior + NewCellRow( pInfo ); // before was no \intbl, bad behavior // Broken RTF? Let's save what we can if ( !pActDefault ) pActDefault = pInsDefault; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 18e9f342650c..5e53c347a843 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3117,7 +3117,7 @@ void ScInputHandler::InsertFunction( const OUString& rFuncName, bool bAddPar ) { if ( eMode == SC_INPUT_NONE ) { - OSL_FAIL("InsertFunction, nicht im Eingabemodus"); + OSL_FAIL("InsertFunction, not during input mode"); return; } @@ -3164,7 +3164,7 @@ void ScInputHandler::ClearText() { if ( eMode == SC_INPUT_NONE ) { - OSL_FAIL("ClearText, nicht im Eingabemodus"); + OSL_FAIL("ClearText, not during input mode"); return; } diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src index 1d76312c03e6..e799d89b7195 100644 --- a/sc/source/ui/dbgui/outline.src +++ b/sc/source/ui/dbgui/outline.src @@ -19,8 +19,8 @@ #include "scres.hrc" -// Imageliste hier, damit sie nicht in ui.src beim Zusammenbauen der -// "echten" Imagelisten stoert +// Image list here, so that there is no interruption during assembly +// of the "real" image list in ui.src Bitmap RID_BMP_LEVEL1 { diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 979c27e966e6..a412d957b915 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -562,7 +562,7 @@ bool ScDocFunc::DeleteContents( if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - OSL_FAIL("ScDocFunc::DeleteContents ohne Markierung"); + OSL_FAIL("ScDocFunc::DeleteContents without markings"); return false; } diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 313b008529b9..3efd9f1c530d 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -269,7 +269,7 @@ void ScDocShell::UnlockPaint_Impl(bool bDoc) } else { - OSL_FAIL("UnlockPaint ohne LockPaint"); + OSL_FAIL("UnlockPaint without LockPaint"); } } diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index a4328b234142..1b7cb1f9107c 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -71,7 +71,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink SvxHyperlinkItem aHLinkItem; - if ( rMarkList.GetMarkCount() == 1 ) // URL-Button markiert ? + if ( rMarkList.GetMarkCount() == 1 ) // URL-Button marked ? { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj ); @@ -84,7 +84,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); - OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" ); + OSL_ENSURE( xControlModel.is(), "UNO-Control without model" ); if( !xControlModel.is() ) return; diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index d31bc6a11857..8b0fddfbfed6 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -54,7 +54,7 @@ bool ScDrawTextObjectBar::IsNoteEdit() return ScDrawLayer::IsNoteCaption( pViewData->GetView()->GetSdrView()->GetTextEditObject() ); } -// wenn kein Text editiert wird, Funktionen wie in drawsh +// if no text edited, functions like in drawsh void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) { diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index eed333b41913..3a0c6ad35c79 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -211,7 +211,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pObjSh->CallXScript( pInfo->GetMacro(), aInArgs, aRet, aOutArgsIndex, aOutArgs, true, &aCaller ); pViewShell->FakeButtonUp( pViewShell->GetViewData().GetActivePart() ); - return true; // kein CaptureMouse etc. + return true; // no CaptureMouse etc. } } } @@ -245,7 +245,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { ScGlobal::OpenURL( sURL, sTarget ); pViewShell->FakeButtonUp( pViewShell->GetViewData().GetActivePart() ); - return true; // kein CaptureMouse etc. + return true; // no CaptureMouse etc. } // Is another object being edited in this view? diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 63362f29078f..8f13dd83ce03 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -118,8 +118,7 @@ void ScFunctionWin::dispose() #* #* Class: ScFunctionWin #* -#* Function: Aktualisiert die Liste der Funktionen ab- -#* haengig von der eingestellten Kategorie. +#* Function: Updates the list of functions depending on the set category #* #* Input: --- #* @@ -144,7 +143,7 @@ void ScFunctionWin::InitLRUList() #* #* Class: ScFunctionWin #* -#* Function: Aktualisiert die Liste der zuletzt verwendeten Funktionen. +#* Function: Updates the list of last used functions. #* #* Input: --- #* @@ -205,8 +204,7 @@ void ScFunctionWin::SetDescription() #* #* Class: ScFunctionWin #* -#* Function: Aktualisiert die Liste der Funktionen ab- -#* haengig von der eingestellten Kategorie. +#* Function: Updates the list of functions depending on the set category #* #* Input: --- #* @@ -266,9 +264,8 @@ void ScFunctionWin::UpdateFunctionList() #* #* Class: ScFunctionWin #* -#* Function: Eingabe ins Dokument uebernehmen. Wird aufgerufen -#* nach betaetigen der Uebernehmen- Schaltflaeche -#* oder einem Doppelklick in die Funktionsliste. +#* Function: Save input into document. Is called after clicking the +#* Apply button or a double-click on the function list. #* #* Input: --- #* @@ -347,7 +344,7 @@ void ScFunctionWin::DoEnter() aString += aFuncList->GetSelectEntry(); } EditView *pEdView=pHdl->GetActiveView(); - if(pEdView!=nullptr) // @ Wegen Absturz bei Namen festlegen + if(pEdView!=nullptr) // @ needed because of crash during setting a name { if(nArgs>0) { @@ -384,8 +381,7 @@ void ScFunctionWin::DoEnter() #* #* Class: ScFunctionWin #* -#* Function: Bei einer Aenderung der Kategorie wird die -#* die Liste der Funktionen aktualisiert. +#* Function: A change of the category will update the list of functions. #* #* Input: --- #* @@ -413,8 +409,7 @@ IMPL_LINK( ScFunctionWin, SelHdl, ListBox&, rLb, void ) #* #* Class: ScFunctionWin #* -#* Function: Bei einer Aenderung der Kategorie wird die -#* die Liste der Funktionen aktualisiert. +#* Function: A change of the category will update the list of functions. #* #* Input: --- #* @@ -424,11 +419,11 @@ IMPL_LINK( ScFunctionWin, SelHdl, ListBox&, rLb, void ) IMPL_LINK_NOARG( ScFunctionWin, SetSelectionClickHdl, Button*, void ) { - DoEnter(); // Uebernimmt die Eingabe + DoEnter(); // saves the input } IMPL_LINK_NOARG( ScFunctionWin, SetSelectionHdl, ListBox&, void ) { - DoEnter(); // Uebernimmt die Eingabe + DoEnter(); // saves the input } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 36d9a0e3730a..b1d4dcebfe3c 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -129,7 +129,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pData->SetInputHandler(pScMod->GetInputHdl()); pData->SetDocShell(pViewData->GetDocShell()); - OSL_ENSURE(pData,"FormEditData ist nicht da"); + OSL_ENSURE(pData,"FormEditData not available"); formula::FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA; // default... diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 253ae20da05a..8e4067625fa8 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -192,11 +192,11 @@ protected: virtual void ShowCursor(bool bOn) override; - virtual void Move() override; // Benachrichtigung + virtual void Move() override; // notification - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; // alt + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; // old - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; // neu + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; // new virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) override; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 3342deada578..ce319d16e68b 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -6502,7 +6502,7 @@ uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() if ( pDocSh ) return new ScAnnotationObj( pDocSh, aCellPos ); - OSL_FAIL("getAnnotation ohne DocShell"); + OSL_FAIL("getAnnotation without DocShell"); return nullptr; } @@ -8949,7 +8949,7 @@ ScCellsEnumeration::~ScCellsEnumeration() void ScCellsEnumeration::Advance_Impl() { - OSL_ENSURE(!bAtEnd,"zuviel Advance_Impl"); + OSL_ENSURE(!bAtEnd,"too much Advance_Impl"); if (!pMark) { pMark = new ScMarkData; @@ -8964,7 +8964,7 @@ void ScCellsEnumeration::Advance_Impl() if (bFound) aPos.Set( nCol, nRow, nTab ); else - bAtEnd = true; // kommt nix mehr + bAtEnd = true; // nothing will follow } void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) @@ -8977,10 +8977,10 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) aRanges.UpdateReference( pRefHint->GetMode(), &pDocShell->GetDocument(), pRefHint->GetRange(), pRefHint->GetDx(), pRefHint->GetDy(), pRefHint->GetDz() ); - delete pMark; // aus verschobenen Bereichen neu erzeugen + delete pMark; // recreate from moved area pMark = nullptr; - if (!bAtEnd) // aPos anpassen + if (!bAtEnd) // adjust aPos { ScRangeList aNew; aNew.Append(ScRange(aPos)); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index db32a2bcbe82..230223517223 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1540,9 +1540,9 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) else { /* - * "Selbstgemachte" RadioButton-Funktionalitaet - * Beim Toggle gibt es den Standard-State, d.h. kein - * Button ist gedrueckt + * "Self-made" functionality of radio buttons + * At the toggle the default state is used, this means + * no button was clicked. */ const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 88fe45a6c96a..cc8e6d89d7b8 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -891,7 +891,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) if ( nPagebreakMouse == SC_PD_BREAK_H ) { if ( nPosX > aPagebreakSource.aStart.Col() && - nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt + nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // to the end is also allowed { bToEnd = ( nPosX == aPagebreakSource.aEnd.Col() + 1 ); aDrawRange.aStart.SetCol( nPosX ); @@ -903,7 +903,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) else { if ( nPosY > aPagebreakSource.aStart.Row() && - nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt + nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // to the end is also allowe { bToEnd = ( nPosY == aPagebreakSource.aEnd.Row() + 1 ); aDrawRange.aStart.SetRow( nPosY ); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 150f1f125571..c75f34526a0f 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -773,8 +773,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI // In any case, Szenario / ChangeTracking must happen after DrawGrid, also for !bGridFirst - //! Test, ob ChangeTrack-Anzeige aktiv ist - //! Szenario-Rahmen per View-Optionen abschaltbar? + //! test if ChangeTrack display is active + //! Disable scenario frame via view option? SCTAB nTabCount = rDoc.GetTableCount(); const std::vector<ScHighlightEntry> &rHigh = pViewData->GetView()->GetHighlightRanges(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 32d95f2855aa..efddb38dc68a 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -423,7 +423,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if ( pDrView && bHelpEnabled && !bDone ) { SdrPageView* pPV = pDrView->GetSdrPageView(); - OSL_ENSURE( pPV, "SdrPageView* ist NULL" ); + OSL_ENSURE( pPV, "SdrPageView* is NULL" ); if (pPV) bDone = FmFormPage::RequestHelp( this, pDrView, rHEvt ); } diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 54141905c549..50090a289c7e 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -126,7 +126,7 @@ public: ScDrawStringsVars(ScOutputData* pData, bool bPTL); // SetPattern = ex-SetVars - // SetPatternSimple: ohne Font + // SetPatternSimple: without Font void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, const ScRefCellValue& rCell, @@ -2778,8 +2778,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) if (nAttrRotate) { - //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ? - //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage) + //! set flag to find the cell in DrawRotated again ? + //! (or flag already set during DrawBackground, then no query here) bHidden = true; // rotated is outputted separately } @@ -4148,8 +4148,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) if (nAttrRotate) { - //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ? - //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage) + //! set flag to find the cell in DrawRotated again ? + //! (or flag already set during DrawBackground, then no query here) bHidden = true; // rotated is outputted separately } @@ -4395,7 +4395,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else aLogicClip = aAreaParam.maClipRect; - if (bClip) // bei bSimClip nur aClipRect initialisieren + if (bClip) // if bSimClip only initialize aClipRect { if (bMetaFile) { @@ -5016,7 +5016,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (bPixelToLogic) aCellSize = mpRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) ); else - aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1 + aCellSize = Size( nOutWidth, nOutHeight ); // scale is one long nGridWidth = nEngineWidth; bool bNegative = false; @@ -5227,7 +5227,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) long nOriVal = 0; if ( nAttrRotate ) { - // Attribut ist 1/100, Font 1/10 Grad + // attribute is 1/100, Font 1/10 Grad nOriVal = nAttrRotate / 10; double nAddX = 0.0; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 6a9b4a35a2f9..082ca8400712 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -127,7 +127,7 @@ void ScPageRowEntry::SetPagesX(size_t nNew) { if (pHidden) { - OSL_FAIL("SetPagesX nicht nach SetHidden"); + OSL_FAIL("SetPagesX not after SetHidden"); pHidden.reset(); } nPagesX = nNew; @@ -203,7 +203,7 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) pParamSet = &pStyleSheet->GetItemSet(); else { - OSL_FAIL("Seitenvorlage nicht gefunden" ); + OSL_FAIL("Template not found" ); pParamSet = nullptr; } @@ -743,7 +743,7 @@ long ScPrintFunc::TextHeight( const EditTextObject* pObject ) void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) { - OSL_ENSURE( aPageSize.Width(), "UpdateHFHeight ohne aPageSize"); + OSL_ENSURE( aPageSize.Width(), "UpdateHFHeight without aPageSize"); if (rParam.bEnable && rParam.bDynamic) { diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 7cfb8ff8fc93..1b383f394e58 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -55,7 +55,7 @@ void ScTabView::ShowRefTip() SCROW nStartY = aViewData.GetRefStartY(); SCCOL nEndX = aViewData.GetRefEndX(); SCROW nEndY = aViewData.GetRefEndY(); - if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle + if ( nEndX != nStartX || nEndY != nStartY ) // not for a single cell { bool bLeft = ( nEndX < nStartX ); bool bTop = ( nEndY < nStartY ); @@ -80,12 +80,12 @@ void ScTabView::ShowRefTip() QuickHelpFlags nFlags = ( bLeft ? QuickHelpFlags::Right : QuickHelpFlags::Left ) | ( bTop ? QuickHelpFlags::Bottom : QuickHelpFlags::Top ); - // nicht ueber die editierte Formel + // not over the edited formula if ( !bTop && aViewData.HasEditView( eWhich ) && nEndY+1 == aViewData.GetEditViewRow() ) { - // dann an der oberen Kante der editierten Zelle ausrichten - aPos.Y() -= 2; // die 3 von oben + // then align at the upper border of edited cell + aPos.Y() -= 2; // the three from above nFlags = ( nFlags & ~QuickHelpFlags::Top ) | QuickHelpFlags::Bottom; } @@ -134,7 +134,7 @@ void ScTabView::StopRefMode() } pSelEngine->Reset(); - pSelEngine->SetAddMode( false ); //! sollte das nicht bei Reset passieren? + pSelEngine->SetAddMode( false ); //! shouldn't that happen during reset? ScSplitPos eOld = pSelEngine->GetWhich(); ScSplitPos eNew = aViewData.GetActivePart(); @@ -189,8 +189,8 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if (!aViewData.IsRefMode()) { - // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die - // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen: + // This will happen, when first at a reference dialog with Control in + // the table is clicked. Then append the new reference to the old content: ScModule* pScMod = SC_MOD(); if (pScMod->IsFormulaMode()) @@ -250,7 +250,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) PaintArea( nPaintStartX, nPaintStartY, nPaintEndX, nPaintEndY, ScUpdateMode::Marks ); } - // Tip-Hilfe fuer Auto-Fill + // autocomplete for Auto-Fill if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) { vcl::Window* pWin = GetActiveWin(); @@ -265,7 +265,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if ( aViewData.GetFillMode() == ScFillMode::MATRIX && !(nScFillModeMouseModifier & KEY_MOD1) ) { aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX ); - SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig + SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // order is right SCROW nRows = nEndY + 1 - aViewData.GetRefStartY(); aHelpStr = aHelpStr.replaceFirst("%1", OUString::number(nRows) ); aHelpStr = aHelpStr.replaceFirst("%2", OUString::number(nCols) ); @@ -277,7 +277,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if (aHelpStr.getLength()) { - // je nach Richtung die obere oder untere Ecke: + // depending on direction the upper or lower corner SCCOL nAddX = ( nEndX >= aMarkRange.aEnd.Col() ) ? 1 : 0; SCROW nAddY = ( nEndY >= aMarkRange.aEnd.Row() ) ? 1 : 0; Point aPos = aViewData.GetScrPos( nEndX+nAddX, nEndY+nAddY, aViewData.GetActivePart() ); @@ -318,10 +318,10 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT SCROW nEndY = nCurY; pDoc->ExtendMerge( nStartX, nStartY, nEndX, nEndY, aViewData.GetTabNo() ); - //! nur Markierung ueber Inhalte zeichnen! + //! draw only markings over content! PaintArea( nStartX,nStartY,nEndX,nEndY, ScUpdateMode::Marks ); - // SetReference ohne Merge-Anpassung + // SetReference without Merge-Adjustment ScRange aRef( nCurX,nCurY,nCurZ, nCurX,nCurY,nCurZ ); SC_MOD()->SetReference( aRef, pDoc, &rMark ); } @@ -345,9 +345,9 @@ long ScTabView::GetScrollBarPos( ScrollBar& rScroll ) return rScroll.GetThumbPos(); } -// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen +// UpdateScrollBars - set visible area and scroll width of scroll bars -static long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen +static long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (complete) cells { long nOldPos; long nNewPos; @@ -356,7 +356,7 @@ static long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = rScroll.SetPageSize( static_cast<long>(nSize) ); nNewPos = rScroll.GetThumbPos(); #ifndef UNX - rScroll.SetPageSize( 1 ); // immer moeglich ! + rScroll.SetPageSize( 1 ); // always possible ! #endif return nNewPos - nOldPos; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 4c68fbf8d052..69f1ffe1ef49 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -117,24 +117,24 @@ void ScTabView::Init() /* #i97900# scrollbars remain in correct RTL mode, needed mirroring etc. is now handled correctly at the respective places. */ - // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist - // Show kommt dann aus UpdateShow beim ersten Resize + // Don't show anything here, because still in wrong order + // Show is received from UpdateShow during first resize // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom, // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter - // Splitter + // fragment pHSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) ); pVSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) ); - // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor + // UpdateShow is done during resize or a copy of an existing view from ctor pDrawActual = nullptr; pDrawOld = nullptr; - // DrawView darf nicht im TabView - ctor angelegt werden, - // wenn die ViewShell noch nicht konstruiert ist... - // Das gilt auch fuer ViewOptionsHasChanged() + // DrawView cannot be create in the TabView - ctor + // when the ViewShell isn't constructed yet... + // The also applies to ViewOptionsHasChanged() TestHintWindow(); } @@ -227,7 +227,7 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode ) if (!pDrawView) { ScDrawLayer* pLayer = aViewData.GetDocument()->GetDrawLayer(); - OSL_ENSURE(pLayer, "wo ist der Draw Layer ??"); + OSL_ENSURE(pLayer, "Where is the Draw Layer ??"); sal_uInt16 i; pDrawView = new ScDrawView( pGridWin[SC_SPLIT_BOTTOMLEFT], &aViewData ); @@ -243,8 +243,8 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode ) { pGridWin[i]->SetMapMode(pGridWin[i]->GetDrawMapMode()); - pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage), - // damit gleich gezeichnet werden kann + pGridWin[i]->Update(); // because of Invalidate in DrawView ctor (ShowPage), + // so that immediately can be drawn } SfxRequest aSfxRequest(SID_OBJECT_SELECT, SfxCallMode::SLOT, aViewData.GetViewShell()->GetPool()); SetDrawFuncPtr(new FuSelection( aViewData.GetViewShell(), GetActiveWin(), pDrawView, @@ -255,7 +255,7 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode ) if ( nForceDesignMode != TRISTATE_INDET ) pDrawView->SetDesignMode( nForceDesignMode ); - // an der FormShell anmelden + // register at FormShell FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) pFormSh->SetView(pDrawView); @@ -280,7 +280,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) { if (pDrawView) { - DrawDeselectAll(); // beendet auch Text-Edit-Modus + DrawDeselectAll(); // end also text edit mode SCTAB nTab = aViewData.GetTabNo(); pDrawView->HideSdrPage(); @@ -289,13 +289,13 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) UpdateLayerLocks(); pDrawView->RecalcScale(); - pDrawView->UpdateWorkArea(); // PageSize ist pro Page unterschiedlich + pDrawView->UpdateWorkArea(); // PageSize is different per page } SfxBindings& rBindings = aViewData.GetBindings(); - // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren - // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles... + // There is no easy way to invalidate all slots of the FormShell + // (for disabled slots on protected tables), therefore simply everything... rBindings.InvalidateAll(false); if (aViewData.GetViewShell()->HasAccessibilityObjects()) @@ -462,7 +462,7 @@ void ScTabView::ViewOptionsHasChanged( bool bHScrollChanged, bool bGraphicsChang } } -// Helper-Funktion gegen das Include des Drawing Layers +// helper function against including the drawing layer void ScTabView::DrawMarkListHasChanged() { diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 494290092b42..69e4347118f5 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -215,7 +215,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) switch (nNewId) { case SID_OBJECT_SELECT: - // Nicht immer zurueckschalten + // not always switch back if(pView->GetMarkedObjectList().GetMarkCount() == 0) SetDrawShell(bEx); pTabView->SetDrawFuncPtr(new FuSelection(this, pWin, pView, pDoc, aNewReq)); break; diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 456fe7f1e67d..4ff85c818642 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -43,13 +43,13 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - if (const ScPaintHint* pPaintHint = dynamic_cast<const ScPaintHint*>(&rHint)) // neu zeichnen + if (const ScPaintHint* pPaintHint = dynamic_cast<const ScPaintHint*>(&rHint)) // draw new { PaintPartFlags nParts = pPaintHint->GetParts(); SCTAB nTab = GetViewData().GetTabNo(); if (pPaintHint->GetStartTab() <= nTab && pPaintHint->GetEndTab() >= nTab) { - if (nParts & PaintPartFlags::Extras) // zuerst, falls Tabelle weg ist !!! + if (nParts & PaintPartFlags::Extras) // first if table vanished !!! if (PaintExtras()) nParts = PaintPartFlags::All; @@ -77,9 +77,9 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) HideNoteMarker(); } } - else if (dynamic_cast<const ScEditViewHint*>(&rHint)) // Edit-View anlegen + else if (dynamic_cast<const ScEditViewHint*>(&rHint)) // create Edit-View { - // ScEditViewHint kommt nur an aktiver View an + // ScEditViewHint is only received at active view const ScEditViewHint* pHint = static_cast<const ScEditViewHint*>(&rHint); SCTAB nTab = GetViewData().GetTabNo(); @@ -92,25 +92,25 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) MakeEditView( pHint->GetEngine(), nCol, nRow ); - StopEditShell(); // sollte nicht gesetzt sein + StopEditShell(); // shouldn't be set ScSplitPos eActive = GetViewData().GetActivePart(); if ( GetViewData().HasEditView(eActive) ) { - // MakeEditView geht schief, wenn der Cursor ausserhalb des - // Bildschirms steht. GetEditView gibt dann eine nicht aktive - // View zurueck, darum die Abfrage HasEditView. + // MakeEditView will fail, if the cursor is outside the screen. + // Then GetEditView will return a none-active view, therefore + // calling HasEditView. - EditView* pView = GetViewData().GetEditView(eActive); // ist nicht 0 + EditView* pView = GetViewData().GetEditView(eActive); // isn't zero SetEditShell(pView, true); } } } } - else if (dynamic_cast<const ScTablesHint*>(&rHint)) // Tabelle eingefuegt / geloescht + else if (dynamic_cast<const ScTablesHint*>(&rHint)) // table insert / deleted { - // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden) + // first fetch current table (can be changed during DeleteTab on ViewData) SCTAB nActiveTab = GetViewData().GetTabNo(); const ScTablesHint& rTabHint = static_cast<const ScTablesHint&>(rHint); @@ -143,43 +143,43 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) OSL_FAIL("unknown ScTablesHint"); } - // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen - // kann und dann auch die aktive View umgeschaltet werden muss. + // No calling of IsActive() here, because the actions can be coming from Basic + // and then also the active view has to be switched. SCTAB nNewTab = nActiveTab; bool bStayOnActiveTab = true; switch (nId) { case SC_TAB_INSERTED: - if ( nTab1 <= nNewTab ) // vorher eingefuegt + if ( nTab1 <= nNewTab ) // insert before ++nNewTab; break; case SC_TAB_DELETED: - if ( nTab1 < nNewTab ) // vorher geloescht + if ( nTab1 < nNewTab ) // deleted before --nNewTab; - else if ( nTab1 == nNewTab ) // aktuelle geloescht + else if ( nTab1 == nNewTab ) // deleted current bStayOnActiveTab = false; break; case SC_TAB_MOVED: - if ( nNewTab == nTab1 ) // verschobene Tabelle + if ( nNewTab == nTab1 ) // moved table nNewTab = nTab2; - else if ( nTab1 < nTab2 ) // nach hinten verschoben + else if ( nTab1 < nTab2 ) // moved back { - if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich + if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // succeeding area --nNewTab; } - else // nach vorne verschoben + else // move in front { - if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich + if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // succeeding area ++nNewTab; } break; case SC_TAB_COPIED: - if ( nNewTab >= nTab2 ) // vorher eingefuegt + if ( nNewTab >= nTab2 ) // insert before ++nNewTab; break; case SC_TAB_HIDDEN: - if ( nTab1 == nNewTab ) // aktuelle ausgeblendet + if ( nTab1 == nNewTab ) // current is hidden bStayOnActiveTab = false; break; case SC_TABS_INSERTED: @@ -211,7 +211,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) default: break; } } - else // ohne Parameter + else // without parameter { const SfxHintId nSlot = rHint.GetId(); switch ( nSlot ) @@ -262,25 +262,25 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) case SfxHintId::ScDocSaved: { - // beim "Save as" kann ein vorher schreibgeschuetztes Dokument - // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#) - // (Invalidate etc. passiert schon vom Sfx her) - // bei SID_EDITDOC kommt kein SfxHintId::TitleChanged, darum - // der eigene Hint aus DoSaveCompleted - //! was ist mit SfxHintId::SAVECOMPLETED ? + // "Save as" can make a write-protected document writable, + // therefore the Layer-Locks anew (#39884#) + // (Invalidate etc. is happing already from Sfx) + // by SID_EDITDOC no SfxHintId::TitleChanged will occur, that + // is why the own hint from DoSaveCompleted + //! what is with SfxHintId::SAVECOMPLETED ? UpdateLayerLocks(); - // Design-Modus bei jedem Speichern anzupassen, waere zuviel - // (beim Speichern unter gleichem Namen soll er unveraendert bleiben) - // Darum nur bei SfxHintId::ModeChanged (vom ViewFrame) + // Would be too much to change Design-Mode with every save + // (when saving under the name, it should remain unchanged) + // Therefore only by SfxHintId::ModeChanged (from ViewFrame) } break; case SfxHintId::ModeChanged: - // Da man sich nicht mehr darauf verlassen kann, woher - // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der - // ReadOnly-Status sich wirklich geaendert hat: + // Since you can no longer rely on it where this hint was coming + // from, always switch the design mode when the ReadOnly state + // really was changed: if ( GetViewData().GetSfxDocShell()->IsReadOnly() != bReadOnly ) { |