diff options
| -rw-r--r-- | sw/inc/pagedesc.hxx | 96 | ||||
| -rw-r--r-- | sw/inc/pam.hxx | 40 | ||||
| -rw-r--r-- | sw/inc/paratr.hxx | 37 |
3 files changed, 84 insertions, 89 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 15630e958db1..eb857b36dd55 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -32,7 +32,7 @@ #include <tools/color.hxx> #include <tools/string.hxx> #include "swdllapi.h" -#include <swtypes.hxx> //fuer SwTwips +#include <swtypes.hxx> // For SwTwips. #include <frmfmt.hxx> #include <editeng/numitem.hxx> @@ -40,7 +40,7 @@ class SfxPoolItem; class SwTxtFmtColl; class SwNode; -//Separator line adjustment +// Separator line adjustment. enum SwFtnAdj { FTNADJ_LEFT, @@ -48,16 +48,16 @@ enum SwFtnAdj FTNADJ_RIGHT }; -//footnote information +// Footnote information. class SW_DLLPUBLIC SwPageFtnInfo { - SwTwips nMaxHeight; //maximum height of the footnote area. - ULONG nLineWidth; //width of separator line - Color aLineColor; //color of the separator line - Fraction aWidth; //percentage width of the separator line. - SwFtnAdj eAdj; //line adjustment. - SwTwips nTopDist; //distance between body and separator. - SwTwips nBottomDist; //distance between separator and first footnote + SwTwips nMaxHeight; // Maximum height of the footnote area. + ULONG nLineWidth; // Width of separator line. + Color aLineColor; // Color of the separator line. + Fraction aWidth; // Percentage width of the separator line. + SwFtnAdj eAdj; // Line adjustment. + SwTwips nTopDist; // Distance between body and separator. + SwTwips nBottomDist; // Distance between separator and first footnote. public: SwTwips GetHeight() const { return nMaxHeight; } @@ -84,51 +84,51 @@ public: }; /* - * Verwendung des UseOnPage (eUse) und der FrmFmt'e + * Use of UseOnPage (eUse) and of FrmFmts * - * RIGHT - aMaster nur fuer rechte Seiten, linke Seiten immer leer. - * LEFT - aLeft fuer linke Seiten, rechte Seiten immer leer. - * aLeft ist eine Kopie des Master. - * ALL - aMaster fuer rechte Seiten, aLeft fuer Linke Seiten. - * aLeft ist eine Kopie des Master. - * MIRROR - aMaster fuer rechte Seiten, aLeft fuer linke Seiten. - * aLeft ist eine Kopie des Master, Raender sind gespiegelt. + * RIGHT - aMaster only for right hand (odd) pages, left hand (even) pages + * always empty. + * LEFT - aLeft for left-hand pages, right-hand pages always empty. + * aLeft is a copy of master. + * ALL - aMaster for right hand pages, aLeft for left hand pages. + * - aLeft is a copy of master. + * MIRROR - aMaster for right hand pages, aLeft for left hand pagers. + * aLeft is a copy of master, margins are mirrored. * - * UI dreht auschliesslich am Master! aLeft wird beim Chg am Dokument - * enstprechend dem eUse eingestellt. + * UI works exclusively on master! aLeft is adjusted on Chg at document + * according to eUse. * - * Damit es die Filter etwas einfacher haben werden weitere Werte im - * eUse untergebracht: + * In order to simplify the work of the filters some more values are placed + * into eUse: * - * HEADERSHARE - Headerinhalt auf beiden Seiten gleich - * FOOTERSHARE - Footerinhalt auf beiden Seiten gleich + * HEADERSHARE - Content of header is equal on left and right hand pages. + * FOOTERSHARE - Content of footer is equal on left and right hand pages. * - * Die Werte werden bei den entsprechenden Get-/Set-Methden ausmaskiert. - * Zugriff auf das volle eUse inclusive der Header-Footer information - * per ReadUseOn(), WriteUseOn() (fuer Filter und CopyCTor)! - * - * Die FrmFormate fuer Header/Footer werden anhand der Attribute fuer - * Header/Footer vom UI am Master eingestellt (Hoehe, Raender, Hintergrund...); - * Header/Footer fuer die Linke Seite werden entsprechen kopiert bzw. - * gespielt (Chg am Dokument). - * Das jew. Attribut fuer den Inhalt wird automatisch beim Chg am - * Dokument versorgt (entsprechen den SHARE-informationen werden Inhalte - * erzeugt bzw. entfernt). + * The values are masked out in the respective getter and setter methods. + * Access to complete eUse including the information on header and footer + * via ReadUseOn(), WriteUseOn() (fuer Filter und CopyCTor)! * + * The Frmformats for header/footer are adjusted by the UI according to + * the attributes for header and footer at master (height, margin, back- + * ground ...) + * Header/footer for left hand pages are copied or mirrored (Chg at + * document). + * The respective attribute for content is cared for automatically on Chg at + * document (contents are created or removed according to SHARE-information). */ typedef USHORT UseOnPage; namespace nsUseOnPage { - const UseOnPage PD_NONE = 0x0000; //for internal use only. + const UseOnPage PD_NONE = 0x0000; // For internal use only. const UseOnPage PD_LEFT = 0x0001; const UseOnPage PD_RIGHT = 0x0002; const UseOnPage PD_ALL = 0x0003; const UseOnPage PD_MIRROR = 0x0007; const UseOnPage PD_HEADERSHARE = 0x0040; const UseOnPage PD_FOOTERSHARE = 0x0080; - const UseOnPage PD_NOHEADERSHARE = 0x00BF; //for internal use only - const UseOnPage PD_NOFOOTERSHARE = 0x007F; //for internal use only + const UseOnPage PD_NOHEADERSHARE = 0x00BF; // For internal use only. + const UseOnPage PD_NOFOOTERSHARE = 0x007F; // For internal use only. } class SW_DLLPUBLIC SwPageDesc : public SwModify @@ -140,18 +140,18 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify SvxNumberType aNumType; SwFrmFmt aMaster; SwFrmFmt aLeft; - SwDepend aDepend; // wg. Registerhaltigkeit + SwDepend aDepend; // Because of grid alignment (Registerhaltigkeit). SwPageDesc *pFollow; - USHORT nRegHeight; // Zeilenabstand und Fontascent der Vorlage - USHORT nRegAscent; // fuer die Registerhaltigkeit + USHORT nRegHeight; // Sentence spacing and fontascent of style. + USHORT nRegAscent; // For grid alignment (Registerhaltigkeit). UseOnPage eUse; BOOL bLandscape; - //Fussnoteninformationen + // Footnote information. SwPageFtnInfo aFtnInfo; - //Wird zum Spiegeln vom Chg (Doc) gerufen. - //Kein Abgleich an anderer Stelle. + // Called for mirroring of Chg (doc). + // No adjustment at any other place. SW_DLLPRIVATE void Mirror(); SW_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft ); @@ -193,8 +193,8 @@ public: inline void ResetAllMasterAttr(); inline void ResetAllLeftAttr(); - //Mit den folgenden Methoden besorgt sich das Layout ein Format - //um eine Seite erzeugen zu koennen + // Layout uses the following methods to obtain a format in order + // to be able to create a page. inline SwFrmFmt *GetRightFmt(); inline const SwFrmFmt *GetRightFmt() const; inline SwFrmFmt *GetLeftFmt(); @@ -214,7 +214,7 @@ public: virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue ); void RegisterChange(); - // erfragen und setzen der PoolFormat-Id + // Query and set PoolFormat-Id. USHORT GetPoolFmtId() const { return aMaster.GetPoolFmtId(); } void SetPoolFmtId( USHORT nId ) { aMaster.SetPoolFmtId( nId ); } USHORT GetPoolHelpId() const { return aMaster.GetPoolHelpId(); } @@ -222,7 +222,7 @@ public: BYTE GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); } void SetPoolHlpFileId( BYTE nId ) { aMaster.SetPoolHlpFileId( nId ); } - // erfrage vom Client Informationen + // Query information from Client. virtual BOOL GetInfo( SfxPoolItem& ) const; const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 8d04419ed2ef..8b78fc7cc398 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -28,13 +28,13 @@ #ifndef _PAM_HXX #define _PAM_HXX -#include <stddef.h> // fuer MemPool +#include <stddef.h> // For MemPool. #include <tools/gen.hxx> #include <tools/mempool.hxx> -#include <cshtyp.hxx> // fuer die Funktions-Definitionen -#include <ring.hxx> // Superklasse -#include <index.hxx> // fuer SwIndex -#include <ndindex.hxx> // fuer SwNodeIndex +#include <cshtyp.hxx> // For function definitions. +#include <ring.hxx> // Super class. +#include <index.hxx> // For SwIndex. +#include <ndindex.hxx> // For SwNodeIndex. #include "swdllapi.h" class SwFmt; @@ -82,17 +82,17 @@ struct SW_DLLPUBLIC SwPosition }; -// das Ergebnis eines Positions Vergleiches +// Result of comparing positions. enum SwComparePosition { - POS_BEFORE, // Pos1 liegt vor Pos2 - POS_BEHIND, // Pos1 liegt hinter Pos2 - POS_INSIDE, // Pos1 liegt vollstaendig in Pos2 - POS_OUTSIDE, // Pos2 liegt vollstaendig in Pos1 - POS_EQUAL, // Pos1 ist genauso gross wie Pos2 - POS_OVERLAP_BEFORE, // Pos1 ueberlappt Pos2 am Anfang - POS_OVERLAP_BEHIND, // Pos1 ueberlappt Pos2 am Ende - POS_COLLIDE_START, // Pos1 Start stoesst an Pos2 Ende - POS_COLLIDE_END // Pos1 End stoesst an Pos2 Start + POS_BEFORE, // Pos1 before Pos2. + POS_BEHIND, // Pos1 behind Pos2. + POS_INSIDE, // Pos1 completely contained in Pos2. + POS_OUTSIDE, // Pos2 completely contained in Pos1. + POS_EQUAL, // Pos1 is as large as Pos2. + POS_OVERLAP_BEFORE, // Pos1 overlaps Pos2 at the beginning. + POS_OVERLAP_BEHIND, // Pos1 overlaps Pos2 at the end. + POS_COLLIDE_START, // Pos1 start touches at Pos2 end. + POS_COLLIDE_END // Pos1 end touches at Pos2 start. }; SwComparePosition ComparePosition( const SwPosition& rStt1, const SwPosition& rEnd1, @@ -150,11 +150,11 @@ public: // @@@ semantic: no copy assignment for super class Ring. SwPaM& operator=( const SwPaM & ); - // Bewegen des Cursors + // Movement of cursor. BOOL Move( SwMoveFn fnMove = fnMoveForward, SwGoInDoc fnGo = fnGoCntnt ); - // Suchen + // Search. BYTE Find( const com::sun::star::util::SearchOptions& rSearchOpt, BOOL bSearchInNotes, utl::TextSearch& rSTxt, @@ -252,11 +252,11 @@ public: const SwPosition& GetBound( bool bOne = true ) const { return bOne ? m_Bound1 : m_Bound2; } - // erfrage die Seitennummer auf der der Cursor steht + // Get number of page which contains cursor. USHORT GetPageNum( BOOL bAtPoint = TRUE, const Point* pLayPos = 0 ); - // steht in etwas geschuetztem oder in die Selektion umspannt - // etwas geschuetztes. + // Is in something protected (readonly) or selection contains + // something protected. BOOL HasReadonlySel( bool bFormView ) const; BOOL ContainsPosition(const SwPosition & rPos) diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 42fda6e21315..a07fe93974b0 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -39,28 +39,23 @@ class SwCharFmt; class IntlWrapper; -/************************************************************************* -|* class SwFmtDrop -*************************************************************************/ - #define DROP_WHOLEWORD ((USHORT)0x0001) -//Wenn ein SwFmtDrop Client ist, so ist dies das CharFmt welches den Font fuer -//die DropCaps beschreibt. Ist es kein Client, so wird von der Formatierung -//das CharFmt des Absatzes benutzt. -//Wird das CharFmt verandert, so wird diese Aenderung ueber das Modify des -//SwFmtDrop an die Absatze propagiert. +// If SwFmtDrop is a Client, it is the CharFmt that describes the font for the +// DropCaps. If it is not a Client, formating uses the CharFmt of the paragraph. +// If the CharFmt is modified, this change is propagated to the paragraphs +// via the Modify of SwFmtDrop. class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient { - SwModify* pDefinedIn; // Modify-Object, in dem der DropCaps steht - // kann nur TxtFmtCollection/TxtNode sein - USHORT nDistance; // Abstand zum Textbeginn - USHORT nReadFmt; // fuer den Sw3-Reader: CharFormat-Id (Pool laden!) - BYTE nLines; // Anzahl der Zeilen - BYTE nChars; // Anzahl der Zeichen - BOOL bWholeWord; // Erstes Wort als Initialen + SwModify* pDefinedIn; // Modify-Object, that contains DropCaps. + // Can only be TxtFmtCollection/TxtNode. + USHORT nDistance; // Distance to beginning of text. + USHORT nReadFmt; // For Sw3-Reader: CharFormat-Id (load Pool!). + BYTE nLines; // Line count. + BYTE nChars; // Character count. + BOOL bWholeWord; // First word with initials. public: - TYPEINFO(); //Bereits in der Basisklasse SwClient + TYPEINFO(); // Already in base class SwClient. SwFmtDrop(); virtual ~SwFmtDrop(); @@ -99,10 +94,10 @@ public: inline SwCharFmt *GetCharFmt() { return (SwCharFmt*)pRegisteredIn; } void SetCharFmt( SwCharFmt *pNew ); virtual void Modify( SfxPoolItem*, SfxPoolItem* ); - // erfrage vom Client Informationen + // Get information from Client. virtual BOOL GetInfo( SfxPoolItem& ) const; - // erfrage und setze den Modify-Pointer + // Get and set Modify pointer. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } inline void ChgDefinedIn( const SwModify* pNew ) { pDefinedIn = (SwModify*)pNew; } @@ -201,7 +196,7 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( /****************************************************************************** - * Implementierung der Paragraph-Attribut Methoden vom SwAttrSet + * Implementation of paragraph-attributes methods of SwAttrSet ******************************************************************************/ inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(BOOL bInP) const @@ -238,7 +233,7 @@ inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(BOOL bInP) { return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); } /****************************************************************************** - * Implementierung der Paragraph-Attribut Methoden vom SwFmt + * Implementation of paragraph-attributes methods of SwFmt ******************************************************************************/ inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(BOOL bInP) const |