Translation of comments from german in sc/source/ui/undo

Change-Id: Ic7f2233ae55f8c5505c5b325aef973b0d0c65730
Reviewed-on: https://gerrit.libreoffice.org/479Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

sc/source/ui/undo/refundo.cxx

@@ -52,9 +52,9 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
     ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName();          //! const
     pRangeName = pOldRanges ? new ScRangeName(*pOldRanges) : NULL;
 
-    pPrintRanges = pDoc->CreatePrintRangeSaver();       // neu erzeugt
+    pPrintRanges = pDoc->CreatePrintRangeSaver();       // recreated
 
-    //! bei Pivot nur Bereiche merken ???
+    //! for Pivot, just mark the range ???
 
     ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection();        //! const
     pDPCollection = pOldDP ? new ScDPCollection(*pOldDP) : NULL;
@@ -166,7 +166,7 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst )
     if (pDetOpList)
         pDoc->SetDetOpList( new ScDetOpList(*pDetOpList) );
 
-    // bUndoRefFirst ist bSetChartRangeLists
+    // bUndoRefFirst is bSetChartRangeLists
     if ( pChartListenerCollection )
         pDoc->SetChartListenerCollection( new ScChartListenerCollection(
             *pChartListenerCollection ), bUndoRefFirst );
@@ -174,7 +174,7 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst )
     if (pDBCollection || pRangeName)
     {
         sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
-        pDoc->SetAutoCalc( false ); // Mehrfachberechnungen vermeiden
+        pDoc->SetAutoCalc( false ); // Avoid multiple calculations
         pDoc->CompileAll();
         pDoc->SetDirty();
         pDoc->SetAutoCalc( bOldAutoCalc );

sc/source/ui/undo/undobase.cxx

@@ -77,17 +77,17 @@ bool ScSimpleUndo::SetViewMarkData( const ScMarkData& rMarkData )
 
 sal_Bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
 {
-    //  Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren
-    //  der Detektiv-Pfeile gehoeren.
-    //  DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in
-    //  eine ScUndoDraw Action verpackt.
-    //  Nur beim automatischen Aktualisieren wird AddUndoAction mit
-    //  bTryMerg=sal_True gerufen.
+    // A SdrUndoGroup for the updating of detective arrows can belong
+    // to each Undo-Action.
+    // DetectiveRefresh is always called next,
+    // the SdrUndoGroup is packaged in a ScUndoDraw action.
+    // AddUndoAction is only called with bTryMerg=sal_True
+    // for automatic update.
 
     if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) )
     {
-        //  SdrUndoAction aus der ScUndoDraw Action uebernehmen,
-        //  ScUndoDraw wird dann vom UndoManager geloescht
+        // SdrUndoAction is aquired from ScUndoDraw Action,
+        // ScUndoDraw is then deleted by the UndoManager
 
         ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction;
         pDetectiveUndo = pCalcUndo->GetDrawUndo();
@@ -104,7 +104,7 @@ void ScSimpleUndo::BeginUndo()
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->HideAllCursors();       // z.B. wegen zusammengefassten Zellen
+        pViewShell->HideAllCursors();       // for example due to merged cells
 
     //  detective updates happened last, must be undone first
     if (pDetectiveUndo)
@@ -128,11 +128,11 @@ void ScSimpleUndo::EndUndo()
 
 void ScSimpleUndo::BeginRedo()
 {
-    pDocShell->SetInUndo( sal_True );   //! eigenes Flag fuer Redo?
+    pDocShell->SetInUndo( sal_True );   //! own Flag for Redo?
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->HideAllCursors();       // z.B. wegen zusammengefassten Zellen
+        pViewShell->HideAllCursors();       // for example due to merged cells
 }
 
 void ScSimpleUndo::EndRedo()
@@ -168,8 +168,8 @@ void ScSimpleUndo::ShowTable( const ScRange& rRange )
         SCTAB nStart = rRange.aStart.Tab();
         SCTAB nEnd   = rRange.aEnd.Tab();
         SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
-        if ( nTab < nStart || nTab > nEnd )                     // wenn nicht im Bereich:
-            pViewShell->SetTabNo( nStart );                     // auf erste des Bereiches
+        if ( nTab < nStart || nTab > nEnd )                     // when not in range:
+            pViewShell->SetTabNo( nStart );                     // at beginning of the range
     }
 }
 
@@ -236,7 +236,7 @@ sal_Bool ScBlockUndo::AdjustHeight()
     }
     else
     {
-        //  Zoom auf 100 lassen
+        // Leave zoom at 100
         nPPTX = ScGlobal::nScreenPPTX;
         nPPTY = ScGlobal::nScreenPPTY;
     }
@@ -261,7 +261,7 @@ void ScBlockUndo::ShowBlock()
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
-        ShowTable( aBlockRange );       // bei mehreren Tabs im Range ist jede davon gut
+        ShowTable( aBlockRange );       // with multiple sheets in range each of them is good
         pViewShell->MoveCursorAbs( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
                                    SC_FOLLOW_JUMP, false, false );
         SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
@@ -270,7 +270,7 @@ void ScBlockUndo::ShowBlock()
         aRange.aEnd.SetTab( nTab );
         pViewShell->MarkRange( aRange );
 
-        //  nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint
+        // not through SetMarkArea to Mark Data, due to possible lacking paint
     }
 }
 
@@ -334,7 +334,7 @@ void ScMultiBlockUndo::AdjustHeight()
     }
     else
     {
-        //  Zoom auf 100 lassen
+        // Leave zoom at 100
         nPPTX = ScGlobal::nScreenPPTX;
         nPPTY = ScGlobal::nScreenPPTY;
     }
@@ -413,9 +413,9 @@ void ScMoveUndo::UndoRef()
     pRefUndoDoc->CopyToDocument( aRange, IDF_FORMULA, false, pDoc, NULL, false );
     if (pRefUndoData)
         pRefUndoData->DoUndo( pDoc, (eMode == SC_UNDO_REFFIRST) );
-        // HACK: ScDragDropUndo ist der einzige mit REFFIRST.
-        // Falls nicht, resultiert daraus evtl. ein zu haeufiges Anpassen
-        // der ChartRefs, nicht schoen, aber auch nicht schlecht..
+        // HACK: ScDragDropUndo is the only one with REFFIRST.
+        // If not, results possibly in a too frequent adjustment
+        // of ChartRefs not that pretty, but not too bad either..
 }
 
 void ScMoveUndo::BeginUndo()

sc/source/ui/undo/undoblk2.cxx

@@ -37,7 +37,7 @@
 #include "global.hxx"
 #include "target.hxx"
 
-#include "undoolk.hxx"              //! GetUndo ins Document verschieben!
+#include "undoolk.hxx"              //! shift GetUndo in the Document
 
 
 // STATIC DATA -----------------------------------------------------------
@@ -46,12 +46,7 @@ TYPEINIT1(ScUndoWidthOrHeight,      SfxUndoAction);
 
 // -----------------------------------------------------------------------
 
-
-
-//
-//      Spaltenbreiten oder Zeilenhoehen aendern
-//
-
+/** Change column widths or row heights */
 ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
                 const ScMarkData& rMark,
                 SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd, SCTAB nNewEndTab,
@@ -86,7 +81,7 @@ ScUndoWidthOrHeight::~ScUndoWidthOrHeight()
 
 rtl::OUString ScUndoWidthOrHeight::GetComment() const
 {
-    // [ "optimale " ] "Spaltenbreite" | "Zeilenhoehe"
+    // [ "optimal " ] "Column width" | "row height"
     return ( bWidth ?
         ( ( eMode == SC_SIZE_OPTIMAL )?
         ScGlobal::GetRscString( STR_UNDO_OPTCOLWIDTH ) :
@@ -113,7 +108,7 @@ void ScUndoWidthOrHeight::Undo()
     }
 
     //! outlines from all tables?
-    if (pUndoTab)                                           // Outlines mit gespeichert?
+    if (pUndoTab)                                           // Outlines are included when saving ?
         pDoc->SetOutlineTable( nStartTab, pUndoTab );
 
     SCTAB nTabCount = pDoc->GetTableCount();
@@ -170,7 +165,7 @@ void ScUndoWidthOrHeight::Redo()
         if ( nTab < nStartTab || nTab > nEndTab )
             pViewShell->SetTabNo( nStartTab );
 
-        // SetWidthOrHeight aendert aktuelle Tabelle !
+        // SetWidthOrHeigt changes current sheet !
         pViewShell->SetWidthOrHeight( bWidth, nRangeCnt, pRanges, eMode, nNewSize, false, true, &aMarkData );
     }
 

sc/source/ui/undo/undocell.cxx

@@ -69,12 +69,6 @@ TYPEINIT1(ScUndoShowHideNote, ScSimpleUndo);
 TYPEINIT1(ScUndoDetective, ScSimpleUndo);
 TYPEINIT1(ScUndoRangeNames, ScSimpleUndo);
 
-
-// -----------------------------------------------------------------------
-//
-//      Attribute auf Cursor anwenden
-//
-
 ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
             const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
@@ -103,7 +97,7 @@ ScUndoCursorAttr::~ScUndoCursorAttr()
 
 rtl::OUString ScUndoCursorAttr::GetComment() const
 {
-    //! eigener Text fuer automatische Attributierung
+    //! own text for automatic attribution
 
     sal_uInt16 nId = STR_UNDO_CURSORATTR;        // "Attribute"
     return ScGlobal::GetRscString( nId );
@@ -153,8 +147,8 @@ void ScUndoCursorAttr::Undo()
 
     if ( bIsAutomatic )
     {
-        //  wenn automatische Formatierung rueckgaengig gemacht wird,
-        //  soll auch nicht weiter automatisch formatiert werden:
+        // if automatic formatting is reversed, then
+        // automatic formatting should also not continue to be done
 
         ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
         if (pViewShell)
@@ -183,11 +177,6 @@ sal_Bool ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
 }
 
 
-// -----------------------------------------------------------------------
-//
-//      Daten eingeben
-//
-
 ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell,
             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
             SCTAB nNewCount, SCTAB* pNewTabs, ScBaseCell** ppOldData,
@@ -224,13 +213,13 @@ ScUndoEnterData::~ScUndoEnterData()
 
 rtl::OUString ScUndoEnterData::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
+    return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
 }
 
 void ScUndoEnterData::DoChange() const
 {
-    //  Zeilenhoehe anpassen
-    //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ??
+    // Adjust row height
+    //! only when needed (old or new Edit cell, or Attribute) ??
     for (sal_uInt16 i=0; i<nCount; i++)
         pDocShell->AdjustRowHeight( nRow, nRow, pTabs[i] );
 
@@ -263,7 +252,7 @@ void ScUndoEnterData::SetChangeTrack()
             pChangeTrack->AppendContent( aPos, ppOldCells[i], nFormat );
         }
         if ( nEndChangeAction > pChangeTrack->GetActionMax() )
-            nEndChangeAction = 0;       // nichts appended
+            nEndChangeAction = 0;       // nothing is appended
     }
     else
         nEndChangeAction = 0;
@@ -362,11 +351,6 @@ sal_Bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const
 }
 
 
-// -----------------------------------------------------------------------
-//
-//      Wert aendern
-//
-
 ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
                                     ScBaseCell* pUndoCell, double nVal, sal_Bool bHeight ) :
     ScSimpleUndo( pNewDocShell ),
@@ -386,7 +370,7 @@ ScUndoEnterValue::~ScUndoEnterValue()
 
 rtl::OUString ScUndoEnterValue::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
+    return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
 }
 
 void ScUndoEnterValue::SetChangeTrack()
@@ -398,7 +382,7 @@ void ScUndoEnterValue::SetChangeTrack()
         nEndChangeAction = pChangeTrack->GetActionMax() + 1;
         pChangeTrack->AppendContent( aPos, pOldCell );
         if ( nEndChangeAction > pChangeTrack->GetActionMax() )
-            nEndChangeAction = 0;       // nichts appended
+            nEndChangeAction = 0;       // nothing is appended
     }
     else
         nEndChangeAction = 0;
@@ -437,7 +421,7 @@ void ScUndoEnterValue::Redo()
 
 void ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  gippsnich
+    // makes no sense
 }
 
 sal_Bool ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -446,11 +430,6 @@ sal_Bool ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 }
 
 
-// -----------------------------------------------------------------------
-//
-//      Beliebige Zelle eingeben
-//
-
 ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
                             ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, sal_Bool bHeight ) :
     ScSimpleUndo( pNewDocShell ),
@@ -472,7 +451,7 @@ ScUndoPutCell::~ScUndoPutCell()
 
 rtl::OUString ScUndoPutCell::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Eingabe"
+    return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
 }
 
 void ScUndoPutCell::SetChangeTrack()
@@ -484,7 +463,7 @@ void ScUndoPutCell::SetChangeTrack()
         nEndChangeAction = pChangeTrack->GetActionMax() + 1;
         pChangeTrack->AppendContent( aPos, pOldCell );
         if ( nEndChangeAction > pChangeTrack->GetActionMax() )
-            nEndChangeAction = 0;       // nichts appended
+            nEndChangeAction = 0;       // Nothing is appended
     }
     else
         nEndChangeAction = 0;
@@ -526,7 +505,7 @@ void ScUndoPutCell::Redo()
 
 void ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  gippsnich
+    // makes no sense
 }
 
 sal_Bool ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -535,11 +514,6 @@ sal_Bool ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 }
 
 
-// -----------------------------------------------------------------------
-//
-//      Seitenumbrueche
-//
-
 ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
             sal_Bool bNewColumn, sal_Bool bNewInsert ) :
@@ -558,7 +532,7 @@ ScUndoPageBreak::~ScUndoPageBreak()
 
 rtl::OUString ScUndoPageBreak::GetComment() const
 {
-    //"Spaltenumbruch" | "Zeilenumbruch"  "einfuegen" | "loeschen"
+    //"Column break" | "Row break"  "insert" | "delete"
     return String ( bColumn ?
         ( bInsert ?
             ScGlobal::GetRscString( STR_UNDO_INSCOLBREAK ) :
@@ -620,10 +594,6 @@ sal_Bool ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
     return (rTarget.ISA(ScTabViewTarget));
 }
 
-// -----------------------------------------------------------------------
-//
-//      Druck-Skalierung
-//
 
 ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell,
             SCTAB nT, sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP ) :
@@ -696,11 +666,6 @@ sal_Bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const
 }
 
 
-// -----------------------------------------------------------------------
-//
-//      Thesaurus
-//
-
 ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell,
                                   SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                                   const String& rNewUndoStr, const EditTextObject* pUndoTObj,
@@ -743,7 +708,7 @@ void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell )
         nEndChangeAction = pChangeTrack->GetActionMax() + 1;
         pChangeTrack->AppendContent( ScAddress( nCol, nRow, nTab ), pOldCell );
         if ( nEndChangeAction > pChangeTrack->GetActionMax() )
-            nEndChangeAction = 0;       // nichts appended
+            nEndChangeAction = 0;       // nothing is appended
     }
     else
         nEndChangeAction = 0;
@@ -776,7 +741,7 @@ void ScUndoThesaurus::DoChange( sal_Bool bUndo, const String& rStr,
             }
             else
             {
-                OSL_FAIL("Nicht CELLTYPE_EDIT bei Un/RedoThesaurus");
+                OSL_FAIL("Not CELLTYPE_EDIT for Un/RedoThesaurus");
             }
         }
     }
@@ -965,11 +930,6 @@ rtl::OUString ScUndoShowHideNote::GetComment() const
 
 // ============================================================================
 
-// -----------------------------------------------------------------------
-//
-//      Detektiv
-//
-
 ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell,
                                     SdrUndoAction* pDraw, const ScDetOpData* pOperation,
                                     ScDetOpList* pUndoList ) :
@@ -1023,7 +983,7 @@ void ScUndoDetective::Undo()
     }
     else
     {
-        //  Eintrag aus der Liste loeschen
+        // Delete entry from list
 
         ScDetOpList* pList = pDoc->GetDetOpList();
         if (pList && pList->Count())
@@ -1034,7 +994,7 @@ void ScUndoDetective::Undo()
                 rVec.erase( it);
             else
             {
-                OSL_FAIL("Detektiv-Eintrag in der Liste nicht gefunden");
+                OSL_FAIL("Detective entry in the list, not found");
             }
         }
     }
@@ -1068,7 +1028,7 @@ void ScUndoDetective::Redo()
 
 void ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  hammanich
+    // makes no sense
 }
 
 sal_Bool ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1076,10 +1036,6 @@ sal_Bool ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
     return false;
 }
 
-// -----------------------------------------------------------------------
-//
-//      Benannte Bereiche
-//
 
 ScUndoRangeNames::ScUndoRangeNames( ScDocShell* pNewDocShell,
                                     ScRangeName* pOld, ScRangeName* pNew, SCTAB nTab ) :
@@ -1142,7 +1098,7 @@ void ScUndoRangeNames::Redo()
 
 void ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  hammanich
+    // makes no sense
 }
 
 sal_Bool ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const

sc/source/ui/undo/undodraw.cxx

@@ -52,7 +52,7 @@ ScUndoDraw::~ScUndoDraw()
 
 void ScUndoDraw::ForgetDrawUndo()
 {
-    pDrawUndo = NULL;   // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden)
+    pDrawUndo = NULL;   // do not delete (DrawUndo has to be set from outside)
 }
 
 rtl::OUString ScUndoDraw::GetComment() const

sc/source/ui/undo/undoolk.cxx

@@ -31,7 +31,7 @@ SdrUndoAction* GetSdrUndoAction( ScDocument* pDoc )
 {
     ScDrawLayer* pLayer = pDoc->GetDrawLayer();
     if (pLayer)
-        return pLayer->GetCalcUndo();               // muss vorhanden sein
+        return pLayer->GetCalcUndo();               // must exist
     else
         return NULL;
 }