Hi,
This is just a small clean-up patch of files that I'm currently working on.
Regarding the translation effort I hope Christina is not working on
these particular files:
http://wiki.documentfoundation.org/Development/Easy_Hacks/Translation_Of_Comments
I've put her in copy of this email.
Haven't sent a patch for a while (to much code reading/head scratching) ;)
/Albert
From 69b99d26474ff686b93d8db77a3844b281a7765c Mon Sep 17 00:00:00 2001
From: Albert Thuswaldner <albert.thuswaldner@gmail.com>
Date: Tue, 21 Feb 2012 00:12:37 +0100
Subject: [PATCH] Clean-up and translation of German comments in ScTabPageSortFields
---
sc/source/ui/dbgui/tpsort.cxx | 45 ++++++++++++++++++----------------------
sc/source/ui/inc/tpsort.hxx | 30 ++++++++++++--------------
2 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6609563..aecb208 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -61,26 +61,26 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
/*
- * Da sich Einstellungen auf der zweiten TabPage (Optionen) auf
- * die erste TabPage auswirken, muss es die Moeglichkeit geben,
- * dies der jeweils anderen Seite mitzuteilen.
+ * Since the settings on the second Tab Page (Options) effects
+ * the first Tab Page, there must be a way for it to communicate with the
+ * other Page.
*
- * Im Moment wird dieses Problem ueber zwei Datenmember des TabDialoges
- * geloest. Wird eine Seite Aktiviert/Deaktiviert, so gleicht sie diese
- * Datenmember mit dem eigenen Zustand ab (->Activate()/Deactivate()).
+ * At the moment this problem is solved through using two data members of the
+ * Tab Pages. If a page is enabled / disabled, it compares this data member
+ * with its own state (-> Activate() / Deactivate()).
*
- * Die Klasse SfxTabPage bietet mittlerweile ein Verfahren an:
+ * In the meantime the class SfxTabPage offers the following method:
*
* virtual sal_Bool HasExchangeSupport() const; -> return sal_True;
* virtual void ActivatePage(const SfxItemSet &);
* virtual int DeactivatePage(SfxItemSet * = 0);
*
- * muss noch geaendert werden!
+ * This still needs to be changed!
*/
//========================================================================
//========================================================================
-// Sortierkriterien-Tabpage:
+// Sort Criteria Tab page
ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
const SfxItemSet& rArgSet )
@@ -183,7 +183,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
if ( aLbSort1.GetEntryCount() == 0 )
FillFieldLists();
- // Selektieren der ListBoxen:
+ // ListBox selection:
if ( rSortData.bDoSort[0] )
{
@@ -200,7 +200,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
}
else
{
- aSortLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren
+ aSortLbArr[i]->SelectEntryPos( 0 ); // Select none
aDirBtnArr[i][0]->Check(); // Up
}
}
@@ -261,7 +261,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
OSL_ENSURE( (nSort1Pos <= SC_MAXFIELDS)
&& (nSort2Pos <= SC_MAXFIELDS)
&& (nSort3Pos <= SC_MAXFIELDS),
- "Array-Range Fehler!" );
+ "Array range error!" );
if ( nSort1Pos == LISTBOX_ENTRY_NOTFOUND ) nSort1Pos = 0;
if ( nSort2Pos == LISTBOX_ENTRY_NOTFOUND ) nSort2Pos = 0;
@@ -273,10 +273,9 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData.bDoSort[1] = (nSort2Pos > 0);
theSortData.bDoSort[2] = (nSort3Pos > 0);
- // wenn auf Optionen-Seite "OK" gewaehlt wurde und
- // dabei die Sortierrichtung umgestellt wurde, so
- // wird das erste Feld der jeweiligen Richtung als
- // Sortierkriterium gewaehlt (steht in nFieldArr[0]):
+ // If the "OK" was selected on the Options page while the sort
+ // direction was changed, then the first field (i.e. nFieldArr[0])
+ // of the respective direction is chosen as the sorting criterion:
if ( bSortByRows != pDlg->GetByRows() )
{
theSortData.nField[0] =
@@ -295,7 +294,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData.bAscending[0] = aBtnUp1.IsChecked();
theSortData.bAscending[1] = aBtnUp2.IsChecked();
theSortData.bAscending[2] = aBtnUp3.IsChecked();
- // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
+ // bHasHeader is in ScTabPageSortOptions::FillItemSet, where it belongs
}
else
{
@@ -311,8 +310,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
-// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
-
+// for data exchange without dialogue detour: (still TODO!)
void ScTabPageSortFields::ActivatePage()
{
if ( pDlg )
@@ -518,7 +516,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
}
//========================================================================
-// Sortieroptionen-Tabpage:
+// Sort option Tab Page:
//========================================================================
ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
@@ -636,10 +634,7 @@ void ScTabPageSortOptions::Init()
aLbOutPos.SelectEntryPos( 0 );
aEdOutPos.SetText( EMPTY_STRING );
- /*
- * Ueberpruefen, ob es sich bei dem uebergebenen
- * Bereich um einen Datenbankbereich handelt:
- */
+ // Check whether the field that is passed on is a database field:
ScAddress aScAddress( rSortData.nCol1, rSortData.nRow1, nCurTab );
ScRange( aScAddress,
@@ -803,7 +798,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
-// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
+// for data exchange without dialogue detour: (still TODO!)
void ScTabPageSortOptions::ActivatePage()
{
if ( pDlg )
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 987f20b..8b87726 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -51,7 +51,7 @@ class ScSortDlg;
struct ScSortParam;
//========================================================================
-// Kriterien (Sort Criteria)
+// Sort Criteria
class ScTabPageSortFields : public SfxTabPage
{
@@ -62,11 +62,11 @@ public:
static SfxTabPage* Create ( Window* pParent,
const SfxItemSet& rArgSet );
- virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet );
+ virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet );
virtual void Reset ( const SfxItemSet& rArgSet );
protected:
-// fuer Datenaustausch (sollte noch umgestellt werden!)
+// for data exchange (TODO: should be changed!)
// virtual void ActivatePage ( const SfxItemSet& rSet );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
@@ -93,16 +93,16 @@ private:
String aStrColumn;
String aStrRow;
- const sal_uInt16 nWhichSort;
+ const sal_uInt16 nWhichSort;
ScSortDlg* pDlg;
ScViewData* pViewData;
const ScSortParam& rSortData;
SCCOLROW nFieldArr[SC_MAXFIELDS];
- sal_uInt16 nFieldCount;
+ sal_uInt16 nFieldCount;
SCCOL nFirstCol;
SCROW nFirstRow;
- sal_Bool bHasHeader;
- sal_Bool bSortByRows;
+ sal_Bool bHasHeader;
+ sal_Bool bSortByRows;
ListBox* aSortLbArr[3];
RadioButton* aDirBtnArr[3][2];
@@ -122,7 +122,7 @@ private:
};
//========================================================================
-// Sortieroptionen (Sort Options)
+// Sort Options
class ScDocument;
class ScRangeData;
@@ -140,11 +140,11 @@ public:
#define SfxTabPage ::SfxTabPage
static SfxTabPage* Create ( Window* pParent,
const SfxItemSet& rArgSet );
- virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet );
+ virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet );
virtual void Reset ( const SfxItemSet& rArgSet );
protected:
-// fuer Datenaustausch (sollte noch umgestellt werden!)
+// for data exchange (TODO: should be changed!)
// virtual void ActivatePage ( const SfxItemSet& rSet );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
@@ -174,14 +174,12 @@ private:
RadioButton aBtnTopDown;
RadioButton aBtnLeftRight;
-// FixedText aFtAreaLabel;
-// FixedInfo aFtArea;
- String aStrRowLabel;
- String aStrColLabel;
- String aStrUndefined;
+ String aStrRowLabel;
+ String aStrColLabel;
+ String aStrUndefined;
String aStrAreaLabel;
- const sal_uInt16 nWhichSort;
+ const sal_uInt16 nWhichSort;
const ScSortParam& rSortData;
ScViewData* pViewData;
ScDocument* pDoc;
--
1.7.3.4
Context
- [PATCH] Clean-up and translation of German comments in ScTabPageSortFields · Albert Thuswaldner
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.