[Libreoffice-commits] .: binfilter/bf_svx binfilter/bf_sw
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Feb 8 09:51:49 PST 2011
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 4 -
binfilter/bf_svx/source/svdraw/svx_svdouno.cxx | 1
binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx | 3
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docdraw.cxx | 14 ----
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 3
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 22 +++---
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 8 --
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 4 -
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 9 --
binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx | 20 ++---
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 79 +++++++++--------------
12 files changed, 64 insertions(+), 105 deletions(-)
New commits:
commit eb08d4dffab1613139fe7069b9dfd62396e8a12e
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Mon Feb 7 20:20:59 2011 +0100
Clean-up bogus comments in filter.
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index aa60203..957f695 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -35,7 +35,6 @@
#include "svdopath.hxx"
#include "scene3d.hxx"
-// OD 30.06.2003 #108784#
#include <svdovirt.hxx>
namespace binfilter {
@@ -446,8 +445,7 @@ namespace binfilter {
/*N*/ SdrObjList* pOL=pObj->GetSubList();
/*N*/ if (pOL!=NULL && pOL->GetObjCount()!=0) {
/*N*/ SdrObject* pTmpObj;
-/*N*/ // OD 30.06.2003 #108784# - adjustment hit point for virtual
-/*N*/ // objects.
+/*N*/ // adjustment hit point for virtual objects.
/*N*/ Point aPnt( rPnt );
/*N*/ if ( pObj->ISA(SdrVirtObj) )
/*N*/ {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
index e2f78d2..461b95f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
@@ -198,7 +198,6 @@ namespace binfilter {
/** helper class to restore graphics at <awt::XView> object after <SdrUnoObj::Paint>
- OD 08.05.2003 #109432#
Restoration of graphics necessary to assure that paint on a window
@author OD
diff --git a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
index 15f8d1c..52d9ffc 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
@@ -51,9 +51,6 @@
#include <comcore.hrc> // ResId fuer Abfrage wenn zu Search & Replaces
namespace binfilter {
-
-// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx>
-//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh );
extern void SwCalcPixStatics( OutputDevice *pOut );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 9214cdd..a0cd741 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -787,7 +787,7 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*N*/ delete pPrt;
/*N*/ pPrt = pP;
/*N*/ }
-/*N*/ // OD 05.03.2003 #107870# - first adjust page description, before trigger formatting.
+/*N*/ // first adjust page description, before trigger formatting.
/*N*/ if( bInitPageDesc )
/*N*/ {
/*N*/ // JP 17.04.97: Bug 38924 - falls noch kein Drucker gesetzt war
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
index 98af0e4..e4bdf5a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
@@ -68,7 +68,6 @@
#include <bf_svx/fhgtitem.hxx>
-// OD 26.06.2003 #108784#
#include <bf_svx/svdpagv.hxx>
namespace binfilter {
@@ -86,7 +85,7 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ SwDrawContact* SwDoc::GroupSelection( SdrView& /*rDrawView*/ )
/*N*/ {
- // OD 30.06.2003 #108784# - replace marked 'virtual' drawing objects by
+ // replace marked 'virtual' drawing objects by
// the corresponding 'master' drawing objects.
DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
@@ -188,7 +187,7 @@ namespace binfilter {
/*N*/ else
/*?*/ pSdrPool->FreezeIdRanges();
/*N*/
-/*N*/ // SJ: #95129# set FontHeight pool defaults without changing static SdrEngineDefaults
+/*N*/ // set FontHeight pool defaults without changing static SdrEngineDefaults
/*N*/ aAttrPool.SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT ));
/*N*/
/*N*/ RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create DrawDocument" );
@@ -206,8 +205,7 @@ namespace binfilter {
/*N*/ sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
/*N*/ nControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
/*N*/
-/*N*/ // OD 25.06.2003 #108784# - add invisible layers corresponding to the
-/*N*/ // visible ones.
+/*N*/ // add invisible layers corresponding to the visible ones.
/*N*/ {
/*N*/ sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleHell" ));
/*N*/ nInvisibleHell = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
@@ -244,8 +242,6 @@ namespace binfilter {
/*N*/ }
/** method to determine, if a layer ID belongs to the visible ones.
-
- OD 25.06.2003 #108784#
Note: If given layer ID is unknown, method asserts and returns <false>.
@author OD
@@ -276,8 +272,6 @@ bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId )
}
/** method to determine, if the corresponding visible layer ID for a invisible one.
-
- OD 25.06.2003 #108784#
Note: If given layer ID is a visible one, method returns given layer ID.
Note: If given layer ID is unknown, method returns given layer ID.
@@ -316,8 +310,6 @@ SdrLayerID SwDoc::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisible
}
/** method to determine, if the corresponding invisible layer ID for a visible one.
-
- OD 25.06.2003 #108784#
Note: If given layer ID is a invisible one, method returns given layer ID.
Note: If given layer ID is unknown, method returns given layer ID.
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 1e5b4a4..62e3bae 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1422,7 +1422,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*M*/ delete pFldSortLst;
/*M*/ pFldSortLst = new _SetGetExpFlds( 64, 16 );
/*M*/
-/*M*/ /// OD 09.08.2002 [#101207#,#101216#,#101778#] - consider and unhide sections
+/*M*/ /// consider and unhide sections
/*M*/ /// with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>)
/*M*/ /// notes by OD:
/*M*/ /// eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
@@ -1521,7 +1521,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*M*/ break;
/*M*/
/*M*/ case RES_SETEXPFLD:
-/*M*/ /// OD 04.10.2002 #102894#
/*N*/ /// fields of subtype <string> have also been add
/*N*/ /// for calculation (eGetMode == GETFLD_CALC).
/*N*/ /// Thus, add fields of subtype <string> in all modes
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 90ee344..70bc2dd 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -536,8 +536,8 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ {
/*?*/ SwDrawContact* pContact = (SwDrawContact*)GetUserCall(pObj);
/*?*/
-/*?*/ // OD 27.06.2003 #108784# - consider, that drawing object has
-/*?*/ // no user call. E.g.: a 'virtual' drawing object is disconnected by
+/*?*/ // consider, that drawing object has no user call.
+/*?*/ // E.g.: a 'virtual' drawing object is disconnected by
/*?*/ // the anchor type change of the 'master' drawing object.
/*?*/ // Continue with next selected object and assert, if this isn't excepted.
/*?*/ if ( !pContact )
@@ -551,7 +551,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ continue;
/*?*/ }
/*?*/
-/*?*/ // OD 17.06.2003 #108784# - determine correct 'old' anchor frame,
+/*?*/ // determine correct 'old' anchor frame,
/*?*/ // considering 'virtual' drawing objects.
/*?*/ const SwFrm* pOldAnch = 0L;
/*?*/ if ( pObj->ISA(SwDrawVirtObj) )
@@ -602,7 +602,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ pObj->GetBoundRect().TopRight() :
/*?*/ aPt;
/*?*/
-/*?*/ // OD 18.06.2003 #108784# - allow drawing objects in header/footer
+/*?*/ // allow drawing objects in header/footer
/*?*/ pNewAnch = ::binfilter::FindAnchor( pOldAnch, aNewPoint, false );
/*?*/ if( pNewAnch->IsTxtFrm() && ((SwTxtFrm*)pNewAnch)->IsFollow() )
/*?*/ pNewAnch = ((SwTxtFrm*)pNewAnch)->FindMaster();
@@ -628,8 +628,8 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ Point aPoint( aPt );
/*?*/ aPoint.X() -= 1;
/*?*/ GetRootFrm()->GetCrsrOfst( &aPos, aPoint, &aState );
-/*?*/ // OD 20.06.2003 #108784# - consider that drawing objects
-/*?*/ // can be in header/footer. Thus, <GetFrm()> by left-top-corner
+/*?*/ // consider that drawing objects can be in header/footer.
+/*?*/ // Thus, <GetFrm()> by left-top-corner
/*?*/ pTxtFrm = aPos.nNode.GetNode().
/*?*/ GetCntntNode()->GetFrm( &aPt, 0, FALSE );
/*?*/ }
@@ -691,7 +691,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ }
/*?*/ else // Ankerwechsel
/*?*/ {
-/*?*/ // OD 18.06.2003 #108784# - allow drawing objects in header/footer
+/*?*/ // allow drawing objects in header/footer
/*?*/ pNewAnch = ::binfilter::FindAnchor( pOldAnch, aPt, false );
/*?*/ if( pNewAnch->IsProtected() )
/*?*/ {
@@ -735,8 +735,8 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/
/*?*/ if( bChanges && pNewAnch )
/*?*/ {
-/*?*/ // OD 20.06.2003 #108784# - consider that a 'virtual' drawing
-/*?*/ // object is disconnected from layout, e.g. caused by an anchor
+/*?*/ // consider that a 'virtual' drawing object
+/*?*/ // is disconnected from layout, e.g. caused by an anchor
/*?*/ // type change.
/*?*/ if ( pObj->ISA(SwDrawVirtObj) )
/*?*/ {
@@ -752,8 +752,8 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ // SetAttr() removes the ParaPortion of pNewAnch, which is required by
/*?*/ // GetFrmAnchorPos. Therefore aTmpPoint has to be calculated before
/*?*/ // the call of SetAttr().
-/*?*/ // OD 20.06.2003 #108784# - refine for assertion:
-/*?*/ // consider anchor change from page to something in header/footer
+/*?*/ // refine for assertion: consider anchor
+/*?*/ // change from page to something in header/footer
/*?*/ Point aProposedAnchorPos;
/*?*/ if ( nOld == FLY_PAGE &&
/*?*/ pContact->GetAnchor()->FindFooterOrHeader() )
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index bbb1199..47f3cea 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -399,8 +399,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/
/*N*/ if( pDest->GetAnchor() == rNewAnchor )
/*N*/ {
-/*N*/ // OD 03.07.2003 #108784# - do *not* connect to layout, if
-/*N*/ // a <MakeFrms> will not be called.
+/*N*/ // do *not* connect to layout, if a <MakeFrms> will not be called.
/*N*/ if ( bMakeFrms )
/*N*/ {
/*N*/ pContact->ConnectToLayout( &rNewAnchor );
@@ -453,8 +452,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ else if( bInsInPage )
/*N*/ pPg->InsertObject( pObj );
/*N*/
-/*N*/ // OD 02.07.2003 #108784# - for drawing objects: set layer of cloned object
-/*N*/ // to invisible layer
+/*N*/ // for drawing objects: set layer of cloned object to invisible layer
/*N*/ SdrLayerID nLayerIdForClone = rObj.GetLayer();
/*N*/ if ( !pObj->ISA(SwFlyDrawObj) &&
/*N*/ !pObj->ISA(SwVirtFlyDrawObj) &&
@@ -678,7 +676,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ : &rRg.GetPoint()->nNode;
/*N*/ }
/*N*/
-/*N*/ // OD 24.06.2003 #108784# - allow drawing objects in header/footer, but
+/*N*/ // allow drawing objects in header/footer, but
/*N*/ // control objects aren't allowed in header/footer.
/*N*/ if( pChkIdx &&
/*N*/ ::binfilter::CheckControlLayer( &rDrawObj ) &&
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index ff2b97c..59853d6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -475,8 +475,8 @@ DBG_BF_ASSERT(0, "STRIP");
--------------------------------------------------------------------*/
-// OD 18.03.2003 #106329# - add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc>
-// in order to control, which page description is used, no appropriate one is found.
+// add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> in order to control,
+// which page description is used, no appropriate one is found.
/*--------------------------------------------------------------------
Beschreibung: Seitennummer errechnen und nach dem Formatieren
diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index 1c264b9..99303be 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -54,13 +54,6 @@ namespace binfilter {
#define DEFTEXTSIZE 12
-// OD 25.09.2002 #99739# - insert declaration of global methods <SwAlignRect>
-// and <SwAlignGrtRect>.
-// Methods are implemented in /core/layout/paintfrm.cxx
-// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx>
-//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh );
-//extern void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
-
//Zum asynchronen (erstmaligem) anfordern von Grafiken
@@ -304,7 +297,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*?*/ else if ( pSh->VisArea().IsOver( aRect ) &&
/*?*/ OUTDEV_WINDOW == pSh->GetOut()->GetOutDevType() )
/*?*/ {
-/*?*/ // OD 27.11.2002 #105519# - invalidate instead of painting
+/*?*/ // invalidate instead of painting
/*?*/ pSh->GetWin()->Invalidate( aRect.SVRect() );
/*?*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
index c293c17..a1dc8cd 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
@@ -50,8 +50,7 @@ namespace binfilter {
/*N*/ SwNodeNum aNum;
/*N*/ const SwNodes& rNds;
/*N*/ BYTE nMin, nNewLevel;
-/*N*/ // OD 21.11.2002 #100043# - array to remember, which level numbering
-/*N*/ // has to be started.
+/*N*/ // array to remember, which level numbering has to be started.
/*N*/ bool aStartLevel[ MAXLEVEL ];
/*N*/
/*N*/ _OutlinePara( const SwNodes& rNodes, USHORT nSttPos, BYTE nOld, BYTE nNew );
@@ -66,7 +65,7 @@ namespace binfilter {
/*N*/ register USHORT nO = Count(), nM, nU = 0;
/*N*/ if( nO > 0 )
/*N*/ {
-/*N*/ //JP 17.03.98: aufgrund des Bug 48592 - wo unter anderem nach Undo/Redo
+/*N*/ // aufgrund des Bug 48592 - wo unter anderem nach Undo/Redo
/*N*/ // Nodes aus dem falschen NodesArray im OutlineArray standen,
/*N*/ // jetzt mal einen Check eingebaut.
/*N*/ #ifdef DBG_UTIL
@@ -115,7 +114,7 @@ namespace binfilter {
/*N*/ nMin( Min( nOld, nNew )),
/*N*/ nNewLevel( nNew )
/*N*/ {
-/*N*/ // OD 25.11.2002 #100043# - init <aStartLevel[]> with defaults, only valid
+/*N*/ // init <aStartLevel[]> with defaults, only valid
/*N*/ // if update of outline numbering started at first outline numbering node.
/*N*/ for ( int i = 0; i < MAXLEVEL; ++i)
/*N*/ aStartLevel[i] = true;
@@ -172,8 +171,7 @@ namespace binfilter {
/*N*/ memset( aNum.GetLevelVal() + (aNum.GetLevel()+1), 0,
/*N*/ (MAXLEVEL - (aNum.GetLevel()+1)) * sizeof(aNum.GetLevelVal()[0]) );
/*N*/ }
-/*N*/ // OD 22.11.2002 #100043# - init array <aStartLevel[]>, not starting at
-/*N*/ // first outline numbering node.
+/*N*/ // init array <aStartLevel[]>, not starting at first outline numbering node.
/*N*/ aStartLevel[ pNum->GetLevel() ] = false;
/*N*/ USHORT nHighestLevelFound = pNum->GetLevel();
/*N*/ while ( pNum->GetLevel() > 0 && nSttPos-- )
@@ -226,14 +224,14 @@ namespace binfilter {
/*N*/ }
/*N*/ #endif
/*N*/
-/*N*/ // OD 21.11.2002 #100043# - determine, if level numbering has to be started.
-/*N*/ // OD 09.12.2002 #106070# - correct outline numbering, even for the
-/*N*/ // first heading. Thus, state of <aStartLevel[]> always has to be
+/*N*/ // determine, if level numbering has to be started.
+/*N*/ // correct outline numbering, even for the first heading.
+/*N*/ // Thus, state of <aStartLevel[]> always has to be
/*N*/ // consulted, not only on level change.
/*N*/ if( aStartLevel[ nLevel ] )
/*N*/ {
/*N*/ nSetValue= pOutlRule->Get( nLevel ).GetStart();
-/*N*/ // OD 21.11.2002 #100043# - reset <aStartLevel[nLevel]>
+/*N*/ // reset <aStartLevel[nLevel]>
/*N*/ aStartLevel[ nLevel ] = false;
/*N*/ }
/*N*/ else
@@ -245,7 +243,7 @@ namespace binfilter {
/*N*/ {
/*N*/ memset( aNum.GetLevelVal() + (nLevel+1), 0,
/*N*/ (MAXLEVEL - ( nLevel+1 )) * sizeof(aNum.GetLevelVal()[0]) );
-/*N*/ // OD 22.11.2002 #100043# - all next level numberings have to be started.
+/*N*/ // all next level numberings have to be started.
/*N*/ for ( int i = nLevel+1; i < MAXLEVEL; ++i)
/*N*/ aStartLevel[i] = true;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 0ee7bf1..065ba15 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -62,10 +62,8 @@
#include <editsh.hxx>
#include <docary.hxx>
-// #108784#
#include <bf_svx/xoutx.hxx>
-// OD 18.06.2003 #108784#
#include <algorithm>
namespace binfilter {
@@ -194,8 +192,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-// OD 13.05.2003 #108784# - copied inline-implementation of <GetMaster()> and
-// <SetMaster()>
+// copied inline-implementation of <GetMaster()> and <SetMaster()>
/*N*/ const SdrObject* SwContact::GetMaster() const
/*N*/ {
/*N*/ return pMasterObj;
@@ -289,7 +286,7 @@ namespace binfilter {
/*N*/ //Gruppenobjekte, wenn diese Controls enthalten.
/*N*/ if ( ::binfilter::CheckControlLayer( pObj ) )
/*N*/ {
-/*N*/ // OD 25.06.2003 #108784# - set layer of object to corresponding invisible layer.
+/*N*/ // set layer of object to corresponding invisible layer.
/*N*/ pObj->SetLayer( pToRegisterIn->GetDoc()->GetInvisibleControlsId() );
/*N*/ }
/*N*/ }
@@ -298,14 +295,14 @@ namespace binfilter {
/*N*/ {
/*N*/ DisconnectFromLayout();
/*N*/
-/*N*/ // OD 25.06.2003 #108784# - remove 'master' from drawing page
+/*N*/ // remove 'master' from drawing page
/*N*/ RemoveMasterFromDrawPage();
/*N*/
/*N*/ // remove and destroy 'virtual' drawing objects.
/*N*/ RemoveAllVirtObjs();
/*N*/ }
-// OD 23.06.2003 #108784# - method to create a new 'virtual' drawing object.
+// method to create a new 'virtual' drawing object.
/*N*/ SwDrawVirtObj* SwDrawContact::CreateVirtObj()
/*N*/ {
/*N*/ // determine 'master'
@@ -320,7 +317,7 @@ namespace binfilter {
/*N*/ return pNewDrawVirtObj;
/*N*/ }
-// OD 23.06.2003 #108784# - destroys a given 'virtual' drawing object.
+// destroys a given 'virtual' drawing object.
// side effect: 'virtual' drawing object is removed from data structure
// <maDrawVirtObjs>.
/*N*/ void SwDrawContact::DestroyVirtObj( SwDrawVirtObj* _pVirtObj )
@@ -332,7 +329,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-// OD 16.05.2003 #108784# - add a 'virtual' drawing object to drawing page.
+// add a 'virtual' drawing object to drawing page.
// Use an already created one, which isn't used, or create a new one.
/*N*/ SwDrawVirtObj* SwDrawContact::AddVirtObj()
/*N*/ {
@@ -358,7 +355,7 @@ namespace binfilter {
/*N*/ return pAddedDrawVirtObj;
/*N*/ }
-// OD 16.05.2003 #108784# - remove 'virtual' drawing objects and destroy them.
+// remove 'virtual' drawing objects and destroy them.
/*N*/ void SwDrawContact::RemoveAllVirtObjs()
/*N*/ {
/*N*/ for ( std::list<SwDrawVirtObj*>::iterator aDrawVirtObjsIter = maDrawVirtObjs.begin();
@@ -374,9 +371,9 @@ namespace binfilter {
/*N*/ maDrawVirtObjs.clear();
/*N*/ }
-// OD 16.05.2003 #108784# - overload <SwContact::SetMaster(..)> in order to
+// overload <SwContact::SetMaster(..)> in order to
// assert, if the 'master' drawing object is replaced.
-// OD 10.07.2003 #110742# - replace of master object correctly handled, if
+// replace of master object correctly handled, if
// handled by method <SwDrawContact::ChangeMasterObject(..)>. Thus, assert
// only, if a debug level is given.
/*N*/ void SwDrawContact::SetMaster( SdrObject* pNew )
@@ -387,7 +384,7 @@ namespace binfilter {
/*N*/ SwContact::SetMaster( pNew );
/*N*/ }
-// OD 19.06.2003 #108784# - get drawing object ('master' or 'virtual') by frame.
+// get drawing object ('master' or 'virtual') by frame.
/*N*/ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
/*N*/ {
/*N*/ SdrObject* pRetDrawObj = 0L;
@@ -441,12 +438,11 @@ namespace binfilter {
/*N*/ }
/*N*/ ClrContourCache( pThis->GetMaster() );
/*N*/
-/*N*/ // OD 03.07.2003 #108784# - notify background of all 'virtual' drawing objects
+/*N*/ // snotify background of all 'virtual' drawing objects
/*N*/ pThis->NotifyBackgrdOfAllVirtObjs( pOldBoundRect );
/*N*/ }
/*N*/ }
-// OD 03.07.2003 #108784#
/*N*/ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
/*N*/ {
/*N*/ for ( std::list<SwDrawVirtObj*>::iterator aDrawVirtObjIter = maDrawVirtObjs.begin();
@@ -518,7 +514,7 @@ namespace binfilter {
/*N*/ const Rectangle* pOldBoundRect )
/*N*/ {
/*N*/ BOOL bInCntnt = FLY_IN_CNTNT == GetFmt()->GetAnchor().GetAnchorId();
-/*N*/ /// OD 05.08.2002 #100843# - do *not* notify, if document is destructing
+/*N*/ /// do *not* notify, if document is destructing
/*N*/ BOOL bNotify = !bInCntnt &&
/*N*/ !(GetFmt()->GetDoc()->IsInDtor()) &&
/*N*/ ( SURROUND_THROUGHT != GetFmt()->GetSurround().GetSurround() );
@@ -688,8 +684,7 @@ namespace binfilter {
void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
{
- // OD 16.05.2003 #108784# - remove 'virtual' drawing objects from writer
- // layout and from drawing page
+ // remove 'virtual' drawing objects from writer layout and from drawing page
for ( std::list<SwDrawVirtObj*>::iterator aDisconnectIter = maDrawVirtObjs.begin();
aDisconnectIter != maDrawVirtObjs.end();
++aDisconnectIter )
@@ -713,9 +708,8 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
pView->MarkObj( GetMaster(), pView->GetPageViewPvNum(0), TRUE );
}
- // OD 25.06.2003 #108784# - Instead of removing 'master' object from
- // drawing page, move the 'master' drawing object into the corresponding
- // invisible layer.
+ // Instead of removing 'master' object from drawing page, move
+ // the 'master' drawing object into the corresponding invisible layer.
{
//((SwFrmFmt*)pRegisteredIn)->GetDoc()->GetDrawModel()->GetPage(0)->
// RemoveObject( GetMaster()->GetOrdNum() );
@@ -730,8 +724,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
}
}
-// OD 26.06.2003 #108784# - method to remove 'master' drawing object
-// from drawing page.
+// method to remove 'master' drawing object from drawing page.
void SwDrawContact::RemoveMasterFromDrawPage()
{
if ( GetMaster() )
@@ -745,8 +738,7 @@ void SwDrawContact::RemoveMasterFromDrawPage()
}
}
-// OD 19.06.2003 #108784# - disconnect for a dedicated drawing object -
-// could be 'master' or 'virtual'.
+// disconnect for a dedicated drawing object - could be 'master' or 'virtual'.
// a 'master' drawing object will disconnect a 'virtual' drawing object
// in order to take its place.
/*N*/ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
@@ -816,7 +808,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
return;
}
- // OD 16.05.2003 #108784# - remove 'virtual' drawing objects from writer
+ // remove 'virtual' drawing objects from writer
// layout and from drawing page, and remove 'master' drawing object from
// writer layout - 'master' object will remain in drawing page.
DisconnectFromLayout( false );
@@ -860,9 +852,8 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
{
ClrContourCache( GetMaster() );
}
- // OD 16.05.2003 #108784# - support drawing objects in header/footer,
- // but not control objects:
- // anchor at first found frame the 'master' object and
+ // support drawing objects in header/footer, but not control
+ // objects: anchor at first found frame the 'master' object and
// at the following frames 'virtual' drawing objects.
// Note: method is similar to <SwFlyFrmFmt::MakeFrms(..)>
SwModify *pModify = 0;
@@ -920,12 +911,12 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
if ( !pAnchorFrmOfMaster )
{
- // OD 02.07.2003 #108784# - check, if 'master' drawing
+ // check, if 'master' drawing
// objects is inserted into drawing page. If not,
// assert and insert 'master' drawing object.
if ( !GetMaster()->IsInserted() )
{
- // OD 25.06.2003 #108784# - debug assert
+ // debug assert
ASSERT( false, "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted!?" );
pDrawFrmFmt->GetDoc()->GetDrawModel()->GetPage(0)->
@@ -976,7 +967,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
}
}
-// OD 20.06.2003 #108784# - method in order to correct relative positioning of
+// method in order to correct relative positioning of
// 'virtual' drawing objects, e.g. caused by a <NbcSetAnchorPos(..)> at the
// 'master' drawing object.
void SwDrawContact::CorrectRelativePosOfVirtObjs()
@@ -990,8 +981,8 @@ void SwDrawContact::CorrectRelativePosOfVirtObjs()
}
}
-// OD 20.06.2003 #108784# - correct in-direct movements of the 'virtual'
-// drawing objects, e.g. caused by a <NbcMove(..)> at the 'master' drawing object
+// correct in-direct movements of the 'virtual' drawing objects,
+// e.g. caused by a <NbcMove(..)> at the 'master' drawing object
void SwDrawContact::MoveOffsetOfVirtObjs( const Size& _rMoveSize )
{
for ( std::list<SwDrawVirtObj*>::iterator aDrawVirtObjIter = maDrawVirtObjs.begin();
@@ -1003,7 +994,7 @@ void SwDrawContact::MoveOffsetOfVirtObjs( const Size& _rMoveSize )
}
}
-// OD 26.06.2003 #108784# - invalidate anchor frames of 'virtual' drawing objects.
+// invalidate anchor frames of 'virtual' drawing objects.
// Needed for, e.g., 'as character' anchored drawing objects and a change of the
// 'master' drawing object.
void SwDrawContact::InvalidateAnchorOfVirtObjs()
@@ -1042,9 +1033,8 @@ void SwDrawContact::ChkPage()
pPage : FindPage( GetMaster()->GetBoundRect() );
if ( pPage != pPg )
{
- // OD 27.06.2003 #108784# - if drawing object is anchor in header/footer
- // a change of the page is a dramatic change. Thus, completely re-connect
- // to the layout
+ // if drawing object is anchor in header/footer a change of the page
+ // is a dramatic change. Thus, completely re-connect to the layout
if ( pAnchor && pAnchor->FindFooterOrHeader() )
{
ConnectToLayout();
@@ -1065,7 +1055,7 @@ void SwDrawContact::ChkPage()
|*
|*************************************************************************/
-// OD 10.07.2003 #110742# - Important note:
+// Important note:
// method is called by method <SwDPage::ReplaceObject(..)>, which called its
// corresponding superclass method <FmFormPage::ReplaceObject(..)>.
// Note: 'master' drawing object *has* to be connected to layout (GetAnchor()
@@ -1074,14 +1064,11 @@ void SwDrawContact::ChkPage()
// =============================================================================
/** implementation of class <SwDrawVirtObj>
- OD 14.05.2003 #108784#
-
@author OD
*/
TYPEINIT1(SwDrawVirtObj,SdrVirtObj);
-// #108784#
// implemetation of SwDrawVirtObj
SwDrawVirtObj::SwDrawVirtObj( SdrObject& _rNewObj,
SwDrawContact& _rDrawContact )
@@ -1193,7 +1180,7 @@ bool SwDrawVirtObj::IsConnected() const
return bRetVal;
}
-// OD 19.06.2003 #108784# - adjust the relative postion of the 'virtual'
+// adjust the relative postion of the 'virtual'
// drawing object to the reference object
void SwDrawVirtObj::AdjustRelativePosToReference()
{
@@ -1206,7 +1193,6 @@ void SwDrawVirtObj::AdjustRelativePosToReference()
}
}
-// #108784#
// All AnchorPos influencing methods which shall not change the
// original object positions.
@@ -1451,9 +1437,8 @@ bool SwDrawVirtObj::HasTextEdit() const
return rRefObj.HasTextEdit();
}
-// OD 18.06.2003 #108784# - overloaded 'layer' methods for 'virtual' drawing
-// object to assure, that layer of 'virtual' object is the layer of the referenced
-// object.
+// overloaded 'layer' methods for 'virtual' drawin object to assure,
+// that layer of 'virtual' object is the layer of the referenced object.
// NOTE: member <
SdrLayerID SwDrawVirtObj::GetLayer() const
{
More information about the Libreoffice-commits
mailing list