[Libreoffice-commits] .: sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Feb 8 10:12:49 PST 2011
sw/source/core/docnode/section.cxx | 54 ++++--------
sw/source/core/docnode/swbaslnk.cxx | 7 -
sw/source/core/draw/dcontact.cxx | 153 ++++++++++++------------------------
sw/source/core/draw/dflyobj.cxx | 7 -
sw/source/core/draw/drawdoc.cxx | 6 -
sw/source/core/draw/dview.cxx | 35 ++------
sw/source/core/edit/autofmt.cxx | 13 +--
sw/source/core/edit/edfcol.cxx | 7 -
sw/source/core/edit/edfld.cxx | 8 -
sw/source/core/edit/editsh.cxx | 7 -
sw/source/core/edit/ednumber.cxx | 12 --
sw/source/core/edit/edtab.cxx | 8 -
sw/source/core/edit/edundo.cxx | 12 +-
sw/source/core/fields/chpfld.cxx | 2
sw/source/core/fields/dbfld.cxx | 1
sw/source/core/fields/docufld.cxx | 6 -
sw/source/core/frmedt/fecopy.cxx | 17 ----
sw/source/core/frmedt/fefly1.cxx | 22 +----
sw/source/core/frmedt/feshview.cxx | 44 +++-------
sw/source/core/frmedt/fews.cxx | 34 ++------
sw/source/core/frmedt/tblsel.cxx | 25 ++---
sw/source/core/graphic/grfatr.cxx | 3
sw/source/core/graphic/ndgrf.cxx | 5 -
23 files changed, 169 insertions(+), 319 deletions(-)
New commits:
commit 9fb9a335370a08739fb557bdcb2787f13ed574dc
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Tue Feb 8 08:51:51 2011 +0100
Remove bogus comments in writer.
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index a09de4d..cc567fd 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -132,9 +132,8 @@ SwSectionData::SwSectionData(SwSection const& rSection)
, m_Password(rSection.GetPassword())
, m_bHiddenFlag(rSection.IsHiddenFlag())
, m_bProtectFlag(rSection.IsProtect())
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
, m_bEditInReadonlyFlag(rSection.IsEditInReadonly())
- // <--
, m_bHidden(rSection.IsHidden())
, m_bCondHiddenFlag(true)
, m_bConnectFlag(rSection.IsConnectFlag())
@@ -151,9 +150,8 @@ SwSectionData::SwSectionData(SwSectionData const& rOther)
, m_Password(rOther.m_Password)
, m_bHiddenFlag(rOther.m_bHiddenFlag)
, m_bProtectFlag(rOther.m_bProtectFlag)
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
, m_bEditInReadonlyFlag(rOther.m_bEditInReadonlyFlag)
- // <--
, m_bHidden(rOther.m_bHidden)
, m_bCondHiddenFlag(true)
, m_bConnectFlag(rOther.m_bConnectFlag)
@@ -213,9 +211,8 @@ SwSection::SwSection(
}
m_Data.SetProtectFlag( pParentSect->IsProtectFlag() );
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
m_Data.SetEditInReadonlyFlag( pParentSect->IsEditInReadonlyFlag() );
- // <--
}
if (!m_Data.IsProtectFlag())
@@ -223,12 +220,10 @@ SwSection::SwSection(
m_Data.SetProtectFlag( rFormat.GetProtect().IsCntntProtected() );
}
- // --> FME 2004-06-22 #114856# edit in readonly sections
- if (!m_Data.IsEditInReadonlyFlag())
+ if (!m_Data.IsEditInReadonlyFlag()) // edit in readonly sections
{
m_Data.SetEditInReadonlyFlag( rFormat.GetEditInReadonly().GetValue() );
}
- // <--
}
@@ -373,7 +368,7 @@ bool SwSection::IsProtect() const
: IsProtectFlag();
}
-// --> FME 2004-06-22 #114856# edit in readonly sections
+// edit in readonly sections
bool SwSection::IsEditInReadonly() const
{
SwSectionFmt *const pFmt( GetFmt() );
@@ -382,7 +377,6 @@ bool SwSection::IsEditInReadonly() const
? pFmt->GetEditInReadonly().GetValue()
: IsEditInReadonlyFlag();
}
-// <--
void SwSection::SetHidden(bool const bFlag)
{
@@ -411,7 +405,7 @@ void SwSection::SetProtect(bool const bFlag)
}
}
-// --> FME 2004-06-22 #114856# edit in readonly sections
+// edit in readonly sections
void SwSection::SetEditInReadonly(bool const bFlag)
{
SwSectionFmt *const pFormat( GetFmt() );
@@ -428,7 +422,6 @@ void SwSection::SetEditInReadonly(bool const bFlag)
m_Data.SetEditInReadonlyFlag(bFlag);
}
}
-// <--
void SwSection::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
@@ -451,7 +444,7 @@ void SwSection::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
pOldSet->ClearItem( RES_PROTECT );
}
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // --> edit in readonly sections
if( SFX_ITEM_SET == pNewSet->GetItemState(
RES_EDIT_IN_READONLY, FALSE, &pItem ) )
{
@@ -498,7 +491,7 @@ void SwSection::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
m_Data.SetProtectFlag( bNewFlag );
}
return;
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
case RES_EDIT_IN_READONLY:
if( pNew )
{
@@ -507,7 +500,6 @@ void SwSection::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
m_Data.SetEditInReadonlyFlag( bNewFlag );
}
return;
- // <--
case RES_SECTION_HIDDEN:
m_Data.SetHiddenFlag(true);
@@ -771,11 +763,10 @@ void SwSectionFmt::DelFrms()
}
if( pIdx )
{
- //JP 22.09.98:
//Hint fuer Pagedesc versenden. Das mueste eigntlich das Layout im
//Paste der Frames selbst erledigen, aber das fuehrt dann wiederum
//zu weiteren Folgefehlern, die mit Laufzeitkosten geloest werden
- //muesten. #56977# #55001# #56135#
+ //muesten.
SwNodeIndex aNextNd( *pIdx );
SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, TRUE, FALSE );
if( pCNd )
@@ -832,7 +823,7 @@ void SwSectionFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
pOldSet->ClearItem( RES_PROTECT );
}
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // --> edit in readonly sections
if( SFX_ITEM_SET == pNewSet->GetItemState(
RES_EDIT_IN_READONLY, FALSE, &pItem ) )
{
@@ -886,9 +877,7 @@ void SwSectionFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
case RES_PROTECT:
- // --> FME 2004-06-22 #114856# edit in readonly sections
- case RES_EDIT_IN_READONLY:
- // <--
+ case RES_EDIT_IN_READONLY: // edit in readonly sections
// diese Messages bis zum Ende des Baums durchreichen !
if( GetDepends() )
{
@@ -1071,9 +1060,8 @@ void SwSectionFmt::UpdateParent() // Parent wurde veraendert
SwSectionPtr pSection = 0;
const SvxProtectItem* pProtect(0);
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
const SwFmtEditInReadonly* pEditInReadonly = 0;
- // <--
bool bIsHidden = false;
SwClientIter aIter( *this );
@@ -1089,17 +1077,15 @@ void SwSectionFmt::UpdateParent() // Parent wurde veraendert
{
const SwSectionPtr pPS = GetParentSection();
pProtect = &pPS->GetFmt()->GetProtect();
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
pEditInReadonly = &pPS->GetFmt()->GetEditInReadonly();
- // <--
bIsHidden = pPS->IsHiddenFlag();
}
else
{
pProtect = &GetProtect();
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
pEditInReadonly = &GetEditInReadonly();
- // <--
bIsHidden = pSection->IsHidden();
}
}
@@ -1110,14 +1096,13 @@ void SwSectionFmt::UpdateParent() // Parent wurde veraendert
(SfxPoolItem*)pProtect );
}
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
if (!pEditInReadonly->GetValue() !=
!pSection->IsEditInReadonlyFlag())
{
pLast->Modify( (SfxPoolItem*)pEditInReadonly,
(SfxPoolItem*)pEditInReadonly );
}
- // <--
if( bIsHidden == pSection->IsHiddenFlag() )
{
@@ -1135,17 +1120,15 @@ void SwSectionFmt::UpdateParent() // Parent wurde veraendert
{
const SwSectionPtr pPS = GetParentSection();
pProtect = &pPS->GetFmt()->GetProtect();
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
pEditInReadonly = &pPS->GetFmt()->GetEditInReadonly();
- // <--
bIsHidden = pPS->IsHiddenFlag();
}
else
{
pProtect = &GetProtect();
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
pEditInReadonly = &GetEditInReadonly();
- // <--
bIsHidden = pSection->IsHidden();
}
}
@@ -1710,9 +1693,8 @@ void SwIntrnlSectRefLink::Closed()
aSectionData.SetLinkFileName( aEmptyStr );
aSectionData.SetHidden( false );
aSectionData.SetProtectFlag( false );
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
aSectionData.SetEditInReadonlyFlag( false );
- // <--
aSectionData.SetConnectFlag( false );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index bbe87ba..89093ec 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -72,10 +72,10 @@ SV_IMPL_REF( SwServerObject )
void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
{
- //JP 4.7.2001: call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
+ //call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
// The reason is, that in the SwNoTxtFrames the Graphic
// after a Paint will be swapped out! So all other "behind"
- // them havent't a loaded Graphic. - #86501#
+ // them havent't a loaded Graphic.
rGrfNd.LockModify();
SwClientIter aIter( rGrfNd );
@@ -193,8 +193,7 @@ void SwBaseLink::DataChanged( const String& rMimeType,
// zugreifen zu muessen (sonst erfolgt ein SwapIn!).
if( bGraphicArrived )
{
- // Bug #34735#: immer mit der korrekten Grafik-Size
- // arbeiten
+ // immer mit der korrekten Grafik-Size arbeiten
if( aGrfSz.Height() && aGrfSz.Width() &&
aSz.Height() && aSz.Width() &&
aGrfSz != aSz )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ceb0c9f..fbe933d 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -193,23 +193,19 @@ BOOL IsMarqueeTextObj( const SdrObject& rObj )
SwContact::SwContact( SwFrmFmt *pToRegisterIn ) :
SwClient( pToRegisterIn ),
- // OD 05.09.2003 #112039# - init member <mbInDTOR>
mbInDTOR( false )
{}
SwContact::~SwContact()
{
- // OD 05.09.2003 #112039# - set <mbInDTOR>
SetInDTOR();
}
-// OD 05.09.2003 #112039# - accessor for member <mbInDTOR>
bool SwContact::IsInDTOR() const
{
return mbInDTOR;
}
-// OD 05.09.2003 #112039# - accessor to set member <mbInDTOR>
void SwContact::SetInDTOR()
{
mbInDTOR = true;
@@ -217,8 +213,6 @@ void SwContact::SetInDTOR()
/** method to move drawing object to corresponding visible layer
- OD 21.08.2003 #i18447#
-
@author OD
*/
void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
@@ -382,7 +376,7 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
}
// -------------------------------------------------------------------------
-// OD 2004-01-16 #110582# - some virtual helper methods for information
+// some virtual helper methods for information
// about the object (Writer fly frame resp. drawing object)
const SwIndex& SwContact::GetCntntAnchorIndex() const
@@ -392,8 +386,6 @@ const SwIndex& SwContact::GetCntntAnchorIndex() const
/** get minimum order number of anchored objects handled by with contact
- OD 2004-08-24 #110810#
-
@author
*/
sal_uInt32 SwContact::GetMinOrdNum() const
@@ -422,8 +414,6 @@ sal_uInt32 SwContact::GetMinOrdNum() const
/** get maximum order number of anchored objects handled by with contact
- OD 2004-08-24 #110810#
-
@author
*/
sal_uInt32 SwContact::GetMaxOrdNum() const
@@ -621,7 +611,7 @@ void SwFlyDrawContact::Modify( SfxPoolItem *, SfxPoolItem * )
{
}
-// OD 2004-01-16 #110582# - override method to control Writer fly frames,
+// override method to control Writer fly frames,
// which are linked, and to assure that all objects anchored at/inside the
// Writer fly frame are also made visible.
void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
@@ -660,7 +650,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
SwContact::MoveObjToVisibleLayer( _pDrawObj );
}
-// OD 2004-01-16 #110582# - override method to control Writer fly frames,
+// override method to control Writer fly frames,
// which are linked, and to assure that all objects anchored at/inside the
// Writer fly frame are also made invisible.
void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
@@ -695,8 +685,6 @@ void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
/** get data collection of anchored objects, handled by with contact
- OD 2004-08-23 #110810#
-
@author
*/
void SwFlyDrawContact::GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const
@@ -740,19 +728,16 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
SwContact( pToRegisterIn ),
maAnchoredDrawObj(),
mbMasterObjCleared( false ),
- // OD 10.10.2003 #112299#
mbDisconnectInProgress( false ),
- // --> OD 2006-01-18 #129959#
mbUserCallActive( false ),
// Note: value of <meEventTypeOfCurrentUserCall> isn't of relevance, because
// <mbUserCallActive> is FALSE.
meEventTypeOfCurrentUserCall( SDRUSERCALL_MOVEONLY )
- // <--
{
// clear vector containing 'virtual' drawing objects.
maDrawVirtObjs.clear();
- // --> OD 2004-09-22 #i33909# - assure, that drawing object is inserted
+ // --> #i33909# - assure, that drawing object is inserted
// in the drawing page.
if ( !pObj->IsInserted() )
{
@@ -765,27 +750,26 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
//Gruppenobjekte, wenn diese Controls enthalten.
if ( ::CheckControlLayer( pObj ) )
{
- // OD 25.06.2003 #108784# - set layer of object to corresponding invisible layer.
+ // set layer of object to corresponding invisible layer.
pObj->SetLayer( pToRegisterIn->getIDocumentDrawModelAccess()->GetInvisibleControlsId() );
}
- // OD 2004-03-29 #i26791#
+ // #i26791#
pObj->SetUserCall( this );
maAnchoredDrawObj.SetDrawObj( *pObj );
// if there already exists an SwXShape for the object, ensure it knows about us, and the SdrObject
- // FS 2009-04-07 #i99056#
+ // #i99056#
SwXShape::AddExistingShapeToFmt( *pObj );
}
SwDrawContact::~SwDrawContact()
{
- // OD 05.09.2003 #112039# - set <mbInDTOR>
SetInDTOR();
DisconnectFromLayout();
- // OD 25.06.2003 #108784# - remove 'master' from drawing page
+ // remove 'master' from drawing page
RemoveMasterFromDrawPage();
// remove and destroy 'virtual' drawing objects.
@@ -880,9 +864,9 @@ SdrObject* SwDrawContact::GetMaster()
: 0L;
}
-// 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.
void SwDrawContact::SetMaster( SdrObject* _pNewMaster )
@@ -942,7 +926,7 @@ SwFrm* SwDrawContact::GetAnchorFrm( SdrObject* _pDrawObj )
return pAnchorFrm;
}
-// OD 23.06.2003 #108784# - method to create a new 'virtual' drawing object.
+// method to create a new 'virtual' drawing object.
SwDrawVirtObj* SwDrawContact::CreateVirtObj()
{
// determine 'master'
@@ -957,7 +941,7 @@ SwDrawVirtObj* SwDrawContact::CreateVirtObj()
return pNewDrawVirtObj;
}
-// 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>.
void SwDrawContact::DestroyVirtObj( SwDrawVirtObj* _pVirtObj )
@@ -969,7 +953,7 @@ void SwDrawContact::DestroyVirtObj( SwDrawVirtObj* _pVirtObj )
}
}
-// 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.
SwDrawVirtObj* SwDrawContact::AddVirtObj()
{
@@ -995,7 +979,7 @@ SwDrawVirtObj* SwDrawContact::AddVirtObj()
return pAddedDrawVirtObj;
}
-// OD 16.05.2003 #108784# - remove 'virtual' drawing objects and destroy them.
+// remove 'virtual' drawing objects and destroy them.
void SwDrawContact::RemoveAllVirtObjs()
{
for ( std::list<SwDrawVirtObj*>::iterator aDrawVirtObjsIter = maDrawVirtObjs.begin();
@@ -1045,12 +1029,12 @@ bool SwDrawContact::VirtObjAnchoredAtFrmPred::operator() ( const SwDrawVirtObj*
return ( pObjAnchorFrm == mpAnchorFrm );
}
-// OD 19.06.2003 #108784# - get drawing object ('master' or 'virtual') by frame.
+// get drawing object ('master' or 'virtual') by frame.
SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
{
SdrObject* pRetDrawObj = 0L;
- // OD 2004-04-14 #i26791# - compare master frames instead of direct frames
+ // #i26791# - compare master frames instead of direct frames
const SwFrm* pProposedAnchorFrm = &_rAnchorFrm;
if ( pProposedAnchorFrm->IsCntntFrm() )
{
@@ -1100,7 +1084,6 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
|*
|*************************************************************************/
-// OD 03.07.2003 #108784#
void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
{
for ( std::list<SwDrawVirtObj*>::iterator aDrawVirtObjIter = maDrawVirtObjs.begin();
@@ -1110,9 +1093,8 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
SwDrawVirtObj* pDrawVirtObj = (*aDrawVirtObjIter);
if ( pDrawVirtObj->GetAnchorFrm() )
{
- // --> OD 2004-10-21 #i34640# - determine correct page frame
+ // #i34640# - determine correct page frame
SwPageFrm* pPage = pDrawVirtObj->AnchoredObj()->FindPageFrmOfAnchor();
- // <--
if( pOldBoundRect && pPage )
{
SwRect aOldRect( *pOldBoundRect );
@@ -1121,14 +1103,11 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
::Notify_Background( pDrawVirtObj, pPage,
aOldRect, PREP_FLY_LEAVE,TRUE);
}
- // --> OD 2004-10-21 #i34640# - include spacing for wrapping
+ // #i34640# - include spacing for wrapping
SwRect aRect( pDrawVirtObj->GetAnchoredObj()->GetObjRectWithSpaces() );
- // <--
if( aRect.HasArea() )
{
- // --> OD 2004-10-21 #i34640# - simplify
SwPageFrm* pPg = (SwPageFrm*)::FindPage( aRect, pPage );
- // <--
if ( pPg )
::Notify_Background( pDrawVirtObj, pPg, aRect,
PREP_FLY_ARRIVE, TRUE );
@@ -1225,7 +1204,6 @@ void SwDrawContact::Changed( const SdrObject& rObj,
pDoc->GetRootFrm()->EndAllAction();
}
-// --> OD 2006-01-18 #129959#
// helper class for method <SwDrawContact::_Changed(..)> for handling nested
// <SdrObjUserCall> events
class NestedUserCallHdl
@@ -1306,7 +1284,6 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
SdrUserCallType eType,
const Rectangle* pOldBoundRect )
{
- // --> OD 2006-01-18 #129959#
// suppress handling of nested <SdrObjUserCall> events
NestedUserCallHdl aNestedUserCallHdl( this, eType );
if ( aNestedUserCallHdl.IsNestedUserCall() )
@@ -1314,14 +1291,12 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
aNestedUserCallHdl.AssertNestedUserCall();
return;
}
- // <--
- // OD 05.08.2002 #100843# - do *not* notify, if document is destructing
+ // do *not* notify, if document is destructing
// --> OD 2004-10-21 #i35912# - do *not* notify for as-character anchored
// drawing objects.
// --> OD 2004-11-11 #i35007#
// improvement: determine as-character anchored object flag only once.
const bool bAnchoredAsChar = ObjAnchoredAsChar();
- // <--
const bool bNotify = !(GetFmt()->GetDoc()->IsInDtor()) &&
( SURROUND_THROUGHT != GetFmt()->GetSurround().GetSurround() ) &&
!bAnchoredAsChar;
@@ -1333,7 +1308,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
if ( bNotify )
{
lcl_NotifyBackgroundOfObj( *this, rObj, pOldBoundRect );
- // --> OD 2004-10-27 #i36181# - background of 'virtual'
+ // --> #i36181# - background of 'virtual'
// drawing objects have also been notified.
NotifyBackgrdOfAllVirtObjs( pOldBoundRect );
// <--
@@ -1341,14 +1316,13 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
DisconnectFromLayout( false );
SetMaster( NULL );
delete this;
- // --> FME 2006-07-12 #i65784# Prevent memory corruption
+ // --> #i65784# Prevent memory corruption
aNestedUserCallHdl.DrawContactDeleted();
// <--
break;
}
case SDRUSERCALL_INSERTED:
{
- // OD 10.10.2003 #112299#
if ( mbDisconnectInProgress )
{
OSL_ENSURE( false,
@@ -1376,7 +1350,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
case SDRUSERCALL_CHILD_INSERTED :
case SDRUSERCALL_CHILD_REMOVED :
{
- // --> AW, OD 2010-09-13 #i113730#
+ // --> #i113730#
// force layer of controls for group objects containing control objects
if(dynamic_cast< SdrObjGroup* >(maAnchoredDrawObj.DrawObj()))
{
@@ -1581,7 +1555,6 @@ namespace
void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
{
- // OD 10.10.2003 #112299#
OSL_ENSURE( !mbDisconnectInProgress,
"<SwDrawContact::Modify(..)> called during disconnection.");
@@ -1590,11 +1563,11 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
if ( pNewAnchorFmt )
{
- // JP 10.04.95: nicht auf ein Reset Anchor reagieren !!!!!
+ // nicht auf ein Reset Anchor reagieren !!!!!
if ( SFX_ITEM_SET ==
GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, FALSE ) )
{
- // OD 10.10.2003 #112299# - no connect to layout during disconnection
+ // no connect to layout during disconnection
if ( !mbDisconnectInProgress )
{
// determine old object retangle of 'master' drawing object
@@ -1603,7 +1576,7 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
Rectangle aOldRect;
if ( GetAnchorFrm() )
{
- // --> OD 2004-10-27 #i36181# - include spacing in object
+ // --> #i36181# - include spacing in object
// rectangle for notification.
aOldRect = maAnchoredDrawObj.GetObjRectWithSpaces().SVRect();
pOldRect = &aOldRect;
@@ -1621,7 +1594,7 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
OSL_ENSURE( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" );
if ( maAnchoredDrawObj.DrawObj() )
{
- // --> OD 2009-07-10 #i102752#
+ // --> #i102752#
// assure that a ShapePropertyChangeNotifier exists
maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( ::svx::eTextShapeAnchorType );
// <--
@@ -1632,12 +1605,11 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
else
DisconnectFromLayout();
}
- // --> OD 2006-03-17 #i62875# - revised fix for issue #124157#
- // no further notification, if not connected to Writer layout
+ // --> #i62875# - no further notification, if not connected to Writer layout
else if ( maAnchoredDrawObj.GetAnchorFrm() &&
maAnchoredDrawObj.GetDrawObj()->GetUserCall() )
{
- // --> OD 2004-07-01 #i28701# - on change of wrapping style, hell|heaven layer,
+ // --> #i28701# - on change of wrapping style, hell|heaven layer,
// or wrapping style influence an update of the <SwSortedObjs> list,
// the drawing object is registered in, has to be performed. This is triggered
// by the 1st parameter of method call <_InvalidateObjs(..)>.
@@ -1746,10 +1718,9 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList )
void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
{
- // OD 10.10.2003 #112299#
mbDisconnectInProgress = true;
- // --> OD 2004-10-27 #i36181# - notify background of drawing object
+ // --> #i36181# - notify background of drawing object
if ( _bMoveMasterToInvisibleLayer &&
!(GetFmt()->GetDoc()->IsInDtor()) &&
GetAnchorFrm() )
@@ -1760,7 +1731,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
}
// <--
- // OD 16.05.2003 #108784# - remove 'virtual' drawing objects from writer
+ // remove 'virtual' drawing objects from writer
// layout and from drawing page
for ( std::list<SwDrawVirtObj*>::iterator aDisconnectIter = maDrawVirtObjs.begin();
aDisconnectIter != maDrawVirtObjs.end();
@@ -1785,24 +1756,21 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
pView->MarkObj( GetMaster(), pView->GetSdrPageView(), 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)->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
// RemoveObject( GetMaster()->GetOrdNum() );
- // OD 21.08.2003 #i18447# - in order to consider group object correct
+ // #i18447# - in order to consider group object correct
// use new method <SwDrawContact::MoveObjToInvisibleLayer(..)>
MoveObjToInvisibleLayer( GetMaster() );
}
}
- // OD 10.10.2003 #112299#
mbDisconnectInProgress = false;
}
-// 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() )
@@ -1816,11 +1784,10 @@ 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.
-// OD 13.10.2003 #i19919# - no special case, if drawing object isn't in
+// #i19919# - no special case, if drawing object isn't in
// page header/footer, in order to get drawing objects in repeating table headers
// also working.
void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
@@ -1881,8 +1848,7 @@ SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
{
- // OD 10.10.2003 #112299# - *no* connect to layout during disconnection from
- // layout.
+ // *no* connect to layout during disconnection from layout.
if ( mbDisconnectInProgress )
{
OSL_ENSURE( false,
@@ -1890,7 +1856,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
return;
}
- // --> OD 2004-09-22 #i33909# - *no* connect to layout, if 'master' drawing
+ // --> #i33909# - *no* connect to layout, if 'master' drawing
// object isn't inserted in the drawing page
if ( !GetMaster()->IsInserted() )
{
@@ -1907,7 +1873,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 );
@@ -1948,7 +1914,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
{
ClrContourCache( GetMaster() );
}
- // OD 16.05.2003 #108784# - support drawing objects in header/footer,
+ // 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.
@@ -2017,8 +1983,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
"<SwDrawContact::ConnectToLayout(..)> - missing fly frame -> crash." );
}
- // OD 2004-01-20 #110582# - find correct follow for
- // as character anchored objects.
+ // find correct follow for as character anchored objects
if ((pAnch->GetAnchorId() == FLY_AS_CHAR) &&
pFrm->IsTxtFrm() )
{
@@ -2061,12 +2026,12 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
if ( GetAnchorFrm() )
{
::setContextWritingMode( maAnchoredDrawObj.DrawObj(), GetAnchorFrm() );
- // OD 2004-04-01 #i26791# - invalidate objects instead of direct positioning
+ // #i26791# - invalidate objects instead of direct positioning
_InvalidateObjs();
}
}
-// OD 27.06.2003 #108784# - insert 'master' drawing object into drawing page
+// insert 'master' drawing object into drawing page
void SwDrawContact::InsertMasterIntoDrawPage()
{
if ( !GetMaster()->IsInserted() )
@@ -2085,7 +2050,7 @@ void SwDrawContact::InsertMasterIntoDrawPage()
SwPageFrm* SwDrawContact::FindPage( const SwRect &rRect )
{
- // --> OD 2004-07-01 #i28701# - use method <GetPageFrm()>
+ // --> #i28701# - use method <GetPageFrm()>
SwPageFrm* pPg = GetPageFrm();
if ( !pPg && GetAnchorFrm() )
pPg = GetAnchorFrm()->FindPageFrm();
@@ -2096,7 +2061,6 @@ SwPageFrm* SwDrawContact::FindPage( const SwRect &rRect )
void SwDrawContact::ChkPage()
{
- // OD 10.10.2003 #112299#
if ( mbDisconnectInProgress )
{
OSL_ENSURE( false,
@@ -2104,16 +2068,15 @@ void SwDrawContact::ChkPage()
return;
}
- // --> OD 2004-07-01 #i28701#
+ // --> #i28701#
SwPageFrm* pPg = ( maAnchoredDrawObj.GetAnchorFrm() &&
maAnchoredDrawObj.GetAnchorFrm()->IsPageFrm() )
? GetPageFrm()
: FindPage( GetMaster()->GetCurrentBoundRect() );
if ( GetPageFrm() != 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 ( maAnchoredDrawObj.GetAnchorFrm() &&
maAnchoredDrawObj.GetAnchorFrm()->FindFooterOrHeader() )
{
@@ -2121,7 +2084,7 @@ void SwDrawContact::ChkPage()
}
else
{
- // --> OD 2004-07-01 #i28701# - use methods <GetPageFrm()> and <SetPageFrm>
+ // --> #i28701# - use methods <GetPageFrm()> and <SetPageFrm>
if ( GetPageFrm() )
GetPageFrm()->RemoveDrawObjFromPage( maAnchoredDrawObj );
pPg->AppendDrawObjToPage( maAnchoredDrawObj );
@@ -2135,7 +2098,7 @@ void SwDrawContact::ChkPage()
|* SwDrawContact::ChangeMasterObject()
|*
|*************************************************************************/
-// 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 triggered
@@ -2143,7 +2106,7 @@ void SwDrawContact::ChkPage()
void SwDrawContact::ChangeMasterObject( SdrObject *pNewMaster )
{
DisconnectFromLayout( false );
- // OD 10.07.2003 #110742# - consider 'virtual' drawing objects
+ // consider 'virtual' drawing objects
RemoveAllVirtObjs();
GetMaster()->SetUserCall( 0 );
@@ -2153,12 +2116,7 @@ void SwDrawContact::ChangeMasterObject( SdrObject *pNewMaster )
_InvalidateObjs();
}
-/** get data collection of anchored objects, handled by with contact
-
- OD 2004-08-23 #110810#
-
- @author
-*/
+// get data collection of anchored objects, handled by with contact
void SwDrawContact::GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const
{
_roAnchoredObjs.push_back( const_cast<SwAnchoredDrawObject*>(&maAnchoredDrawObj) );
@@ -2362,8 +2320,6 @@ namespace sdr
// =============================================================================
/** implementation of class <SwDrawVirtObj>
- OD 14.05.2003 #108784#
-
@author OD
*/
@@ -2374,7 +2330,6 @@ sdr::contact::ViewContact* SwDrawVirtObj::CreateObjectSpecificViewContact()
return new sdr::contact::VCOfDrawVirtObj(*this);
}
-// #108784#
// implemetation of SwDrawVirtObj
SwDrawVirtObj::SwDrawVirtObj( SdrObject& _rNewObj,
SwDrawContact& _rDrawContact )
@@ -2742,15 +2697,13 @@ void SwDrawVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
SetRectsDirty();
}
-// #108784#
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' drawing object to assure,
+// that layer of 'virtual' object is the layer of the referenced object.
SdrLayerID SwDrawVirtObj::GetLayer() const
{
return GetReferencedObj().GetLayer();
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index c417c0e..aecabd9 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -59,9 +59,7 @@
using namespace ::com::sun::star;
-// --> OD 2004-11-22 #117958#
#include <svx/sdr/properties/defaultproperties.hxx>
-// <--
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
@@ -127,14 +125,13 @@ namespace sdr
sdr::properties::BaseProperties* SwFlyDrawObj::CreateObjectSpecificProperties()
{
- // --> OD 2004-11-22 #117958# - create default properties
+ // create default properties
return new sdr::properties::DefaultProperties(*this);
- // <--
}
sdr::contact::ViewContact* SwFlyDrawObj::CreateObjectSpecificViewContact()
{
- // #i95264# needs an own VC since createViewIndependentPrimitive2DSequence()
+ // needs an own VC since createViewIndependentPrimitive2DSequence()
// is called when RecalcBoundRect() is used
return new sdr::contact::VCOfSwFlyDrawObj(*this);
}
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 126ab2c..c1c568c 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -127,7 +127,7 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
}
SetForbiddenCharsTable( pD->getForbiddenCharacterTable() );
- // #87795# Implementation for asian compression
+ // Implementation for asian compression
SetCharCompressType( static_cast<UINT16>(pD->getCharacterCompressionType() ));
}
@@ -142,9 +142,7 @@ SwDrawDocument::~SwDrawDocument()
{
Broadcast(SdrHint(HINT_MODELCLEARED));
- // #116168#
ClearModel(sal_True);
- //Clear();
}
/*************************************************************************
@@ -212,7 +210,6 @@ SdrLayerID SwDrawDocument::GetControlExportLayerId( const SdrObject & ) const
return (SdrLayerID)pDoc->GetHeavenId();
}
-// --> OD 2006-03-01 #b6382898#
uno::Reference< uno::XInterface > SwDrawDocument::createUnoModel()
{
@@ -234,6 +231,5 @@ uno::Reference< uno::XInterface > SwDrawDocument::createUnoModel()
return xModel;
}
-// <--
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 69f485f..f00b136 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -235,8 +235,7 @@ void SwDrawView::AddCustomHdl()
return;
SdrObject *pObj = rMrkList.GetMark(0)->GetMarkedSdrObj();
- // --> OD 2006-11-06 #130889# - make code robust
-// const SwFmtAnchor &rAnchor = ::FindFrmFmt(pObj)->GetAnchor();
+ // make code robust
SwFrmFmt* pFrmFmt( ::FindFrmFmt( pObj ) );
if ( !pFrmFmt )
{
@@ -244,7 +243,6 @@ void SwDrawView::AddCustomHdl()
return;
}
const SwFmtAnchor &rAnchor = pFrmFmt->GetAnchor();
- // <--
if (FLY_AS_CHAR == rAnchor.GetAnchorId())
return;
@@ -380,8 +378,6 @@ inline SdrObject *lcl_FindParent( SdrObject *pObj )
/** determine maximal order number for a 'child' object of given 'parent' object
- OD 2004-08-20 #110810#
-
@author OD
*/
sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
@@ -418,8 +414,6 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
/** method to move 'repeated' objects of the given moved object to the
according level
- OD 2004-08-23 #110810#
-
@author OD
*/
void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
@@ -505,16 +499,15 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
}
}
-// --> OD 2004-08-20 #110810# - adjustment and re-factoring of method
+// --> adjustment and re-factoring of method
void SwDrawView::ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
ULONG nNewPos )
{
- // --> OD 2004-08-17 #110810# - nothing to do for group members
+ // nothing to do for group members
if ( pObj->GetUpGroup() )
{
return;
}
- // <--
// determine drawing page and assure that the order numbers are correct.
SdrPage* pDrawPage = GetModel()->GetPage( 0 );
@@ -788,16 +781,14 @@ const SwFrm* SwDrawView::CalcAnchor()
else
{
SwDrawContact *pC = (SwDrawContact*)GetUserCall(pObj);
- // OD 17.06.2003 #108784# - determine correct anchor position for
- // 'virtual' drawing objects.
- // OD 2004-03-25 #i26791#
+ // determine correct anchor position for 'virtual' drawing objects.
+ // #i26791#
pAnch = pC->GetAnchorFrm( pObj );
if( !pAnch )
{
pC->ConnectToLayout();
- // OD 17.06.2003 #108784# - determine correct anchor position for
- // 'virtual' drawing objects.
- // OD 2004-03-25 #i26791#
+ // determine correct anchor position for 'virtual' drawing objects.
+ // #i26791#
pAnch = pC->GetAnchorFrm( pObj );
}
aMyRect = pObj->GetSnapRect();
@@ -824,7 +815,7 @@ const SwFrm* SwDrawView::CalcAnchor()
{
if ( pAnch->IsCntntFrm() )
{
- // OD 26.06.2003 #108784# - allow drawing objects in header/footer,
+ // allow drawing objects in header/footer,
// but exclude control objects.
bool bBodyOnly = CheckControlLayer( pObj );
pAnch = ::FindAnchor( (SwCntntFrm*)pAnch, aPt, bBodyOnly );
@@ -952,9 +943,8 @@ void SwDrawView::CheckPossibilities()
uno::Reference < embed::XEmbeddedObject > xObj = pNd->GetOLEObj().GetOleRef();
if ( xObj.is() )
{
- // --> OD 2004-08-16 #110810# - improvement for
- // the future, when more than one Writer fly frame
- // can be selected.
+ // --> improvement for the future, when more
+ // than one Writer fly frame can be selected.
// TODO/LATER: retrieve Aspect - from where?!
bSzProtect |= ( embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ) ) ? TRUE : FALSE;
@@ -995,8 +985,6 @@ void SwDrawView::CheckPossibilities()
/** replace marked <SwDrawVirtObj>-objects by its reference object for delete
marked objects.
- OD 18.06.2003 #108784#
-
@author OD
*/
void SwDrawView::ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView )
@@ -1046,8 +1034,7 @@ void SwDrawView::DeleteMarked()
if ( pDoc->GetRootFrm() )
pDoc->GetRootFrm()->StartAllAction();
pDoc->StartUndo(UNDO_EMPTY, NULL);
- // OD 18.06.2003 #108784# - replace marked <SwDrawVirtObj>-objects by its
- // reference objects.
+ // replace marked <SwDrawVirtObj>-objects by its reference objects.
{
SdrPageView* pDrawPageView = rImp.GetPageView();
if ( pDrawPageView )
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 43872bf..e83dfa0 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2248,15 +2248,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
eStat = READ_NEXT_PARA;
while( !bEnde )
{
- // #95884# limit redline array size to prevent overflow and to conserve
- // memory
+ // limit redline array size to prevent overflow and to conserve memory
if( pDoc->HasTooManyUndos() )
{
DBG_ASSERT( bUndoState, "undo overflow without undo?" );
//ask user
- short nResult = m_nActionWhileAutoformatUndoBufferOverflow; // TODO: #102007# read the last decision of the user from configuration
- if(m_bAskForCancelUndoWhileBufferOverflow) // #102007# TODO: read the last decision of the user from configuration
+ short nResult = m_nActionWhileAutoformatUndoBufferOverflow; // TODO: read the last decision of the user from configuration
+ if(m_bAskForCancelUndoWhileBufferOverflow) // TODO: read the last decision of the user from configuration
{
Window* pParent = pEditShell?pEditShell->GetWin():NULL;
WarningBox aWarning( pParent,SW_RES(MSG_DISABLE_UNDO_QUESTION));
@@ -2266,8 +2265,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
nResult = aWarning.Execute();
m_bAskForCancelUndoWhileBufferOverflow = !aWarning.GetCheckBoxState();
m_nActionWhileAutoformatUndoBufferOverflow = nResult;
- // TODO: #102007# store m_bAskForCancelUndoWhileBufferOverflow in configuration
- // TODO: #102007# store m_nActionWhileAutoformatUndoBufferOverflow in configuration
+ // TODO: store m_bAskForCancelUndoWhileBufferOverflow in configuration
+ // TODO: store m_nActionWhileAutoformatUndoBufferOverflow in configuration
}
DBG_ASSERT( (nResult == RET_YES) || (nResult == RET_CANCEL) || (nResult == RET_NO),
@@ -2289,7 +2288,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
//cancel autoformatting and undo changes
eStat = IS_ENDE;
- // TODO: #102004# undo changes
+ // TODO: undo changes
}
}
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 7194e39..d20061d 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -38,9 +38,7 @@
#include <ndtxt.hxx>
#include <paratr.hxx>
#include <fmtpdsc.hxx>
-// --> FME 2004-06-29 #114856# Formular view
-#include <viewopt.hxx>
-// <--
+#include <viewopt.hxx> // Formular view
#include <SwRewriter.hxx>
#include <undobj.hxx>
#include <swundo.hxx>
@@ -82,9 +80,8 @@ void SwEditShell::SetTxtFmtColl( SwTxtFmtColl *pFmt,
FOREACHPAM_START(this)
if( !PCURCRSR->HasReadonlySel(
- // --> FME 2004-06-29 #114856# Formular view
+ // Formular view
GetViewOptions()->IsFormView() ) )
- // <--
GetDoc()->SetTxtFmtColl( *PCURCRSR, pLocal, true, bResetListAttrs );
FOREACHPAM_END()
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index f946235..a077489 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -301,7 +301,7 @@ SwField* SwEditShell::GetCurFld() const
SwTxtFld *pTxtFld = GetDocTxtFld( pCrsr->Start() );
SwField *pCurFld = NULL;
- /* #108536# Field was only recognized if no selection was
+ /* Field was only recognized if no selection was
present. Now it is recognized if either the cursor is in the
field or the selection spans exactly over the field. */
if( pTxtFld &&
@@ -320,7 +320,7 @@ SwField* SwEditShell::GetCurFld() const
}
- /* #108536# removed handling of multi-selections */
+ /* removed handling of multi-selections */
return pCurFld;
}
@@ -383,7 +383,7 @@ void SwEditShell::UpdateFlds( SwField &rFld )
pTxtFld = lcl_FindInputFld( GetDoc(), rFld);
if (pTxtFld != 0)
- GetDoc()->UpdateFld(pTxtFld, rFld, pMsgHnt, TRUE); // #111840#
+ GetDoc()->UpdateFld(pTxtFld, rFld, pMsgHnt, TRUE);
}
// bOkay (statt return wg. EndAllAction) wird FALSE,
@@ -430,7 +430,7 @@ void SwEditShell::UpdateFlds( SwField &rFld )
bOkay = FALSE;
bTblSelBreak = GetDoc()->UpdateFld(pTxtFld, rFld,
- pMsgHnt, FALSE); // #111840#
+ pMsgHnt, FALSE);
}
// Der Suchbereich wird um den gefundenen Bereich
// verkuerzt.
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 62dc718..f3c7cf6 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -262,16 +262,14 @@ SwGrfNode * SwEditShell::_GetGrfNode() const
* oder auf die gleiche Graphic zeigt)
******************************************************************************/
-// --> OD 2005-02-09 #119353# - robust
const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
{
SwGrfNode* pGrfNode = _GetGrfNode();
- // --> OD 2005-02-09 #119353# - robust
const Graphic* pGrf( 0L );
if ( pGrfNode )
{
pGrf = &(pGrfNode->GetGrf());
- // --> OD 2007-03-01 #i73788#
+ // --> #i73788#
// no load of linked graphic, if its not needed now (bWait = FALSE).
if ( bWait )
{
@@ -312,13 +310,10 @@ BOOL SwEditShell::IsGrfSwapOut( BOOL bOnlyLinked ) const
: pGrfNode->GetGrfObj().IsSwappedOut());
}
-// --> OD 2005-02-09 #119353# - robust
const GraphicObject* SwEditShell::GetGraphicObj() const
{
SwGrfNode* pGrfNode = _GetGrfNode();
- // --> OD 2005-02-09 #119353# - robust
return pGrfNode ? &(pGrfNode->GetGrfObj()) : 0L;
- // <--
}
USHORT SwEditShell::GetGraphicType() const
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index fbf8aa1..f42051c 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -181,7 +181,6 @@ BOOL SwEditShell::HasNumber() const
{
bResult = pTxtNd->HasNumber();
- // --> OD 2005-10-26 #b6340308#
// special case: outline numbered, not counted paragraph
if ( bResult &&
pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
@@ -189,7 +188,6 @@ BOOL SwEditShell::HasNumber() const
{
bResult = FALSE;
}
- // <--
}
return bResult;
@@ -234,10 +232,9 @@ void SwEditShell::DelNumRules()
// ueberfluessig sein, aber VB hatte darueber eine Bugrep.
CallChgLnk();
- // --> OD 2005-10-24 #126346# - cursor can not be anymore in
- // front of a label, because numbering/bullet is deleted.
+ // cursor can not be anymore in front of a label,
+ // because numbering/bullet is deleted.
SetInFrontOfLabel( FALSE );
- // <--
GetDoc()->SetModified();
EndAllAction();
@@ -608,7 +605,7 @@ BOOL SwEditShell::IsOutlineCopyable( USHORT nIdx ) const
}
-BOOL SwEditShell::NumOrNoNum( BOOL bNumOn, BOOL bChkStart ) // #115901#
+BOOL SwEditShell::NumOrNoNum( BOOL bNumOn, BOOL bChkStart )
{
BOOL bRet = FALSE;
SwPaM* pCrsr = GetCrsr();
@@ -616,7 +613,6 @@ BOOL SwEditShell::NumOrNoNum( BOOL bNumOn, BOOL bChkStart ) // #115901#
( !bChkStart || !pCrsr->GetPoint()->nContent.GetIndex()) )
{
StartAllAction(); // Klammern fuers Updaten !!
- // #115901#
bRet = GetDoc()->NumOrNoNum( pCrsr->GetPoint()->nNode, !bNumOn ); // #i29560#
EndAllAction();
}
@@ -651,11 +647,9 @@ BYTE SwEditShell::GetNumLevel() const
SwPaM* pCrsr = GetCrsr();
const SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
- // --> FME 2005-09-12 #124972# Made code robust:
OSL_ENSURE( pTxtNd, "GetNumLevel() without text node" );
if ( !pTxtNd )
return nLevel;
- // <--
const SwNumRule* pRule = pTxtNd->GetNumRule();
if(pRule)
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index d742687..607e13b 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -80,7 +80,7 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
GetDoc()->SplitNode( *pPos, false );
}
- /* #109161# If called from a shell the adjust item is propagated
+ /* If called from a shell the adjust item is propagated
from pPos to the new content nodes in the table.
*/
const SwTable *pTable = GetDoc()->InsertTable( rInsTblOpts, *pPos,
@@ -449,9 +449,8 @@ BOOL SwEditShell::CanMergeTable( BOOL bWithPrev, BOOL* pChkNxtPrv ) const
const SwTableNode* pChkNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
bNew == pChkNd->GetTable().IsNewModel() &&
- // --> FME 2004-09-17 #117418# Consider table in table case
+ // Consider table in table case
pChkNd->EndOfSectionIndex() == pTblNd->GetIndex() - 1 )
- // <--
*pChkNxtPrv = TRUE, bRet = TRUE; // mit Prev ist moeglich
else
{
@@ -468,10 +467,9 @@ BOOL SwEditShell::CanMergeTable( BOOL bWithPrev, BOOL* pChkNxtPrv ) const
if( bWithPrev )
{
pTmpTblNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
- // --> FME 2004-09-17 #117418# Consider table in table case
+ // Consider table in table case
if ( pTmpTblNd && pTmpTblNd->EndOfSectionIndex() != pTblNd->GetIndex() - 1 )
pTmpTblNd = 0;
- // <--
}
else
pTmpTblNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 15fa4dc..f1da936 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -53,7 +53,7 @@ BOOL SwEditShell::Undo( SwUndoId nUndoId, USHORT nCnt )
{
SET_CURR_SHELL( this );
- // #105332# current undo state was not saved
+ // current undo state was not saved
BOOL bRet = FALSE;
BOOL bSaveDoesUndo = GetDoc()->DoesUndo();
@@ -130,12 +130,12 @@ BOOL SwEditShell::Undo( SwUndoId nUndoId, USHORT nCnt )
GetDoc()->SetRedlineMode( eOld );
GetDoc()->CompressRedlines();
- //JP 18.09.97: autom. Erkennung fuer die neue "Box"
+ // autom. Erkennung fuer die neue "Box"
SaveTblBoxCntnt();
}
EndAllAction();
- // #105332# undo state was not restored but set to FALSE everytime
+ // undo state was not restored but set to FALSE everytime
GetDoc()->DoUndo( bSaveDoesUndo );
return bRet;
}
@@ -146,7 +146,7 @@ USHORT SwEditShell::Redo( USHORT nCnt )
BOOL bRet = FALSE;
- // #105332# undo state was not saved
+ // undo state was not saved
BOOL bSaveDoesUndo = GetDoc()->DoesUndo();
GetDoc()->DoUndo( FALSE );
@@ -216,13 +216,13 @@ USHORT SwEditShell::Redo( USHORT nCnt )
GetDoc()->SetRedlineMode( eOld );
GetDoc()->CompressRedlines();
- //JP 18.09.97: autom. Erkennung fuer die neue "Box"
+ // autom. Erkennung fuer die neue "Box"
SaveTblBoxCntnt();
}
EndAllAction();
- // #105332# undo state was not restored but set FALSE everytime
+ // undo state was not restored but set FALSE everytime
GetDoc()->DoUndo( bSaveDoesUndo );
return bRet;
}
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index b38d6a8..7c5e6f6 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -163,12 +163,10 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
if ( pTxtNd->IsOutline() )
{
- // --> OD 2005-11-17 #128041#
// correction of refactoring done by cws swnumtree:
// retrieve numbering string without prefix and suffix strings
// as stated in the above german comment.
sNumber = pTxtNd->GetNumString( false );
- // <--
SwNumRule* pRule( pTxtNd->GetNumRule() );
if ( pTxtNd->IsCountedInList() && pRule )
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index ca29acb..ef960f5 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -511,7 +511,6 @@ SwDBData SwDBNameInfField::GetDBData(SwDoc* pDoc)
return aRet;
}
-// #111840#
void SwDBNameInfField::SetDBData(const SwDBData & rDBData)
{
aDBData = rDBData;
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 01c705f..10ed3c0 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -451,8 +451,8 @@ String SwFileNameFieldType::Expand(ULONG nFmt) const
{
INetURLObject aTemp(rURLObj);
aTemp.removeSegment();
- // #101947# last slash should belong to the pathname
- aRet = aTemp.PathToFileName();//GetFull();
+ // last slash should belong to the pathname
+ aRet = aTemp.PathToFileName();
}
else
{
@@ -1442,7 +1442,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
else
sTmpName = aFALSETxt;
-// OS 21.08.97: #42943# Datenbankausdruecke muessen sich von
+// Datenbankausdruecke muessen sich von
// einfachem Text unterscheiden. also wird der einfache Text
// bevorzugt in Anfuehrungszeichen gesetzt.
// Sind diese vorhanden werden umschliessende entfernt.
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index f2d21c6..d951920 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -52,12 +52,8 @@
#include <svx/svdoole2.hxx>
#include <svx/fmmodel.hxx>
#include <svx/unomodel.hxx>
-// --> OD 2005-08-03 #i50824#
-#include <svx/svditer.hxx>
-// <--
-// --> OD 2006-03-01 #b6382898#
+#include <svx/svditer.hxx> // #i50824#
#include <svx/svdograf.hxx>
-// <--
#include <unotools/streamwrap.hxx>
#include <fmtanchr.hxx>
#include <fmtcntnt.hxx>
@@ -969,7 +965,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
(FLY_AS_CHAR == aAnchor.GetAnchorId()))
{
SwPosition* pPos = PCURCRSR->GetPoint();
- // #108784# allow shapes (no controls) in header/footer
+ // allow shapes (no controls) in header/footer
if( RES_DRAWFRMFMT == rCpyFmt.Which() &&
GetDoc()->IsInHeaderFooter( pPos->nNode ) &&
CheckControlLayer( rCpyFmt.FindSdrObject() ) )
@@ -1225,7 +1221,6 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const
// Rahmen selektiert
if( CNT_GRF == GetCntType() )
{
- // --> OD 2005-02-09 #119353# - robust
const Graphic* pGrf( GetGraphic() );
if ( pGrf )
{
@@ -1286,7 +1281,6 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const
}
}
}
- // <--
}
}
else if( SOT_FORMAT_GDIMETAFILE == nFmt )
@@ -1298,7 +1292,6 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const
}
// --> OD 2005-08-03 #i50824#
-// --> OD 2006-03-01 #b6382898#
// replace method <lcl_RemoveOleObjsFromSdrModel> by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>
void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel )
{
@@ -1335,7 +1328,7 @@ void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel )
}
}
}
-// <--
+
void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt )
{
SET_CURR_SHELL( this );
@@ -1363,7 +1356,7 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt )
1 == pModel->GetPage(0)->GetObjCount() &&
1 == pView->GetMarkedObjectList().GetMarkCount() )
{
- // OD 10.07.2003 #110742# - replace a marked 'virtual' drawing object
+ // replace a marked 'virtual' drawing object
// by its corresponding 'master' drawing object in the mark list.
SwDrawView::ReplaceMarkedDrawVirtObjs( *pView );
@@ -1480,10 +1473,8 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt )
pView->SetDesignMode( sal_True );
// --> OD 2005-08-03 #i50824#
- // --> OD 2006-03-01 #b6382898#
// method <lcl_RemoveOleObjsFromSdrModel> replaced by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>
lcl_ConvertSdrOle2ObjsToSdrGrafObjs( pModel );
- // <--
pView->Paste( *pModel, aPos );
ULONG nCnt = pView->GetMarkedObjectList().GetMarkCount();
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 7063ab7..bf43219 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -70,14 +70,11 @@
#include <fldbas.hxx>
#include <fmtfld.hxx>
#include <swundo.hxx>
-// --> OD 2006-03-06 #125892#
#include <HandleAnchorNodeChg.hxx>
-// <--
#include <frmatr.hxx>
-// --> OD 2009-12-29 #i89920#
-#include <fmtsrnd.hxx>
+
+#include <fmtsrnd.hxx> // #i89920#
#include <editeng/opaqitem.hxx>
-// <--
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -339,7 +336,7 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
Point aPoint( aTmpPos );
aPoint.X() -= 1; //nicht im Fly landen!!
GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
- // #108784# - determine text frame by left-top-corner of object
+ // determine text frame by left-top-corner of object
pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->GetFrm( &aTmpPos, 0, sal_False );
}
const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aTmpPos );
@@ -442,7 +439,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
pFooterOrHeader = pCntnt->FindFooterOrHeader();
}
}
- // OD 26.06.2003 #108784# - set <pFooterOrHeader> also for drawing
+ // set <pFooterOrHeader> also for drawing
// objects, but not for control objects.
// Necessary for moving 'anchor symbol' at the user interface inside header/footer.
else if ( !::CheckControlLayer( pObj ) )
@@ -551,8 +548,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
if( bMoveIt )
{
StartAllAction();
- // --> OD 2006-02-28 #125892#
- // handle change of anchor node:
+ // --> handle change of anchor node:
// if count of the anchor frame also change, the fly frames have to be
// re-created. Thus, delete all fly frames except the <this> before the
// anchor attribute is change and re-create them afterwards.
@@ -749,7 +745,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
GetDoc()->EndUndo( UNDO_INSLAYFMT, NULL );
}
else
- /* #109161# If called from a shell try to propagate an
+ /* If called from a shell try to propagate an
existing adjust item from rPos to the content node of the
new frame. */
pRet = GetDoc()->MakeFlySection( eRndId, &rPos, &rSet, pParent, TRUE );
@@ -1015,7 +1011,6 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
SwFlyFrm *pFly = FindFlyFrm();
if ( !pFly )
{
- // --> OD 2006-11-08 #139670# - make code robust
SwFrm* pCurrFrm( GetCurrFrm() );
if ( !pCurrFrm )
{
@@ -1023,7 +1018,6 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
"<SwFEShell::GetFlyFrmAttr(..)> - missing current frame. This is a serious defect, please inform OD." );
return sal_False;
}
- // <--
pFly = GetCurrFrm()->FindFlyFrm();
if ( !pFly )
{
@@ -1057,7 +1051,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
}
}
rSet.SetParent( pFly->GetFmt()->GetAttrSet().GetParent() );
- //JP 11.02.97: Bug #35894#: die Attribute MUESSEN entfern werden!
+ // die Attribute MUESSEN entfern werden!
rSet.ClearItem( RES_FILL_ORDER );
rSet.ClearItem( RES_CNTNT );
//MA: Ersteinmal entfernen (Template by example usw.)
@@ -1693,7 +1687,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
{
ObjCntType eType = OBJCNT_NONE;
- // OD 23.06.2003 #108784# - investigate 'master' drawing object, if method
+ // investigate 'master' drawing object, if method
// is called for a 'virtual' drawing object.
const SdrObject* pInvestigatedObj;
if ( rObj.ISA(SwDrawVirtObj) )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index c562aa9..8dbca7f 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -87,11 +87,8 @@
#include "txtfrm.hxx"
#include "txatbase.hxx"
#include "mdiexp.hxx" // fuer Update der Statuszeile bei drag
-// OD 2004-05-24 #i28701#
-#include <sortedobjs.hxx>
-// --> OD 2006-03-06 #125892#
+#include <sortedobjs.hxx> // #i28701#
#include <HandleAnchorNodeChg.hxx>
-// <--
#include <basegfx/polygon/b2dpolygon.hxx>
#define SCROLLVAL 75
@@ -132,8 +129,7 @@ extern BOOL bNoInterrupt; // in swapp.cxx
}
else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt->Which() )
{
- // --> OD 2007-07-25 #136039#
- // assure consistent cursor
+ // --> assure consistent cursor
pSh->KillPams();
pSh->ClearMark();
// <--
@@ -504,8 +500,7 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir )
if( bRet )
{
StartAllAction();
- // --> OD 2006-02-28 #125892#
- // handle change of anchor node:
+ // --> handle change of anchor node:
// if count of the anchor frame also change, the fly frames have to be
// re-created. Thus, delete all fly frames except the <this> before the
// anchor attribute is change and re-create them afterwards.
@@ -580,7 +575,7 @@ USHORT SwFEShell::GetSelFrmType() const
return eType;
}
-// #108784# does the draw selection contain a control?
+// does the draw selection contain a control?
bool SwFEShell::IsSelContainsControl() const
{
bool bRet = false;
@@ -752,8 +747,7 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
if ( pCFrm )
{
SwCntntNode *pCNode = pCFrm->GetNode();
- // --> OD 2007-07-25 #126039#
- // assure, that the cursor is consistent.
+ // --> assure, that the cursor is consistent.
KillPams();
ClearMark();
// <--
@@ -942,7 +936,6 @@ short SwFEShell::GetLayerId() const
|* Beschreibung Objekt ueber/unter dem Dokument
|*
*************************************************************************/
-// OD 25.06.2003 #108784#
// Note: only visible objects can be marked. Thus, objects with invisible
// layer IDs have not to be considered.
// If <SwFEShell> exists, layout exists!!
@@ -952,13 +945,13 @@ void SwFEShell::ChangeOpaque( SdrLayerID nLayerId )
{
const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
const IDocumentDrawModelAccess* pIDDMA = getIDocumentDrawModelAccess();
- // OD 25.06.2003 #108784# - correct type of <nControls>
+ // correct type of <nControls>
for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i )
{
SdrObject* pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
- // OD 21.08.2003 #i18447# - no change of layer for controls
+ // #i18447# - no change of layer for controls
// or group objects containing controls.
- // --> OD 2010-09-14 #i113730#
+ // --> #i113730#
// consider that a member of a drawing group has been selected.
const SwContact* pContact = ::GetUserCall( pObj );
OSL_ENSURE( pContact && pContact->GetMaster(), "<SwFEShell::ChangeOpaque(..)> - missing contact or missing master object at contact!" );
@@ -1134,7 +1127,6 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
#endif
}
-// #107513#
// Test if there is a object at that position and if it should be selected.
sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
{
@@ -1665,7 +1657,7 @@ BOOL SwFEShell::ImpEndCreate()
if( !bCharBound )
{
- // OD 16.05.2003 #108784# - allow native drawing objects in header/footer.
+ // allow native drawing objects in header/footer.
// Thus, set <bBodyOnly> to <false> for these objects using value
// of <nIdent> - value <0xFFFF> indicates control objects, which aren't
// allowed in header/footer.
@@ -1897,7 +1889,7 @@ BOOL SwFEShell::ImpEndCreate()
pContact->ConnectToLayout();
- // OD 25.06.2003 #108784# - mark object at frame the object is inserted at.
+ // mark object at frame the object is inserted at.
{
SdrObject* pMarkObj = pContact->GetDrawObjectByAnchorFrm( *pAnch );
if ( pMarkObj )
@@ -2220,10 +2212,10 @@ BOOL SwFEShell::IsGroupSelected()
for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i )
{
SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
- // OD 30.06.2003 #108784# - consider 'virtual' drawing objects.
+ // consider 'virtual' drawing objects.
// Thus, use corresponding method instead of checking type.
if ( pObj->IsGroupObject() &&
- // --> FME 2004-12-08 #i38505# No ungroup allowed for 3d objects
+ // --> #i38505# No ungroup allowed for 3d objects
!pObj->Is3DObj() &&
// <--
FLY_AS_CHAR != ((SwDrawContact*)GetUserCall(pObj))->
@@ -2236,8 +2228,8 @@ BOOL SwFEShell::IsGroupSelected()
return FALSE;
}
-// OD 27.06.2003 #108784# - change return type.
-// OD 27.06.2003 #108784# - adjustments for drawing objects in header/footer:
+// Change return type.
+// Adjustments for drawing objects in header/footer:
// allow group, only if all selected objects are in the same header/footer
// or not in header/footer.
bool SwFEShell::IsGroupAllowed() const
@@ -2272,7 +2264,7 @@ bool SwFEShell::IsGroupAllowed() const
}
}
- // OD 27.06.2003 #108784# - check, if all selected objects are in the
+ // check, if all selected objects are in the
// same header/footer or not in header/footer.
if ( bIsGroupAllowed )
{
@@ -2522,7 +2514,7 @@ BOOL SwFEShell::GetObjAttr( SfxItemSet &rSet ) const
{
SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
- // --> OD 2007-07-24 #143008# - make code robust
+ // --> make code robust
OSL_ENSURE( pContact, "<SwFEShell::GetObjAttr(..)> - missing <pContact> - please inform OD." );
if ( pContact )
{
@@ -3007,8 +2999,6 @@ void SwFEShell::CreateDefaultShape( UINT16 eSdrObjectKind, const Rectangle& rRec
}
/** SwFEShell::GetShapeBackgrd
-
- OD 02.09.2002 for #102450#:
method determines background color of the page the selected drawing
object is on and returns this color.
If no color is found, because no drawing object is selected or ...,
@@ -3060,8 +3050,6 @@ const Color SwFEShell::GetShapeBackgrd() const
}
/** Is default horizontal text direction for selected drawing object right-to-left
-
- OD 09.12.2002 #103045#
Because drawing objects only painted for each page only, the default
horizontal text direction of a drawing object is given by the corresponding
page property.
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 5031573..9d9db33 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -56,14 +56,10 @@
#include <edimp.hxx>
#include <pagedesc.hxx>
#include <fmtanchr.hxx>
-// OD 29.10.2003 #113049#
#include <environmentofanchoredobject.hxx>
-// OD 12.11.2003 #i22341#
-#include <ndtxt.hxx>
-// OD 27.11.2003 #112045#
+#include <ndtxt.hxx> // #i22341#
#include <dflyobj.hxx>
-// OD 2004-03-29 #i26791#
-#include <dcontact.hxx>
+#include <dcontact.hxx> // #i26791#
using namespace com::sun::star;
@@ -493,7 +489,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
const SdrMarkList& rMrkList = pDView->GetMarkedObjectList();
StartUndo();
- // OD 27.11.2003 #112045# - copy marked drawing objects to
+ // copy marked drawing objects to
// local list to perform the corresponding action for each object
std::vector<SdrObject*> aDrawObjs;
{
@@ -570,7 +566,7 @@ BOOL SwFEShell::Sort(const SwSortOptions& rOpt)
while( !pFrm->IsCellFrm() )
pFrm = pFrm->GetUpper();
{
- /* #107993# ParkCursor->ParkCursorTab */
+ /* ParkCursor->ParkCursorTab */
ParkCursorInTab();
}
@@ -704,11 +700,11 @@ SwFEShell::~SwFEShell()
delete pChainTo;
}
-// OD 18.09.2003 #i17567#, #108749#, #110354# - adjustments for allowing
+// #i17567# - adjustments for allowing
// negative vertical positions for fly frames anchored to paragraph/to character.
-// OD 06.11.2003 #i22305# - adjustments for option 'Follow text flow'
+// #i22305# - adjustments for option 'Follow text flow'
// for to frame anchored objects.
-// OD 12.11.2003 #i22341# - adjustments for vertical alignment at top of line
+// #i22341# - adjustments for vertical alignment at top of line
// for to character anchored objects.
void SwFEShell::CalcBoundRect( SwRect& _orRect,
const RndStdIds _nAnchorId,
@@ -873,7 +869,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
aPos = pFrm->Frm().TopRight();
else
aPos = (pFrm->Frm().*fnRect->fnGetPos)();
- // OD 08.09.2003 #i17567#, #108749#, #110354# - allow negative positions
+ // #i17567# - allow negative positions
// for fly frames anchor to paragraph/to character.
if ((_nAnchorId == FLY_AT_PARA) || (_nAnchorId == FLY_AT_CHAR))
{
@@ -882,7 +878,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
// and vertically by the printing area of the vertical environment,
// if the object follows the text flow, or by the frame area of the
// vertical environment, if the object doesn't follow the text flow.
- // OD 29.10.2003 #113049# - new class <SwEnvironmentOfAnchoredObject>
+ // new class <SwEnvironmentOfAnchoredObject>
objectpositioning::SwEnvironmentOfAnchoredObject aEnvOfObj(
_bFollowTextFlow );
const SwLayoutFrm& rHoriEnvironLayFrm =
@@ -895,7 +891,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
aVertEnvironRect = rVertEnvironLayFrm.Prt();
aVertEnvironRect.Pos() += rVertEnvironLayFrm.Frm().Pos();
- // OD 19.09.2003 #i18732# - adjust vertical 'virtual' anchor position
+ // #i18732# - adjust vertical 'virtual' anchor position
// (<aPos.Y()> respectively <aPos.X()>), if object is vertical aligned
// to page areas.
if ( _eVertRelOrient == text::RelOrientation::PAGE_FRAME || _eVertRelOrient == text::RelOrientation::PAGE_PRINT_AREA )
@@ -945,7 +941,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
}
}
- // OD 12.11.2003 #i22341# - adjust vertical 'virtual' anchor position
+ // #i22341# - adjust vertical 'virtual' anchor position
// (<aPos.Y()> respectively <aPos.X()>), if object is anchored to
// character and vertical aligned at character or top of line
// --> OD 2005-12-29 #125800#
@@ -1223,33 +1219,27 @@ BOOL SwFEShell::IsFrmVertical(BOOL bEnvironment, BOOL& bRTL) const
return bVert;
SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
- // --> OD 2006-01-06 #123831# - make code robust:
if ( !pObj )
{
OSL_ENSURE( false,
"<SwFEShell::IsFrmVertical(..)> - missing SdrObject instance in marked object list -> This is a serious situation, please inform OD" );
return bVert;
}
- // <--
- // OD 2004-03-29 #i26791#
+ // #i26791#
SwContact* pContact = static_cast<SwContact*>(GetUserCall( pObj ));
- // --> OD 2006-01-06 #123831# - make code robust:
if ( !pContact )
{
OSL_ENSURE( false,
"<SwFEShell::IsFrmVertical(..)> - missing SwContact instance at marked object -> This is a serious situation, please inform OD" );
return bVert;
}
- // <--
const SwFrm* pRef = pContact->GetAnchoredObj( pObj )->GetAnchorFrm();
- // --> OD 2006-01-06 #123831# - make code robust:
if ( !pRef )
{
OSL_ENSURE( false,
"<SwFEShell::IsFrmVertical(..)> - missing anchor frame at marked object -> This is a serious situation, please inform OD" );
return bVert;
}
- // <--
if ( pObj->ISA(SwVirtFlyDrawObj) && !bEnvironment )
pRef = static_cast<const SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 633d354..e9ebd08 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -303,7 +303,6 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
SwSelBoxes& rBoxes, SwCellFrms* pCells,
const SwTblSearchType eSearchType )
{
- // #112697# Robust:
const SwTabFrm* pStartTab = pStart->FindTabFrm();
if ( !pStartTab )
{
@@ -314,9 +313,8 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
int bChkProtected = nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType;
BOOL bTblIsValid;
- // --> FME 2006-01-25 #i55421# Reduced value 10
- int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
- // <--
+ // #i55421# Reduced value 10
+ int nLoopMax = 10;
USHORT i;
do {
@@ -464,7 +462,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
break;
}
- // --> FME 2005-10-13 #125337# Make code robust, check if pStart has
+ // --> Make code robust, check if pStart has
// been deleted due to the formatting of the table:
if ( aDelCheck.HasBeenDeleted() )
{
@@ -496,10 +494,10 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
if( !pCNd )
pCNd = aIdx.GetNodes().GoNextSection( &aIdx, FALSE, FALSE );
- // #109394# if table is invisible, return
+ // if table is invisible, return
// (layout needed for forming table selection further down, so we can't
// continue with invisible tables)
- // OD 07.11.2003 #i22135# - Also the content of the table could be
+ // #i22135# - Also the content of the table could be
// invisible - e.g. in a hidden section
// Robust: check, if content was found (e.g. empty table cells)
if ( !pCNd || pCNd->GetFrm() == NULL )
@@ -513,7 +511,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
if( !pCNd )
pCNd = aIdx.GetNodes().GoNextSection( &aIdx, FALSE, FALSE );
- // OD 07.11.2003 #i22135# - Robust: check, if content was found and if it's visible
+ // #i22135# - Robust: check, if content was found and if it's visible
if ( !pCNd || pCNd->GetFrm() == NULL )
{
return FALSE;
@@ -1204,7 +1202,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
if ( pCell->GetNext() )
{
pCell = (const SwLayoutFrm*)pCell->GetNext();
- // --> FME 2005-11-03 #125288# Check if table cell is not empty
+ // --> Check if table cell is not empty
if ( pCell->Lower() && pCell->Lower()->IsRowFrm() )
pCell = pCell->FirstCell();
}
@@ -1765,7 +1763,7 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
const SwCntntFrm* pLastCntnt = pTab->FindLastCntnt();
rpEnd = pLastCntnt ? pLastCntnt->GetUpper() : 0;
- // --> FME 2006-07-17 #134385# Made code robust. If pTab does not have a lower,
+ // --> Made code robust. If pTab does not have a lower,
// we would crash here.
if ( !pLastCntnt ) return;
// <--
@@ -1841,7 +1839,6 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
while ( pEnd && !pEnd->IsCellFrm() )
pEnd = pEnd->GetUpper();
- // #112697# Robust:
if ( !pStart || !pEnd )
{
OSL_ENSURE( false, "MakeSelUnions with pStart or pEnd not in CellFrm" );
@@ -1892,11 +1889,9 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
else if( nsSwTblSearchType::TBLSEARCH_COL == ((~nsSwTblSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
::lcl_FindStartEndCol( pStart, pEnd, nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType );
- // --> FME 2006-07-17 #134385# Made code robust.
- if ( !pEnd ) return;
- // <--
+ if ( !pEnd ) return; // Made code robust.
- //neu besorgen, da sie jetzt verschoben sind. MA: 28. Dec. 93 Bug 5190
+ //neu besorgen, da sie jetzt verschoben sind.
pTable = pStart->FindTabFrm();
pEndTable = pEnd->FindTabFrm();
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index de75a32..a0a3e3b 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -313,8 +313,7 @@ bool SwTransparencyGrf::PutValue( const uno::Any& rVal,
if(nVal < 0)
{
// for compatibility with old documents
- // OD 05.11.2002 #104308# - introduce rounding as for SO 6.0 PP2
- // introduced by fix of #104293#.
+ // introduce rounding as for SO 6.0 PP2
nVal = ( ( nVal * 128 ) - (99/2) ) / 100;
nVal += 128;
}
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 1666997..2184429 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -799,8 +799,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
// re-generating its name.
// A save action can have changed the filename of the embedded graphic,
// because a changed unique ID of the graphic is calculated.
- // --> OD 2006-01-30 #b6364738#
- // recursive calls of <GetUniqueID()> have to be avoided.
+ // --> recursive calls of <GetUniqueID()> have to be avoided.
// Thus, use local static boolean to assure this.
static bool bInRegenerateStrmName( false );
if ( !bInRegenerateStrmName &&
@@ -945,7 +944,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
{
SvStream* pRet;
- // #101174#: Keep graphic while in swap in. That's at least important
+ // Keep graphic while in swap in. That's at least important
// when breaking links, because in this situation a reschedule call and
// a DataChanged call lead to a paint of the graphic.
if( pGrfObj->IsInSwapOut() && (IsSelected() || bInSwapIn) )
More information about the Libreoffice-commits
mailing list