[Libreoffice-commits] .: sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Feb 12 13:49:23 PST 2011
sw/source/core/inc/anchoredobjectposition.hxx | 55 ++++------------
sw/source/core/inc/environmentofanchoredobject.hxx | 18 -----
sw/source/core/inc/flowfrm.hxx | 37 ++--------
sw/source/core/inc/flyfrm.hxx | 43 ++++--------
sw/source/core/inc/frmtool.hxx | 61 +++++++-----------
sw/source/core/inc/objectformatter.hxx | 57 ++++------------
sw/source/core/inc/pagefrm.hxx | 57 ++++------------
sw/source/core/inc/prevwpage.hxx | 4 -
sw/source/core/inc/retrieveinputstreamconsumer.hxx | 8 --
sw/source/core/inc/sortedobjs.hxx | 11 ---
sw/source/core/inc/swthreadmanager.hxx | 8 --
sw/source/core/inc/tocntntanchoredobjectposition.hxx | 11 ---
sw/source/core/inc/tolayoutanchoredobjectposition.hxx | 8 --
sw/source/core/inc/viewimp.hxx | 32 ++-------
14 files changed, 111 insertions(+), 299 deletions(-)
New commits:
commit dd7858b9b0642b913cded06afe4855c80f0db126
Author: Antoine Proulx <proulx.antoine at gmail.com>
Date: Sat Feb 12 22:48:50 2011 +0100
Remove bogus comments
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 10a6c7b..9b76eaa 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -29,7 +29,7 @@
#define _ANCHOREDOBJECTPOSITION_HXX
#include <swtypes.hxx>
-// OD 2004-03-16 #i11860#
+// #i11860#
#include <frame.hxx>
class SdrObject;
@@ -41,7 +41,7 @@ class SwRect;
class SvxLRSpaceItem;
class SvxULSpaceItem;
class SwFmtHoriOrient;
-// OD 2004-03-23 #i26701#
+// #i26701#
class SwAnchoredObject;
namespace objectpositioning
@@ -57,7 +57,7 @@ namespace objectpositioning
// information about object
// does the object represents a Writer fly frame
bool mbIsObjFly;
- // OD 2004-03-23 #i26791# - anchored object the object belongs to;
+ // #i26791# - anchored object the object belongs to;
SwAnchoredObject* mpAnchoredObj;
// frame the object is anchored at
SwFrm* mpAnchorFrm;
@@ -65,25 +65,20 @@ namespace objectpositioning
SwContact* mpContact;
// frame format
const SwFrmFmt* mpFrmFmt;
- // --> OD 2006-03-15 #i62875#
+ // #i62875#
bool mbFollowTextFlow;
- // <--
- // --> OD 2006-03-15 #i62875#
+ // #i62875#
// for compatibility option <DoNotCaptureDrawObjsOnPage>
bool mbDoNotCaptureAnchoredObj;
- // <--
/** determine information about object
- OD 30.07.2003 #110978#
member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrm>, <mpContact>
and <mpFrmFmt> are set
-
- @author OD
*/
void _GetInfoAboutObj();
- // --> OD 2006-03-15 #i62875#
+ // #i62875#
SwTwips _ImplAdjustVertRelPos( const SwTwips _nTopOfAnch,
const bool _bVert,
const SwFrm& _rPageAlignLayFrm,
@@ -92,7 +87,6 @@ namespace objectpositioning
const bool _bCheckBottom = true ) const;
SwTwips _ImplAdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm,
const SwTwips _nProposedRelPosX ) const;
- // <--
protected:
SwAnchoredObjectPosition( SdrObject& _rDrawObj );
@@ -123,27 +117,24 @@ namespace objectpositioning
{
return *mpFrmFmt;
}
- // --> OD 2006-03-15 #i62875#
+ // #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;
- // OD 12.11.2003 #i22341#
+ // #i22341#
virtual SwTwips ToCharTopOfLine() const;
// *********************************************************************
/** helper method to determine top of a frame for the vertical
object positioning
- OD 2004-03-11 #i11860#
-
- @author OD
+ #i11860#
*/
SwTwips _GetTopForObjPos( const SwFrm& _rFrm,
const SwRectFn& _fnRect,
@@ -157,7 +148,7 @@ namespace objectpositioning
SwTwips& _orAlignAreaOffset ) const;
// *********************************************************************
- // --> OD 2004-06-17 #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos>
+ // #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos>
SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm,
const SwFrm& _rPageAlignLayFrm,
const sal_Int16 _eVertOrient,
@@ -171,9 +162,9 @@ namespace objectpositioning
/** adjust calculated vertical in order to keep object inside
'page' alignment layout frame.
- OD 2004-07-22 #i31805# - add parameter <_bCheckBottom>
- OD 2004-10-08 #i26945# - add parameter <_bFollowTextFlow>
- OD 2006-03-15 #i62875# - made inline, intrinsic actions moved
+ #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.
@@ -201,8 +192,6 @@ namespace objectpositioning
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>
-
- @author OD
*/
inline SwTwips _AdjustVertRelPos( const SwTwips _nTopOfAnch,
const bool _bVert,
@@ -223,11 +212,9 @@ namespace objectpositioning
// *********************************************************************
/** calculate relative horizontal position
- --> OD 2004-06-17 #i26791# - add output parameter
+ #i26791# - add output parameter
<_roHoriOffsetToFrmAnchorPos>
- @author OD
-
@param _rHoriOrientFrm
input parameter - frame the horizontal position of the object
is oriented at.
@@ -273,12 +260,10 @@ namespace objectpositioning
/** adjust calculated horizontal in order to keep object inside
'page' alignment layout frame for object type position TO_CNTNT
- OD 2006-03-15 #i62875# - made inline, intrinsic actions moved
+ #i62875# - made inline, intrinsic actions moved
to private method <_ImplAdjustHoriRelPos>, which is only
called, if <mbDoNotCaptureAnchoredObj> not set.
- @author OD
-
@param _rPageAlignLayFrm
input paramter - layout frame, which determines the 'page area'
the object has to be horizontal positioned in.
@@ -300,8 +285,6 @@ namespace objectpositioning
// *********************************************************************
/** toggle given horizontal orientation and relative alignment
- @author OD
-
@param _bToggleLeftRight
input parameter - boolean indicating, if horizontal orientation
and relative alignment has to be toggled.
@@ -322,8 +305,6 @@ namespace objectpositioning
// *********************************************************************
/** determine alignment values for horizontal position of object
- @author OD
-
@param _rHoriOrientFrm
input parameter - frame the horizontal position of the object
is oriented at.
@@ -371,8 +352,6 @@ namespace objectpositioning
/** adjust calculated horizontal position in order to draw object
aside other objects with same positioning
- @author OD
-
@param _rHoriOrientFrm
input parameter - frame the horizontal position of the object
is oriented at.
@@ -416,8 +395,6 @@ namespace objectpositioning
method used by <_AdjustHoriRelPosForDrawAside(..)>
- @author OD
-
@param _pFly
input parameter - fly frame the draw aside check is done for.
@@ -461,8 +438,6 @@ namespace objectpositioning
positioning.
method used by <_DrawAsideFly(..)>
- @author OD
-
@param _eRelOrient1
input parameter - alignment 1
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 87b6bfa..b5844f2 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -41,10 +41,6 @@ namespace objectpositioning
public:
/** construtor
- OD 05.11.2003
-
- @author OD
-
@param _bFollowTextFlow
input parameter - indicates, if the anchored object, for which
this environment is instantiated, follow the text flow or not
@@ -52,17 +48,12 @@ namespace objectpositioning
SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow );
/** destructor
-
- OD 05.11.2003
-
- @author OD
*/
~SwEnvironmentOfAnchoredObject();
/** determine environment layout frame for possible horizontal object
positions respectively for alignment to 'page areas'
- OD 05.11.2003
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
@@ -70,11 +61,9 @@ namespace objectpositioning
this is, if object hasn't to follow the text flow:
- page frame.
- OD 2005-01-20 #118546# - no exception any more. Thus remove
+ - no exception any more. Thus remove
parameter <_bForPageAlignment>
- @author OD
-
@param _rHoriOrientFrm
input parameter - frame, at which the horizontal position is
oriented at (typically it's the anchor frame).
@@ -88,7 +77,6 @@ namespace objectpositioning
/** determine environment layout frame for possible vertical object
positions respectively for alignments to 'page areas'
- OD 05.11.2003
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
@@ -98,11 +86,9 @@ namespace objectpositioning
this is, if object hasn't to follow the text flow:
- page frame.
- OD 2005-01-20 #118546# - no exception any more. Thus remove
+ - no exception any more. Thus remove
parameter <_bForPageAlignment>
- @author OD
-
@param _rVertOrientFrm
input parameter - frame, at which the vertical position is
oriented at (typically it's the anchor frame).
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index aa18cee..00993ab 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -53,9 +53,8 @@ class SwRect;
class SwBorderAttrs;
class SwDoc;
class SwNodeIndex;
-// --> OD 2005-03-04 #i44049#
+// #i44049#
class SwObjectFormatterTxtFrm;
-// <--
void MakeFrms( SwDoc *, const SwNodeIndex &, const SwNodeIndex & );
@@ -66,9 +65,8 @@ class SwFlowFrm
friend inline void PrepareUnlock( SwFlowFrm * );
friend inline void TableSplitRecalcLock( SwFlowFrm * );
friend inline void TableSplitRecalcUnlock( SwFlowFrm * );
- // --> OD 2005-03-04 #i44049#
+ // #i44049#
friend class SwObjectFormatterTxtFrm;
- // <--
//TblSel darf das Follow-Bit zuruecksetzen.
friend inline void UnsetFollow( SwFlowFrm *pFlow );
@@ -91,31 +89,25 @@ class SwFlowFrm
/** helper method to determine previous frame for calculation of the
upper space
- OD 2004-03-10 #i11860#
+ #i11860#
@param _pProposedPrevFrm
optional input parameter - pointer to frame, which should be used
instead of the direct previous frame.
-
- @author OD
*/
const SwFrm* _GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPrevFrm = 0L ) const;
/** method to detemine the upper space amount, which is considered for
the previous frame
- OD 2004-03-11 #i11860#
-
- @author OD
+ #i11860#
*/
SwTwips _GetUpperSpaceAmountConsideredForPrevFrm() const;
/** method to detemine the upper space amount, which is considered for
the page grid
- OD 2004-03-12 #i11860#
-
- @author OD
+ #i11860#
*/
SwTwips _GetUpperSpaceAmountConsideredForPageGrid(
const SwTwips _nUpperSpaceWithoutGrid ) const;
@@ -136,9 +128,8 @@ protected:
//Prueft ob Vorwaertsfluss noch Sinn macht Endloswanderschaften (unterbinden)
inline BOOL IsFwdMoveAllowed();
- // --> OD 2005-03-08 #i44049# - method <CalcCntnt(..)> has to check this property.
+ // #i44049# - method <CalcCntnt(..)> has to check this property.
friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
- // <--
BOOL IsKeepFwdMoveAllowed(); //Wie oben, Move fuer Keep.
//Prueft ob ein Obj das Umlauf wuenscht ueberlappt.
@@ -201,11 +192,9 @@ public:
/** method to determine the upper space hold by the frame
- OD 2004-03-12 #i11860# - add 3rd parameter <_bConsiderGrid> to get
+ #i11860# - add 3rd parameter <_bConsiderGrid> to get
the upper space with and without considering the page grid
(default value: <TRUE>)
-
- @author ?
*/
SwTwips CalcUpperSpace( const SwBorderAttrs *pAttrs = NULL,
const SwFrm* pPr = NULL,
@@ -215,26 +204,18 @@ public:
the previous frame and the page grid, if option 'Use former object
positioning' is OFF
- OD 2004-03-18 #i11860#
-
- @author OD
+ #i11860#
*/
SwTwips GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const;
/** calculation of lower space
-
- OD 2004-03-02 #106629#
-
- @author OD
*/
SwTwips CalcLowerSpace( const SwBorderAttrs* _pAttrs = 0L ) const;
/** calculation of the additional space to be considered, if flow frame
is the last inside a table cell
- OD 2004-07-16 #i26250
-
- @author OD
+ #i26250
@param _pAttrs
optional input parameter - border attributes of the flow frame.
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 0a5cad4..1140b0f 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -40,7 +40,7 @@ class SwSpzFrmFmts;
class SwAttrSetChg;
class PolyPolygon;
-// OD 2004-03-22 #i26791#
+// #i26791#
#include <anchoredobject.hxx>
//Sucht ausgehend von pOldAnch einen Anker fuer Absatzgebundene Rahmen.
@@ -54,7 +54,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove = TRUE );
//allg. Basisklasse fuer alle Freifliegenden Rahmen
-// OD 2004-03-22 #i26791# - inherit also from <SwAnchoredFlyFrm>
+// #i26791# - inherit also from <SwAnchoredFlyFrm>
class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
{
//darf Locken. Definiert in frmtool.cxx
@@ -76,7 +76,7 @@ protected:
SwFlyFrm *pPrevLink, // Vorgaenger/Nachfolger fuer Verkettung mit
*pNextLink; // Textfluss
- // OD 2004-05-27 #i26791# - moved to <SwAnchoredObject>
+ // #i26791# - moved to <SwAnchoredObject>
// Point aRelPos; //Die Relative Position zum Master
private:
@@ -117,8 +117,6 @@ protected:
// invisible layer.
friend class SwNoTxtFrm; // Darf NotifyBackground rufen
-// virtual void NotifyBackground( SwPageFrm *pPage,
-// const SwRect& rRect, PrepareHint eHint) = 0;
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
void MakePrtArea( const SwBorderAttrs &rAttrs );
@@ -137,22 +135,19 @@ protected:
/** method to assure that anchored object is registered at the correct
page frame
- OD 2004-07-02 #i28701#
-
- @author OD
+ #i28701#
*/
virtual void RegisterAtCorrectPage();
- // --> OD 2006-08-10 #i68520#
+ // #i68520#
virtual bool _SetObjTop( const SwTwips _nTop );
virtual bool _SetObjLeft( const SwTwips _nLeft );
- // <--
- // --> OD 2006-10-05 #i70122#
+ // #i70122#
virtual const SwRect GetObjBoundRect() const;
- // <--
+
public:
- // OD 2004-03-23 #i26791#
+ // #i26791#
TYPEINFO();
virtual ~SwFlyFrm();
@@ -184,7 +179,7 @@ public:
SwFlyFrm *FindChainNeighbour( SwFrmFmt &rFmt, SwFrm *pAnch = 0 );
- // OD 2004-03-24 #i26791#
+ // #i26791#
const SwVirtFlyDrawObj* GetVirtDrawObj() const;
SwVirtFlyDrawObj *GetVirtDrawObj();
void NotifyDrawObj();
@@ -223,7 +218,7 @@ public:
SwFrm *FindLastLower();
- // OD 16.04.2003 #i13147# - add parameter <_bForPaint> to avoid load of
+ // #i13147# - add parameter <_bForPaint> to avoid load of
// the graphic during paint. Default value: sal_False
BOOL GetContour( PolyPolygon& rContour,
const sal_Bool _bForPaint = sal_False ) const;
@@ -232,40 +227,32 @@ public:
//Auf dieser Shell painten (PreView, Print-Flag usw. rekursiv beachten)?.
static BOOL IsPaint( SdrObject *pObj, const ViewShell *pSh );
- /** SwFlyFrm::IsBackgroundTransparent - for feature #99657#
+ /** SwFlyFrm::IsBackgroundTransparent
- OD 12.08.2002
determines, if background of fly frame has to be drawn transparent
definition found in /core/layout/paintfrm.cxx
- @author OD
-
@return true, if background color is transparent or a existing background
graphic is transparent.
*/
sal_Bool IsBackgroundTransparent() const;
- /** SwFlyFrm::IsShadowTransparent - for feature #99657#
+ /** SwFlyFrm::IsShadowTransparent
- OD 05.08.2002
determine, if shadow color of fly frame has to be drawn transparent
definition found in /core/layout/paintfrm.cxx
- @author OD
-
@return true, if shadow color is transparent.
*/
sal_Bool IsShadowTransparent() const;
- // OD 2004-01-19 #110582#
void Chain( SwFrm* _pAnchor );
void Unchain();
void InsertCnt();
void DeleteCnt();
- // OD 2004-02-12 #110582#-2
void InsertColumns();
- // OD 2004-03-23 #i26791# - pure virtual methods of base class <SwAnchoredObject>
+ // #i26791# - pure virtual methods of base class <SwAnchoredObject>
virtual void MakeObjPos();
virtual void InvalidateObjPos();
@@ -276,12 +263,10 @@ public:
/** method to determine, if a format on the Writer fly frame is possible
- OD 2004-05-11 #i28701#
+ #i28701#
refine 'IsFormatPossible'-conditions of method
<SwAnchoredObject::IsFormatPossible()> by:
format isn't possible, if Writer fly frame is locked resp. col-locked.
-
- @author OD
*/
virtual bool IsFormatPossible() const;
};
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 844fbbf..39d42c6 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -31,9 +31,8 @@
#include "layfrm.hxx"
#include "frmatr.hxx"
#include "swcache.hxx"
-// --> OD 2008-12-04 #i96772#
+// #i96772#
#include <editeng/lrspitem.hxx>
-// <--
class SwPageFrm;
class SwFlyFrm;
@@ -58,24 +57,23 @@ struct SwFindRowSpanCacheObj;
#define WEIT_WECH LONG_MAX - 20000 //Initale Position der Flys.
#define BROWSE_HEIGHT 56700L * 10L //10 Meter
-//#define BROWSE_HEIGHT 1440L * 45L // 45 inch, maximum size for pdf files
#define GRFNUM_NO 0
#define GRFNUM_YES 1
#define GRFNUM_REPLACE 2
//Painten des Hintergrunds. Mit Brush oder Graphic.
-// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should
+// - add 6th parameter to indicate that method should
// consider background transparency, saved in the color of the brush item
void MA_FASTCALL DrawGraphic( const SvxBrushItem *, OutputDevice *,
const SwRect &rOrg, const SwRect &rOut, const BYTE nGrfNum = GRFNUM_NO,
const sal_Bool bConsiderBackgroundTransparency = sal_False );
-// OD 24.01.2003 #106593# - method to align rectangle
+// - method to align rectangle
// Created declaration here to avoid <extern> declarations
void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh );
-// OD 24.01.2003 #106593# - method to align graphic rectangle
+// - method to align graphic rectangle
// Created declaration here to avoid <extern> declarations
void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
@@ -137,7 +135,7 @@ BOOL IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage );
-// JP 07.05.98: wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm
+// wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm
// gerufen
SwFrm* GetFrmOfModify( SwModify const&, USHORT const nFrmType, const Point* = 0,
const SwPosition *pPos = 0,
@@ -146,7 +144,7 @@ SwFrm* GetFrmOfModify( SwModify const&, USHORT const nFrmType, const Point* = 0,
//Sollen ExtraDaten (Reline-Strich, Zeilennummern) gepaintet werden?
BOOL IsExtraData( const SwDoc *pDoc );
-// OD 14.03.2003 #i11760# - method declaration <CalcCntnt(..)>
+// #i11760# - method declaration <CalcCntnt(..)>
void CalcCntnt( SwLayoutFrm *pLay,
bool bNoColl = false,
bool bNoCalcFollow = false );
@@ -167,9 +165,8 @@ protected:
BOOL bInvaKeep;
BOOL bValidSize;
protected:
- // --> OD 2005-07-29 #i49383#
+ // #i49383#
bool mbFrmDeleted;
- // <--
public:
SwFrmNotify( SwFrm *pFrm );
@@ -178,12 +175,11 @@ public:
const SwRect &Frm() const { return aFrm; }
const SwRect &Prt() const { return aPrt; }
void SetInvaKeep() { bInvaKeep = TRUE; }
- // --> OD 2005-07-29 #i49383#
+ // #i49383#
void FrmDeleted()
{
mbFrmDeleted = true;
}
- // <--
};
class SwLayNotify : public SwFrmNotify
@@ -214,11 +210,11 @@ public:
class SwCntntNotify : public SwFrmNotify
{
private:
- // OD 08.01.2004 #i11859#
+ // #i11859#
bool mbChkHeightOfLastLine;
SwTwips mnHeightOfLastLine;
- // OD 2004-02-26 #i25029#
+ // #i25029#
bool mbInvalidatePrevPrtArea;
bool mbBordersJoinedWithPrev;
@@ -228,7 +224,7 @@ public:
SwCntntNotify( SwCntntFrm *pCntFrm );
~SwCntntNotify();
- // OD 2004-02-26 #i25029#
+ // #i25029#
void SetInvalidatePrevPrtArea()
{
mbInvalidatePrevPrtArea = true;
@@ -247,15 +243,14 @@ public:
//!!!Achtung: Wenn weitere Attribute gecached werden muss unbedingt die
//Methode Modify::Modify mitgepflegt werden!!!
-// OD 23.01.2003 #106895# - delete old method <SwBorderAttrs::CalcRight()> and
+// - delete old method <SwBorderAttrs::CalcRight()> and
// the stuff that belongs to it.
class SwBorderAttrs : public SwCacheObj
{
const SwAttrSet &rAttrSet;
const SvxULSpaceItem &rUL;
- // --> OD 2008-12-04 #i96772#
+ // #i96772#
SvxLRSpaceItem rLR;
- // <--
const SvxBoxItem &rBox;
const SvxShadowItem &rShadow;
const Size aFrmSize; //Die FrmSize
@@ -278,12 +273,12 @@ class SwBorderAttrs : public SwCacheObj
BOOL bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen?
BOOL bCachedGetTopLine :1; //GetTopLine() gecached?
BOOL bCachedGetBottomLine :1; //GetBottomLine() gecached?
- // OD 21.05.2003 #108789# - booleans indicating, if values <bJoinedWithPrev>
+ // - booleans indicating, if values <bJoinedWithPrev>
// and <bJoinedWithNext> are cached and valid.
// Caching depends on value of <bCacheGetLine>.
mutable BOOL bCachedJoinedWithPrev :1;
mutable BOOL bCachedJoinedWithNext :1;
- // OD 21.05.2003 #108789# - booleans indicating, if borders are joined
+ // - booleans indicating, if borders are joined
// with previous/next frame.
BOOL bJoinedWithPrev :1;
BOOL bJoinedWithNext :1;
@@ -310,29 +305,29 @@ class SwBorderAttrs : public SwCacheObj
void _IsLine();
- // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm>
+ // #i25029# - add optional 2nd parameter <_pPrevFrm>
// If set, its value is taken for testing, if borders/shadow have to joined
// with previous frame.
void _GetTopLine ( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L );
void _GetBottomLine( const SwFrm& _rFrm );
- // OD 21.05.2003 #108789# - private methods to calculate cached values
+ // - private methods to calculate cached values
// <bJoinedWithPrev> and <bJoinedWithNext>.
- // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm>
+ // #i25029# - add optional 2nd parameter <_pPrevFrm>
// If set, its value is taken for testing, if borders/shadow have to joined
// with previous frame.
void _CalcJoinedWithPrev( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L );
void _CalcJoinedWithNext( const SwFrm& _rFrm );
- // OD 21.05.2003 #108789# - internal helper method for methods
+ // - internal helper method for methods
// <_CalcJoinedWithPrev> and <_CalcJoinedWithNext>.
BOOL _JoinWithCmp( const SwFrm& _rCallerFrm,
const SwFrm& _rCmpFrm ) const;
//Rechte und linke Linie sowie LRSpace gleich?
- // OD 21.05.2003 #108789# - change name of 1st parameter - "rAttrs" -> "rCmpAttrs".
+ // - change name of 1st parameter - "rAttrs" -> "rCmpAttrs".
BOOL CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
const SwFrm *pCaller,
const SwFrm *pCmp ) const;
@@ -365,16 +360,16 @@ public:
inline BOOL IsBorderDist() const { return bBorderDist; }
//Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden?
- // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm>
+ // #i25029# - add optional 2nd parameter <_pPrevFrm>
// If set, its value is taken for testing, if borders/shadow have to joined
// with previous frame.
inline USHORT GetTopLine ( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L ) const;
inline USHORT GetBottomLine( const SwFrm& _rFrm ) const;
inline void SetGetCacheLine( BOOL bNew ) const;
- // OD 21.05.2003 #108789# - accessors for cached values <bJoinedWithPrev>
+ // - accessors for cached values <bJoinedWithPrev>
// and <bJoinedWithPrev>
- // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm>
+ // #i25029# - add optional 2nd parameter <_pPrevFrm>
// If set, its value is taken for testing, if borders/shadow have to joined
// with previous frame.
BOOL JoinedWithPrev( const SwFrm& _rFrm,
@@ -439,7 +434,7 @@ public:
//Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden?
-// OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm>
+// #i25029# - add optional 2nd parameter <_pPrevFrm>
// If set, its value is taken for testing, if borders/shadow have to joined
// with previous frame.
inline USHORT SwBorderAttrs::GetTopLine ( const SwFrm& _rFrm,
@@ -462,7 +457,7 @@ inline void SwBorderAttrs::SetGetCacheLine( BOOL bNew ) const
((SwBorderAttrs*)this)->bCacheGetLine = bNew;
((SwBorderAttrs*)this)->bCachedGetBottomLine =
((SwBorderAttrs*)this)->bCachedGetTopLine = FALSE;
- // OD 21.05.2003 #108789# - invalidate cache for values <bJoinedWithPrev>
+ // - invalidate cache for values <bJoinedWithPrev>
// and <bJoinedWithNext>.
bCachedJoinedWithPrev = FALSE;
bCachedJoinedWithNext = FALSE;
@@ -513,10 +508,10 @@ inline BOOL SwBorderAttrs::IsLine() const
/** method to determine the spacing values of a frame
- OD 2004-03-10 #i28701#
+ #i28701#
Values only provided for flow frames (table, section or text frames)
Note: line spacing value is only determined for text frames
- OD 2009-08-28 #i102458#
+ #i102458#
Add output parameter <obIsLineSpacingProportional>
@param rFrm
@@ -529,8 +524,6 @@ inline BOOL SwBorderAttrs::IsLine() const
output parameter - line spacing of the frame in SwTwips
@param obIsLineSpacingProportional
-
- @author OD
*/
void GetSpacingValuesOfFrm( const SwFrm& rFrm,
SwTwips& onLowerSpacing,
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index 6fccce3..7ea7778 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -31,19 +31,17 @@
#include <sal/types.h>
class SwFrm;
-// --> OD 2004-10-08 #i26945#
+// #i26945#
class SwTxtFrm;
-// <--
class SwLayoutFrm;
class SwPageFrm;
class SwAnchoredObject;
class SwLayAction;
-// --> OD 2004-10-04 #i26945#
+// OD 2004-10-04 #i26945#
class SwPageNumAndTypeOfAnchors;
-// <--
// -----------------------------------------------------------------------------
-// OD 2004-06-25 #i28701#
+// #i28701#
// Format floating screen objects, which are anchored at the given anchor frame
// and registered at the given page frame.
// -----------------------------------------------------------------------------
@@ -65,30 +63,25 @@ class SwObjectFormatter
SwLayAction* mpLayAction;
// data structure to collect page number of object's 'anchor'
- // --> OD 2004-10-04 #i26945#
+ // #i26945#
SwPageNumAndTypeOfAnchors* mpPgNumAndTypeOfAnchors;
- // <--
/** helper method for method <_FormatObj(..)> - performs the intrinsic
format of the layout of the given layout frame and all its lower
layout frames.
- OD 2004-06-28 #i28701#
+ #i28701#
IMPORTANT NOTE:
Method corresponds to methods <SwLayAction::FormatLayoutFly(..)> and
<SwLayAction::FormatLayout(..)>. Thus, its code for the formatting have
to be synchronised.
-
- @author OD
*/
void _FormatLayout( SwLayoutFrm& _rLayoutFrm );
/** helper method for method <_FormatObj(..)> - performs the intrinsic
format of the content of the given floating screen object.
- OD 2004-06-28 #i28701#
-
- @author OD
+ #i28701#
*/
void _FormatObjCntnt( SwAnchoredObject& _rAnchoredObj );
@@ -120,8 +113,6 @@ class SwObjectFormatter
/** method to restrict the format of floating screen objects to
as-character anchored ones
-
- @author OD
*/
inline void SetFormatOnlyAsCharAnchored()
{
@@ -135,23 +126,19 @@ class SwObjectFormatter
/** performs the intrinsic format of a given floating screen object and its content.
- OD 2004-06-28 #i28701#
-
- @author OD
+ #i28701#
*/
void _FormatObj( SwAnchoredObject& _rAnchoredObj );
/** invokes the intrinsic format method for all floating screen objects,
anchored at anchor frame on the given page frame
- OD 2004-06-28 #i28701#
- OD 2004-10-08 #i26945# - for format of floating screen objects for
+ #i28701#
+ #i26945# - for format of floating screen objects for
follow text frames, the 'master' text frame is passed to the method.
Thus, the objects, whose anchor character is inside the follow text
frame can be formatted.
- @author OD
-
@param _pMasterTxtFrm
input parameter - pointer to 'master' text frame. default value: NULL
*/
@@ -159,33 +146,25 @@ class SwObjectFormatter
/** accessor to collected anchored object
- OD 2004-07-05 #i28701#
-
- @author OD
+ #i28701#
*/
SwAnchoredObject* GetCollectedObj( const sal_uInt32 _nIndex );
/** accessor to 'anchor' page number of collected anchored object
- OD 2004-07-05 #i28701#
-
- @author OD
+ #i28701#
*/
sal_uInt32 GetPgNumOfCollected( const sal_uInt32 _nIndex );
/** accessor to 'anchor' type of collected anchored object
- OD 2004-10-04 #i26945#
-
- @author OD
+ #i26945#
*/
bool IsCollectedAnchoredAtMaster( const sal_uInt32 _nIndex );
/** accessor to total number of collected anchored objects
- OD 2004-07-05 #i28701#
-
- @author OD
+ #i28701#
*/
sal_uInt32 CountOfCollected();
@@ -194,9 +173,7 @@ class SwObjectFormatter
/** intrinsic method to format a certain floating screen object
- OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd>
-
- @author OD
+ #i40147# - add parameter <_bCheckForMovedFwd>
@param _rAnchoredObj
input parameter - anchored object, which have to be formatted.
@@ -213,22 +190,16 @@ class SwObjectFormatter
const bool _bCheckForMovedFwd = false ) = 0;
/** intrinsic method to format all floating screen objects
-
- @author OD
*/
virtual bool DoFormatObjs() = 0;
/** method to format all floating screen objects at the given anchor frame
-
- @author OD
*/
static bool FormatObjsAtFrm( SwFrm& _rAnchorFrm,
const SwPageFrm& _rPageFrm,
SwLayAction* _pLayAction = 0L );
/** method to format a given floating screen object
-
- @author OD
*/
static bool FormatObj( SwAnchoredObject& _rAnchoredObj,
SwFrm* _pAnchorFrm = 0L,
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 61a4bcd..e6b86b5 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -46,12 +46,10 @@ class SdrObject;
class SwAttrSetChg;
class Font;
-// OD 2004-05-07 #i28701# - replaced by class <SwSortedObjs>
-//SV_DECL_PTRARR_SORT(SwSortDrawObjs,SdrObjectPtr,1,2);
+// #i28701# - replaced by class <SwSortedObjs>
class SwSortedObjs;
-// --> OD 2004-07-02 #i28701#
+// #i28701#
class SwAnchoredObject;
-// <--
enum SwPageChg
{
@@ -64,7 +62,7 @@ class SwPageFrm: public SwFtnBossFrm
{
friend class SwFrm;
- // OD 2004-05-07 #i28701# - use <SwSortedObjs>
+ // #i28701# - use <SwSortedObjs>
SwSortedObjs *pSortedObjs;
SwPageDesc *pDesc; //PageDesc der die Seite beschreibt.
@@ -85,11 +83,11 @@ class SwPageFrm: public SwFtnBossFrm
BOOL bInvalidWordCount :1;
BOOL bHasGrid :1; // Grid for Asian layout
- // OD 2004-05-17 #i28701# - boolean, indicating that layout of page frame
+ // #i28701# - boolean, indicating that layout of page frame
// is in progress.
bool mbLayoutInProgress;
- // OD 12.02.2003 #i9719#, #105645#
+ // #i9719#
static const sal_Int8 mnBorderPxWidth;
static const sal_Int8 mnShadowPxWidth;
@@ -101,9 +99,7 @@ class SwPageFrm: public SwFtnBossFrm
/** determine rectangle for page border
- OD 12.02.2003 for #i9719# and #105645#
-
- @author OD
+ #i9719#
@param _rPageRect
input parameter - constant instance reference of the page rectangle.
@@ -125,9 +121,7 @@ class SwPageFrm: public SwFtnBossFrm
/** determine rectangle for right page shadow
- OD 12.02.2003 for #i9719# and #105645#
-
- @author OD
+ #i9719#
@param _rPageRect
input parameter - constant instance reference of the page rectangle.
@@ -149,9 +143,7 @@ class SwPageFrm: public SwFtnBossFrm
/** determine rectangle for bottom page shadow
- OD 12.02.2003 for #i9719# and #105645#
-
- @author OD
+ #i9719#
@param _rPageRect
input parameter - constant instance reference of the page rectangle.
@@ -173,9 +165,7 @@ class SwPageFrm: public SwFtnBossFrm
bool bRightSidebar );
/** adds the sidebar used for notes to right and left border
- mod 20.10.2007 for #i6193#
-
- @author mod
+ #i6193#
@param aRect
input parameter - current rect, we change borders if we want a sidebar
@@ -207,10 +197,9 @@ public:
const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; }
SwSortedObjs *GetSortedObjs() { return pSortedObjs; }
- // --> OD 2004-07-02 #i28701# - new methods to append/remove drawing objects
+ // #i28701# - new methods to append/remove drawing objects
void AppendDrawObjToPage( SwAnchoredObject& _rNewObj );
void RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj );
- // <--
void AppendFlyToPage( SwFlyFrm *pNew );
void RemoveFlyFromPage( SwFlyFrm *pToRemove );
@@ -240,7 +229,7 @@ public:
//Schickt an alle ContentFrames ein Prepare wg. geaenderter Registervorlage
void PrepareRegisterChg();
- // --> OD 2005-06-09 #i50432# - adjust method description and synopsis.
+ // #i50432# - adjust method description and synopsis.
// Appends a fly frame - the given one or a new one - at the page frame.
// Needed for <Modify> and <MakeFrms>
// - return value not needed any more
@@ -248,7 +237,6 @@ public:
// - third parameter only needed for assertion, but calling method assures
// this assertion. Thus, delete it.
void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt );
- // <--
virtual BOOL GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0 ) const;
@@ -312,26 +300,20 @@ public:
BOOL IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; }
BOOL IsInvalidWordCount() const { return bInvalidWordCount; }
- /** SwPageFrm::GetDrawBackgrdColor - for #102450#
+ /** SwPageFrm::GetDrawBackgrdColor
- 29.08.2002:
determine the color, that is respectively will be drawn as background
for the page frame.
- @author OD
-
@return reference to an instance of class Color
*/
const Color& GetDrawBackgrdColor() const;
/** paint margin area of a page
- OD 20.11.2002 for #104598#:
implement paint of margin area; margin area will be painted for a
view shell with a window and if the document is not in online layout.
- @author OD
-
@param _rOutputRect
input parameter - constant instance reference of the rectangle, for
which an output has to be generated.
@@ -345,11 +327,9 @@ public:
/** paint page border and shadow
- OD 12.02.2003 for #i9719# and #105645#
+ #i9719#
implement paint of page border and shadow
- @author OD
-
@param _rPageRect
input parameter - constant instance reference of the page rectangle.
Generally, it's the frame area of the page, but for empty pages in print
@@ -366,9 +346,7 @@ public:
/** get bound rectangle of border and shadow for repaints
- OD 12.02.2003 for #i9719# and #105645#
-
- author OD
+ #i9719#
@param _rPageRect
input parameter - constant instance reference of the page rectangle.
@@ -391,8 +369,6 @@ public:
static void PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, USHORT nPageNum, bool bRight);
static void PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, ViewShell* _pViewShell, const Color aColorUp, const Color aColorDown);
/**
- mod #6i193#
-
asks the page on which side a margin should be shown, e.g for notes
returns true for left side, false for right side
*/
@@ -400,7 +376,7 @@ public:
virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
- // OD 12.02.2003 #i9719#, #105645#
+ // #i9719#
inline sal_Int8 BorderPxWidth() const
{
return mnBorderPxWidth;
@@ -410,10 +386,9 @@ public:
return mnShadowPxWidth;
}
- // OD 22.09.2003 #110978#
const SwRect PrtWithoutHeaderAndFooter() const;
- // OD 2004-05-17 #i28701#
+ // #i28701#
inline bool IsLayoutInProgress() const
{
return mbLayoutInProgress;
diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx
index 888fddf..ab42c62 100644
--- a/sw/source/core/inc/prevwpage.hxx
+++ b/sw/source/core/inc/prevwpage.hxx
@@ -8,10 +8,6 @@
class SwPageFrm;
/** data structure for a preview page in the current preview layout
-
- OD 12.12.2002 #103492# - struct <PrevwPage>
-
- @author OD
*/
struct PrevwPage
{
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index 5c2171c..77986d7 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -40,9 +40,7 @@ class SwAsyncRetrieveInputStreamThread;
/** class to provide creation of a thread to retrieve an input stream given by
an URL and to consume the retrieved input stream.
- OD 2007-01-29 #i73788#
-
- @author OD
+ #i73788#
*/
class SwAsyncRetrieveInputStreamThreadConsumer
{
@@ -52,14 +50,10 @@ class SwAsyncRetrieveInputStreamThreadConsumer
~SwAsyncRetrieveInputStreamThreadConsumer();
/** method to create thread
-
- @author OD
*/
void CreateThread( const String& rURL );
/** method called to provide the retrieved input stream to the thread Consumer
-
- @author OD
*/
void ApplyInputStream(
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
diff --git a/sw/source/core/inc/sortedobjs.hxx b/sw/source/core/inc/sortedobjs.hxx
index e4fe271..621b69b 100644
--- a/sw/source/core/inc/sortedobjs.hxx
+++ b/sw/source/core/inc/sortedobjs.hxx
@@ -52,8 +52,6 @@ class SwAnchoredObject;
- internal anchor order number
If one of the sort criteria attributes of an anchored object changes,
the sorting has to be updated - use method <Update(..)>
-
- @author OD
*/
class SwSortedObjs
{
@@ -70,8 +68,6 @@ class SwSortedObjs
@param _nIndex
input parameter - index of entry, valid value range [0..Count()-1]
-
- @author OD
*/
SwAnchoredObject* operator[]( sal_uInt32 _nIndex ) const;
@@ -84,22 +80,15 @@ class SwSortedObjs
/** method to update the position of the given anchored object in the
sorted list
- OD 2004-07-01
-
- @author OD
-
@return boolean, indicating success of the update.
*/
bool Update( SwAnchoredObject& _rAnchoredObj );
/** Position of object <_rAnchoredObj> in sorted list
- OD 2004-05-07
Returns the number of the list position of object <_rAnchoredObj>.
Returns <Count()>, if object isn't contained in list.
- @author OD
-
@return sal_uInt32
Number of the list position of object <_rAnchoredObj>
*/
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index 21db2cc..3ca4c5c 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -41,10 +41,8 @@ class ThreadManager;
/** class to manage threads in Writer using a <ThreadManager> instance
- OD 2007-04-13 #i73788#
+ #i73788#
Conforms the singleton pattern
-
- @author OD
*/
class SwThreadManager
: private ::boost::noncopyable
@@ -68,14 +66,10 @@ class SwThreadManager
Suspending the starting of further threads is sensible during the
destruction of a Writer document.
-
- @author OD
*/
void SuspendStartingOfThreads();
/** continues the starting of threads after it has been suspended
-
- @author OD
*/
void ResumeStartingOfThreads();
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 32a6321..a88590f 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -41,7 +41,7 @@ namespace objectpositioning
private:
// calculated data for object position
const SwLayoutFrm* mpVertPosOrientFrm;
- // --> OD 2004-06-17 #i26791#
+ // #i26791#
// determine offset to frame anchor position according to the
// positioning alignments
Point maOffsetToFrmAnchorPos;
@@ -55,7 +55,7 @@ namespace objectpositioning
virtual bool IsAnchoredToChar() const;
virtual const SwFrm* ToCharOrientFrm() const;
virtual const SwRect* ToCharRect() const;
- // OD 12.11.2003 #i22341#
+ // #i22341#
virtual SwTwips ToCharTopOfLine() const;
// method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to
@@ -65,7 +65,6 @@ namespace objectpositioning
// *********************************************************************
/** determine frame for horizontal position
- OD 04.08.2003
if the given proposed frame is a content frame, the proposed
frame is returned.
otherwise (given proposed frame is a layout frame),
@@ -73,8 +72,6 @@ namespace objectpositioning
for the first, that the anchor or a follow of the anchor.
If none is found, the proposed frame is returned.
- @author OD
-
@param _pProposedFrm
input parameter - proposed frame for horizontal position
@@ -88,14 +85,10 @@ namespace objectpositioning
virtual ~SwToCntntAnchoredObjectPosition();
/** calculate position of object
-
- @author OD
*/
virtual void CalcPosition();
/** frame, at which the vertical position is oriented at
-
- @author OD
*/
const SwLayoutFrm& GetVertPosOrientFrm() const;
};
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index 9f80010..07ac2aa 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
@@ -39,7 +39,7 @@ namespace objectpositioning
// calculated data for object position type TO_LAYOUT
Point maRelPos;
- // --> OD 2004-06-17 #i26791#
+ // #i26791#
// determine offset to frame anchor position according to the
// positioning alignments
Point maOffsetToFrmAnchorPos;
@@ -49,16 +49,10 @@ namespace objectpositioning
virtual ~SwToLayoutAnchoredObjectPosition();
/** calculate position for object
-
- OD 30.07.2003 #110978#
-
- @author OD
*/
virtual void CalcPosition();
/** calculated relative position for object
-
- @author OD
*/
Point GetRelPos() const;
};
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index c235c2f..e0a63e6 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -31,7 +31,6 @@
#include <vcl/timer.hxx>
#include <tools/color.hxx>
-// OD 25.06.2003 #108784#
#include <svx/svdtypes.hxx>
#include <tools/string.hxx>
@@ -67,7 +66,7 @@ class SwViewImp
friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus.
friend class SwLayIdle;
- // OD 12.12.2002 #103492# - for paint of page preview
+ // for paint of page preview
friend class SwPagePreviewLayout;
ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch
@@ -92,8 +91,6 @@ class SwViewImp
BOOL bFirstPageInvalid :1; //Pointer auf erste Seite ungueltig?
- //BOOL bResetXorVisibility:1; //StartAction/EndAction
- //HMHBOOL bShowHdlPaint :1; //LockPaint/UnlockPaint
BOOL bResetHdlHiddenPaint:1;// -- "" --
BOOL bSmoothUpdate :1; //Meber fuer SmoothScroll
@@ -103,7 +100,6 @@ class SwViewImp
USHORT nRestoreActions ; //Die Anzahl der zu restaurierenden Actions (UNO)
SwRect aSmoothRect;
- // OD 12.12.2002 #103492#
SwPagePreviewLayout* mpPgPrevwLayout;
/**
@@ -140,12 +136,10 @@ private:
/** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
- OD 2005-12-01 #i27138#
+ #i27138#
implementation for wrapper method
<ViewShell::InvalidateAccessibleParaFlowRelation(..)>
- @author OD
-
@param _pFromTxtFrm
input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM
has to be invalidated.
@@ -161,21 +155,17 @@ private:
/** invalidate text selection for paragraphs
- OD 2005-12-12 #i27301#
+ #i27301#
implementation for wrapper method
<ViewShell::InvalidateAccessibleParaTextSelection(..)>
-
- @author OD
*/
void _InvalidateAccessibleParaTextSelection();
/** invalidate attributes for paragraphs and paragraph's characters
- OD 2009-01-06 #i88069#
+ #i88069#
implementation for wrapper method
<ViewShell::InvalidateAccessibleParaAttrs(..)>
-
- @author OD
*/
void _InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm );
@@ -206,15 +196,16 @@ public:
const SdrPageView*GetPageView() const { return pSdrPageView; }
void MakeDrawView();
- // OD 29.08.2002 #102450#
// add 3rd parameter <const Color* pPageBackgrdColor> for setting this
// color as the background color at the outliner of the draw view
// for painting layers <hell> and <heaven>
- // OD 09.12.2002 #103045# - add 4th parameter for the horizontal text
+
+ // add 4th parameter for the horizontal text
// direction of the page in order to set the default horizontal text
// direction at the outliner of the draw view for painting layers <hell>
// and <heaven>.
- // OD 25.06.2003 #108784# - correct type of 1st parameter
+
+ // correct type of 1st parameter
void PaintLayer( const SdrLayerID _nLayerID,
const SwPrtOptions *pPrintData,
const SwRect& _rRect,
@@ -223,8 +214,6 @@ public:
//wird als Link an die DrawEngine uebergeben, entscheidet was wie
//gepaintet wird oder nicht.
- //#110094#-3
- //DECL_LINK( PaintDispatcher, SdrPaintProcRec * );
// Interface Drawing
BOOL IsDragPossible( const Point &rPoint );
@@ -249,10 +238,8 @@ public:
void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;}
USHORT GetRestoreActions() const{return nRestoreActions;}
- // OD 12.12.2002 #103492#
void InitPagePreviewLayout();
- // OD 12.12.2002 #103492#
inline SwPagePreviewLayout* PagePreviewLayout()
{
return mpPgPrevwLayout;
@@ -298,8 +285,7 @@ public:
const SwFlyFrm *pFollow );
// update data for accessible preview
- // OD 15.01.2003 #103492# - change method signature due to new page preview
- // functionality
+ // change method signature due to new page preview functionality
void UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages,
const Fraction& _rScale,
const SwPageFrm* _pSelectedPageFrm,
More information about the Libreoffice-commits
mailing list