[Libreoffice-commits] core.git: sc/source
Albert Thuswaldner
albert.thuswaldner at gmail.com
Thu Feb 12 01:56:46 PST 2015
sc/source/core/data/sortparam.cxx | 8 +++---
sc/source/core/data/stlpool.cxx | 40 +++++++++++++++++-----------------
sc/source/core/data/stlsheet.cxx | 29 ++++++++++++------------
sc/source/core/data/subtotalparam.cxx | 2 -
4 files changed, 40 insertions(+), 39 deletions(-)
New commits:
commit 7da33e8c5396f324a2427536138d84b8b032e24e
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Sun Feb 8 21:19:19 2015 +0100
Translated german comments in sc/source/core/data/ #2
Change-Id: Ia8a0235b8acb5c76c195e280a75256f6b82684bb
Reviewed-on: https://gerrit.libreoffice.org/14372
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 235201d..b876577 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -94,7 +94,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
bool ScSortParam::operator==( const ScSortParam& rOther ) const
{
bool bEqual = false;
- // Anzahl der Sorts gleich?
+ // Number of Sorts the same?
sal_uInt16 nLast = 0;
sal_uInt16 nOtherLast = 0;
sal_uInt16 nSortSize = GetSortKeyCount();
@@ -156,7 +156,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
{
sal_uInt16 i;
- // zuerst die Gruppen aus den Teilergebnissen
+ // first the groups from the partial results
if (rSub.bDoSort)
for (i=0; i<MAXSUBTOTAL; i++)
if (rSub.bGroupActive[i])
@@ -168,7 +168,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
maKeyState.push_back(key);
}
- // dann dahinter die alten Einstellungen
+ // then the old settings
for (i=0; i < rOld.GetSortKeyCount(); i++)
if (rOld.maKeyState[i].bDoSort)
{
@@ -177,7 +177,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
for (sal_uInt16 j = 0; j < GetSortKeyCount(); j++)
if ( maKeyState[j].nField == nThisField )
bDouble = true;
- if (!bDouble) // ein Feld nicht zweimal eintragen
+ if (!bDouble) // do not enter a field twice
{
ScSortKeyState key;
key.bDoSort = true;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index a7dfe9c..fce5fa1 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -129,7 +129,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
const OUString& rName, SfxStyleFamily eFamily )
{
- // this ist Dest-Pool
+ // this is the Dest-Pool
SfxStyleSheetBase* pStyleSheet = pSrcPool->Find( rName, eFamily );
if (pStyleSheet)
@@ -180,13 +180,13 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
}
}
-// Standard-Vorlagen
+// Standard templates
#define SCSTR(id) ScGlobal::GetRscString(id)
void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool )
{
- // Default-Styles kopieren
+ // Copy Default styles
CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA );
CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA );
@@ -214,13 +214,13 @@ static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFon
void ScStyleSheetPool::CreateStandardStyles()
{
- // neue Eintraege auch bei CopyStdStylesFrom eintragen
+ // Add new entries even for CopyStdStylesFrom
Color aColBlack ( COL_BLACK );
Color aColGrey ( COL_LIGHTGRAY );
OUString aStr;
sal_Int32 nStrLen;
- OUString aHelpFile;//XXX JN welcher Text???
+ OUString aHelpFile;//which text???
SfxItemSet* pSet = NULL;
SfxItemSet* pHFSet = NULL;
SvxSetItem* pHFSetItem = NULL;
@@ -237,7 +237,7 @@ void ScStyleSheetPool::CreateStandardStyles()
OUString aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
- // Zellformatvorlagen:
+ // Cell format templates:
// 1. Standard
@@ -270,7 +270,7 @@ void ScStyleSheetPool::CreateStandardStyles()
// if ( eCtl == LANGUAGE_THAI )
// pSet->Put( SvxFontHeightItem( 300, 100, ATTR_CTL_FONT_HEIGHT ) ); // 15 pt
- // 2. Ergebnis
+ // 2. Result
pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_RESULT ),
SFX_STYLE_FAMILY_PARA,
@@ -282,7 +282,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) );
- // 3. Ergebnis1
+ // 3. Result1
pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_RESULT1 ),
SFX_STYLE_FAMILY_PARA,
@@ -291,7 +291,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) );
pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 );
- // 4. Ueberschrift
+ // 4. headline
pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_HEADLINE ),
SFX_STYLE_FAMILY_PARA,
@@ -316,7 +316,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet = &pSheet->GetItemSet();
pSet->Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) );
- // Seitenformat-Vorlagen:
+ // Page format template:
// 1. Standard
@@ -327,14 +327,14 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet = &pSheet->GetItemSet();
pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_PAGE_STD );
- // Abstand der Kopf-/Fusszeilen von der Tabelle
+ // distance to header/footer for the sheet
pHFSetItem = new SvxSetItem( static_cast<const SvxSetItem&>(pSet->Get( ATTR_PAGE_HEADERSET ) ) );
pSet->Put( *pHFSetItem, ATTR_PAGE_HEADERSET );
pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
DELETEZ( pHFSetItem );
- // Kopfzeile:
- // [leer][\TABELLE\][leer]
+ // Header:
+ // [empty][\sheet\][empty]
pEdEngine->SetText(EMPTY_OUSTRING);
pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() );
@@ -345,8 +345,8 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet->Put( *pHeaderItem );
DELETEZ( pTxtObj );
- // Fusszeile:
- // [leer][Seite \SEITE\][leer]
+ // Footer:
+ // [empty][Page \STR_PAGE\][empty]
aStr = SCSTR( STR_PAGE ) + " ";
pEdEngine->SetText( aStr );
@@ -367,7 +367,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet = &pSheet->GetItemSet();
pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_PAGE_REP );
- // Hintergrund und Umrandung
+ // Background and border
aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP );
aBoxItem.SetLine( &aBorderLine, BOX_LINE_BOTTOM );
aBoxItem.SetLine( &aBorderLine, BOX_LINE_LEFT );
@@ -391,8 +391,8 @@ void ScStyleSheetPool::CreateStandardStyles()
pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
DELETEZ( pHFSetItem );
- // Kopfzeile:
- // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\]
+ // Footer:
+ // [\TABLE\ (\DATA\)][empty][\DATE\, \TIME\]
aStr = " ()";
pEdEngine->SetText( aStr );
@@ -412,8 +412,8 @@ void ScStyleSheetPool::CreateStandardStyles()
DELETEZ( pTxtObj );
pSet->Put( *pHeaderItem );
- // Fusszeile:
- // [leer][Seite: \SEITE\ / \SEITEN\][leer]
+ // Footer:
+ // [empty][Page: \PAGE\ / \PAGE\][empty]
aStr = SCSTR( STR_PAGE ) + " ";
nStrLen = aStr.getLength();
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 552e5d6..30f397a 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -129,9 +129,9 @@ SfxItemSet& ScStyleSheet::GetItemSet()
{
case SFX_STYLE_FAMILY_PAGE:
{
- // Seitenvorlagen sollen nicht ableitbar sein,
- // deshalb werden an dieser Stelle geeignete
- // Werte eingestellt. (==Standard-Seitenvorlage)
+ // Page templates should not be derivable,
+ // therefore suitable values are set at this point.
+ // (== Standard page template)
SfxItemPool& rItemPool = GetPool().GetPool();
pSet = new SfxItemSet( rItemPool,
@@ -142,15 +142,15 @@ SfxItemSet& ScStyleSheet::GetItemSet()
ATTR_USERDEF, ATTR_USERDEF,
0 );
- // Wenn gerade geladen wird, wird auch der Set hinterher aus der Datei
- // gefuellt, es brauchen also keine Defaults gesetzt zu werden.
- // GetPrinter wuerde dann auch einen neuen Printer anlegen, weil der
- // gespeicherte Printer noch nicht geladen ist!
+ // If being loaded also the set is then filled in from the file,
+ // so the defaults do not need to be set.
+ // GetPrinter would then also create a new printer,
+ // because the stored Printer is not loaded yet!
ScDocument* pDoc = static_cast<ScStyleSheetPool&>(GetPool()).GetDocument();
if ( pDoc )
{
- // Setzen von sinnvollen Default-Werten:
+ // Setting reasonable default values:
SvxPageItem aPageItem( ATTR_PAGE );
SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() );
@@ -159,7 +159,7 @@ SfxItemSet& ScStyleSheet::GetItemSet()
rItemPool.GetDefaultItem(ATTR_PAGE_HEADERSET) ));
SfxItemSet& rHFSet = aHFSetItem.GetItemSet();
- SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand
+ SvxSizeItem aHFSizeItem( // 0,5 cm + distance
ATTR_PAGE_SIZE,
Size( 0, (long)( 500 / HMM_PER_TWIPS ) + HFDIST_CM ) );
@@ -186,12 +186,13 @@ SfxItemSet& ScStyleSheet::GetItemSet()
rHFSet.Put( aBoxInfoItem );
rHFSet.Put( aHFSizeItem );
rHFSet.Put( aHFDistItem );
- rHFSet.Put( SvxLRSpaceItem( 0,0,0,0, ATTR_LRSPACE ) ); // Rand auf Null setzen
+ rHFSet.Put( SvxLRSpaceItem( 0,0,0,0, ATTR_LRSPACE ) ); // Set border to Null
pSet->Put( aHFSetItem, ATTR_PAGE_HEADERSET );
pSet->Put( aHFSetItem, ATTR_PAGE_FOOTERSET );
- pSet->Put( aBoxInfoItem ); // PoolDefault wg. Formatvorlagen
- // nicht ueberschreiben!
+ pSet->Put( aBoxInfoItem ); // Do not overwrite PoolDefault
+ // due to format templates
+
// Writing direction: not as pool default because the default for cells
// must remain FRMDIR_ENVIRONMENT, and each page style's setting is
@@ -260,8 +261,8 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
GetItemSet().SetParent( NULL );
}
-// schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern,
-// obwohl der fuer den Benutzer sichtbare Name uebersetzt ist:
+// Dirty tricks, to always save the default template as "standard"
+// even though when shown to the user it is renamed:
const OUString& ScStyleSheet::GetName() const
{
diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx
index 95eba3f..2cf17fd 100644
--- a/sc/source/core/data/subtotalparam.cxx
+++ b/sc/source/core/data/subtotalparam.cxx
@@ -181,7 +181,7 @@ void ScSubTotalParam::SetSubTotals( sal_uInt16 nGroup,
if ( ptrSubTotals && ptrFunctions && (nCount > 0) && (nGroup <= MAXSUBTOTAL) )
{
- // 0 wird als 1 aufgefasst, sonst zum Array-Index dekrementieren
+ // 0 is interpreted as 1, otherwise decrementing the array index
if (nGroup != 0)
nGroup--;
More information about the Libreoffice-commits
mailing list