translations of comments from german to english Committer: Winfried Donkers <osc@dci-electronics.nl> On branch master Changes to be committed: modified: sc/source/ui/view/auditsh.cxx modified: sc/source/ui/view/colrowba.cxx modified: sc/source/ui/view/dbfunc.cxx modified: sc/source/ui/view/viewfunc.cxx

4 files changed, 28 insertions, 30 deletions

diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 364c412160db..baf6001a55fa 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -119,7 +119,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
                       && pReqArgs->GetItemState( SID_RANGE_ROW, sal_True, &pYItem ) == SFX_ITEM_SET )
                     {
                         OSL_ENSURE( pXItem->ISA(SfxInt16Item) && pYItem->ISA(SfxInt32Item),
-                                        "falsche Items" );
+                                        "wrong items" );
                         SCsCOL nCol = static_cast<SCsCOL>(((const SfxInt16Item*) pXItem)->GetValue());
                         SCsROW nRow = static_cast<SCsROW>(((const SfxInt32Item*) pYItem)->GetValue());
                         ScViewFunc* pView = pViewData->GetView();
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 0f24a98e2bf4..83c5ab9dc829 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -185,7 +185,7 @@ void ScColBar::SelectWindow()
 {
     ScTabViewShell* pViewSh = pViewData->GetViewShell();
 
-    pViewSh->SetActive();           // Appear und SetViewFrame
+    pViewSh->SetActive();           // Appear and SetViewFrame
     pViewSh->DrawDeselectAll();
 
     ScSplitPos eActive = pViewData->GetActivePart();
@@ -350,7 +350,7 @@ void ScRowBar::SelectWindow()
 {
     ScTabViewShell* pViewSh = pViewData->GetViewShell();
 
-    pViewSh->SetActive();           // Appear und SetViewFrame
+    pViewSh->SetActive();           // Appear and SetViewFrame
     pViewSh->DrawDeselectAll();
 
     ScSplitPos eActive = pViewData->GetActivePart();
@@ -398,9 +398,7 @@ String ScRowBar::GetDragHelp( long nVal )
     return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) );
 }
 
-//  GetHiddenCount ist nur fuer Zeilen ueberladen
-
-SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )
+SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )   // overloaded only for rows
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 2498fa3f9a2a..b1e6a75cef7d 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -64,7 +64,7 @@ ScDBFunc::~ScDBFunc()
 }
 
 //
-//      Hilfsfunktionen
+//      auxiliary functions
 //
 
 void ScDBFunc::GotoDBArea( const ::rtl::OUString& rDBName )
@@ -92,7 +92,7 @@ void ScDBFunc::GotoDBArea( const ::rtl::OUString& rDBName )
     }
 }
 
-//  aktuellen Datenbereich fuer Sortieren / Filtern suchen
+//  get actual datarange for sort / filter search
 
 ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, ScGetDBSelection eSel )
 {
@@ -210,7 +210,7 @@ ScDBData* ScDBFunc::GetAnonymousDBData()
     return pDocSh->GetAnonymousDBData(aRange);
 }
 
-//  Datenbankbereiche aendern (Dialog)
+//  change database range (dialog)
 
 void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std::vector<ScRange> &rDelAreaList )
 {
@@ -226,7 +226,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std::
     std::vector<ScRange>::const_iterator iter;
     for (iter = rDelAreaList.begin(); iter != rDelAreaList.end(); ++iter)
     {
-        //  Targets am SBA abmelden nicht mehr noetig
+        //  register target in SBA no longer necessary
         const ScAddress& rStart = iter->aStart;
         const ScAddress& rEnd   = iter->aEnd;
         pDocShell->DBAreaDeleted( rStart.Tab(),
@@ -238,7 +238,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std::
     if (bRecord)
         pUndoColl = new ScDBCollection( *pOldColl );
 
-    //  neue Targets am SBA anmelden nicht mehr noetig
+    //  register target in SBA no longer necessary
 
     pDoc->CompileDBFormula( sal_True );     // CreateFormulaString
     pDoc->SetDBCollection( new ScDBCollection( rNewColl ) );
@@ -257,10 +257,10 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std::
 }
 
 //
-//      wirkliche Funktionen
+//      main functions
 //
 
-// Sortieren
+// Sort
 
 void ScDBFunc::UISort( const ScSortParam& rSortParam, sal_Bool bRecord )
 {
@@ -271,7 +271,7 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, sal_Bool bRecord )
                                                     rSortParam.nCol2, rSortParam.nRow2 );
     if (!pDBData)
     {
-        OSL_FAIL( "Sort: keine DBData" );
+        OSL_FAIL( "Sort: no DBData" );
         return;
     }
 
@@ -279,13 +279,13 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, sal_Bool bRecord )
     pDBData->GetSubTotalParam( aSubTotalParam );
     if (aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly)
     {
-        //  Subtotals wiederholen, mit neuer Sortierung
+        //  repeat subtotals, with new sortorder
 
         DoSubTotals( aSubTotalParam, bRecord, &rSortParam );
     }
     else
     {
-        Sort( rSortParam, bRecord );        // nur sortieren
+        Sort( rSortParam, bRecord );        // just sort
     }
 }
 
@@ -297,7 +297,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, sal_Bool bRecord, sal_Bool b
     sal_Bool bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, false );
     if ( bSuccess && !rSortParam.bInplace )
     {
-        //  Ziel markieren
+        //  mark target
         ScRange aDestRange( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab,
                             rSortParam.nDestCol + rSortParam.nCol2 - rSortParam.nCol1,
                             rSortParam.nDestRow + rSortParam.nRow2 - rSortParam.nRow1,
@@ -306,7 +306,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, sal_Bool bRecord, sal_Bool b
     }
 }
 
-//  Filtern
+//  filters
 
 void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, sal_Bool bRecord )
 {
@@ -320,7 +320,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource
         sal_Bool bCopy = !rQueryParam.bInplace;
         if (bCopy)
         {
-            //  Zielbereich markieren (DB-Bereich wurde ggf. angelegt)
+            //  mark target range (data base  range has been set up if applicable)
             ScDocument* pDoc = pDocSh->GetDocument();
             ScDBData* pDestData = pDoc->GetDBAtCursor(
                                             rQueryParam.nDestCol, rQueryParam.nDestRow,
@@ -343,7 +343,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource
     }
 }
 
-//  Autofilter-Knoepfe ein-/ausblenden
+//  autofilter-buttons show / hide
 
 void ScDBFunc::ToggleAutoFilter()
 {
@@ -354,7 +354,7 @@ void ScDBFunc::ToggleAutoFilter()
     ScDocument*     pDoc    = GetViewData()->GetDocument();
     ScDBData*       pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN);
 
-    pDBData->SetByRow( sal_True );              //! Undo, vorher abfragen ??
+    pDBData->SetByRow( sal_True );              //! undo, retrieve beforehand ??
     pDBData->GetQueryParam( aParam );
 
 
@@ -366,7 +366,7 @@ void ScDBFunc::ToggleAutoFilter()
     sal_Bool    bHeader  = pDBData->HasHeader();
     sal_Bool    bPaint   = false;
 
-    //!     stattdessen aus DB-Bereich abfragen?
+    //!     instead retrieve from DB-range?
 
     for (nCol=aParam.nCol1; nCol<=aParam.nCol2 && bHasAuto; nCol++)
     {
@@ -377,9 +377,9 @@ void ScDBFunc::ToggleAutoFilter()
             bHasAuto = false;
     }
 
-    if (bHasAuto)                               // aufheben
+    if (bHasAuto)                               // remove
     {
-        //  Filterknoepfe ausblenden
+        //  hide filter buttons
 
         for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++)
         {
@@ -400,7 +400,7 @@ void ScDBFunc::ToggleAutoFilter()
 
         pDBData->SetAutoFilter(false);
 
-        //  Filter aufheben (incl. Paint / Undo)
+        //  remove filter (incl. Paint / Undo)
 
         SCSIZE nEC = aParam.GetEntryCount();
         for (SCSIZE i=0; i<nEC; i++)
@@ -412,7 +412,7 @@ void ScDBFunc::ToggleAutoFilter()
 
         bPaint = sal_True;
     }
-    else                                    // Filterknoepfe einblenden
+    else                                    // show filter buttons
     {
         if ( !pDoc->IsBlockEmpty( nTab,
                                   aParam.nCol1, aParam.nRow1,
@@ -422,7 +422,7 @@ void ScDBFunc::ToggleAutoFilter()
             {
                 if ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                         ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),       // "StarCalc"
-                        ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 )     // Koepfe aus erster Zeile?
+                        ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 )     // header from first cell?
                     ).Execute() == RET_YES )
                 {
                     pDBData->SetHeader( sal_True );     //! Undo ??
@@ -465,7 +465,7 @@ void ScDBFunc::ToggleAutoFilter()
     }
 }
 
-//      nur ausblenden, keine Daten veraendern
+//      just hide, no data change
 
 void ScDBFunc::HideAutoFilter()
 {
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 441136257c93..cb767b79a505 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2769,7 +2769,7 @@ void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
     const SvNumberformat* pOldEntry = pFormatter->GetEntry( nOldFormat );
     if (!pOldEntry)
     {
-        OSL_FAIL("Zahlformat nicht gefunden !!!");
+        OSL_FAIL("numberformat not found !!!");
         return;
     }
 
@@ -2850,7 +2850,7 @@ void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
             short nNewType = 0;
             sal_Bool bOk = pFormatter->PutEntry( aNewPicture, nErrPos,
                                                 nNewType, nNewFormat, eLanguage );
-            OSL_ENSURE( bOk, "falsches Zahlformat generiert" );
+            OSL_ENSURE( bOk, "incorrect numberformat generated" );
             if (!bOk)
                 bError = sal_True;
         }