[Libreoffice-commits] .: sw/inc
Christoph Herzog
cherzog at kemper.freedesktop.org
Mon Apr 18 13:26:23 PDT 2011
sw/inc/SwNumberTree.hxx | 4 +-
sw/inc/swatrset.hxx | 29 +++++++++------------
sw/inc/swbaslnk.hxx | 4 +-
sw/inc/swcrsr.hxx | 26 ++++++++-----------
sw/inc/swddetbl.hxx | 5 ++-
sw/inc/swevent.hxx | 6 ++--
sw/inc/swgstr.hxx | 65 ++++++++++++++++++++++++------------------------
sw/inc/swmodule.hxx | 61 ++++++++++++++++++++-------------------------
sw/inc/swrect.hxx | 10 +++----
sw/inc/swregion.hxx | 10 ++++---
10 files changed, 107 insertions(+), 113 deletions(-)
New commits:
commit 304ed8e2fa004ffe4d0c2d06c8f76ff0ed551956
Author: Christoph Herzog <rhogez at googlemail.com>
Date: Mon Apr 18 22:25:24 2011 +0200
Translate German comments.
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index f57103f..c9a8979 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -93,13 +93,13 @@ struct compSwNumberTreeNodeLessThan
Uncounted Phantoms
0.1. dljflskjlasf
- 5. ödsöfkaös
+ 5. abcdagaha
5.1.
+ R (nStart = 5)
+ 0 (phantom, not counted)
| + 1 dljflskjlasf
- + 5 ödsöfkaös
+ + 5 abcdagaha
+ 1
The phantom gets numbered with 0. The first non-phantom node gets
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 911dbb0..bebda02 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -65,7 +65,7 @@ class SvxCharRotateItem;
class SvxCharReliefItem;
class SvxCharHiddenItem;
-// Frame-Attribute
+// Frame attributes
class SwFmtFillOrder;
class SwFmtFrmSize;
class SvxPaperBinItem;
@@ -143,8 +143,8 @@ class SwTblBoxValue;
class SwAttrPool : public SfxItemPool
{
- friend void _InitCore(); // fuers anlegen/zerstoeren der
- friend void _FinitCore(); // Versionsmaps
+ friend void _InitCore(); // For creating/deleting of version maps.
+ friend void _FinitCore();
static sal_uInt16* pVersionMap1;
static sal_uInt16* pVersionMap2;
static sal_uInt16* pVersionMap3;
@@ -191,7 +191,7 @@ public:
int Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew );
int Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew );
- // ein Item oder einen Bereich loeschen
+ // Delete an item or a range.
sal_uInt16 ClearItem_BC( sal_uInt16 nWhich, SwAttrSet* pOld, SwAttrSet* pNew );
sal_uInt16 ClearItem_BC( sal_uInt16 nWhich1, sal_uInt16 nWhich2,
SwAttrSet* pOld = 0, SwAttrSet* pNew = 0 );
@@ -203,27 +203,24 @@ public:
SwAttrPool* GetPool() const { return (SwAttrPool*)SfxItemSet::GetPool(); }
- // kopiere die Attribute ggfs. ueber Dokumentgrenzen
+ // Copy attributes, if necessary across documents.
void CopyToModify( SwModify& rMod ) const;
- // ----------------------------------------------------------------
- // Sonderbehandlung fuer einige Attribute
- // Setze den Modify-Pointer (alten pDefinedIn) bei folgenden Attributen:
+ // Special treatment for some attributes.
+ // Set Modify-pointer (the old pDefinedIn) at the following attributes:
// - SwFmtDropCaps
// - SwFmtPageDesc
- // (Wird beim Einfuegen in Formate/Nodes gerufen)
+ // (Is called at insert in formats/nodes.)
// Second version is for the SwAttrSet handles of SwCntntNode.
bool SetModifyAtAttr( const SwModify* pModify );
- // Das Doc wird jetzt am SwAttrPool gesetzt. Dadurch hat man es immer
- // im Zugriff.
+ // Document is set at SwAttrPool. Therefore it is always accessible.
const SwDoc *GetDoc() const { return GetPool()->GetDoc(); }
SwDoc *GetDoc() { return GetPool()->GetDoc(); }
- // GetMethoden: das Bool gibt an, ob nur im Set (sal_False) oder auch in
- // den Parents gesucht werden soll. Wird nichts gefunden,
- // wird das deflt. Attribut returnt.
- // Charakter-Attribute - impl. steht im charatr.hxx
+ // Get methods: bool indicates whether to search only in Set (sal_False)
+ // or also in parents. If nothing is found then default attribute is returned.
+ // Character attributes. Implementation in charatr.hxx.
inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const;
inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const;
inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const;
@@ -263,7 +260,7 @@ public:
inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const;
inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const;
- // Frame-Attribute - impl. steht im frmatr.hxx
+ // Frame attributes. Implementation in frmatr.hxx.
inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const;
inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const;
inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const;
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 213b536..e593ed2 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -74,12 +74,12 @@ public:
SwCntntNode *GetCntntNode() { return pCntntNode; }
- // nur fuer Grafiken
+ // For graphics only.
sal_Bool SwapIn( sal_Bool bWaitForData = sal_False, sal_Bool bNativFormat = sal_False );
sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
- // nur fuer Grafik-Links ( zum Umschalten zwischen DDE / Grf-Link)
+ // Only for graphics-links (for switching between DDE / Grf-link).
void SetObjType( sal_uInt16 nType ) { SvBaseLink::SetObjType( nType ); }
sal_Bool IsRecursion( const SwBaseLink* pChkLnk ) const;
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 3d4d14a..203c7e0 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -42,8 +42,8 @@ namespace com { namespace sun { namespace star { namespace util {
} } } }
-// ein Basis-Struktur fuer die Parameter der Find-Methoden
-// return - Werte vom Found-Aufruf.
+// Base structure for parameters of the find-methods.
+// Returns values of found-call.
const int FIND_NOT_FOUND = 0;
const int FIND_FOUND = 1;
const int FIND_NO_RING = 2;
@@ -192,9 +192,8 @@ public:
sal_Bool MoveTable( SwWhichTable, SwPosTable );
sal_Bool MoveRegion( SwWhichRegion, SwPosRegion );
-
- // gibt es eine Selection vom Content in die Tabelle
- // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
+ // Is there a selection of content in table?
+ // Return value indicates if cursor remains at its old position.
virtual sal_Bool IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -206,10 +205,10 @@ public:
/** Restore cursor state to the one saved by SwCrsrSaveState **/
void RestoreSavePos();
- // sal_True: an die Position kann der Cursor gesetzt werden
+ // sal_True: cursor can be set at this position.
virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const;
- // darf der Cursor in ReadOnlyBereiche?
+ // Is cursor allowed in ready only ranges?
virtual bool IsReadOnlyAvailable() const;
virtual sal_Bool IsSkipOverProtectSections() const;
@@ -270,7 +269,7 @@ protected:
xub_StrLen nTblPtCnt, nTblMkCnt;
SwSelBoxes aSelBoxes;
sal_Bool bChg : 1;
- sal_Bool bParked : 1; // Tabellen-Cursor wurde geparkt
+ sal_Bool bParked : 1; // Table-cursor was parked.
virtual bool IsSelOvrCheck(int eFlags);
@@ -288,15 +287,14 @@ public:
sal_uInt16 GetBoxesCount() const { return aSelBoxes.Count(); }
const SwSelBoxes& GetBoxes() const { return aSelBoxes; }
- // Baut fuer alle Boxen die Cursor auf
+ // Creates cursor for all boxes.
SwCursor* MakeBoxSels( SwCursor* pAktCrsr );
- // sind irgendwelche Boxen mit einem Schutz versehen?
+ // Any boxes protected?
sal_Bool HasReadOnlyBoxSel() const;
- // wurde der TabelleCursor veraendert ? Wenn ja speicher gleich
- // die neuen Werte.
+ // Has table cursor been changed? If so, save new values immediately.
sal_Bool IsCrsrMovedUpdt();
- // wurde der TabelleCursor veraendert ?
+ // Has table cursor been changed?
sal_Bool IsCrsrMoved() const
{
return nTblMkNd != GetMark()->nNode.GetIndex() ||
@@ -307,7 +305,7 @@ public:
sal_Bool IsChgd() const { return bChg; }
- // Parke den Tabellen-Cursor auf dem StartNode der Boxen.
+ // Park table cursor at start node of boxes.
void ParkCrsr();
bool NewTableSelection();
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 962a751..7a0c0c5 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -37,8 +37,9 @@ class SwDDETable : public SwTable
SwDepend aDepend;
public:
TYPEINFO();
- // Constructor movet alle Lines/Boxen aus der SwTable zu sich.
- // Die SwTable ist danach Leer und muss geloescht werden.
+
+ // Ctor moves all lines/boxes from SwTable to it.
+ // After that SwTable is empty and has to be deleted.
SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
sal_Bool bUpdate = sal_True );
~SwDDETable();
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 322ba61..8c6e896 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -64,17 +64,17 @@ class SwFrmFmt;
class SwFmtINetFmt;
class IMapObject;
-// enum fuer Objecte die Events ins Basic oder in JavaScript Callen
+// Enum for objects that call events into Basic or JavaScript.
enum SwCallEventObjectType
{
- EVENT_OBJECT_NONE = 0, // Null ist garnichts
+ EVENT_OBJECT_NONE = 0, // Null is nothing at all.
EVENT_OBJECT_IMAGE,
EVENT_OBJECT_INETATTR,
EVENT_OBJECT_URLITEM,
EVENT_OBJECT_IMAGEMAP
};
-// structur fuer den Austausch zwischen UI/CORE
+// Structure for the exchange between UI/CORE.
struct SwCallMouseEvent
{
diff --git a/sw/inc/swgstr.hxx b/sw/inc/swgstr.hxx
index 035d1e6..3152d57 100644
--- a/sw/inc/swgstr.hxx
+++ b/sw/inc/swgstr.hxx
@@ -30,38 +30,38 @@
#include <tools/stream.hxx>
-typedef long long3; // Zur Dokumentation: 3-byte-Longs
+typedef long long3; // For documentation: 3-byte-longs.
-#define MAX_BEGIN 64 // Maximale Blockschachtelung
-#define PASSWDLEN 16 // Maximale Passwortlaenge
+#define MAX_BEGIN 64 // Maximum block nesting.
+#define PASSWDLEN 16 // Maximum password length.
-// Neue Version mit SvStreams
+// New version with SvStreams.
-// Passwort- und Codierungs-Funktionalitaet
+// Functionality for passwords and encoding.
class swcrypter {
protected:
- sal_Char cPasswd[ PASSWDLEN ]; // Passwort-Puffer
- sal_Bool bPasswd; // sal_True wenn mit Passwort
- void encode( sal_Char*, sal_uInt16 ); // Puffer codieren/decodieren
+ sal_Char cPasswd[ PASSWDLEN ]; // Password buffer.
+ sal_Bool bPasswd; // sal_True if with password.
+ void encode( sal_Char*, sal_uInt16 ); // Encode/decode buffer.
public:
swcrypter();
- sal_Bool setpasswd( const String& ); // Passwort setzen
- void copypasswd( const sal_Char* ); // Passwort direkt setzen
+ sal_Bool setpasswd( const String& ); // Set password.
+ void copypasswd( const sal_Char* ); // Set password directly.
const sal_Char* getpasswd() { return cPasswd; }
};
-// Reader/Writer-Stream-Basisklasse mit Pufferverwaltung fuer Texte
-// und Spezial-I/O fuer 3-Byte-Longs
+// Reader/Writer-stream base class with buffer administration for texts
+// ans special I/O for 3-byte-longs.
class swstreambase : public swcrypter {
protected:
- SvStream* pStrm; // eigentlicher Stream
- sal_Char* pBuf; // Zwischenpuffer
- sal_uInt16 nBuflen; // Laenge des Zwischenpuffers
- short nLong; // Long-Laenge (3 oder 4)
- sal_Bool bTempStrm; // sal_True: Stream loeschen
- void checkbuf( sal_uInt16 ); // Testen der Pufferlaenge
+ SvStream* pStrm; // The actual stream.
+ sal_Char* pBuf; // Temporary buffer.
+ sal_uInt16 nBuflen; // Length of temporary buffer.
+ short nLong; // Long-length (3 or 4).
+ sal_Bool bTempStrm; // sal_True: delete stream.
+ void checkbuf( sal_uInt16 ); // Test buffer length.
swstreambase( SvStream& );
@@ -70,18 +70,19 @@ protected:
public:
~swstreambase();
SvStream& Strm() { return *pStrm; }
- void clear(); // Puffer loeschen
+ void clear(); // Delete buffer.
- // Zusatzfunktionen zur I/O von LONGs als 3-Byte-Zahlen
+ // Supplementary functions for I/O of LONGs as 3-byte numbers.
void long3() { nLong = 3; }
void long4() { nLong = 4; }
- // Alias- und Hilfsfunktionen
+
+ // Alias and helper functions.
void seek( long nPos ) { pStrm->Seek( nPos ); }
long tell() { return pStrm->Tell(); }
- long filesize(); // Dateigroesse
+ long filesize();
void setbad();
int good() { return ( pStrm->GetError() == SVSTREAM_OK ); }
@@ -125,20 +126,20 @@ inline swstreambase& swstreambase::operator>>( sal_uLong& c )
}
class swistream : public swstreambase {
- sal_uInt8 cType; // Record-Typ
- sal_uLong nOffset; // Record-Offset-Portion
+ sal_uInt8 cType; // Record type.
+ sal_uLong nOffset; // Record offset portion.
public:
swistream( SvStream& );
- sal_uInt8 peek(); // 1 Byte testen
- sal_uInt8 next(); // Blockstart
- sal_uInt8 cur() { return cType; } // aktueller Block
- sal_uInt8 skipnext(); // Record ueberspringen
- void undonext(); // next() rueckgaengig machen
+ sal_uInt8 peek(); // Test 1 byte.
+ sal_uInt8 next(); // Block start.
+ sal_uInt8 cur() { return cType; } // Current block.
+ sal_uInt8 skipnext(); // Skip record.
+ void undonext(); // Undo next().
long getskip() { return nOffset; }
- void skip( long = -1L ); // Block ueberspringen
- sal_Char* text(); // Textstring lesen (nach BEGIN)
- long size(); // aktuelle Record-Laenge
+ void skip( long = -1L ); // Skip block.
+ sal_Char* text(); // Read text string (after BEGIN).
+ long size(); // Current record length.
private:
swistream( const swistream& );
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 423c930..20c1dc7 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -69,7 +69,7 @@ struct SwDBData;
#define VIEWOPT_DEST_VIEW 0
#define VIEWOPT_DEST_TEXT 1
#define VIEWOPT_DEST_WEB 2
-#define VIEWOPT_DEST_VIEW_ONLY 3 //ViewOptions werden nur an der ::com::sun::star::sdbcx::View, nicht an der Appl. gesetzt
+#define VIEWOPT_DEST_VIEW_ONLY 3 //ViewOptions are set only at ::com::sun::star::sdbcx::View, not at the appl.
namespace com{ namespace sun{ namespace star{ namespace scanner{
class XScannerManager;
@@ -88,8 +88,8 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C
SwChapterNumRules* pChapterNumRules;
SwStdFontConfig* pStdFontConfig;
SwNavigationConfig* pNavigationConfig;
- SwToolbarConfigItem*pToolbarConfig; //fuer gestackte Toolbars, welche
- SwToolbarConfigItem*pWebToolbarConfig; //war sichtbar?
+ SwToolbarConfigItem*pToolbarConfig; //For stacked toolbars. Which one was visible?
+ SwToolbarConfigItem*pWebToolbarConfig;
SwDBConfig* pDBConfig;
svtools::ColorConfig* pColorConfig;
SvtAccessibilityOptions* pAccessibilityOptions;
@@ -101,13 +101,12 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C
SwAttrPool *pAttrPool;
- // Die aktuelle View wird hier gehalten um nicht ueber
- // GetActiveView arbeiten zu muessen
- // Die View ist solange gueltig bis Sie im Activate
- // zerstoert oder ausgetauscht wird
+ // Current view is held here in order to avoid one's being forced
+ // to work via GetActiveView.
+ // View is valid until destroyed in Activate or exchanged.
SwView* pView;
- // Liste aller Redline-Autoren
+ // List of all Redline-authors.
SvStringsDtor* pAuthorNames;
// DictionaryList listener to trigger spellchecking or hyphenation
@@ -121,13 +120,13 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C
sal_Bool bAuthorInitialised : 1;
sal_Bool bEmbeddedLoadSave : 1;
- // Hint abfangen fuer DocInfo
+ // Catch hint for DocInfo.
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
protected:
- // Briefumschlaege, Etiketten
+ // Envelopes, labels.
void InsertEnv(SfxRequest&);
void InsertLab(SfxRequest&, sal_Bool bLabel);
@@ -138,25 +137,23 @@ public:
TYPEINFO();
SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
- // dieser Ctor nur fuer SW-Dll
+ // This Ctor only for SW-Dll.
SwModule( SfxObjectFactory* pFact,
SfxObjectFactory* pWebFact,
SfxObjectFactory* pGlobalFact );
~SwModule();
- // View setzen nur fuer internen Gebrauch,
- // aus techn. Gruenden public
- //
+ // Set view for internal use only. It is public only for technical reasons.
inline void SetView(SwView* pVw) { pView = pVw; }
inline SwView* GetView() { return pView; }
- //Die Handler fuer die Slots
- void StateOther(SfxItemSet &); // andere
+ // Handler for slots.
+ void StateOther(SfxItemSet &);
- void ExecOther(SfxRequest &); // Felder, Formel ..
+ void ExecOther(SfxRequest &); // Fields, formula...
- // Benutzereinstellungen modifizieren
+ // Modify user settings.
const SwMasterUsrPref *GetUsrPref(sal_Bool bWeb) const;
const SwViewOption* GetViewOption(sal_Bool bWeb);
void ApplyUsrPref(const SwViewOption &, SwView*,
@@ -166,12 +163,12 @@ public:
void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags);
void ApplyLinkMode(sal_Int32 nNewLinkMode);
- //default page mode for text grid
+ // Default page mode for text grid.
void ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode);
void ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); // apply_char_unit
- // ConfigItems erzeugen
+ // Create ConfigItems.
SwModuleOptions* GetModuleConfig() { return pModuleConfig;}
SwPrintOptions* GetPrtOptions(sal_Bool bWeb);
SwChapterNumRules* GetChapterNumRules();
@@ -186,7 +183,7 @@ public:
SvtUserOptions& GetUserOptions();
SvtUndoOptions& GetUndoOptions();
- // Ueber Sichten iterieren
+ // Iterate over views.
static SwView* GetFirstView();
static SwView* GetNextView(SwView*);
@@ -195,12 +192,12 @@ public:
void ShowDBObj( SwView& rView, const SwDBData& rData, sal_Bool bOnlyIfAvailable = sal_False);
- // Tabellenmodi
+ // Table modi.
sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const;
sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const;
sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const;
- // Redlining
+ // Redlining.
sal_uInt16 GetRedlineAuthor();
const String& GetRedlineAuthor(sal_uInt16 nPos);
sal_uInt16 InsertRedlineAuthor(const String& rAuthor);
@@ -212,27 +209,27 @@ public:
sal_uInt16 GetRedlineMarkPos();
const Color& GetRedlineMarkColor();
- // returne den definierten DocStat - WordDelimiter
+ // Return defined DocStat - WordDelimiter.
const String& GetDocStatWordDelim() const;
- // Durchreichen der Metric von der ModuleConfig (fuer HTML-Export)
+ // Pass metric of ModuleConfig (for HTML-export).
sal_uInt16 GetMetric( sal_Bool bWeb ) const;
- // Update-Stati durchreichen
+ // Pass update-statuses.
sal_uInt16 GetLinkUpdMode( sal_Bool bWeb ) const;
SwFldUpdateFlags GetFldUpdateFlags( sal_Bool bWeb ) const;
- //virtuelle Methoden fuer den Optionendialog
+ // Virtual methods for options dialog.
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
- //hier wird der Pool angelegt und an der SfxShell gesetzt
+ // Pool is created here and set at SfxShell.
void InitAttrPool();
- //Pool loeschen bevor es zu spaet ist
+ // Delete pool before it is too late.
void RemoveAttrPool();
- // Invalidiert ggf. OnlineSpell-WrongListen
+ // Invalidates online spell-wrong-lists if necessary.
void CheckSpellChanges( sal_Bool bOnlineSpelling,
sal_Bool bIsSpellWrongAgain, sal_Bool bIsSpellAllAgain, sal_Bool bSmartTags );
@@ -268,9 +265,7 @@ inline void SwModule::SetLngSvcEvtListener(
}
-/*
- Zugriff auf das SwModule, die ::com::sun::star::sdbcx::View und die Shell
-*/
+// Access to SwModule, the ::com::sun::star::sdbcx::View and the shell.
#define SW_MOD() ( *(SwModule**) GetAppData(SHL_WRITER))
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 4fa5fe4..3edf310 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -44,7 +44,7 @@ public:
inline SwRect( const Point& rLT, const Point& rRB );
inline SwRect( long X, long Y, long Width, long Height );
- //SV-SS e.g. SwRect( pWin->GetClipRect() );
+ //SV-SS e.g. SwRect( pWin->GetClipRect() );
SwRect( const Rectangle &rRect );
//Set-Methods
@@ -70,8 +70,7 @@ public:
inline long Top() const;
inline long Bottom() const;
- //Damit Layoutseitig per Memberpointer auf die Member von Pos und SSize
- //zugegriffen werden kann.
+ // In order to be able to access the members of Pos and SSize from the layout side.
inline Point &Pos();
inline Size &SSize();
@@ -81,7 +80,8 @@ public:
SwRect &Union( const SwRect& rRect );
SwRect &Intersection( const SwRect& rRect );
- //Wie Intersection nur wird davon ausgegangen, dass die Rects ueberlappen!
+
+ // Same as Intersection, only assume that Rects are overlapping!
SwRect &_Intersection( const SwRect &rRect );
inline SwRect GetIntersection( const SwRect& rRect ) const;
@@ -107,7 +107,7 @@ public:
//SV-SS e.g. pWin->DrawRect( aSwRect.SVRect() );
inline Rectangle SVRect() const;
- // Ausgabeoperator fuer die Debugging-Gemeinde
+ // Output operator for debugging.
friend SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 83ccf67..51cc17a 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -36,19 +36,21 @@ SV_DECL_VARARR( SwRects, SwRect, 20, 8 )
class SwRegionRects : public SwRects
{
- SwRect aOrigin; // die Kopie des StartRects
+ SwRect aOrigin; // Copy of StartRect.
inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, sal_Bool &rDel);
public:
SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20,
sal_uInt16 nGrow = 8 );
- // Zum Ausstanzen aus aOrigin.
+
+ // For punching from aOrigin.
void operator-=( const SwRect& rRect );
- // Aus Loechern werden Flaechen, aus Flaechen werden Loecher.
+ // From holes to areas, from areas to holes.
void Invert();
- // Benachbarte Rechtecke zusammenfassen.
+
+ // Combine adjacent rectangles.
void Compress( sal_Bool bFuzzy = sal_True );
inline const SwRect &GetOrigin() const { return aOrigin; }
More information about the Libreoffice-commits
mailing list