Hello
On Mon, Apr 4, 2011 at 12:56 PM, Christina Roßmanith
<ChrRossmanith@web.de> wrote:
Hi Anurag,
welcome to LibreOffice!
I have a comment concerning your first patch: Many bugids can be removed -
BUT please don't remove the #i.....# ids (c.f.
http://wiki.documentfoundation.org/Development/FAQ)
I'd suggest that you edit your patch to keep the #i....# ids and send it
again.
I've updates my patch as said. I've included some more files in
this.There were lots of German
comments present in the module and I've skipped such comments
containing some bug IDs.
Hoping to see this one getting pushed :) .
Christina Rossmanith
Am 03.04.2011 14:44, schrieb Anurag Jain:
Hello
This is my first patch for removal of bogus comments from the writer module.
Thanks
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
--
Anurag Jain
Final yr B.Tech CSE
SASTRA University
Thanjavur(T.N.)-613402
From 0b865b2b31b63e8606e0f93ca83da01875006c10 Mon Sep 17 00:00:00 2001
From: ANURAG JAIN <anuragjainfzd@gmail.com>
Date: Tue, 5 Apr 2011 07:04:50 +0530
Subject: [PATCH] Removal of bogus comments in writer module
---
sw/source/core/doc/docdesc.cxx | 42 +++----
sw/source/core/docnode/section.cxx | 5 +-
sw/source/core/frmedt/fews.cxx | 46 +-------
sw/source/core/inc/SwXMLBlockExport.hxx | 4 +-
sw/source/core/inc/SwXMLBlockImport.hxx | 3 -
sw/source/core/inc/UndoBookmark.hxx | 1 -
sw/source/core/inc/UndoCore.hxx | 11 +--
sw/source/core/inc/UndoDelete.hxx | 2 -
sw/source/core/inc/UndoDraw.hxx | 6 -
sw/source/core/inc/UndoInsert.hxx | 11 +--
sw/source/core/inc/UndoOverwrite.hxx | 1 -
.../core/inc/ascharanchoredobjectposition.hxx | 26 +----
sw/source/core/inc/cntfrm.hxx | 3 +-
sw/source/core/inc/doctxm.hxx | 4 +-
sw/source/core/inc/dview.hxx | 13 +--
sw/source/core/inc/flyfrms.hxx | 33 ++----
sw/source/core/inc/frame.hxx | 122 +++++--------------
17 files changed, 84 insertions(+), 249 deletions(-)
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0269d6b..52b984e 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -83,11 +83,10 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
SwFrmFmt &rFmt1,
SwFrmFmt &rFmt2 )
{
- // --> FME 2005-01-21 #i41075# Printer on demand
+ // --> #i41075# Printer on demand
// This function does not require a printer anymore.
// The default page size is obtained from the application
//locale
- // <--
SwFmtFrmSize aFrmSize( ATT_FIX_SIZE );
const Size aPhysSize = SvxPaperInfo::GetDefaultPaperSize();
@@ -147,7 +146,6 @@ void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
const sal_Bool bPage = sal_True )
{
/////////////// !!!!!!!!!!!!!!!!
-//JP 03.03.99:
// eigentlich sollte hier das Intersect von ItemSet benutzt werden, aber das
// funktioniert nicht richtig, wenn man unterschiedliche WhichRanges hat.
/////////////// !!!!!!!!!!!!!!!!
@@ -157,10 +155,9 @@ void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
RES_COL, RES_COL,
RES_FRAMEDIR, RES_FRAMEDIR,
RES_TEXTGRID, RES_TEXTGRID,
- // --> FME 2005-04-18 #i45539#
+ // #i45539#
RES_HEADER_FOOTER_EAT_SPACING,
RES_HEADER_FOOTER_EAT_SPACING,
- // <--
RES_UNKNOWNATR_CONTAINER,
RES_UNKNOWNATR_CONTAINER,
0 };
@@ -170,12 +167,11 @@ void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
{
for( sal_uInt16 nId = aIdArr[ n ]; nId <= aIdArr[ n+1]; ++nId )
{
- // --> FME 2005-04-18 #i45539#
+ // #i45539#
// bPage == true:
// All in aIdArr except from RES_HEADER_FOOTER_EAT_SPACING
// bPage == false:
// All in aIdArr except from RES_COL and RES_PAPER_BIN:
- // <--
if( ( bPage && RES_HEADER_FOOTER_EAT_SPACING != nId ) ||
( !bPage && RES_COL != nId && RES_PAPER_BIN != nId ))
{
@@ -199,7 +195,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
OSL_ENSURE( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
SwPageDesc *pDesc = aPageDescs[i];
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -220,7 +216,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
if( rChged.GetNumType().GetNumberingType() != pDesc->GetNumType().GetNumberingType() )
{
pDesc->SetNumType( rChged.GetNumType() );
- // JP 30.03.99: Bug 64121 - den Seitennummernfeldern bescheid sagen,
+ // Bug 64121 - den Seitennummernfeldern bescheid sagen,
// das sich das Num-Format geaendert hat
GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
@@ -399,7 +395,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
//Layot benachrichtigen!
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
- std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));//swmod 080304
+ std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));
}
//Jetzt noch die Seiten-Attribute uebernehmen.
@@ -475,7 +471,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
if( bHasLayout )
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
- std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));//swmod 080228
+ std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));
}
}
}
@@ -534,7 +530,7 @@ void SwDoc::DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast )
|*************************************************************************/
sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
- sal_Bool bRegardLanguage, sal_Bool bBroadcast) // #116530#
+ sal_Bool bRegardLanguage, sal_Bool bBroadcast)
{
SwPageDesc *pNew;
if( pCpy )
@@ -569,7 +565,6 @@ sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
if (GetIDocumentUndoRedo().DoesUndo())
{
- // #116530#
GetIDocumentUndoRedo().AppendUndo(new SwUndoPageDescCreate(pNew, this));
}
@@ -602,11 +597,10 @@ void SwDoc::PrtDataChanged()
{
//!!!!!!!! Bei Aenderungen hier bitte ggf. InJobSetup im Sw3io mitpflegen
- // --> FME 2005-01-21 #i41075#
+ // #i41075#
OSL_ENSURE( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ||
0 != getPrinter( sal_False ), "PrtDataChanged will be called recursive!" );
- // <--
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
SwWait *pWait = 0;
sal_Bool bEndAction = sal_False;
@@ -636,7 +630,7 @@ void SwDoc::PrtDataChanged()
pFntCache->Flush();
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
- std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));//swmod
080304
+ std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
if ( pSh )
{
@@ -649,7 +643,7 @@ void SwDoc::PrtDataChanged()
}
}
- } //swmod 080218
+ }
if ( bDraw && pDrawModel )
{
const sal_Bool bTmpAddExtLeading = get(IDocumentSettingAccess::ADD_EXT_LEADING);
@@ -664,7 +658,7 @@ void SwDoc::PrtDataChanged()
PrtOLENotify( sal_True );
if ( bEndAction )
- pTmpRoot->EndAllAction(); //swmod 080218
+ pTmpRoot->EndAllAction();
delete pWait;
}
@@ -689,7 +683,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
if ( pSh->ISA(SwFEShell) )
pShell = (SwFEShell*)pSh;
- } //swmod 071107//swmod 071225
+ }
if ( !pShell )
{
//Das hat ohne Shell und damit ohne Client keinen Sinn, weil nur darueber
@@ -713,7 +707,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
{
::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
0, pNodes->Count(), GetDocShell());
- GetCurrentLayout()->StartAllAction(); //swmod 080218
+ GetCurrentLayout()->StartAllAction();
for( sal_uInt16 i = 0; i < pNodes->Count(); ++i )
{
@@ -756,7 +750,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
}
}
delete pNodes;
- GetCurrentLayout()->EndAllAction(); //swmod 080218
+ GetCurrentLayout()->EndAllAction();
::EndProgress( GetDocShell() );
}
}
@@ -774,7 +768,7 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
{
::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
0, pNodes->Count(), GetDocShell());
- GetCurrentLayout()->StartAllAction(); //swmod 080218
+ GetCurrentLayout()->StartAllAction();
SwMsgPoolItem aMsgHint( RES_UPDATE_ATTR );
for( sal_uInt16 i = 0; i < pNodes->Count(); ++i )
@@ -791,7 +785,7 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
pOLENd->ModifyNotification( &aMsgHint, &aMsgHint );
}
}
- GetCurrentLayout()->EndAllAction(); //swmod 080218
+ GetCurrentLayout()->EndAllAction();
::EndProgress( GetDocShell() );
delete pNodes;
}
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 3643fb7..f4dc409 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -714,7 +714,7 @@ void SwSectionFmt::DelFrms()
if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
{
- // #147431# : First delete the <SwSectionFrm> of the <SwSectionFmt> instance
+ // First delete the <SwSectionFrm> of the <SwSectionFmt> instance
// mba: test iteration as objects are removed in iteration
CallSwClientNotify( SfxSimpleHint(SFX_HINT_DYING) );
@@ -1359,7 +1359,6 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
// set additional flag that links have been updated, in order to check this
// during load.
pDoc->SetLinksUpdated( sal_True );
- // <--
// Undo immer abschalten
bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
@@ -1508,7 +1507,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
{
pSrcDoc->GetLinkManager().UpdateAllLinks( sal_False, sal_True, sal_False, 0 );
}
- // <--
+
if( pCpyRg )
{
SwNodeIndex& rInsPos = pPam->GetPoint()->nNode;
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index c7313f7..4dc82ff 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -751,14 +751,12 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
Point aPos;
bool bVertic = false;
sal_Bool bRTL = sal_False;
- // --> OD 2009-09-01 #mongolianlayout#
bool bVerticalL2R = false;
- // <--
if ((FLY_AT_PAGE == _nAnchorId) || (FLY_AT_FLY == _nAnchorId)) // LAYER_IMPL
{
const SwFrm* pTmp = pFrm;
- // OD 06.11.2003 #i22305#
+ // #i22305#
if ((FLY_AT_PAGE == _nAnchorId) ||
((FLY_AT_FLY == _nAnchorId) && !_bFollowTextFlow))
{
@@ -778,14 +776,10 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
else
aPos = (pFrm->Frm().*fnRect->fnGetPos)();
- // --> OD 2009-09-01 #mongolianlayout#
if( bVert || bVertL2R )
- // <--
{
- // --> OD 2009-09-01 #mongolianlayout#
bVertic = bVert ? true : false;
bVerticalL2R = bVertL2R ? true : false;
- // <--
_bMirror = false; // no mirroring in vertical environment
switch ( _eHoriRelOrient )
{
@@ -834,9 +828,8 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
default:break;
}
}
- // --> OD 2009-09-01 #mongolianlayout#
+
if ( bVert && !bVertL2R )
- // <--
{
switch ( _eVertRelOrient )
{
@@ -848,7 +841,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
break;
}
}
- // --> OD 2009-09-01 #mongolianlayout#
else if ( bVertL2R )
{
switch ( _eVertRelOrient )
@@ -861,7 +853,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
break;
}
}
- // <--
else
{
switch ( _eVertRelOrient )
@@ -882,7 +873,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
break;
}
}
- // <--
if ( _opPercent )
*_opPercent = pFrm->Prt().SSize();
}
@@ -926,13 +916,10 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
// to page areas.
if ( _eVertRelOrient == text::RelOrientation::PAGE_FRAME || _eVertRelOrient ==
text::RelOrientation::PAGE_PRINT_AREA )
{
- // --> OD 2009-09-01 #mongolianlayout#
if ( bVert && !bVertL2R )
- // <--
{
aPos.X() = aVertEnvironRect.Right();
}
- // --> OD 2009-09-01 #mongolianlayout#
else if ( bVertL2R )
{
aPos.X() = aVertEnvironRect.Left();
@@ -948,14 +935,12 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
OSL_ENSURE( rVertEnvironLayFrm.IsPageFrm(),
"<SwFEShell::CalcBoundRect(..)> - not following text flow, but vertical
environment *not* page!" );
aVertEnvironRect = rVertEnvironLayFrm.Frm();
- // OD 19.09.2003 #i18732# - adjustment vertical 'virtual' anchor position
+ // #i18732# - adjustment 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 )
{
- // --> OD 2009-09-01 #mongolianlayout#
if ( bVert && !bVertL2R )
- // <--
{
aPos.X() = aVertEnvironRect.Right();
if ( _eVertRelOrient == text::RelOrientation::PAGE_PRINT_AREA )
@@ -963,7 +948,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
aPos.X() -= rVertEnvironLayFrm.GetRightMargin();
}
}
- // --> OD 2009-09-01 #mongolianlayout#
else if ( bVertL2R )
{
aPos.X() = aVertEnvironRect.Left();
@@ -972,7 +956,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
aPos.X() += rVertEnvironLayFrm.GetLeftMargin();
}
}
- // <--
else
{
aPos.Y() = aVertEnvironRect.Top();
@@ -993,7 +976,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
// #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#
// <pFrm>, which is the anchor frame or the proposed anchor frame,
// doesn't have to be a text frame (e.g. edit a to-page anchored
// fly frame). Thus, assure this.
@@ -1032,7 +1014,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
pTxtFrm->GetTopOfLine( nTop, aDefaultCntntPos );
}
}
- // --> OD 2009-09-01 #mongolianlayout#
if ( bVert || bVertL2R )
{
aPos.X() = nTop;
@@ -1044,7 +1025,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
}
}
- // --> OD 2004-10-05 #i26945# - adjust horizontal 'virtual' anchor
+ // #i26945# - adjust horizontal 'virtual' anchor
// position (<aPos.X()> respectively <aPos.Y()>), if object is
// anchored to character and horizontal aligned at character.
if ( pTxtFrm &&
@@ -1064,22 +1045,16 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
pTxtFrm->GetAutoPos( aChRect, aDefaultCntntPos );
}
nLeft = (aChRect.*fnRect->fnGetLeft)();
- // --> OD 2009-09-01 #mongolianlayout#
if ( bVert || bVertL2R )
{
aPos.Y() = nLeft;
}
- // <--
else
{
aPos.X() = nLeft;
}
}
- // <--
-
- // --> OD 2009-09-01 #mongolianlayout#
if ( bVert || bVertL2R )
- // <--
{
_orRect = SwRect( aVertEnvironRect.Left(),
aHoriEnvironRect.Top(),
@@ -1113,9 +1088,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
}
// bei zeichengebundenen lieber nur 90% der Hoehe ausnutzen
{
- // --> OD 2009-09-01 #mongolianlayout#
if( bVert || bVertL2R )
- // <--
_orRect.Width( (_orRect.Width()*9)/10 );
else
_orRect.Height( (_orRect.Height()*9)/10 );
@@ -1125,14 +1098,10 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
const SwTwips nBaseOfstForFly = ( pFrm->IsTxtFrm() && pFly ) ?
((SwTxtFrm*)pFrm)->GetBaseOfstForFly( !bWrapThrough ) :
0;
- // --> OD 2009-09-01 #mongolianlayout#
if( bVert || bVertL2R )
- // <--
{
- // --> OD 2009-09-01 #mongolianlayout#
bVertic = bVert ? true : false;
bVerticalL2R = bVertL2R ? true : false;
- // <--
_bMirror = false;
switch ( _eHoriRelOrient )
@@ -1257,10 +1226,8 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
{
if( bVertic && !bVerticalL2R )
_orRect.Pos( aPos.X() - _orRect.Width() - _orRect.Left(), _orRect.Top() - aPos.Y() );
- // --> OD 2009-09-01 #mongolianlayout#
else if( bVerticalL2R )
_orRect.Pos( _orRect.Left() - aPos.X(), _orRect.Top() - aPos.Y() );
- // <--
else if ( bRTL )
_orRect.Pos( - ( _orRect.Right() - aPos.X() ), _orRect.Top() - aPos.Y() );
else
@@ -1276,7 +1243,7 @@ Size SwFEShell::GetGraphicDefaultSize() const
SwFlyFrm *pFly = FindFlyFrm();
if ( pFly )
{
- // --> OD 2004-09-24 #i32951# - due to issue #i28701# no format of a
+ // #i32951# - due to issue #i28701# no format of a
// newly inserted Writer fly frame or its anchor frame is performed
// any more. Thus, it could be possible (e.g. on insert of a horizontal
// line) that the anchor frame isn't formatted and its printing area
@@ -1289,7 +1256,6 @@ Size SwFEShell::GetGraphicDefaultSize() const
{
aRet = pAnchorFrm->GetUpper()->Prt().SSize();
}
- // <--
SwRect aBound;
CalcBoundRect( aBound, pFly->GetFmt()->GetAnchor().GetAnchorId());
@@ -1301,7 +1267,6 @@ Size SwFEShell::GetGraphicDefaultSize() const
return aRet;
}
-// --> OD 2009-08-31 #mongolianlayou#
// add output parameter <bVertL2R>
sal_Bool SwFEShell::IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRTL, sal_Bool& bVertL2R)
const
{
@@ -1345,7 +1310,6 @@ sal_Bool SwFEShell::IsFrmVertical(const sal_Bool bEnvironment, sal_Bool&
bRTL, s
return bVert;
}
-// <--
void SwFEShell::MoveObjectIfActive( svt::EmbeddedObjectRef&, const Point& )
{
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index d1da8ec..349a397 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -38,7 +38,6 @@ class SwXMLBlockListExport : public SvXMLExport
private:
SwXMLTextBlocks &rBlockList;
public:
- // #110680#
SwXMLBlockListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
xServiceFactory,
SwXMLTextBlocks & rBlocks,
@@ -57,7 +56,6 @@ class SwXMLTextBlockExport : public SvXMLExport
private:
SwXMLTextBlocks &rBlockList;
public:
- // #110680#
SwXMLTextBlockExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
xServiceFactory,
SwXMLTextBlocks & rBlocks,
@@ -65,7 +63,7 @@ public:
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLTextBlockExport ( void ) {}
- sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) {return 0;}
+ sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum) {return 0;}
sal_uInt32 exportDoc(const String & rText);
void _ExportAutoStyles() {}
void _ExportMasterStyles () {}
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 1cae68b..e819423 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -44,7 +44,6 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
public:
- // #110680#
SwXMLBlockListImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
xServiceFactory,
SwXMLTextBlocks &rBlocks );
@@ -72,8 +71,6 @@ protected:
public:
sal_Bool bTextOnly;
String &m_rText;
-
- // #110680#
SwXMLTextBlockImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
xServiceFactory,
SwXMLTextBlocks &rBlocks, String &rNewText, sal_Bool bNewTextOnly );
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index 87d774d..6ae6111 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -53,7 +53,6 @@ protected:
public:
virtual ~SwUndoBookmark();
- // #111827#
/**
Returns the rewriter for this undo object.
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 35abb46..99f4722 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -122,31 +122,27 @@ class SwUndoFmtColl : public SwUndo, private SwUndRng
String aFmtName;
SwHistory* pHistory;
SwFmtColl* pFmtColl;
- // --> OD 2008-04-15 #refactorlists# - for correct <ReDo(..)> and <Repeat(..)>
+ // for correct <ReDo(..)> and <Repeat(..)>
// boolean, which indicates that the attributes are reseted at the nodes
// before the format has been applied.
const bool mbReset;
// boolean, which indicates that the list attributes had been reseted at
// the nodes before the format has been applied.
const bool mbResetListAttrs;
- // <--
void DoSetFmtColl(SwDoc & rDoc, SwPaM & rPaM);
public:
- // --> OD 2008-04-15 #refactorlists#
// SwUndoFmtColl( const SwPaM&, SwFmtColl* );
SwUndoFmtColl( const SwPaM&, SwFmtColl*,
const bool bReset,
const bool bResetListAttrs );
- // <--
virtual ~SwUndoFmtColl();
virtual void UndoImpl( ::sw::UndoRedoContext & );
virtual void RedoImpl( ::sw::UndoRedoContext & );
virtual void RepeatImpl( ::sw::RepeatContext & );
- // #111827#
/**
Returns the rewriter for this undo object.
@@ -207,10 +203,8 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & );
};
-
//--------------------------------------------------------------------
-// -> #111827#
const int nUndoStringLength = 20;
/**
@@ -238,9 +232,6 @@ const int nUndoStringLength = 20;
*/
String
ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr);
-// <- #111827#
-
-// #16487#
/**
Denotes special characters in a string.
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 7bdfb79..20caa88 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -80,8 +80,6 @@ public:
virtual void UndoImpl( ::sw::UndoRedoContext & );
virtual void RedoImpl( ::sw::UndoRedoContext & );
virtual void RepeatImpl( ::sw::RepeatContext & );
-
- // #111827#
/**
Returns rewriter for this undo object.
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 9d49090..a62b784 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -41,8 +41,6 @@ class SdrObjGroup;
class SdrUndoAction;
class SwDrawFrmFmt;
-
-
//--------------------------------------------------------------------
// ----------- Undo for Draw Objects ---------------------------------
@@ -79,7 +77,6 @@ public:
void SetGroupFmt( SwDrawFrmFmt* );
};
-// --> OD 2006-11-01 #130889#
// Action "ungroup drawing object" is now splitted into three parts - see
// method <SwDoc::UnGroupSelection(..)>:
// - creation for <SwDrawFrmFmt> instances for the group members of the
@@ -108,7 +105,6 @@ public:
void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* );
};
-// --> OD 2006-11-01 #130889#
class SwUndoDrawUnGroupConnectToLayout : public SwUndo
{
private:
@@ -125,8 +121,6 @@ class SwUndoDrawUnGroupConnectToLayout : public SwUndo
void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
SdrObject* pDrawObject );
};
-// <--
-
class SwUndoDrawDelete : public SwUndo
{
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index a39ba32..5995af2 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -74,7 +74,6 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
virtual void RepeatImpl( ::sw::RepeatContext & );
- // #111827#
/**
Returns rewriter for this undo object.
@@ -111,7 +110,6 @@ public:
virtual void UndoImpl( ::sw::UndoRedoContext & );
virtual void RedoImpl( ::sw::UndoRedoContext & );
- // #111827#
/**
Returns the rewriter of this undo object.
@@ -180,12 +178,11 @@ class SwUndoInsertLabel : public SwUndo
};
String sText;
- // --> PB 2005-01-06 #i39983# the separator is drawn with a character style
+ // #i39983# the separator is drawn with a character style
String sSeparator;
- // <--
String sNumberSeparator;
String sCharacterStyle;
- // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
+ // #i26791# - re-store of drawing object position no longer needed
sal_uInt16 nFldId;
SwLabelType eType;
sal_uInt8 nLayerId; // fuer Zeichen-Objekte
@@ -195,9 +192,8 @@ class SwUndoInsertLabel : public SwUndo
public:
SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
- // --> PB 2005-01-06 #i39983# the separator is drawn with a character style
+ // #i39983# the separator is drawn with a character style
const String& rSeparator,
- // <--
const String& rNumberSeparator, //#i61007# order of captions
const sal_Bool bBefore, const sal_uInt16 nId,
const String& rCharacterStyle,
@@ -208,7 +204,6 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
virtual void RepeatImpl( ::sw::RepeatContext & );
- // #111827#
/**
Returns the rewriter of this undo object.
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 151de9b..0c56d52 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -59,7 +59,6 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
virtual void RepeatImpl( ::sw::RepeatContext & );
- // #111827#
/**
Returns the rewriter of this undo object.
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx
b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index dd84145..2f868a9 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -81,8 +81,6 @@ namespace objectpositioning
/** determine the relative position to base line for object position
- @author OD
-
@param _ObjBoundHeight
height including corresponding spacing of the object, for which
the Y-position has to be calculated.
@@ -100,8 +98,6 @@ namespace objectpositioning
/** construtor; provided object to be positioned and needed data
for calculation of the object position
- OD 28.10.2003 #110978#
-
@param _rDrawObj
input parameter - object, that is be positioned.
@@ -121,8 +117,6 @@ namespace objectpositioning
@param _nLineAscent, _nLineDescent, _nLineAscentInclObjs,
_nLineDescentInclObjs - needed line values for the different
alignments.
-
- @author OD
*/
SwAsCharAnchoredObjectPosition( SdrObject& _rDrawObj,
const Point& _rProposedAnchorPos,
@@ -138,33 +132,23 @@ namespace objectpositioning
members <maAnchorPos>, <mnRelPos>, <maObjBoundRect> and
<mnLineAlignment> are calculated.
calculated position is set at the given object.
-
- @author OD
*/
virtual void CalcPosition();
- /** calculated anchored position for object position type AS_CHAR
+ // calculated anchored position for object position type AS_CHAR
- @author OD
- */
Point GetAnchorPos() const;
- /** calculated relative position to base line for object position type AS_CHAR
-
- @author OD
- */
+ // calculated relative position to base line for object position type AS_CHAR
+
SwTwips GetRelPosY() const;
- /** determined object rectangle including spacing for object position type AS_CHAR
+ // determined object rectangle including spacing for object position type AS_CHAR
- @author OD
- */
SwRect GetObjBoundRectInclSpacing() const;
- /** determined line alignment relative to line height
+ // determined line alignment relative to line height
- @author OD
- */
sal_uInt8 GetLineAlignment() const;
};
} // namespace objectpositioning
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 898715b..cca1d52 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -44,14 +44,13 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
{
friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); //ruft MakePrtArea
- // --> OD 2007-11-26 #b6614158#
// parameter <bObjsInNewUpper>, indicating that objects are existing in
// remaining area of new upper
sal_Bool _WouldFit( SwTwips nSpace,
SwLayoutFrm *pNewUpper,
sal_Bool bTstMove,
const bool bObjsInNewUpper );
- // <--
+
virtual void MakeAll();
void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 5665634..86ed8d7 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -74,7 +74,7 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
void InsertAlphaDelimitter( const SwTOXInternational& rIntl );
// Textrumpf generieren
- // OD 18.03.2003 #106329# - add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc>
+ // add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc>
void GenerateText( sal_uInt16 nArrayIdx,
sal_uInt16 nCount,
SvStringsDtor&,
@@ -100,7 +100,7 @@ public:
SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt);
virtual ~SwTOXBaseSection();
- // OD 19.03.2003 #106329# - add parameter <_bNewTOX> in order to distinguish
+ // add parameter <_bNewTOX> in order to distinguish
// between the creation of a new table-of-content or an update of
// a table-of-content. Default value: false
void Update( const SfxItemSet* pAttr = 0,
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index d77a5ff..8ac0abf 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -47,7 +47,6 @@ class SwDrawView : public FmFormView
/** determine maximal order number for a 'child' object of given 'parent' object
- OD 2004-08-20 #110810#
The maximal order number will be determined on the current object
order hierarchy. It's the order number of the 'child' object with the
highest order number. The calculation can be influenced by parameter
@@ -60,8 +59,6 @@ class SwDrawView : public FmFormView
@param <_pExclChildObj>
optional input parameter - 'child' object, which will not be considered
on the calculation of the maximal order number
-
- @author OD
*/
sal_uInt32 _GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
const SdrObject* _pExclChildObj = 0L ) const;
@@ -69,8 +66,6 @@ class SwDrawView : public FmFormView
/** method to move 'repeated' objects of the given moved object to the
according level
- OD 2004-08-23 #110810#
-
@param <_rMovedAnchoredObj>
input parameter - moved object, for which the 'repeated' ones have also
to be moved.
@@ -78,8 +73,6 @@ class SwDrawView : public FmFormView
@param <_rMovedChildsObjs>
input parameter - data collection of moved 'child' objects - the 'repeated'
ones of these 'childs' will also been moved.
-
- @author OD
*/
void _MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
const std::vector<SdrObject*>& _rMovedChildObjs ) const;
@@ -118,14 +111,12 @@ public:
virtual void DeleteMarked();
- //JP 06.10.98: 2. Versuch
inline void ValidateMarkList() { FlushComeBackTimer(); }
- // --> OD 2009-03-05 #i99665#
+ // #i99665#
sal_Bool IsAntiAliasing() const;
- // <--
- // OD 18.06.2003 #108784# - method to replace marked/selected <SwDrawVirtObj>
+ // method to replace marked/selected <SwDrawVirtObj>
// by its reference object for delete of selection and group selection
static void ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView );
};
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 37513df..59aeda2 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -28,7 +28,7 @@
#ifndef _FLYFRMS_HXX
#define _FLYFRMS_HXX
#include "flyfrm.hxx"
-// --> #i28701#
+// #i28701#
class SwFlyAtCntFrm;
//Basisklasse fuer diejenigen Flys, die sich relativ frei Bewegen koennen -
@@ -37,15 +37,15 @@ class SwFlyFreeFrm : public SwFlyFrm
{
SwPageFrm *pPage; //Bei dieser Seite ist der Fly angemeldet.
- // --> #i34753# - flag for at-page anchored Writer fly frames
+ // #i34753# - flag for at-page anchored Writer fly frames
// to prevent a positioning - call of method <MakeObjPos()> -, if Writer
// fly frame is already clipped during its format by the object formatter.
bool mbNoMakePos;
- // <--
- // --> #i37068# - flag to prevent move in method
+
+ // #i37068# - flag to prevent move in method
// <CheckClip(..)>
bool mbNoMoveOnCheckClip;
- // <--
+
void CheckClip( const SwFmtFrmSize &rSz ); //'Emergency' Clipping.
/** determines, if direct environment of fly frame has 'auto' size
@@ -72,14 +72,14 @@ protected:
SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
public:
- // --> #i28701#
+ // #i28701#
TYPEINFO();
virtual ~SwFlyFreeFrm();
virtual void MakeAll();
- // --> #i37068# - accessors for member <mbNoMoveOnCheckClip>
+ // #i37068# - accessors for member <mbNoMoveOnCheckClip>
inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip )
{
mbNoMoveOnCheckClip = _bNewNoMoveOnCheckClip;
@@ -88,8 +88,7 @@ public:
{
return mbNoMoveOnCheckClip;
}
- // <--
- // --> #i34753# - accessors for member <mbNoMakePos>
+ // #i34753# - accessors for member <mbNoMakePos>
inline void SetNoMakePos( const bool _bNoMakePos )
{
if ( IsFlyLayFrm() )
@@ -108,7 +107,6 @@ public:
return false;
}
}
- // <--
/** method to determine, if a format on the Writer fly frame is possible
@@ -117,8 +115,6 @@ public:
<SwFlyFrm::IsFormatPossible()> by:
format isn't possible, if Writer fly frame isn't registered at a page frame
and its anchor frame isn't inside another Writer fly frame.
-
- @author OD
*/
virtual bool IsFormatPossible() const;
};
@@ -128,7 +124,7 @@ public:
class SwFlyLayFrm : public SwFlyFreeFrm
{
public:
- // --> #i28701#
+ // #i28701#
TYPEINFO();
SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
@@ -150,14 +146,12 @@ protected:
page frame
#i28701#
-
- @author OD
*/
virtual void RegisterAtCorrectPage();
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
public:
- // --> #i28701#
+ // #i28701#
TYPEINFO();
SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
@@ -173,8 +167,6 @@ public:
refine 'IsFormatPossible'-conditions of method
<SwFlyFreeFrm::IsFormatPossible()> by:
format isn't possible, if method <MakeAll()> is already in progress.
-
- @author OD
*/
virtual bool IsFormatPossible() const;
};
@@ -195,7 +187,7 @@ protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
public:
- // --> #i28701#
+ // #i28701#
TYPEINFO();
SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
@@ -231,11 +223,10 @@ public:
// #i26791#
virtual void MakeObjPos();
- // --> #115759# - invalidate anchor frame on invalidation
+ // invalidate anchor frame on invalidation
// of the position, because the position is calculated during the
// format of the anchor frame
virtual void _ActionOnInvalidation( const InvalidationType _nInvalid );
- // <--
};
inline void SwFlyInCntFrm::InvalidateLayout() const
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index ba148cc..94db9cc 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -207,32 +207,8 @@ struct SwRectFnCollection
};
typedef SwRectFnCollection* SwRectFn;
-/*
-extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R;
-#define SWRECTFN( pFrm ) sal_Bool bVert = pFrm->IsVertical(); \
- sal_Bool bRev = pFrm->IsReverse(); \
- SwRectFn fnRect = bVert ? \
- ( bRev ? fnRectVL2R : fnRectVert ): \
- ( bRev ? fnRectB2T : fnRectHori );
-#define SWRECTFNX( pFrm ) sal_Bool bVertX = pFrm->IsVertical(); \
- sal_Bool bRevX = pFrm->IsReverse(); \
- SwRectFn fnRectX = bVertX ? \
- ( bRevX ? fnRectVL2R : fnRectVert ): \
- ( bRevX ? fnRectB2T : fnRectHori );
-#define SWREFRESHFN( pFrm ) { if( bVert != pFrm->IsVertical() || \
- bRev != pFrm->IsReverse() ) \
- bVert = pFrm->IsVertical(); \
- bRev = pFrm->IsReverse(); \
- fnRect = bVert ? \
- ( bRev ? fnRectVL2R : fnRectVert ): \
- ( bRev ? fnRectB2T : fnRectHori ); }
-#define SWRECTFN2( pFrm ) sal_Bool bVert = pFrm->IsVertical(); \
- sal_Bool bNeighb = pFrm->IsNeighbourFrm(); \
- SwRectFn fnRect = bVert == bNeighb ? \
- fnRectHori : fnRectVert;
-*/
-//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+// Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
#define SWRECTFN( pFrm ) sal_Bool bVert = pFrm->IsVertical(); \
sal_Bool bRev = pFrm->IsReverse(); \
@@ -274,7 +250,7 @@ enum MakePageType
MAKEPAGE_NOSECTION // Don't create section frames
};
-// OD 2004-05-06 #i28701# - replaced by new class <SwSortedObjs>
+// #i28701# - replaced by new class <SwSortedObjs>
//typedef SdrObject* SdrObjectPtr;
//SV_DECL_PTRARR(SwDrawObjs,SdrObjectPtr,1,1);
@@ -306,11 +282,10 @@ class SwFrm: public SwClient, public SfxBroadcaster
//Cache fuer (Umrandungs-)Attribute.
static SwCache *pCache;
- // --> OD 2006-05-10 #i65250#
+ // #i65250#
// frame ID is now in general available - used for layout loop control
static sal_uInt32 mnLastFrmId;
const sal_uInt32 mnFrmId;
- // <--
SwRootFrm *mpRoot;
SwLayoutFrm *pUpper;
@@ -323,7 +298,7 @@ class SwFrm: public SwClient, public SfxBroadcaster
/** method to determine next content frame in the same environment
for a flow frame (content frame, table frame, section frame)
- OD 2005-11-30 #i27138# - adding documentation:
+ #i27138# - adding documentation:
Travelling downwards through the layout to determine the next content
frame in the same environment. There are several environments in a
document, which form a closed context regarding this function. These
@@ -334,13 +309,11 @@ class SwFrm: public SwClient, public SfxBroadcaster
- Each group of linked fly frames
- All footnotes
- All document body frames
- OD 2005-11-30 #i27138# - adding parameter <_bInSameFtn>
+ #i27138# - adding parameter <_bInSameFtn>
Its default value is <false>. If its value is <true>, the environment
'All footnotes' is no longer treated. Instead each footnote is treated
as an own environment.
- @author OD
-
@param _bInSameFtn
input parameter - boolean indicating, that the found next content
frame has to be in the same footnote frame. This parameter is only
@@ -354,7 +327,7 @@ class SwFrm: public SwClient, public SfxBroadcaster
/** method to determine previous content frame in the same environment
for a flow frame (content frame, table frame, section frame)
- OD 2005-11-30 #i27138#
+ #i27138#
Travelling upwards through the layout to determine the previous content
frame in the same environment. There are several environments in a
document, which form a closed context regarding this function. These
@@ -365,13 +338,11 @@ class SwFrm: public SwClient, public SfxBroadcaster
- Each group of linked fly frames
- All footnotes
- All document body frames
- OD 2005-11-30 #i27138# - adding parameter <_bInSameFtn>
+ #i27138# - adding parameter <_bInSameFtn>
Its default value is <false>. If its value is <true>, the environment
'All footnotes' is no longer treated. Instead each footnote is treated
as an own environment.
- @author OD
-
@param _bInSameFtn
input parameter - boolean indicating, that the found previous content
frame has to be in the same footnote frame. This parameter is only
@@ -410,7 +381,7 @@ protected:
sal_uInt16 bInvalidVert: 1;
sal_uInt16 bDerivedVert: 1;
sal_uInt16 bVertical: 1;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ // Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
sal_uInt16 bVertLR: 1;
//End of SCMS
sal_uInt16 nType: 4; //Who am I?
@@ -449,12 +420,11 @@ protected:
void PrepareMake();
void OptPrepareMake();
void MakePos();
- // --> OD 2005-09-28 #b6329202#
// method formats next frame of table frame to assure keep attribute.
// in case of nested tables method <SwFrm::MakeAll()> is called to
// avoid format of superior table frame.
friend SwFrm* lcl_FormatNextCntntForKeep( SwTabFrm* pTabFrm );
- // <--
+
virtual void MakeAll() = 0;
//Adjustierung der Frames einer Seite
SwTwips AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst = sal_False );
@@ -471,10 +441,7 @@ protected:
void CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_Bool bBrowse );
/** enumeration for the different invalidations
-
- OD 2004-05-19 #i28701#
-
- @author OD
+ #i28701#
*/
enum InvalidationType
{
@@ -482,20 +449,15 @@ protected:
};
/** method to determine, if an invalidation is allowed.
-
- OD 2004-05-19 #i28701
-
- @author OD
+ #i28701
*/
virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const;
/** method to perform additional actions on an invalidation
- OD 2004-05-19 #i28701#
+ #i28701#
Method has *only* to contain actions, which has to be performed on
*every* assignment of the corresponding flag to <sal_False>.
-
- @author OD
*/
virtual void _ActionOnInvalidation( const InvalidationType _nInvalid );
@@ -547,17 +509,16 @@ public:
sal_Bool WrongPageDesc( SwPageFrm* pNew );
- // --> OD 2004-07-02 #i28701# - new methods to append/remove drawing objects
+ //#i28701# - new methods to append/remove drawing objects
void AppendDrawObj( SwAnchoredObject& _rNewObj );
void RemoveDrawObj( SwAnchoredObject& _rToRemoveObj );
- // <--
//Arbeiten mit der Kette der FlyFrms
void AppendFly( SwFlyFrm *pNew );
void RemoveFly( SwFlyFrm *pToRemove );
const SwSortedObjs *GetDrawObjs() const { return pDrawObjs; }
SwSortedObjs *GetDrawObjs() { return pDrawObjs; }
- // --> OD 2004-07-01 #i28701# - change purpose of method and adjust its name
+ // #i28701# - change purpose of method and adjust its name
void InvalidateObjs( const bool _bInvaPosOnly,
const bool _bNoInvaOfAsCharAnchoredObjs = true );
@@ -611,12 +572,12 @@ public:
inline sal_Bool IsReverse() const { return bReverse; }
inline void SetReverse( sal_Bool bNew ){ bReverse = bNew ? 1 : 0; }
inline sal_Bool IsVertical() const;
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ //Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
inline sal_Bool IsVertLR() const;
//End of SCMS
inline sal_Bool GetVerticalFlag() const;
inline void SetVertical( sal_Bool bNew ){ bVertical = bNew ? 1 : 0; }
- //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+ //Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
inline void SetbVertLR( sal_Bool bNew ) { bVertLR = bNew ? 1 : 0; }
//End of SCMS
inline void SetDerivedVert( sal_Bool bNew ){ bDerivedVert = bNew ? 1 : 0; }
@@ -634,14 +595,11 @@ public:
/** determine, if frame is moveable in given environment
- OD 08.08.2003 #110978#
method replaced 'old' method <sal_Bool IsMoveable() const>.
Determines, if frame is moveable in given environment. if no environment
is given (parameter _pLayoutFrm == 0L), the movability in the actual
environment (<this->GetUpper()) is checked.
- @author OD
-
@param _pLayoutFrm
input parameter - given environment (layout frame), in which the movability
will be checked. If not set ( == 0L ), actual environment is taken.
@@ -693,9 +651,8 @@ public:
inline SwFlyFrm *FindFlyFrm();
inline SwSectionFrm *FindSctFrm();
inline SwFrm *FindNext();
- // --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
+ // #i27138# - add parameter <_bInSameFtn>
inline SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false );
- // <--
inline SwFrm *FindPrev();
inline const SwPageFrm *FindPageFrm() const;
inline const SwFtnBossFrm *FindFtnBossFrm( sal_Bool bFtn = sal_False ) const;
@@ -706,17 +663,13 @@ public:
inline const SwFlyFrm *FindFlyFrm() const;
inline const SwSectionFrm *FindSctFrm() const;
inline const SwFrm *FindNext() const;
- // --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
+ // #i27138# - add parameter <_bInSameFtn>
inline const SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false ) const;
- // <--
inline const SwFrm *FindPrev() const;
const SwFrm *GetLower() const;
/** inline wrapper method for <_FindPrevCnt(..)>
-
- OD 2005-11-30 #i27138#
-
- @author OD
+ #i27138#
*/
inline SwCntntFrm* FindPrevCnt( const bool _bInSameFtn = false )
{
@@ -727,10 +680,7 @@ public:
}
/** inline const wrapper method for <_FindPrevCnt(..)>
-
- OD 2005-11-30 #i27138#
-
- @author OD
+ #i27138#
*/
inline const SwCntntFrm* FindPrevCnt( const bool _bInSameFtn = false ) const
{
@@ -740,12 +690,11 @@ public:
return const_cast<SwFrm*>(this)->_FindPrevCnt( _bInSameFtn );
}
- // --> OD 2007-09-04 #i79774#, #b6596954#
+ // #i79774#
SwFrm* _GetIndPrev() const;
SwFrm* GetIndPrev() const
{ return ( pPrev || !IsInSct() ) ? pPrev : _GetIndPrev(); }
-// const SwFrm* GetIndPrev() const { return ((SwFrm*)this)->GetIndPrev(); }
- // <--
+
SwFrm* GetIndNext()
{ return ( pNext || !IsInSct() ) ? pNext : _GetIndNext(); }
const SwFrm* GetIndNext() const { return ((SwFrm*)this)->GetIndNext(); }
@@ -796,11 +745,11 @@ public:
sal_Bool IsValid() const { return bValidPos && bValidSize && bValidPrtArea; }
//Invalideren nur den Frm
- // OD 2004-05-19 #i28701# - add call to method <_ActionOnInvalidation(..)>
+ // #i28701# - add call to method <_ActionOnInvalidation(..)>
// for all invalidation methods.
- // OD 2004-05-19 #i28701# - use method <_InvalidationAllowed(..)> to
+ // #i28701# - use method <_InvalidationAllowed(..)> to
// decide, if invalidation will to be performed or not.
- // --> OD 2004-10-08 #i26945# - no additional invalidation, if it's already
+ // #i26945# - no additional invalidation, if it's already
// invalidate.
void _InvalidateSize()
{
@@ -843,7 +792,6 @@ public:
_ActionOnInvalidation( INVALID_ALL );
}
}
- // <--
//Benachrichtigen gleich die Seite mit.
inline void InvalidateSize();
inline void InvalidatePrt();
@@ -859,10 +807,7 @@ public:
void ImplInvalidateNextPos( sal_Bool bNoFtn = sal_False );
/** method to invalidate printing area of next frame
-
- OD 09.01.2004 #i11859#
-
- @author OD
+ #i11859#
*/
void InvalidateNextPrtArea();
@@ -949,10 +894,9 @@ public:
inline sal_Bool IsNeighbourFrm() const
{ return GetType() & FRM_NEIGHBOUR ? sal_True : sal_False; }
- // --> OD 2006-05-10 #i65250#
+ // #i65250#
inline sal_uInt32 GetFrmId() const { return mnFrmId; }
inline sal_uInt32 GetLastFrmId() const { return mnLastFrmId; }
- // <--
// NEW TABELS
// Some functions for covered/covering table cells. This way unnessessary
@@ -961,7 +905,7 @@ public:
bool IsCoveredCell() const;
bool IsInCoveredCell() const;
- // FME 2007-08-30 #i81146# new loop control
+ // #i81146# new loop control
bool KnowsFormat( const SwFmt& rFmt ) const;
void RegisterToFormat( SwFmt& rFmt );
void ValidateThisAndAllLowers( const sal_uInt16 nStage );
@@ -1011,7 +955,7 @@ sal_Bool SwFrm::IsVertical() const
((SwFrm*)this)->SetDirFlags( sal_True );
return bVertical != 0;
}
-//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
+//Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
inline sal_Bool SwFrm::IsVertLR() const
{
return bVertLR != 0;
@@ -1099,7 +1043,7 @@ inline void SwFrm::InvalidateAll()
ImplInvalidatePos();
bValidPrtArea = bValidSize = bValidPos = sal_False;
- // OD 2004-05-19 #i28701#
+ // #i28701#
_ActionOnInvalidation( INVALID_ALL );
}
}
@@ -1201,7 +1145,7 @@ inline const SwFrm *SwFrm::FindNext() const
else
return ((SwFrm*)this)->_FindNext();
}
-// --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
+// #i27138# - add parameter <_bInSameFtn>
inline SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn )
{
if ( pNext && pNext->IsCntntFrm() )
@@ -1209,8 +1153,7 @@ inline SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn )
else
return _FindNextCnt( _bInSameFtn );
}
-// <--
-// --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
+// #i27138# - add parameter <_bInSameFtn>
inline const SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn ) const
{
if ( pNext && pNext->IsCntntFrm() )
@@ -1218,7 +1161,6 @@ inline const SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn ) const
else
return ((SwFrm*)this)->_FindNextCnt( _bInSameFtn );
}
-// <--
inline SwFrm *SwFrm::FindPrev()
{
if ( pPrev && !pPrev->IsSctFrm() )
--
1.7.0.4
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.