[Libreoffice-commits] core.git: sw/source
Johnny_M
klasse at partyheld.de
Tue Feb 21 22:46:14 UTC 2017
sw/source/filter/inc/fltini.hxx | 18 ++++-----
sw/source/filter/inc/fltshell.hxx | 16 ++++----
sw/source/filter/inc/wrt_fn.hxx | 6 +--
sw/source/filter/inc/wrtswtbl.hxx | 70 +++++++++++++++++++-------------------
4 files changed, 55 insertions(+), 55 deletions(-)
New commits:
commit 9787e68c27b94ccfa25bd9246e24fb42c900aff3
Author: Johnny_M <klasse at partyheld.de>
Date: Sun Feb 19 13:31:50 2017 +0000
Translate German comments in sw/source/filter/inc/
Change-Id: Ibd1fd21f1d36591d28979e733da4a812133912ef
Reviewed-on: https://gerrit.libreoffice.org/34428
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 5cb162f..7b5fa11 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -27,11 +27,11 @@ class SwTextNode;
class SwNumRule;
class SwNodeIndex;
-// die speziellen Reader
+// the special readers
class HTMLReader: public Reader
{
- // wir wollen die Streams / Storages nicht geoeffnet haben
+ // we don't want to have the streams/storages open
virtual bool SetStrmStgPtr() override;
virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override;
virtual OUString GetTemplateName() const override;
@@ -53,18 +53,18 @@ public:
std::vector<OUString*>& rStrings ) const override;
};
-// die speziellen Writer
+// the special writers
void GetWW8Writer( const OUString&, const OUString&, WriterRef& );
-// Umsetzen der LRSpaces im aktuell importierten Doc. Die Fremd-Filter
-// liefern immer absolute Werte fuer die Ebenen einer NumRule. Wir
-// verarbeiten jetzt aber relative Werte bezogen auf das LR-Space-Item.
-// Das hat zur Folge, das bei allen Absaetzen die EInzuege der NumRule vom
-// Absatz-Einzug abgezogen werden muss.
+// Mapping of the LRSpaces in the currently imported document.
+// The foreign filters always provide absolute values for the levels of
+// a NumRule. We are now processing relative values related to the LR-Space-Item
+// though. The consequence of this is that, for all paragraphs, the indentations
+// of the NumRule must be subtracted from the paragraph indentation.
class SW_DLLPUBLIC SwRelNumRuleSpaces
{
- SwNumRuleTable* pNumRuleTable; // Liste aller benannten NumRules
+ SwNumRuleTable* pNumRuleTable; // list of all named NumRules
public:
SwRelNumRuleSpaces( SwDoc& rDoc, bool bNewDoc );
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 4ba7b72..8c132ef 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -86,7 +86,7 @@ public:
}
};
-// Stack-Eintrag fuer die Attribute Es werden immer Pointer auf neue Attribute uebergeben.
+// Stack entry for the attributes. It is always pointers to new attributes that are passed.
class SwFltStackEntry
{
private:
@@ -200,7 +200,7 @@ public:
SwFltAnchor(const SwFltAnchor&);
virtual ~SwFltAnchor() override;
- // "pure virtual Methoden" vom SfxPoolItem
+ // "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
void SetFrameFormat(SwFrameFormat * _pFrameFormat);
@@ -249,7 +249,7 @@ public:
nAutorNo( rCpy.nAutorNo ),
nAutorNoPrev( rCpy.nAutorNoPrev )
{}
- // "pure virtual Methoden" vom SfxPoolItem
+ // "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
};
@@ -270,7 +270,7 @@ public:
const bool bIsTOCBookmark = false );
SwFltBookmark( const SwFltBookmark& );
- // "pure virtual Methoden" vom SfxPoolItem
+ // "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
@@ -310,7 +310,7 @@ class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
public:
SwFltTOX(SwTOXBase* pBase);
SwFltTOX(const SwFltTOX&);
- // "pure virtual Methoden" vom SfxPoolItem
+ // "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
SwTOXBase* GetBase() { return pTOXBase; }
@@ -320,9 +320,9 @@ public:
bool HadPageDescItem() const { return bHadPageDescItem; }
};
-// Der WWEndStack verhaelt sich wie der WWControlStck, nur dass die Attribute
-// auf ihm bis ans Ende des Dokuments gehortet werden, falls auf sie noch
-// zugegriffen werden muss (z.B. Book/RefMarks, Index u.s.w.)
+// The WWEndStack behaves like the WWControlStack, except that the attributes
+// on it are hoarded to the end of the document if they need to be accessed
+// (e.g., book/RefMarks, index, etc.).
class SwFltEndStack : public SwFltControlStack
{
public:
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 49f4a19..5995300 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -20,14 +20,14 @@
#define INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
#include "hintids.hxx"
-// einige Forward-Deklarationen
+// some forward declarations
class SwNode;
class SwContentNode;
class Writer;
class SfxPoolItem;
class SfxItemSet;
-/* Funktionspointer auf die Attribut-Write-Funktionen */
+/* function pointers to the attribute-write functions */
typedef Writer& (*FnAttrOut)( Writer&, const SfxPoolItem& );
typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ];
@@ -35,7 +35,7 @@ SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
bool bDeep );
-/* Funktionspointer auf die Node-Write-Funktionen */
+/* function pointers to the node-write functions */
enum RES_NODE
{
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 57bb117..dcebbc2 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -36,7 +36,7 @@ class SvxBrushItem;
namespace editeng { class SvxBorderLine; }
-// Code aus dem HTML-Filter fuers schreiben von Tabellen
+// Code from the HTML filter for writing of tables
#define COLFUZZY 20
#define ROWFUZZY 20
@@ -45,18 +45,18 @@ namespace editeng { class SvxBorderLine; }
class SW_DLLPUBLIC SwWriteTableCell
{
- const SwTableBox *pBox; // SwTableBox der Zelle
- const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile
+ const SwTableBox *pBox; // SwTableBox of the cell
+ const SvxBrushItem *pBackground; // inherited background of a row
- long nHeight; // fixe/Mindest-Hoehe der Zeile
+ long nHeight; // fix/minimum height of a row
- sal_uInt32 nWidthOpt; // Breite aus Option;
+ sal_uInt32 nWidthOpt; // width from option;
- sal_uInt16 nRow; // Start-Zeile
- sal_uInt16 nCol; // Start-Spalte
+ sal_uInt16 nRow; // start row
+ sal_uInt16 nCol; // start column
- sal_uInt16 nRowSpan; // ueberspannte Zeilen
- sal_uInt16 nColSpan; // ueberspannte Spalten
+ sal_uInt16 nRowSpan; // spanned rows
+ sal_uInt16 nColSpan; // spanned columns
bool bPrcWidthOpt;
@@ -95,10 +95,10 @@ typedef std::vector<std::unique_ptr<SwWriteTableCell>> SwWriteTableCells;
class SW_DLLPUBLIC SwWriteTableRow
{
- SwWriteTableCells m_Cells; ///< All cells of the Rows
- const SvxBrushItem *pBackground;// Hintergrund
+ SwWriteTableCells m_Cells; ///< all cells of the rows
+ const SvxBrushItem *pBackground; // background
- long nPos; // End-Position (twips) der Zeile
+ long nPos; // end position (twips) of the row
bool mbUseLayoutHeights;
SwWriteTableRow & operator= (const SwWriteTableRow &) = delete;
@@ -109,10 +109,10 @@ protected:
public:
- sal_uInt16 nTopBorder; // Dicke der oberen/unteren Umrandugen
+ sal_uInt16 nTopBorder; // thickness of upper/lower border
sal_uInt16 nBottomBorder;
- bool bTopBorder : 1; // Welche Umrandungen sind da?
+ bool bTopBorder : 1; // which borders are there?
bool bBottomBorder : 1;
SwWriteTableRow( long nPos, bool bUseLayoutHeights );
@@ -140,15 +140,15 @@ public:
inline bool SwWriteTableRow::operator==( const SwWriteTableRow& rRow ) const
{
- // etwas Unschaerfe zulassen
+ // allow for some fuzzyness
return (nPos >= rRow.nPos ? nPos - rRow.nPos : rRow.nPos - nPos ) <=
(mbUseLayoutHeights ? 0 : ROWFUZZY);
}
inline bool SwWriteTableRow::operator<( const SwWriteTableRow& rRow ) const
{
- // Da wir hier nur die Wahrheits-Grade 0 und 1 kennen, lassen wir lieber
- // auch nicht zu, dass x==y und x<y gleichzeitig gilt ;-)
+ // Since we only know the degrees of truth of 0 and 1 here, we also prefer to
+ // not let x==y and x<y at the same time ;-)
return nPos < rRow.nPos - (mbUseLayoutHeights ? 0 : ROWFUZZY);
}
@@ -159,15 +159,15 @@ public:
class SW_DLLPUBLIC SwWriteTableCol
{
- sal_uInt32 nPos; // End Position der Spalte
+ sal_uInt32 nPos; // end position of the column
sal_uInt32 nWidthOpt;
bool bRelWidthOpt : 1;
- bool bOutWidth : 1; // Spaltenbreite ausgeben?
+ bool bOutWidth : 1; // output the column width?
public:
- bool bLeftBorder : 1; // Welche Umrandungen sind da?
+ bool bLeftBorder : 1; // which borders are there?
bool bRightBorder : 1;
SwWriteTableCol( sal_uInt32 nPosition );
@@ -193,15 +193,15 @@ public:
inline bool SwWriteTableCol::operator==( const SwWriteTableCol& rCol ) const
{
- // etwas Unschaerfe zulassen
+ // allow for some fuzzyness
return (nPos >= rCol.nPos ? nPos - rCol.nPos
: rCol.nPos - nPos ) <= COLFUZZY;
}
inline bool SwWriteTableCol::operator<( const SwWriteTableCol& rCol ) const
{
- // Da wir hier nur die Wahrheits-Grade 0 und 1 kennen, lassen wir lieber
- // auch nicht zu, dass x==y und x<y gleichzeitig gilt ;-)
+ // Since we only know the degrees of truth of 0 and 1 here, we also prefer to
+ // not let x==y and x<y at the same time ;-)
return nPos + COLFUZZY < rCol.nPos;
}
@@ -223,27 +223,27 @@ class SW_DLLPUBLIC SwWriteTable
private:
const SwTable* m_pTable;
protected:
- SwWriteTableCols m_aCols; // alle Spalten
- SwWriteTableRows m_aRows; // alle Zellen
+ SwWriteTableCols m_aCols; // all columns
+ SwWriteTableRows m_aRows; // all rows
- sal_uInt32 m_nBorderColor; // Umrandungsfarbe
+ sal_uInt32 m_nBorderColor; // border color
- sal_uInt16 m_nCellSpacing; // Dicke der inneren Umrandung
- sal_uInt16 m_nCellPadding; // Absatnd Umrandung-Inhalt
+ sal_uInt16 m_nCellSpacing; // thickness of the inner border
+ sal_uInt16 m_nCellPadding; // distance of border to content
- sal_uInt16 m_nBorder; // Dicke der ausseren Umrandung
- sal_uInt16 m_nInnerBorder; // Dicke der inneren Umrandung
- sal_uInt32 m_nBaseWidth; // Bezugsgroesse fur Breiten SwFormatFrameSize
+ sal_uInt16 m_nBorder; // thickness of the outer border
+ sal_uInt16 m_nInnerBorder; // thickness of the inner border
+ sal_uInt32 m_nBaseWidth; // reference value for SwFormatFrameSize width
- sal_uInt16 m_nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
+ sal_uInt16 m_nHeadEndRow; // last row of the table heading
sal_uInt16 m_nLeftSub;
sal_uInt16 m_nRightSub;
- sal_uInt32 m_nTabWidth; // Absolute/Relative Breite der Tabelle
+ sal_uInt32 m_nTabWidth; // absolute/relative width of the table
- bool m_bRelWidths : 1; // Breiten relativ ausgeben?
- bool m_bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
+ bool m_bRelWidths : 1; // generate relative widths?
+ bool m_bUseLayoutHeights : 1; // use layout to determine the height?
#ifdef DBG_UTIL
bool m_bGetLineHeightCalled : 1;
#endif
More information about the Libreoffice-commits
mailing list