[Libreoffice-commits] .: 2 commits - sw/qa sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jan 28 03:33:01 PST 2011
sw/qa/core/makefile.mk | 1
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 9 --
sw/source/core/attr/format.cxx | 17 +---
sw/source/core/attr/swatrset.cxx | 21 ++---
sw/source/core/bastyp/init.cxx | 24 ++----
sw/source/core/crsr/crsrsh.cxx | 18 +---
sw/source/core/crsr/crstrvl.cxx | 5 -
sw/source/core/doc/doc.cxx | 33 ++------
sw/source/core/doc/docbm.cxx | 6 -
sw/source/core/doc/docdraw.cxx | 88 +++++++----------------
sw/source/core/doc/docedt.cxx | 13 +--
sw/source/core/doc/docfld.cxx | 6 -
sw/source/core/doc/docfly.cxx | 44 ++++-------
sw/source/core/doc/docfmt.cxx | 60 ++++-----------
sw/source/core/doc/docftn.cxx | 6 -
sw/source/core/doc/doclay.cxx | 47 +++++-------
sw/source/core/doc/docnew.cxx | 56 +++-----------
sw/source/core/doc/docnum.cxx | 25 ++----
18 files changed, 163 insertions(+), 316 deletions(-)
New commits:
commit e43774ad78a957f213d317ac2b158c41bd12f738
Author: shirahara <luixxiul at gmail.com>
Date: Fri Jan 28 11:31:24 2011 +0000
removed bogus comments
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 7cbb633..b489078 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -129,9 +129,7 @@
#include <swcalwrp.hxx>
#include <SwStyleNameMapper.hxx>
-// OD 09.10.2003 #i18732#
#include <fmtfollowtextflow.hxx>
-// OD 2004-05-05 #i28701#
#include <fmtwrapinfluenceonobjpos.hxx>
#include <fmtmeta.hxx>
@@ -387,12 +385,11 @@ SfxItemInfo aSlotTab[] =
{ SID_ATTR_HDFT_DYNAMIC_SPACING, SFX_ITEM_POOLABLE }, // RES_HEADER_FOOTER_EAT_SPACING
{ FN_TABLE_ROW_SPLIT, SFX_ITEM_POOLABLE }, // RES_ROW_SPLIT
- // DVO, OD 18.09.2003 #i18732# - use slot-id define in svx
+ // #i18732# - use slot-id define in svx
{ SID_SW_FOLLOW_TEXT_FLOW, SFX_ITEM_POOLABLE }, // RES_FOLLOW_TEXT_FLOW
- // --> collapsing borders FME 2005-05-27 #i29550#
+ // collapsing borders #i29550#
{ SID_SW_COLLAPSING_BORDERS, SFX_ITEM_POOLABLE }, // RES_COLLAPSING_BORDERS
- // <-- collapsing
- // OD 2004-05-04 #i28701#
+ // #i28701#
{ SID_SW_WRAP_INFLUENCE_ON_OBJPOS, SFX_ITEM_POOLABLE }, // RES_WRAP_INFLUENCE_ON_OBJPOS
{ 0, 0 }, // RES_AUTO_STYLE
{ 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_STYLE_NAME
@@ -428,7 +425,7 @@ USHORT* SwAttrPool::pVersionMap1 = 0;
USHORT* SwAttrPool::pVersionMap2 = 0;
USHORT* SwAttrPool::pVersionMap3 = 0;
USHORT* SwAttrPool::pVersionMap4 = 0;
-// OD 2004-01-21 #i18732#
+// #i18732#
USHORT* SwAttrPool::pVersionMap5 = 0;
USHORT* SwAttrPool::pVersionMap6 = 0;
SwIndexReg* SwIndexReg::pEmptyIndexArray = 0;
@@ -605,13 +602,12 @@ void _InitCore()
aAttrTab[ RES_FRAMEDIR - POOLATTR_BEGIN ] = new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] = new SwFmtRowSplit;
- // OD 18.09.2003 #i18732#
+ // #i18732#
aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] = new SwFmtFollowTextFlow( TRUE );
- // --> collapsing borders FME 2005-05-27 #i29550#
+ // collapsing borders #i29550#
aAttrTab[ RES_COLLAPSING_BORDERS - POOLATTR_BEGIN ] = new SfxBoolItem( RES_COLLAPSING_BORDERS, FALSE );
- // <-- collapsing
- // OD 2004-05-04 #i28701#
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i28701#
+ // #i35017# - constant name has changed
aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] =
new SwFmtWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
// <--
@@ -701,7 +697,7 @@ void _InitCore()
for ( i = 66; i <= 121; ++i )
SwAttrPool::pVersionMap4[ i-1 ] = i + 9;
- // OD 2004-01-21 #i18732# - setup new version map due to extension of
+ // #i18732# - setup new version map due to extension of
// the frame attributes (RES_FRMATR_*) for binary filters.
SwAttrPool::pVersionMap5 = new USHORT[ 130 ];
for( i = 1; i <= 109; i++ )
@@ -822,7 +818,7 @@ void _FinitCore()
delete[] SwAttrPool::pVersionMap2;
delete[] SwAttrPool::pVersionMap3;
delete[] SwAttrPool::pVersionMap4;
- // OD 2004-01-21 #i18732#
+ // #i18732#
delete[] SwAttrPool::pVersionMap5;
delete[] SwAttrPool::pVersionMap6;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 2808d7c..ed8d37b 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -381,7 +381,7 @@ BOOL SwCrsrShell::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
else
{
const BOOL bSkipHidden = !GetViewOptions()->IsShowHiddenChar();
- // --> OD 2009-12-30 #i107447#
+ // #i107447#
// To avoid loop the reset of <bInFrontOfLabel> flag is no longer
// reflected in the return value <bRet>.
const bool bResetOfInFrontOfLabel = SetInFrontOfLabel( FALSE );
@@ -392,7 +392,6 @@ BOOL SwCrsrShell::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
// undo reset of <bInFrontOfLabel> flag
SetInFrontOfLabel( TRUE );
}
- // <--
}
if( bRet )
@@ -459,10 +458,8 @@ BOOL SwCrsrShell::UpDown( BOOL bUp, USHORT nCnt )
SwShellCrsr* pTmpCrsr = getShellCrsr( true );
BOOL bRet = pTmpCrsr->UpDown( bUp, nCnt );
- // --> FME 2005-01-10 #i40019# UpDown should always reset the
- // bInFrontOfLabel flag:
+ // #i40019# UpDown should always reset the bInFrontOfLabel flag:
bRet = SetInFrontOfLabel(FALSE) || bRet;
- // <--
if( pBlockCrsr )
pBlockCrsr->clearPoints();
@@ -731,12 +728,11 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, BOOL bOnlyText, bool bBlock )
*pCrsr->GetPoint() = aPos;
rAktCrsrPt = aPt;
- // --> FME 2005-01-31 #i41424# Only update the marked number levels if necessary
+ // #i41424# Only update the marked number levels if necessary
// Force update of marked number levels if necessary.
if ( bNewInFrontOfLabel || bOldInFrontOfLabel )
pCurCrsr->_SetInFrontOfLabel( !bNewInFrontOfLabel );
SetInFrontOfLabel( bNewInFrontOfLabel );
- // <--
if( !pCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
{
@@ -1287,8 +1283,8 @@ static void lcl_CheckHiddenPara( SwPosition& rPos )
rPos = SwPosition( aTmp, SwIndex( pTxtNd, 0 ) );
}
-// --> OD 2005-12-14 #i27301# - helper class, which notifies the accessibility
-// about invalid text selections in its destructor
+// #i27301# - helper class, which notifies the accessibility about invalid text
+// selections in its destructor
class SwNotifyAccAboutInvalidTextSelections
{
private:
@@ -1321,9 +1317,8 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
return; // wenn nicht, dann kein Update !!
}
- // --> OD 2005-12-14 #i27301#
+ // #i27301#
SwNotifyAccAboutInvalidTextSelections aInvalidateTextSelections( *this );
- // <--
if ( bIgnoreReadonly )
{
@@ -2557,7 +2552,6 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
bCallChgLnk = bHasFocus = bSVCrsrVis = bAutoUpdateCells = TRUE;
bSetCrsrInReadOnly = TRUE;
pVisCrsr = new SwVisCrsr( this );
- // OD 11.02.2003 #100556#
mbMacroExecAllowed = rShell.IsMacroExecAllowed();
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e610ed5..94c1603 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -74,7 +74,7 @@
#include <wrong.hxx>
#include <vcl/window.hxx>
-#include <docufld.hxx> // OD 2008-06-19 #i90516#
+#include <docufld.hxx>
using namespace ::com::sun::star;
@@ -1522,7 +1522,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
return bRet;
}
-// --> OD 2008-06-19 #i90516#
+// #i90516#
const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
{
const SwPostItField* pPostItFld = 0;
@@ -1545,7 +1545,6 @@ const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
return pPostItFld;
}
-// <--
// befindet sich der Node in einem geschuetzten Bereich?
BOOL SwContentAtPos::IsInProtectSect() const
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 73ad556..18df128 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -125,9 +125,7 @@
/* @@@MAINTAINABILITY-HORROR@@@
Probably unwanted dependency on SwDocShell
*/
-// --> OD 2005-08-29 #125370#
#include <layouter.hxx>
-// <--
using namespace ::com::sun::star;
using ::rtl::OUString;
@@ -183,19 +181,16 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case TABLE_ROW_KEEP: return mbTableRowKeep;
case IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: return mbIgnoreTabsAndBlanksForLineCalculation;
case DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: return mbDoNotCaptureDrawObjsOnPage;
- // --> OD 2006-08-25 #i68949#
+ // #i68949#
case CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME: return mbClipAsCharacterAnchoredWriterFlyFrames;
- // <--
case UNIX_FORCE_ZERO_EXT_LEADING: return mbUnixForceZeroExtLeading;
case USE_OLD_PRINTER_METRICS: return mbOldPrinterMetrics;
case TABS_RELATIVE_TO_INDENT : return mbTabRelativeToIndent;
case PROTECT_FORM: return mbProtectForm;
- // --> OD 2008-06-05 #i89181#
+ // #i89181#
case TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: return mbTabAtLeftIndentForParagraphsInList;
- // <--
- case INVERT_BORDER_SPACING: return mbInvertBorderSpacing;
+ case INVERT_BORDER_SPACING: return mbInvertBorderSpacing;
case COLLAPSE_EMPTY_CELL_PARA: return mbCollapseEmptyCellPara;
- // COMPATIBILITY FLAGS END
case BROWSE_MODE: return mbBrowseMode;
case HTML_MODE: return mbHTMLMode;
@@ -251,7 +246,7 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
if (pOutlineRule)
{
pOutlineRule->Validate();
- // --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
+ // counting of phantoms depends on <IsOldNumbering()>
pOutlineRule->SetCountPhantoms( !mbOldNumbering );
}
}
@@ -294,7 +289,7 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
mbDoNotCaptureDrawObjsOnPage = value;
break;
- // --> OD 2006-08-25 #i68949#
+ // #i68949#
case CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME:
mbClipAsCharacterAnchoredWriterFlyFrames = value;
break;
@@ -313,7 +308,7 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
case TABS_RELATIVE_TO_INDENT:
mbTabRelativeToIndent = value;
break;
- // --> OD 2008-06-05 #i89181#
+ // #i89181#
case TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
mbTabAtLeftIndentForParagraphsInList = value;
break;
@@ -507,10 +502,9 @@ void SwDoc::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/
}
if ( bCallPrtDataChanged &&
- // --> FME 2005-01-21 #i41075# Do not call PrtDataChanged() if we do not
+ // #i41075# Do not call PrtDataChanged() if we do not
// use the printer for formatting:
!get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) )
- // <--
PrtDataChanged();
}
@@ -576,14 +570,13 @@ void SwDoc::setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewH
}
else
{
- // --> FME 2005-01-21 #i41075#
+ // #i41075#
// We have to take care that a printer exists before calling
// PrtDataChanged() in order to prevent that PrtDataChanged()
// triggers this funny situation:
// getReferenceDevice()->getPrinter()->CreatePrinter_()
// ->setPrinter()-> PrtDataChanged()
SfxPrinter* pPrinter = getPrinter( true );
- // <--
if( pDrawModel )
pDrawModel->SetRefDevice( pPrinter );
}
@@ -1306,9 +1299,8 @@ void SwDoc::CalculatePagesForPrinting(
( (bRightPg && bPrintRightPages) ||
(!bRightPg && bPrintLeftPages) ) )
{
- // --> FME 2005-12-12 #b6354161# Feature - Print empty pages
+ // Feature - Print empty pages
if ( bPrintEmptyPages || pStPage->Frm().Height() )
- // <--
{
rValidPages.insert( nPageNo );
rValidStartFrms[ nPageNo ] = pStPage;
@@ -1952,14 +1944,11 @@ bool SwDoc::IsModified() const
void SwDoc::SetModified()
{
- // --> OD 2005-08-29 #125370#
SwLayouter::ClearMovedFwdFrms( *this );
SwLayouter::ClearObjsTmpConsiderWrapInfluence( *this );
SwLayouter::ClearFrmsNotToWrap( *this );
- // <--
- // --> OD 2006-05-10 #i65250#
+ // #i65250#
SwLayouter::ClearMoveBwdLayoutInfo( *this );
- // <--
// dem Link wird der Status returnt, wie die Flags waren und werden
// Bit 0: -> alter Zustand
// Bit 1: -> neuer Zustand
@@ -2297,12 +2286,10 @@ BOOL SwDoc::RemoveInvisibleContent()
SwScriptInfo::DeleteHiddenRanges( *pTxtNd );
}
- // --> FME 2006-01-11 #120473#
// Footnotes/Frames may have been removed, therefore we have
// to reset n:
if ( bRemoved )
n = aPam.GetPoint()->nNode.GetIndex();
- // <--
}
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ed33bc8..fe0e8e2 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -610,7 +610,7 @@ namespace sw { namespace mark
{
// completely in range
- // --> OD 2009-08-07 #i92125#
+ // #i92125#
bool bKeepCrossRefBkmk( false );
{
if ( rStt == rEnd &&
@@ -628,7 +628,6 @@ namespace sw { namespace mark
pSaveBkmk->push_back(SaveBookmark(true, true, *pMark, rStt, pSttIdx));
vMarksToDelete.push_back(ppMark);
}
- // <--
}
else if(isPosInRange ^ isOtherPosInRange)
{
@@ -645,7 +644,7 @@ namespace sw { namespace mark
rEnd,
isPosInRange ? pMark->GetOtherMarkPos() : pMark->GetMarkPos());
- // --> OD 2009-08-06 #i92125#
+ // #i92125#
// no move of position for cross-reference bookmarks,
// if move occurs inside a certain node
if ( ( IDocumentMarkAccess::GetType(*pMark) !=
@@ -662,7 +661,6 @@ namespace sw { namespace mark
// illegal selection? collapse the mark and restore sorting later
isSortingNeeded |= lcl_FixCorrectedMark(isPosInRange, isOtherPosInRange, pMark);
}
- // <--
}
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 24afdf7..0255f65 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -107,22 +107,19 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
"<lcl_AdjustPositioningAttr(..)> - anchor frame is a follow. Please inform OD." );
bool bVert = false;
bool bR2L = false;
- // --> OD 2005-05-10 #i45952# - use anchor position of
- // anchor frame, if it exist.
+ // #i45952# - use anchor position of anchor frame, if it exist.
Point aAnchorPos;
if ( pAnchorFrm )
{
- // --> OD 2005-05-10 #i45952#
+ // #i45952#
aAnchorPos = pAnchorFrm->GetFrmAnchorPos( ::HasWrap( &_rSdrObj ) );
- // <--
bVert = pAnchorFrm->IsVertical();
bR2L = pAnchorFrm->IsRightToLeft();
}
else
{
- // --> OD 2005-05-10 #i45952#
+ // #i45952#
aAnchorPos = _rSdrObj.GetAnchorPos();
- // <--
// If no anchor frame exist - e.g. because no layout exists - the
// default layout direction is taken.
const SvxFrameDirectionItem* pDirItem =
@@ -183,10 +180,9 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
_pFrmFmt->SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
_pFrmFmt->SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
- // --> OD 2005-03-11 #i44334#, #i44681# - positioning attributes already set
+ // #i44334#, #i44681# - positioning attributes already set
_pFrmFmt->PosAttrSet();
- // <--
- // --> OD 2004-10-01 #i34750# - keep current object rectangle for drawing
+ // #i34750# - keep current object rectangle for drawing
// objects. The object rectangle is used on events from the drawing layer
// to adjust the positioning attributes - see <SwDrawContact::_Changed(..)>.
{
@@ -200,13 +196,12 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
->SetLastObjRect( aObjRect.SVRect() );
}
}
- // <--
}
SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
{
- // OD 30.06.2003 #108784# - replace marked 'virtual' drawing objects by
- // the corresponding 'master' drawing objects.
+ // replace marked 'virtual' drawing objects by the corresponding 'master'
+ // drawing objects.
SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView );
const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList();
@@ -224,28 +219,26 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
? 0
: new SwUndoDrawGroup( (USHORT)rMrkList.GetMarkCount() );
- // --> OD 2005-08-16 #i53320#
+ // #i53320#
bool bGroupMembersNotPositioned( false );
{
SwAnchoredDrawObject* pAnchoredDrawObj =
static_cast<SwAnchoredDrawObject*>(pMyContact->GetAnchoredObj( pObj ));
bGroupMembersNotPositioned = pAnchoredDrawObj->NotYetPositioned();
}
- // <--
//ContactObjekte und Formate vernichten.
for( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i )
{
pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
- // --> OD 2005-08-16 #i53320#
+ // #i53320#
#if OSL_DEBUG_LEVEL > 1
SwAnchoredDrawObject* pAnchoredDrawObj =
static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( pObj ));
OSL_ENSURE( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
"<SwDoc::GroupSelection(..)> - group members have different positioning status!" );
#endif
- // <--
pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
//loescht sich selbst!
@@ -257,41 +250,37 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
else
DelFrmFmt( pFmt );
- // --> OD 2005-05-10 #i45952# - re-introduce position
- // normalization of group member objects, because its anchor position
- // is cleared, when they are grouped.
+ // #i45952# - re-introduce position normalization of group member
+ // objects, because its anchor position is cleared, when they are
+ // grouped.
Point aAnchorPos( pObj->GetAnchorPos() );
pObj->NbcSetAnchorPos( Point( 0, 0 ) );
pObj->NbcMove( Size( aAnchorPos.X(), aAnchorPos.Y() ) );
- // <--
}
pFmt = MakeDrawFrmFmt( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "DrawObject" )),
GetDfltFrmFmt() );
pFmt->SetFmtAttr( aAnch );
- // --> OD 2004-10-25 #i36010# - set layout direction of the position
+ // #i36010# - set layout direction of the position
pFmt->SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
- // <--
rDrawView.GroupMarked();
OSL_ENSURE( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
SdrObject* pNewGroupObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
pNewContact = new SwDrawContact( pFmt, pNewGroupObj );
- // --> OD 2004-11-22 #i35635#
+ // #i35635#
pNewContact->MoveObjToVisibleLayer( pNewGroupObj );
- // <--
pNewContact->ConnectToLayout();
- // --> OD 2005-08-16 #i53320# - No adjustment of the positioning and
- // alignment attributes, if group members aren't positioned yet.
+ // #i53320# - No adjustment of the positioning and alignment
+ // attributes, if group members aren't positioned yet.
if ( !bGroupMembersNotPositioned )
{
- // OD 2004-04-01 #i26791# - Adjust positioning and alignment attributes.
+ // #i26791# - Adjust positioning and alignment attributes.
lcl_AdjustPositioningAttr( pFmt, *pNewGroupObj );
}
- // <--
if( pUndo )
{
@@ -319,20 +308,16 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
if( bUndo )
ClearRedo();
- // OD 30.06.2003 #108784# - replace marked 'virtual' drawing objects by
- // the corresponding 'master' drawing objects.
+ // replace marked 'virtual' drawing objects by the corresponding 'master'
+ // drawing objects.
SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView );
const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList();
- // --> OD 2006-11-01 #130889#
std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >* pFmtsAndObjs( 0L );
const sal_uInt32 nMarkCount( rMrkList.GetMarkCount() );
- // <--
if ( nMarkCount )
{
- // --> OD 2006-11-01 #130889#
pFmtsAndObjs = new std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >[nMarkCount];
- // <--
SdrObject *pMyObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
if( !pMyObj->GetUpGroup() )
{
@@ -360,11 +345,10 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm,
GetDfltFrmFmt() );
pFmt->SetFmtAttr( aAnch );
- // --> OD 2004-10-25 #i36010# - set layout direction of the position
+ // #i36010# - set layout direction of the position
pFmt->SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
pFmtsAndObjs[i].push_back( std::pair< SwDrawFrmFmt*, SdrObject* >( pFmt, pSubObj ) );
- // <--
if( bUndo )
pUndo->AddObj( i2, pFmt );
@@ -374,7 +358,6 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
}
}
rDrawView.UnGroupMarked();
- // --> OD 2006-11-01 #130889#
// creation of <SwDrawContact> instances for the former group members and
// its connection to the Writer layout.
for ( sal_uInt32 i = 0; i < nMarkCount; ++i )
@@ -404,7 +387,6 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
}
}
delete [] pFmtsAndObjs;
- // <--
}
/*************************************************************************
@@ -472,10 +454,10 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView )
if( pContact ) // natuerlich nicht bei gruppierten Objekten
{
SwDrawFrmFmt *pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
- // OD 18.06.2003 #108784# - before delete of selection
- // is performed, marked <SwDrawVirtObj>-objects have to
- // be replaced by its reference objects.
- // Thus, assert, if a <SwDrawVirt>-object is found in the mark list.
+ // before delete of selection is performed, marked
+ // <SwDrawVirtObj>-objects have to be replaced by its
+ // reference objects. Thus, assert, if a
+ // <SwDrawVirt>-object is found in the mark list.
if ( pObj->ISA(SwDrawVirtObj) )
{
OSL_ENSURE( false,
@@ -611,8 +593,7 @@ void SwDoc::InitDrawModel()
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
nControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
- // OD 25.06.2003 #108784# - add invisible layers corresponding to the
- // visible ones.
+ // add invisible layers corresponding to the visible ones.
{
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleHell" ));
nInvisibleHell = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
@@ -656,12 +637,7 @@ void SwDoc::InitDrawModel()
}
}
-/** method to notify drawing page view about the invisible layers
-
- OD 26.06.2003 #108784#
-
- @author OD
-*/
+/** method to notify drawing page view about the invisible layers */
void SwDoc::NotifyInvisibleLayers( SdrPageView& _rSdrPageView )
{
String sLayerNm;
@@ -677,10 +653,7 @@ void SwDoc::NotifyInvisibleLayers( SdrPageView& _rSdrPageView )
/** 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
*/
bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId ) const
{
@@ -709,11 +682,8 @@ bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId ) const
/** 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.
-
- @author OD
*/
SdrLayerID SwDoc::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId )
{
@@ -749,11 +719,8 @@ 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.
-
- @author OD
*/
SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId )
{
@@ -954,7 +921,7 @@ SdrLayerID SwDoc::GetInvisibleHellId() const { return nInvisibleHell; }
SdrLayerID SwDoc::GetInvisibleControlsId() const { return nInvisibleControls; }
SdrModel* SwDoc::GetOrCreateDrawModel() { return GetDrawModel() ? GetDrawModel() : _MakeDrawModel(); }
-// --> OD 2006-03-14 #i62875#
+// #i62875#
namespace docfunc
{
bool ExistsDrawObjs( SwDoc& p_rDoc )
@@ -1044,6 +1011,5 @@ namespace docfunc
return bAllDrawObjsOnPage;
}
}
-// <--
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 737c901..b6dbd0c 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1058,11 +1058,9 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
{
if( pTNd->CanJoinNext())
{
- // --> OD 2009-08-20 #i100466#
// Always join next, because <pTNd> has to stay as it is.
// A join previous from its next would more or less delete <pTNd>
pTNd->JoinNext();
- // <--
bRemove = false;
}
}
@@ -1436,8 +1434,7 @@ void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
}
pDoc->CorrRel( aIdx, *rPam.GetPoint(), 0, sal_True );
- // --> OD 2009-08-20 #i100466#
- // adjust given <rPam>, if it does not belong to the cursors
+ // #i100466# adjust given <rPam>, if it does not belong to the cursors
if ( pDelNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() )
{
rPam.GetBound( sal_True ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
@@ -1446,7 +1443,6 @@ void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
{
rPam.GetBound( sal_False ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
}
- // <--
pTxtNd->JoinNext();
}
}
@@ -1578,12 +1574,12 @@ bool SwDoc::DeleteAndJoinImpl( SwPaM & rPam,
{
sal_Bool bJoinTxt, bJoinPrev;
lcl_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
- // --> OD 2009-08-20 #i100466#
+ // #i100466#
if ( bForceJoinNext )
{
bJoinPrev = sal_False;
}
- // <--
+
{
bool const bSuccess( DeleteRangeImpl( rPam ) );
if (!bSuccess)
@@ -1789,8 +1785,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
return true;
}
-// OD 2009-08-20 #i100466#
-// Add handling of new optional parameter <bForceJoinNext>
+// #i100466# Add handling of new optional parameter <bForceJoinNext>
bool SwDoc::DeleteAndJoin( SwPaM & rPam,
const bool bForceJoinNext )
{
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 51d1b3a..4282598 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1191,8 +1191,8 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, USHORT& rTblSize,
if( !aNew.Len() ) // nichts gefunden, dann ist
aNew = pSFld->GetFormula(); // die Formel der neue Wert
- // OD 11.02.2003 #i3141# - update expression of field as in
- // method <SwDoc::UpdateExpFlds(..)> for string/text fields
+ // #i3141# - update expression of field as in method
+ // <SwDoc::UpdateExpFlds(..)> for string/text fields
pSFld->ChgExpStr( aNew );
// suche den Namen vom Feld
@@ -2225,7 +2225,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
delete pFldSortLst;
pFldSortLst = new _SetGetExpFlds( 64, 16 );
- /// OD 09.08.2002 [#101207#,#101216#,#101778#] - consider and unhide sections
+ /// consider and unhide sections
/// with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>)
/// notes by OD:
/// eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 1adad00..f0d83ad 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -66,9 +66,7 @@
#include <fmtcnct.hxx>
#include <dflyobj.hxx>
-// --> OD 2009-07-20 #i73249#
#include <undoflystrattr.hxx>
-// <--
extern USHORT GetHtmlMode( const SwDocShell* );
@@ -350,8 +348,8 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, BOOL bNewFrms
pItem = 0;
SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
- // OD 2004-05-14 #i28922# - correction: compare <aOldV.GetVertOrient()
- // with <text::VertOrientation::NONE>
+ // #i28922# - correction: compare <aOldV.GetVertOrient() with
+ // <text::VertOrientation::NONE>
if( text::VertOrientation::NONE == aOldV.GetVertOrient() && (!pItem ||
aOldV.GetPos() == ((SwFmtVertOrient*)pItem)->GetPos() ) )
{
@@ -460,7 +458,7 @@ BOOL SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
return aTmpSet.Count() || MAKEFRMS == nMakeFrms;
}
-// --> OD 2009-07-20 #i73249#
+// #i73249#
void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
const String& sNewTitle )
{
@@ -514,7 +512,6 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
SetModified();
}
-// <--
/***************************************************************************
* Methode : BOOL SwDoc::SetFrmFmtToFly( SwFlyFrm&, SwFrmFmt& )
@@ -652,7 +649,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
{
SwDrawContact* pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
- // OD 27.06.2003 #108784# - consider, that drawing object has
+ // 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.
@@ -667,23 +664,21 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
continue;
}
- // OD 2004-03-29 #i26791#
+ // #i26791#
const SwFrm* pOldAnchorFrm = pContact->GetAnchorFrm( pObj );
const SwFrm* pNewAnchorFrm = pOldAnchorFrm;
- // --> OD 2006-03-01 #i54336#
+ // #i54336#
// Instead of only keeping the index position for an as-character
// anchored object the complete <SwPosition> is kept, because the
// anchor index position could be moved, if the object again is
// anchored as character.
-// xub_StrLen nIndx = STRING_NOTFOUND;
const SwPosition* pOldAsCharAnchorPos( 0L );
const RndStdIds eOldAnchorType = pContact->GetAnchorId();
if ( !_bSameOnly && eOldAnchorType == FLY_AS_CHAR )
{
pOldAsCharAnchorPos = new SwPosition( pContact->GetCntntAnchor() );
}
- // <--
if ( _bSameOnly )
_eAnchorType = eOldAnchorType;
@@ -703,7 +698,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
? aObjRect.TopRight()
: aPt;
- // OD 18.06.2003 #108784# - allow drawing objects in header/footer
+ // allow drawing objects in header/footer
pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aNewPoint, false );
if ( pNewAnchorFrm->IsTxtFrm() && ((SwTxtFrm*)pNewAnchorFrm)->IsFollow() )
{
@@ -733,8 +728,8 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
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 );
}
@@ -775,7 +770,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
else // Ankerwechsel
{
- // OD 18.06.2003 #108784# - allow drawing objects in header/footer
+ // allow drawing objects in header/footer
pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aPt, false );
if( pNewAnchorFrm->IsProtected() )
{
@@ -806,8 +801,8 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
aNewAnch.SetAnchor( &aPos );
SetAttr( aNewAnch, *pContact->GetFmt() );
- // OD 2004-04-13 #i26791# - adjust vertical positioning to
- // 'center to baseline'
+ // #i26791# - adjust vertical positioning to 'center to
+ // baseline'
SetAttr( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ), *pContact->GetFmt() );
SwTxtNode *pNd = aPos.nNode.GetNode().GetTxtNode();
OSL_ENSURE( pNd, "Cursor not positioned at TxtNode." );
@@ -824,14 +819,14 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
pNewAnchorFrm &&
( !_bSameOnly || pNewAnchorFrm != pOldAnchorFrm ) )
{
- // OD 2004-04-06 #i26791# - Direct object positioning no longer
- // needed. Apply of attributes (method call <SetAttr(..)>) takes
- // care of the invalidation of the object position.
+ // #i26791# - Direct object positioning no longer needed. Apply
+ // of attributes (method call <SetAttr(..)>) takes care of the
+ // invalidation of the object position.
SetAttr( aNewAnch, *pContact->GetFmt() );
if ( _bPosCorr )
{
- // --> OD 2004-08-24 #i33313# - consider not connected
- // 'virtual' drawing objects
+ // #i33313# - consider not connected 'virtual' drawing
+ // objects
if ( pObj->ISA(SwDrawVirtObj) &&
!static_cast<SwDrawVirtObj*>(pObj)->IsConnected() )
{
@@ -849,7 +844,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
}
- // --> OD 2006-03-01 #i54336#
+ // #i54336#
if ( pNewAnchorFrm && pOldAsCharAnchorPos )
{
//Bei InCntnt's wird es spannend: Das TxtAttribut muss vernichtet
@@ -869,7 +864,6 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIndx, nIndx );
delete pOldAsCharAnchorPos;
}
- // <--
}
}
@@ -925,7 +919,7 @@ int SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
{
const SwFmtAnchor& rAnchor = (*GetSpzFrmFmts())[ n ]->GetAnchor();
ULONG nTstSttNd;
- // OD 11.12.2003 #i20622# - to-frame anchored objects are allowed.
+ // #i20622# - to-frame anchored objects are allowed.
if ( ((rAnchor.GetAnchorId() == FLY_AT_PARA) ||
(rAnchor.GetAnchorId() == FLY_AT_CHAR)) &&
0 != rAnchor.GetCntntAnchor() &&
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index a65b0fe..dd5670f 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -118,13 +118,11 @@ struct ParaRstFmt
const SfxItemSet* pDelSet;
USHORT nWhich;
bool bReset;
- // --> OD 2007-11-06 #i62575#
- bool bResetListAttrs;
- // <--
+ bool bResetListAttrs; // #i62575#
bool bResetAll;
bool bInclRefToxMark;
- bool bKeepOutlineLevelAttr; //#outline level,add by zhaojianwei
+ bool bKeepOutlineLevelAttr;
ParaRstFmt( const SwPosition* pStt, const SwPosition* pEnd,
SwHistory* pHst, USHORT nWhch = 0, const SfxItemSet* pSet = 0 )
@@ -134,13 +132,11 @@ struct ParaRstFmt
pEndNd(pEnd),
pDelSet(pSet),
nWhich(nWhch),
- // --> OD 2007-11-06 #i62675#
- bReset( false ),
+ bReset( false ), // #i62675#
bResetListAttrs( false ),
- // <--
bResetAll( true ),
bInclRefToxMark( false ),
- bKeepOutlineLevelAttr( false ) //#outline level,add by zhaojianwei
+ bKeepOutlineLevelAttr( false )
{}
ParaRstFmt( SwHistory* pHst )
@@ -150,13 +146,11 @@ struct ParaRstFmt
pEndNd(0),
pDelSet(0),
nWhich(0),
- // --> OD 2007-11-06 #i62675#
bReset( false ),
- bResetListAttrs( false ),
- // <--
+ bResetListAttrs( false ), // #i62675#
bResetAll( true ),
bInclRefToxMark( false ),
- bKeepOutlineLevelAttr( false ) //#outline level,add by zhaojianwei
+ bKeepOutlineLevelAttr( false )
{}
};
@@ -355,9 +349,7 @@ void SwDoc::RstTxtAttrs(const SwPaM &rRg, BOOL bInclRefToxMark )
void SwDoc::ResetAttrs( const SwPaM &rRg,
BOOL bTxtAttr,
const SvUShortsSort* pAttrs,
- // --> OD 2008-11-28 #b96644#
const bool bSendDataChangedEvents )
- // <--
{
SwPaM* pPam = (SwPaM*)&rRg;
if( !bTxtAttr && pAttrs && pAttrs->Count() &&
@@ -412,14 +404,13 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
pPam->GetPoint()->nContent = nPtPos;
}
- // --> OD 2008-11-28 #i96644#
+ // #i96644#
// SwDataChanged aTmp( *pPam, 0 );
std::auto_ptr< SwDataChanged > pDataChanged;
if ( bSendDataChangedEvents )
{
pDataChanged.reset( new SwDataChanged( *pPam, 0 ) );
}
- // <--
SwHistory* pHst = 0;
if( DoesUndo() )
{
@@ -653,13 +644,13 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
if( pNode && pNode->IsTxtNode() )
{
- // -> #i27615#
+ // #i27615#
if (rRg.IsInFrontOfLabel())
{
SwTxtNode * pTxtNd = pNode->GetTxtNode();
SwNumRule * pNumRule = pTxtNd->GetNumRule();
- // --> OD 2005-10-24 #126346# - make code robust:
+ // make code robust:
if ( !pNumRule )
{
OSL_ENSURE( false,
@@ -667,7 +658,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
DELETECHARSETS
return false;
}
- // <--
SwNumFmt aNumFmt = pNumRule->Get(static_cast<USHORT>(pTxtNd->GetActualListLevel()));
SwCharFmt * pCharFmt =
@@ -685,7 +675,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
DELETECHARSETS
return true;
}
- // <- #i27615#
const SwIndex& rSt = pStt->nContent;
@@ -1189,7 +1178,6 @@ void SwDoc::ResetAttrAtFormat( const USHORT nWhichId,
else if ( pUndo )
delete pUndo;
}
-// <--
int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
SvxTabStopItem& rChgTabStop )
@@ -1540,12 +1528,11 @@ SwFmt *SwDoc::_MakeFrmFmt(const String &rFmtName,
}
-// --> OD 2005-01-13 #i40550# - add parameter <bAuto> - not relevant
+// #i40550# - add parameter <bAuto> - not relevant
SwCharFmt *SwDoc::MakeCharFmt( const String &rFmtName,
SwCharFmt *pDerivedFrom,
BOOL bBroadcast,
BOOL )
-// <--
{
SwCharFmt *pFmt = new SwCharFmt( GetAttrPool(), rFmtName, pDerivedFrom );
pCharFmtTbl->Insert( pFmt, pCharFmtTbl->Count() );
@@ -1582,12 +1569,11 @@ SwFmt *SwDoc::_MakeCharFmt(const String &rFmtName,
* Erzeugen der FormatCollections
*/
// TXT
-// --> OD 2005-01-13 #i40550# - add parameter <bAuto> - not relevant
+// #i40550# - add parameter <bAuto> - not relevant
SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
BOOL bBroadcast,
BOOL )
-// <--
{
SwTxtFmtColl *pFmtColl = new SwTxtFmtColl( GetAttrPool(), rFmtName,
pDerivedFrom );
@@ -1705,13 +1691,11 @@ BOOL lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
lcl_RstAttr( pCNd, pPara );
- // --> OD 2007-11-06 #i62675#
- // check, if paragraph style has changed
+ // #i62675# check, if paragraph style has changed
if ( pPara->bResetListAttrs &&
pFmt != pCNd->GetFmtColl() &&
pFmt->GetItemState( RES_PARATR_NUMRULE ) == SFX_ITEM_SET )
{
- // --> OD 2009-09-07 #b6876367#
// Check, if the list style of the paragraph will change.
bool bChangeOfListStyleAtParagraph( true );
SwTxtNode* pTNd( dynamic_cast<SwTxtNode*>(pCNd) );
@@ -1748,9 +1732,7 @@ BOOL lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
pCNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
pCNd->ResetAttr( RES_PARATR_LIST_ID );
}
- // <--
}
- // <--
}
// erst in die History aufnehmen, damit ggfs. alte Daten
@@ -1789,9 +1771,8 @@ BOOL SwDoc::SetTxtFmtColl( const SwPaM &rRg,
ParaRstFmt aPara( pStt, pEnd, pHst );
aPara.pFmtColl = pFmt;
aPara.bReset = bReset;
- // --> OD 2007-11-06 #i62675#
+ // #i62675#
aPara.bResetListAttrs = bResetListAttrs;
- // <--
GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1,
lcl_SetTxtFmtColl, &aPara );
@@ -1827,9 +1808,8 @@ SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt,
fnCopyFmt, rDfltFmt );
// erzeuge das Format und kopiere die Attribute
- // --> OD 2005-01-13 #i40550#
+ // #i40550#
SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, FALSE, TRUE );
- // <--
pNewFmt->SetAuto( rFmt.IsAuto() );
pNewFmt->CopyAttrs( rFmt, TRUE ); // kopiere Attribute
@@ -1989,9 +1969,8 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr,
if( RES_CONDTXTFMTCOLL == pSrc->Which() )
MakeCondTxtFmtColl( pSrc->GetName(), (SwTxtFmtColl*)&rDfltFmt );
else
- // --> OD 2005-01-13 #i40550#
+ // #i40550#
(this->*fnCopyFmt)( pSrc->GetName(), &rDfltFmt, FALSE, TRUE );
- // <--
}
}
@@ -2320,7 +2299,7 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, BOOL bRight, BOOL bModulus )
{
SvxLRSpaceItem aLS( (SvxLRSpaceItem&)pTNd->SwCntntNode::GetAttr( RES_LR_SPACE ) );
- // --> FME 2008-09-16 #i93873# See also lcl_MergeListLevelIndentAsLRSpaceItem in thints.cxx
+ // #i93873# See also lcl_MergeListLevelIndentAsLRSpaceItem in thints.cxx
if ( pTNd->AreListLevelIndentsApplicable() )
{
const SwNumRule* pRule = pTNd->GetNumRule();
@@ -2573,7 +2552,7 @@ void SwDoc::RenameFmt(SwFmt & rFmt, const String & sNewName,
BroadcastStyleOperation(sNewName, eFamily, SFX_STYLESHEET_MODIFIED);
}
-// --> OD 2006-09-27 #i69627#
+// #i69627#
namespace docfunc
{
bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc )
@@ -2606,15 +2585,13 @@ namespace docfunc
if ( SFX_ITEM_SET == pParentTxtFmtColl->GetItemState( RES_PARATR_NUMRULE ) )
{
- // --> OD 2009-11-12 #i106218#
- // consider that the outline style is set
+ // #i106218# consider that the outline style is set
const SwNumRuleItem& rDirectItem = pParentTxtFmtColl->GetNumRule();
if ( rDirectItem.GetValue() != rDoc.GetOutlineNumRule()->GetName() )
{
bRet = true;
break;
}
- // <--
}
}
@@ -2622,6 +2599,5 @@ namespace docfunc
return bRet;
}
}
-// <--
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 5991e3d..27c8014 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -313,8 +313,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
pFtnInfo->Modify( &aOld, &aNew );
}
- // --> OD 2008-01-09 #i81002#
- // no update during loading
+ // #i81002# no update during loading
if ( !IsInReading() )
{
UpdateRefFlds(NULL);
@@ -378,8 +377,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
pEndNoteInfo->Modify( &aOld, &aNew );
}
- // --> OD 2008-01-09 #i81002#
- // no update during loading
+ // #i81002# no update during loading
if ( !IsInReading() )
{
UpdateRefFlds(NULL);
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index c390f9f..3e273d3 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -281,7 +281,7 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
}
else
{
- // --> OD 2004-07-26 #i32089# - delete at-frame anchored objects
+ // #i32089# - delete at-frame anchored objects
if ( nWh == RES_FLYFRMFMT )
{
// determine frame formats of at-frame anchored objects
@@ -481,15 +481,15 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
else
{
OSL_ENSURE( RES_DRAWFRMFMT == rSource.Which(), "Weder Fly noch Draw." );
- // OD 2005-08-02 #i52780# - Note: moving object to visible layer not needed.
+ // #i52780# - Note: moving object to visible layer not needed.
SwDrawContact* pSourceContact = (SwDrawContact *)rSource.FindContactObj();
SwDrawContact* pContact = new SwDrawContact( (SwDrawFrmFmt*)pDest,
CloneSdrObj( *pSourceContact->GetMaster(),
mbCopyIsMove && this == pSrcDoc ) );
- // --> OD 2005-05-23 #i49730# - notify draw frame format
- // that position attributes are already set, if the position attributes
- // are already set at the source draw frame format.
+ // #i49730# - notify draw frame format that position attributes are
+ // already set, if the position attributes are already set at the
+ // source draw frame format.
if ( pDest->ISA(SwDrawFrmFmt) &&
rSource.ISA(SwDrawFrmFmt) &&
static_cast<const SwDrawFrmFmt&>(rSource).IsPosAttrSet() )
@@ -500,8 +500,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
if( pDest->GetAnchor() == rNewAnchor )
{
- // OD 03.07.2003 #108784# - do *not* connect to layout, if
- // a <MakeFrms> will not be called.
+ // Do *not* connect to layout, if a <MakeFrms> will not be called.
if ( bMakeFrms )
{
pContact->ConnectToLayout( &rNewAnchor );
@@ -534,9 +533,8 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, sal_Bool bMoveWithinDoc,
sal_Bool bInsInPage )
{
- // --> OD 2005-08-08 #i52858# - method name changed
+ // #i52858# - method name changed
SdrPage *pPg = GetOrCreateDrawModel()->GetPage( 0 );
- // <--
if( !pPg )
{
pPg = GetDrawModel()->AllocPage( sal_False );
@@ -561,8 +559,7 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, sal_Bool bMoveWithinDoc,
else if( bInsInPage )
pPg->InsertObject( pObj );
- // OD 02.07.2003 #108784# - for drawing objects: set layer of cloned object
- // to invisible layer
+ // For drawing objects: set layer of cloned object to invisible layer
SdrLayerID nLayerIdForClone = rObj.GetLayer();
if ( !pObj->ISA(SwFlyDrawObj) &&
!pObj->ISA(SwVirtFlyDrawObj) &&
@@ -625,8 +622,8 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
// Anker noch nicht gesetzt ?
RndStdIds eAnchorId = pAnchor ? pAnchor->GetAnchorId()
: pFmt->GetAnchor().GetAnchorId();
- // --> OD 2010-01-07 #i107811#
- // Assure that at-page anchored fly frames have a page num or a content anchor set.
+ // #i107811# Assure that at-page anchored fly frames have a page num or a
+ // content anchor set.
if ( !pAnchor ||
( FLY_AT_PAGE != pAnchor->GetAnchorId() &&
!pAnchor->GetCntntAnchor() ) ||
@@ -924,8 +921,8 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
: &rRg.GetPoint()->nNode;
}
- // OD 24.06.2003 #108784# - allow drawing objects in header/footer, but
- // control objects aren't allowed in header/footer.
+ // Allow drawing objects in header/footer, but control objects aren't
+ // allowed in header/footer.
if( pChkIdx &&
::CheckControlLayer( &rDrawObj ) &&
IsInHeaderFooter( *pChkIdx ) )
@@ -970,14 +967,13 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
if( GetRootFrm() )
{
pFmt->MakeFrms();
- // --> OD 2005-02-09 #i42319# - follow-up of #i35635#
+ // #i42319# - follow-up of #i35635#
// move object to visible layer
- // --> OD 2007-07-10 #i79391#
+ // #i79391#
if ( pContact->GetAnchorFrm() )
{
pContact->MoveObjToVisibleLayer( &rDrawObj );
}
- // <--
}
if( DoesUndo() )
@@ -1544,7 +1540,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
// dem Object (Grafik/Ole) absatzgebunden in den neuen Rahmen,
// Frames erzeugen.
- // OD 27.11.2003 #112045# - Keep layer ID of drawing object before removing
+ // Keep layer ID of drawing object before removing
// its frames.
// Note: The layer ID is passed to the undo and have to be the correct value.
// Removing the frames of the drawing object changes its layer.
@@ -1572,7 +1568,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_SURROUND );
// Den Rahmen ggf. in den Hintergrund schicken.
- // OD 02.07.2003 #108784# - consider 'invisible' hell layer.
+ // Consider 'invisible' hell layer.
if ( GetHellId() != nLayerId &&
GetInvisibleHellId() != nLayerId )
{
@@ -1582,7 +1578,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
}
// Position uebernehmen
- // OD 2004-04-15 #i26791# - use directly the positioning attributes of
+ // #i26791# - use directly the positioning attributes of
// the drawing object.
pNewSet->Put( pOldFmt->GetHoriOrient() );
pNewSet->Put( pOldFmt->GetVertOrient() );
@@ -1648,13 +1644,13 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
if( nLayerId == GetHellId() )
rSdrObj.SetLayer( GetHeavenId() );
- // OD 02.07.2003 #108784# - consider drawing objects in 'invisible' hell layer
+ // Consider drawing objects in 'invisible' hell layer
else if( nLayerId == GetInvisibleHellId() )
rSdrObj.SetLayer( GetInvisibleHeavenId() );
pNewSet->Put( SvxLRSpaceItem( RES_LR_SPACE ) );
pNewSet->Put( SvxULSpaceItem( RES_UL_SPACE ) );
- // OD 2004-04-15 #i26791# - set position of the drawing object, which is labeled.
+ // #i26791# - set position of the drawing object, which is labeled.
pNewSet->Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
@@ -1669,7 +1665,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
if( pUndo )
{
pUndo->SetFlys( *pOldFmt, *pNewSet, *pNewFmt );
- // OD 2004-04-15 #i26791# - position no longer needed
+ // #i26791# - position no longer needed
pUndo->SetDrawObj( nLayerId );
}
else
@@ -2163,13 +2159,12 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
- // --> OD 2005-02-21 #i42921# - use new method <SwCntntNode::GetTextDirection(..)>
+ // #i42921# - use new method <SwCntntNode::GetTextDirection(..)>
if ( pNd )
{
nRet = pNd->GetTextDirection( rPos, pPt );
}
if ( nRet == -1 )
- // <--
{
const SvxFrameDirectionItem* pItem = 0;
if( pNd )
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1c8ffd0..dc11d47 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -102,16 +102,11 @@
#include <cmdid.h> // fuer den dflt - Printer in SetJob
-// --> OD 2006-04-19 #b6375613#
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-// <--
-
-// --> OD 2007-03-16 #i73788#
#include <pausethreadstarting.hxx>
-// <--
#include <numrule.hxx>
#include <list.hxx>
#include <listfunc.hxx>
@@ -267,9 +262,7 @@ SwDoc::SwDoc() :
mpGrammarContact( 0 ),
aChartDataProviderImplRef(),
pChartControllerHelper( 0 ),
- // --> OD 2007-10-31 #i83479#
- mpListItemsList( new tImplSortedNodeNumList() ),
- // <--
+ mpListItemsList( new tImplSortedNodeNumList() ), // #i83479#
m_pXmlIdRegistry(),
nUndoPos( 0 ),
nUndoSavePos( 0 ),
@@ -284,12 +277,10 @@ SwDoc::SwDoc() :
mIdleBlockCount(0),
nLockExpFld( 0 ),
mbReadlineChecked(false),
- // --> OD 2005-02-11 #i38810#
- mbLinksUpdated( sal_False ),
+ mbLinksUpdated( sal_False ), //#i38810#
mbClipBoard( false ),
mbColumnSelection( false ),
- // i#78591#
- mbProtectForm(false),
+ mbProtectForm(false), // i#78591#
n32DummyCompatabilityOptions1(0),
n32DummyCompatabilityOptions2(0),
mbStartIdleTimer(sal_False)
@@ -326,9 +317,7 @@ SwDoc::SwDoc() :
#if OSL_DEBUG_LEVEL > 1
mbXMLExport =
#endif
- // --> OD 2006-03-21 #b6375613#
mbApplyWorkaroundForB6375613 =
- // <--
false;
mbGroupUndo =
@@ -369,9 +358,7 @@ SwDoc::SwDoc() :
mbUnixForceZeroExtLeading = false; // hidden
mbOldPrinterMetrics = false; // hidden
mbTabRelativeToIndent = true; // hidden
- // --> OD 2008-06-05 #i89181#
- mbTabAtLeftIndentForParagraphsInList = false; // hidden
- // <--
+ mbTabAtLeftIndentForParagraphsInList = false; // hidden #i89181#
mbInvertBorderSpacing = false; // hidden
mbCollapseEmptyCellPara = true; // hidden
@@ -412,16 +399,12 @@ SwDoc::SwDoc() :
// lege (fuer die Filter) eine Default-OutlineNumRule an
pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
- // --> OD 2008-06-06 #i89178#
+ // #i89178#
numfunc::GetDefaultPositionAndSpaceMode(),
- // <--
OUTLINE_RULE );
- // <--
- // #115901#
AddNumRule(pOutlineRule);
- // --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
+ // Counting of phantoms depends on <IsOldNumbering()>
pOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) );
- // <--
new SwTxtNode( SwNodeIndex( aUndoNodes.GetEndOfContent() ), pDfltTxtFmtColl );
new SwTxtNode( SwNodeIndex( aNodes.GetEndOfContent() ),
@@ -460,14 +443,11 @@ SwDoc::SwDoc() :
*/
SwDoc::~SwDoc()
{
- // --> OD 2007-03-16 #i73788#
- SwPauseThreadStarting aPauseThreadStarting;
- // <--
+ SwPauseThreadStarting aPauseThreadStarting; // #i73788#
- // --> OD 2007-11-01 #i83479#
+ // #i83479#
delete mpListItemsList;
mpListItemsList = 0;
- // <--
// clean up chart related structures...
// Note: the chart data provider gets already diposed in ~SwDocShell
@@ -691,13 +671,11 @@ VirtualDevice& SwDoc::CreateVirtualDevice_() const
{
VirtualDevice* pNewVir = new VirtualDevice( 1 );
- // <--
pNewVir->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 );
- // --> FME 2006-10-09 #i60945# External leading compatibility for unix systems.
+ // #i60945# External leading compatibility for unix systems.
if ( get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING ) )
pNewVir->Compat_ZeroExtleadBug();
- // <--
MapMode aMapMode( pNewVir->GetMapMode() );
aMapMode.SetMapUnit( MAP_TWIP );
@@ -821,16 +799,12 @@ void SwDoc::ClearDoc()
pNumRuleTbl->DeleteAndDestroy( 0, pNumRuleTbl->Count() );
// creation of new outline numbering rule
pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
- // --> OD 2008-06-06 #i89178#
+ // #i89178#
numfunc::GetDefaultPositionAndSpaceMode(),
- // <--
OUTLINE_RULE );
- // <--
AddNumRule(pOutlineRule);
- // --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
+ // Counting of phantoms depends on <IsOldNumbering()>
pOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) );
- // <--
- // <--
//remove the dummy pagedec from the array and delete all the old ones
aPageDescs.Remove( nDummyPgDsc );
@@ -929,8 +903,8 @@ IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode )
return pDoc->getGrammarContact();
}
-// --> FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and
-// SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
+// #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks()
+// to new SwDoc::UpdateLinks():
void SwDoc::UpdateLinks( BOOL bUI )
{
SfxObjectCreateMode eMode;
@@ -972,8 +946,7 @@ void SwDoc::UpdateLinks( BOOL bUI )
}
}
-// <--
-// --> OD 2006-04-19 #b6375613#
+
void SwDoc::SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 )
{
if ( mbApplyWorkaroundForB6375613 != p_bApplyWorkaroundForB6375613 )
@@ -1011,7 +984,6 @@ void SwDoc::SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 )
}
}
}
-// <--
::sfx2::IXmlIdRegistry&
SwDoc::GetXmlIdRegistry()
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 59eef08..30b03a5 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -654,7 +654,6 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
}
else
{
- // --> OD 2006-01-12 #126588#
// A text node, which has an outline paragraph style applied and
// has as hard attribute 'no numbering' set, has an outline level,
// but no numbering tree node. Thus, consider this situation in
@@ -728,8 +727,7 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
return TRUE;
}
- // --> OD 2006-09-22 #i68289#
- // additional search on hyperlink URL without its outline numbering part
+ // #i68289# additional search on hyperlink URL without its outline numbering part
if ( !sName.Equals( rName ) )
{
nFndPos = ::lcl_FindOutlineName( GetNodes(), sName, FALSE );
@@ -741,7 +739,6 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
return TRUE;
}
}
- // <--
}
return FALSE;
}
@@ -898,8 +895,8 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
pTxtNd->AddToList();
}
}
- // --> OD 2005-10-26 #b6340308# - only clear numbering attribute at
- // text node, if at paragraph style the new numbering rule is found.
+ // Only clear numbering attribute at text node, if at paragraph
+ // style the new numbering rule is found.
else if ( !pRule )
{
SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
@@ -913,9 +910,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
}
}
}
- // <--
}
- // <--
}
if ( bSetItem )
@@ -1650,7 +1645,7 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
bRet = OutlineUpDown(rPam, nDiff);
else if (bOnlyNonOutline)
{
- /* --> #i24560#
+ /* #i24560#
Only promote or demote if all selected paragraphs are
promotable resp. demotable.
@@ -1660,8 +1655,8 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
{
SwTxtNode* pTNd = GetNodes()[ nTmp ]->GetTxtNode();
- // --> OD 2006-10-19 #134160# - make code robust:
- // consider case that the node doesn't denote a text node.
+ // Make code robust: consider case that the node doesn't denote a
+ // text node.
if ( pTNd )
{
SwNumRule * pRule = pTNd->GetNumRule();
@@ -1674,7 +1669,6 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
bRet = FALSE;
}
}
- // <--
}
if( bRet )
@@ -2602,19 +2596,16 @@ namespace listfunc
}
const String CreateUniqueListId( const SwDoc& rDoc )
{
- // --> OD 2008-08-06 #i92478#
+ // #i92478#
String aNewListId = String::CreateFromAscii( "list" );
- // <--
sal_Int64 n = Time().GetTime();
n += Date().GetDate();
n += rand();
- // --> OD 2008-08-06 #i92478#
+ // #i92478#
aNewListId += String::CreateFromInt64( n );
- // <--
return MakeListIdUnique( rDoc, aNewListId );
}
}
-// <--
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4082aec85e1bdcc0ef12453765bc14c8f883ef7a
Author: shirahara <luixxiul at gmail.com>
Date: Fri Jan 28 11:09:11 2011 +0000
removed bogus comments
diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk
index a23749e..d75990a 100644
--- a/sw/qa/core/makefile.mk
+++ b/sw/qa/core/makefile.mk
@@ -150,6 +150,7 @@ STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
.EXPORT : STAR_RESOURCEPATH
test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
+ echo $(STAR_RESOURCEPATH)
@echo ----------------------------------------------------------
@echo - start unit test \#1 on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 49de186..4ec81eb 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -106,12 +106,11 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
{
sal_Int16 nNewWrapInfluence = 0;
rVal >>= nNewWrapInfluence;
- // --> OD 2004-10-18 #i35017# - constant names have changed and
+ // #i35017# - constant names have changed and
// <ITERATIVE> has been added
if ( nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
nNewWrapInfluence == text::WrapInfluenceOnPosition::ONCE_CONCURRENT ||
nNewWrapInfluence == text::WrapInfluenceOnPosition::ITERATIVE )
- // <--
{
SetWrapInfluenceOnObjPos( nNewWrapInfluence );
}
@@ -132,12 +131,11 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
{
- // --> OD 2004-10-18 #i35017# - constant names have changed and consider
+ // #i35017# - constant names have changed and consider
// new value <ITERATIVE>
if ( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
_nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT ||
_nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ITERATIVE )
- // <--
{
mnWrapInfluenceOnPosition = _nWrapInfluenceOnPosition;
}
@@ -147,7 +145,7 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
}
}
-// --> OD 2004-10-18 #i35017# - add parameter <_bIterativeAsOnceConcurrent>
+// #i35017# - add parameter <_bIterativeAsOnceConcurrent>
// to control, if value <ITERATIVE> has to be treated as <ONCE_CONCURRENT>
sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
const bool _bIterativeAsOnceConcurrent ) const
@@ -162,6 +160,5 @@ sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
return nWrapInfluenceOnPosition;
}
-// <--
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 99272f3..337c92f 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -37,9 +37,7 @@
#include <doc.hxx>
#include <paratr.hxx> // fuer SwParaFmt - SwHyphenBug
#include <swcache.hxx>
-// --> OD 2006-11-22 #i71574#
#include <fmtcolfunc.hxx>
-// <--
TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
@@ -450,12 +448,11 @@ BOOL SwFmt::SetFmtAttr(const SfxPoolItem& rAttr )
{
if( 0 != ( bRet = (0 != aSet.Put( rAttr ))) )
aSet.SetModifyAtAttr( this );
- // --> OD 2006-11-22 #i71574#
+ // #i71574#
if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
{
TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
}
- // <--
}
else
{
@@ -501,12 +498,11 @@ BOOL SwFmt::SetFmtAttr( const SfxItemSet& rSet )
{
if( 0 != ( bRet = (0 != aSet.Put( rSet ))) )
aSet.SetModifyAtAttr( this );
- // --> OD 2006-11-22 #i71574#
+ // #i71574#
if ( nFmtWhich == RES_TXTFMTCOLL )
{
TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
}
- // <--
}
else
{
@@ -563,10 +559,9 @@ BOOL SwFmt::ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 )
-// --> OD 2007-01-24 #i73790#
+// #i73790#
// method renamed
USHORT SwFmt::ResetAllFmtAttr()
-// <--
{
if( !aSet.Count() )
return 0;
@@ -639,9 +634,8 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
}
}
-/** SwFmt::IsBackgroundTransparent - for feature #99657#
+/** SwFmt::IsBackgroundTransparent
- OD 22.08.2002
Virtual method to determine, if background of format is transparent.
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent background.
@@ -655,9 +649,8 @@ sal_Bool SwFmt::IsBackgroundTransparent() const
return sal_False;
}
-/** SwFmt::IsShadowTransparent - for feature #99657#
+/** SwFmt::IsShadowTransparent
- OD 22.08.2002
Virtual method to determine, if shadow of format is transparent.
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent shadow.
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index e490a55..0269e7f 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -61,7 +61,7 @@ SwAttrPool::SwAttrPool( SwDoc* pD )
SetVersionMap( 2, 1, 75, pVersionMap2 );
SetVersionMap( 3, 1, 86, pVersionMap3 );
SetVersionMap( 4, 1,121, pVersionMap4 );
- // OD 2004-01-21 #i18732# - apply new version map
+ // #i18732# - apply new version map
SetVersionMap( 5, 1,130, pVersionMap5 );
SetVersionMap( 6, 1,136, pVersionMap6 );
}
@@ -246,9 +246,8 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
{
if( Count() )
{
- // --> OD 2008-08-15 #i92811#
+ // #i92811#
SfxStringItem* pNewListIdItem( 0 );
- // <--
const SfxPoolItem* pItem;
const SwDoc *pSrcDoc = GetDoc();
@@ -285,7 +284,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
// copy list style, if needed
const String sDefaultListStyleName =
pList->GetDefaultListStyleName();
- // --> OD 2008-08-15 #i92811#
+ // #i92811#
const SwNumRule* pDstDocNumRule =
pDstDoc->FindNumRulePtr( sDefaultListStyleName );
if ( !pDstDocNumRule )
@@ -316,12 +315,11 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
// copy list
pDstDoc->createList( sListId, sDefaultListStyleName );
}
- // <--
}
}
- // JP 04.02.99: Task #61467# Seitenvorlagenwechsel mit kopieren
- // Gegenueber dem alten Verhalten, sie zu entfernen
+ // Seitenvorlagenwechsel mit kopieren Gegenueber dem alten
+ // Verhalten, sie zu entfernen
const SwPageDesc* pPgDesc;
if( pSrcDoc != pDstDoc && SFX_ITEM_SET == GetItemState(
RES_PAGEDESC, FALSE, &pItem ) &&
@@ -344,12 +342,11 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
if( pCNd )
{
- // --> OD 2008-08-15 #i92811#
+ // #i92811#
if ( pNewListIdItem != 0 )
{
aTmpSet.Put( *pNewListIdItem );
}
- // <--
pCNd->SetAttr( aTmpSet );
}
else
@@ -357,7 +354,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
}
else if( pCNd )
{
- // --> OD 2008-08-15 #i92811#
+ // #i92811#
if ( pNewListIdItem != 0 )
{
SfxItemSet aTmpSet( *this );
@@ -368,15 +365,13 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
{
pCNd->SetAttr( *this );
}
- // <--
}
else
pFmt->SetFmtAttr( *this );
- // --> OD 2008-08-15 #i92811#
+ // #i92811#
delete pNewListIdItem;
pNewListIdItem = 0;
- // <--
}
}
#if OSL_DEBUG_LEVEL > 1
More information about the Libreoffice-commits
mailing list