[Libreoffice-commits] .: sw/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 11 03:32:21 PST 2011
sw/inc/dbfld.hxx | 46 +++++++++++++++++++++-----------------------
sw/inc/dbmgr.hxx | 49 +++++++++++++++++++++++------------------------
sw/inc/dcontact.hxx | 54 ++++++++++++++++++++++++----------------------------
3 files changed, 71 insertions(+), 78 deletions(-)
New commits:
commit 1b34c10368c6539101b74207430dfd702567c81d
Author: Christoph Herzog <rhogez at googlemail.com>
Date: Mon Jan 10 15:49:15 2011 +0100
3 more translations in writer/sw/inc
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index ef1f79d..0a78082 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -37,7 +37,7 @@ class SwTxtFld;
class SwFrm;
/*--------------------------------------------------------------------
- Beschreibung: Datenbankfeld
+ Database field.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
@@ -66,9 +66,8 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung:
- von SwFields abgeleitete Klassen. Sie ueberlagern die Expand-Funktion.
- Der Inhalt wird entsprechend dem Format, soweit vorhanden, formatiert.
+ Classes derived from SwFields. They overlay the expand-function.
+ Content is formated according to the format (if available).
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBField : public SwValueField
@@ -86,7 +85,7 @@ public:
virtual SwFieldType* ChgTyp( SwFieldType* );
- // Der aktuelle Text
+ // Current text.
inline void SetExpansion(const String& rStr);
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -94,16 +93,16 @@ public:
virtual USHORT GetSubType() const;
virtual void SetSubType(USHORT nType);
- // Name oder Inhalt
+ // Name or content.
virtual String GetCntnt(BOOL bName = FALSE) const;
- // fuer Berechnungen in Ausdruecken
+ // For calculations in expressions.
void ChgValue( double d, BOOL bVal );
- // Evaluierung ueber den DBMgr String rauspulen
+ // Get the evaluation via DBMgr string.
void Evaluate();
- // Evaluierung fuer Kopf und Fusszeilen
+ // Evaluation for header and footer.
void ChangeExpansion( const SwFrm*, const SwTxtFld* );
void InitContent();
void InitContent(const String& rExpansion);
@@ -114,7 +113,7 @@ public:
inline void ClearInitialized() { bInitialized = FALSE; }
inline void SetInitialized() { bInitialized = TRUE; }
- // Name erfragen
+ // Get name.
virtual const String& GetPar1() const;
// access to the command string
@@ -137,7 +136,7 @@ inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
{ bIsInBodyTxt = bIsInBody; }
/*--------------------------------------------------------------------
- Beschreibung: Basisklasse fuer alle weiteren Datenbankfelder
+ Base class for all other database fields.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBNameInfField : public SwField
@@ -158,7 +157,7 @@ public:
SwDBData GetDBData(SwDoc* pDoc);
void SetDBData(const SwDBData& rDBData);
- // Name oder Inhalt
+ // Name or content.
virtual String GetCntnt(BOOL bName = FALSE) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -167,7 +166,7 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Datenbankfeld Naechster Satz
+ Database field next record.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType
@@ -179,7 +178,7 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Naechsten Datensatz mit Bedingung
+ Next data record with condition.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
@@ -212,7 +211,7 @@ inline void SwDBNextSetField::SetCondValid(BOOL bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
- Beschreibung: Datenbankfeld Naechster Satz
+ Database field next record.
--------------------------------------------------------------------*/
class SwDBNumSetFieldType : public SwFieldType
@@ -224,9 +223,8 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Datensatz mit Nummer xxx
- Die Nummer steht in nFormat
- ! kleiner Missbrauch
+ Data record with number xxx.
+ Number is in nFormat (bit of a misuse!)
--------------------------------------------------------------------*/
class SwDBNumSetField : public SwDBNameInfField
@@ -249,11 +247,11 @@ public:
virtual const String& GetPar1() const;
virtual void SetPar1(const String& rStr);
- // Datensatznummer
+ // Number of data record.
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- // Die Datensatznummer steht in nFormat !!
+ // Number of data record is in nFormat!!
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -265,7 +263,7 @@ inline void SwDBNumSetField::SetCondValid(BOOL bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
- Beschreibung: Datenbankname
+ Database name.
--------------------------------------------------------------------*/
class SwDBNameFieldType : public SwFieldType
@@ -279,7 +277,7 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Datenbankfeld
+ Database field.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
@@ -294,7 +292,7 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Datensatznummer
+ Number of data record.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType
@@ -306,7 +304,7 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Datenbankfeld
+ Database field.
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index bf4ca26..5fc0e2f 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -87,19 +87,19 @@ class SwMailMergeConfigItem;
enum DBMgrOptions
{
- DBMGR_MERGE, // Datensaetze in Felder
- DBMGR_INSERT, // Datensaetze in Text
- DBMGR_MERGE_MAILMERGE, // Serienbriefe drucken
- DBMGR_MERGE_MAILING, // Serienbriefe als email versenden
- DBMGR_MERGE_MAILFILES, // Serienbriefe als Datei(en) speichern
- DBMGR_MERGE_DOCUMENTS, // Print merged documents
- DBMGR_MERGE_SINGLE_FILE // save merge as single file
+ DBMGR_MERGE, // Data records in fields.
+ DBMGR_INSERT, // Data records in text.
+ DBMGR_MERGE_MAILMERGE, // Print mail merge.
+ DBMGR_MERGE_MAILING, // Send mail merge as email.
+ DBMGR_MERGE_MAILFILES, // Save mail merg as files.
+ DBMGR_MERGE_DOCUMENTS, // Print merged documents.
+ DBMGR_MERGE_SINGLE_FILE // Save merge as single file.
};
// -----------------------------------------------------------------------
/*--------------------------------------------------------------------
- Beschreibung: (neue) Logische Datenbanken verwalten
+ Administration of (new) logical databases.
--------------------------------------------------------------------*/
#define SW_DB_SELECT_UNKNOWN 0
#define SW_DB_SELECT_TABLE 1
@@ -154,7 +154,7 @@ struct SwMergeDescriptor
SwWrtShell& rSh;
const ::svx::ODataAccessDescriptor& rDescriptor;
String sSaveToFilter; //export filter to save resulting files
- String sSaveToFilterOptions; //
+ String sSaveToFilterOptions;
com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveToFilterData;
String sSubject;
@@ -199,13 +199,13 @@ friend class SwConnectionDisposedListener_Impl;
static SwDbtoolsClient* pDbtoolsClient;
- String sEMailAddrFld; // Mailing: Spaltenname der E-Mail Adresse
- String sSubject; // Mailing: Subject
- String sAttached; // Mailing: Attachte Files
+ String sEMailAddrFld; // Mailing: Column name of email address.
+ String sSubject; // Mailing: Subject
+ String sAttached; // Mailing: Attached Files.
USHORT nMergeType;
- BOOL bInitDBFields : 1; // TRUE: Datenbank an Feldern beim Mergen
- BOOL bSingleJobs : 1; // Einzelne Druckjobs bei Aufruf aus Basic
- BOOL bCancel : 1; // Serienbrief-Save abgebrochen
+ BOOL bInitDBFields : 1;
+ BOOL bSingleJobs : 1; // Printing job when called from Basic.
+ BOOL bCancel : 1; // Mail merge save canceled.
BOOL bInMerge : 1; //merge process active
BOOL bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API)
@@ -221,10 +221,10 @@ friend class SwConnectionDisposedListener_Impl;
SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
- // Datensaetze als Text ins Dokument einfuegen
+ // Insert data record as text into document.
SW_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
- // Einzelnen Datensatz als Text ins Dokument einfuegen
+ // Insert a single data record as text into document.
SW_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
// merge to file _and_ merge to e-Mail
@@ -236,7 +236,7 @@ public:
SwNewDBMgr();
~SwNewDBMgr();
- // Art des aktellen Mergens. Siehe DBMgrOptions-enum
+ // Current merge type. Cf. DBMgrOptions-enum.
inline USHORT GetMergeType() const { return nMergeType; }
inline void SetMergeType( USHORT nTyp ) { nMergeType = nTyp; }
@@ -247,29 +247,28 @@ public:
inline BOOL IsMergeSilent() const { return bMergeSilent != 0; }
inline void SetMergeSilent( BOOL bVal ) { bMergeSilent = bVal; }
- // Mischen von Datensaetzen in Felder
+ // Merging of data records into fields.
BOOL MergeNew( const SwMergeDescriptor& rMergeDesc );
BOOL Merge(SwWrtShell* pSh);
- // Datenbankfelder mit fehlendem Datenbankname initialisieren
+ // Initialize data fields that lack name of database.
inline BOOL IsInitDBFields() const { return bInitDBFields; }
inline void SetInitDBFields(BOOL b) { bInitDBFields = b; }
- // Serienbriefe einzelnd oder alle zusammen drucken/speichern
+ // Print / Save mail merge one by one or all together.
inline BOOL IsSingleJobs() const { return bSingleJobs; }
inline void SetSingleJobs(BOOL b) { bSingleJobs = b; }
- // Mailing
- // email-Daten setzen
+ // Mailing: Set email data.
inline void SetEMailColumn(const String& sColName) { sEMailAddrFld = sColName; }
inline void SetSubject(const String& sSbj) { sSubject = sSbj; }
inline void SetAttachment(const String& sAtt) { sAttached = sAtt; }
- // Listbox mit allen Tabellennamen einer Datenbank fuellen
+ // Fill listbox with all table names of a database.
BOOL GetTableNames(ListBox* pListBox, const String& rDBName );
- // Listbox mit allen Spaltennamen einer Datenbanktabelle fuellen
+ // Fill listbox with all column names of a database table.
BOOL GetColumnNames(ListBox* pListBox,
const String& rDBName, const String& rTableName, BOOL bAppend = FALSE);
BOOL GetColumnNames(ListBox* pListBox,
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 95005fb..b3b6a3b 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -53,12 +53,11 @@ struct SwPosition;
class SwIndex;
#include <anchoreddrawobject.hxx>
-//Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
-//Wenn das Object ein SwVirtFlyDrawObj ist so wird das Format von
-//selbigem besorgt.
-//Anderfalls ist es eben ein einfaches Zeichenobjekt. Diese hat einen
-//UserCall und der ist Client vom gesuchten Format.
-//Implementierung in dcontact.cxx
+// The other way round: Search format for given object.
+// If object is a SwVirtFlyDrawObj the format will be obtained from it.
+// If not it is a simple DrawObject. It has a UserCall which
+// is client of the format we are looking for.
+// Implementation in dcontact.cxx.
SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj );
inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj )
{ return ::FindFrmFmt( (SdrObject*)pObj ); }
@@ -66,20 +65,20 @@ sal_Bool HasWrap( const SdrObject* pObj );
void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
-//Bei Aenderungen das Objekt aus dem ContourCache entfernen.
-//Implementierung in TxtFly.Cxx
+// When changes occur remove object from ContourCache.
+// Implementation in TxtFly.cxx.
void ClrContourCache( const SdrObject *pObj );
-// liefert BoundRect inklusive Abstand
+// Returns BoundRect plus distance.
SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj );
-//Liefert den UserCall ggf. vom Gruppenobjekt
+// Returns UserCall of goup object (if applicable).
SwContact* GetUserCall( const SdrObject* );
-// liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist
+// Returns TRUE if the SrdObject is a Marquee object.
BOOL IsMarqueeTextObj( const SdrObject& rObj );
-//Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte)
+// Base class for the following contact objects (frame + draw objects).
class SwContact : public SdrObjUserCall, public SwClient
{
// boolean, indicating destruction of contact object
@@ -118,7 +117,7 @@ protected:
public:
TYPEINFO();
- //Fuer den Reader, es wir nur die Verbindung hergestellt.
+ //For reader. Only the connection is created.
SwContact( SwFrmFmt *pToRegisterIn );
virtual ~SwContact();
@@ -203,8 +202,8 @@ public:
sal_uInt32 GetMaxOrdNum() const;
};
-//KontactObjekt fuer die Verbindung zwischen Rahmen bzw. deren Formaten
-//im StarWriter (SwClient) und den Zeichenobjekten des Drawing (SdrObjUserCall)
+// ContactObject for connection between frames (or their formats respectively)
+// in SwClient and the drawobjects of Drawing (DsrObjUserCall).
class SW_DLLPUBLIC SwFlyDrawContact : public SwContact
{
@@ -222,7 +221,7 @@ private:
public:
TYPEINFO();
- //Legt das DrawObjekt an und meldet es beim Model an.
+ // Creates DrawObject and registers it with the Model.
SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
virtual ~SwFlyDrawContact();
@@ -245,7 +244,6 @@ public:
virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj );
/** get data collection of anchored objects handled by with contact
-
*/
virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const;
};
@@ -347,10 +345,9 @@ class SwDrawVirtObj : public SdrVirtObj
bool CheckControlLayer( const SdrObject *pObj );
-//KontactObjekt fuer die Verbindung von Formaten als Repraesentanten der
-//Zeichenobjekte im StarWriter (SwClient) und den Objekten selbst im Drawing
-//(SdrObjUserCall).
+// ContactObject for connection of formats as representatives of draw objects
+// in SwClient and the objects themselves in Drawing (SDrObjUserCall).
class NestedUserCallHdl;
class SwDrawContact : public SwContact
@@ -450,9 +447,9 @@ class SwDrawContact : public SwContact
void ChkPage();
SwPageFrm* FindPage( const SwRect &rRect );
- //Fuegt das SdrObject in die Arrays (SwPageFrm und SwFrm) des Layouts ein.
- //Der Anker wird Anhand des Attributes SwFmtAnchor bestimmt.
- //Das Objekt wird ggf. beim alten Anker abgemeldet.
+ // Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm).
+ // The anchor is determined according to the attribute SwFmtAnchor.
+ // If required the object gets unregistered with the old anchor.
void ConnectToLayout( const SwFmtAnchor *pAnch = 0 );
// method to insert 'master' drawing object
// into drawing page
@@ -474,17 +471,17 @@ class SwDrawContact : public SwContact
// by frame.
SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm );
- // virtuelle Methoden von SwClient
+ // Virtual methods of SwClient.
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
- // virtuelle Methoden von SdrObjUserCall
+ // Virtual methods of SdrObjUserCall.
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect);
- // wird von Changed() und auch vom UndoDraw benutzt, uebernimmt
- // das Notifien von Absaetzen, die ausweichen muessen
+ // Used by Changed() and by UndoDraw.
+ // Notifies paragraphs that have to get out of the way.
void _Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle* pOldBoundRect);
- //Moved alle SW-Verbindungen zu dem neuen Master.
+ //Moves all SW-connections to new Master)
void ChangeMasterObject( SdrObject *pNewMaster );
SwDrawVirtObj* AddVirtObj();
@@ -492,7 +489,6 @@ class SwDrawContact : public SwContact
void NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect );
/** get data collection of anchored objects, handled by with contact
-
*/
virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const;
};
More information about the Libreoffice-commits
mailing list