[Libreoffice-commits] .: sw/inc
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Jan 27 00:50:10 PST 2011
sw/inc/fldbas.hxx | 111 ++++++++++++++++++++--------------------------------
sw/inc/flddat.hxx | 11 -----
sw/inc/fldinit.hxx | 4 -
sw/inc/flyenum.hxx | 17 +++----
sw/inc/flypos.hxx | 11 ++---
sw/inc/fmtanchr.hxx | 12 ++---
6 files changed, 65 insertions(+), 101 deletions(-)
New commits:
commit f08be066e505966ebdbacfd91d77b9f73dfc5ad5
Author: Christoph Herzog <rhogez at googlemail.com>
Date: Wed Jan 26 10:38:06 2011 +0100
Translation of comments (minor, 6 files) in sw/inc
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index a3a89bb..1602d3f 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -43,13 +43,9 @@ class SvNumberFormatter;
#endif // FIELDIDS_ONLY
-/*--------------------------------------------------------------------
- Beschreibung: die ID's fuer die Feldtypen
- --------------------------------------------------------------------*/
-
enum RES_FIELDS
{
-// Fuer die alten Dokumente muessen die Field-Which IDS erhalten bleiben !!!!
+// For old documents the Field-Which IDs must be preserved !!!
RES_FIELDS_BEGIN,
RES_DBFLD = RES_FIELDS_BEGIN,
RES_USERFLD,
@@ -94,10 +90,7 @@ enum RES_FIELDS
RES_FIELDS_END
};
-/*--------------------------------------------------------------------
- Beschreibung: Liste der FieldTypes am UI
- --------------------------------------------------------------------*/
-
+// List of FieldTypes at UI.
enum SwFldTypesEnum
{
TYP_BEGIN,
@@ -163,28 +156,28 @@ enum SwFileNameFormat
enum SwVarFormat
{
- VVF_CMD = 0x0010, // Kommando anzeigen
- VVF_INVISIBLE = 0x0040, // unsichtbar
+ VVF_CMD = 0x0010, // Show command.
+ VVF_INVISIBLE = 0x0040, // Invisible.
VVF_XXP = 0x0400, // 1234%
VVF_XX_XXP = 0x0800, // 1.234,56%
VVF_CLEAR = 0x000f,
-// ab hier neue Formate
- VVF_SYS = 0x2000, //Zahlenformat aus der Systemeinstellung
+// From here new formats:
+ VVF_SYS = 0x2000, // Format for numbers from system.
VVF_X = 0x2100, // 1234
- VVF_X_X = 0x2200, // 1234,5
- VVF_X_XX = 0x2300, // 1245,56
- VVF_XX_X = 0x2400, // 1.234,5
- VVF_XX_XX = 0x2500, // 1.234,56
- VVF_XX_XXX = 0x2600, // 1.234,567
- VVF_SYS_CUR = 0x2700, // W???hrungsformat aus der Systemeinstellung
- VVF_CUR_X = 0x2800, // DM 1234
- VVF_CUR_XX_XX = 0x2900, // DM 1234,56 DM 1234,00
- VVF_CUR_XX_X0 = 0x2a00, // DM 1234,56 DM 1234,--
- VVF_X_CUR = 0x2b00, // 1234 DM
- VVF_XX_XX_CUR = 0x2c00, // 1234,56 DM 1234,00 DM
- VVF_XX_X0_CUR = 0x2d00, // 1234,56 DM 1234,-- DM
-// Kompatibilitaet:
+ VVF_X_X = 0x2200, // 1234.5
+ VVF_X_XX = 0x2300, // 1245.56
+ VVF_XX_X = 0x2400, // 1.234.5
+ VVF_XX_XX = 0x2500, // 1.234.56
+ VVF_XX_XXX = 0x2600, // 1.234.567
+ VVF_SYS_CUR = 0x2700, // Format for currency from system.
+ VVF_CUR_X = 0x2800, // EUR 1234
+ VVF_CUR_XX_XX = 0x2900, // EUR 1234.56 EUR 1234.00
+ VVF_CUR_XX_X0 = 0x2a00, // EUR 1234.56 EUR 1234.--
+ VVF_X_CUR = 0x2b00, // 1234 EUR
+ VVF_XX_XX_CUR = 0x2c00, // 1234.56 EUR 1234.00 EUR
+ VVF_XX_X0_CUR = 0x2d00, // 1234.56 EUR 1234.-- EUR
+// Compatibility:
VF_CMD = VVF_CMD,
VF_INVISIBLE = VVF_INVISIBLE,
VF_XXP = VVF_XXP,
@@ -204,16 +197,15 @@ namespace nsSwGetSetExpType
const SwGetSetExpType GSE_EXPR = 0x0002; // Expression
const SwGetSetExpType GSE_INP = 0x0004; // InputField
const SwGetSetExpType GSE_SEQ = 0x0008; // Sequence
- const SwGetSetExpType GSE_FORMULA = 0x0010; // Formel
+ const SwGetSetExpType GSE_FORMULA = 0x0010; // Formula
}
typedef USHORT SwExtendedSubType;
namespace nsSwExtendedSubType
{
- const SwExtendedSubType SUB_CMD = 0x0100; // Kommando anzeigen
- const SwExtendedSubType SUB_INVISIBLE = 0x0200; // unsichtbar
- const SwExtendedSubType SUB_OWN_FMT = 0x0400; // SwDBField: Uebernimmt Formatierung nicht
- // aus Datenbank
+ const SwExtendedSubType SUB_CMD = 0x0100; // Show command.
+ const SwExtendedSubType SUB_INVISIBLE = 0x0200; // Invisible.
+ const SwExtendedSubType SUB_OWN_FMT = 0x0400; // SwDBField: Don't accept formating from database.
}
enum SwInputFieldSubType
@@ -242,34 +234,27 @@ enum SwDateTimeSubType
extern USHORT aTypeTab[];
-/*--------------------------------------------------------------------
- Beschreibung: Allgemeine Tools
- --------------------------------------------------------------------*/
-
+// General tools.
String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
String FormatNumber(USHORT nNum, sal_uInt32 nFormat);
-/*--------------------------------------------------------------------
- Beschreibung: Instanzen von SwFields und Abgeleiteten kommen 0-n mal vor.
- Zu jeder Klasse SwFields existiert
- 1 Instanz der zugehoerigen Typenklasse
- Basisklasse aller Feldtypen ist SwFieldType
- --------------------------------------------------------------------*/
-
+// Instances of SwFields and those derived from it occur 0 to n times.
+// For each class there is one instance of the associated type class.
+// Base class of all field types is SwFieldType.
DBG_NAMEEX(SwFieldType)
class SW_DLLPUBLIC SwFieldType : public SwModify
{
USHORT nWhich;
- friend void _FinitUI(); // um den Pointer zu loeschen!
+ friend void _FinitUI(); // In order to delete pointer!
static SvStringsDtor* pFldNames;
- static void _GetFldName(); // legt die FldNames an, fldmgr.cxx!
+ static void _GetFldName(); // Sets up FldNames; fldmgr.cxx!
protected:
- // single argument ctors shall be explicit.
+ // Single argument ctors shall be explicit.
explicit SwFieldType( USHORT nWhichId );
public:
@@ -279,7 +264,7 @@ public:
#endif
static const String& GetTypeStr( USHORT nTypeId );
- // nur in abgeleiteten Klassen
+ // Only in derived classes.
virtual const String& GetName() const;
virtual SwFieldType* Copy() const = 0;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
@@ -295,18 +280,14 @@ inline void SwFieldType::UpdateFlds() const
((SwFieldType*)this)->Modify( 0, 0 );
}
-/*--------------------------------------------------------------------
- Beschreibung: Basisklasse aller Felder.
- Ueber Which wird der Typ des Feldes abgefragt.
- Ueber Expand() wird der expandierte Inhalt
- des Feldes in Erfahrung gebracht.
- --------------------------------------------------------------------*/
-
+// Base class of all fields.
+// Type of field is queried via Which.
+// Expanded content of field is queried via Expand().
class SW_DLLPUBLIC SwField
{
private:
- mutable String m_Cache; // cached expansion (for clipboard)
- USHORT nLang; // Immer ueber SetLanguage aendern!
+ mutable String m_Cache; // Cached expansion (for clipboard).
+ USHORT nLang; // Always change via SetLanguage!
BOOL bIsAutomaticLanguage;
sal_uInt32 nFormat;
@@ -323,10 +304,9 @@ protected:
public:
virtual ~SwField();
- // Typ feststellen
inline SwFieldType* GetTyp() const;
- // neuen Typ setzen (wird fuer das Kopieren zwischen Dokumenten benutzt)
+ // Set new type (used for copying among documents).
virtual SwFieldType* ChgTyp( SwFieldType* );
/** expand the field.
@@ -335,7 +315,7 @@ public:
*/
String ExpandField(bool const bInClipboard) const;
- // liefert den Namen oder den Inhalt
+ // Returns name or content.
virtual String GetCntnt(BOOL bName = FALSE) const;
SwField * CopyField() const;
@@ -353,11 +333,11 @@ public:
virtual USHORT GetSubType() const;
virtual void SetSubType(USHORT);
- // Sprache an der Feldposition
+ // Language at field position.
inline USHORT GetLanguage() const;
virtual void SetLanguage(USHORT nLng);
- // Parameter fuer Dialog und BASIC erfragen
+ // Query parameters for dialog and for BASIC.
inline sal_uInt32 GetFormat() const;
virtual const String& GetPar1() const;
virtual String GetPar2() const;
@@ -370,9 +350,9 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
- // hat das Feld eine Action auf dem ClickHandler ? (z.B. INetFelder,..)
+
+ // Does the field possess an action on its ClickHandler? (e.g. INetFields, ...).
BOOL HasClickHdl() const;
- // ist es ein Fix-Feld?
BOOL IsFixed() const;
BOOL IsAutomaticLanguage() const { return bIsAutomaticLanguage;}
@@ -390,15 +370,12 @@ inline sal_uInt32 SwField::GetFormat() const
inline USHORT SwField::GetLanguage() const
{ return nLang; }
-/*--------------------------------------------------------------------
- Beschreibung: Felder mit Values, die ueber der Numberformatter
- formatiert werden muessen
- --------------------------------------------------------------------*/
+//Fields containing values that have to be formated via number formatter.
class SwValueFieldType : public SwFieldType
{
SwDoc* pDoc;
- BOOL bUseFormat; // Numberformatter verwenden
+ BOOL bUseFormat; // Use number formatter.
protected:
SwValueFieldType( SwDoc* pDocPtr, USHORT nWhichId );
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index f03cc88..fa1ad74 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -37,9 +37,6 @@ class DateTime;
class Date;
class Time;
-/*--------------------------------------------------------------------
- Beschreibung: Formate
- --------------------------------------------------------------------*/
enum SwDateFormat
{
@@ -95,9 +92,6 @@ enum SwDateSubFormat
DATE_VAR
};
-/*--------------------------------------------------------------------
- Beschreibung: Datum/Uhrzeitfeld
- --------------------------------------------------------------------*/
class SwDateTimeFieldType : public SwValueFieldType
{
@@ -107,14 +101,11 @@ public:
virtual SwFieldType* Copy() const;
};
-/*--------------------------------------------------------------------
- Beschreibung: Datum/Uhrzeitfeld
- --------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDateTimeField : public SwValueField
{
USHORT nSubType;
- long nOffset; // Offset in Minutes
+ long nOffset; // Offset in minutes.
public:
SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSubType = DATEFLD,
diff --git a/sw/inc/fldinit.hxx b/sw/inc/fldinit.hxx
index d302446..2244140 100644
--- a/sw/inc/fldinit.hxx
+++ b/sw/inc/fldinit.hxx
@@ -28,9 +28,7 @@
#ifndef _FLDINIT_HXX
#define _FLDINIT_HXX
-/*--------------------------------------------------------------------
- Beschreibung: Tabelle aller FeldInfos
- --------------------------------------------------------------------*/
+//Table for FieldInfo.
void InitFieldInfo();
void FinitFieldInfo();
diff --git a/sw/inc/flyenum.hxx b/sw/inc/flyenum.hxx
index b2060e7..0923ef9 100644
--- a/sw/inc/flyenum.hxx
+++ b/sw/inc/flyenum.hxx
@@ -38,16 +38,15 @@ enum FlyCntType
};
-//Returnwerte fuer Chainable und Chain
+// Return values for chainable and chain.
#define SW_CHAIN_OK 0
-#define SW_CHAIN_NOT_EMPTY 1 //Nur leere Frames duerfen connected werden
-#define SW_CHAIN_IS_IN_CHAIN 2 //Destination ist bereits in einer chain
-#define SW_CHAIN_WRONG_AREA 3 //Destination steht in einer nicht erlaubten
- //Section (Kopf-/Fusszeile)
-#define SW_CHAIN_NOT_FOUND 4 //Destination und/oder Source nicht gefunden
-#define SW_CHAIN_SOURCE_CHAINED 5 //Source hat bereits einen Follow
-#define SW_CHAIN_SELF 6 //Sich selbst zu verketten ist
- //natuerlich nicht erleubt.
+#define SW_CHAIN_NOT_EMPTY 1 // Only empty frames may be connected.
+#define SW_CHAIN_IS_IN_CHAIN 2 // Destination already in chain.
+#define SW_CHAIN_WRONG_AREA 3 // Destination in section where it shouldn't be
+ // (header, footer).
+#define SW_CHAIN_NOT_FOUND 4 // Destination and/or source not found.
+#define SW_CHAIN_SOURCE_CHAINED 5 // Source already has a follow.
+#define SW_CHAIN_SELF 6 // Self-chaining is not allowed.
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 3d39aa0..ca4bb90 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -35,17 +35,18 @@
class SwFrmFmt;
class SwNodeIndex;
-// Struktur zum Erfragen der akt. freifliegenden Rahmen am Dokument.
+
+// For querying current flys in document.
class SW_DLLPUBLIC SwPosFlyFrm
{
- const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
- SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
+ const SwFrmFmt* pFrmFmt; // FlyFrmFmt
+ SwNodeIndex* pNdIdx; // Index for node is sufficient.
UINT32 nOrdNum;
public:
SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, USHORT nArrPos );
- virtual ~SwPosFlyFrm(); // virtual fuer die Writer (DLL !!)
+ virtual ~SwPosFlyFrm(); // Virtual for Writer (DLL !!)
- // operatoren fuer das Sort-Array
+ // Operators for sort array.
BOOL operator==( const SwPosFlyFrm& );
BOOL operator<( const SwPosFlyFrm& );
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index edc0f45..a3d9865 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -38,15 +38,14 @@ struct SwPosition;
class IntlWrapper;
#define IVER_FMTANCHOR_LONGIDX ((USHORT)1)
-//FlyAnchor, Anker des Freifliegenden Rahmen ----
-
+// FlyAnchors
class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
{
- SwPosition *pCntntAnchor; //0 Fuer Seitengebundene Rahmen.
- //Index fuer Absatzgebundene Rahmen.
- //Position fuer Zeichengebundene Rahmen
+ SwPosition *pCntntAnchor; // 0 for page-bound frames.
+ // Index for paragraph-bound frames.
+ // Position for character-bound frames.
RndStdIds nAnchorId;
- USHORT nPageNum; //Seitennummer bei Seitengeb. Rahmen.
+ USHORT nPageNum; // Page number for page-bound frames.
// #i28701# - getting anchor positions ordered
sal_uInt32 mnOrder;
@@ -57,7 +56,6 @@ public:
SwFmtAnchor( const SwFmtAnchor &rCpy );
~SwFmtAnchor();
- // Zuweisungsoperator
SwFmtAnchor &operator=( const SwFmtAnchor& );
// "pure virtual methods" of SfxPoolItem
More information about the Libreoffice-commits
mailing list