[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/cellform.cxx | 10 -
sc/source/core/tool/compiler.cxx | 42 +++---
sc/source/core/tool/consoli.cxx | 43 +++
3 files changed, 47 insertions(+), 48 deletions(-)
New commits:
commit 04b32cc8254d7489f3e5be35f9fb6352863aac3e
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun May 31 10:43:24 2015 -0400
fdo#39468 Translate German Comments - sc/source/core/tool/ #1
Change-Id: I95c6669cfbdcbc81c5a173a6687fca14bed255fb
Reviewed-on: https://gerrit.libreoffice.org/16003
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index dfc0ffe..36529c6 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -267,8 +267,8 @@ OUString ScCellFormat::GetOutputString( ScDocument rDoc,
const ScAddress rPos,
if (rCell.meType == CELLTYPE_EDIT)
{
-// GetString an der EditCell macht Leerzeichen aus Umbruechen,
-// hier werden die Umbrueche aber gebraucht
+// GetString converts line breaks into spaces in EditCell,
+// but here we need the line breaks
const EditTextObject* pData = rCell.mpEditText;
if (pData)
{
@@ -276,12 +276,12 @@ OUString ScCellFormat::GetOutputString( ScDocument rDoc,
const ScAddress rPos,
rEngine.SetText(*pData);
aVal = rEngine.GetText(LINEEND_LF);
}
-// Edit-Zellen auch nicht per NumberFormatter formatieren
-// (passend zur Ausgabe)
+// also do not format EditCells as numbers
+// (fitting to output)
}
else
{
-// wie in GetString am Dokument (column)
+// like in GetString for document (column)
Color* pColor;
sal_uLong nNumFmt = rDoc.GetNumberFormat(rPos);
aVal = GetString(rDoc, rPos, nNumFmt, pColor, *rDoc.GetFormatTable());
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1253f59..1d5b36b 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1817,42 +1817,42 @@ static sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode*
pDst, const sal_Unicode* pS
// NextSymbol
-// Zerlegt die Formel in einzelne Symbole fuer die weitere
-// Verarbeitung (Turing-Maschine).
+// Parses the formula into separate symbols for further
+// processing (Turing-Machine).
-// Ausgangs Zustand = GetChar
+// initial state = GetChar
-// Alter Zustand | gelesenes Zeichen | Aktion| Neuer Zustand
+// old state | read character| action| new state
//---+---+---+---
-// GetChar | ;()+-*/^=| Symbol=Zeichen| Stop
-// | | Symbol=Zeichen| GetBool
-// | $ Buchstabe | Symbol=Zeichen| GetWord
-// | Ziffer| Symbol=Zeichen| GetValue
-// | | Keine | GetString
-// | Sonst | Keine | GetChar
+// GetChar | ;()+-*/^=| Symbol=char | Stop
+// | | Symbol=char | GetBool
+// | $ letter | Symbol=char | GetWord
+// | number| Symbol=char | GetValue
+// | | none | GetString
+// | other | none | GetChar
//---+---+---+---
-// GetBool | =| Symbol=Symbol+Zeichen | Stop
-// | Sonst | Dec(CharPos) | Stop
+// GetBool | =| Symbol=Symbol+char| Stop
+// | other | Dec(CharPos) | Stop
//---+---+---+---
// GetWord | SepSymbol | Dec(CharPos) | Stop
// | ()+-*/^=~ | |
-// | Leerzeichen | Dec(CharPos) | Stop
+// | space | Dec(CharPos) | Stop
// | $_:. | |
-// | Buchstabe,Ziffer | Symbol=Symbol+Zeichen | GetWord
-// | Sonst | Fehler| Stop
+// | letter, number| Symbol=Symbol+char| GetWord
+// | other | error | Stop
//---+---+---+---
// GetValue | ;()*/^=| |
-// | Leerzeichen | Dec(CharPos
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen9.cxx |2 +-
sc/source/core/data/document.cxx |2 +-
sc/source/core/data/table2.cxx |2 +-
sc/source/core/data/table3.cxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8fa5e036f59eea1413c66dccb44b8f4ecb8deb09
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun May 31 09:21:29 2015 -0400
fdo#39468 Translate German Comments - last bits of sc/source/core/data/
Change-Id: Icbd625ae96b372812f3dd94526fcc9fc8e3e0a76
Reviewed-on: https://gerrit.libreoffice.org/16001
Tested-by: Jenkins c...@libreoffice.org
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index abaed19..bc8d76d 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -265,7 +265,7 @@ void ScDocument::DrawMovePage( sal_uInt16 nOldPos,
sal_uInt16 nNewPos )
void ScDocument::DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
{
-// angelegt wird die Page schon im ScTable ctor
+// page is already created in ScTable ctor
pDrawLayer-ScCopyPage( nOldPos, nNewPos );
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index b45bc8e..7ff0203 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2742,7 +2742,7 @@ void ScDocument::CopyFromClip( const ScRange rDestRange,
const ScMarkData rMar
pDestRanges = aLocalRangeList;
}
-bInsertingFromOtherDoc = true; // kein Broadcast/Listener aufbauen bei
Insert
+bInsertingFromOtherDoc = true; // No Broadcast/Listener created at Insert
sc::ColumnSpanSet aBroadcastSpans(false);
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 660a776..196eb59 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -428,7 +428,7 @@ void ScTable::DeleteArea(
aCol[i].DeleteArea(nRow1, nRow2, nDelFlag, bBroadcast,
pBroadcastSpans);
}
-// Zellschutz auf geschuetzter Tabelle nicht setzen
+// Do not set protected cell in a protected table
if ( IsProtected() (nDelFlag IDF_ATTRIB) )
{
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 6b5f634..5b3a04f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1480,7 +1480,7 @@ short ScTable::CompareCell(
if (eType2 == CELLTYPE_FORMULA rCell2.mpFormula-IsValue())
bStr2 = false;
-if ( bStr1 bStr2 ) // nur Strings untereinander als
String vergleichen!
+if ( bStr1 bStr2 ) // only compare strings as strings!
{
OUString aStr1;
OUString aStr2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column.cxx | 10 +-
sc/source/core/data/column2.cxx | 14 ++--
sc/source/core/data/column3.cxx |4 -
sc/source/core/data/conditio.cxx |8 +-
sc/source/core/data/dbdocutl.cxx |6 -
sc/source/core/data/documen3.cxx |6 -
sc/source/core/data/documen4.cxx |8 +-
sc/source/core/data/documen5.cxx |2
sc/source/core/data/documen7.cxx |4 -
sc/source/core/data/documen8.cxx |4 -
sc/source/core/data/documen9.cxx |4 -
sc/source/core/data/document.cxx |6 -
sc/source/core/data/dpdimsave.cxx| 18 ++---
sc/source/core/data/dpgroup.cxx |4 -
sc/source/core/data/dpobject.cxx | 34 -
sc/source/core/data/dpoutput.cxx | 60 -
sc/source/core/data/dpsave.cxx | 12 +--
sc/source/core/data/dpsdbtab.cxx |8 +-
sc/source/core/data/dpshttab.cxx |2
sc/source/core/data/dptabdat.cxx |8 +-
sc/source/core/data/dptabres.cxx | 52 +++
sc/source/core/data/dptabsrc.cxx | 120 +--
sc/source/core/data/dputil.cxx |2
sc/source/core/data/drwlayer.cxx | 16 ++--
sc/source/core/data/fillinfo.cxx | 12 +--
sc/source/core/data/formulacell.cxx |4 -
sc/source/core/data/global.cxx |4 -
sc/source/core/data/global2.cxx |2
sc/source/core/data/markdata.cxx | 16 ++--
sc/source/core/data/patattr.cxx | 10 +-
sc/source/core/data/sortparam.cxx|2
sc/source/core/data/stlpool.cxx |2
sc/source/core/data/stlsheet.cxx | 13 +--
sc/source/core/data/table1.cxx | 16 ++--
sc/source/core/data/table2.cxx | 14 ++--
sc/source/core/data/table3.cxx |8 +-
sc/source/core/data/table4.cxx |4 -
sc/source/core/data/table6.cxx |2
sc/source/core/data/validat.cxx | 16 ++--
sc/source/core/tool/addincol.cxx | 50 +++---
sc/source/core/tool/addinlis.cxx |4 -
sc/source/core/tool/appoptio.cxx |2
sc/source/core/tool/charthelper.cxx |2
sc/source/core/tool/chgtrack.cxx | 60 -
sc/source/core/tool/compiler.cxx |6 -
sc/source/core/tool/consoli.cxx | 16 ++--
sc/source/core/tool/dbdata.cxx |2
sc/source/core/tool/ddelink.cxx |2
sc/source/core/tool/detfunc.cxx | 16 ++--
sc/source/core/tool/editutil.cxx |4 -
sc/source/core/tool/interpr1.cxx |6 -
sc/source/core/tool/interpr2.cxx | 14 ++--
sc/source/core/tool/interpr4.cxx | 12 +--
sc/source/core/tool/navicfg.cxx | 10 +-
sc/source/core/tool/optutil.cxx |4 -
sc/source/core/tool/progress.cxx |2
sc/source/core/tool/queryentry.cxx |2
sc/source/core/tool/rangenam.cxx |4 -
sc/source/core/tool/rangeseq.cxx |2
sc/source/core/tool/refupdat.cxx | 12 +--
sc/source/core/tool/stringutil.cxx |4 -
sc/source/core/tool/token.cxx|6 -
sc/source/core/tool/unitconv.cxx |4 -
sc/source/core/tool/viewopti.cxx |2
sc/source/filter/dif/difimp.cxx |4 -
sc/source/filter/excel/excdoc.cxx|2
sc/source/filter/excel/excimp8.cxx |2
sc/source/filter/excel/impop.cxx |2
sc/source/filter/excel/xeescher.cxx |2
sc/source/filter/excel/xichart.cxx |4 -
sc/source/filter/excel/xiformula.cxx |2
sc/source/filter/excel/xipivot.cxx |4 -
sc/source/filter/excel/xlpivot.cxx |8 +-
sc/source/filter/excel/xlroot.cxx|2
74 files changed, 410 insertions(+), 407 deletions(-)
New commits:
commit f276ef3f7f6ecc584b77a196236852bc6ff415cc
Author: Christian M. Heller christian.helle...@gmail.com
Date: Tue Nov 11 04:51:00 2014 -0500
fdo#39468 Translate German Comments - replace '//!' with '//TODO:'
It seems that most comments starting with '//!' were intended as FIXMEs.
This replaces gerrit 12241.
Conflicts:
sc/source/core/tool/token.cxx
sc/source/filter/excel/xlpivot.cxx
Change-Id: I6ed06b32c70cc854a896dbbc386565e6fbfa9b28
Reviewed-on: https://gerrit.libreoffice.org/12361
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d7597e6..111b254 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -66,7 +66,7 @@ namespace {
inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
{
-//! move to a header file
+//TODO: move to a header file
return ( nScript != SCRIPTTYPE_LATIN
nScript != SCRIPTTYPE_ASIAN
nScript != SCRIPTTYPE_COMPLEX
@@ -697,7 +697,7 @@ void ScColumn::SetPatternArea( SCROW nStartRow, SCROW
nEndRow,
void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem rAttr )
{
// in order to only create a new
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen4.cxx | 128 +++
sc/source/core/data/documen5.cxx |9 +-
2 files changed, 68 insertions(+), 69 deletions(-)
New commits:
commit 1b58c8434f42a92cfd63f1cc1b9e7e0e4826c86c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Mon Nov 3 19:43:44 2014 -0500
fdo#39468 Translate German Comments - sc/source/core/data/documen{4,5}.cxx
Change-Id: I19a2242909dd8519a4819045e039def6e48f2c39
Reviewed-on: https://gerrit.libreoffice.org/12237
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 4b36b65..5f11898 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -344,7 +344,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW
nRow1,
}
}
-void ScDocument::InsertTableOp(const ScTabOpParam rParam, //
Mehrfachoperation
+void ScDocument::InsertTableOp(const ScTabOpParam rParam, // multiple
(repeated?) operation
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
const ScMarkData rMark)
{
@@ -608,7 +608,7 @@ bool ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
if (maTabs[*itr])
maTabs[*itr]-UpdateSelectionFunction(aData, aMark);
-//! rMark an UpdateSelectionFunction uebergeben !
+//TODO: pass rMark to UpdateSelectionFunction !
if (!aData.bError)
switch (eFunc)
@@ -660,10 +660,10 @@ double ScDocument::RoundValueAsShown( double fVal,
sal_uInt32 nFormat ) const
nPrecision = (short)GetFormatTable()-GetFormatPrecision( nFormat
);
switch ( nType )
{
-case NUMBERFORMAT_PERCENT: // 0,41% == 0,0041
+case NUMBERFORMAT_PERCENT: // 0.41% == 0.0041
nPrecision += 2;
break;
-case NUMBERFORMAT_SCIENTIFIC: // 1,23e-3 == 0,00123
+case NUMBERFORMAT_SCIENTIFIC: // 1.23e-3 == 0.00123
{
if ( fVal 0.0 )
nPrecision = sal::static_int_castshort( nPrecision -
(short)floor( log10( fVal ) ) );
@@ -682,7 +682,7 @@ double ScDocument::RoundValueAsShown( double fVal,
sal_uInt32 nFormat ) const
}
double fRound = ::rtl::math::round( fVal, nPrecision );
if ( ::rtl::math::approxEqual( fVal, fRound ) )
-return fVal;// durch Rundung hoechstens Fehler
+return fVal;// rounding might introduce some error
else
return fRound;
}
@@ -690,7 +690,7 @@ double ScDocument::RoundValueAsShown( double fVal,
sal_uInt32 nFormat ) const
return fVal;
}
-// bedingte Formate und Gueltigkeitsbereiche
+// conditional formats and validation ranges
sal_uLong ScDocument::AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab )
{
@@ -706,7 +706,7 @@ sal_uLong ScDocument::AddCondFormat( ScConditionalFormat*
pNew, SCTAB nTab )
sal_uLong ScDocument::AddValidationEntry( const ScValidationData rNew )
{
if (rNew.IsEmpty())
-return 0; // leer ist immer 0
+return 0; // empty is always 0
if (!pValidationList)
pValidationList = new ScValidationDataList;
@@ -722,7 +722,7 @@ sal_uLong ScDocument::AddValidationEntry( const
ScValidationData rNew )
nMax = nKey;
}
-// Der Aufruf kann aus ScPatternAttr::PutInPool kommen, darum Clone (echte
Kopie)
+// might be called from ScPatternAttr::PutInPool; thus clone (real copy)
sal_uLong nNewKey = nMax + 1;
ScValidationData* pInsert = rNew.Clone(this);
@@ -882,19 +882,19 @@ void ScDocument::AddDetectiveOperation( const
ScDetOpData rData )
void ScDocument::ClearDetectiveOperations()
{
-delete pDetOpList; // loescht auch die Eintraege
+delete pDetOpList; // deletes also the entries
pDetOpList = NULL;
}
void ScDocument::SetDetOpList(ScDetOpList* pNew)
{
-delete pDetOpList; // loescht auch die Eintraege
+delete pDetOpList; // deletes also the entries
pDetOpList = pNew;
}
-// Vergleich von Dokumenten
+// Comparison of Documents
-// Pfriemel-Faktoren
+// Pfriemel-Factors
#define SC_DOCCOMP_MAXDIFF 256
#define SC_DOCCOMP_MINGOOD 128
#define SC_DOCCOMP_COLUMNS 10
@@ -914,7 +914,7 @@ sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow,
SCTAB nThisTab,
else
nOtherCol = nThisCol;
-if (ValidCol(nOtherCol))// nur Spalten vergleichen, die in beiden
Dateien sind
+if (ValidCol(nOtherCol))// only compare columns that are common to
both docs
{
ScRefCellValue aThisCell, aOtherCell;
aThisCell.assign(*this, ScAddress(nThisCol, nThisRow, nThisTab
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen2.cxx | 64 ++-
1 file changed, 31 insertions(+), 33 deletions(-)
New commits:
commit 1cd9c19ba1983984e9d42cc8cb5ddbfcdcebe2a7
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Nov 2 03:05:01 2014 -0500
fdo#39468 Translate German Comments - sc/source/core/data/documen2.cxx
Change-Id: I9a426f40f8cdce1f1ebe207dd9ada8154d8fde46
Reviewed-on: https://gerrit.libreoffice.org/12195
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d9ab457..5a6af4b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -114,7 +114,7 @@ struct ScLookupCacheMapImpl
void clear()
{
freeCaches();
-// Zap map.
+// free mapping
ScLookupCacheMap aTmp;
aCacheMap.swap( aTmp);
}
@@ -330,11 +330,11 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack )
IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
{
-if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln
+if ( ScDdeLink::IsInUpdate() ) // do not nest
{
-aTrackTimer.Start();// spaeter nochmal versuchen
+aTrackTimer.Start();// try again later
}
-else if (pShell)// ausfuehren
+else if (pShell)// execute
{
TrackFormulas();
pShell-Broadcast( SfxSimpleHint( FID_DATACHANGED ) );
@@ -363,7 +363,7 @@ void ScDocument::SetExpandRefs( bool bVal )
void ScDocument::StartTrackTimer()
{
-if (!aTrackTimer.IsActive())// nicht ewig aufschieben
+if (!aTrackTimer.IsActive())// do not postpone for forever
aTrackTimer.Start();
}
@@ -388,10 +388,9 @@ ScDocument::~ScDocument()
ScAddInAsync::RemoveDocument( this );
ScAddInListener::RemoveDocument( this );
-DELETEZ( pChartListenerCollection); // vor pBASM wg. evtl. Listener!
+DELETEZ( pChartListenerCollection); // before pBASM because of potential
Listener!
DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners
-// BroadcastAreas vor allen Zellen zerstoeren um unnoetige
-// Einzel-EndListenings der Formelzellen zu vermeiden
+// destroy BroadcastAreas first to avoid un-needed Single-EndListenings of
Formula-Cells
delete pBASM; // BroadcastAreaSlotMachine
pBASM = NULL;
@@ -421,11 +420,11 @@ ScDocument::~ScDocument()
ImplDeleteOptions();
delete pConsolidateDlgData;
delete pClipData;
-delete pDetOpList; // loescht auch die Eintraege
+delete pDetOpList; // also deletes entries
delete pChangeTrack;
delete pEditEngine;
delete pNoteEngine;
-delete pChangeViewSettings; // und weg damit
+delete pChangeViewSettings; // and delete
delete pVirtualDevice_100th_mm;
delete pDPCollection;
@@ -463,13 +462,13 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc )
SharePooledResources(pSourceDoc);
-// bedingte Formate / Gueltigkeiten
-//! Vorlagen kopieren?
+// conditional Formats / validations
+// TODO: Copy Templates?
const ScValidationDataList* pSourceValid = pSourceDoc-pValidationList;
if ( pSourceValid )
pValidationList = new ScValidationDataList(this, *pSourceValid);
-// Links in Stream speichern
+// store Links in Stream
delete pClipData;
if (pSourceDoc-GetDocLinkManager().hasDdeLinks())
{
@@ -591,7 +590,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB
nTab )
void ScDocument::EnsureTable( SCTAB nTab )
{
-bool bExtras = !bIsUndo;// Spaltenbreiten, Zeilenhoehen, Flags
+bool bExtras = !bIsUndo;// Column-Widths, Row-Heights, Flags
if (static_castsize_t(nTab) = maTabs.size())
maTabs.resize(nTab+1, NULL);
@@ -728,8 +727,8 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos,
ScProgress* pProgress )
if (nNewPos == SC_TAB_APPEND || nNewPos = nTabCount)
nNewPos = nTabCount-1;
-// Referenz-Updaterei
-//! mit UpdateReference zusammenfassen!
+// Update Reference
+// TODO: combine with UpdateReference!
sc::RefUpdateMoveTabContext aCxt(nOldPos, nNewPos);
@@ -792,8 +791,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos,
const ScMarkData* pOnlyM
OUString aName;
GetName(nOldPos, aName);
-// vorneweg testen, ob der Prefix als gueltig erkannt wird
-// wenn nicht, nur doppelte vermeiden
+// check first if Prefix is valid; if not, then only avoid duplicates
bool bPrefix = ValidTabName( aName );
OSL_ENSURE(bPrefix, invalid table name);
SCTAB nDummy;
@@ -885,7 +883,7 @@ bool
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx |4 ++--
sc/source/filter/excel/excform8.cxx |4 ++--
sc/source/filter/lotus/lotform.cxx | 12 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1071eccd037390774b6d3f1aade9af02fd2cbe54
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Nov 2 02:18:02 2014 -0500
fdo#39468 Translate German Comments - final bits of sc/source/filter/
Change-Id: Ie01e9488c6b8e36c40e6176bc1cac38a93a8087f
Reviewed-on: https://gerrit.libreoffice.org/12194
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 0e5eacc..3a0236a 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -932,7 +932,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs rRangeList,
XclImpStream aIn, sal
aSRD.InitFlags();
aCRD.InitFlags();
-switch( nOp ) // book page:
+switch( nOp ) // book page:
{ // SDK4 SDK5
case 0x01: // Array Formula [325]
// Array Formula or Shared Formula [277]
@@ -1539,7 +1539,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz
)
if( nAnz 0 eId == ocExternal )
{
TokenId n = eParam[ nAnz - 1 ];
-//# GRUETZE FUER BASIC-FUNCS RICHTEN!
+//# ADJUST GRUETZE (?) FOR BASIC-FUNCS!
if( const OUString* pExt = aPool.GetExternal( n ) )
{
if( const XclFunctionInfo* pFuncInfo =
maFuncProv.GetFuncInfoFromXclMacroName( *pExt ) )
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index 3686671..19f8cb5 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -177,7 +177,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*
rpTokArray, XclImpStream aIn,
aSRD.InitFlags();
aCRD.InitFlags();
-switch( nOp ) // book page:
+switch( nOp ) // book page:
{ // SDK4 SDK5
case 0x01: // Array Formula [325]
// Array Formula or Shared Formula [277]
@@ -208,7 +208,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*
rpTokArray, XclImpStream aIn,
aPool aStack ocDiv nMerk0;
aPool aStack;
break;
-case 0x07: // Exponentiation[313 265]
+case 0x07: // Exponentiation[313 265]
// raise SECOND-TOP to power of TOP
aStack nMerk0;
aPool aStack ocPow nMerk0;
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index 450c5fe..3e1fe49 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1265,14 +1265,14 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex
)
FT_FuncFix2,// 108 Cell() - new
FT_FuncFix1,// 109 Trim() - new
FT_FuncFix1,// 110 Clean() - new
-FT_FuncFix1,// 111 S() - change in Bez.
-FT_FuncFix1,// 112 N() - change in Bez.
+FT_FuncFix1,// 111 S() - change in name
+FT_FuncFix1,// 112 N() - change in name
FT_FuncFix2,// 113 Exact() - new
-FT_NotImpl, // 114 App - change in Bez.
+FT_NotImpl, // 114 App - change in name
FT_FuncFix1,// 115 @@() - new
FT_FuncFix3,// 116 Rate() - new
-FT_FuncFix3,// 117 Term() - change in Anz.
-FT_FuncFix3,// 118 Cterm() - change in Anz.
+FT_FuncFix3,// 117 Term() - change in quantity
+FT_FuncFix3,// 118 Cterm() - change in quantity
FT_FuncFix3,// 119 Sln()- new
FT_FuncFix4,// 120 Syd()- new
FT_FuncFix4,// 121 Ddb()- new
@@ -1755,7 +1755,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
NULL, // 69 Is Text?
NULL, // 70 Len()
NULL, // 71 Val()
-NULL, // 72 String()ocFixed ersatzweise +
Spezialfall
+NULL
[Libreoffice-commits] core.git: sc/source
sc/source/filter/lotus/lotread.cxx | 26 +++
sc/source/filter/starcalc/scflt.cxx | 59 +--
sc/source/filter/starcalc/scfobj.cxx | 10 ++---
sc/source/filter/xml/xmlcelli.cxx|9 ++---
4 files changed, 51 insertions(+), 53 deletions(-)
New commits:
commit d665d253eea7b6f311167079893cbfaac566ca8b
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Oct 19 07:54:05 2014 -0400
fdo#39468 Translate German Comments - sc/source/filter/{lotus,starcalc,xml}
V2 with changes suggested by Samuel and Eike
Change-Id: I3bc7e5c5173fe06d29f32bab1973828fdfb33d53
Reviewed-on: https://gerrit.libreoffice.org/12036
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/filter/lotus/lotread.cxx
b/sc/source/filter/lotus/lotread.cxx
index c739ab2..a75dc99 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -54,7 +54,7 @@ FltError ImportLotus::Read()
pIn-Seek( nNextRec );
-// Progressbar starten
+// start progressbar
ScfStreamProgressBar aPrgrsBar( *pIn, pD-GetDocumentShell() );
LotusContext rContext = aConv.getContext();
while( eAkt != S_END )
@@ -93,17 +93,17 @@ FltError ImportLotus::Read()
}
else
{
-eAkt = S_END; // hier kommt wat fuer = WK1 hinne!
+eAkt = S_END; // TODO: add here
something for = WK1!
eRet = 0x;
}
}
break;
-case S_WK1: // S_WK1
+case S_WK1: // S_WK1
break;
-case S_WK3: // S_WK3
-case S_WK4: // S_WK4
+case S_WK3: // S_WK3
+case S_WK4: // S_WK4
switch( nOp )
{
case 0x0001:// EOF
@@ -180,21 +180,21 @@ FltError ImportLotus::Read()
break;
-case S_FM3: // S_FM3
+case S_FM3: // S_FM3
break;
-case S_END: // S_END
+case S_END: // S_END
break;
}
OSL_ENSURE( nNextRec = pIn-Tell(),
-*ImportLotus::Read(): Etwas zu gierig... );
+*ImportLotus::Read(): Read too much... );
pIn-Seek( nNextRec );
aPrgrsBar.Progress();
}
-// duemmliche Namen eliminieren
+// TODO: eliminate stupid names
SCTAB nTabs = pD-GetTableCount();
SCTAB nCnt;
OUString aTabName;
@@ -210,7 +210,7 @@ FltError ImportLotus::Read()
for( nCnt = 1 ; nCnt nTabs ; nCnt++ )
{
OSL_ENSURE( pD-HasTable( nCnt ),
--ImportLotus::Read(): Wo ist meine Tabelle?! );
+-ImportLotus::Read(): Where is my table?! );
pD-GetName( nCnt, aTabName );
if( aTabName.equals(aRef) )
{
@@ -241,7 +241,7 @@ FltError ImportLotus::Read(SvStream rIn)
pIn-Seek( nNextRec );
-// Progressbar starten
+// start progressbar
ScfStreamProgressBar aPrgrsBar( *pIn, pD-GetDocumentShell() );
LotusContext rContext = aConv.getContext();
while( bRead )
@@ -267,7 +267,7 @@ FltError ImportLotus::Read(SvStream rIn)
case 0x0001:// EOF
bRead = false;
OSL_ENSURE( nTab == 0,
--ImportLotus::Read( SvStream ): Zweimal EOF nicht
erlaubt );
+-ImportLotus::Read( SvStream ): EOF twice! );
nTab++;
break;
@@ -294,7 +294,7 @@ FltError ImportLotus::Read(SvStream rIn)
}
OSL_ENSURE( nNextRec = pIn-Tell(),
-*ImportLotus::Read(): Etwas zu gierig... );
+*ImportLotus::Read(): Read too much... );
pIn-Seek( nNextRec );
aPrgrsBar.Progress();
}
diff --git a/sc/source/filter/starcalc/scflt.cxx
b/sc/source/filter/starcalc/scflt.cxx
index bdade94..f133163 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -424,7 +424,7 @@ Sc10FontCollection::Sc10FontCollection(SvStream rStream)
}
}
-// Benannte-Bereiche
+// named regions
Sc10NameData::Sc10NameData(SvStream rStream)
{
@@ -465,7 +465,7 @@ Sc10NameCollection::Sc10NameCollection(SvStream rStream) :
}
}
-// Vorlagen
+// templates
Sc10PatternData::Sc10PatternData(SvStream rStream
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/excform.hxx |4 +-- sc/source/filter/inc/imp_op.hxx |4 +-- sc/source/filter/inc/lotform.hxx |4 +-- sc/source/filter/inc/scflt.hxx| 46 +++--- sc/source/filter/inc/tokstack.hxx |4 +-- 5 files changed, 31 insertions(+), 31 deletions(-) New commits: commit 1361c56aab70e579623b69e67dd99edb4c7b8d89 Author: Christian M. Heller christian.helle...@gmail.com Date: Sat Oct 11 16:19:50 2014 -0400 fdo#39468 Translate German Comments - sc/source/filter/inc/ leftovers Change-Id: I0fe5c0165e1c430861028175c82ff116bac969aa Reviewed-on: https://gerrit.libreoffice.org/11926 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 59e933f..8372c20 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -37,8 +37,8 @@ protected: boolbExternName;// external name was found static const sal_uInt16 nRowMask; -static const sal_uInt16 nLastInd; // last Index for Excel-SC- -// Token Umsetzung +static const sal_uInt16 nLastInd; // last Index for Excel-SC- token + XclFunctionProvider maFuncProv; const XclBiff meBiff; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 5fd69bc..241338a 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -100,8 +100,8 @@ protected: ScfUInt32VecmaSheetOffsets; ScRange maScOleSize;/// Visible range if embedded. -NameBuffer* pExtNameBuff; // ... externe Namen (Ind.-Basis=1) -ExcelToSc* pFormConv; // Formel-Konverter +NameBuffer* pExtNameBuff; // ... external names (Ind.-Basis=1) +ExcelToSc* pFormConv; // formula-converter XclImpOutlineBuffer*pColOutlineBuff; XclImpOutlineBuffer*pRowOutlineBuff; diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 427e84f..37aa95a 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -83,9 +83,9 @@ private: // with '(rParam)+1' and finished with Store() ! voidDecToken( TokenId rParam ); -// ACHTUNG: ~ +// Attention: ~ voidNegToken( TokenId rParam ); -// ACHTUNG: like ~, but with '-(rParam)' +// Attention: like ~, but with '-(rParam)' public: LotusToSc(LotusContext rContext, SvStream aStr, svl::SharedStringPool rSPool, rtl_TextEncoding eSrc, bool b); diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index b073a09..2ac1168 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -24,12 +24,12 @@ #include collect.hxx #include tools/solar.h -// FehlerNummern +// Error numbers #define errUnknownFormat1 #define errUnknownID2 #define errOutOfMemory 3 -// Identifiers im FileFormat +// Identifiers in FileFormat #define ColWidthID 1 #define ColAttrID 2 #define RowHeightID 3 @@ -41,18 +41,18 @@ #define PatternID 9 #define DataBaseID 10 -// Zeilen/Spalten Flags +// Row/Column Flags #define crfSoftBreak1 #define crfHardBreak2 #define crfHidden 4 -// Zelltypen +// Cell types #define ctValue 1 #define ctString2 #define ctFormula 3 #define ctNote 4 -// FontStyles +// Font Styles #define ffDontCare 0x00 #define ffRoman 0x10 #define ffSwiss 0x20 @@ -60,34 +60,34 @@ #define ffScript0x40 #define ffDecorative0x50 -// FontWeight +// Font Weight #define fwNormal400 -// FontAttribute +// Font attributes #define atNone 0 #define atBold 1 #define atItalic2 #define atUnderline 4 #define atStrikeOut 8 -// Horizontale Ausrichtung +// Horizontal alignment #define hjNone 0 #define hjLeft 1 #define hjCenter2 #define hjRight 3 -// Vertikale Ausrichtung +// Vertical alignment #define vjNone 0 #define vjTop 1 #define vjCenter2 #define vjBottom3 -// AusrichtungsFlags +// Allignment flags #define ojWordBreak 0x01 #define ojBottomTop 0x02 #define ojTopBottom 0x04 -// ZellRaster +// Cell grid #define raNone 0 #define raGray121 #define raGray252 @@ -95,13 +95,13 @@ #define raGray754 #define raGray100 5 -// Zellschutz
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/excdoc.hxx |2
sc/source/filter/inc/excform.hxx |4 -
sc/source/filter/inc/expbase.hxx | 14 +--
sc/source/filter/inc/htmlexp.hxx | 20 ++---
sc/source/filter/inc/imp_op.hxx | 16 ++--
sc/source/filter/inc/lotform.hxx | 38 +-
sc/source/filter/inc/namebuff.hxx | 14 +--
sc/source/filter/inc/rtfexp.hxx |2
sc/source/filter/inc/scflt.hxx| 138 +++---
sc/source/filter/inc/tokstack.hxx | 66 +-
10 files changed, 157 insertions(+), 157 deletions(-)
New commits:
commit d7646a56c3555bae8ade3f996f2037472160f90c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Oct 4 06:28:02 2014 -0400
fdo#39468 Translate German Comments - sc/source/filter/inc/
Change-Id: I26eacb2f8ab02c788e82aa6fdcb76d8fa07f64fb
Reviewed-on: https://gerrit.libreoffice.org/11803
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index dc606b6..6188033 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -56,7 +56,7 @@ private:
XclExpNoteListRef mxNoteList;
-// pRec mit new anlegen und vergessen, delete macht ExcTable selber!
+// re-create and forget pRec; delete is done by ExcTable itself!
voidAdd( XclExpRecordBase* pRec );
public:
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index e057420..59e933f 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -35,9 +35,9 @@ protected:
enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA };
typedef ::std::vector ExtensionType ExtensionTypeVec;
-boolbExternName;// wenn External Name gefunden
wurde
+boolbExternName;// external name was found
static const sal_uInt16 nRowMask;
-static const sal_uInt16 nLastInd; // letzter Index fuer Excel-SC-
+static const sal_uInt16 nLastInd; // last Index for Excel-SC-
// Token Umsetzung
XclFunctionProvider maFuncProv;
const XclBiff meBiff;
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 2757113..e564e14 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -41,19 +41,19 @@ public:
ScExportBase( SvStream, ScDocument*, const ScRange );
virtual ~ScExportBase();
-// Hidden Cols/Rows an den Raendern trimmen,
-// return: sal_True wenn Bereich vorhanden
-// Start/End/Col/Row muessen gueltige Ausgangswerte
sein
+// Trim borders of hidden Cols/Rows,
+// return: sal_True if range exists
+// Start/End/Col/Row must have valid starting values
boolTrimDataArea( SCTAB nTab, SCCOL nStartCol,
SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
const;
-// Ausgabebereich einer Tabelle ermitteln,
-// Hidden Cols/Rows an den Raendern beruecksichtigt,
-// return: sal_True wenn Bereich vorhanden
+// Get Data Area of a table,
+// adjust borders of hidden Cols/Rows,
+// return: sal_True if range exists
boolGetDataArea( SCTAB nTab, SCCOL nStartCol,
SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
const;
-// Tabelle nicht vorhanden oder leer
+// table does not exist or is empty
boolIsEmptyTable( SCTAB nTab ) const;
ScFieldEditEngine GetEditEngine() const;
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 6120906..c895d03 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -70,11 +70,11 @@ struct ScHTMLStyle
struct ScHTMLGraphEntry
{
-ScRange aRange; // ueberlagerter Zellbereich
-SizeaSize; // Groesse in Pixeln
-SizeaSpace; // Spacing in Pixeln
+ScRange aRange; // mapped range
+SizeaSize; // size in pixels
+SizeaSpace; // spacing in pixels
SdrObject* pObject;
-boolbInCell;// ob in Zelle ausgegeben wird
+boolbInCell;// if output is in cell
boolbWritten;
ScHTMLGraphEntry( SdrObject* pObj, const ScRange rRange,
@@ -109,15 +109,15 @@ class ScHTMLExport : public ScExportBase
OUString
[Libreoffice-commits] core.git: sc/source
sc/source/filter/dif/difimp.cxx |2 +-
sc/source/filter/html/htmlimp.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d06039e7c93362a88ba394a178d3fcb85fc5d779
Author: Christian M. Heller christian.helle...@gmail.com
Date: Fri Oct 3 22:11:01 2014 -0400
fdo#39468 Translate German Comments - difimp and htmlimp
Change-Id: I221d07c56822905c500f11f3f738231259743acd
Reviewed-on: https://gerrit.libreoffice.org/11802
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 2a8e187..8b009f4 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -383,7 +383,7 @@ TOPIC DifParser::GetNextTopic( void )
// skip 2 lines
ReadNextLine( aLine );
// fall-through
-case S_ERROR_L2:// Fehler in Line 2 aufgetreten
+case S_ERROR_L2:// error happened in line 2
// skip 1 line
ReadNextLine( aLine );
eS = S_END;
diff --git a/sc/source/filter/html/htmlimp.cxx
b/sc/source/filter/html/htmlimp.cxx
index 9eec75b..0a05a6a7 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -100,9 +100,9 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const
OUString rBaseURL, const S
ScHTMLImport::~ScHTMLImport()
{
-// Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem
Dtor!
-// Ist gewaehrleistet, da ScEEImport Basisklasse ist
-delete (ScHTMLParser*) mpParser;// vor EditEngine!
+// Ordering is important, otherwise we get an error in some other Dtor!
+// OK, as ScEEImport is the Base Class
+delete (ScHTMLParser*) mpParser;// before EditEngine!
}
void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const OUString rName,
const ScRange rRange )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa sw/source
sc/source/filter/dif/difimp.cxx | 26 +-
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx|6 +-
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/wrtw8esh.cxx| 10 +-
sw/source/filter/ww8/wrtww8.cxx |1 +
sw/source/filter/ww8/wrtww8.hxx |2 ++
6 files changed, 31 insertions(+), 16 deletions(-)
New commits:
commit 3bbb934da7368217680e67cb76d6ecd2b4694696
Author: Christian M. Heller christian.helle...@gmail.com
Date: Wed Oct 1 05:30:54 2014 -0400
fdo#39468 Translate German Comments - sc/cource/filter/dif
Change-Id: I1d44c2538baac9a1443118c95a2886db5098dab1
Reviewed-on: https://gerrit.libreoffice.org/11736
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 243f6fa..2a8e187 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -121,7 +121,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream
rIn, ScDocument* pDoc,
}
if( eTopic == T_DATA )
-{ // Ab hier kommen die Daten
+{ // data starts here
SCCOL nBaseCol = rInsPos.Col();
SCCOL nColCnt = SCCOL_MAX;
@@ -149,7 +149,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream
rIn, ScDocument* pDoc,
break;
case D_EOD:
break;
-case D_NUMERIC: // Numbercell
+case D_NUMERIC: // Number cell
if( nColCnt == SCCOL_MAX )
nColCnt = nBaseCol;
@@ -188,7 +188,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream
rIn, ScDocument* pDoc,
nColCnt++;
break;
-case D_STRING: // Textcell
+case D_STRING: // Text cell
if( nColCnt == SCCOL_MAX )
nColCnt = nBaseCol;
@@ -221,7 +221,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream
rIn, ScDocument* pDoc,
if( bSyntErrWarn )
-// ACHTUNG: Hier fehlt noch die richtige Warnung!
+// FIXME: Add proper Warnung!
return eERR_RNGOVRFLW;
else if( bOverflowWarn )
@@ -369,7 +369,7 @@ TOPIC DifParser::GetNextTopic( void )
break;
case S_Data:
OSL_ENSURE( aLine.getLength() = 2,
-+GetNextTopic(): String ist zu kurz! );
++GetNextTopic(): String is too short! );
if( aLine.getLength() 2 )
aData = aLine.copy( 1, aLine.getLength() - 2 );
else
@@ -380,11 +380,11 @@ TOPIC DifParser::GetNextTopic( void )
OSL_FAIL( DifParser::GetNextTopic - unexpected state );
break;
case S_UNKNOWN:
-// 2 Zeilen ueberlesen
+// skip 2 lines
ReadNextLine( aLine );
// fall-through
case S_ERROR_L2:// Fehler in Line 2 aufgetreten
-// eine Zeile ueberlesen
+// skip 1 line
ReadNextLine( aLine );
eS = S_END;
break;
@@ -418,7 +418,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode*
pPossibleNumericData )
eRet = D_SYNT_ERROR;
}
else
-{ // ...und zur Strafe mit'm Numberformatter...
+{ // ...and for punishment, with number formatting...
OSL_ENSURE( pNumFormatter, -DifParser::GetNextDataset(): No
Formatter, more fun! );
OUString aTestVal( pPossibleNumericData );
sal_uInt32 nFormat = 0;
@@ -514,7 +514,7 @@ DATASET DifParser::GetNextDataset( void )
}
break;
case '0': // Numeric Data
-pAktBuffer++; // Wert in fVal, 2. Zeile in aData
+pAktBuffer++; // value in fVal, 2. line in aData
if( *pAktBuffer == ',' )
{
pAktBuffer++;
@@ -636,7 +636,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
sal_Int32 nExp = 0;
boolbExpNeg = false;
boolbExpOverflow = false;
-static const sal_uInt16 nExpLimit = 4096; // ACHTUNG: muss genauer
ermittelt werden!
+static const sal_uInt16 nExpLimit = 4096; // FIXME: has to be set
more accurately!
sal_Unicode cAkt;
boolbRet = false;
@@ -774,7 +774,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
case S_FINDEND:
if( IsNumberEnding( cAkt ) )
{
-bRet = true;// damit sinnvoll weitergeparst werden
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excdoc.cxx |4 +-
sc/source/filter/excel/excimp8.cxx |2 -
sc/source/filter/excel/expop2.cxx |2 -
sc/source/filter/excel/impop.cxx|2 -
sc/source/filter/excel/namebuff.cxx | 10 ++---
sc/source/filter/excel/read.cxx | 28 +++
sc/source/filter/excel/tokstack.cxx | 67 +---
7 files changed, 57 insertions(+), 58 deletions(-)
New commits:
commit be5b4223c803505064c6d82a3d209da560c9838b
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Sep 28 13:14:54 2014 -0400
fdo#39468 Translate German Comments - sc/source/filter/excel/
Change-Id: I2a5104c6da0cf9843c42b1687aec6eb9c459c3d4
Reviewed-on: https://gerrit.libreoffice.org/11735
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index 488f3cc..e84b474 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -228,7 +228,7 @@ void ExcTable::FillAsHeaderBinary( ExcBoundsheetList
rBoundsheetList )
Add( new XclExpUInt16Record( EXC_ID_FNGROUPCOUNT, 14 ) );
-// erst Namen- und Tabellen-Eintraege aufbauen
+// first setup table names and contents
for( nC = 0 ; nC nScTabCount ; nC++ )
if( rTabInfo.IsExportTab( nC ) )
@@ -370,7 +370,7 @@ void ExcTable::FillAsHeaderXml( ExcBoundsheetList
rBoundsheetList )
rR.pTabId = new XclExpChTrTabId( std::max( nExcTabCount, nCodenames ) );
Add( rR.pTabId );
-// erst Namen- und Tabellen-Eintraege aufbauen
+// first setup table names and contents
for( nC = 0 ; nC nScTabCount ; nC++ )
if( rTabInfo.IsExportTab( nC ) )
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index 9a3d312..0f59432 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -448,7 +448,7 @@ void ImportExcel8::PostDocLoad( void )
ImportExcel::PostDocLoad();
-// Scenarien bemachen! ACHTUNG: Hier wird Tabellen-Anzahl im Dokument
erhoeht!!
+// check scenarios; Attention: This increases the table count of the
document!!
if( !pD-IsClipboard() maScenList.aEntries.size() )
{
pD-UpdateChartListenerCollection();// references in charts must
be updated
diff --git a/sc/source/filter/excel/expop2.cxx
b/sc/source/filter/excel/expop2.cxx
index ade5794..8356acd 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -45,7 +45,7 @@ ExportBiff5::ExportBiff5( XclExpRootData rExpData, SvStream
rStrm ):
ExportTyp( rStrm, rExpData.mrDoc, rExpData.meTextEnc ),
XclExpRoot( rExpData )
{
-// nur Teil der Root-Daten gebraucht
+// only need part of the Root data
pExcRoot = GetOldRoot();
pExcRoot-pER = this; // ExcRoot - XclExpRoot
pExcRoot-eDateiTyp = Biff5;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b38440b..ca1ca75 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1127,7 +1127,7 @@ void ImportExcel::Bof4( void )
void ImportExcel::Bof5( void )
{
-//POST: eDateiTyp = Typ der zu lesenden Datei
+//POST: eDateiTyp = Type of the file to be read
sal_uInt16 nSubType, nVers;
BiffTyp eDatei;
diff --git a/sc/source/filter/excel/namebuff.cxx
b/sc/source/filter/excel/namebuff.cxx
index ab0981c..dde5392 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -120,10 +120,10 @@ bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex,
sal_uInt16 rScIndex )
}
if( rTabNum == 0x )
-{// neue Tabelle erzeugen
+{// create new table
SCTAB nNewTabNum;
if( pCur-bSWB )
-{// Tabelle ist im selben Workbook!
+{// table is in the same workbook!
if( pExcRoot-pIR-GetDoc().GetTable( pCur-aTab, nNewTabNum ) )
{
rScIndex = rTabNum = static_castsal_uInt16(nNewTabNum);
@@ -133,7 +133,7 @@ bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex,
sal_uInt16 rScIndex )
rTabNum = 0xFFFD;
}
else if( pExcRoot-pIR-GetDocShell() )
-{// Tabelle ist 'echt' extern
+{// table is 'really' external
if( pExcRoot-pIR-GetExtDocOptions().GetDocSettings().mnLinkCnt
== 0 )
{
OUString aURL( ScGlobal::GetAbsDocName( pCur-aFile,
@@ -145,8 +145,8 @@ bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex,
sal_uInt16 rScIndex )
return true;
}
else
-rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt
- wird
-// wohl auch nicht mehr gehen...
+rTabNum = 0xFFFE; // no table is created for now
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/8172/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/2937/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/8172/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/8172/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/2937/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/2937/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/8428/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/3955/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/2931/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/8174/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/8174/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/2931/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/63/8663/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/8174/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/2865/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/8428/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/2865/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/2931/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/2865/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/2966/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/8728/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/8664/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/8427/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/2534/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/8664/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/2938/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/2966/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/3237/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/2447/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/2552/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/8171/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/8667/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/3237/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/8429/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/8667/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/2552/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/3787/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/8171/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/2552/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/8429/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/2447/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/3162/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/8169/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/8169/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/3162/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/8169/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/3162/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/3162/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/8665/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/8665/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/63/3163/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/63/3163/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/63/3163/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/docfact.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit 6bc34153bc429b57694cfc59655814d0fe089e24
Author: Christian M. Heller christian.helle...@gmail.com
Date: Wed Mar 19 18:44:36 2014 -0400
fdo#39468 Translate German Comments - docfact.cxx
Change-Id: Ib9ca82b1b5f19dff439cd3119781a5f025b45231
Reviewed-on: https://gerrit.libreoffice.org/8663
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/basflt/docfact.cxx
b/sw/source/filter/basflt/docfact.cxx
index a95d122..c8c87c0 100644
--- a/sw/source/filter/basflt/docfact.cxx
+++ b/sw/source/filter/basflt/docfact.cxx
@@ -23,9 +23,6 @@
#include cmdid.h
-/**
- * Methode : SwDocFac::SwDocFac( SwDoc *pDoc )
-
**/
SwDocFac::SwDocFac( SwDoc *pDc )
: pDoc( pDc )
@@ -34,9 +31,6 @@ SwDocFac::SwDocFac( SwDoc *pDc )
pDoc-acquire();
}
-/**
- * Methode : SwDocFac::~SwDocFac()
-
**/
SwDocFac::~SwDocFac()
{
@@ -44,10 +38,6 @@ SwDocFac::~SwDocFac()
delete pDoc;
}
-/**
- * Methode : SwDoc *SwDocFac::GetDoc()
- * Beschreibung: Diese Methode legt immer einen Drucker an.
-
**/
SwDoc *SwDocFac::GetDoc()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/fltini.cxx | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 76358d0cd1ffc0fe81230e4fed12e259ad131366
Author: Christian M. Heller christian.helle...@gmail.com
Date: Wed Mar 19 18:58:51 2014 -0400
fdo#39468 Translate German Comments - fltini.cxx
Reviewed on:
https://gerrit.libreoffice.org/8664
Change-Id: I719fe3266b80fd6e4da73729c74f3d606708b691
diff --git a/sw/source/filter/basflt/fltini.cxx
b/sw/source/filter/basflt/fltini.cxx
index 00b6e9a..8374d19 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -137,7 +137,7 @@ Filters::Filters()
Filters::~Filters()
{
-// die Reader vernichten
+// kill Readers
for( sal_uInt16 n = 0; n MAXFILTER; ++n )
{
SwReaderWriterEntry rEntry = aReaderWriter[n];
@@ -188,7 +188,7 @@ SwRead GetReader( const OUString rFltName )
if ( aFilterDetect[n].IsFilter( rFltName ) )
{
pRead = aReaderWriter[n].GetReader();
-// fuer einige Reader noch eine Sonderbehandlung:
+// add special treatment for some readers
if ( pRead )
pRead-SetFltName( rFltName );
break;
@@ -214,7 +214,7 @@ sal_Bool SwReader::CheckPasswd( const OUString
/*rPasswd*/, const Reader /*rOp
return sal_True;
}
-// Filter Flags lesen, wird von WW8 / W4W / EXCEL / LOTUS benutzt.
+// Read Filter Flags; used by WW8 / W4W / EXCEL / LOTUS
/*
FilterFlags
@@ -323,9 +323,8 @@ void CalculateFlySize(SfxItemSet rFlySet, const
SwNodeIndex rAnchor,
aSz = (SwFmtFrmSize)(*pItem);
SwTwips nWidth;
-// dann die Breite des Flys selbst bestimmen. Ist eine Tabelle
-// defininiert, dann benutze deren Breite, sonst die Breite der
-// Seite
+// determine the width; if there is a table use the width of
the table;
+// otherwise use the width of the page
const SwTableNode* pTblNd = rAnchor.GetNode().FindTableNode();
if( pTblNd )
nWidth =
pTblNd-GetTable().GetFrmFmt()-GetFrmSize().GetWidth();
@@ -378,7 +377,7 @@ void CalculateFlySize(SfxItemSet rFlySet, const
SwNodeIndex rAnchor,
pFirstTxtNd-EraseText( aNdIdx, 2 );
}
-// Umrandung und Abstand zum Inhalt beachten
+// consider border and distance to content
const SvxBoxItem rBoxItem =
(SvxBoxItem)rFlySet.Get( RES_BOX );
sal_uInt16 nLine = BOX_LINE_LEFT;
for( int i = 0; i 2; ++i )
@@ -394,7 +393,7 @@ void CalculateFlySize(SfxItemSet rFlySet, const
SwNodeIndex rAnchor,
nLine = BOX_LINE_RIGHT;
}
-// Mindestbreite fuer Inhalt einhalten
+// enforce minimum width for contents
if( nMinFrm MINLAY )
nMinFrm = MINLAY;
if( nMaxFrm MINLAY )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/iodetect.cxx | 31 +++
1 file changed, 11 insertions(+), 20 deletions(-)
New commits:
commit a9db058c95d8be07c0734b450609153d87832d41
Author: Christian M. Heller christian.helle...@gmail.com
Date: Wed Mar 19 19:30:34 2014 -0400
fdo#39468 Translate German Comments - iodetect.cxx
Change-Id: I45d81df485ff62417f94c01234c3ddc41b6f3c77
Reviewed-on: https://gerrit.libreoffice.org/8665
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/basflt/iodetect.cxx
b/sw/source/filter/basflt/iodetect.cxx
index f53ad3b..af15200 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -47,7 +47,7 @@ SwIoDetect aFilterDetect[] =
OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const
{
-// Filter erkennung
+// Filter recognition
struct W1_FIB
{
SVBT16 wIdent; // 0x0 int magic number
@@ -92,7 +92,7 @@ OUString SwIoDetect::IsReader(const sal_Char* pHeader,
sal_uLong nLen_) const
const OUString SwIoSystem::GetSubStorageName( const SfxFilter rFltr )
{
-/* bei den StorageFiltern noch den SubStorageNamen setzen */
+// for StorageFilters also set the SubStorageName
const OUString rUserData = rFltr.GetUserData();
if (rUserData == FILTER_XML ||
rUserData == FILTER_XMLV ||
@@ -159,8 +159,8 @@ sal_Bool SwIoSystem::IsValidStgFilter(SotStorage rStg,
const SfxFilter rFilter
( rStg.IsContained( SwIoSystem::GetSubStorageName( rFilter )) );
if( bRet )
{
-/* Bug 53445 - es gibt Excel Docs ohne ClipBoardId! */
-/* Bug 62703 - und auch WinWord Docs ohne ClipBoardId! */
+/* Bug 53445 - there are Excel Docs w/o ClipBoardId! */
+/* Bug 62703 - and also WinWord Docs w/o ClipBoardId! */
if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() ==
sWW6)
{
bRet = (rStg.IsContained(OUString(0Table))
@@ -195,8 +195,8 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong
nBytesRead, sal_uLong nBufferL
}
}
-/* Feststellen ob das File in dem entsprechenden Format vorliegt. */
-/* Z.z werden nur unsere eigene Filter unterstuetzt */
+// Check if the file fits the corresponding format
+// Currently we only support our own filters
sal_Bool SwIoSystem::IsFileFilter(SfxMedium rMedium, const OUString rFmtName)
{
sal_Bool bRet = sal_False;
@@ -266,12 +266,10 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium rMedium,
const OUString rFmtName)
return bRet;
}
-/* die Methode stellt fest, von welchem Typ der stream (File) ist.*/
-/* Es wird versucht, eine dem Filter entsprechende Byte-Folge zu finden. */
-/* Wird kein entsprechender gefunden, wird zur Zeit der ASCII-Reader */
-/* returnt !! Der Returnwert ist der interne Filtername! */
-/* rPrefFltName ist der interne Name des Filters, den der Benutzer im */
-/* Open-Dialog eingestellt hat. */
+// Check the type of the stream (file) by searching for corresponding set of
bytes.
+// If no known type is found, return ASCII for now!
+// Returns the internal FilterName.
+// rPrefFltName is the internal FilterName that was chosen by the user in the
Open Dlg.
const SfxFilter* SwIoSystem::GetFileFilter(const OUString rFileName,
const OUString rPrefFltName, SfxMedium* pMedium)
{
@@ -372,12 +370,6 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString
rFileName,
TerminateBuffer(aBuffer, nBytesRead, sizeof(aBuffer));
-/* !!!*/
-/* suche nach dem bestimmten Filter, falls kein entsprechender*/
-/* gefunden wird, so wird der ASCII-Filter returnt. */
-/* Gibt es Filter ohne einen Identifizierungs-String, so werden diese */
-/* nie erkannt und es wird auch der ASCII-Filter returnt. */
-/* !!!*/
{
for( sal_uInt16 n = 0; n MAXFILTER; ++n )
{
@@ -391,8 +383,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString
rFileName,
}
}
-/* Ok, bis jetzt kein Filter gefunden, also befrage mal die */
-/* WORD 4 WORD Filter */
+// no filter recognized so far; thus check WORD 4 WORD Filter
if( !rFileName.isEmpty() )
{
if( pMedium )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/shellio.cxx | 116 +++-
1 file changed, 51 insertions(+), 65 deletions(-)
New commits:
commit 370c29237804bd0bd96ae34ab630681044857780
Author: Christian M. Heller christian.helle...@gmail.com
Date: Wed Mar 19 20:40:38 2014 -0400
fdo#39468 Translate German Comments - shellio.cxx
Change-Id: I932440ae95a6e7599168e88e9a17686b67763247
Reviewed-on: https://gerrit.libreoffice.org/8667
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/basflt/shellio.cxx
b/sw/source/filter/basflt/shellio.cxx
index 5f1f937..ed6e51a 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -58,14 +58,14 @@ using namespace ::com::sun::star;
sal_uLong SwReader::Read( const Reader rOptions )
{
-// Variable uebertragen
+// copy variables
Reader* po = (Reader*) rOptions;
po-pStrm = pStrm;
po-pStg = pStg;
po-xStg = xStg;
po-bInsertMode = 0 != pCrsr;
-// ist ein Medium angegeben, dann aus diesem die Streams besorgen
+// if a Medium is selected, get its Stream
if( 0 != (po-pMedium = pMedium )
!po-SetStrmStgPtr() )
{
@@ -80,7 +80,7 @@ sal_uLong SwReader::Read( const Reader rOptions )
GetDoc();
-// waehrend des einlesens kein OLE-Modified rufen
+// while reading, do not call OLE-Modified
Link aOLELink( pDoc-GetOle2Link() );
pDoc-SetOle2Link( Link() );
@@ -92,21 +92,17 @@ sal_uLong SwReader::Read( const Reader rOptions )
pPam = pCrsr;
else
{
-// Wenn der Reader nicht mit einem Shell konstruiert wurde,
-// selber einen Pam machen.
+// if the Reader was not called by a Shell, create a PaM ourselves
SwNodeIndex nNode( pDoc-GetNodes().GetEndOfContent(), -1 );
pPam = new SwPaM( nNode );
-// Bei Web-Dokumenten wird die Default-Vorlage schon im InitNew
-// gesetzt und braucht deshalb nicht nochmal gesetzt zu werden.
-// Das gilt natuerlich nicht, wenn der Filter nicht der HTML-Filter
-// ist oder im ConvertFrom zuvor ein SetTemplateName gerufen
-// wurde.
+// For Web documents the default template was set already by InitNew,
+// unless the filter is not HTML,
+// or a SetTemplateName was called in ConvertFrom.
if( !pDoc-get(IDocumentSettingAccess::HTML_MODE) || ReadHTML != po ||
!po-pTemplate )
po-SetTemplate( *pDoc );
}
-// Pams sind ringfoermig verkettet. Aufhoeren, wenn man wieder beim
-// ersten ist.
+// Pams are connected like rings; stop when we return to the 1st element
SwPaM *pEnd = pPam;
SwUndoInsDoc* pUndo = 0;
@@ -115,7 +111,7 @@ sal_uLong SwReader::Read( const Reader rOptions )
bool bSaveUndo = bDocUndo pCrsr;
if( bSaveUndo )
{
-// das Einlesen von Seitenvorlagen ist nicht Undofaehig!
+// the reading of the page template cannot be undone!
if( 0 != ( bReadPageDescs = po-aOpt.IsPageDescs() ) )
{
bSaveUndo = false;
@@ -134,7 +130,7 @@ sal_uLong SwReader::Read( const Reader rOptions )
RedlineMode_t eOld = pDoc-GetRedlineMode();
RedlineMode_t ePostReadRedlineMode( nsRedlineMode_t::REDLINE_IGNORE );
-// Array von FlyFormaten
+// Array of FlyFormats
SwFrmFmts aFlyFrmArr;
// only read templates? then ignore multi selection!
sal_Bool bFmtsOnly = po-aOpt.IsFmtsOnly();
@@ -149,12 +145,12 @@ sal_uLong SwReader::Read( const Reader rOptions )
SwPaM* pUndoPam = 0;
if( bDocUndo || pCrsr )
{
-// Pam auf den Node davor setzen damit er nicht mit verschoben wird
+// set Pam to the previous node, so that it is not also moved
const SwNodeIndex rTmp = pPam-GetPoint()-nNode;
pUndoPam = new SwPaM( rTmp, rTmp, 0, -1 );
}
-// Speicher mal alle Fly's
+// store for now all Fly's
if( pCrsr )
{
std::copy(pDoc-GetSpzFrmFmts()-begin(),
@@ -163,8 +159,7 @@ sal_uLong SwReader::Read( const Reader rOptions )
const sal_Int32 nSttCntnt = pPam-GetPoint()-nContent.GetIndex();
-// damit fuer alle Reader die Ende-Position immer stimmt, hier
-// pflegen.
+// make sure the End position is correct for all Readers
SwCntntNode* pCNd = pPam-GetCntntNode();
sal_Int32 nEndCntnt = pCNd ? pCNd-Len() - nSttCntnt : 0;
SwNodeIndex aEndPos( pPam-GetPoint()-nNode, 1 );
@@ -178,7 +173,7 @@ sal_uLong SwReader::Read( const Reader rOptions )
pDoc-SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
-if( !IsError( nError )) // dann setzen wir das Ende mal richtig
+if( !IsError( nError )) // set the End position already
{
aEndPos--;
pCNd = aEndPos.GetNode
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dlgctrl.cxx | 63 ++
1 file changed, 28 insertions(+), 35 deletions(-)
New commits:
commit 0a4f02575f9dfbd6e5706bd025093d110ed97f65
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Mar 2 17:57:57 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dlgctrl.cxx
Change-Id: Ibfae3f4d94f675db0275e83f8d5f074269713cad
Reviewed-on: https://gerrit.libreoffice.org/8427
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 5bc9c92..531581f 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -86,11 +86,10 @@ static Window* ImplGetSubChildWindow( Window* pParent,
sal_uInt16 n, sal_uInt16
{
pWindow = pWindow-ImplGetWindow();
-// Unsichtbare und disablte Fenster werden uebersprungen
+// skip invisible and disabled windows
if ( pTabPage || isVisibleInLayout(pWindow) )
{
-// Wenn das letzte Control ein TabControl war, wird von
-// diesem die TabPage genommen
+// if the last control was a TabControl, take its TabPage
if ( pTabPage )
{
pFoundWindow = ImplGetSubChildWindow( pTabPage, n, nIndex );
@@ -100,17 +99,13 @@ static Window* ImplGetSubChildWindow( Window* pParent,
sal_uInt16 n, sal_uInt16
{
pFoundWindow = pWindow;
-// Bei einem TabControl sich die aktuelle TabPage merken,
-// damit diese dann genommen wird
+// for a TabControl, remember the current TabPage for later use
if ( pWindow-GetType() == WINDOW_TABCONTROL )
{
TabControl* pTabControl = ((TabControl*)pWindow);
-// Feststellen, ob TabPage Child vom TabControl ist
-// und auch noch existiert (deshalb durch Vergleich,
-// indem alle ChildFenster getestet werden). Denn es
-// kann sein, das TabPages schon in einem Dialog-Dtor
-// zerstoert wurden, obwohl das TabControl noch
-// existiert.
+// Check if the TabPage is a Child of the TabControl and
still exists (by
+// walking all child windows); because it could be that
the TabPage has been
+// destroyed already by a Dialog-Dtor, event that the
TabControl still exists.
TabPage* pTempTabPage = pTabControl-GetTabPage(
pTabControl-GetCurPageId() );
if ( pTempTabPage )
{
@@ -249,7 +244,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex,
sal_uInt16 nType,
if ( i = nFormEnd )
{
-// 2ten Index mitfuehren, falls alle Controls disablte
+// carry the 2nd index, in case all controls are disabled
sal_uInt16 nStartIndex2 = i;
sal_uInt16 nOldIndex = i+1;
@@ -316,7 +311,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
sal_uInt16 nSecondFormStart = 0;
sal_uInt16 nFormEnd;
-// Focus-Fenster in der Child-Liste suchen
+// find focus window in the child list
Window* pFirstChildWindow = pSWindow = ImplGetChildWindow( pParent, 0, i,
false );
if( pWindow == NULL )
@@ -329,8 +324,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
pSWindow-ImplGetWindow()-IsDialogControlStart() )
nFormStart = i;
-// SecondWindow wegen zusammengesetzten Controls wie
-// ComboBoxen und Feldern
+// SecondWindow for composit controls like ComboBoxes and arrays
if ( pSWindow-ImplIsWindowOrChild( pWindow ) )
{
pSecondWindow = pSWindow;
@@ -347,8 +341,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
if ( !pSWindow )
{
-// Fenster nicht gefunden, dann koennen wir auch keine
-// Steuerung uebernehmen
+// Window not found; we cannot handle it
if ( !pSecondWindow )
return NULL;
else
@@ -359,11 +352,11 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
}
}
-// Start-Daten setzen
+// initialize
rIndex = i;
rFormStart = nFormStart;
-// Formularende suchen
+// find end of template
nFormEnd = nFormStart;
pTempWindow = pSWindow;
sal_Int32 nIteration = 0;
@@ -445,7 +438,7 @@ static Window* ImplFindAccelWindow( Window* pParent,
sal_uInt16 rIndex, sal_Uni
return pMnemonicWidget;
}
-// Bei Static-Controls auf das naechste Controlm weiterschalten
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dockwin.cxx | 116 --
1 file changed, 12 insertions(+), 104 deletions(-)
New commits:
commit 204642f30767ae0b206a74dce34e2755e810b4a5
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 08:24:18 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dockwin.cxx
(BTW: There seems to be some duplication between dockwin and dockmgr)
Conflicts:
vcl/source/window/dockwin.cxx
Change-Id: Icaf421620f87de7512a461b778958f6e141946db
Reviewed-on: https://gerrit.libreoffice.org/8171
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index f733b53..8bf14c6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -34,15 +34,8 @@
#include salframe.hxx
-
-// ===
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
-// ===
-
-
-
class DockingWindow::ImplData
{
public:
@@ -63,8 +56,6 @@ DockingWindow::ImplData::~ImplData()
{
}
-
-
class ImplDockFloatWin : public FloatingWindow
{
private:
@@ -104,7 +95,7 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits
nWinBits,
mbInMove( false ),
mnLastUserEvent( 0 )
{
-// Daten vom DockingWindow uebernehmen
+// copy settings of DockingWindow
if ( pDockingWin )
{
SetSettings( pDockingWin-GetSettings() );
@@ -121,16 +112,12 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent,
WinBits nWinBits,
maDockTimer.SetTimeout( 50 );
}
-
-
ImplDockFloatWin::~ImplDockFloatWin()
{
if( mnLastUserEvent )
Application::RemoveUserEvent( mnLastUserEvent );
}
-
-
IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
{
DBG_ASSERT( mpDockWin-IsFloatingMode(), docktimer called but not
floating );
@@ -220,8 +207,6 @@ void ImplDockFloatWin::Move()
mnLastUserEvent = Application::PostUserEvent( LINK( this,
ImplDockFloatWin, DockingHdl ) );
}
-
-
void ImplDockFloatWin::Resize()
{
FloatingWindow::Resize();
@@ -229,54 +214,41 @@ void ImplDockFloatWin::Resize()
mpDockWin-ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(),
WINDOW_POSSIZE_POSSIZE );
}
-
-
void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton )
{
FloatingWindow::TitleButtonClick( nButton );
mpDockWin-TitleButtonClick( nButton );
}
-
-
void ImplDockFloatWin::Pin()
{
FloatingWindow::Pin();
mpDockWin-Pin();
}
-
-
void ImplDockFloatWin::Roll()
{
FloatingWindow::Roll();
mpDockWin-Roll();
}
-
-
void ImplDockFloatWin::PopupModeEnd()
{
FloatingWindow::PopupModeEnd();
mpDockWin-PopupModeEnd();
}
-
-
void ImplDockFloatWin::Resizing( Size rSize )
{
FloatingWindow::Resizing( rSize );
mpDockWin-Resizing( rSize );
}
-
-
bool ImplDockFloatWin::Close()
{
return mpDockWin-Close();
}
-// ===
bool DockingWindow::ImplStartDocking( const Point rPos )
{
@@ -289,7 +261,7 @@ bool DockingWindow::ImplStartDocking( const Point rPos )
mbLastFloatMode = IsFloatingMode();
mbStartFloat= mbLastFloatMode;
-// FloatingBorder berechnen
+// calculate FloatingBorder
FloatingWindow* pWin;
if ( mpFloatWin )
pWin = mpFloatWin;
@@ -331,7 +303,6 @@ bool DockingWindow::ImplStartDocking( const Point rPos )
return true;
}
-// ===
void DockingWindow::ImplInitDockingWindowData()
{
@@ -349,8 +320,6 @@ void DockingWindow::ImplInitDockingWindowData()
mbHideBtn = false;
}
-
-
void DockingWindow::ImplInit( Window* pParent, WinBits nStyle )
{
if ( !(nStyle WB_NODIALOGCONTROL) )
@@ -368,12 +337,10 @@ void DockingWindow::ImplInit( Window* pParent, WinBits
nStyle )
ImplInitSettings();
}
-
-
void DockingWindow::ImplInitSettings()
{
-// Hack, damit man auch DockingWindows ohne Hintergrund bauen kann
-// und noch nicht alles umgestellt ist
+// Hack: to be able to build DockingWindows w/o background before switching
+// TODO: Hack
if ( IsBackground() )
{
const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -389,8 +356,6 @@ void DockingWindow::ImplInitSettings()
}
}
-
-
void DockingWindow::ImplLoadRes( const ResId rResId )
{
Window::ImplLoadRes( rResId );
@@ -400,7 +365,7 @@ void DockingWindow::ImplLoadRes( const ResId rResId )
if ( (RSC_DOCKINGWINDOW_XYMAPMODE | RSC_DOCKINGWINDOW_X |
RSC_DOCKINGWINDOW_Y) nMask )
{
-// Groessenangabe aus der Resource verwenden
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/floatwin.cxx | 80 -
1 file changed, 17 insertions(+), 63 deletions(-)
New commits:
commit 4e5fb3ae8aaa7a65b065f0415fe4df667dab3def
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 09:04:00 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/floatwin.cxx
Conflicts:
vcl/source/window/floatwin.cxx
Change-Id: I5cf91515e088f7f7bb766089c0812b023ecb3bdd
Reviewed-on: https://gerrit.libreoffice.org/8172
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 285b161..f006df8 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -34,8 +34,6 @@
#include tools/debug.hxx
-// ===
-
class FloatingWindow::ImplData
{
public:
@@ -60,7 +58,6 @@ Rectangle FloatingWindow::ImplGetItemEdgeClipRect()
return mpImplData-maItemEdgeClipRect;
}
-// ===
void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
{
@@ -138,8 +135,6 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits
nStyle )
ImplInitSettings();
}
-
-
void FloatingWindow::ImplInitSettings()
{
const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -154,7 +149,6 @@ void FloatingWindow::ImplInitSettings()
SetBackground( aColor );
}
-// ===
FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) :
SystemWindow( WINDOW_FLOATINGWINDOW )
@@ -162,8 +156,6 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits
nStyle ) :
ImplInit( pParent, nStyle );
}
-
-
FloatingWindow::FloatingWindow( Window* pParent, const ResId rResId ) :
SystemWindow( WINDOW_FLOATINGWINDOW )
{
@@ -176,8 +168,6 @@ FloatingWindow::FloatingWindow( Window* pParent, const
ResId rResId ) :
Show();
}
-
-
void FloatingWindow::ImplLoadRes( const ResId rResId )
{
SystemWindow::ImplLoadRes( rResId );
@@ -187,7 +177,7 @@ void FloatingWindow::ImplLoadRes( const ResId rResId )
if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH |
RSC_FLOATINGWINDOW_HEIGHT) nObjMask )
{
-// Groessenangabe aus der Resource verwenden
+// use Sizes from the Resource
SizeaSize;
MapUnit eSizeMap = MAP_PIXEL;
@@ -208,8 +198,6 @@ void FloatingWindow::ImplLoadRes( const ResId rResId )
}
}
-
-
FloatingWindow::~FloatingWindow()
{
if( mbPopupModeCanceled )
@@ -226,20 +214,16 @@ FloatingWindow::~FloatingWindow()
delete mpImplData;
}
-
-
Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle
rRect, sal_uLong nFlags, sal_uInt16 rArrangeIndex )
{
return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex );
}
-
-
Point FloatingWindow::ImplCalcPos( Window* pWindow,
const Rectangle rRect, sal_uLong nFlags,
sal_uInt16 rArrangeIndex )
{
-// Fenster-Position ermitteln
+// get window position
Point aPos;
SizeaSize = pWindow-GetSizePixel();
Rectangle aScreenRect =
pWindow-ImplGetFrameWindow()-GetDesktopRectPixel();
@@ -397,7 +381,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
break;
}
-// Evt. noch anpassen
+// adjust if necessary
if ( bBreak !(nFlags FLOATWIN_POPUPMODE_NOAUTOARRANGE) )
{
if ( (nArrangeAry[nArrangeIndex] == FLOATWIN_POPUPMODE_LEFT) ||
@@ -447,8 +431,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
return pW-OutputToScreenPixel( aPos );
}
-
-
FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const
Point rPos, sal_uInt16 rHitTest )
{
FloatingWindow* pWin = this;
@@ -505,8 +487,6 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window*
pReference, const Poin
return NULL;
}
-
-
FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
{
FloatingWindow* pWin = this;
@@ -524,8 +504,6 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
return pLastFoundWin;
}
-
-
bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow )
{
FloatingWindow* pWin = this;
@@ -542,8 +520,6 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const
Window* pWindow )
return false;
}
-
-
IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
{
mnPostId= 0;
@@ -553,11 +529,9 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
return 0;
}
-
-
bool FloatingWindow::Notify( NotifyEvent rNEvt )
{
-// Zuerst Basisklasse rufen wegen TabSteuerung
+// call Base Class first for tab control
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox2.cxx | 277 ++---
1 file changed, 43 insertions(+), 234 deletions(-)
New commits:
commit 45261b88c4935c0a6dd57e8a47438b799d091957
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 11:41:20 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/toolbox2.cxx
Conflicts:
vcl/source/window/toolbox2.cxx
Change-Id: Ifcb3a31733d8122d228596e8ec1253990f979471
Reviewed-on: https://gerrit.libreoffice.org/8174
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ea5e3ef..aa27d30 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -56,12 +56,9 @@
using namespace vcl;
using namespace com::sun::star;
-// ===
#define TB_SEP_SIZE 8
-
-
ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
m_pLayoutData( NULL ),
mpImageListProvider( NULL ),
@@ -125,8 +122,6 @@ ImplToolItem::ImplToolItem()
init(0, 0, true);
}
-
-
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image rImage,
ToolBoxItemBits nItemBits ) :
maImage( rImage )
@@ -134,8 +129,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
Image rImage,
init(nItemId, nItemBits, false);
}
-
-
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString rText,
ToolBoxItemBits nItemBits ) :
maText( rText )
@@ -143,8 +136,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
OUString rText,
init(nItemId, nItemBits, false);
}
-
-
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image rImage,
const OUString rText, ToolBoxItemBits nItemBits )
:
maImage( rImage ),
@@ -153,8 +144,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
Image rImage,
init(nItemId, nItemBits, false);
}
-
-
ImplToolItem::ImplToolItem( const ImplToolItem rItem ) :
mpWindow( rItem.mpWindow ),
mpUserData ( rItem.mpUserData ),
@@ -188,14 +177,10 @@ ImplToolItem::ImplToolItem( const ImplToolItem rItem ) :
{
}
-
-
ImplToolItem::~ImplToolItem()
{
}
-
-
ImplToolItem ImplToolItem::operator=( const ImplToolItem rItem )
{
mpWindow= rItem.mpWindow;
@@ -230,8 +215,6 @@ ImplToolItem ImplToolItem::operator=( const ImplToolItem
rItem )
return *this;
}
-
-
Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth,
const Size rDefaultSize )
{
Size aSize( rDefaultSize ); // the size of 'standard' toolbox items
@@ -284,8 +267,6 @@ Size ImplToolItem::GetSize( bool bHorz, bool
bCheckMaxWidth, long maxWidth, cons
return aSize;
}
-
-
void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool
rbImage, bool rbText ) const
{
if ( meType != TOOLBOXITEM_BUTTON )
@@ -344,8 +325,6 @@ void ImplToolItem::DetermineButtonDrawStyle( ButtonType
eButtonType, bool rbIma
}
}
-
-
Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const
{
Rectangle aRect;
@@ -362,23 +341,16 @@ Rectangle ImplToolItem::GetDropDownRect( bool bHorz )
const
return aRect;
}
-
-
bool ImplToolItem::IsClipped() const
{
return ( meType == TOOLBOXITEM_BUTTON mbVisible maRect.IsEmpty() );
}
-
-
bool ImplToolItem::IsItemHidden() const
{
return ( meType == TOOLBOXITEM_BUTTON !mbVisible );
}
-
-
-
const OUString ToolBox::ImplConvertMenuString( const OUString rStr )
{
OUString aCvtStr( rStr );
@@ -388,8 +360,6 @@ const OUString ToolBox::ImplConvertMenuString( const
OUString rStr )
return aCvtStr;
}
-
-
void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint )
{
ImplUpdateInputEnable();
@@ -401,7 +371,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool
bFullPaint )
{
mbFormat = true;
-// Muss ueberhaupt eine neue Ausgabe erfolgen
+// do we need to redraw?
if ( IsReallyVisible() IsUpdateMode() )
{
Invalidate( Rectangle( mnLeftBorder, mnTopBorder,
@@ -415,7 +385,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool
bFullPaint )
{
mbFormat = true;
-// Muss ueberhaupt eine neue Ausgabe erfolgen
+// do we need to redraw?
if ( IsReallyVisible() IsUpdateMode() )
maTimer.Start();
}
@@ -425,11 +395,9 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool
bFullPaint )
ImplCallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED );
}
-
-
void ToolBox::ImplUpdateItem( sal_uInt16 nIndex )
{
-// Muss ueberhaupt eine neue Ausgabe erfolgen
+// do we need to redraw?
if ( IsReallyVisible() IsUpdateMode() )
{
if ( nIndex
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dockmgr.cxx | 93 +++---
1 file changed, 7 insertions(+), 86 deletions(-)
New commits:
commit d5688e16e72aea26b2bf281efc71e9fadf74944c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 07:46:15 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dockmgr.cxx
Conflicts:
vcl/source/window/dockmgr.cxx
Change-Id: I0af8a95eab8b05752bb4497295d26b717021d3fd
Reviewed-on: https://gerrit.libreoffice.org/8169
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 0e80b6d..fc865cd 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -37,14 +37,8 @@
#include vcl/settings.hxx
-// ===
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
-// ===
-
-
-// ===
class ImplDockFloatWin2 : public FloatingWindow
{
@@ -81,7 +75,6 @@ public:
sal_uLong GetLastTicks() const { return mnLastTicks; }
};
-// ===
ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
ImplDockingWindowWrapper* pDockingWin ) :
@@ -91,7 +84,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent,
WinBits nWinBits,
mbInMove( false ),
mnLastUserEvent( 0 )
{
-// Daten vom DockingWindow uebernehmen
+// copy state of DockingWindow
if ( pDockingWin )
{
SetSettings( pDockingWin-GetWindow()-GetSettings() );
@@ -110,16 +103,12 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent,
WinBits nWinBits,
maEndDockTimer.SetTimeout( 50 );
}
-
-
ImplDockFloatWin2::~ImplDockFloatWin2()
{
if( mnLastUserEvent )
Application::RemoveUserEvent( mnLastUserEvent );
}
-
-
IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
{
DBG_ASSERT( mpDockWin-IsFloatingMode(), docktimer called but not
floating );
@@ -264,8 +253,6 @@ void ImplDockFloatWin2::Move()
mnLastUserEvent = Application::PostUserEvent( LINK( this,
ImplDockFloatWin2, DockingHdl ) );
}
-
-
void ImplDockFloatWin2::Resize()
{
// forwarding of resize only required if we have no borderwindow (
GetWindow() then returns 'this' )
@@ -273,7 +260,7 @@ void ImplDockFloatWin2::Resize()
{
FloatingWindow::Resize();
Size aSize( GetSizePixel() );
-mpDockWin-GetWindow()-ImplPosSizeWindow( 0, 0, aSize.Width(),
aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // is this needed ???
+mpDockWin-GetWindow()-ImplPosSizeWindow( 0, 0, aSize.Width(),
aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // TODO: is this needed ???
}
}
@@ -284,55 +271,41 @@ void ImplDockFloatWin2::setPosSizePixel( long nX, long nY,
FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
-
-
-
void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton )
{
FloatingWindow::TitleButtonClick( nButton );
mpDockWin-TitleButtonClick( nButton );
}
-
-
void ImplDockFloatWin2::Pin()
{
FloatingWindow::Pin();
mpDockWin-Pin();
}
-
-
void ImplDockFloatWin2::Roll()
{
FloatingWindow::Roll();
mpDockWin-Roll();
}
-
-
void ImplDockFloatWin2::PopupModeEnd()
{
FloatingWindow::PopupModeEnd();
mpDockWin-PopupModeEnd();
}
-
-
void ImplDockFloatWin2::Resizing( Size rSize )
{
FloatingWindow::Resizing( rSize );
mpDockWin-Resizing( rSize );
}
-
-
bool ImplDockFloatWin2::Close()
{
return mpDockWin-Close();
}
-// ===
DockingManager::DockingManager()
{
@@ -437,8 +410,6 @@ bool DockingManager::IsInPopupMode( const Window *pWindow )
return false;
}
-
-
void DockingManager::EndPopupMode( const Window *pWin )
{
ImplDockingWindowWrapper *pWrapper = GetDockingWindowWrapper( pWin );
@@ -446,8 +417,6 @@ void DockingManager::EndPopupMode( const Window *pWin )
pWrapper-GetFloatingWindow()-EndPopupMode();
}
-
-
void DockingManager::AddWindow( const Window *pWindow )
{
ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow );
@@ -838,8 +807,6 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent
rTEvt )
}
-// ===
-
ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
{
ImplInitData();
@@ -866,8 +833,6 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
}
}
-
-
bool ImplDockingWindowWrapper::ImplStartDocking( const Point rPos
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/graphicfilter.cxx |5 --
vcl/source/filter/graphicfilter2.cxx | 84 ---
2 files changed, 41 insertions(+), 48 deletions(-)
New commits:
commit 791b4eedfba1e913037d88a3c185dc01c9ea24be
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat May 18 07:18:25 2013 -0400
fdo#39468 Translate German comments - graphicfilter
Change-Id: I4e64c2d9ca8d85251a4cde5d3ab68f0956a4f0d1
Reviewed-on: https://gerrit.libreoffice.org/3955
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index f6d1a9f..204fe2e 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -770,8 +770,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream rStream,
String rFormatExtensio
sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const String rPath, SvStream
rStream, sal_uInt16 rFormat )
{
-// ggf. Filter bzw. Format durch anlesen ermitteln,
-// oder durch anlesen zusichern, dass das Format stimmt:
+// determine or check the filter/format by reading into it
if( rFormat == GRFILTER_FORMAT_DONTKNOW )
{
String aFormatExt;
@@ -781,7 +780,7 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const
String rPath, SvStream rS
if( rFormat != GRFILTER_FORMAT_DONTKNOW )
return GRFILTER_OK;
}
-// ggf. Filter anhand der Datei-Endung raussuchen:
+// determine filter by file extension
if( rPath.Len() )
{
String aExt( ImpGetExtension( rPath ) );
diff --git a/vcl/source/filter/graphicfilter2.cxx
b/vcl/source/filter/graphicfilter2.cxx
index 24a182d..8e28214 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -130,42 +130,41 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream rStm,
sal_Bool bExtendedInfo
sal_uInt32 nTemp32;
sal_uInt32 nCompression;
-// bis zur ersten Information
+// up to first info
rStm.SeekRel( 0x10 );
-// PixelBreite auslesen
+// Pixel width
rStm nTemp32;
aPixSize.Width() = nTemp32;
-// PixelHoehe auslesen
+// Pixel height
rStm nTemp32;
aPixSize.Height() = nTemp32;
-// Planes auslesen
+// Planes
rStm nTemp16;
nPlanes = nTemp16;
-// BitCount auslesen
+// BitCount
rStm nTemp16;
nBitsPerPixel = nTemp16;
-// Compression auslesen
+// Compression
rStm nTemp32;
bCompressed = ( ( nCompression = nTemp32 ) 0 );
-// logische Breite
+// logical width
rStm.SeekRel( 4 );
rStm nTemp32;
if ( nTemp32 )
aLogSize.Width() = ( aPixSize.Width() * 10 ) / nTemp32;
-// logische Hoehe
+// logical height
rStm nTemp32;
if ( nTemp32 )
aLogSize.Height() = ( aPixSize.Height() * 10 ) / nTemp32;
-// Wir wollen noch etwas feiner differenzieren und
-// auf sinnvolle Werte ueberpruefen ( Bug-Id #29001 )
+// further validation, check for rational values
if ( ( nBitsPerPixel 24 ) || ( nCompression 3 ) )
{
nFormat = GFF_NOT;
@@ -200,15 +199,15 @@ sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream rStm,
sal_Bool bExtendedInfo
{
sal_uInt16 nTemp16;
-// PixelBreite auslesen
+// Pixel width
rStm nTemp16;
aPixSize.Width() = nTemp16;
-// PixelHoehe auslesen
+// Pixel height
rStm nTemp16;
aPixSize.Height() = nTemp16;
-// Bits/Pixel auslesen
+// Bits/Pixel
rStm cByte;
nBitsPerPixel = ( ( cByte 112 ) 4 ) + 1;
}
@@ -461,17 +460,17 @@ sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream rStm,
sal_Bool bExtendedInfo
rStm.SeekRel( 1 );
-// Kompression lesen
+// compression
rStm cByte;
bCompressed = ( cByte 0 );
bRet = (cByte==0 || cByte ==1);
-// Bits/Pixel lesen
+// Bits/Pixel
rStm cByte;
nBitsPerPixel = cByte;
-// Bildabmessungen
+// image dimensions
rStm nTemp16;
nXmin = nTemp16;
rStm nTemp16;
@@ -484,20 +483,20 @@ sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream rStm,
sal_Bool bExtendedInfo
aPixSize.Width() = nXmax - nXmin + 1
[PATCH] fdo#39468 Translate German comments - graphicfilter
; aLogSize = OutputDevice::LogicToLogic( aLogSize, MapMode( (MapUnit) nTemp16 ), -- To view, visit https://gerrit.libreoffice.org/3955 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e64c2d9ca8d85251a4cde5d3ab68f0956a4f0d1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/textund2.hxx |6 -
vcl/source/edit/textundo.cxx | 53 +--
vcl/source/edit/textview.cxx | 146 ---
vcl/source/edit/vclmedit.cxx | 38 ---
vcl/source/edit/xtextedt.cxx | 35 --
5 files changed, 108 insertions(+), 170 deletions(-)
New commits:
commit b27ec833fe14527e810014f682e036cbfc0ddc1d
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat May 4 16:34:02 2013 -0400
fdo#39468 Translate German Comments - rest of vcl/source/edit/...
Change-Id: I6cb657853cf3e8d4e35c0dc09be6a4a15ba3a336
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 17a2918..396317e 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -26,9 +26,9 @@
class TextUndoDelPara : public TextUndo
{
private:
-sal_BoolmbDelObject;
-sal_uLong mnPara;
-TextNode* mpNode; // Zeigt auf das gueltige, nicht zerstoerte Objekt!
+sal_BoolmbDelObject;
+sal_uLong mnPara;
+TextNode* mpNode; // points at the valid not-destroyed object
public:
TYPEINFO();
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 3cbb85d..51b3826 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -65,10 +65,6 @@ void Shorten (OUString rString)
} // namespace
-//
-// TextUndoManager
-// ===
-//
TextUndoManager::TextUndoManager( TextEngine* p )
{
@@ -115,9 +111,6 @@ sal_Bool TextUndoManager::Redo()
void TextUndoManager::UndoRedoStart()
{
DBG_ASSERT( GetView(), Undo/Redo: Active View? );
-
-// if ( GetView() )
-// GetView()-HideSelection();
}
void TextUndoManager::UndoRedoEnd()
@@ -134,12 +127,6 @@ void TextUndoManager::UndoRedoEnd()
mpTextEngine-FormatAndUpdate( GetView() );
}
-
-//
-// TextUndo
-//
-//
-
TextUndo::TextUndo( TextEngine* p )
{
mpTextEngine = p;
@@ -160,12 +147,6 @@ void TextUndo::SetSelection( const TextSelection rSel )
GetView()-ImpSetSelection( rSel );
}
-
-//
-// TextUndoDelPara
-// ===
-//
-
TextUndoDelPara::TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode,
sal_uLong nPara )
: TextUndo( pTextEngine )
{
@@ -183,7 +164,7 @@ TextUndoDelPara::~TextUndoDelPara()
void TextUndoDelPara::Undo()
{
GetTextEngine()-InsertContent( mpNode, mnPara );
-mbDelObject = sal_False;// gehoert wieder der Engine
+mbDelObject = sal_False;// belongs again to the engine
if ( GetView() )
{
@@ -194,18 +175,17 @@ void TextUndoDelPara::Undo()
void TextUndoDelPara::Redo()
{
-// pNode stimmt nicht mehr, falls zwischendurch Undos, in denen
-// Absaetze verschmolzen sind.
+// pNode is not valid anymore in case an Undo joined paragraphs
mpNode = GetDoc()-GetNodes().GetObject( mnPara );
delete GetTEParaPortions()-GetObject( mnPara );
GetTEParaPortions()-Remove( mnPara );
-// Node nicht loeschen, haengt im Undo!
+// do not delete Node because of Undo!
GetDoc()-GetNodes().Remove( mnPara );
GetTextEngine()-ImpParagraphRemoved( mnPara );
-mbDelObject = sal_True; // gehoert wieder dem Undo
+mbDelObject = sal_True; // belongs again to the Undo
sal_uLong nParas = GetDoc()-GetNodes().Count();
sal_uLong n = mnPara nParas ? mnPara : (nParas-1);
@@ -219,12 +199,6 @@ OUString TextUndoDelPara::GetComment () const
return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr());
}
-
-//
-// TextUndoConnectParas
-//
-//
-
TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong
nPara, sal_uInt16 nPos )
: TextUndo( pTextEngine )
{
@@ -253,12 +227,6 @@ OUString TextUndoConnectParas::GetComment () const
return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr());
}
-
-//
-// TextUndoSplitPara
-// =
-//
-
TextUndoSplitPara::TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong
nPara, sal_uInt16 nPos )
: TextUndo( pTextEngine )
{
@@ -287,12 +255,6 @@ OUString TextUndoSplitPara::GetComment () const
return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr());
}
-
-//
-// TextUndoInsertChars
-// ===
-//
-
TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const
TextPaM rTextPaM, const XubString rStr )
: TextUndo( pTextEngine ),
maTextPaM( rTextPaM ), maText( rStr )
@@ -342,13 +304,6 @@ OUString TextUndoInsertChars::GetComment () const
return OUString(ResId(STR_TEXTUNDO_INSERTCHARS,
*ImplGetResMgr())).replaceAll($1, sText);
}
-
-
-//
-// TextUndoRemoveChars
-// ===
-//
-
TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const
TextPaM rTextPaM, const XubString rStr )
: TextUndo( pTextEngine
[PATCH] fdo#39468 Translate German Comments - rest of vcl/source/edi...
the beginning of the word to the selection,
+// so that the whole word is in the visible region.
SetSelection( aSel.GetStart() );
ShowCursor( sal_True, sal_False );
}
@@ -289,7 +284,7 @@
{
InsertText( rSearchOptions.replaceString );
nFound = 1;
-Search( rSearchOptions, bForward ); // gleich zum naechsten
+Search( rSearchOptions, bForward ); // right away to the next
}
else
{
@@ -299,7 +294,7 @@
}
else
{
-// Der Writer ersetzt alle, vom Anfang bis Ende...
+// the writer replaces all, from beginning to end
ExtTextEngine* pTextEngine = (ExtTextEngine*)GetTextEngine();
@@ -351,20 +346,20 @@
sal_uLong nEndPara = aSel.GetEnd().GetPara();
if ( aSel.HasRange() !aSel.GetEnd().GetIndex() )
{
-nEndPara--; // den dann nicht einruecken...
+nEndPara--; // do not indent
}
for ( sal_uLong nPara = nStartPara; nPara = nEndPara; nPara++ )
{
if ( bRight )
{
-// Tabs hinzufuegen
+// add tabs
GetTextEngine()-ImpInsertText( TextPaM( nPara, 0 ), '\t' );
bDone = sal_True;
}
else
{
-// Tabs/Blanks entfernen
+// remove Tabs/Blanks
String aText = GetTextEngine()-GetText( nPara );
if ( aText.Len() (
( aText.GetChar( 0 ) == '\t' ) ||
--
To view, visit https://gerrit.libreoffice.org/3787
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cb657853cf3e8d4e35c0dc09be6a4a15ba3a336
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/textdata.cxx | 31 +++--
vcl/source/edit/textdoc.cxx | 97 ---
2 files changed, 45 insertions(+), 83 deletions(-)
New commits:
commit 4b9301d424baab155d9be56726c64aefb720
Author: Christian M. Heller christian.helle...@gmail.com
Date: Mon Apr 1 18:11:17 2013 -0400
fdo#39468 Translate German comments V2 - vcl/source/edit/{textdata, textdoc}
made the changes suggested by Thomas and Petr
Change-Id: I0f9e8dcda27a714628edaa5e1e8fd875c8f67593
Reviewed-on: https://gerrit.libreoffice.org/3162
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index f713947..bfc601f 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -24,10 +24,6 @@
#include tools/debug.hxx
-// -
-// (+) class TextSelection
-// -
-
TextSelection::TextSelection()
{
}
@@ -53,9 +49,6 @@ void TextSelection::Justify()
}
-// -
-// (+) class TETextPortionList
-// -
TETextPortionList::TETextPortionList()
{
}
@@ -82,7 +75,7 @@ void TETextPortionList::DeleteFromPortion( sal_uInt16
nDelFrom )
sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16
nPortionStart, sal_Bool bPreferStartingPortion )
{
-// Bei nCharPos an Portion-Grenze wird die linke Portion gefunden
+// find left portion at nCharPos at portion border
sal_uInt16 nTmpPos = 0;
for ( sal_uInt16 nPortion = 0; nPortion size(); nPortion++ )
{
@@ -103,9 +96,6 @@ sal_uInt16 TETextPortionList::FindPortion( sal_uInt16
nCharPos, sal_uInt16 nPor
}
-// -
-// (+) class TEParaPortion
-// -
TEParaPortion::TEParaPortion( TextNode* pN )
{
mpNode = pN;
@@ -127,13 +117,13 @@ void TEParaPortion::MarkInvalid( sal_uInt16 nStart, short
nDiff )
}
else
{
-// Einfaches hintereinander tippen
+// simple consecutive typing
if ( ( nDiff 0 ) ( mnInvalidDiff 0 )
( ( mnInvalidPosStart+mnInvalidDiff ) == nStart ) )
{
mnInvalidDiff = mnInvalidDiff + nDiff;
}
-// Einfaches hintereinander loeschen
+// simple consecutive deleting
else if ( ( nDiff 0 ) ( mnInvalidDiff 0 ) (
mnInvalidPosStart == nStart ) )
{
mnInvalidPosStart = mnInvalidPosStart + nDiff;
@@ -202,12 +192,11 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine(
sal_uInt16 nLastFormat
const TextLine* pUnformatted = maLines[ nLastFormattedLine+1 ];
short nPortionDiff = pUnformatted-GetStartPortion() -
pLastFormatted-GetEndPortion();
short nTextDiff = pUnformatted-GetStart() - pLastFormatted-GetEnd();
-nTextDiff++;// LastFormatted-GetEnd() war incl. = 1 zuviel
abgezogen!
+nTextDiff++;// LastFormatted-GetEnd() was inclusive = subtracted
one too much!
-// Die erste unformatierte muss genau eine Portion hinter der letzten
der
-// formatierten beginnen:
-// Wenn in der geaenderten Zeile eine Portion gesplittet wurde,
-// kann nLastEnd nNextStart sein!
+// The first unformated one has to start exactly one portion past the
last
+// formated one.
+// If a portion got split in the changed row, nLastEnd could be
nNextStart!
short nPDiff = sal::static_int_cast short (-( nPortionDiff-1 ));
short nTDiff = sal::static_int_cast short (-( nTextDiff-1 ));
if ( nPDiff || nTDiff )
@@ -228,9 +217,6 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine(
sal_uInt16 nLastFormat
}
}
-// -
-// (+) class TEParaPortions
-// -
TEParaPortions::TEParaPortions()
{
}
@@ -248,9 +234,6 @@ void TEParaPortions::Reset()
clear();
}
-// -
-// (+) class IdleFormatter
-// -
IdleFormatter::IdleFormatter()
{
mpView = 0;
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 5dc0394..7c9d28c 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -22,17 +22,12 @@
#include stdlib.h
-
-// Vergleichmethode wird von QuickSort gerufen...
-
+// compare function called by QuickSort
static bool CompareStart( const
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/texteng.cxx | 291 +++-
1 file changed, 126 insertions(+), 165 deletions(-)
New commits:
commit 51fddc6c52d04a2dccdfb7d04f8dd0455e8c4b95
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Apr 7 12:45:37 2013 -0400
fdo#39468 Translate German comments V2 - source/edit/texteng.cxx
Change-Id: Ifc02535cecc24d9362d2534784c659ee8705f751
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index b03924c..db76523 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -61,9 +61,6 @@ using namespace ::com::sun::star::uno;
using namespace ::rtl;
-// -
-// (-) class TextEngine
-// -
TextEngine::TextEngine()
{
mpDoc = 0;
@@ -118,7 +115,7 @@ TextEngine::~TextEngine()
delete mpIdleFormatter;
delete mpDoc;
delete mpTEParaPortions;
-delete mpViews; // nur die Liste, nicht die Vies
+delete mpViews; // only the list, not the Views
delete mpRefDev;
delete mpUndoManager;
delete mpIMEInfos;
@@ -188,8 +185,8 @@ void TextEngine::SetFont( const Font rFont )
else
maTextColor = rFont.GetColor();
-// Wegen Selektion keinen Transparenten Font zulassen...
-// (Sonst spaeter in ImplPaint den Hintergrund anders loeschen...)
+// Do not allow transparent fonts because of selection
+// (otherwise delete the background in ImplPaint later differently)
maFont.SetTransparent( sal_False );
// Tell VCL not to use the font color, use text color from OutputDevice
maFont.SetColor( COL_TRANSPARENT );
@@ -336,7 +333,7 @@ sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent
rKeyEvent )
case KEYFUNC_CUT:
case KEYFUNC_PASTE: bDoesChange = sal_True;
break;
-default:// wird dann evtl. unten bearbeitet.
+default:// might get handled below
eFunc = KEYFUNC_DONTKNOW;
}
}
@@ -421,7 +418,7 @@ String TextEngine::GetText( const TextSelection rSel,
LineEnd aSeparator ) cons
sal_uInt16 nEndPos = pNode-GetText().Len();
if ( nNode == nStartPara )
nStartPos = aSel.GetStart().GetIndex();
-if ( nNode == nEndPara ) // kann auch == nStart sein!
+if ( nNode == nEndPara ) // may also be == nStart!
nEndPos = aSel.GetEnd().GetIndex();
aText += pNode-GetText().Copy( nStartPos, nEndPos-nStartPos );
@@ -450,7 +447,7 @@ void TextEngine::SetText( const OUString rText )
ImpRemoveText();
sal_Bool bUndoCurrentlyEnabled = IsUndoEnabled();
-// Der von Hand reingesteckte Text kann nicht vom Anwender rueckgaengig
gemacht werden.
+// the manually inserted text cannot be reversed by the user
EnableUndo( sal_False );
TextPaM aStartPaM( 0, 0 );
@@ -465,13 +462,12 @@ void TextEngine::SetText( const OUString rText )
TextView* pView = (*mpViews)[ nView ];
pView-ImpSetSelection( aEmptySel );
-// Wenn kein Text, dann auch Kein FormatUpdate
-// = Der Text bleibt stehen.
+// if no text, then no FormatUpdate = the text remains
if ( rText.isEmpty() GetUpdateMode() )
pView-Invalidate();
}
-if( rText.isEmpty() ) // sonst muss spaeter noch invalidiert werden,
!bFormatted reicht.
+if( rText.isEmpty() ) // otherwise needs invalidation later; !bFormatted
is sufficient
mnCurTextHeight = 0;
FormatAndUpdate();
@@ -483,7 +479,7 @@ void TextEngine::SetText( const OUString rText )
void TextEngine::CursorMoved( sal_uLong nNode )
{
-// Leere Attribute loeschen, aber nur, wenn Absatz nicht leer!
+// delete empty attribute; but only if paragraph is not empty!
TextNode* pNode = mpDoc-GetNodes().GetObject( nNode );
if ( pNode pNode-GetCharAttribs().HasEmptyAttribs()
pNode-GetText().Len() )
pNode-GetCharAttribs().DeleteEmptyAttribs();
@@ -494,11 +490,11 @@ void TextEngine::ImpRemoveChars( const TextPaM rPaM,
sal_uInt16 nChars, SfxUndo
DBG_ASSERT( nChars, ImpRemoveChars: 0 Chars?! );
if ( IsUndoEnabled() !IsInUndo() )
{
-// Attribute muessen hier vorm RemoveChars fuer UNDO gesichert werden!
+// attributes have to be saved for UNDO before RemoveChars!
TextNode* pNode = mpDoc-GetNodes().GetObject( rPaM.GetPara() );
XubString aStr( pNode-GetText().Copy( rPaM.GetIndex(), nChars ) );
-// Pruefen, ob Attribute geloescht oder geaendert werden:
+// check if attributes are being deleted or changed
sal_uInt16 nStart = rPaM.GetIndex();
sal_uInt16 nEnd = nStart + nChars;
for ( sal_uInt16 nAttr = pNode-GetCharAttribs().Count(); nAttr; )
@@ -526,7 +522,7 @@ TextPaM TextEngine
[PATCH] fdo#39468 Translate German comments - source/edit/texteng.cx...
-// passiven muss die Selektion angepasst werden:
+// No adjustment needed for the active View;
+// but for all passive Views the Selection needs adjusting.
if ( mpViews-size() 1 )
{
for ( sal_uInt16 nView = mpViews-size(); nView; )
--
To view, visit https://gerrit.libreoffice.org/3237
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc02535cecc24d9362d2534784c659ee8705f751
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/texteng.cxx | 116 ++--
1 file changed, 58 insertions(+), 58 deletions(-)
New commits:
commit 4c5bada9d76d8f9247dd5fb269065f91abc233d0
Author: Christian M. Heller christian.helle...@gmail.com
Date: Mon Apr 1 19:25:10 2013 -0400
fdo#39468 Translate German in DBG_ASSERT and OSL_ENSURE in texteng.cxx
Change-Id: I9aac6a1f6e4a36fb95a518b752aef2066b45094c
Reviewed-on: https://gerrit.libreoffice.org/3163
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 261144a..7213ad1 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -477,7 +477,7 @@ void TextEngine::SetText( const OUString rText )
FormatAndUpdate();
EnableUndo( bUndoCurrentlyEnabled );
-DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(),
Undo nach SetText? );
+DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(),
SetText: Undo! );
}
@@ -491,7 +491,7 @@ void TextEngine::CursorMoved( sal_uLong nNode )
void TextEngine::ImpRemoveChars( const TextPaM rPaM, sal_uInt16 nChars,
SfxUndoAction* )
{
-DBG_ASSERT( nChars, ImpRemoveChars - 0 Chars?! );
+DBG_ASSERT( nChars, ImpRemoveChars: 0 Chars?! );
if ( IsUndoEnabled() !IsInUndo() )
{
// Attribute muessen hier vorm RemoveChars fuer UNDO gesichert werden!
@@ -518,7 +518,7 @@ void TextEngine::ImpRemoveChars( const TextPaM rPaM,
sal_uInt16 nChars, SfxUndo
TextPaM TextEngine::ImpConnectParagraphs( sal_uLong nLeft, sal_uLong nRight )
{
-DBG_ASSERT( nLeft != nRight, Den gleichen Absatz zusammenfuegen ? );
+DBG_ASSERT( nLeft != nRight, ImpConnectParagraphs: connect the very same
paragraph ? );
TextNode* pLeft = mpDoc-GetNodes().GetObject( nLeft );
TextNode* pRight = mpDoc-GetNodes().GetObject( nRight );
@@ -529,8 +529,8 @@ TextPaM TextEngine::ImpConnectParagraphs( sal_uLong nLeft,
sal_uLong nRight )
// Erstmal Portions suchen, da pRight nach ConnectParagraphs weg.
TEParaPortion* pLeftPortion = mpTEParaPortions-GetObject( nLeft );
TEParaPortion* pRightPortion = mpTEParaPortions-GetObject( nRight );
-DBG_ASSERT( pLeft pLeftPortion, Blinde Portion in
ImpConnectParagraphs(1) );
-DBG_ASSERT( pRight pRightPortion, Blinde Portion in
ImpConnectParagraphs(2) );
+DBG_ASSERT( pLeft pLeftPortion, ImpConnectParagraphs(1): Hidden
Portion );
+DBG_ASSERT( pRight pRightPortion, ImpConnectParagraphs(2): Hidden
Portion );
TextPaM aPaM = mpDoc-ConnectParagraphs( pLeft, pRight );
ImpParagraphRemoved( nRight );
@@ -557,8 +557,8 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection
rSel )
CursorMoved( aStartPaM.GetPara() ); // nur damit neu eingestellte
Attribute verschwinden...
CursorMoved( aEndPaM.GetPara() ); // nur damit neu eingestellte
Attribute verschwinden...
-DBG_ASSERT( mpDoc-IsValidPaM( aStartPaM ), Index im Wald in
ImpDeleteText );
-DBG_ASSERT( mpDoc-IsValidPaM( aEndPaM ), Index im Wald in ImpDeleteText
);
+DBG_ASSERT( mpDoc-IsValidPaM( aStartPaM ), ImpDeleteText(1): bad Index
);
+DBG_ASSERT( mpDoc-IsValidPaM( aEndPaM ), ImpDeleteText(2): bad Index );
sal_uLong nStartNode = aStartPaM.GetPara();
sal_uLong nEndNode = aEndPaM.GetPara();
@@ -579,7 +579,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection
rSel )
{
ImpRemoveChars( aStartPaM, nChars );
TEParaPortion* pPortion = mpTEParaPortions-GetObject( nStartNode
);
-DBG_ASSERT( pPortion, Blinde Portion in ImpDeleteText(3) );
+DBG_ASSERT( pPortion, ImpDeleteText(3): bad Index );
pPortion-MarkSelectionInvalid( aStartPaM.GetIndex(),
pLeft-GetText().Len() );
}
@@ -592,7 +592,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection
rSel )
aEndPaM.GetIndex() = 0;
ImpRemoveChars( aEndPaM, nChars );
TEParaPortion* pPortion = mpTEParaPortions-GetObject( nEndNode );
-DBG_ASSERT( pPortion, Blinde Portion in ImpDeleteText(4) );
+DBG_ASSERT( pPortion, ImpDeleteText(4): bad Index );
pPortion-MarkSelectionInvalid( 0,
pPortion-GetNode()-GetText().Len() );
}
@@ -605,7 +605,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection
rSel )
nChars = aEndPaM.GetIndex() - aStartPaM.GetIndex();
ImpRemoveChars( aStartPaM, nChars );
TEParaPortion* pPortion = mpTEParaPortions-GetObject( nStartNode );
-DBG_ASSERT( pPortion, Blinde Portion in ImpDeleteText(5) );
+DBG_ASSERT( pPortion, ImpDeleteText(5): bad Index );
pPortion-MarkInvalid( aEndPaM.GetIndex(), aStartPaM.GetIndex() -
aEndPaM.GetIndex() );
}
@@ -670,8 +670,8 @@ TextPaM TextEngine::ImpInsertText( const TextSelection
rCurSel, sal_Unicode c,
TextPaM
[PATCH] fdo#39468 Translate German comments - vcl/source/edit/{textd...
/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f9e8dcda27a714628edaa5e1e8fd875c8f67593 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 Translate German in DBG_ASSERT and OSL_ENSURE in t...
! );
if ( bLineBreak == sal_True )
CreateAndInsertEmptyLine( nPara );
@@ -2942,7 +2942,7 @@
{
if ( !mxBreakIterator.is() )
mxBreakIterator = vcl::unohelper::CreateBreakIterator();
-DBG_ASSERT( mxBreakIterator.is(), Could not create BreakIterator );
+DBG_ASSERT( mxBreakIterator.is(), BreakIterator: Failed to create! );
return mxBreakIterator;
}
@@ -2957,7 +2957,7 @@
{
if ( maLocale.Language.isEmpty() )
{
-maLocale = Application::GetSettings().GetUILanguageTag().getLocale();
// XXX why UI locale?
+maLocale = Application::GetSettings().GetUILanguageTag().getLocale();
// TODO: why UI locale?
}
return maLocale;
}
--
To view, visit https://gerrit.libreoffice.org/3163
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aac6a1f6e4a36fb95a518b752aef2066b45094c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/longcurr.cxx |5 ++---
vcl/source/control/scrbar.cxx |2 +-
vcl/source/control/slider.cxx | 38 +-
vcl/source/control/spinfld.cxx | 15 +++
vcl/source/control/tabctrl.cxx | 28 ++--
5 files changed, 41 insertions(+), 47 deletions(-)
New commits:
commit 69a9cffb9e6285a8735e4b35cdea9db4b118063c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Mar 24 10:28:49 2013 -0400
fdo#39468 Translate German comments - vcl/source/control/
FYI: there is some code duplication noticeable between slider and scrbar
Conflicts:
vcl/source/control/longcurr.cxx
vcl/source/control/lstbox.cxx
vcl/source/control/menubtn.cxx
vcl/source/control/morebtn.cxx
vcl/source/control/prgsbar.cxx
vcl/source/control/scrbar.cxx
Change-Id: I736cf155e252293ed571cd44a6a395b15c4bf576
Reviewed-on: https://gerrit.libreoffice.org/2966
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index ba5e5b3..52f28e8 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -188,7 +188,7 @@ static sal_Bool ImplNumericGetValue( const XubString rStr,
BigInt rValue,
bNegative = sal_True;
}
-// Throw out all unwanted chars
+// delete unwanted characters
for (xub_StrLen i=0; i aStr1.Len(); )
{
if ( (aStr1.GetChar( i ) = '0') (aStr1.GetChar( i ) = '9') )
@@ -226,7 +226,7 @@ static sal_Bool ImplNumericGetValue( const XubString rStr,
BigInt rValue,
aStr = aStr1;
aStr += aStr2.makeStringAndClear();
-// Boundscheck
+// check range
BigInt nValue( aStr );
if ( bRound )
{
@@ -420,7 +420,6 @@ void LongCurrencyFormatter::SetUseThousandSep( sal_Bool b )
void LongCurrencyFormatter::SetDecimalDigits( sal_uInt16 nDigits )
{
-
if ( nDigits 9 )
nDigits = 9;
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 5df8e29..8a85bb5 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1033,7 +1033,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent rMEvt )
// Should we start Tracking?
if ( meScrollType != SCROLL_DONTKNOW )
{
-// remember original position in case of abort or EndScroll-Delta
+// store original position for cancel and EndScroll delta
mnStartPos = mnThumbPos;
// #92906# Call StartTracking() before ImplDoMouseAction(),
otherwise
// MouseButtonUp() / EndTracking() may be called if somebody is
spending
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index b6e1913..6bfaa2a 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -222,7 +222,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate )
long Slider::ImplCalcThumbPos( long nPixPos )
{
-// Position berechnen
+// calculate position
long nCalcThumbPos;
nCalcThumbPos = ImplMulDiv( nPixPos-mnThumbPixOffset,
mnMaxRange-mnMinRange, mnThumbPixRange-1 );
nCalcThumbPos += mnMinRange;
@@ -233,11 +233,10 @@ long Slider::ImplCalcThumbPos( long nPixPos )
long Slider::ImplCalcThumbPosPix( long nPos )
{
-// Position berechnen
+// calculate position
long nCalcThumbPos;
nCalcThumbPos = ImplMulDiv( nPos-mnMinRange, mnThumbPixRange-1,
mnMaxRange-mnMinRange );
-// Am Anfang und Ende des Sliders versuchen wir die Anzeige korrekt
-// anzuzeigen
+// at the beginning and end we try to display Slider correctly
if ( !nCalcThumbPos (mnThumbPos mnMinRange) )
nCalcThumbPos = 1;
if ( nCalcThumbPos
@@ -327,7 +326,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags )
const StyleSettingsrStyleSettings = GetSettings().GetStyleSettings();
sal_BoolbEnabled = IsEnabled();
-// Evt. noch offene Berechnungen nachholen
+// do missing calculations
if ( mbCalcSize )
ImplCalc( sal_False );
@@ -653,7 +652,7 @@ void Slider::MouseButtonDown( const MouseEvent rMEvt )
meScrollType= SCROLL_DRAG;
mnDragDraw = SLIDER_DRAW_THUMB;
-// Zusaetzliche Daten berechnen
+// calculate additional values
Point aCenterPos = maThumbRect.Center();
if ( GetStyle() WB_HORZ )
mnMouseOff = rMousePos.X()-aCenterPos.X();
@@ -685,10 +684,10 @@ void Slider::MouseButtonDown( const MouseEvent rMEvt )
mnDragDraw = SLIDER_DRAW_CHANNEL;
}
-// Soll Tracking gestartet werden
+// Shall we start Tracking?
if( meScrollType != SCROLL_DONTKNOW )
{
-// Startposition merken fuer Abbruch und EndScroll-Delta
[PATCH] fdo#39468 Translate German comments - vcl/source/control/
-Positionen
+// for the Tab positions
#define TAB_PAGERECT0x
// ===
@@ -234,7 +234,7 @@
{
sal_uLong nEle = ReadLongRes();
-// Item hinzufuegen
+// add item
for( sal_uLong i = 0; i nEle; i++ )
{
InsertPage( ResId( (RSHEADER_TYPE *)GetClassRes(),
*rResId.GetResMgr() ) );
@@ -252,7 +252,7 @@
ImplFreeLayoutData();
-// TabCtrl-Daten loeschen
+// delete TabCtrl data
if ( mpTabCtrlData )
{
if( mpTabCtrlData-mpListBox )
@@ -310,7 +310,7 @@
if ( pItem-maFormatText.Len() TAB_EXTRASPACE_X )
aSize.Width() += TAB_EXTRASPACE_X-pItem-maFormatText.Len();
-// Evt. den Text kuerzen
+// shorten Text if needed
if ( aSize.Width()+4 = nMaxWidth )
{
rtl::OUString aAppendStr(...);
@@ -638,7 +638,7 @@
sal_Bool TabControl::ImplPosCurTabPage()
{
-// Aktuelle TabPage resizen/positionieren
+// resize/position current TabPage
ImplTabItem* pItem = ImplGetItem( GetCurPageId() );
if ( pItem pItem-mpTabPage )
{
@@ -762,7 +762,7 @@
else
nOff = 0;
-// Wenn wir die aktuelle Page sind, muessen wir etwas mehr zeichnen
+// if this is the active Page, we have to draw a little more
if ( pItem-mnId == mnCurPageId )
{
nOff2 = 2;
@@ -1041,7 +1041,7 @@
if( ! bLayout )
HideFocus();
-// Hier wird gegebenenfalls auch neu formatiert
+// reformat if needed
Rectangle aRect = ImplGetTabRect( TAB_PAGERECT );
// find current item
@@ -1239,9 +1239,10 @@
mbFormat = sal_True;
-// Aktuelle TabPage resizen/positionieren
+// resize/position active TabPage
sal_Bool bTabPage = ImplPosCurTabPage();
-// Feststellen, was invalidiert werden muss
+
+// check what needs to be invalidated
Size aNewSize = rAllocation;
long nNewWidth = aNewSize.Width();
for( std::vector ImplTabItem ::iterator it =
mpTabCtrlData-maItemList.begin();
@@ -1362,7 +1363,7 @@
rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId
), RTL_TEXTENCODING_UTF8 ) );
if ( !aHelpId.isEmpty() )
{
-// Wenn eine Hilfe existiert, dann ausloesen
+// call Help if existing
Help* pHelp = Application::GetHelp();
if ( pHelp )
pHelp-Start( aHelpId, this );
@@ -1370,8 +1371,7 @@
}
}
-// Bei Quick- oder Balloon-Help zeigen wir den Text an,
-// wenn dieser abgeschnitten ist
+// for Quick or Ballon Help, we show the text, if it is cut
if ( rHEvt.GetMode() (HELPMODE_QUICK | HELPMODE_BALLOON) )
{
ImplTabItem* pItem = ImplGetItem( nItemId );
@@ -1929,7 +1929,7 @@
{
mnActPageId = nPageId;
ActivatePage();
-// Page koennte im Activate-Handler umgeschaltet wurden sein
+// Page could have been switched by the Activate handler
nPageId = mnActPageId;
mnActPageId = 0;
SetCurPageId( nPageId );
@@ -1956,7 +1956,7 @@
if ( IsDefaultSize() )
SetTabPageSizePixel( pTabPage-GetSizePixel() );
-// Erst hier setzen, damit Resize nicht TabPage umpositioniert
+// only set here, so that Resize does not reposition TabPage
pItem-mpTabPage = pTabPage;
queue_resize();
if ( pItem-mnId == mnCurPageId )
--
To view, visit https://gerrit.libreoffice.org/2966
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I736cf155e252293ed571cd44a6a395b15c4bf576
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 Translate German Comments - salframe.cxx
also be used for the W-Version, because the struct
// to access lpCreateParams is the same structure
CREATESTRUCTA* pStruct = (CREATESTRUCTA*)lParam;
@@ -5591,9 +5582,8 @@
if ( pFrame != 0 )
{
SetWindowPtr( hWnd, pFrame );
-// HWND schon hier setzen, da schon auf den Instanzdaten
-// gearbeitet werden kann, wenn Messages waehrend
-// CreateWindow() gesendet werden
+// Set HWND already here, as data might be used already
+// when messages are being sent by CreateWindow()
pFrame-mhWnd = hWnd;
pFrame-maSysData.hWnd = hWnd;
}
@@ -5668,15 +5658,14 @@
case WM_MOUSEWHEEL:
// FALLTHROUGH intended
case WM_MOUSEHWHEEL:
-// Gegen Rekursion absichern, falls wir vom IE oder dem externen
-// Fenster die Message wieder zurueckbekommen
+// protect against recursion, in case the message is returned
+// by IE or the external window
if ( !bInWheelMsg )
{
bInWheelMsg++;
rDef = !ImplHandleWheelMsg( hWnd, nMsg, wParam, lParam );
-// Wenn wir die Message nicht ausgewertet haben, schauen wir
-// noch einmal nach, ob dort ein geplugtes Fenster steht,
-// welches wir dann benachrichtigen
+// If we did not process the message, re-check if here is a
+// connected (?) window that we have to notify.
if ( rDef )
rDef = ImplSalWheelMousePos( hWnd, nMsg, wParam, lParam,
nRet );
bInWheelMsg--;
@@ -5771,12 +5760,11 @@
break;
case WM_ACTIVATE:
-// Wenn wir aktiviert werden, dann wollen wir auch unsere
-// Palette setzen. Wir machen dieses in Activate,
-// damit andere externe Child-Fenster auch unsere Palette
-// ueberschreiben koennen. So wird unsere jedenfalls nur einmal
-// gesetzt und nicht immer rekursiv, da an allen anderen Stellen
-// diese nur als Background-Palette gesetzt wird
+// Getting activated, we also want to set our palette.
+// We do this in Activate, so that other external child windows
+// can overwrite our palette. Thus our palette is set only once
+// and not recursively, as at all other places it is set only as
+// the background palette.
if ( LOWORD( wParam ) != WA_INACTIVE )
ImplSendMessage( hWnd, SAL_MSG_FORCEPALETTE, 0, 0 );
break;
@@ -5959,16 +5947,15 @@
#endif // WINVER = 0x0500
}
-// WheelMouse-Message abfangen
+// catch WheelMouse-Message
if ( rDef (nMsg == aSalShlData.mnWheelMsgId)
aSalShlData.mnWheelMsgId )
{
-// Gegen Rekursion absichern, falls wir vom IE oder dem externen
-// Fenster die Message wieder zurueckbekommen
+// protect against recursion, in case the message is returned
+// by IE or the external window
if ( !bInWheelMsg )
{
bInWheelMsg++;
-// Zuerst wollen wir die Message dispatchen und dann darf auch
-// das SystemWindow drankommen
+// First dispatch the message; and then give the SystemWindow a
turn
WORD nKeyState = 0;
if ( GetKeyState( VK_SHIFT ) 0x8000 )
nKeyState |= MK_SHIFT;
--
To view, visit https://gerrit.libreoffice.org/2931
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a5655ac1b1b4feca0b3a5ed3d4c37a63bce6c5a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 Translate German comments - vcl/win/source/gdi/
problem mapping the correct color of the
+// mask to the palette if we draw the DIB directly == draw DDB
if( ( GetBitCount() = 8 ) rSalBitmap.ImplGethDIB()
rSalBitmap.GetBitCount() == 1 )
{
WinSalBitmap aTmp;
@@ -800,13 +797,12 @@
hOldPen = SelectPen( mhDC, hPen );
POINT* pWinPtAry;
-// Unter NT koennen wir das Array direkt weiterreichen
+// for NT, we can handover the array directly
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
WinSalGraphics::DrawPolyLine(): POINT != SalPoint );
pWinPtAry = (POINT*)pPtAry;
-// Wegen Windows 95 und der Beschraenkung auf eine maximale Anzahl
-// von Punkten
+// for Windows 95 and its maximum number of points
if ( nSalFlags SAL_INVERT_TRACKFRAME )
{
if ( !Polyline( mhDC, pWinPtAry, (int)nPoints ) (nPoints
MAX_64KSALPOINTS) )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f2bcd8e..e80b8ab 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -799,7 +799,7 @@
inline FontPitch ImplMetricPitchToSal( BYTE nPitch )
{
-// Sausaecke bei MS !! siehe NT Hilfe
+// G! See NT help
if ( !(nPitch TMPF_FIXED_PITCH) )
return PITCH_FIXED;
else
@@ -2269,8 +2269,8 @@
EnumFontFamiliesExW( mhDC, aLogFont,
(FONTENUMPROCW)SalEnumFontsProcExW, (LPARAM)(void*)aInfo, 0 );
-// Feststellen, was es fuer Courier-Schriften auf dem Bildschirm gibt,
-// um in SetFont() evt. Courier auf Courier New zu mappen
+// check what Courier fonts are used on the screen, so to perhaps
+// map Courier to CourierNew in SetFont()
if ( !mbPrinter )
{
bImplSalCourierScalable = aInfo.mbImplSalCourierScalable;
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index d1904a7..dda80b3 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -403,7 +403,7 @@
return FALSE;
}
-// Outputbuffer anlegen
+// make Outputbuffer
nDriverDataLen = sizeof(SalDriverData) + nSysJobSize-1;
pOutBuffer = (SalDriverData*)rtl_allocateZeroMemory(
nDriverDataLen );
pOutBuffer-mnSysSignature = SAL_DRIVERDATA_SYSSIGN;
@@ -412,14 +412,14 @@
(char*)pOutBuffer-maDriverData -
(char*)pOutBuffer );
-// Testen, ob wir einen geeigneten Inputbuffer haben
+// check if we have a suitable input buffer
if ( bIn ImplTestSalJobSetup( pPrinter, pSetupData, FALSE ) )
{
pInBuffer = (BYTE*)pSetupData-mpDriverData +
((SalDriverData*)pSetupData-mpDriverData)-mnDriverOffset;
nMode |= DM_IN_BUFFER;
}
-// Testen, ob Dialog angezeigt werden soll
+// check if the dialog should be shown
if ( pVisibleDlgParent )
{
hWnd = pVisibleDlgParent-mhWnd;
@@ -1571,14 +1571,13 @@
mnError = 0;
mbAbort = FALSE;
-// Wegen Telocom Balloon Fax-Treiber, der uns unsere Messages
-// ansonsten oefters schickt, versuchen wir vorher alle
-// zu verarbeiten und dann eine Dummy-Message reinstellen
+// As the Telocom Balloon Fax driver tends to send messages repeatedly
+// we try to process first all, and then insert a dummy message
sal_Bool bWhile = TRUE;
int i = 0;
do
{
-// Messages verarbeiten
+// process messages
MSG aMsg;
if ( ImplPeekMessage( aMsg, 0, 0, 0, PM_REMOVE ) )
{
@@ -1689,7 +1688,7 @@
{
mbAbort = TRUE;
-// Abort asyncron ausloesen
+// trigger Abort asynchronously
HDC hDC = mhDC;
if ( hDC )
{
@@ -1708,7 +1707,7 @@
SalData*pSalData = GetSalData();
WinSalPrinter* pPrinter = pSalData-mpFirstPrinter;
-// Feststellen, ob Printer noch existiert
+// check if printer still exists
while ( pPrinter )
{
if ( pPrinter-mhDC == hPrnDC )
@@ -1717,7 +1716,7 @@
pPrinter = pPrinter-mpNextPrinter;
}
-// Wenn Printer noch existiert, dann den Job abbrechen
+// if printer still exists, cancel the job
if ( pPrinter )
{
HDC hDC = pPrinter-mhDC;
--
To view, visit https://gerrit.libreoffice.org/2937
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I273bab015f96128ab5128ade3b8e0c69b0ef730e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/app/saldata.cxx |2 +-
vcl/win/source/app/salinst.cxx | 15 +++
vcl/win/source/app/saltimer.cxx |4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 275dbf60e9a3ea47656dfef0928e5cc83df4762e
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Mar 23 13:09:25 2013 -0400
fdo#39468 Translate German comments - vcl/win/source/app
Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
Reviewed-on: https://gerrit.libreoffice.org/2938
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index ff5a10f..2a3ea09 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -61,7 +61,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char*
pStr2 )
char c2;
do
{
-// Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
+// change to LowerCase if the char is between 'A' and 'Z'
c1 = *pStr1;
c2 = *pStr2;
if ( (c1 = 65) (c1 = 90) )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 9f30139..021ebc7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -212,8 +212,7 @@ void ImplSalYieldMutexAcquireWithWait()
SalData* pSalData = GetSalData();
if ( pSalData-mnAppThreadId == nThreadId )
{
-// Wenn wir den Mutex nicht bekommen, muessen wir solange
-// warten, bis wir Ihn bekommen
+// wait till we get the Mutex
sal_Bool bAcquire = FALSE;
do
{
@@ -399,13 +398,13 @@ SalData::SalData()
}
mnStockPenCount = 0;// count of static pens
mnStockBrushCount = 0; // count of static brushes
-mnSalObjWantKeyEvt = 0; // KeyEvent, welcher vom SalObj-Hook
verarbeitet werden soll
+mnSalObjWantKeyEvt = 0; // KeyEvent for the SalObj hook
mnCacheDCInUse = 0; // count of CacheDC in use
mbObjClassInit = FALSE; // is SALOBJECTCLASS initialised
mbInPalChange = FALSE; // is in WM_QUERYNEWPALETTE
mnAppThreadId = 0; // Id from Applikation-Thread
mbScrSvrEnabled = FALSE;// ScreenSaver enabled
-mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == nicht
vorhanden)
+mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == not
available)
mpSageEnableProc = 0; // funktion to deactivate the system agent
mpFirstIcon = 0;// icon cache, points to first icon, NULL if
none
mpTempFontItem = 0;
@@ -940,7 +939,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
void SalTimer::Start( sal_uLong nMS )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
SalData* pSalData = GetSalData();
if ( pSalData-mpFirstInstance )
{
@@ -957,7 +956,7 @@ void SalTimer::Start( sal_uLong nMS )
SalFrame* WinSalInstance::CreateChildFrame( SystemParentData*
pSystemParentData, sal_uLong nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME,
nSalFrameStyle, (LPARAM)pSystemParentData-hWnd );
}
@@ -965,7 +964,7 @@ SalFrame* WinSalInstance::CreateChildFrame(
SystemParentData* pSystemParentData,
SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong
nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
HWND hWndParent;
if ( pParent )
hWndParent = static_castWinSalFrame*(pParent)-mhWnd;
@@ -987,7 +986,7 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent,
SystemWindowData* /*pWindowData*/, //
SystemWindowData meaningless on Windows
sal_Bool /*bShow*/ )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0,
(LPARAM)static_castWinSalFrame*(pParent) );
}
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index c042c2f..dbe4ddc 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -42,11 +42,11 @@ void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex )
if ( !bMutex )
pSalData-mnTimerOrgMS = nMS;
-// Periode darf nicht zu gross sein, da Windows mit sal_uInt16 arbeitet
+// duration has to fit into Window's sal_uInt16
if ( nMS MAX_SYSPERIOD )
nMS = MAX_SYSPERIOD;
-// Gibt es einen Timer, dann zerstoren
+// kill timer if it exists
if ( pSalData-mnTimerId )
KillTimer( 0, pSalData-mnTimerId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman
[PATCH] fdo#39468 Translate German comments - vcl/win/source/app
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2938
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/2938/1
fdo#39468 Translate German comments - vcl/win/source/app
Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
---
M vcl/win/source/app/saldata.cxx
M vcl/win/source/app/salinst.cxx
M vcl/win/source/app/saltimer.cxx
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index ff5a10f..2a3ea09 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -61,7 +61,7 @@
char c2;
do
{
-// Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
+// change to LowerCase if the char is between 'A' and 'Z'
c1 = *pStr1;
c2 = *pStr2;
if ( (c1 = 65) (c1 = 90) )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 9f30139..021ebc7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -212,8 +212,7 @@
SalData* pSalData = GetSalData();
if ( pSalData-mnAppThreadId == nThreadId )
{
-// Wenn wir den Mutex nicht bekommen, muessen wir solange
-// warten, bis wir Ihn bekommen
+// wait till we get the Mutex
sal_Bool bAcquire = FALSE;
do
{
@@ -399,13 +398,13 @@
}
mnStockPenCount = 0;// count of static pens
mnStockBrushCount = 0; // count of static brushes
-mnSalObjWantKeyEvt = 0; // KeyEvent, welcher vom SalObj-Hook
verarbeitet werden soll
+mnSalObjWantKeyEvt = 0; // KeyEvent for the SalObj hook
mnCacheDCInUse = 0; // count of CacheDC in use
mbObjClassInit = FALSE; // is SALOBJECTCLASS initialised
mbInPalChange = FALSE; // is in WM_QUERYNEWPALETTE
mnAppThreadId = 0; // Id from Applikation-Thread
mbScrSvrEnabled = FALSE;// ScreenSaver enabled
-mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == nicht
vorhanden)
+mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == not
available)
mpSageEnableProc = 0; // funktion to deactivate the system agent
mpFirstIcon = 0;// icon cache, points to first icon, NULL if
none
mpTempFontItem = 0;
@@ -940,7 +939,7 @@
void SalTimer::Start( sal_uLong nMS )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
SalData* pSalData = GetSalData();
if ( pSalData-mpFirstInstance )
{
@@ -957,7 +956,7 @@
SalFrame* WinSalInstance::CreateChildFrame( SystemParentData*
pSystemParentData, sal_uLong nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME,
nSalFrameStyle, (LPARAM)pSystemParentData-hWnd );
}
@@ -965,7 +964,7 @@
SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong
nSalFrameStyle )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
HWND hWndParent;
if ( pParent )
hWndParent = static_castWinSalFrame*(pParent)-mhWnd;
@@ -987,7 +986,7 @@
SystemWindowData* /*pWindowData*/, //
SystemWindowData meaningless on Windows
sal_Bool /*bShow*/ )
{
-// Um auf Main-Thread umzuschalten
+// to switch to Main-Thread
return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0,
(LPARAM)static_castWinSalFrame*(pParent) );
}
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index c042c2f..dbe4ddc 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -42,11 +42,11 @@
if ( !bMutex )
pSalData-mnTimerOrgMS = nMS;
-// Periode darf nicht zu gross sein, da Windows mit sal_uInt16 arbeitet
+// duration has to fit into Window's sal_uInt16
if ( nMS MAX_SYSPERIOD )
nMS = MAX_SYSPERIOD;
-// Gibt es einen Timer, dann zerstoren
+// kill timer if it exists
if ( pSalData-mnTimerId )
KillTimer( 0, pSalData-mnTimerId );
--
To view, visit https://gerrit.libreoffice.org/2938
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd5851f763a392cad658d206d23ea055456fce2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/window/salframe.cxx | 199 +
1 file changed, 93 insertions(+), 106 deletions(-)
New commits:
commit e0ce2898f1fc5242015c90606be94484a252f795
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Mar 23 09:33:44 2013 -0400
fdo#39468 Translate German Comments - salframe.cxx
Change-Id: I0a5655ac1b1b4feca0b3a5ed3d4c37a63bce6c5a
Reviewed-on: https://gerrit.libreoffice.org/2931
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index a824564..223c09f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -131,7 +131,7 @@ static void SetMaximizedFrameGeometry( HWND hWnd,
WinSalFrame* pFrame, RECT* pPa
static void ImplSaveFrameState( WinSalFrame* pFrame )
{
-// Position, Groesse und Status fuer GetWindowState() merken
+// save position, size and state for GetWindowState()
if ( !pFrame-mbFullScreen )
{
sal_Bool bVisible = (GetWindowStyle( pFrame-mhWnd ) WS_VISIBLE) !=
0;
@@ -524,7 +524,7 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd,
sal_Bool bAsChild )
// ===
-// Uebersetzungstabelle von System-Keycodes in StarView-Keycodes
+// translation table from System keycodes into StartView keycodes
#define KEY_TAB_SIZE 146
static sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
@@ -892,7 +892,7 @@ WinSalFrame::WinSalFrame()
memset( maGeometry, 0, sizeof( maGeometry ) );
-// Daten ermitteln, wenn erster Frame angelegt wird
+// get data, when making 1st frame
if ( !pSalData-mpFirstFrame )
{
if ( !aSalShlData.mnWheelMsgId )
@@ -1213,7 +1213,7 @@ static void ImplSalShow( HWND hWnd, sal_Bool bVisible,
sal_Bool bNoActivate )
pFrame-mnShowState = SW_SHOWNOACTIVATE;
else
pFrame-mnShowState = SW_SHOW;
-// Damit Taskleiste unter W98 auch gleich ausgeblendet wird
+// hide toolbar for W98
if ( pFrame-mbPresentation )
{
HWND hWndParent = ::GetParent( hWnd );
@@ -1690,9 +1690,8 @@ void WinSalFrame::GetClientSize( long rWidth, long
rHeight )
void WinSalFrame::SetWindowState( const SalFrameState* pState )
{
-// Wir testen, ob das Fenster ueberhaupt auf den Bildschirm passt, damit
-// nicht wenn die Bildschirm-Aufloesung geaendert wurde, das Fenster aus
-// diesem herausragt
+// Check if the window fits into the screen, in case the screen
+// resolution changed
int nX;
int nY;
int nWidth;
@@ -1724,7 +1723,7 @@ void WinSalFrame::SetWindowState( const SalFrameState*
pState )
long nBottomDeco = abs( aWinRect.bottom - aRect2.bottom );
long nRightDeco = abs( aWinRect.right - aRect2.right );
-// Fenster-Position/Groesse in den Bildschirm einpassen
+// adjust window position/size to fit the screen
if ( !(pState-mnMask (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y)) )
nPosSize |= SWP_NOMOVE;
if ( !(pState-mnMask (SAL_FRAMESTATE_MASK_WIDTH |
SAL_FRAMESTATE_MASK_HEIGHT)) )
@@ -1762,12 +1761,12 @@ void WinSalFrame::SetWindowState( const SalFrameState*
pState )
if ( nY nScreenY )
nY = nScreenY;
-// Restore-Position setzen
+// set Restore-Position
WINDOWPLACEMENT aPlacement;
aPlacement.length = sizeof( aPlacement );
GetWindowPlacement( mhWnd, aPlacement );
-// Status setzen
+// set State
sal_Bool bVisible = (GetWindowStyle( mhWnd ) WS_VISIBLE) != 0;
sal_Bool bUpdateHiddenFramePos = FALSE;
if ( !bVisible )
@@ -1914,7 +1913,7 @@ void WinSalFrame::ShowFullScreen( sal_Bool bFullScreen,
sal_Int32 nDisplay )
if ( bFullScreen )
{
-// Damit Taskleiste von Windows ausgeblendet wird
+// to hide the Windows taskbar
DWORD nExStyle = GetWindowExStyle( mhWnd );
if ( nExStyle WS_EX_TOOLWINDOW )
{
@@ -1935,8 +1934,8 @@ void WinSalFrame::ShowFullScreen( sal_Bool bFullScreen,
sal_Int32 nDisplay )
}
else
{
-// wenn ShowState wieder hergestellt werden muss, hiden wir zuerst
-// das Fenster, damit es nicht so sehr flackert
+// when the ShowState has to be reset, hide the window first to
+// reduce flicker
sal_Bool bVisible = (GetWindowStyle( mhWnd ) WS_VISIBLE) != 0;
if ( bVisible (mnShowState != mnFullScreenShowState) )
ShowWindow( mhWnd, SW_HIDE );
@@ -2004,7 +2003,7 @@ void WinSalFrame::StartPresentation( sal_Bool bStart )
pSalData-mpSageEnableProc( DISABLE_AGENT );
}
-// Bildschirmschoner ausschalten, wenn Praesentation laueft
+// turn off screen-saver when in Presentation mode
SystemParametersInfo( SPI_GETSCREENSAVEACTIVE
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salgdi.cxx | 48 +++--
vcl/win/source/gdi/salgdi2.cxx | 28 ++-
vcl/win/source/gdi/salgdi3.cxx |6 ++---
vcl/win/source/gdi/salprn.cxx | 19 +++-
4 files changed, 47 insertions(+), 54 deletions(-)
New commits:
commit 620611fe91970f073297f72a6d0605d7c7bd8943
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Mar 23 12:42:20 2013 -0400
fdo#39468 Translate German comments - vcl/win/source/gdi/
Change-Id: I273bab015f96128ab5128ade3b8e0c69b0ef730e
Reviewed-on: https://gerrit.libreoffice.org/2937
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 80bf5ab..4ac1f4b 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -125,9 +125,9 @@ static BYTE aOrdDither16Bit[8][8] =
// ===
-// Pens muessen wir mit 1 Pixel-Breite erzeugen, da ansonsten die S3-Karte
-// viele Paintprobleme hat, wenn Polygone/PolyLines gezeichnet werden und
-// eine komplexe ClipRegion gesetzt ist
+// we must create pens with 1-pixel width; otherwise the S3-graphics card
+// map has many paint problems when drawing polygons/polyLines and a
+// complex is set
#define GSL_PEN_WIDTH 1
// ===
@@ -327,14 +327,14 @@ void ImplFreeSalGDI()
for ( i = 0; i pSalData-mnStockBrushCount; i++ )
DeleteBrush( pSalData-mhStockBrushAry[i] );
-// 50% Brush loeschen
+// delete 50% Brush
if ( pSalData-mh50Brush )
{
DeleteBrush( pSalData-mh50Brush );
pSalData-mh50Brush = 0;
}
-// 50% Bitmap loeschen
+// delete 50% Bitmap
if ( pSalData-mh50Bmp )
{
DeleteBitmap( pSalData-mh50Bmp );
@@ -344,7 +344,7 @@ void ImplFreeSalGDI()
ImplClearHDCCache( pSalData );
delete[] pSalData-mpHDCCache;
-// Ditherpalette loeschen, wenn vorhanden
+// delete Ditherpalette, if existing
if ( pSalData-mhDitherPal )
{
DeleteObject( pSalData-mhDitherPal );
@@ -513,7 +513,7 @@ static SalColor ImplGetROPSalColor( SalROPColor nROPColor )
void ImplSalInitGraphics( WinSalGraphics* pData )
{
-// Beim Printer berechnen wir die minimale Linienstaerke
+// calculate the minimal line width for the printer
if ( pData-mbPrinter )
{
int nDPIX = GetDeviceCaps( pData-mhDC, LOGPIXELSX );
@@ -554,7 +554,7 @@ HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp )
{
HDC hDC = GetDC( 0 );
-// neuen DC mit DefaultBitmap anlegen
+// create new DC sith DefaultBitmap
pC-mhDC = CreateCompatibleDC( hDC );
if( pSalData-mhDitherPal )
@@ -750,7 +750,7 @@ WinSalGraphics::WinSalGraphics()
WinSalGraphics::~WinSalGraphics()
{
-// free obsolete GDI objekts
+// free obsolete GDI objects
ReleaseFonts();
if ( mhPen )
@@ -770,7 +770,7 @@ WinSalGraphics::~WinSalGraphics()
mhRegion = 0;
}
-// Cache-Daten zerstoeren
+// delete cache data
if ( mpStdClipRgnData )
delete [] mpStdClipRgnData;
@@ -996,7 +996,7 @@ void WinSalGraphics::SetLineColor()
HPEN hNewPen = GetStockPen( NULL_PEN );
HPEN hOldPen = SelectPen( mhDC, hNewPen );
-// destory or save old pen
+// destroy or save old pen
if ( mhPen )
{
if ( !mbStockPen )
@@ -1054,7 +1054,7 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor )
// select new pen
HPEN hOldPen = SelectPen( mhDC, hNewPen );
-// destory or save old pen
+// destroy or save old pen
if ( mhPen )
{
if ( !mbStockPen )
@@ -1078,7 +1078,7 @@ void WinSalGraphics::SetFillColor()
HBRUSH hNewBrush = GetStockBrush( NULL_BRUSH );
HBRUSH hOldBrush = SelectBrush( mhDC, hNewBrush );
-// destory or save old brush
+// destroy or save old brush
if ( mhBrush )
{
if ( !mbStockBrush )
@@ -1182,7 +1182,7 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor )
// select new brush
HBRUSH hOldBrush = SelectBrush( mhDC, hNewBrush );
-// destory or save old brush
+// destroy or save old brush
if ( mhBrush )
{
if ( !mbStockBrush )
@@ -1332,7 +1332,7 @@ void WinSalGraphics::drawRect( long nX, long nY, long
nWidth, long nHeight )
void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
{
-// Unter NT koennen wir das Array direkt weiterreichen
+// for NT, we can handover the array directly
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
WinSalGraphics::DrawPolyLine(): POINT != SalPoint );
@@ -1358,8 +1358,7 @@ void WinSalGraphics::drawPolyLine( sal_uLong nPoints,
const SalPoint* pPtAry )
pWinPtAry
[PATCH] fdo#39468 German comments in vcl/unx/generic/...
, b=0xFF
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index f4cba0e..36df4b9 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -362,12 +362,12 @@
bool bClose
)
{
-// errechne wie viele Linien XWindow auf einmal zeichnen kann
+// calculate how many lines XWindow can draw in one go
sal_uLong nMaxLines = (GetDisplay()-GetMaxRequestSize() -
sizeof(xPolyPointReq))
/ sizeof(xPoint);
if( nMaxLines nPoints ) nMaxLines = nPoints;
-// gebe alle Linien aus, die XWindows zeichnen kann.
+// print all lines that XWindows can draw
sal_uLong n;
for( n = 0; nPoints - n nMaxLines; n += nMaxLines - 1 )
XDrawLines( GetXDisplay(),
@@ -391,7 +391,7 @@
}
}
-// Dithern: Calculate a dither-pixmap and make a brush of it
+// Calculate a dither-pixmap and make a brush of it
#define P_DELTA 51
#define DMAP( v, m )((v % P_DELTA) m ? (v / P_DELTA) + 1 : (v / P_DELTA))
@@ -766,7 +766,7 @@
SelectBrush(),
nX, nY, nDX, nDY );
}
-// Beschreibung DrawRect verkehrt, deshalb -1
+// description DrawRect is wrong; thus -1
if( nPenColor_ != SALCOLOR_NONE )
XDrawRectangle( GetXDisplay(),
GetDrawable(),
@@ -886,7 +886,7 @@
XClipBox( pXRegA, aXRect );
GC pGC = SelectBrush();
-SetClipRegion( pGC, pXRegA ); // ??? doppelt
+SetClipRegion( pGC, pXRegA ); // ??? twice
XDestroyRegion( pXRegA );
bBrushGC_ = sal_False;
--
To view, visit https://gerrit.libreoffice.org/2865
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I869f5ac346b378ee63832e01ce099f366b7c184f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/app/saldisp.cxx | 29 ++---
vcl/unx/generic/gdi/salgdi.cxx | 10 +-
2 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit c86fa81bcd5db0db4b343a27cc7ca979613fc2ad
Author: Christian M. Heller christian.helle...@gmail.com
Date: Wed Mar 20 05:27:28 2013 -0400
fdo#39468 German comments in vcl/unx/generic/...
Change-Id: I869f5ac346b378ee63832e01ce099f366b7c184f
Reviewed-on: https://gerrit.libreoffice.org/2865
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b303a22..87b4846 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -763,8 +763,7 @@ void SalDisplay::ModifierMapping()
nShiftKeySym_ = sal_XModifier2Keysym( pDisp_, pXModMap, ShiftMapIndex );
nCtrlKeySym_= sal_XModifier2Keysym( pDisp_, pXModMap, ControlMapIndex
);
nMod1KeySym_= sal_XModifier2Keysym( pDisp_, pXModMap, Mod1MapIndex );
-// Auf Sun-Servern und SCO-Severn beruecksichtigt XLookupString
-// nicht den NumLock Modifier.
+// on Sun and SCO servers XLookupString does not account for NumLock
if( GetServerVendor() == vendor_sun )
{
XLIB_KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock );
@@ -813,7 +812,7 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode )
const
nKeySym = XK_0 + (nKeyCode - KEY_0);
else if( KEY_A = nKeyCode nKeyCode = KEY_Z )
nKeySym = XK_A + (nKeyCode - KEY_A);
-else if( KEY_F1 = nKeyCode nKeyCode = KEY_F26 ) // Existiert die Taste
+else if( KEY_F1 = nKeyCode nKeyCode = KEY_F26 ) // does this key
exist?
nKeySym = XK_F1 + (nKeyCode - KEY_F1);
else switch( nKeyCode )
{
@@ -1087,7 +1086,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym,
char*pcPrintable ) const
}
else switch( keysym )
{
-// - - - - - Sun X-Server Tastatur ohne Cursorblock ??? - - -
+// - - - - - Sun X-Server keyboard without Cursorblock ??? - - -
case XK_R7: // XK_F27:
nKey = KEY_HOME;
break;
@@ -1115,7 +1114,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym,
char*pcPrintable ) const
case XK_R15: // XK_F35:
nKey = KEY_PAGEDOWN;
break;
-// - - - - - Sun X-Server Tastatur ??? - - - - - - - - - - - -
+// - - - - - Sun X-Server keyboard ??? - - - - - - - - - - - -
case XK_L1: // XK_F11:
nKey = KEY_F11; // on a sun keyboard this actually is usally
SunXK_Stop,
// but VCL doesn't have a key defintion for that
@@ -1436,11 +1435,11 @@ KeySym SalDisplay::GetKeySym( XKeyEvent*pEvent,
|| IsKeypadKey(nKeySym)
|| XK_Delete == nKeySym ) )
{
-// Bei einigen X-Servern muss man bei den Keypadtasten
-// schon sehr genau hinschauen. ZB. Solaris XServer:
-// 2, 4, 6, 8 werden als Cursorkeys klassifiziert (Up, Down, Left,
Right
-// 1, 3, 5, 9 werden als Functionkeys klassifiziert (F27,F29,F33,F35)
-// 0 als Keypadkey und der Dezimalpunkt gar nicht (KP_Insert)
+// For some X-servers special care is needed for Keypad keys.
+// For example Solaris XServer:
+// 2, 4, 6, 8 are classified as Cursorkeys (Up, Down, Left, Right)
+// 1, 3, 5, 9 are classified as Funtionkeys (F27,F29,F33,F35)
+// 0 as Keypadkey, and the decimal point key not at all (KP_Insert)
KeySym nNewKeySym = XLookupKeysym( pEvent, nNumLockIndex_ );
if( nNewKeySym != NoSymbol )
nKeySym = nNewKeySym;
@@ -1492,7 +1491,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
case POINTER_WAIT:
aCur = XCreateFontCursor( pDisp_, XC_watch );
break;
-case POINTER_TEXT: // Mouse Pointer ist ein I Beam
+case POINTER_TEXT: // Mouse Pointer is a I Beam
aCur = XCreateFontCursor( pDisp_, XC_xterm );
DBG_ASSERT( aCur != None, GetPointer: Could not define cursor );
break;
@@ -1500,7 +1499,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
aCur = XCreateFontCursor( pDisp_, XC_question_arrow );
DBG_ASSERT( aCur != None, GetPointer: Could not define cursor );
break;
-case POINTER_CROSS: // Mouse Pointer ist ein Kreuz
+case POINTER_CROSS: // Mouse Pointer is a cross
aCur = XCreateFontCursor( pDisp_, XC_crosshair );
DBG_ASSERT( aCur != None, GetPointer: Could not define cursor );
break;
@@ -1675,7 +1674,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
case POINTER_DRAW_CAPTION:
MAKE_CURSOR( drawcaption_
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/combobox.cxx |2
vcl/source/control/fixed.cxx|2
vcl/source/control/ilstbox.cxx | 91 +++-
3 files changed, 47 insertions(+), 48 deletions(-)
New commits:
commit 21414f3958357303084780b27d566f2058b73a37
Author: Christian M. Heller christian.helle...@gmail.com
Date: Mon Mar 4 20:13:41 2013 -0500
fdo#39468 translate German comments in /vcl V2
Change-Id: Icead8400db3bab570b5ef55d5079ea50e2e3b7b9
Reviewed-on: https://gerrit.libreoffice.org/2552
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index fd09ccb..13e3f2e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -381,7 +381,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
{
aText = mpSubEdit-GetText();
-// remove all entries to which there is an selected entry
+// remove all entries to which there is an entry, but which is not
selected
xub_StrLen nIndex = 0;
while ( nIndex != STRING_NOTFOUND )
{
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index b6a4d10..35a47f3 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -386,7 +386,7 @@ Size FixedText::CalcMinimumTextSize( Control const
*pControl, long nMaxWidth )
if ( pControl-GetStyle() WB_EXTRAOFFSET )
aSize.Width() += 2;
-// GetTextRect cannot take and empty string
+// GetTextRect cannot take an empty string
if ( aSize.Width() 0 )
aSize.Width() = 0;
if ( aSize.Height() = 0 )
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 475d074..e790a43 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -199,7 +199,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos,
ImplEntryType* pNewEntry
// defined values are {-1, 0, 1} which is compatible with
StringCompare
StringCompare eComp = (StringCompare)rSorter.compare(rStr,
pTemp-maStr);
-// Schnelles Einfuegen bei sortierten Daten
+// fast insert for sorted data
if ( eComp != COMPARE_LESS )
{
insPos = maEntries.size();
@@ -218,7 +218,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos,
ImplEntryType* pNewEntry
}
else
{
-// Binaeres Suchen
+// binary search
nHigh--;
do
{
@@ -298,7 +298,7 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const
XubString rStr, sal_uInt16 n
sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
sal_uInt16 nEntryCount = GetEntryCount();
if ( !bForward )
-nStart++; // wird sofort dekrementiert
+nStart++; // decrements right away
const vcl::I18nHelper rI18nHelper =
mpWindow-GetSettings().GetLocaleI18nHelper();
for ( sal_uInt16 n = nStart; bForward ? ( n nEntryCount ) : n; )
@@ -738,8 +738,8 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics(
ImplEntryType rEntry )
if ( !aMetrics.bText !aMetrics.bImage !IsUserDrawEnabled() )
{
-// entries which have no (aka an empty) text, and no image, and are
not user-drawn, should be
-// shown nonetheless
+// entries which have no (aka an empty) text, and no image,
+// and are not user-drawn, should be shown nonetheless
aMetrics.nEntryHeight = mnTextHeight + mnBorder;
}
@@ -912,7 +912,7 @@ sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const
void ImplListBoxWindow::MouseButtonDown( const MouseEvent rMEvt )
{
-mbMouseMoveSelect = sal_False; // Nur bis zum ersten MouseButtonDown
+mbMouseMoveSelect = sal_False; // only till the first MouseButtonDown
maQuickSelectionEngine.Reset();
if ( !IsReadOnly() )
@@ -1005,8 +1005,8 @@ void ImplListBoxWindow::MouseMove( const MouseEvent
rMEvt )
}
}
-// Falls der DD-Button gedrueckt wurde und jemand mit gedrueckter
-// Maustaste in die ListBox faehrt...
+// if the DD button was pressed and someone moved into the ListBox
+// with the mouse button pressed...
if ( rMEvt.IsLeft() !rMEvt.IsSynthetic() )
{
if ( !mbMulti GetEntryList()-GetSelectEntryCount() )
@@ -1045,7 +1045,7 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos,
sal_Bool bSelect )
{
if( !mbMulti )
{
-// Selektierten Eintrag deselektieren
+// deselect the selected entry
sal_uInt16 nDeselect = GetEntryList()-GetSelectEntryPos( 0 );
if( nDeselect != LISTBOX_ENTRY_NOTFOUND
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/fltcall.hxx | 22 +++--- vcl/inc/vcl/textdata.hxx|2 +- vcl/inc/vcl/texteng.hxx |8 vcl/source/control/combobox.cxx | 23 --- vcl/source/control/fixed.cxx|6 +++--- 5 files changed, 31 insertions(+), 30 deletions(-) New commits: commit 929baa03c33084eaca51e02a131cc835048543c4 Author: Christian M. Heller christian.helle...@gmail.com Date: Sun Mar 3 18:05:04 2013 -0500 fdo#39468 translate German comments in vcl modified: vcl/inc/vcl/fltcall.hxx modified: vcl/inc/vcl/textdata.hxx modified: vcl/inc/vcl/texteng.hxx modified: vcl/source/control/combobox.cxx modified: vcl/source/control/fixed.cxx Change-Id: I8af3fe962ba77d7047eac8d7570c5bc572585363 Reviewed-on: https://gerrit.libreoffice.org/2534 Reviewed-by: Muthu Subramanian K muthus...@gmail.com Tested-by: Muthu Subramanian K muthus...@gmail.com diff --git a/vcl/inc/vcl/fltcall.hxx b/vcl/inc/vcl/fltcall.hxx index 91e4d28..03a6340 100644 --- a/vcl/inc/vcl/fltcall.hxx +++ b/vcl/inc/vcl/fltcall.hxx @@ -49,19 +49,19 @@ struct FltCallDialogParameter typedef sal_Bool (*PFilterCall)(SvStream rStream, Graphic rGraphic, FilterConfigItem* pConfigItem, sal_Bool bPrefDialog); -// Von diesem Typ sind sowohl Export-Filter-Funktionen als auch Import-Filter-Funktionen. -// rFileName ist der komplette Pfadname der zu importierenden bzw. zu exportierenden Datei. -// pCallBack darf auch NULL sein. pCallerData wird der Callback-Funktion uebergeben. -// pOptionsConfig darf NULL sein. Anderenfalls ist die Gruppe des Config schon gesetzt -// und darf von dem Filter nicht geaendert werden! -// Wenn bPrefDialog==sal_True gilt, wird ggf. ein Preferences-Dialog durchgefuehrt. +// Of this type are both export-filter and import-filter functions +// rFileName is the complete path to the file to be imported or exported +// pCallBack can be NULL. pCallerData is handed to the callback function +// pOptionsConfig can be NULL; if not, the group of the config is already set +// and may not be changed by this filter! +// If bPrefDialog==sal_True, a Preferences-Dialog might be called typedef sal_Bool ( *PFilterDlgCall )( FltCallDialogParameter ); -// Von diesem Typ sind sowohl Export-Filter-Funktionen als auch Import-Filter-Funktionen. -// Uebergeben wird ein Pointer auf ein Parent-Fenster und auf die Options-Config. -// pOptions und pWindow duerfen NULL sein, in diesem Fall wird sal_False zurueckgeliefert. -// Anderenfalls ist die Gruppe der Config schon gesetzt -// und darf von dem Filter nicht geaendert werden! +// Of this type are both export-filter and import-filter functions +// hands a pointer to the parent window and to the options config +// pOptions and pWindow can be NULL; in this case sal_False is returned, +// otherwise the group of the config is already set +// and may not be changed by this filter! #endif diff --git a/vcl/inc/vcl/textdata.hxx b/vcl/inc/vcl/textdata.hxx index 4ee0e2f..476ba00 100644 --- a/vcl/inc/vcl/textdata.hxx +++ b/vcl/inc/vcl/textdata.hxx @@ -25,7 +25,7 @@ #include svl/smplhint.hxx #include tools/string.hxx -// Fuer Notify, wenn alle Absaetze geloescht wurden... +// for Notify, if all paragraphs were deleted #define TEXT_PARA_ALL 0x class TextPaM diff --git a/vcl/inc/vcl/texteng.hxx b/vcl/inc/vcl/texteng.hxx index e5f4582..2fc0314 100644 --- a/vcl/inc/vcl/texteng.hxx +++ b/vcl/inc/vcl/texteng.hxx @@ -122,7 +122,7 @@ private: TxtAlignmeAlign; -sal_BoolmbIsFormatting : 1;// Semaphore wegen der Hook's +sal_BoolmbIsFormatting : 1;// semaphore for the Hook's sal_BoolmbFormatted : 1; sal_BoolmbUpdate: 1; sal_BoolmbModified : 1; @@ -161,7 +161,7 @@ protected: SAL_DLLPRIVATE ::com::sun::star::uno::Reference ::com::sun::star::i18n::XExtendedInputSequenceChecker GetInputSequenceChecker() const; SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection rCurSel ) const; -// Broadcasten bzw. Selektionen anpassen: +// broadcast or adjust selections voidImpParagraphInserted( sal_uLong nPara ); voidImpParagraphRemoved( sal_uLong nPara ); voidImpCharsRemoved( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ); @@ -210,12 +210,12 @@ protected: sal_uLong CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nPortionLen, const Font* pFont = 0 ); Range GetInvalidYOffsets( sal_uLong nPortion ); -// Fuer Undo/Redo +// for Undo/Redo voidInsertContent
[PATCH] fdo#39468 translate German comments in /vcl
) (nMaxWidth - nWidth);
if ( nMaxLI GetLeftIndent() )
SetLeftIndent( nMaxLI );
@@ -2497,8 +2497,8 @@
void ImplListBox::ImplResizeControls()
{
-// Hier werden die Controls nur angeordnet, ob die Scrollbars
-// sichtbar sein sollen wird bereits in ImplCheckScrollBars ermittelt.
+// Here we only position the Controls; if the Scrollbars are to be
+// visible is already determined in ImplCheckScrollBars
Size aOutSz = GetOutputSizePixel();
long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
@@ -2528,7 +2528,7 @@
mpScrollBarBox-Hide();
}
-// vert. ScrollBar
+// vertical ScrollBar
if( mbVScroll )
{
// Scrollbar on left or right side?
@@ -2543,7 +2543,7 @@
SetTopEntry( GetTopEntry() );
}
-// horz. ScrollBar
+// horizontal ScrollBar
if( mbHScroll )
{
Point aHPos( ( bMirroring mbVScroll ) ? nSBWidth : 0,
aOutSz.Height() - nSBWidth );
@@ -3070,8 +3070,8 @@
{
FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
-// Fix #60890# ( MBA ): um auch im aufgeklappten Zustand der Listbox die
Gro\se einfach zu einen
-// Aufruf von Resize() andern zu konnen, wird die Position hier ggf.
angepa\t
+// Fix #60890# ( MBA ): to be able to resize the Listbox even in its open
state
+// after a call to Resize(), we adjust its position if necessary
if ( IsReallyVisible() ( nFlags WINDOW_POSSIZE_HEIGHT ) )
{
Point aPos = GetParent()-GetPosPixel();
@@ -3089,12 +3089,11 @@
// if( !IsReallyVisible() )
{
-// Die ImplListBox erhaelt kein Resize, weil nicht sichtbar.
-// Die Fenster muessen aber ein Resize() erhalten, damit die
-// Anzahl der sichtbaren Eintraege fuer PgUp/PgDown stimmt.
-// Die Anzahl kann auch nicht von List/Combobox berechnet werden,
-// weil hierfuer auch die ggf. vorhandene vertikale Scrollbar
-// beruecksichtigt werden muss.
+// The ImplListBox does not get a Resize() as not visible.
+// But the windows must get a Resize(), so that the number of
+// visible entries is correct for PgUp/PgDown.
+// The number also cannot be calculated by List/Combobox, as for
+// this the presence of the vertical Scrollbar has to be known.
mpImplLB-SetSizePixel( GetOutputSizePixel() );
((Window*)mpImplLB)-Resize();
((Window*)mpImplLB-GetMainWindow())-Resize();
@@ -3130,14 +3129,14 @@
if( mbAutoWidth )
{
-// AutoSize erstmal nur fuer die Breite...
+// AutoSize first only for width...
aFloatSz.Width() = aSz.Width() + nLeft + nRight;
-aFloatSz.Width() += nRight; // etwas mehr Platz sieht besser aus...
+aFloatSz.Width() += nRight; // adding some space looks better...
if ( ( aFloatSz.Height() nMaxHeight ) || ( mnDDLineCount (
mnDDLineCount mpImplLB-GetEntryList()-GetEntryCount() ) ) )
{
-// dann wird noch der vertikale Scrollbar benoetigt
+// then we also need the vertical Scrollbar
long nSBWidth =
GetSettings().GetStyleSettings().GetScrollBarSize();
aFloatSz.Width() += nSBWidth;
}
@@ -3151,17 +3150,17 @@
if ( aFloatSz.Height() nMaxHeight )
aFloatSz.Height() = nMaxHeight;
-// Minimale Hoehe, falls Hoehe nicht auf Float-Hoehe eingestellt wurde.
-// Der Parent vom FloatWin muss die DropDown-Combo/Listbox sein.
+// Minimal height, in case height is not set to Float height.
+// The parent of FloatWin must be DropDown-Combo/Listbox.
Size aParentSz = GetParent()-GetSizePixel();
if( (!mnDDLineCount || !nLines) ( aFloatSz.Height()
aParentSz.Height() ) )
aFloatSz.Height() = aParentSz.Height();
-// Nicht schmaler als der Parent werden...
+// do not get narrower than the parent...
if( aFloatSz.Width() aParentSz.Width() )
aFloatSz.Width() = aParentSz.Width();
-// Hoehe auf Entries alignen...
+// align height to entries...
long nInnerHeight = aFloatSz.Height() - nTop - nBottom;
long nEntryHeight = mpImplLB-GetEntryHeight();
if ( nInnerHeight % nEntryHeight )
--
To view, visit https://gerrit.libreoffice.org/2552
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icead8400db3bab570b5ef55d5079ea50e2e3b7b9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468 translate German comments in vcl
to the API to a valid
range
voidValidateSelection( TextSelection rSel ) const;
voidValidatePaM( TextPaM rPaM ) const;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 8356a52..fd09ccb 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -381,7 +381,7 @@
{
aText = mpSubEdit-GetText();
-// Alle Eintraege entfernen, zu denen es einen Entry gibt, der
aber nicht selektiert ist.
+// remove all entries to which there is an selected entry
xub_StrLen nIndex = 0;
while ( nIndex != STRING_NOTFOUND )
{
@@ -403,7 +403,7 @@
aText = comphelper::string::strip(aText, ' ');
}
-// Fehlende Eintraege anhaengen...
+// attach missing entries
::std::set sal_uInt16 aSelInText;
lcl_GetSelectedEntries( aSelInText, aText, mcMultiSep,
mpImplLB-GetEntryList() );
sal_uInt16 nSelectedEntries =
mpImplLB-GetEntryList()-GetSelectEntryCount();
@@ -415,7 +415,7 @@
if ( aText.Len() (aText.GetChar( aText.Len()-1 ) !=
mcMultiSep) )
aText += mcMultiSep;
if ( aText.Len() )
-aText += ' '; // etwas auflockern
+aText += ' '; // slightly loosen
aText += mpImplLB-GetEntryList()-GetEntryText( nP );
aText += mcMultiSep;
}
@@ -611,8 +611,8 @@
ImplUpdateFloatSelection();
}
-// FloatingWindow-Groesse auch im unsichtbare Zustand auf Stand halten,
-// weil KEY_PGUP/DOWN ausgewertet wird...
+// adjust the size of the FloatingWindow even when invisible
+// as KEY_PGUP/DOWN is being processed...
if ( mpFloatWin )
mpFloatWin-SetSizePixel( mpFloatWin-CalcFloatSize() );
}
@@ -724,7 +724,8 @@
ImplInitDropDownButton( mpBtn );
}
Resize();
-mpImplLB-Resize(); // Wird nicht durch ComboBox::Resize() gerufen,
wenn sich die ImplLB nicht aendert.
+mpImplLB-Resize(); // not called by ComboBox::Resize() if ImplLB is
unchanged
+
SetBackground();// due to a hack in Window::UpdateSettings the
background must be reset
// otherwise it will overpaint NWF drawn comboboxes
}
@@ -857,7 +858,7 @@
void ComboBox::ImplUpdateFloatSelection()
{
-// Text in der ListBox in den sichtbaren Bereich bringen
+// move text in the ListBox into the visible region
mpImplLB-SetCallSelectionChangedHdl( sal_False );
if ( !IsMultiSelectionEnabled() )
{
@@ -1112,11 +1113,11 @@
Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
{
-// ggf. werden ScrollBars eingeblendet
+// show ScrollBars where appropriate
Size aMinSz = CalcMinimumSize();
Size aSz;
-// Hoehe
+// height
if ( nLines )
{
if ( !IsDropDownBox() )
@@ -1127,7 +1128,7 @@
else
aSz.Height() = aMinSz.Height();
-// Breite
+// width
if ( nColumns )
aSz.Width() = nColumns *
GetTextWidth(rtl::OUString(static_castsal_Unicode('X')));
else
@@ -1203,7 +1204,7 @@
}
}
-// Inhalt
+// contents
if ( !IsDropDownBox() )
{
longnOnePixel = GetDrawPixel( pDev, 1 );
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index efa5985..f1d1957 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -405,7 +405,7 @@
if ( pControl-GetStyle() WB_EXTRAOFFSET )
aSize.Width() += 2;
-// GetTextRect verkraftet keinen leeren String:
+// GetTextRect cannot take and empty string
if ( aSize.Width() 0 )
aSize.Width() = 0;
if ( aSize.Height() = 0 )
@@ -892,7 +892,7 @@
}
else
{
-// Haben wir ueberhaupt eine Bitmap
+// do we have a Bitmap?
if ( !(!(*pBitmap)) )
{
if ( GetStyle() WB_SCALE )
@@ -1095,7 +1095,7 @@
Image *pImage = maImage;
-// Haben wir ueberhaupt ein Image
+// do we have an image?
if ( !(!(*pImage)) )
{
if ( GetStyle() WB_SCALE )
--
To view, visit https://gerrit.libreoffice.org/2534
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8af3fe962ba77d7047eac8d7570c5bc572585363
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/win
vcl/inc/vcl/graphicfilter.hxx| 51 +--
vcl/inc/vcl/prgsbar.hxx | 43 +++-
vcl/win/source/window/salobj.cxx | 33 ++---
3 files changed, 57 insertions(+), 70 deletions(-)
New commits:
commit 02a985013e816c94a07cf93491873fddfe090b1d
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Feb 24 11:30:51 2013 -0500
fdo#39468: Translated German comments in vcl/{inc,win}
Change-Id: I1b11872dd56d93b116a65ac2e3905f751cfafeeb
Signed-off-by: Philipp Riemer ruderphil...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/2447
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/vcl/inc/vcl/graphicfilter.hxx b/vcl/inc/vcl/graphicfilter.hxx
index f9a7ae1..3e2218c 100644
--- a/vcl/inc/vcl/graphicfilter.hxx
+++ b/vcl/inc/vcl/graphicfilter.hxx
@@ -87,10 +87,7 @@ struct ConvertData;
#define EMF_SHORTNAME EMF
#define SVG_SHORTNAME SVG
-//
-// - Info-Klasse fuer alle von uns
-// unterstuetzten Grafik-Fileformate
-//
+// Info class for all supported file formats
#define GFF_NOT ( (sal_uInt16)0x )
#define GFF_BMP ( (sal_uInt16)0x0001 )
@@ -169,50 +166,48 @@ class VCL_DLLPUBLIC GraphicDescriptor
public:
-// Ctor, um einen Filenamen zu setzen. Es muss ::Detect() gerufen werden,
-// um das File zu identifizieren;
-// wenn das File keinen eindeutigen Header besitzt ( Mtf's ) wird das
-// Format anhand der Extension bestimmt
+/** Ctor to set a filename
+
+::Detect() must be called to identify the file
+If the file has no unique header (Mtf's), the format
+is determined from the extension */
GraphicDescriptor( const INetURLObject rPath );
-// Ctor, um einen Stream zu setzen. Es muss ::Detect() gerufen werden,
-// um das File zu identifizieren;
-// da einige Formate ( Mtf's ) keinen eindeutigen Header besitzen,
-// ist es sinnvoll den Filenamen (inkl. Ext. ) mitanzugeben,
-// da so das Format ueber die Extension ermittelt werden kann
+/** Ctor using a stream
+
+::Detect() must be called to identify the file
+As some formats (Mtf's) do not have a unique header, it makes sense
+to supply the file name (incl. ext.), so that the format can be
+derived from the extension */
GraphicDescriptor( SvStream rInStream, const String* pPath = NULL );
-// Dtor
virtual ~GraphicDescriptor();
-// Startet die Detektion;
-// bei bExtendedInfo == sal_True werden soweit wie moeglich
-// Daten aus dem jeweiligen FileHeader ermittelt
-// ( Groesse, Farbtiefe usw. )
+/** starts the detection
+
+if bExtendedInfo == sal_True the file header is used to derive
+as many properties as possible (size, color, etc.) */
virtual sal_BoolDetect( sal_Bool bExtendedInfo = sal_False );
-// liefert das Fileformat nach erfolgreicher Detektion zurueck;
-// wenn kein Format erkannt wurde, ist das Formart GFF_NOT
+/** @return the file format, GFF_NOT if no format was recognized */
sal_uInt16 GetFileFormat() const { return nFormat; }
-// liefert die Pixel-Bildgroesse oder 0-Size zurueck
+/** @return graphic size in pixels or 0 size */
const Size GetSizePixel() const { return (Size) aPixSize; }
-// liefert die logische Bildgroesse in 1/100mm oder 0-Size zurueck
+/** @return the logical graphic size in 1/100mm or 0 size */
const Size GetSize_100TH_MM() const { return (Size) aLogSize; }
-// liefert die Bits/Pixel oder 0 zurueck
+/** @return bits/pixel or 0 **/
sal_uInt16 GetBitsPerPixel() const { return nBitsPerPixel; }
-// liefert die Anzahl der Planes oder 0 zurueck
+/** return number of planes or 0 */
sal_uInt16 GetPlanes() const { return nPlanes; }
-// zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist
+/** @return true if the graphic is compressed */
sal_BoolIsCompressed() const { return bCompressed; }
-// gibt die Filternummer des Filters zurueck,
-// der im GraphicFilter zum Lesen dieses Formats
-// benoetigt wird
+/** @return filter number that is needed by the GraphFilter to read this
format */
static String GetImportFormatShortName( sal_uInt16 nFormat );
};
diff --git a/vcl/inc/vcl/prgsbar.hxx b/vcl/inc/vcl/prgsbar.hxx
index fb68670..9f22df4 100644
--- a/vcl/inc/vcl/prgsbar.hxx
+++ b/vcl/inc/vcl/prgsbar.hxx
@@ -24,29 +24,26 @@
#include vcl/window.hxx
/*
-
-Beschreibung
-
-
-class ProgressBar
-
-Diese Klasse dient zur Anzeige einer Progress-Anzeige
[PATCH]Comment translation vcl/win/source/window/salobj.cxx
From 1fdf270d1fd405068dcf4a4c16faf72a2bc19ff9 Mon Sep 17 00:00:00 2001
From: Christian M. Heller christian.helle...@gmail.com
Date: Sun, 24 Feb 2013 11:30:51 -0500
Subject: [PATCH] Comment translation vcl/win/source/window/salobj.cxx
---
vcl/win/source/window/salobj.cxx | 33 ++---
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index e2c1b24..f6287e7 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -41,7 +41,7 @@ static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )
HWND hTempWnd = ::GetParent( hWndChild );
while ( hTempWnd )
{
-// Ab nicht Child-Fenstern hoeren wir auf zu suchen
+// stop searching if not a child window
if ( !(GetWindowStyle( hTempWnd ) WS_CHILD) )
return FALSE;
if ( hTempWnd == hWndParent )
@@ -129,8 +129,7 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
pObject = ImplFindSalObject( pData-hwnd );
if ( pObject !ImplFindSalObject( (HWND)pData-wParam ) )
{
-// LoseFocus nur rufen, wenn wirklich kein ChildFenster
-// den Focus bekommt
+// only call LoseFocus, if truly no child window gets the focus
if ( !pData-wParam || !ImplFindSalObject( (HWND)pData-wParam ) )
{
if ( ImplSalYieldMutexTryToAcquire() )
@@ -172,11 +171,9 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg )
if ( (pMsg-message == WM_KEYDOWN) ||
(pMsg-message == WM_KEYUP) )
{
-// KeyEvents wollen wir nach Moeglichkeit auch abarbeiten,
-// wenn das Control diese nicht selber auswertet
-// SysKeys werden als WM_SYSCOMMAND verarbeitet
-// Char-Events verarbeiten wir nicht, da wir nur
-// Accelerator relevante Keys verarbeiten wollen
+// process KeyEvents even if the control does not process them itself
+// SysKeys are processed as WM_SYSCOMMAND
+// Char-Events are not processed, as they are not accelerator-relevant
sal_Bool bWantedKeyCode = FALSE;
// A-Z, 0-9 nur in Verbindung mit Control-Taste
if ( ((pMsg-wParam = 65) (pMsg-wParam = 90)) ||
@@ -200,7 +197,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg )
ImplSalYieldMutexRelease();
}
}
-// Hier WM_SYSCHAR abfangen, um mit Alt+Taste evtl. Menu zu aktivieren
+// check WM_SYSCHAR, to activate menu with Alt key
else if ( pMsg-message == WM_SYSCHAR )
{
pSalData-mnSalObjWantKeyEvt = 0;
@@ -362,9 +359,8 @@ LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
CREATESTRUCTA* pStruct = (CREATESTRUCTA*)lParam;
pSysObj = (WinSalObject*)pStruct-lpCreateParams;
SetSalObjWindowPtr( hWnd, pSysObj );
-// HWND schon hier setzen, da schon auf den Instanzdaten
-// gearbeitet werden kann, wenn Messages waehrend
-// CreateWindow() gesendet werden
+// set HWND already here,
+// as instance data might be used during CreateWindow() events
pSysObj-mhWnd = hWnd;
rDef = FALSE;
}
@@ -400,7 +396,7 @@ LRESULT CALLBACK SalSysObjChildWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPA
switch( nMsg )
{
-// Wegen PlugIn's loeschen wir erstmal den Hintergrund
+// clear background for plugins
case WM_ERASEBKGND:
{
WinSalObject* pSysObj = GetSalObjWindowPtr( ::GetParent( hWnd ) );
@@ -480,7 +476,7 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
{
SalData* pSalData = GetSalData();
-// Hook installieren, wenn es das erste SalObject ist
+// install hook, if it is the first SalObject
if ( !pSalData-mpFirstObject )
{
pSalData-mhSalObjMsgHook = SetWindowsHookExW( WH_CALLWNDPROC,
@@ -599,7 +595,7 @@ WinSalObject::~WinSalObject()
{
pSalData-mpFirstObject = mpNextObject;
-// Wenn letztes SalObject, dann Hook wieder entfernen
+// remove hook, if it is the last SalObject
if ( !pSalData-mpFirstObject )
UnhookWindowsHookEx( pSalData-mhSalObjMsgHook );
}
@@ -622,9 +618,8 @@ WinSalObject::~WinSalObject()
if ( mhWnd )
DestroyWindow( mhWnd );
-// Palette wieder zuruecksetzen, wenn kein externes Child-Fenster
-// mehr vorhanden ist, da diese unsere Palette ueberschrieben haben
-// koennen
+// reset palette, if no external child window is left,
+// as they might have overwritten our palette
if ( hWndParent
::GetActiveWindow() == hWndParent
!GetWindow( hWndParent, GW_CHILD ) )
@@ -712,7 +707,7 @@ void WinSalObject::EndSetClipRegion()
{
HRGN hRegion
