summaryrefslogtreecommitdiff
path: root/ure
AgeCommit message (Expand)Author
2017-01-27Remove dynamic exception specifications from !LIBO_INTERNAL_ONLYStephan Bergmann
2017-01-26ure/source/uretest is !LIBO_INTERNAL_ONLYStephan Bergmann
2017-01-18update approximate install location in READMECaolán McNamara
2016-12-07tdf#88206 replace cppu::WeakImplHelper* miscJochen Nitschke
2016-09-20[API CHANGE] Remove HAVE_GCC_VISIBILITY_FEATURE, always trueStephan Bergmann
2016-03-04Don't put symlink to MacOS folder of sandboxed appAndras Timar
2015-09-15Revert cppuhelper/implbase.hxx usage in non-LIBO_INTERNAL_ONLY code, againStephan Bergmann
2015-09-15Resolves: tdf#88206 replace cppu::WeakImplHelper* etc.Takeshi Abe
2015-03-01Typo: embeded->embeddedJulien Nabet
2014-12-03Fold URE: WindowsStephan Bergmann
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann
2014-11-28Fold URE: Linux ure/share/java/* -> program/classes/Stephan Bergmann
2014-11-28Remove unused ure_unorc_urlStephan Bergmann
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann
2014-11-28Fold URE: Linux ure/bin/* -> program/Stephan Bergmann
2014-11-28theIntrospection missing from cppumaker callStephan Bergmann
2014-11-24...so startup.sh is gone nowStephan Bergmann
2014-11-24uno is the only remaining user of startup.shStephan Bergmann
2014-10-09Remove jvmfwk plugin featureStephan Bergmann
2014-09-17The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mkTor Lillqvist
2014-09-16urelibs is part of the stable extension interface on Mac OS XStephan Bergmann
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist
2014-08-10Ugly hack to fix build when srcdir!=builddirTor Lillqvist
2014-08-10javaldx is not built for WNT or MACOSX so no point in the uno wrapper scriptTor Lillqvist
2014-08-10Fixes for the --enable-canonical-installation-tree-structure caseTor Lillqvist
2014-08-10Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIRTor Lillqvist
2014-08-10Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/javaTor Lillqvist
2014-06-05various: remove SAL_THROW macroNoel Grandin
2014-05-23remove boilerplate in UNO Exception constructor callsNoel Grandin
2014-03-07Introduce com.sun.star.beans.theIntrospection singletonStephan Bergmann
2013-12-16Clean-up uno/lbnames.hStephan Bergmann
2013-12-11ure: remove documentation of no longer bundled GCC librariesMichael Stahl
2013-12-11ure: remove references to SunStudio C52 filenamesMichael Stahl
2013-11-05fdo#60698: Merge all libs of io...Marcos Paulo de Souza
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl
2013-10-05URE folder path fixes for the HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE caseTor Lillqvist
2013-09-23Try to fix cross-compilationTor Lillqvist
2013-09-22add mode lines to new files (and idls) since last runCaolán McNamara
2013-09-16Remove incorrect commentsTor Lillqvist
2013-09-12gbuild: remove gb_Rdb__get_final_targetMichael Stahl
2013-09-11Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixesStephan Bergmann
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
2013-09-09gbuild: install rdb files directly in module they come fromMatúš Kukan
2013-09-09tweak previous commit hoping it will work on Mac ...Michael Stahl
2013-09-09ure: install files with filelistsMatúš Kukan
2013-08-27fdo#67313: Use "lo" suffix for private URE libsStephan Bergmann
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist
2013-08-19Use correct paths to URE stuff on WindowsTor Lillqvist
2013-08-18Use subfolder names from <config_folders.h>Tor Lillqvist
generated by cgit (git 2.34.1) at 2024-08-02 03:09:00 +0000
iv>
+ sal_Int32 nTxtPos;
+ bool bPageValid; // Were we able to evaluate everything on the whole page?
+ bool bAllValid; // Were we able to evaluate everything?
#ifdef DBG_UTIL
bool m_bIndicator;
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 28e2bd28b649..d074034ba387 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -33,11 +33,11 @@ class SwCellFrm;
class SwLayoutFrm: public SwFrm
{
- //Der verkappte SwFrm
+ // The SwFrm in disguise
friend class SwFlowFrm;
friend class SwFrm;
- //Hebt die Lower waehrend eines Spaltenumbaus auf.
+ // Releases the Lower while restructuring columns
friend SwFrm* SaveCntnt( SwLayoutFrm *, SwFrm * );
friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
@@ -69,7 +69,7 @@ public:
void RefreshLaySubsidiary( const SwPageFrm*, const SwRect& ) const;
void RefreshExtraData( const SwRect & ) const;
- //Proportionale Groessenanpassung der untergeordneten.
+ /// Change size of lowers proportionally
void ChgLowersProp( const Size& rOldSize );
void AdjustColumns( const SwFmtCol *pCol, bool bAdjustAttributes );
@@ -77,7 +77,7 @@ public:
void ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
const bool bChgFtn = false );
- //Painted die Column-Trennlinien fuer die innenliegenden Columns.
+ /// Paints the column separation line for the inner columns
void PaintColLines( const SwRect &, const SwFmtCol &,
const SwPageFrm * ) const;
@@ -89,8 +89,10 @@ public:
virtual void Cut() SAL_OVERRIDE;
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
- //sucht den dichtesten Cntnt zum SPoint, wird bei Seiten, Flys und Cells
- //benutzt wenn GetCrsrOfst versagt hat.
+ /**
+ * Finds the closest Cntnt for the SPoint
+ * Is used for Pages, Flys and Cells if GetCrsrOfst failed
+ */
const SwCntntFrm* GetCntntPos( Point &rPoint, const bool bDontLeave,
const bool bBodyOnly = false,
const bool bCalc = false,
@@ -108,11 +110,14 @@ public:
inline SwCntntFrm *ContainsCntnt();
const SwCellFrm *FirstCell() const;
inline SwCellFrm *FirstCell();
- // Method <ContainsAny()> doesn't investigate content of footnotes by default.
- // But under certain circumstances this investigation is intended.
- // Thus, introduce new optional parameter <_bInvestigateFtnForSections>.
- // It's default is <false>, still indicating that content of footnotes isn't
- // investigated for sections.
+
+ /**
+ * Method <ContainsAny()> doesn't investigate content of footnotes by default.
+ * But under certain circumstances this investigation is intended.
+ * Thus, introduce new optional parameter <_bInvestigateFtnForSections>.
+ * It's default is <false>, still indicating that content of footnotes isn't
+ * investigated for sections.
+ */
const SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false ) const;
inline SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false );
bool IsAnLower( const SwFrm * ) const;
@@ -121,28 +126,35 @@ public:
virtual SwFrmFmt *GetFmt();
void SetFrmFmt( SwFrmFmt* );
- //Verschieben der Ftns aller Lower - ab dem StartCntnt.
- //sal_True wenn mindestens eine Ftn verschoben wurde.
- //Ruft das Update der Seitennummer wenn bFtnNums gesetzt ist.
+ /**
+ * Moving the Ftns of all Lowers - starting from StartCntnt
+ *
+ * @returns true if at least one Ftn was moved
+ * Calls the page number update if bFtnNums is set
+ */
bool MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
SwFtnBossFrm *pNewBoss, const bool bFtnNums );
// --> #i28701# - change purpose of method and its name
// --> #i44016# - add parameter <_bUnlockPosOfObjs> to
- // force an unlockposition call for the lower objects.
+ /// force an unlockposition call for the lower objects.
void NotifyLowerObjs( const bool _bUnlockPosOfObjs = false );
- //Invalidiert diejenigen innenliegenden Frames, deren Breite und/oder
- //Hoehe Prozentual berechnet werden. Auch Rahmen, die an this oder an
- //innenliegenden verankert sind werden ggf. invalidiert.
+ /**
+ * Invalidates the inner Frames, whose width and/or height are
+ * calculated using percentages.
+ * Frames that are anchored to this or inner Frames, are also invalidated.
+ */
void InvaPercentLowers( SwTwips nDiff = 0 );
- //Gerufen von Format fuer Rahmen und Bereichen mit Spalten.
+ /// Called by Format for Frames and Areas with columns
void FormatWidthCols( const SwBorderAttrs &, const SwTwips nBorder,
const SwTwips nMinHeight );
- // InnerHeight returns the height of the content and may be bigger or
- // less than the PrtArea-Height of the layoutframe himself
+ /**
+ * InnerHeight returns the height of the content and may be bigger or
+ * less than the PrtArea-Height of the layoutframe himself
+ */
SwTwips InnerHeight() const;
/** method to check relative position of layout frame to
@@ -177,7 +189,10 @@ public:
}
};
-//Um doppelte Implementierung zu sparen wird hier ein bischen gecasted
+/**
+ * In order to save us from duplicating implementations, we cast here
+ * a little.
+ */
inline SwCntntFrm* SwLayoutFrm::ContainsCntnt()
{
return (SwCntntFrm*)(((const SwLayoutFrm*)this)->ContainsCntnt());
@@ -193,7 +208,9 @@ inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
return (SwFrm*)(((const SwLayoutFrm*)this)->ContainsAny( _bInvestigateFtnForSections ));
}
-// Diese SwFrm-inlines sind hier, damit frame.hxx nicht layfrm.hxx includen muss
+/**
+ * These SwFrm inlines are here, so that frame.hxx does not need to include layfrm.hxx
+ */
inline bool SwFrm::IsColBodyFrm() const
{
return mnType == FRMC_BODY && GetUpper()->IsColumnFrm();
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index f40fc34f9bc0..c3de3bedf205 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -95,8 +95,8 @@ void _DelBookmarks(const SwNodeIndex& rStt,
* location. */
struct _SaveFly
{
- sal_uLong nNdDiff; /// relative node difference
- SwFrmFmt* pFrmFmt; /// the fly's frame format
+ sal_uLong nNdDiff; /// relative node difference
+ SwFrmFmt* pFrmFmt; /// the fly's frame format
bool bInsertPosition; /// if true, anchor _at_ insert position
_SaveFly( sal_uLong nNodeDiff, SwFrmFmt* pFmt, bool bInsert )
@@ -132,22 +132,23 @@ public:
sal_Int32 GetCntnt() const { return nCntnt; }
};
-// Funktions-Deklaration damit auch alles unter der CrsrShell mal die
-// Crsr verschieben kann
-// die Funktionen rufen nicht die SwDoc::Corr - Methoden!
-
- // Setzt alle PaMs im Bereich vom Range nach NewPos
+/**
+ * Function declarations so that everything below the CrsrShell can
+ * move the Crsr once in a while.
+ * These functions do not call the SwDoc::Corr methods!
+ */
void PaMCorrAbs( const SwPaM& rRange,
const SwPosition& rNewPos );
- // Setzt alle PaMs in OldNode auf relative Pos
+/// Sets all PaMs in OldNode to relative Pos
void PaMCorrRel( const SwNodeIndex &rOldNode,
const SwPosition &rNewPos,
const sal_Int32 nOffset = 0 );
-// Hilfsklasse zum kopieren von absatzgebundenen Flys. Durch die Sortierung
-// nach der Ordnungsnummer wird versucht die layout seitige Anordnung
-// bei zu behalten
+/**
+ * Helper to copy paragraph-bound Flys.
+ * By sorting by order number, we try to retain the layout.
+ */
class _ZSortFly
{
const SwFrmFmt* pFmt;
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index d6a6737c230c..8ae69dea3730 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -21,26 +21,26 @@
#include <tools/solar.h>
-/*
- * Die Klasse SwNode2Layout stellt die Verbindung von Nodes zum Layout her.
- * Sie liefert einen intelligenten Iterator ueber die zum Node oder Nodebereich
- * gehoerenden Frames. Je nach Zweck der Iteration, z.B. um vor oder hinter
- * den Frames andere Frames einzufuegen, werden Master/Follows erkannt und nur
- * die relevanten zurueckgegeben. Auch wiederholte Tabellenueberschriften werden
- * beachtet.
- * Es ist auch moeglich, ueber SectionNodes zu iterieren, die durch Schachtelung
- * manchmal gar keinem SectionFrm direkt zugeordnet sind, manchmal aber sogar
- * mehreren.
- * SwNode2Layout ist ein Schnittstelle zwischen der aufrufenden Methode und
- * einem SwClientIter, sie waehlt je nach Aufgabenstellung das richtige
- * SwModify aus, erzeugt einen SwClientIter und filtert dessen Iterationen
- * je nach Aufgabenstellung.
- * Die Aufgabenstellung wird durch die Wahl des Ctors bestimmt.
- * 1. Das Einsammeln der UpperFrms, damit spaeter RestoreUpperFrms wird,
- * wird von MakeFrms gerufen, wenn es keinen PrevNext gibt, vor/hinter den
- * die Frames gehaengt werden koennen.
- * 2. Die Lieferung der Frames hinter/vor die die neuen Frames eines Nodes
- * gehaengt werden muessen, ebenfalls von MakeFrms gerufen.
+/**
+ * This class connects the Nodes with the Layouts.
+ * It provides an intelligent iterator over Frames belonging to the Node or
+ * Node Area. Depending on the purpose of iterating (e.g. to insert other
+ * Frames before or after the Frames) Master/Follows are recognized and only
+ * the relevant ones are returned. Repeated table headers are also taken
+ * into account.
+ * It's possible to iterate over SectionNodes that are either not directly
+ * assigned to a SectionFrm or to multiple ones due to nesting.
+ *
+ * This class is an interface between the method and a SwClientIter: it
+ * chooses the right SwModify depending on the task, creates a SwClientIter
+ * and filters its iterations depeding on the task.
+ * The task is determined by the choice of ctor.
+ *
+ * 1. Collecting the UpperFrms (so that later on it becomes RestoreUpperFrms)
+ * is called by MakeFrms, if there's no PrevNext (before/after we can insert
+ * the Frames).
+ * 2. Inserting the Frames before/after which the new Frames of a Node need to
+ * be inserted, is also called by MakeFrms.
*/
class SwNode2LayImpl;
@@ -55,10 +55,11 @@ class SwNode2Layout
{
SwNode2LayImpl *pImpl;
public:
- // Dieser Ctor ist zum Einsammeln der UpperFrms gedacht.
+ /// Use this ctor for collecting the UpperFrms
SwNode2Layout( const SwNode& rNd );
- // Dieser Ctor ist fuer das Einfuegen vor oder hinter rNd gedacht,
- // nIdx ist der Index des einzufuegenden Nodes
+
+ /// Use this ctor for inserting before/after rNd
+ /// @param nIdx is the index of the to-be-inserted Node
SwNode2Layout( const SwNode& rNd, sal_uLong nIdx );
~SwNode2Layout();
SwFrm* NextFrm();
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index b0c4a3dc0eb6..129ee68f8c22 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -50,30 +50,30 @@ class SwPageFrm: public SwFtnBossFrm
SwSortedObjs *pSortedObjs;
- SwPageDesc *pDesc; //PageDesc der die Seite beschreibt.
-
- sal_uInt16 nPhyPageNum; //Physikalische Seitennummer.
-
- bool bInvalidCntnt :1;
- bool bInvalidLayout :1;
- bool bInvalidFlyCntnt :1;
- bool bInvalidFlyLayout :1;
- bool bInvalidFlyInCnt :1;
- bool bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
- bool bEmptyPage :1; //Dies ist eine explizite Leerseite
- bool bEndNotePage :1; //'Fussnotenseite' fuer Endnoten
- bool bInvalidSpelling :1; //Das Online-Spelling ist gefordert
- bool bInvalidSmartTags :1; //checking for smarttags is needed
- bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren
- bool bInvalidWordCount :1;
- bool bHasGrid :1; // Grid for Asian layout
+ SwPageDesc *pDesc; //PageDesc that describes the Page
+
+ sal_uInt16 nPhyPageNum; // Physical page number
+
+ bool bInvalidCntnt :1;
+ bool bInvalidLayout :1;
+ bool bInvalidFlyCntnt :1;
+ bool bInvalidFlyLayout :1;
+ bool bInvalidFlyInCnt :1;
+ bool bFtnPage :1; // This Page is for document end footnotes
+ bool bEmptyPage :1; // This Page is an explicitly empty page
+ bool bEndNotePage :1; // 'Footnote page' for end notes
+ bool bInvalidSpelling :1; // We need online spelling
+ bool bInvalidSmartTags :1; // We need checking for smarttags
+ bool bInvalidAutoCmplWrds :1; // Update auto complete word list
+ bool bInvalidWordCount :1;
+ bool bHasGrid :1; // Grid for Asian layout
static const sal_Int8 mnShadowPxWidth;
void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
- // Anpassen der max. Fussnotenhoehen in den einzelnen Spalten
+ /// Adapt the max. footnote height in each single column
void SetColMaxFtnHeight();
/** determine rectangle for horizontal page shadow
@@ -111,9 +111,9 @@ public:
SwPageFrm( SwFrmFmt*, SwFrm*, SwPageDesc* );
virtual ~SwPageFrm();
- //public, damit die SwViewShell beim Umschalten vom BrowseMode darauf
- //zugreifen kann.
- void PrepareHeader(); //Kopf-/Fusszeilen anlegen/entfernen.
+ /// Make this public, so that the SwViewShell can access it when switching from browse mode
+ /// Add/remove header/footer
+ void PrepareHeader();
void PrepareFooter();
const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; }
@@ -124,7 +124,7 @@ public:
void AppendFlyToPage( SwFlyFrm *pNew );
void RemoveFlyFromPage( SwFlyFrm *pToRemove );
- void MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest );//optimiertes Remove/Append
+ void MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ); // Optimized Remove/Append
void SetPageDesc( SwPageDesc *, SwFrmFmt * );
SwPageDesc *GetPageDesc() { return pDesc; }
@@ -138,18 +138,18 @@ public:
SwRect GetBoundRect() const;
- //Spezialisiertes GetCntntPos() fuer Felder in Rahmen.
+ // Specialized GetCntntPos() for Field in Frames
void GetCntntPosition( const Point &rPt, SwPosition &rPos ) const;
- bool IsEmptyPage() const { return bEmptyPage; } //explizite Leerseite.
+ bool IsEmptyPage() const { return bEmptyPage; } // Explicitly empty page
void UpdateFtnNum();
- //Immer nach dem Paste rufen. Erzeugt die Seitengeb. Rahmen und Formatiert
- //generischen Inhalt.
+ /// Always call after Paste
+ /// Creates the page-bound frames and formats the generic content
void PreparePage( bool bFtn );
- //Schickt an alle ContentFrames ein Prepare wg. geaenderter Registervorlage
+ // Sends a Prepare() to all ContentFrames caused by a changed register template
void PrepareRegisterChg();
// Appends a fly frame - the given one or a new one - at the page frame.
@@ -162,7 +162,7 @@ public:
virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
- // erfrage vom Client Informationen
+ /// Get info from Client
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
virtual void Cut() SAL_OVERRIDE;
@@ -176,25 +176,25 @@ public:
virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
virtual void PaintBreak() const SAL_OVERRIDE;
- //Zeilennummern usw malen
+ /// Paint line number etc.
void RefreshExtraData( const SwRect & ) const;
- //Hilfslinien malen.
+ /// Paint helper lines
void RefreshSubsidiary( const SwRect& ) const;
- //Fussnotenschnittstelle
- bool IsFtnPage() const { return bFtnPage; }
- bool IsEndNotePage() const { return bEndNotePage; }
- void SetFtnPage( bool b ) { bFtnPage = b; }
- void SetEndNotePage( bool b ) { bEndNotePage = b; }
+ /// Foot note interface
+ bool IsFtnPage() const { return bFtnPage; }
+ bool IsEndNotePage() const { return bEndNotePage; }
+ void SetFtnPage( bool b ) { bFtnPage = b; }
+ void SetEndNotePage( bool b ) { bEndNotePage = b; }
inline sal_uInt16 GetPhyPageNum() const { return nPhyPageNum;}
inline void SetPhyPageNum( sal_uInt16 nNum ) { nPhyPageNum = nNum;}
inline void DecrPhyPageNum() { --nPhyPageNum; }
inline void IncrPhyPageNum() { ++nPhyPageNum; }
- //Validieren, invalidieren und abfragen des Status der Seite.
- //Layout/Cntnt und jeweils Fly/nicht Fly werden getrennt betrachtet.
+ /// Validate, invalidate and query the Page status
+ /// Layout/Cntnt and Fly/non-Fly respectively are inspected separately
inline void InvalidateFlyLayout() const;
inline void InvalidateFlyCntnt() const;
inline void InvalidateFlyInCnt() const;
generated by cgit (git 2.34.1) at 2024-08-02 03:08:57 +0000