[Libreoffice-commits] .: 7 commits - sw/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 23:06:50 PDT 2012
sw/source/core/inc/GetMetricVal.hxx | 2
sw/source/core/inc/MarkManager.hxx | 9
sw/source/core/inc/SwGrammarMarkUp.hxx | 1
sw/source/core/inc/SwPortionHandler.hxx | 2
sw/source/core/inc/SwUndoFmt.hxx | 3
sw/source/core/inc/SwUndoPageDesc.hxx | 2
sw/source/core/inc/SwUndoTOXChange.hxx | 1
sw/source/core/inc/SwXMLBlockExport.hxx | 4
sw/source/core/inc/SwXMLBlockImport.hxx | 8
sw/source/core/inc/SwXMLBlockListContext.hxx | 12
sw/source/core/inc/SwXMLTextBlocks.hxx | 2
sw/source/core/inc/SwXTextDefaults.hxx | 3
sw/source/core/inc/UndoAttribute.hxx | 15
sw/source/core/inc/UndoBookmark.hxx | 2
sw/source/core/inc/UndoCore.hxx | 22
sw/source/core/inc/UndoDelete.hxx | 4
sw/source/core/inc/UndoDraw.hxx | 23
sw/source/core/inc/UndoInsert.hxx | 19
sw/source/core/inc/UndoManager.hxx | 9
sw/source/core/inc/UndoNumbering.hxx | 9
sw/source/core/inc/UndoOverwrite.hxx | 5
sw/source/core/inc/UndoRedline.hxx | 7
sw/source/core/inc/UndoSection.hxx | 5
sw/source/core/inc/UndoSort.hxx | 8
sw/source/core/inc/UndoSplitMove.hxx | 3
sw/source/core/inc/UndoTable.hxx | 19
sw/source/core/inc/acorrect.hxx | 28
sw/source/core/inc/anchoredobjectposition.hxx | 821 +++++++++-----------
sw/source/core/inc/ascharanchoredobjectposition.hxx | 201 ++--
sw/source/core/inc/attrhint.hxx | 1
sw/source/core/inc/blink.hxx | 6
sw/source/core/inc/bodyfrm.hxx | 3
sw/source/core/inc/bookmrk.hxx | 113 +-
sw/source/core/inc/cellfrm.hxx | 2
sw/source/core/inc/cntfrm.hxx | 54 -
sw/source/core/inc/colfrm.hxx | 1
sw/source/core/inc/crossrefbookmark.hxx | 35
sw/source/core/inc/dbg_lay.hxx | 15
sw/source/core/inc/dflyobj.hxx | 32
sw/source/core/inc/docfld.hxx | 36
sw/source/core/inc/docsort.hxx | 86 --
sw/source/core/inc/doctxm.hxx | 74 -
sw/source/core/inc/drawdev.hxx | 34
sw/source/core/inc/drawfont.hxx | 60 -
sw/source/core/inc/dumpfilter.hxx | 3
sw/source/core/inc/dview.hxx | 11
sw/source/core/inc/environmentofanchoredobject.hxx | 129 +--
sw/source/core/inc/flyfrms.hxx | 40
sw/source/core/inc/fntcache.hxx | 17
sw/source/core/inc/frame.hxx | 272 ++----
sw/source/core/inc/frminf.hxx | 33
sw/source/core/inc/frmtool.hxx | 206 ++---
sw/source/core/inc/ftnboss.hxx | 48 -
sw/source/core/inc/ftnfrm.hxx | 39
sw/source/core/inc/hffrm.hxx | 6
55 files changed, 1206 insertions(+), 1399 deletions(-)
New commits:
commit 98e2ca5e850f824a889e61764fbbd0824b2c5857
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Jun 2 19:47:07 2012 +0200
fixed indentation of sw/source/core/inc/environmentofanchoredobject.hxx
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 5b49aad..ed9c630 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -36,69 +36,69 @@ namespace objectpositioning
{
class SwEnvironmentOfAnchoredObject
{
- private:
- const bool mbFollowTextFlow;
-
- public:
- /** construtor
-
- @param _bFollowTextFlow
- input parameter - indicates, if the anchored object, for which
- this environment is instantiated, follow the text flow or not
- */
- SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow );
-
- /** destructor
- */
- ~SwEnvironmentOfAnchoredObject();
-
- /** determine environment layout frame for possible horizontal object
- positions respectively for alignment to 'page areas'
-
- this is, if object has to follow the text flow:
- - cell frame, if anchored inside a cell
- - fly frame, if anchored inside a fly frame
- otherwise it's the page frame
-
- this is, if object hasn't to follow the text flow:
- - page frame.
- - no exception any more. Thus remove
- parameter <_bForPageAlignment>
-
- @param _rHoriOrientFrm
- input parameter - frame, at which the horizontal position is
- oriented at (typically it's the anchor frame).
- starting point for the search of the layout frame.
-
- @return reference to the layout frame, which determines the
- the horizontal environment the object has to be positioned in.
- */
- const SwLayoutFrm& GetHoriEnvironmentLayoutFrm( const SwFrm& _rHoriOrientFrm ) const;
-
- /** determine environment layout frame for possible vertical object
- positions respectively for alignments to 'page areas'
-
- this is, if object has to follow the text flow:
- - cell frame, if anchored inside a cell
- - fly frame, if anchored inside a fly frame
- - header/footer frame, if anchored inside page header/footer
- - footnote frame, if anchored inside footnote
- otherwise it's the document body frame
-
- this is, if object hasn't to follow the text flow:
- - page frame.
- - no exception any more. Thus remove
- parameter <_bForPageAlignment>
-
- @param _rVertOrientFrm
- input parameter - frame, at which the vertical position is
- oriented at (typically it's the anchor frame).
- starting point for the search of the layout frame.
-
- @return reference to the layout frame, which determines the
- the vertical environment the object has to be positioned in.
- */
- const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm ) const;
+ private:
+ const bool mbFollowTextFlow;
+
+ public:
+ /** construtor
+
+ @param _bFollowTextFlow
+ input parameter - indicates, if the anchored object, for which
+ this environment is instantiated, follow the text flow or not
+ */
+ SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow );
+
+ /** destructor
+ */
+ ~SwEnvironmentOfAnchoredObject();
+
+ /** determine environment layout frame for possible horizontal object
+ positions respectively for alignment to 'page areas'
+
+ this is, if object has to follow the text flow:
+ - cell frame, if anchored inside a cell
+ - fly frame, if anchored inside a fly frame
+ otherwise it's the page frame
+
+ this is, if object hasn't to follow the text flow:
+ - page frame.
+ - no exception any more. Thus remove
+ parameter <_bForPageAlignment>
+
+ @param _rHoriOrientFrm
+ input parameter - frame, at which the horizontal position is
+ oriented at (typically it's the anchor frame).
+ starting point for the search of the layout frame.
+
+ @return reference to the layout frame, which determines the
+ the horizontal environment the object has to be positioned in.
+ */
+ const SwLayoutFrm& GetHoriEnvironmentLayoutFrm( const SwFrm& _rHoriOrientFrm ) const;
+
+ /** determine environment layout frame for possible vertical object
+ positions respectively for alignments to 'page areas'
+
+ this is, if object has to follow the text flow:
+ - cell frame, if anchored inside a cell
+ - fly frame, if anchored inside a fly frame
+ - header/footer frame, if anchored inside page header/footer
+ - footnote frame, if anchored inside footnote
+ otherwise it's the document body frame
+
+ this is, if object hasn't to follow the text flow:
+ - page frame.
+ - no exception any more. Thus remove
+ parameter <_bForPageAlignment>
+
+ @param _rVertOrientFrm
+ input parameter - frame, at which the vertical position is
+ oriented at (typically it's the anchor frame).
+ starting point for the search of the layout frame.
+
+ @return reference to the layout frame, which determines the
+ the vertical environment the object has to be positioned in.
+ */
+ const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm ) const;
};
}
commit ebdb9e5294a7b15e6371fcaef153872743a65fd7
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Jun 2 19:45:46 2012 +0200
make coding style of files (e-h) in sw/source/core/inc consistent
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 0700256..5b49aad 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _ENVIRONMENTOFANCHOREDOBJECT_HXX
#define _ENVIRONMENTOFANCHOREDOBJECT_HXX
@@ -99,7 +100,7 @@ namespace objectpositioning
*/
const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm ) const;
};
-} // namespace objectpositioning
+}
#endif
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 0f2cfbe..13b3c05 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -27,7 +27,9 @@
************************************************************************/
#ifndef _FLYFRMS_HXX
#define _FLYFRMS_HXX
+
#include "flyfrm.hxx"
+
// #i28701#
class SwFlyAtCntFrm;
@@ -55,8 +57,6 @@ class SwFlyFreeFrm : public SwFlyFrm
return <true>, if such a frame is found and it has 'auto' size.
otherwise <false> is returned.
- @author OD
-
@return boolean indicating, that direct environment has 'auto' size
*/
bool HasEnvironmentAutoSize() const;
@@ -67,7 +67,6 @@ protected:
friend class SwFlyNotify;
virtual void NotifyBackground( SwPageFrm *pPage,
const SwRect& rRect, PrepareHint eHint);
-
SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
public:
@@ -233,6 +232,7 @@ inline void SwFlyInCntFrm::InvalidateCntnt() const
{
((SwFlyInCntFrm*)this)->bInvalidCntnt = sal_True;
}
+
inline void SwFlyInCntFrm::ValidateLayout() const
{
((SwFlyInCntFrm*)this)->bInvalidLayout = sal_False;
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 3346321..e0eeb50 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -30,7 +30,6 @@
#include <vcl/font.hxx>
#include <tools/mempool.hxx>
-
#include "swtypes.hxx"
#include "swcache.hxx"
@@ -43,10 +42,6 @@ class ViewShell;
class SwSubFont;
class MapMode;
-/*************************************************************************
- * class SwFntCache
- *************************************************************************/
-
class SwFntCache : public SwCache
{
public:
@@ -69,10 +64,6 @@ extern SwFntObj *pLastFont;
extern sal_uInt8 *pMagicNo;
extern Color *pWaveCol;
-/*************************************************************************
- * class SwFntObj
- *************************************************************************/
-
class SwFntObj : public SwCacheObj
{
friend class SwFntAccess;
@@ -138,11 +129,6 @@ public:
void CreatePrtFont( const OutputDevice& rOut );
};
-/*************************************************************************
- * class SwFntAccess
- *************************************************************************/
-
-
class SwFntAccess : public SwCacheAccess
{
ViewShell *pShell;
@@ -156,7 +142,6 @@ public:
inline SwFntObj* Get() { return (SwFntObj*) SwCacheAccess::Get(); };
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index a13013f..544655a 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -95,28 +95,9 @@ typedef struct _xmlTextWriter *xmlTextWriterPtr;
#define FRM_FTNBOSS 0x0006
#define FRM_ACCESSIBLE (FRM_HEADER|FRM_FOOTER|FRM_FTN|FRM_TXT|FRM_ROOT|FRM_FLY|FRM_TAB|FRM_CELL|FRM_PAGE)
- //Weils so schon ist das ganze als Bitfeld....
-//0000 0000 0000 0001 ROOT
-//0000 0000 0000 0010 PAGE
-//0000 0000 0000 0100 COLUMN
-//0000 0000 0000 1000 HEADER
-//0000 0000 0001 0000 FOOTER
-//0000 0000 0010 0000 FTNCONT
-//0000 0000 0100 0000 FTN
-//0000 0000 1000 0000 BODY
-//0000 0001 0000 0000 FLY
-//0000 0010 0000 0000 SECTION
-//0000 0100 0000 0000 UNUSED
-//0000 1000 0000 0000 TAB
-//0001 0000 0000 0000 ROW
-//0010 0000 0000 0000 CELL
-//0100 0000 0000 0000 TXT
-//1000 0000 0000 0000 NOTXT
-
// The type of the frame is internal represented by the 4-bit value nType,
// which can expanded to the types above by shifting a bit (0x1 << nType)
// Here are the corresponding defines for the compressed representation:
-
#define FRMC_ROOT 0
#define FRMC_PAGE 1
#define FRMC_COLUMN 2
@@ -246,7 +227,6 @@ enum MakePageType
MAKEPAGE_NOSECTION // Don't create section frames
};
-
/**
* Base class of the Writer layout elements.
*
@@ -275,8 +255,6 @@ class SwFrm: public SwClient, public SfxBroadcaster
// implemented in text/txtftn.cxx, prevents Ftn oscillation
friend void ValidateTxt( SwFrm *pFrm );
-// friend void CalcAnchorAndKeep( SwFlyFrm * );
-
friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );
// cache for (border) attributes
@@ -353,7 +331,6 @@ class SwFrm: public SwClient, public SfxBroadcaster
*/
SwCntntFrm* _FindPrevCnt( const bool _bInSameFtn = false );
-
void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & );
SwFrm* _GetIndNext();
void SetDirFlags( sal_Bool bVert );
@@ -366,31 +343,31 @@ protected:
SwRect aFrm; // absolute position in document and size of the Frm
SwRect aPrt; // position relatively to Frm and size of PrtArea
- sal_uInt16 bReverse: 1; // Next line above/at the right side instead
- // under/at the left side of the previous line.
- sal_uInt16 bInvalidR2L: 1;
- sal_uInt16 bDerivedR2L: 1;
- sal_uInt16 bRightToLeft: 1;
- sal_uInt16 bInvalidVert: 1;
- sal_uInt16 bDerivedVert: 1;
- sal_uInt16 bVertical: 1;
+ sal_uInt16 bReverse : 1; // Next line above/at the right side instead
+ // under/at the left side of the previous line
+ sal_uInt16 bInvalidR2L : 1;
+ sal_uInt16 bDerivedR2L : 1;
+ sal_uInt16 bRightToLeft : 1;
+ sal_uInt16 bInvalidVert : 1;
+ sal_uInt16 bDerivedVert : 1;
+ sal_uInt16 bVertical : 1;
// Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
- sal_uInt16 bVertLR: 1;
- sal_uInt16 nType: 4; //Who am I?
-
- sal_Bool bValidPos: 1;
- sal_Bool bValidPrtArea: 1;
- sal_Bool bValidSize: 1;
- sal_Bool bValidLineNum: 1;
- sal_Bool bFixSize: 1;
- sal_Bool bUnUsed1: 1;
+ sal_uInt16 bVertLR : 1;
+ sal_uInt16 nType : 4; //Who am I?
+
+ sal_Bool bValidPos : 1;
+ sal_Bool bValidPrtArea : 1;
+ sal_Bool bValidSize : 1;
+ sal_Bool bValidLineNum : 1;
+ sal_Bool bFixSize : 1;
+ sal_Bool bUnUsed1 : 1;
// if sal_True, frame will be painted completely even content was changed
// only partially. For CntntFrms a border (from Action) will exclusively
// painted if <bCompletePaint> is sal_True.
sal_Bool bCompletePaint : 1;
sal_Bool bRetouche : 1; // frame is responsible for retouching
public:
- sal_Bool bUnUsed2: 1;
+ sal_Bool bUnUsed2 : 1;
protected:
sal_Bool bInfInvalid : 1; // InfoFlags are invalid
sal_Bool bInfBody : 1; // Frm is in document body
@@ -598,11 +575,10 @@ public:
@return boolean, indicating, if frame is moveable in given environment
*/
-// sal_Bool IsMoveable() const;
bool IsMoveable( const SwLayoutFrm* _pLayoutFrm = 0L ) const;
// Is it permitted for the (Txt)Frm to add a footnote in the current
- // environment (not e.g. for repeating table headlines)?
+ // environment (not e.g. for repeating table headlines)
sal_Bool IsFtnAllowed() const;
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
@@ -738,11 +714,11 @@ public:
// Only invalidate Frm
// #i28701# - add call to method <_ActionOnInvalidation(..)>
- // for all invalidation methods.
+ // for all invalidation methods.
// #i28701# - use method <_InvalidationAllowed(..)> to
- // decide, if invalidation will to be performed or not.
+ // decide, if invalidation will to be performed or not.
// #i26945# - no additional invalidation, if it's already
- // invalidate.
+ // invalidate.
void _InvalidateSize()
{
if ( bValidSize && _InvalidationAllowed( INVALID_SIZE ) )
@@ -991,17 +967,14 @@ inline SwLayoutFrm *SwFrm::GetNextLayoutLeaf()
{
return (SwLayoutFrm*)((const SwFrm*)this)->GetNextLayoutLeaf();
}
-
inline SwLayoutFrm *SwFrm::GetPrevLayoutLeaf()
{
return (SwLayoutFrm*)((const SwFrm*)this)->GetPrevLayoutLeaf();
}
-
inline const SwLayoutFrm *SwFrm::GetNextLayoutLeaf() const
{
return ImplGetNextLayoutLeaf( true );
}
-
inline const SwLayoutFrm *SwFrm::GetPrevLayoutLeaf() const
{
return ImplGetNextLayoutLeaf( false );
@@ -1027,7 +1000,6 @@ inline void SwFrm::InvalidateLineNum()
if ( bValidLineNum )
ImplInvalidateLineNum();
}
-
inline void SwFrm::InvalidateAll()
{
if ( _InvalidationAllowed( INVALID_ALL ) )
@@ -1040,7 +1012,6 @@ inline void SwFrm::InvalidateAll()
_ActionOnInvalidation( INVALID_ALL );
}
}
-
inline void SwFrm::InvalidateNextPos( sal_Bool bNoFtn )
{
if ( pNext && !pNext->IsSctFrm() )
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 555ab64..1631348 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _FRMINF_HXX
#define _FRMINF_HXX
@@ -34,10 +35,6 @@ class SwTxtFrm;
class SwPaM;
class SwTxtCursor;
-/*************************************************************************
- * class SwTxtFrmInfo
- *************************************************************************/
-
class SwTxtFrmInfo
{
const SwTxtFrm *pFrm;
@@ -78,8 +75,6 @@ public:
const SwTxtFrm *pNextFrm = 0 ) const;
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 5cef92a..abf3d2b 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -25,8 +25,10 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _FRMTOOL_HXX
#define _FRMTOOL_HXX
+
#include "swtypes.hxx"
#include "layfrm.hxx"
#include "frmatr.hxx"
@@ -57,17 +59,17 @@ struct SwFindRowSpanCacheObj;
#define GRFNUM_REPLACE 2
// draw background with brush or graphics
-// - add 6th parameter to indicate that method should
-// consider background transparency, saved in the color of the brush item
+// The 6th parameter indicates that the method should consider background
+// transparency, saved in the color of the brush item.
void DrawGraphic( const SvxBrushItem *, OutputDevice *,
const SwRect &rOrg, const SwRect &rOut, const sal_uInt8 nGrfNum = GRFNUM_NO,
const sal_Bool bConsiderBackgroundTransparency = sal_False );
-// - method to align rectangle
+// method to align rectangle.
// Created declaration here to avoid <extern> declarations
void SwAlignRect( SwRect &rRect, const ViewShell *pSh );
-// - method to align graphic rectangle
+// method to align graphic rectangle
// Created declaration here to avoid <extern> declarations
void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
@@ -120,6 +122,7 @@ const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos );
sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj );
+// FIXME: EasyHack (refactoring): rename method and parameter name in all files
const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp );
sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
@@ -127,9 +130,12 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage );
// used by SwCntntNode::GetFrm and SwFlyFrm::GetFrm
-SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, sal_uInt16 const nFrmType, const Point* = 0,
- const SwPosition *pPos = 0,
- const sal_Bool bCalcFrm = sal_False );
+SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
+ SwModify const&,
+ sal_uInt16 const nFrmType,
+ const Point* = 0,
+ const SwPosition *pPos = 0,
+ const sal_Bool bCalcFrm = sal_False );
// Should extra data (reline stroke, line numbers) be painted?
sal_Bool IsExtraData( const SwDoc *pDoc );
@@ -175,6 +181,7 @@ class SwLayNotify : public SwFrmNotify
sal_Bool bLowersComplete;
SwLayoutFrm *GetLay() { return (SwLayoutFrm*)pFrm; }
+
public:
SwLayNotify( SwLayoutFrm *pLayFrm );
~SwLayNotify();
@@ -188,6 +195,7 @@ class SwFlyNotify : public SwLayNotify
SwPageFrm *pOldPage;
const SwRect aFrmAndSpace;
SwFlyFrm *GetFly() { return (SwFlyFrm*)pFrm; }
+
public:
SwFlyNotify( SwFlyFrm *pFlyFrm );
~SwFlyNotify();
@@ -244,26 +252,25 @@ class SwBorderAttrs : public SwCacheObj
// the following bool values set the cached values to INVALID - until they
// are calculated for the first time
- sal_Bool bTopLine :1;
- sal_Bool bBottomLine :1;
- sal_Bool bLeftLine :1;
- sal_Bool bRightLine :1;
- sal_Bool bTop :1;
- sal_Bool bBottom :1;
- sal_Bool bLine :1;
+ sal_Bool bTopLine : 1;
+ sal_Bool bBottomLine : 1;
+ sal_Bool bLeftLine : 1;
+ sal_Bool bRightLine : 1;
+ sal_Bool bTop : 1;
+ sal_Bool bBottom : 1;
+ sal_Bool bLine : 1;
sal_Bool bIsLine : 1; // border on at least one side?
sal_Bool bCacheGetLine : 1; // cache GetTopLine(), GetBottomLine()?
sal_Bool bCachedGetTopLine : 1; // is GetTopLine() cached?
sal_Bool bCachedGetBottomLine : 1; // is GetBottomLine() cached?
- // - booleans indicating, if values <bJoinedWithPrev>
- // and <bJoinedWithNext> are cached and valid.
- // Caching depends on value of <bCacheGetLine>.
- mutable sal_Bool bCachedJoinedWithPrev :1;
- mutable sal_Bool bCachedJoinedWithNext :1;
- // - booleans indicating, if borders are joined
- // with previous/next frame.
+ // Booleans indicate that <bJoinedWithPrev> and <bJoinedWithNext> are
+ // cached and valid.
+ // Caching depends on value of <bCacheGetLine>.
+ mutable sal_Bool bCachedJoinedWithPrev : 1;
+ mutable sal_Bool bCachedJoinedWithNext : 1;
+ // Booleans indicate that borders are joined with previous/next frame.
sal_Bool bJoinedWithPrev :1;
sal_Bool bJoinedWithNext :1;
@@ -289,24 +296,20 @@ class SwBorderAttrs : public SwCacheObj
void _IsLine();
- // #i25029# - add optional 2nd parameter <_pPrevFrm>
- // If set, its value is taken for testing, if borders/shadow have to joined
- // with previous frame.
+ // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+ // borders/shadow have to be joined with previous frame.
void _GetTopLine ( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L );
void _GetBottomLine( const SwFrm& _rFrm );
- // - private methods to calculate cached values
- // <bJoinedWithPrev> and <bJoinedWithNext>.
- // #i25029# - add optional 2nd parameter <_pPrevFrm>
- // If set, its value is taken for testing, if borders/shadow have to joined
- // with previous frame.
+ // calculate cached values <bJoinedWithPrev> and <bJoinedWithNext>
+ // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+ // borders/shadow have to be joined with previous frame.
void _CalcJoinedWithPrev( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L );
void _CalcJoinedWithNext( const SwFrm& _rFrm );
- // - internal helper method for methods
- // <_CalcJoinedWithPrev> and <_CalcJoinedWithNext>.
+ // internal helper method for _CalcJoinedWithPrev and _CalcJoinedWithNext
sal_Bool _JoinWithCmp( const SwFrm& _rCallerFrm,
const SwFrm& _rCmpFrm ) const;
@@ -342,19 +345,17 @@ public:
inline sal_Bool IsBorderDist() const { return bBorderDist; }
- //Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden?
- // #i25029# - add optional 2nd parameter <_pPrevFrm>
- // If set, its value is taken for testing, if borders/shadow have to joined
- // with previous frame.
+ // Should upper (or lower) border be evaluated for this frame?
+ // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+ // borders/shadow have to be joined with previous frame.
inline sal_uInt16 GetTopLine ( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L ) const;
inline sal_uInt16 GetBottomLine( const SwFrm& _rFrm ) const;
inline void SetGetCacheLine( sal_Bool bNew ) const;
- // - accessors for cached values <bJoinedWithPrev>
- // and <bJoinedWithPrev>
- // #i25029# - add optional 2nd parameter <_pPrevFrm>
- // If set, its value is taken for testing, if borders/shadow have to joined
- // with previous frame.
+
+ // Accessors for cached values <bJoinedWithPrev> and <bJoinedWithPrev>
+ // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+ // borders/shadow have to be joined with previous frame.
sal_Bool JoinedWithPrev( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L ) const;
sal_Bool JoinedWithNext( const SwFrm& _rFrm ) const;
@@ -381,6 +382,7 @@ class SwOrderIter
const SwPageFrm *pPage;
const SdrObject *pCurrent;
const sal_Bool bFlysOnly;
+
public:
SwOrderIter( const SwPageFrm *pPage, sal_Bool bFlysOnly = sal_True );
@@ -393,11 +395,11 @@ public:
const SdrObject *Prev();
};
-
class StackHack
{
static sal_uInt8 nCnt;
static sal_Bool bLocked;
+
public:
StackHack()
{
@@ -437,8 +439,7 @@ inline void SwBorderAttrs::SetGetCacheLine( sal_Bool bNew ) const
((SwBorderAttrs*)this)->bCacheGetLine = bNew;
((SwBorderAttrs*)this)->bCachedGetBottomLine =
((SwBorderAttrs*)this)->bCachedGetTopLine = sal_False;
- // - invalidate cache for values <bJoinedWithPrev>
- // and <bJoinedWithNext>.
+ // invalidate cache for values <bJoinedWithPrev> and <bJoinedWithNext>
bCachedJoinedWithPrev = sal_False;
bCachedJoinedWithNext = sal_False;
}
@@ -532,13 +533,11 @@ const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell_ );
class SwDeletionChecker
{
- private:
-
+private:
const SwFrm* mpFrm;
const SwModify* mpRegIn;
- public:
-
+public:
SwDeletionChecker( const SwFrm* pFrm )
: mpFrm( pFrm ),
mpRegIn( pFrm ? const_cast<SwFrm*>(pFrm)->GetRegisteredIn() : 0 )
@@ -553,6 +552,6 @@ class SwDeletionChecker
bool HasBeenDeleted();
};
-#endif //_FRMTOOL_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index def0dec..2083fc0 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _FTNBOSS_HXX
#define _FTNBOSS_HXX
@@ -65,10 +66,11 @@ class SwFtnBossFrm: public SwLayoutFrm
SwFtnContFrm *MakeFtnCont();
SwFtnFrm *FindFirstFtn();
sal_uInt8 _NeighbourhoodAdjustment( const SwFrm* pFrm ) const;
-protected:
+protected:
void InsertFtn( SwFtnFrm * );
static void ResetFtn( const SwFtnFrm *pAssumed );
+
public:
inline SwFtnBossFrm( SwFrmFmt* pFmt, SwFrm* pSib ) : SwLayoutFrm( pFmt, pSib ) {}
@@ -109,9 +111,9 @@ public:
SvPtrarr& _rFtnArr,
const sal_Bool _bCollectOnlyPreviousFtns = sal_False,
const SwFtnBossFrm* _pRefFtnBossFrm = NULL);
- /// OD 03.04.2003 #108446# - add parameter <_bCollectOnlyPreviousFtns> in
- /// order to control, if only footnotes, which are positioned before the
- /// footnote boss frame <this> have to be collected.
+ // The parameter <_bCollectOnlyPreviousFtns> controls if only footnotes
+ // that are positioned before the footnote boss-frame <this> have to be
+ // collected.
void CollectFtns( const SwCntntFrm* _pRef,
SwFtnBossFrm* _pOld,
SvPtrarr& _rFtnArr,
@@ -129,11 +131,12 @@ inline const SwLayoutFrm *SwFtnBossFrm::FindBodyCont() const
{
return ((SwFtnBossFrm*)this)->FindBodyCont();
}
+
inline const SwFtnContFrm *SwFtnBossFrm::FindFtnCont() const
{
return ((SwFtnBossFrm*)this)->FindFtnCont();
}
-#endif //_FTNBOSS_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index d78db52..90b84d6 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _FTNFRM_HXX
#define _FTNFRM_HXX
@@ -76,7 +77,6 @@ protected:
virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
#endif
-
public:
SwFtnFrm( SwFrmFmt*, SwFrm*, SwCntntFrm*, SwTxtFtn* );
@@ -88,8 +88,6 @@ public:
sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const;
#ifdef DBG_UTIL
- // in a non pro version test if the attribute has the same
- // meaning which his reference is
const SwCntntFrm *GetRef() const;
SwCntntFrm *GetRef();
#else
@@ -135,18 +133,17 @@ public:
{
return mbUnlockPosOfLowerObjs;
}
+
/** search for last content in the current footnote frame
OD 2005-12-02 #i27138#
- @author OD
-
@return SwCntntFrm*
pointer to found last content frame. NULL, if none is found.
*/
SwCntntFrm* FindLastCntnt();
};
-#endif //_FTNFRM_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 993da32..b5fb779 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -25,20 +25,20 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _HFFRM_HXX
#define _HFFRM_HXX
#include <tools/mempool.hxx>
-
#include "layfrm.hxx"
-
class SwHeadFootFrm : public SwLayoutFrm
{
protected:
void FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs);
void FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs);
inline sal_Bool GetEatSpacing() const; // in hffrm.cxx
+
public:
SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType);
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
@@ -67,6 +67,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm)
};
-#endif //_HFFRM_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 510f70015aba59d5bb4cc2ab9667c08676c37a78
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Jun 2 19:41:10 2012 +0200
translate German comments in sw/source/core/inc/f*.hxx
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index e774f8b..0f2cfbe 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -31,19 +31,18 @@
// #i28701#
class SwFlyAtCntFrm;
-//Basisklasse fuer diejenigen Flys, die sich relativ frei Bewegen koennen -
-//also die nicht _im_ Inhalt gebundenen Flys.
+// Base class for those Flys that can "move freely" or better that are not
+// bound in Cntnt.
class SwFlyFreeFrm : public SwFlyFrm
{
- SwPageFrm *pPage; //Bei dieser Seite ist der Fly angemeldet.
+ SwPageFrm *pPage; // page where the Fly is registered
// #i34753# - flag for at-page anchored Writer fly frames
// to prevent a positioning - call of method <MakeObjPos()> -, if Writer
// fly frame is already clipped during its format by the object formatter.
bool mbNoMakePos;
- // #i37068# - flag to prevent move in method
- // <CheckClip(..)>
+ // #i37068# - flag to prevent move in method <CheckClip(..)>
bool mbNoMoveOnCheckClip;
void CheckClip( const SwFmtFrmSize &rSz ); //'Emergency' Clipping.
@@ -119,8 +118,7 @@ public:
virtual bool IsFormatPossible() const;
};
-
-//Die Fly's, die an einem Layoutfrm haengen und nicht inhaltsgebunden sind
+// Flys that are bound to LayoutFrms and not to Cntnt
class SwFlyLayFrm : public SwFlyFreeFrm
{
public:
@@ -133,7 +131,7 @@ protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
};
-//Die Flys, die an einem Cntnt haengen nicht aber im Inhalt
+// Flys that are bound to Cntnt but not in Cntnt
class SwFlyAtCntFrm : public SwFlyFreeFrm
{
protected:
@@ -171,7 +169,7 @@ public:
virtual bool IsFormatPossible() const;
};
-//Die Flys, die an einem Zeichen in einem Cntnt haengen.
+// Flys that are bound to a character in Cntnt
class SwFlyInCntFrm : public SwFlyFrm
{
Point aRef; //Relativ zu diesem Point wird die AbsPos berechnet.
@@ -209,23 +207,21 @@ public:
sal_Bool IsInvalidLayout() const { return bInvalidLayout; }
sal_Bool IsInvalidCntnt() const { return bInvalidCntnt; }
-
- //BP 26.11.93: vgl. tabfrm.hxx, gilt bestimmt aber fuer andere auch...
- //Zum Anmelden der Flys nachdem ein FlyCnt erzeugt _und_ eingefuegt wurde.
- //Muss vom Erzeuger gerufen werden, denn erst nach dem Konstruieren wird
- //Das Teil gepastet; mithin ist auch erst dann die Seite zum Anmelden der
- //Flys erreichbar.
+ // (26.11.93, see tabfrm.hxx, but might also be valid for others)
+ // For creation of a Fly after a FlyCnt was created _and_ inserted.
+ // Must be called by creator because can be pasted only after creation.
+ // Sometimes the page for registering the Flys is not visible until then
+ // as well.
void RegistFlys();
- //siehe layact.cxx
+ //see layact.cxx
void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; }
// #i26791#
virtual void MakeObjPos();
- // invalidate anchor frame on invalidation
- // of the position, because the position is calculated during the
- // format of the anchor frame
+ // invalidate anchor frame on invalidation of the position, because the
+ // position is calculated during the format of the anchor frame
virtual void _ActionOnInvalidation( const InvalidationType _nInvalid );
};
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 7087b06..3346321 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -63,7 +63,7 @@ public:
void Flush();
};
-// Font-Cache, globale Variable, in txtinit.Cxx angelegt/zerstoert
+// Font cache, global variable, created/destroyed in txtinit.cxx
extern SwFntCache *pFntCache;
extern SwFntObj *pLastFont;
extern sal_uInt8 *pMagicNo;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index a0c620c..a13013f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -33,9 +33,9 @@
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <svl/svarray.hxx>
#include <editeng/borderline.hxx>
-#include "swtypes.hxx" // fuer SwTwips
+#include "swtypes.hxx"
#include "swrect.hxx"
-#include "calbck.hxx" // fuer SwClient
+#include "calbck.hxx"
#include <svl/brdcst.hxx>
#include "IDocumentDrawModelAccess.hxx"
@@ -67,12 +67,11 @@ class SwSortedObjs;
class SwAnchoredObject;
typedef struct _xmlTextWriter *xmlTextWriterPtr;
-//Jeder FrmTyp findet sich hier in einem Bit wieder.
-//Die Bits muessen so gesetzt werden, dass mit einer Maskierung festgestellt
-//werden kann was fuer ein FrmTyp eine Instanz ist _und_ von welchen Klassen
-//sie abgeleitet ist.
-//Der Frm hat in der Basisklasse einen Member der von den CToren der
-//einzelnen Frms entsprechend gesetzt werden muss.
+// Each FrmType is represented here as a bit.
+// The bits must be set in a way that it can be determined with masking of
+// which kind of FrmType an instance is _and_ from what classes it was derived.
+// Each frame has in its base class a member that must be set by the
+// constructors accordingly.
#define FRM_ROOT 0x0001
#define FRM_PAGE 0x0002
#define FRM_COLUMN 0x0004
@@ -90,7 +89,7 @@ typedef struct _xmlTextWriter *xmlTextWriterPtr;
#define FRM_TXT 0x4000
#define FRM_NOTXT 0x8000
-//Fuer den internen Gebrauch ein paar gebraeuchliche Verknuepfungen.
+// for internal use some common combinations
#define FRM_LAYOUT 0x3FFF
#define FRM_CNTNT 0xC000
#define FRM_FTNBOSS 0x0006
@@ -237,13 +236,13 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
( (aFrm1.*fnRect->fnGetTop)() != (aFrm2.*fnRect->fnGetTop)() || \
(aFrm1.*fnRect->fnGetLeft)() != (aFrm2.*fnRect->fnGetLeft)() )
-//Fuer GetNextLeaf/GetPrevLeaf.
+// for GetNextLeaf/GetPrevLeaf.
enum MakePageType
{
- MAKEPAGE_NONE, //Keine Seite bzw. Fussnote anlegen
- MAKEPAGE_APPEND, //Nur ggf. Seite anhaengen
- MAKEPAGE_INSERT, //Seite ggf. anhaengen oder einfuegen.
- MAKEPAGE_FTN, //Fussnote ggf. einfuegen.
+ MAKEPAGE_NONE, // do not create page/footnote
+ MAKEPAGE_APPEND, // only append page if needed
+ MAKEPAGE_INSERT, // add or append page if needed
+ MAKEPAGE_FTN, // add footnote if needed
MAKEPAGE_NOSECTION // Don't create section frames
};
@@ -257,30 +256,30 @@ enum MakePageType
*/
class SwFrm: public SwClient, public SfxBroadcaster
{
- //Der verkappte Frm
+ // the hidden Frm
friend class SwFlowFrm;
- friend class SwLayoutFrm; // Sw3FrameIo: fuer pNext, pPrev
- friend class SwLooping; // LoopControlling (layouter.cxx)
+ friend class SwLayoutFrm;
+ friend class SwLooping;
- //Hebt die Lower waehrend eines Spaltenumbaus auf.
+ // voids lower during creation of a column
friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL );
friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
#ifdef DBG_UTIL
- //removes empty SwSectionFrms from a chain
+ // remove empty SwSectionFrms from a chain
friend SwFrm* SwClearDummies( SwFrm* pFrm );
#endif
- //Zum validieren eines unsinnig invalidierten in SwCntntFrm::MakeAll
+ // for validating a mistakenly invalidated one in SwCntntFrm::MakeAll
friend void ValidateSz( SwFrm *pFrm );
- // Implementiert in text/txtftn.cxx, verhindert Ftn-Oszillation
+ // implemented in text/txtftn.cxx, prevents Ftn oscillation
friend void ValidateTxt( SwFrm *pFrm );
// friend void CalcAnchorAndKeep( SwFlyFrm * );
friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );
- //Cache fuer (Umrandungs-)Attribute.
+ // cache for (border) attributes
static SwCache *pCache;
// #i65250#
@@ -362,10 +361,10 @@ class SwFrm: public SwClient, public SfxBroadcaster
const SwLayoutFrm* ImplGetNextLayoutLeaf( bool bFwd ) const;
protected:
- SwSortedObjs* pDrawObjs; //Hier haengen die DrawObjs, kann 0 sein
+ SwSortedObjs* pDrawObjs; // draw objects, can be 0
- SwRect aFrm; //Absolute Dokumentposition und groesse des Frm
- SwRect aPrt; //Position der PrtArea rel zum Frm und groesse der PrtArea
+ SwRect aFrm; // absolute position in document and size of the Frm
+ SwRect aPrt; // position relatively to Frm and size of PrtArea
sal_uInt16 bReverse: 1; // Next line above/at the right side instead
// under/at the left side of the previous line.
@@ -385,23 +384,22 @@ protected:
sal_Bool bValidLineNum: 1;
sal_Bool bFixSize: 1;
sal_Bool bUnUsed1: 1;
- sal_Bool bCompletePaint: 1; //Frame wird ganz gepaintet wenn sal_True, auch
- //wenn der Inhalt nur teilw. veraendert ist;
- //Bei CntntFrms wird ausschliesslich wenn sal_True
- //der Border (von Action) gemalt.
- sal_Bool bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich
- //wenn sal_True.
+ // if sal_True, frame will be painted completely even content was changed
+ // only partially. For CntntFrms a border (from Action) will exclusively
+ // painted if <bCompletePaint> is sal_True.
+ sal_Bool bCompletePaint : 1;
+ sal_Bool bRetouche : 1; // frame is responsible for retouching
public:
sal_Bool bUnUsed2: 1;
protected:
- sal_Bool bInfInvalid: 1; //InfoFlags sind Invalid.
- sal_Bool bInfBody: 1; //Frm steht im DokumentBody.
- sal_Bool bInfTab: 1; //Frm steht in einer Tabelle.
- sal_Bool bInfFly: 1; //Frm steht in einem Fly.
- sal_Bool bInfFtn: 1; //Frm steht in einer Fussnote.
- sal_Bool bInfSct: 1; //Frm steht in einem Bereich.
- sal_Bool bColLocked: 1; //Grow/Shrink sperren bei spaltigen Section-
- //oder Fly-Frames, wird im Format gesetzt
+ sal_Bool bInfInvalid : 1; // InfoFlags are invalid
+ sal_Bool bInfBody : 1; // Frm is in document body
+ sal_Bool bInfTab : 1; // Frm is in a table
+ sal_Bool bInfFly : 1; // Frm is in a Fly
+ sal_Bool bInfFtn : 1; // Frm is in a footnote
+ sal_Bool bInfSct : 1; // Frm is in a section
+ sal_Bool bColLocked : 1; // lock Grow/Shrink for column-wise section
+ // or fly frames, will be set in Format
void ColLock() { bColLocked = sal_True; }
void ColUnlock() { bColLocked = sal_False; }
@@ -415,16 +413,16 @@ protected:
void PrepareMake();
void OptPrepareMake();
void MakePos();
- // method formats next frame of table frame to assure keep attribute.
- // in case of nested tables method <SwFrm::MakeAll()> is called to
- // avoid format of superior table frame.
+ // Format next frame of table frame to assure keeping attributes.
+ // In case of nested tables method <SwFrm::MakeAll()> is called to
+ // avoid formating of superior table frame.
friend SwFrm* lcl_FormatNextCntntForKeep( SwTabFrm* pTabFrm );
virtual void MakeAll() = 0;
- //Adjustierung der Frames einer Seite
+ // adjust frames of a page
SwTwips AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst = sal_False );
- //Aendern nur die Framesize, nicht die PrtArea-SSize
+ // change only frame size not the size of PrtArea
virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) = 0;
virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) = 0;
@@ -456,14 +454,14 @@ protected:
*/
virtual void _ActionOnInvalidation( const InvalidationType _nInvalid );
- //Schatten und Umrandung painten
+ // draw shadow and borders
void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const;
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( );
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); // already in base class
sal_uInt16 GetType() const { return 0x1 << nType; }
@@ -471,25 +469,24 @@ public:
static SwCache *GetCachePtr() { return pCache; }
static void SetCache( SwCache *pNew ) { pCache = pNew; }
- //Aendern die PrtArea-SSize und die FrmSize.
+ // change PrtArea size and FrmSize
SwTwips Shrink( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
SwTwips Grow ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
- //Wir brauchen unterschiedliche Methoden (wg. Performance) fuer das
- //Einfuegenin den Layout Baum:
+ // different methods for inserting in layout tree (for performance reasons)
- //Einfuegen vor pBehind oder am Ende der Kette unter pUpper
+ // insert before pBehind or at the end of the chain below pUpper
void InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind );
- //Einfuegen hinter pBefore oder am Anfang der Kette unter pUpper
+ // insert after pBefore or at the beginnig of the chain below pUpper
void InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore );
- //Einfuegen vor pBehind oder am Ende der Kette, unter Beruecksichtigung
- //der Geschwister von pSct
+ // insert before pBehind or at the end of the chain while considering
+ // the siblings of pSct
void InsertGroupBefore( SwFrm* pParent, SwFrm* pWhere, SwFrm* pSct );
void Remove();
- //For internal use only; wer es anders macht wird
- //in einen Sack gesteckt und muss zwei Tage drin hocken bleiben.
- //Fuert Spezialbehandlung fuer _Get[Next|Prev]Leaf() durch (Tabellen).
+ // For internal use only - who ignores this will be put in a sack and has
+ // to stay there for two days
+ // Does special treatment for _Get[Next|Prev]Leaf() (for tables).
SwLayoutFrm *GetLeaf( MakePageType eMakePage, sal_Bool bFwd );
SwLayoutFrm *GetNextLeaf ( MakePageType eMakePage );
SwLayoutFrm *GetNextFtnLeaf( MakePageType eMakePage );
@@ -508,7 +505,7 @@ public:
void AppendDrawObj( SwAnchoredObject& _rNewObj );
void RemoveDrawObj( SwAnchoredObject& _rToRemoveObj );
- //Arbeiten mit der Kette der FlyFrms
+ // work with chain of FlyFrms
void AppendFly( SwFlyFrm *pNew );
void RemoveFly( SwFlyFrm *pToRemove );
const SwSortedObjs *GetDrawObjs() const { return pDrawObjs; }
@@ -531,7 +528,8 @@ public:
drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const;
void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const;
- //Retouche, nicht im Bereich des uebergebenen Rect!
+// FIXME: EasyHack (refactoring): rename method name in all files
+ // retouch, not in the area of the given Rect!
void Retouche( const SwPageFrm *pPage, const SwRect &rRect ) const;
sal_Bool GetBackgroundBrush( const SvxBrushItem*& rpBrush,
@@ -547,10 +545,10 @@ public:
inline void ResetRetouche() const;
inline sal_Bool IsRetouche() const { return bRetouche; }
- void SetInfFlags(); //Setzen der InfoFlags
+ void SetInfFlags();
inline void InvalidateInfFlags() { bInfInvalid = sal_True; }
- inline sal_Bool IsInDocBody() const; //Benutzen die InfoFlags.
- inline sal_Bool IsInFtn() const; //ggf. werden die Flags ermittelt.
+ inline sal_Bool IsInDocBody() const; // use InfoFlags, determine flags
+ inline sal_Bool IsInFtn() const; // if necessary
inline sal_Bool IsInTab() const;
inline sal_Bool IsInFly() const;
inline sal_Bool IsInSct() const;
@@ -603,8 +601,8 @@ public:
// sal_Bool IsMoveable() const;
bool IsMoveable( const SwLayoutFrm* _pLayoutFrm = 0L ) const;
- //Ist es fuer den (Txt)Frm in der aktuellen Umgebung erlaubt eine
- //Fussnote einzufuegen (nicht z.B. in wiederholten TabellenHeadlines).
+ // Is it permitted for the (Txt)Frm to add a footnote in the current
+ // environment (not e.g. for repeating table headlines)?
sal_Bool IsFtnAllowed() const;
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
@@ -618,10 +616,10 @@ public:
inline sal_Bool HasFixSize() const { return bFixSize; }
inline void SetFixSize( sal_Bool bNew ) { bFixSize = bNew; }
- //Prueft alle Seiten ab der Uebergebenen und korrigiert ggf.
+ // check all pages (starting from the given) and correct them if needed
static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = sal_True );
- //Koennen 0 liefern, einmal const einmal nicht
+ // might return 0, with and without const
SwFrm *GetNext() { return pNext; }
SwFrm *GetPrev() { return pPrev; }
SwLayoutFrm *GetUpper() { return pUpper; }
@@ -693,8 +691,8 @@ public:
{ return ( pNext || !IsInSct() ) ? pNext : _GetIndNext(); }
const SwFrm* GetIndNext() const { return ((SwFrm*)this)->GetIndNext(); }
- sal_uInt16 GetPhyPageNum() const; //Seitennummer ohne Offset
- sal_uInt16 GetVirtPageNum() const; //Seitenummer mit Offset
+ sal_uInt16 GetPhyPageNum() const; // page number without offset
+ sal_uInt16 GetVirtPageNum() const; // page number with offset
sal_Bool OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
sal_Bool WannaRightPage() const;
@@ -703,25 +701,25 @@ public:
inline SwLayoutFrm *GetPrevLayoutLeaf();
inline SwLayoutFrm *GetNextLayoutLeaf();
- inline void Calc() const; //Hier wird ggf. 'Formatiert'
- inline void OptCalc() const; //Hier wird zur Optimierung davon ausgegangen,
- //das die Vorgaenger bereits formatiert sind.
+ inline void Calc() const; // here might be "formatted"
+ inline void OptCalc() const; // here we assume (for optimization) that
+ // the predecessors are already formatted
inline Point GetRelPos() const;
const SwRect &Frm() const { return aFrm; }
const SwRect &Prt() const { return aPrt; }
- // The PaintArea is the area, where content may be displayed.
- // The margin of the page or the space between columns belongs to her.
+ // PaintArea is the area where content might be displayed.
+ // The margin of a page or the space between columns belongs to it.
const SwRect PaintArea() const;
- // The UnionFrm is the union of frm- and prt-area, normally identical
- // to the frm-area except the case of negative prt-margins.
+ // UnionFrm is the union of Frm- and PrtArea, normally identical
+ // to the FrmArea except in case of negative Prt margins.
const SwRect UnionFrm( sal_Bool bBorder = sal_False ) const;
- //Der Zugriff auf die Member wird hier ausnahmsweiste gestattet,
- //dies soll aber nicht dazu dienen die Werte wahllos zu veraendern;
- //es ist nur die einzige Moeglichkeit die Compilerprobleme zu umgehen
- //(gleiche Methode mal public mal protected).
+ // HACK: Here we exceptionally allow direct access to members.
+ // This should not delude into changing those value randomly; it is the
+ // only option to circumvent compiler problems (same method with public
+ // and protected).
SwRect &Frm() { return aFrm; }
SwRect &Prt() { return aPrt; }
@@ -738,7 +736,7 @@ public:
sal_Bool GetValidLineNumFlag()const { return bValidLineNum; }
sal_Bool IsValid() const { return bValidPos && bValidSize && bValidPrtArea; }
- //Invalideren nur den Frm
+ // Only invalidate Frm
// #i28701# - add call to method <_ActionOnInvalidation(..)>
// for all invalidation methods.
// #i28701# - use method <_InvalidationAllowed(..)> to
@@ -786,7 +784,7 @@ public:
_ActionOnInvalidation( INVALID_ALL );
}
}
- //Benachrichtigen gleich die Seite mit.
+ // also notify page at the same time
inline void InvalidateSize();
inline void InvalidatePrt();
inline void InvalidatePos();
@@ -816,25 +814,25 @@ public:
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const;
- // der "kurze Dienstweg" zwischen den Frames und der Formatierung.
- // Wer den void* falsch Casted ist selbst schuld!
- // Auf jedenfall muss der void* auf 0 geprueft werden.
+ // HACK: shortcut between frame and formatting
+ // It's your own fault if you cast void* incorrectly! In any case check
+ // the void* for 0.
virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
const void *pVoid = 0, sal_Bool bNotify = sal_True );
- //sal_True wenn's die richtige Klasse ist, sal_False sonst
+ // sal_True if it is the correct class, sal_False otherwise
inline sal_Bool IsLayoutFrm() const;
inline sal_Bool IsRootFrm() const;
inline sal_Bool IsPageFrm() const;
inline sal_Bool IsColumnFrm() const;
- inline sal_Bool IsFtnBossFrm() const; // Fussnotenbosse sind PageFrms und ColumnFrms
+ inline sal_Bool IsFtnBossFrm() const; // footnote bosses might be PageFrms or ColumnFrms
inline sal_Bool IsHeaderFrm() const;
inline sal_Bool IsFooterFrm() const;
inline sal_Bool IsFtnContFrm() const;
inline sal_Bool IsFtnFrm() const;
inline sal_Bool IsBodyFrm() const;
- inline sal_Bool IsColBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb ColumnFrm
- inline sal_Bool IsPageBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb PageFrm
+ inline sal_Bool IsColBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above ColumnFrm
+ inline sal_Bool IsPageBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above PageFrm
inline sal_Bool IsFlyFrm() const;
inline sal_Bool IsSctFrm() const;
inline sal_Bool IsTabFrm() const;
@@ -843,17 +841,18 @@ public:
inline sal_Bool IsCntntFrm() const;
inline sal_Bool IsTxtFrm() const;
inline sal_Bool IsNoTxtFrm() const;
- inline sal_Bool IsFlowFrm() const; //Frms deren PrtArea von den Nachbarn
- //abhaengen und die halt im Inhaltsfluss
- //stehen.
- inline sal_Bool IsRetoucheFrm() const; //Frms die Retouchefaehig sind bzw. die
- //u.U. hinter sich Retouchieren muessen.
+ // Frms where its PrtArea depends on their neighbors and that are
+ // positioned in the content flow
+ inline sal_Bool IsFlowFrm() const;
+ // Frms that are capable of retouching or that might need to retouch behind
+ // themselves
+ inline sal_Bool IsRetoucheFrm() const;
inline sal_Bool IsAccessibleFrm() const;
- void PrepareCrsr(); //Die CrsrShell darf.
+ void PrepareCrsr(); // CrsrShell is allowed to call this
- //Ist der Frm (bzw. die Section in der er steht) geschuetzt?
- //Auch Fly in Fly in ... und Fussnoten
+ // Is the Frm (or the section containing it) protected? Same for Fly in
+ // Fly in ... and footnotes
sal_Bool IsProtected() const;
sal_Bool IsColLocked() const { return bColLocked; }
@@ -905,8 +904,7 @@ public:
void ValidateThisAndAllLowers( const sal_uInt16 nStage );
public:
- /** if writer is NULL, dumps the layout structure as XML in layout.xml
- */
+ // if writer is NULL, dumps the layout structure as XML in layout.xml
virtual void dumpAsXml(xmlTextWriterPtr writer = NULL);
virtual void dumpInfosAsXml(xmlTextWriterPtr writer);
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
@@ -1047,7 +1045,7 @@ inline void SwFrm::InvalidateNextPos( sal_Bool bNoFtn )
{
if ( pNext && !pNext->IsSctFrm() )
pNext->InvalidatePos();
-#ifndef C30 // vielleicht geht es ja bei C40 ?
+#ifndef C30 // maybe it works for C40?
else
ImplInvalidateNextPos( bNoFtn );
#else
@@ -1070,8 +1068,7 @@ inline void SwFrm::OptCalc() const
inline Point SwFrm::GetRelPos() const
{
Point aRet( aFrm.Pos() );
- //hier wird gecasted, weil die Klasse SwLayoutFrm nur vorward-
- //declariert ist.
+ // here we cast since SwLayoutFrm is declared only as forwarded
aRet -= ((SwFrm*)GetUpper())->Prt().Pos();
aRet -= ((SwFrm*)GetUpper())->Frm().Pos();
return aRet;
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index f05658c..555ab64 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -30,10 +30,9 @@
#include "swtypes.hxx"
-class SwTxtFrm; // SwTxtFrmInfo
-class SwPaM; // SwTxtFrmInfo
-class SwTxtCursor; // SwTxtFrmInfo
-
+class SwTxtFrm;
+class SwPaM;
+class SwTxtCursor;
/*************************************************************************
* class SwTxtFrmInfo
@@ -43,39 +42,38 @@ class SwTxtFrmInfo
{
const SwTxtFrm *pFrm;
- // Wo beginnt der Text (ohne whitespaces)? (Dokument global !!)
+ // Where does the text (w/o whitespaces) start (document is global!)?
SwTwips GetLineStart( const SwTxtCursor &rLine ) const;
public:
inline SwTxtFrmInfo( const SwTxtFrm *pTxtFrm ) : pFrm(pTxtFrm) { }
- // Passt der Absatz in eine Zeile?
+ // Does the paragraph fit into a single line?
sal_Bool IsOneLine() const;
- // Ist die Zeile zu X% gefuellt?
+ // Is the line filled to X%?
sal_Bool IsFilled( const sal_uInt8 nPercent ) const;
- // Wo beginnt der Text (ohne whitespaces)? (rel. im Frame !!)
+ // Where does the text (w/o whitespaces) start (rel. in frame)?
SwTwips GetLineStart() const;
- //returne die mittel Position des n. Charakters
+ // return center position of the next character
SwTwips GetCharPos( xub_StrLen nChar, sal_Bool bCenter = sal_True ) const;
- // Sammelt die whitespaces am Zeilenbeginn und -ende im Pam
+ // collect all whitespaces at the beginning and end of a line in Pam
void GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const;
- // Ist an der ersten Textposition ein Bullet/Symbol etc?
+ // Is a bullet point/symbol/etc. at the first text position?
sal_Bool IsBullet( xub_StrLen nTxtPos ) const;
- // Ermittelt Erstzeileneinzug
+ // determine intentation for first line
SwTwips GetFirstIndent() const;
- // setze und erfrage den Frame;
const SwTxtFrm* GetFrm() const { return pFrm; }
SwTxtFrmInfo& SetFrm( const SwTxtFrm* pNew )
{ pFrm = pNew; return *this; }
- // liegt eine Gegenueberstellung vor? (returnt Pos im Frame)
+ // Is it a comparison? Returns position in frame.
sal_uInt16 GetBigIndent( xub_StrLen& rFndPos,
const SwTxtFrm *pNextFrm = 0 ) const;
};
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 8e3a652..5cef92a 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -50,14 +50,13 @@ class SwPageDesc;
class SwTableBox;
struct SwFindRowSpanCacheObj;
-#define FAR_AWAY LONG_MAX - 20000 //Initale Position der Flys.
-#define BROWSE_HEIGHT 56700L * 10L //10 Meter
-
+#define FAR_AWAY LONG_MAX - 20000 // initial position of a Fly
+#define BROWSE_HEIGHT 56700L * 10L // 10 Meters
#define GRFNUM_NO 0
#define GRFNUM_YES 1
#define GRFNUM_REPLACE 2
-//Painten des Hintergrunds. Mit Brush oder Graphic.
+// draw background with brush or graphics
// - add 6th parameter to indicate that method should
// consider background transparency, saved in the color of the brush item
void DrawGraphic( const SvxBrushItem *, OutputDevice *,
@@ -72,45 +71,42 @@ void SwAlignRect( SwRect &rRect, const ViewShell *pSh );
// Created declaration here to avoid <extern> declarations
void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
-//Fly besorgen, wenn keine List hineingereicht wird, wir die der aktuellen
-//Shell benutzt.
-//Implementierung in feshview.cxx
+// get Fly, if no List is given use the current shell
+// Implementation in feshview.cxx
SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh );
-//Nicht gleich die math.lib anziehen.
sal_uLong SqRt( BigInt nX );
SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart );
void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow );
-//CntntNodes besorgen, CntntFrms erzeugen und in den LayFrm haengen.
+// Get CntntNodes, create CntntFrms, and add them to LayFrm.
void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, sal_uLong nIndex,
sal_Bool bPages = sal_False, sal_uLong nEndIndex = 0,
SwFrm *pPrv = 0 );
-//Erzeugen der Frames fuer einen bestimmten Bereich, verwendet _InsertCnt
+// Creation of frames for a specific section (uses _InsertCnt)
void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
const SwNodeIndex &rEndIdx );
-//Um z.B. fuer Tabelleheadlines das Erzeugen der Flys in _InsertCnt zu unterbinden.
+// prevent creation of Flys in _InsertCnt, e.g. for table headlines
extern sal_Bool bDontCreateObjects;
-//Fuer FlyCnts, siehe SwFlyAtCntFrm::MakeAll()
+// for FlyCnts, see SwFlyAtCntFrm::MakeAll()
extern sal_Bool bSetCompletePaintOnInvalidate;
-//Fuer Tabelleneinstellung per Tastatur.
+// for table settings via keyboard
long CalcRowRstHeight( SwLayoutFrm *pRow );
long CalcHeightWidthFlys( const SwFrm *pFrm );
-//Neue Seite einsetzen
SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
sal_Bool bOdd, sal_Bool bInsertEmpty, sal_Bool bFtn,
SwFrm *pSibling );
-//Flys bei der Seite anmelden.
+// connect Flys with page
void RegistFlys( SwPageFrm*, const SwLayoutFrm* );
-//Benachrichtung des Fly Hintergrundes wenn Notwendig.
+// notification of Fly's background if needed
void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
const SwRect* pOldRect = 0 );
@@ -130,13 +126,12 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage );
-// wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm
-// gerufen
+// used by SwCntntNode::GetFrm and SwFlyFrm::GetFrm
SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, sal_uInt16 const nFrmType, const Point* = 0,
const SwPosition *pPos = 0,
const sal_Bool bCalcFrm = sal_False );
-//Sollen ExtraDaten (Reline-Strich, Zeilennummern) gepaintet werden?
+// Should extra data (reline stroke, line numbers) be painted?
sal_Bool IsExtraData( const SwDoc *pDoc );
// #i11760# - method declaration <CalcCntnt(..)>
@@ -144,10 +139,8 @@ void CalcCntnt( SwLayoutFrm *pLay,
bool bNoColl = false,
bool bNoCalcFollow = false );
-
-//Die Notify-Klassen merken sich im CTor die aktuellen Groessen und fuehren
-//im DTor ggf. die notwendigen Benachrichtigungen durch.
-
+// Notify classes memorize the current sizes in their constructor and do
+// the necessary notifications in their destructor if needed
class SwFrmNotify
{
protected:
@@ -231,15 +224,11 @@ public:
}
};
-//SwBorderAttrs kapselt die Berechnung fuer die Randattribute inclusive
-//Umrandung. Die Attribute und die errechneten Werte werden gecached.
-//Neu: Die gesammte Klasse wird gecached.
-
-//!!!Achtung: Wenn weitere Attribute gecached werden muss unbedingt die
-//Methode Modify::Modify mitgepflegt werden!!!
-
-// - delete old method <SwBorderAttrs::CalcRight()> and
-// the stuff that belongs to it.
+// SwBorderAttrs encapsulates the calculation for margin attributes including
+// border. The whole class is cached.
+//
+// WARNING! If more attributes should be cached also adjust the method
+// Modify::Modify!
class SwBorderAttrs : public SwCacheObj
{
const SwAttrSet &rAttrSet;
@@ -248,13 +237,13 @@ class SwBorderAttrs : public SwCacheObj
SvxLRSpaceItem rLR;
const SvxBoxItem &rBox;
const SvxShadowItem &rShadow;
- const Size aFrmSize; //Die FrmSize
+ const Size aFrmSize;
- sal_Bool bBorderDist :1; //Ist's ein Frm der auch ohne Linie
- //einen Abstand haben kann?
+ // Is it a frame that can have a margin without a border?
+ sal_Bool bBorderDist : 1;
- //Mit den Folgenden Bools werden die gecache'ten Werte fuer UNgueltig
- //erklaert - bis sie einmal berechnet wurden.
+ // the following bool values set the cached values to INVALID - until they
+ // are calculated for the first time
sal_Bool bTopLine :1;
sal_Bool bBottomLine :1;
sal_Bool bLeftLine :1;
@@ -263,11 +252,11 @@ class SwBorderAttrs : public SwCacheObj
sal_Bool bBottom :1;
sal_Bool bLine :1;
- sal_Bool bIsLine :1; //Umrandung an mind. einer Kante?
+ sal_Bool bIsLine : 1; // border on at least one side?
- sal_Bool bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen?
- sal_Bool bCachedGetTopLine :1; //GetTopLine() gecached?
- sal_Bool bCachedGetBottomLine :1; //GetBottomLine() gecached?
+ sal_Bool bCacheGetLine : 1; // cache GetTopLine(), GetBottomLine()?
+ sal_Bool bCachedGetTopLine : 1; // is GetTopLine() cached?
+ sal_Bool bCachedGetBottomLine : 1; // is GetBottomLine() cached?
// - booleans indicating, if values <bJoinedWithPrev>
// and <bJoinedWithNext> are cached and valid.
// Caching depends on value of <bCacheGetLine>.
@@ -278,7 +267,7 @@ class SwBorderAttrs : public SwCacheObj
sal_Bool bJoinedWithPrev :1;
sal_Bool bJoinedWithNext :1;
- //Die gecache'ten Werte, undefiniert bis sie einmal berechnet wurden.
+ // The cached values (un-defined until calculated for the first time)
sal_uInt16 nTopLine,
nBottomLine,
nLeftLine,
@@ -288,13 +277,13 @@ class SwBorderAttrs : public SwCacheObj
nGetTopLine,
nGetBottomLine;
- //Nur die Lines + Shadow errechnen.
+ // only calculate lines and shadow
void _CalcTopLine();
void _CalcBottomLine();
void _CalcLeftLine();
void _CalcRightLine();
- //Lines + Shadow + Abstaende
+ // lines + shadow + margin
void _CalcTop();
void _CalcBottom();
@@ -321,8 +310,7 @@ class SwBorderAttrs : public SwCacheObj
sal_Bool _JoinWithCmp( const SwFrm& _rCallerFrm,
const SwFrm& _rCmpFrm ) const;
- //Rechte und linke Linie sowie LRSpace gleich?
- // - change name of 1st parameter - "rAttrs" -> "rCmpAttrs".
+ // Are the left and right line and the LRSpace equal?
sal_Bool CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
const SwFrm *pCaller,
const SwFrm *pCmp ) const;
@@ -374,7 +362,8 @@ public:
class SwBorderAttrAccess : public SwCacheAccess
{
- const SwFrm *pConstructor; //opt: Zur weitergabe an SwBorderAttrs
+ const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs
+
protected:
virtual SwCacheObj *NewObj();
@@ -384,11 +373,9 @@ public:
SwBorderAttrs *Get();
};
-//---------------------------------------------------------------------
-//Iterator fuer die DrawObjecte einer Seite. Die Objecte werden Nach ihrer
-//Z-Order iteriert.
-//Das iterieren ist nicht eben billig, denn fuer alle Operationen muss jeweils
-//ueber das gesamte SortArray iteriert werden.
+// Iterator for draw objects of a page. The objects will be iterated sorted by
+// their Z-order. Iterating is not cheap since for each operation the _whole_
+// SortArray needs to be traversed.
class SwOrderIter
{
const SwPageFrm *pPage;
@@ -427,11 +414,9 @@ public:
static sal_uInt8 Count() { return StackHack::nCnt; }
};
-
-//Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden?
-// #i25029# - add optional 2nd parameter <_pPrevFrm>
-// If set, its value is taken for testing, if borders/shadow have to joined
-// with previous frame.
+// Should upper (or lower) border be evaluated for this frame?
+// #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+// borders/shadow have to be joined with previous frame.
inline sal_uInt16 SwBorderAttrs::GetTopLine ( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm ) const
{
@@ -541,8 +526,8 @@ const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell_ );
/** helper class to check if a frame has been deleted during an operation
- * !!!WARNING!!! This should only be used as a last and desperate means
- * to make the code robust.
+ * WARNING! This should only be used as a last and desperate means to make the
+ * code robust.
*/
class SwDeletionChecker
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 21aab88..def0dec 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -35,9 +35,8 @@ class SwFtnContFrm;
class SwFtnFrm;
class SwTxtFtn;
-
-//Setzen des maximalen Fussnotenbereiches. Restaurieren des alten Wertes im DTor.
-//Implementierung im ftnfrm.cxx
+// Set max. footnote area.
+// Restoration of the old value in DTor. Implementation in ftnfrm.cxx
class SwSaveFtnHeight
{
SwFtnBossFrm *pBoss;
@@ -55,12 +54,12 @@ public:
class SwFtnBossFrm: public SwLayoutFrm
{
- //Fuer die privaten Fussnotenoperationen
+ // for private footnote operations
friend class SwFrm;
friend class SwSaveFtnHeight;
- friend class SwPageFrm; // fuer das Setzen der MaxFtnHeight
+ friend class SwPageFrm; // for setting of MaxFtnHeight
- //Maximale Hoehe des Fussnotencontainers fuer diese Seite.
+ // max. height of the footnote container on this page
SwTwips nMaxFtnHeight;
SwFtnContFrm *MakeFtnCont();
@@ -77,7 +76,7 @@ public:
inline const SwLayoutFrm *FindBodyCont() const;
inline void SetMaxFtnHeight( const SwTwips nNewMax ) { nMaxFtnHeight = nNewMax; }
- //Fussnotenschnittstelle
+ // footnote interface
void AppendFtn( SwCntntFrm *, SwTxtFtn * );
void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, sal_Bool bPrep = sal_True );
static SwFtnFrm *FindFtn( const SwCntntFrm *, const SwTxtFtn * );
@@ -91,21 +90,20 @@ public:
void RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock = sal_False,
const SwTxtFtn *pAttr = 0 );
- //SS damit der Textformatierer Temporaer die Fussnotenhoehe begrenzen
- //kann. DeadLine in Dokumentkoordinaten.
+ // Set DeadLine (in document coordinates) so that the text formatter can
+ // temporarily limit footnote height.
void SetFtnDeadLine( const SwTwips nDeadLine );
SwTwips GetMaxFtnHeight() const { return nMaxFtnHeight; }
- //Liefert den Wert, der noch uebrig ist, bis der Body seine minimale
- //Hoehe erreicht hat.
+ // returns value for remaining space until the body reaches minimal height
SwTwips GetVarSpace() const;
- //Layoutseitig benoetigte Methoden
- /// OD 03.04.2003 #108446# - add parameters <_bCollectOnlyPreviousFtns> and
- /// <_pRefFtnBossFrm> in order to control, if only footnotes, which are positioned
- /// before the given reference footnote boss frame have to be collected.
- /// Note: if parameter <_bCollectOnlyPreviousFtns> is true, then parameter
- /// <_pRefFtnBossFrm> have to be referenced to an object.
+ // methods needed for layouting
+ // The parameters <_bCollectOnlyPreviousFtns> and <_pRefFtnBossFrm> control
+ // if only footnotes that are positioned before the given reference
+ // footnote boss-frame have to be collected.
+ // Note: if parameter <_bCollectOnlyPreviousFtns> is true, then parameter
+ // <_pRefFtnBossFrm> has to be referenced by an object.
static void _CollectFtns( const SwCntntFrm* _pRef,
SwFtnFrm* _pFtn,
SvPtrarr& _rFtnArr,
@@ -121,7 +119,8 @@ public:
void _MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc = sal_False );
void MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
SwTxtFtn *pAttr );
- // Sollte AdjustNeighbourhood gerufen werden (oder Grow/Shrink)?
+
+ // should AdjustNeighbourhood be called (or Grow/Shrink)?
sal_uInt8 NeighbourhoodAdjustment( const SwFrm* pFrm ) const
{ return IsPageFrm() ? NA_ONLY_ADJUST : _NeighbourhoodAdjustment( pFrm ); }
};
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index c73682a..d78db52 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -35,12 +35,10 @@ class SwTxtFtn;
class SwBorderAttrs;
class SwFtnFrm;
-//Fuer Fussnoten gibt es einen Speziellen Bereich auf der Seite. Dieser
-//Bereich ist ein SwFtnContFrm.
-//Jede Fussnote ist durch einen SwFtnFrm abgegrenzt, dieser nimmt die
-//Fussnotenabsaetze auf. SwFtnFrm koennen aufgespalten werden, sie gehen
-//dann auf einer anderen Seite weiter.
-
+// There exists a special section on a page for footnotes. It's called
+// SwFtnContFrm. Each footnote is separated by a SwFtnFrm which contains
+// the paragraphs of a footnote. SwFtnFrm can be splitted and will then
+// continue on another page.
class SwFtnContFrm: public SwLayoutFrm
{
public:
@@ -59,17 +57,17 @@ public:
class SwFtnFrm: public SwLayoutFrm
{
- //Zeiger auf den FtnFrm in dem die Fussnote weitergefuehrt wird:
- // 0 wenn kein Follow vorhanden,
- // this beim letzten
- // der Follow sonst.
+ // Pointer to FtnFrm in which the footnote will be continued:
+ // - 0 no following existent
+ // - this for the last one
+ // - otherwise the following FtnFrm
SwFtnFrm *pFollow;
- SwFtnFrm *pMaster; //Der FtnFrm dessen Follow ich bin.
- SwCntntFrm *pRef; //In diesem CntntFrm steht die Fussnotenref.
- SwTxtFtn *pAttr; //Fussnotenattribut (zum wiedererkennen)
+ SwFtnFrm *pMaster; // FtnFrm from which I am the following
+ SwCntntFrm *pRef; // in this CntntFrm is the footnote reference
+ SwTxtFtn *pAttr; // footnote attribute (for recognition)
- sal_Bool bBackMoveLocked : 1; //Absaetze in dieser Fussnote duerfen derzeit
- //nicht rueckwaerts fliessen.
+ // if true paragraphs in this footnote are NOT permitted to flow backwards
+ sal_Bool bBackMoveLocked : 1;
// #i49383# - control unlock of position of lower anchored objects.
bool mbUnlockPosOfLowerObjs : 1;
#ifdef DBG_UTIL
@@ -120,7 +118,7 @@ public:
void UnlockBackMove() { bBackMoveLocked = sal_False;}
sal_Bool IsBackMoveLocked() { return bBackMoveLocked; }
- // Verhindert, dass der letzte Inhalt den SwFtnFrm mitloescht (Cut())
+ // prevents that the last content deletes the SwFtnFrm as well (Cut())
inline void ColLock() { bColLocked = sal_True; }
inline void ColUnlock() { bColLocked = sal_False; }
commit 9b43bf2ce3b947b494e076cad853d09a6e6d7544
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Jun 2 16:18:44 2012 +0200
re-indent files in sw/source/core/inc
* re-indentatation by -4 spaces
* delete ASCII art separators
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index dc1ceaf..8892f5e 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -51,424 +51,412 @@ namespace objectpositioning
class SwAnchoredObjectPosition
{
- private:
- // object to be positioned
- SdrObject& mrDrawObj;
-
- // information about object
- // does the object represents a Writer fly frame
- bool mbIsObjFly;
- // #i26791# - anchored object the object belongs to;
- SwAnchoredObject* mpAnchoredObj;
- // frame the object is anchored at
- SwFrm* mpAnchorFrm;
- // contact object
- SwContact* mpContact;
- // frame format
- const SwFrmFmt* mpFrmFmt;
- // #i62875#
- bool mbFollowTextFlow;
- // #i62875#
- // for compatibility option <DoNotCaptureDrawObjsOnPage>
- bool mbDoNotCaptureAnchoredObj;
-
- /** determine information about object
-
- member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrm>, <mpContact>
- and <mpFrmFmt> are set
- */
- void _GetInfoAboutObj();
-
- // #i62875#
- // --> OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R>
- SwTwips _ImplAdjustVertRelPos( const SwTwips nTopOfAnch,
- const bool bVert,
- const bool bVertL2R,
- const SwFrm& rPageAlignLayFrm,
- const SwTwips nProposedRelPosY,
- const bool bFollowTextFlow,
- const bool bCheckBottom = true ) const;
- SwTwips _ImplAdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm,
- const SwTwips _nProposedRelPosX ) const;
-
- protected:
- SwAnchoredObjectPosition( SdrObject& _rDrawObj );
- virtual ~SwAnchoredObjectPosition();
-
- // accessors for object and its corresponding data/information
- inline SdrObject& GetObject() const
- {
- return mrDrawObj;
- }
- inline bool IsObjFly() const
- {
- return mbIsObjFly;
- }
- inline SwAnchoredObject& GetAnchoredObj() const
- {
- return *mpAnchoredObj;
- }
- inline SwFrm& GetAnchorFrm() const
- {
- return *mpAnchorFrm;
- }
- inline SwContact& GetContact() const
- {
- return *mpContact;
- }
- inline const SwFrmFmt& GetFrmFmt() const
- {
- return *mpFrmFmt;
- }
- // #i62875#
- inline bool DoesObjFollowsTextFlow() const
- {
- return mbFollowTextFlow;
- }
-
- // virtual methods providing data for to character anchored objects.
- virtual bool IsAnchoredToChar() const;
- virtual const SwFrm* ToCharOrientFrm() const;
- virtual const SwRect* ToCharRect() const;
- // #i22341#
- virtual SwTwips ToCharTopOfLine() const;
-
- // *********************************************************************
- /** helper method to determine top of a frame for the vertical
- object positioning
-
- #i11860#
- */
- SwTwips _GetTopForObjPos( const SwFrm& _rFrm,
- const SwRectFn& _fnRect,
- const bool _bVert ) const;
-
- // *********************************************************************
- void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm,
- const SwFrm& _rPageAlignLayFrm,
- const sal_Int16 _eRelOrient,
- SwTwips& _orAlignAreaHeight,
- SwTwips& _orAlignAreaOffset ) const;
-
- // *********************************************************************
+ private:
+ // object to be positioned
+ SdrObject& mrDrawObj;
+
+ // does the object represents a Writer fly frame
+ bool mbIsObjFly;
+ // #i26791# - anchored object the object belongs to;
+ SwAnchoredObject* mpAnchoredObj;
+ // frame the object is anchored at
+ SwFrm* mpAnchorFrm;
+ // contact object
+ SwContact* mpContact;
+ // frame format
+ const SwFrmFmt* mpFrmFmt;
+ // #i62875#
+ bool mbFollowTextFlow;
+ // #i62875#
+ // for compatibility option <DoNotCaptureDrawObjsOnPage>
+ bool mbDoNotCaptureAnchoredObj;
+
+ /** determine information about object
+
+ member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrm>, <mpContact>
+ and <mpFrmFmt> are set
+ */
+ void _GetInfoAboutObj();
+
+ // #i62875#
+ // --> OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R>
+ SwTwips _ImplAdjustVertRelPos( const SwTwips nTopOfAnch,
+ const bool bVert,
+ const bool bVertL2R,
+ const SwFrm& rPageAlignLayFrm,
+ const SwTwips nProposedRelPosY,
+ const bool bFollowTextFlow,
+ const bool bCheckBottom = true ) const;
+ SwTwips _ImplAdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm,
+ const SwTwips _nProposedRelPosX ) const;
+
+ protected:
+ SwAnchoredObjectPosition( SdrObject& _rDrawObj );
+ virtual ~SwAnchoredObjectPosition();
+
+ // accessors for object and its corresponding data/information
+ inline SdrObject& GetObject() const
+ {
+ return mrDrawObj;
+ }
+ inline bool IsObjFly() const
+ {
+ return mbIsObjFly;
+ }
+ inline SwAnchoredObject& GetAnchoredObj() const
+ {
+ return *mpAnchoredObj;
+ }
+ inline SwFrm& GetAnchorFrm() const
+ {
+ return *mpAnchorFrm;
+ }
+ inline SwContact& GetContact() const
+ {
+ return *mpContact;
+ }
+ inline const SwFrmFmt& GetFrmFmt() const
+ {
+ return *mpFrmFmt;
+ }
+ // #i62875#
+ inline bool DoesObjFollowsTextFlow() const
+ {
+ return mbFollowTextFlow;
+ }
+
+ // virtual methods providing data for to character anchored objects.
+ virtual bool IsAnchoredToChar() const;
+ virtual const SwFrm* ToCharOrientFrm() const;
+ virtual const SwRect* ToCharRect() const;
+ // #i22341#
+ virtual SwTwips ToCharTopOfLine() const;
+
+ /** helper method to determine top of a frame for the vertical object
+ positioning
+
+ #i11860#
+ */
+ SwTwips _GetTopForObjPos( const SwFrm& _rFrm,
+ const SwRectFn& _fnRect,
+ const bool _bVert ) const;
+
+ void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm,
+ const SwFrm& _rPageAlignLayFrm,
+ const sal_Int16 _eRelOrient,
+ SwTwips& _orAlignAreaHeight,
+ SwTwips& _orAlignAreaOffset ) const;
+
// #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos>
- SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm,
- const SwFrm& _rPageAlignLayFrm,
- const sal_Int16 _eVertOrient,
- const sal_Int16 _eRelOrient,
- const SwTwips _nVertPos,
- const SvxLRSpaceItem& _rLRSpacing,
- const SvxULSpaceItem& _rULSpacing,
- SwTwips& _roVertOffsetToFrmAnchorPos ) const;
-
- // *********************************************************************
- /** adjust calculated vertical in order to keep object inside
- 'page' alignment layout frame.
-
- #i31805# - add parameter <_bCheckBottom>
- #i26945# - add parameter <_bFollowTextFlow>
- #i62875# - made inline, intrinsic actions moved
- to private method <_ImplAdjustVertRelPos>, which is only
- called, if <mbDoNotCaptureAnchoredObj> not set.
- OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R>
-
- @param nTopOfAnch
- input parameter - 'vertical' position, at which the relative
- position of the object is calculated from.
-
- @param bVert
- input parameter - boolean, indicating, if object is in vertical
- layout.
-
- @param bVertL2R
- input parameter - boolean, indicating, if object is in mongolian
- layout (vertical left-to-right layout).
-
- @param rPageAlignLayFrm
- input parameter - layout frame, which determines the 'page area'
- the object has to be vertical positioned in.
-
- @param nProposedRelPosY
- input parameter - proposed relative vertical position, which
- will be adjusted.
-
- @param bFollowTextFlow
- input parameter - value of attribute 'Follow text flow' of the
- anchored object.
-
- @param bCheckBottom
- input parameter - boolean indicating, if bottom of anchored
- object has to be checked and thus, (if needed) the proposed
- relative position has to be adjusted. default value <true>
- */
- inline SwTwips _AdjustVertRelPos( const SwTwips nTopOfAnch,
- const bool bVert,
- const bool bVertL2R,
- const SwFrm& rPageAlignLayFrm,
- const SwTwips nProposedRelPosY,
- const bool bFollowTextFlow,
- const bool bCheckBottom = true ) const
- {
- return !mbDoNotCaptureAnchoredObj
- ? _ImplAdjustVertRelPos( nTopOfAnch, bVert, bVertL2R,
- rPageAlignLayFrm,
- nProposedRelPosY,
- bFollowTextFlow,
- bCheckBottom )
- : nProposedRelPosY;
- }
-
- // *********************************************************************
- /** calculate relative horizontal position
-
- #i26791# - add output parameter
- <_roHoriOffsetToFrmAnchorPos>
-
- @param _rHoriOrientFrm
- input parameter - frame the horizontal position of the object
- is oriented at.
-
- @param _rEnvOfObj
- input parameter - object instance to retrieve environment
- information about the object
-
- @param _rHoriOrient
- input parameter - horizontal positioning and alignment, for which
- the relative position is calculated.
-
- @param _rLRSpacing
- input parameter - left and right spacing of the object to the text
-
- @param _rULSpacing
- input parameter - upper and lower spacing of the object to the text
-
- @param _bObjWrapThrough
- input parameter - boolean indicating, if object has wrap mode
- 'wrap through'.
-
- @param _nRelPosY
- input parameter - relative vertical position
-
- @param _roHoriOffsetToFrmAnchorPos
- output parameter - 'horizontal' offset to frame anchor position
- according to the alignment
-
- @return relative horizontal position in SwTwips
- */
- SwTwips _CalcRelPosX( const SwFrm& _rHoriOrientFrm,
- const SwEnvironmentOfAnchoredObject& _rEnvOfObj,
- const SwFmtHoriOrient& _rHoriOrient,
- const SvxLRSpaceItem& _rLRSpacing,
- const SvxULSpaceItem& _rULSpacing,
- const bool _bObjWrapThrough,
- const SwTwips _nRelPosY,
- SwTwips& _roHoriOffsetToFrmAnchorPos
- ) const;
-
- // *********************************************************************
- /** adjust calculated horizontal in order to keep object inside
- 'page' alignment layout frame for object type position TO_CNTNT
-
- #i62875# - made inline, intrinsic actions moved
- to private method <_ImplAdjustHoriRelPos>, which is only
- called, if <mbDoNotCaptureAnchoredObj> not set.
-
- @param _rPageAlignLayFrm
- input paramter - layout frame, which determines the 'page area'
- the object has to be horizontal positioned in.
-
- @param _nProposedRelPosX
- input parameter - proposed relative horizontal position, which
- will be adjusted.
-
- @return adjusted relative horizontal position in SwTwips.
- */
- inline SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm,
- const SwTwips _nProposedRelPosX ) const
- {
- return !mbDoNotCaptureAnchoredObj
- ? _ImplAdjustHoriRelPos( _rPageAlignLayFrm, _nProposedRelPosX )
- : _nProposedRelPosX;
- }
-
- // *********************************************************************
- /** toggle given horizontal orientation and relative alignment
-
- @param _bToggleLeftRight
- input parameter - boolean indicating, if horizontal orientation
- and relative alignment has to be toggled.
-
- @param _ioeHoriOrient
- input/output parameter - horizontal orientation, that is toggled,
- if needed.
-
- @param _iopeRelOrient
- optional input/output parameter (default value NULL)
- - if set, relative alignment, that is toggled, if needed.
- */
- void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight,
- sal_Int16& _ioeHoriOrient,
- sal_Int16& _iopeRelOrient
- ) const;
-
- // *********************************************************************
- /** determine alignment values for horizontal position of object
-
- @param _rHoriOrientFrm
- input parameter - frame the horizontal position of the object
- is oriented at.
-
- @param _rPageAlignLayFrm
- input paramter - layout frame, which determines the 'page area'
- the object has to be horizontal positioned in.
-
- @param _eRelOrient
- input parameter - horizontal relative alignment, for which
- the relative position is calculated.
-
- @param _bToggleLeftRight
- input parameter - boolean indicating, if left/right alignments
- have to be toggled.
-
- @param _bObjWrapThrough
- input parameter - boolean indicating, if object has wrap mode
- 'wrap through'.
- important note: value is only relevant, if _rHoriOrientFrm is
- a text frame.
-
- @param _orAlignAreaWidth
- output parameter - width in SwTwips of the area the horizontal
- position is aligned to.
-
- @param _orAlignAreaOffset
- output parameter - offset in SwTwips of the area the horizontal
- position is aligned to. offset is given to the 'left' of the
- anchor position.
-
- @param _obAlignedRelToPage
- output parameter - boolean indicating, that object is aligned
- to 'page area'.
- */
- void _GetHoriAlignmentValues( const SwFrm& _rHoriOrientFrm,
- const SwFrm& _rPageAlignLayFrm,
- const sal_Int16 _eRelOrient,
- const bool _bObjWrapThrough,
- SwTwips& _orAlignAreaWidth,
- SwTwips& _orAlignAreaOffset,
- bool& _obAlignedRelToPage ) const;
-
- // *********************************************************************
- /** adjust calculated horizontal position in order to draw object
- aside other objects with same positioning
-
- @param _rHoriOrientFrm
- input parameter - frame the horizontal position of the object
- is oriented at.
-
- @param _nProposedRelPosX
- input parameter - proposed relative horizontal position, which
- will be adjusted.
-
- @param _nRelPosY
- input parameter - relative vertical position
-
- @param _eHoriOrient
- input parameter - horizontal position of object
-
- @param _eRelOrient
- inpt parameter - alignment of object
-
- @param _rLRSpacing
- input parameter - left and right spacing of the object to the text
-
- @param _rULSpacing
- input parameter - upper and lower spacing of the object to the text
-
- @param _bEvenPage
- input parameter - boolean indicating, if object is on an even page.
-
- @return adjusted relative horizontal position in SwTwips
- */
- SwTwips _AdjustHoriRelPosForDrawAside( const SwFrm& _rHoriOrientFrm,
- const SwTwips _nProposedRelPosX,
- const SwTwips _nRelPosY,
- const sal_Int16 _eHoriOrient,
- const sal_Int16 _eRelOrient,
- const SvxLRSpaceItem& _rLRSpacing,
- const SvxULSpaceItem& _rULSpacing,
- const bool _bEvenPage
- ) const;
-
- // *********************************************************************
- /** detemine, if object has to draw aside given fly frame
-
- method used by <_AdjustHoriRelPosForDrawAside(..)>
-
- @param _pFly
- input parameter - fly frame the draw aside check is done for.
-
- @param _rObjRect
- input parameter - proposed object rectangle
-
- @param _pObjContext
- input parameter - context of the object
-
- @param _nObjIndex
- input parameter - index of the anchor frame of the object
-
- @param _bEvenPage
- input parameter - boolean indicating, if object is on an even page.
-
- @param _eHoriOrient
- input parameter - horizontal position of object
-
- @param _eRelOrient
- inpt parameter - alignment of object
-
- @return boolean indicating, if object has to be drawn aside
- given fly frame.
- */
- bool _DrawAsideFly( const SwFlyFrm* _pFly,
- const SwRect& _rObjRect,
- const SwFrm* _pObjContext,
- const sal_uLong _nObjIndex,
- const bool _bEvenPage,
- const sal_Int16 _eHoriOrient,
- const sal_Int16 _eRelOrient
- ) const;
-
- // *********************************************************************
- /** determine, if object has to draw aside another object
-
- the different alignments of the objects determines, if one has
- to draw aside another one. Thus, the given alignment are checked
- against each other, which one has to be drawn aside the other one.
- depending on parameter _bLeft check is done for left or right
- positioning.
- method used by <_DrawAsideFly(..)>
-
- @param _eRelOrient1
- input parameter - alignment 1
-
- @param _eRelOrient2
- input parameter - alignment 2
-
- @param _bLeft
- input parameter - boolean indicating, if check is done for left
- or for right positioning.
-
- @return boolean indicating, if an object with an alignment
- <_eRelOrient1> has to be drawn aside an object with an
- alignment <_eRelOrient2>
- */
- bool _Minor( sal_Int16 _eRelOrient1,
- sal_Int16 _eRelOrient2,
- bool _bLeft ) const;
-
- public:
- virtual void CalcPosition() = 0;
+ SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm,
+ const SwFrm& _rPageAlignLayFrm,
+ const sal_Int16 _eVertOrient,
+ const sal_Int16 _eRelOrient,
+ const SwTwips _nVertPos,
+ const SvxLRSpaceItem& _rLRSpacing,
+ const SvxULSpaceItem& _rULSpacing,
+ SwTwips& _roVertOffsetToFrmAnchorPos ) const;
+
+ /** adjust calculated vertical in order to keep object inside
+ 'page' alignment layout frame.
+
+ #i31805# - add parameter <_bCheckBottom>
+ #i26945# - add parameter <_bFollowTextFlow>
+ #i62875# - made inline, intrinsic actions moved
+ to private method <_ImplAdjustVertRelPos>, which is only
+ called, if <mbDoNotCaptureAnchoredObj> not set.
+ OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R>
+
+ @param nTopOfAnch
+ input parameter - 'vertical' position, at which the relative
+ position of the object is calculated from.
+
+ @param bVert
+ input parameter - boolean, indicating, if object is in vertical
+ layout.
+
+ @param bVertL2R
+ input parameter - boolean, indicating, if object is in mongolian
+ layout (vertical left-to-right layout).
+
+ @param rPageAlignLayFrm
+ input parameter - layout frame, which determines the 'page area'
+ the object has to be vertical positioned in.
+
+ @param nProposedRelPosY
+ input parameter - proposed relative vertical position, which
+ will be adjusted.
+
+ @param bFollowTextFlow
+ input parameter - value of attribute 'Follow text flow' of the
+ anchored object.
+
+ @param bCheckBottom
+ input parameter - boolean indicating, if bottom of anchored
+ object has to be checked and thus, (if needed) the proposed
+ relative position has to be adjusted. default value <true>
+ */
+ inline SwTwips _AdjustVertRelPos( const SwTwips nTopOfAnch,
+ const bool bVert,
+ const bool bVertL2R,
+ const SwFrm& rPageAlignLayFrm,
+ const SwTwips nProposedRelPosY,
+ const bool bFollowTextFlow,
+ const bool bCheckBottom = true ) const
+ {
+ return !mbDoNotCaptureAnchoredObj
+ ? _ImplAdjustVertRelPos( nTopOfAnch, bVert, bVertL2R,
+ rPageAlignLayFrm,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list