sw/source/core/text/EnhancedPDFExportHelper.cxx | 69 +++---------------------
sw/source/core/text/atrhndl.hxx | 16 +----
sw/source/core/text/atrstck.cxx | 69 +-----------------------
sw/source/core/text/blink.cxx | 10 +--
sw/source/core/text/frmcrsr.cxx | 44 ---------------
sw/source/core/text/frmform.cxx | 35 ++++--------
sw/source/core/text/frminf.cxx | 41 --------------
sw/source/core/text/guess.cxx | 11 +--
sw/source/core/text/guess.hxx | 4 -
sw/source/core/text/inftxt.cxx | 61 ++++++---------------
sw/source/core/text/inftxt.hxx | 54 ++----------------
sw/source/core/text/itradj.cxx | 61 ++-------------------
12 files changed, 67 insertions(+), 408 deletions(-)
New commits:
commit d8f8c8aa4544e2a0e7e3c43764080d5fe0effacf
Author: Chris Laplante <mostthings...@gmail.com>
Date: Fri Apr 18 00:59:07 2014 -0400
Begin removing ASCII art and useless comments from sw
Change-Id: Ic367b2ebca1a766c830ccd44a84274d86be4f080
Reviewed-on: https://gerrit.libreoffice.org/9090
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 4a59b55..f310c5f 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -258,9 +258,6 @@ bool lcl_HasPreviousParaSameNumRule( const SwTxtNode& rNode
)
} // end namespace
-/*
- * SwTaggedPDFHelper::SwTaggedPDFHelper()
- */
SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
const Frm_Info* pFrmInfo,
const Por_Info* pPorInfo,
@@ -297,9 +294,6 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info*
pNumInfo,
}
}
-/*
- * SwTaggedPDFHelper::~SwTaggedPDFHelper()
- */
SwTaggedPDFHelper::~SwTaggedPDFHelper()
{
if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
@@ -319,9 +313,6 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
}
}
-/*
- * SwTaggedPDFHelper::CheckReopenTag()
- */
bool SwTaggedPDFHelper::CheckReopenTag()
{
bool bRet = false;
@@ -391,9 +382,6 @@ bool SwTaggedPDFHelper::CheckReopenTag()
return bRet && !bContinue;
}
-/*
- * SwTaggedPDFHelper::CheckRestoreTag()
- */
bool SwTaggedPDFHelper::CheckRestoreTag() const
{
bool bRet = false;
@@ -413,9 +401,6 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
return bRet;
}
-/*
- * SwTaggedPDFHelper::BeginTag()
- */
void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const
OUString& rString )
{
// write new tag
@@ -474,9 +459,6 @@ void SwTaggedPDFHelper::BeginTag(
vcl::PDFWriter::StructElement eType, const OUS
SetAttributes( eType );
}
-/*
- * SwTaggedPDFHelper::EndTag()
- */
void SwTaggedPDFHelper::EndTag()
{
mpPDFExtOutDevData->EndStructureElement();
@@ -486,11 +468,7 @@ void SwTaggedPDFHelper::EndTag()
#endif
}
-/*
- * SwTaggedPDFHelper::SetAttributes()
- *
- * Sets the attributes according to the structure type.
- */
+// Sets the attributes according to the structure type.
void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
{
vcl::PDFWriter::StructAttributeValue eVal;
@@ -845,9 +823,6 @@ void SwTaggedPDFHelper::SetAttributes(
vcl::PDFWriter::StructElement eType )
}
}
-/*
- * SwTaggedPDFHelper::BeginNumberedListStructureElements()
- */
void SwTaggedPDFHelper::BeginNumberedListStructureElements()
{
OSL_ENSURE( mpNumInfo, "List without mpNumInfo?" );
@@ -985,9 +960,6 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
}
}
-/*
- * SwTaggedPDFHelper::BeginBlockStructureElements()
- */
void SwTaggedPDFHelper::BeginBlockStructureElements()
{
const SwFrm* pFrm = &mpFrmInfo->mrFrm;
@@ -1323,9 +1295,6 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
}
}
-/*
- * SwTaggedPDFHelper::EndStructureElements()
- */
void SwTaggedPDFHelper::EndStructureElements()
{
while ( nEndStructureElement > 0 )
@@ -1337,9 +1306,6 @@ void SwTaggedPDFHelper::EndStructureElements()
CheckRestoreTag();
}
-/*
- * SwTaggedPDFHelper::BeginInlineStructureElements()
- */
void SwTaggedPDFHelper::BeginInlineStructureElements()
{
const SwLinePortion* pPor = &mpPorInfo->mrPor;
@@ -1471,18 +1437,12 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
}
}
-/*
- * static SwTaggedPDFHelper::IsExportTaggedPDF
- */
- bool SwTaggedPDFHelper::IsExportTaggedPDF( const OutputDevice& rOut )
- {
+bool SwTaggedPDFHelper::IsExportTaggedPDF( const OutputDevice& rOut )
+{
vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST(
vcl::PDFExtOutDevData, rOut.GetExtOutDevData() );
return pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportTaggedPDF();
- }
+}
-/*
- * SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper()
- */
SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh,
OutputDevice& rOut,
const OUString&
rPageRange,
@@ -1542,9 +1502,6 @@ SwEnhancedPDFExportHelper::~SwEnhancedPDFExportHelper()
delete mpRangeEnum;
}
-/*
- * SwEnhancedPDFExportHelper::EnhancedPDFExport()
- */
void SwEnhancedPDFExportHelper::EnhancedPDFExport()
{
vcl::PDFExtOutDevData* pPDFExtOutDevData =
@@ -2106,12 +2063,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
mrOut.Pop();
}
-/*
- * SwEnhancedPDFExportHelper::CalcOutputPageNum()
- *
- * Returns the page number in the output pdf on which the given rect is
located.
- * If this page is duplicated, method will return first occurrence of it.
- */
+// Returns the page number in the output pdf on which the given rect is
located.
+// If this page is duplicated, method will return first occurrence of it.
sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( const SwRect& rRect )
const
{
std::vector< sal_Int32 > aPageNums = CalcOutputPageNums( rRect );
@@ -2120,13 +2073,9 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum(
const SwRect& rRect ) co
return -1;
}
-/*
- * SwEnhancedPDFExportHelper::CalcOutputPageNums()
- *
- * Returns a vector of the page numbers in the output pdf on which the given
- * rect is located. There can be many such pages since StringRangeEnumerator
- * allows duplication of its entries.
- */
+// Returns a vector of the page numbers in the output pdf on which the given
+// rect is located. There can be many such pages since StringRangeEnumerator
+// allows duplication of its entries.
std::vector< sal_Int32 > SwEnhancedPDFExportHelper::CalcOutputPageNums(
const SwRect& rRect ) const
{
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index 7cbbc41..ed41f2a 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -32,23 +32,13 @@ class SwViewShell;
class SfxPoolItem;
extern const sal_uInt8 StackPos[];
-/*************************************************************************
- * class SwAttrHandler
- *
- * Used by Attribute Iterators to organize attributes on stacks to
- * find the valid attribute in each category
- *************************************************************************/
-
+// Used by Attribute Iterators to organize attributes on stacks to
+// find the valid attribute in each category
class SwAttrHandler
{
private:
- /*************************************************************************
- * class SwAttrStack
- *
- * Container for SwTxtAttr Objects
- *************************************************************************/
-
+ // Container for SwTxtAttr Objects
class SwAttrStack
{
private:
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index b2f628b..0de34cd 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -130,14 +130,10 @@ const sal_uInt8 StackPos[
static_cast<sal_uInt16>(RES_TXTATR_WITHEND_END) -
43, // RES_TXTATR_INPUTFIELD // 55
};
-/*************************************************************************
- * CharFmt::GetItem
- * returns the item set associated with an character/inet/auto style
- *************************************************************************/
-
namespace CharFmt
{
+// Returns the item set associated with an character/inet/auto style
const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr )
{
const SfxItemSet* pSet = 0;
@@ -161,11 +157,7 @@ const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr )
return pSet;
}
-/*************************************************************************
- * CharFmt::GetItem
- * extracts pool item of type nWhich from rAttr
- *************************************************************************/
-
+// Extracts pool item of type nWhich from rAttr
const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich )
{
if ( RES_TXTATR_INETFMT == rAttr.Which() ||
@@ -185,11 +177,7 @@ const SfxPoolItem* GetItem( const SwTxtAttr& rAttr,
sal_uInt16 nWhich )
return ( nWhich == rAttr.Which() ) ? &rAttr.GetAttr() : 0;
}
-/*************************************************************************
- * CharFmt::IsItemIncluded
- * checks if item is included in character/inet/auto style
- *************************************************************************/
-
+// checks if item is included in character/inet/auto style
bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr )
{
bool bRet = false;
@@ -200,7 +188,6 @@ bool IsItemIncluded( const sal_uInt16 nWhich, const
SwTxtAttr *pAttr )
return bRet;
}
-
}
/*************************************************************************
@@ -281,20 +268,12 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
return false;
}
-/*************************************************************************
- * SwAttrHandler::SwAttrStack::SwAttrStack()
- *************************************************************************/
-
inline SwAttrHandler::SwAttrStack::SwAttrStack()
: nCount( 0 ), nSize( INITIAL_NUM_ATTR )
{
pArray = pInitialArray;
}
-/*************************************************************************
- * SwAttrHandler::SwAttrStack::Insert()
- *************************************************************************/
-
void SwAttrHandler::SwAttrStack::Insert( const SwTxtAttr& rAttr, const
sal_uInt16 nPos )
{
// do we still have enough space?
@@ -334,10 +313,6 @@ void SwAttrHandler::SwAttrStack::Insert( const SwTxtAttr&
rAttr, const sal_uInt1
nCount++;
}
-/*************************************************************************
- * SwAttrHandler::SwAttrStack::Remove()
- *************************************************************************/
-
void SwAttrHandler::SwAttrStack::Remove( const SwTxtAttr& rAttr )
{
sal_uInt16 nPos = Pos( rAttr );
@@ -350,19 +325,11 @@ void SwAttrHandler::SwAttrStack::Remove( const SwTxtAttr&
rAttr )
}
}
-/*************************************************************************
- * SwAttrHandler::SwAttrStack::Top()
- *************************************************************************/
-
const SwTxtAttr* SwAttrHandler::SwAttrStack::Top() const
{
return nCount ? pArray[ nCount - 1 ] : 0;
}
-/*************************************************************************
- * SwAttrHandler::SwAttrStack::Pos()
- *************************************************************************/
-
sal_uInt16 SwAttrHandler::SwAttrStack::Pos( const SwTxtAttr& rAttr ) const
{
if ( ! nCount )
@@ -379,10 +346,6 @@ sal_uInt16 SwAttrHandler::SwAttrStack::Pos( const
SwTxtAttr& rAttr ) const
return USHRT_MAX;
}
-/*************************************************************************
- * SwAttrHandler::SwAttrHandler()
- *************************************************************************/
-
SwAttrHandler::SwAttrHandler()
: mpIDocumentSettingAccess(NULL)
, mpShell(NULL)
@@ -397,10 +360,6 @@ SwAttrHandler::~SwAttrHandler()
delete pFnt;
}
-/*************************************************************************
- * SwAttrHandler::Init()
- *************************************************************************/
-
void SwAttrHandler::Init( const SwAttrSet& rAttrSet,
const IDocumentSettingAccess& rIDocumentSettingAcces,
const SwViewShell* pSh )
@@ -460,10 +419,6 @@ void SwAttrHandler::Reset( )
aAttrStack[ i ].Reset();
}
-/*************************************************************************
- * SwAttrHandler::PushAndChg()
- *************************************************************************/
-
void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
{
// these special attributes in fact represent a collection of attributes
@@ -508,10 +463,6 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr,
SwFont& rFnt )
}
}
-/*************************************************************************
- * SwAttrHandler::Push()
- *************************************************************************/
-
bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
{
OSL_ENSURE( rItem.Which() < RES_TXTATR_WITHEND_END,
@@ -541,10 +492,6 @@ bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const
SfxPoolItem& rItem )
return false;
}
-/*************************************************************************
- * SwAttrHandler::PopAndChg()
- *************************************************************************/
-
void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
{
if ( RES_TXTATR_WITHEND_END <= rAttr.Which() )
@@ -585,12 +532,7 @@ void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr,
SwFont& rFnt )
}
}
-/*************************************************************************
- * SwAttrHandler::Pop()
- *
- * only used during redlining
- *************************************************************************/
-
+// only used during redlining
void SwAttrHandler::Pop( const SwTxtAttr& rAttr )
{
OSL_ENSURE( rAttr.Which() < RES_TXTATR_WITHEND_END,
@@ -602,9 +544,6 @@ void SwAttrHandler::Pop( const SwTxtAttr& rAttr )
}
}
-/*************************************************************************
- * SwAttrHandler::ActivateTop()
- *************************************************************************/
void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
{
OSL_ENSURE( nAttr < RES_TXTATR_WITHEND_END,
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 6f16858..0555322 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -29,12 +29,11 @@
// Nihct sichtbare Zeit:
#define BLINK_OFF_TIME 800L
-/*************************************************************************
- * pBlink points to the instance where blinking portions need to register.
+/* pBlink points to the instance where blinking portions need to register.
* If necessary, it needs to be created by SwBlink.
* They are then triggered rhythimcally for a repaint. They can query
* for being visible or invisible with IsVisible().
- *************************************************************************/
+ */
SwBlink *pBlink = NULL;
SwBlink::SwBlink()
@@ -50,12 +49,11 @@ SwBlink::~SwBlink( )
aTimer.Stop();
}
-/*************************************************************************
+/*
* SwBlink::Blinker (timer):
* Toggle visibility flag
* Determine the repaint rectangle and invalidate them in their OleShells.
- *************************************************************************/
-
+ */
IMPL_LINK_NOARG(SwBlink, Blinker)
{
bVisible = !bVisible;
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index b7040f9..4a73939 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -137,10 +137,6 @@ bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_Int32 nNew )
return false;
}
-/*************************************************************************
- * GetFrmAtOfst(), GetFrmAtPos()
- *************************************************************************/
-
SwTxtFrm& SwTxtFrm::GetFrmAtOfst( const sal_Int32 nWhere )
{
SwTxtFrm* pRet = this;
@@ -168,10 +164,6 @@ SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos )
return pFoll;
}
-/*************************************************************************
- * SwTxtFrm::GetCharRect()
- *************************************************************************/
-
/*
* GetCharRect() returns the char's char line described by aPos.
* GetCrsrOfst() does the reverse: It goes from a document coordinate to
@@ -357,10 +349,6 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const
SwPosition &rPos,
return bRet;
}
-/*************************************************************************
- * SwTxtFrm::GetAutoPos()
- *************************************************************************/
-
/*
* GetAutoPos() looks up the char's char line which is described by rPos
* and is used by the auto-positioned frame.
@@ -516,10 +504,6 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
return bRet;
}
-/*************************************************************************
- * SwTxtFrm::_GetCrsrOfst()
- *************************************************************************/
-
// Minimum distance of non-empty lines is a little less than 2 cm
#define FILL_MIN_DIST 1100
@@ -666,10 +650,6 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point&
rPoint,
return true;
}
-/*************************************************************************
- * virtual SwTxtFrm::GetCrsrOfst()
- *************************************************************************/
-
bool SwTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
@@ -685,10 +665,6 @@ bool SwTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
return _GetCrsrOfst( pPos, rPoint, nChgFrm != 0, pCMS );
}
-/*************************************************************************
- * SwTxtFrm::LeftMargin()
- *************************************************************************/
-
/*
* Layout-oriented cursor movement to the line start.
*/
@@ -722,10 +698,6 @@ bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
return true;
}
-/*************************************************************************
- * SwTxtFrm::RightMargin()
- *************************************************************************/
-
/*
* To the line end: That's the position before the last char of the line.
* Exception: In the last line, it should be able to place the cursor after
@@ -767,10 +739,6 @@ bool SwTxtFrm::RightMargin(SwPaM *pPam, bool bAPI) const
return true;
}
-/*************************************************************************
- * SwTxtFrm::_UnitUp()
- *************************************************************************/
-
// The following two methods try to put the Crsr into the next/succsessive
// line. If we do not have a preceding/successive line we forward the call
// to the base class.
@@ -1174,10 +1142,6 @@ void SwTxtFrm::PrepareVisualMove( sal_Int32& nPos,
sal_uInt8& nCrsrLevel,
ubidi_close( pBidi );
}
-/*************************************************************************
- * SwTxtFrm::_UnitDown()
- *************************************************************************/
-
bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
bool bSetInReadOnly ) const
{
@@ -1303,10 +1267,6 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips
nOffset,
return SwCntntFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
}
-/*************************************************************************
- * virtual SwTxtFrm::UnitUp()
- *************************************************************************/
-
bool SwTxtFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
bool bSetInReadOnly ) const
{
@@ -1326,10 +1286,6 @@ bool SwTxtFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
return bRet;
}
-/*************************************************************************
- * virtual SwTxtFrm::UnitDown()
- *************************************************************************/
-
bool SwTxtFrm::UnitDown(SwPaM *pPam, const SwTwips nOffset,
bool bSetInReadOnly ) const
{
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index cbabc00..d3992a4b 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -109,13 +109,9 @@ void SwTxtFrm::ValidateFrm()
UNDO_SWAP( this )
}
-/*************************************************************************
- * ValidateBodyFrm()
- * After a RemoveFtn the BodyFrm and all Frms contained within it, need to be
- * recalculated, so that the DeadLine is right.
- * First we search outwards, on the way back we calculate everything.
-*************************************************************************/
-
+// After a RemoveFtn the BodyFrm and all Frms contained within it, need to be
+// recalculated, so that the DeadLine is right.
+// First we search outwards, on the way back we calculate everything.
void _ValidateBodyFrm( SwFrm *pFrm )
{
if( pFrm && !pFrm->IsCellFrm() )
@@ -462,12 +458,10 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool
bHasToFit )
nRstHeight += nAdd;
}
-/* ------------------------------------
- * nRstHeight < 0 means that the TxtFrm is located completely outside of its
Upper.
- * This can happen, if it's located within a FlyAtCntFrm, which changed sides
by a
- * Grow(). In such a case, it's wrong to execute the following Grow().
- * In the case of a bug, we end up with an infinite loop.
- * -----------------------------------*/
+ // nRstHeight < 0 means that the TxtFrm is located completely outside
of its Upper.
+ // This can happen, if it's located within a FlyAtCntFrm, which
changed sides by a
+ // Grow(). In such a case, it's wrong to execute the following Grow().
+ // In the case of a bug, we end up with an infinite loop.
SwTwips nFrmHeight = (Frm().*fnRect->fnGetHeight)();
SwTwips nPrtHeight = (Prt().*fnRect->fnGetHeight)();
@@ -544,16 +538,11 @@ com::sun::star::uno::Sequence<
::com::sun::star::style::TabStop > SwTxtFrm::GetT
return tabs;
}
-/*************************************************************************
- * SwTxtFrm::AdjustFollow()
- * AdjustFollow expects the following situation:
- * The SwTxtIter points to the lower end of the Master, the Offset is set in
- * the Follow.
- * nOffset holds the Offset in the text string, from which the Master closes
- * and the Follow starts.
- * If it's 0, the FollowFrame is deleted.
- *************************************************************************/
-
+// AdjustFollow expects the following situation:
+// The SwTxtIter points to the lower end of the Master, the Offset is set in
the Follow.
+// nOffset holds the Offset in the text string, from which the Master closes
+// and the Follow starts.
+// If it's 0, the FollowFrame is deleted.
void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
const sal_Int32 nOffset, const sal_Int32 nEnd,
const sal_uInt8 nMode )
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index fbf317f..fe7aea5 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -21,10 +21,6 @@
#include <frminf.hxx>
#include <itrtxt.hxx>
-/*************************************************************************
- * SwTxtMargin::GetTxtStart()
- *************************************************************************/
-
sal_Int32 SwTxtMargin::GetTxtStart() const
{
const OUString &rTxt = GetInfo().GetTxt();
@@ -39,10 +35,6 @@ sal_Int32 SwTxtMargin::GetTxtStart() const
return nEnd;
}
-/*************************************************************************
- * SwTxtMargin::GetTxtEnd()
- *************************************************************************/
-
sal_Int32 SwTxtMargin::GetTxtEnd() const
{
const OUString &rTxt = GetInfo().GetTxt();
@@ -56,10 +48,6 @@ sal_Int32 SwTxtMargin::GetTxtEnd() const
return nStart;
}
-/*************************************************************************
- * SwTxtFrmInfo::IsOneLine()
- *************************************************************************/
-
// Does the paragraph fit into one line?
bool SwTxtFrmInfo::IsOneLine() const
{
@@ -81,10 +69,6 @@ bool SwTxtFrmInfo::IsOneLine() const
return true;
}
-/*************************************************************************
- * SwTxtFrmInfo::IsFilled()
- *************************************************************************/
-
// Is the line filled for X percent?
bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
{
@@ -98,10 +82,6 @@ bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
return KSHORT(nWidth) <= pLay->Width();
}
-/*************************************************************************
- * SwTxtFrmInfo::GetLineStart()
- *************************************************************************/
-
// Where does the text start (without whitespace)? (document global)
SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine ) const
{
@@ -116,10 +96,6 @@ SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor
&rLine ) const
return rLine.GetLineStart();
}
-/*************************************************************************
- * SwTxtFrmInfo::GetLineStart()
- *************************************************************************/
-
// Where does the text start (without whitespace)? (relative in the Frame)
SwTwips SwTxtFrmInfo::GetLineStart() const
{
@@ -165,10 +141,6 @@ SwTwips SwTxtFrmInfo::GetCharPos( sal_Int32 nChar, bool
bCenter ) const
return (( nNext + nStt ) / 2 ) - (pFrm->Frm().*fnRect->fnGetLeft)();
}
-/*************************************************************************
- * SwTxtFrmInfo::GetSpaces()
- *************************************************************************/
-
SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
const sal_Int32 nPos, const sal_Int32 nLen )
{
@@ -233,10 +205,6 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, bool
bWithLineBreak ) const
while( aLine.Next() );
}
-/*************************************************************************
- * SwTxtFrmInfo::IsBullet()
- *************************************************************************/
-
// Is there a bullet/symbol etc. at the text position?
// Fonts: CharSet, SYMBOL und DONTKNOW
bool SwTxtFrmInfo::IsBullet( sal_Int32 nTxtStart ) const
@@ -247,15 +215,10 @@ bool SwTxtFrmInfo::IsBullet( sal_Int32 nTxtStart ) const
return aLine.IsSymbol( nTxtStart );
}
-/*************************************************************************
- * SwTxtFrmInfo::GetFirstIndent()
- *************************************************************************/
-
// Get first line indent
// The precondition for a positive or negative first line indent:
// All lines (except for the first one) have the same left margin.
// We do not want to be so picky and work with a tolerance of TOLERANCE twips.
-
SwTwips SwTxtFrmInfo::GetFirstIndent() const
{
SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
@@ -288,10 +251,6 @@ SwTwips SwTxtFrmInfo::GetFirstIndent() const
return 1;
}
-/*************************************************************************
- * SwTxtFrmInfo::GetBigIndent()
- *************************************************************************/
-
sal_Int32 SwTxtFrmInfo::GetBigIndent( sal_Int32& rFndPos,
const SwTxtFrm *pNextFrm ) const
{
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 21b7121..1a65e03 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -42,14 +42,9 @@ using namespace ::com::sun::star::linguistic2;
#define CH_FULL_BLANK 0x3000
-/*************************************************************************
- * SwTxtGuess::Guess
- *
- * provides information for line break calculation
- * returns true if no line break has to be performed
- * otherwise possible break or hyphenation position is determined
- *************************************************************************/
-
+// provides information for line break calculation
+// returns true if no line break has to be performed
+// otherwise possible break or hyphenation position is determined
bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
const KSHORT nPorHeight )
{
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index dd6153f..3b489d9 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -26,10 +26,6 @@
class SwTxtFormatInfo;
-/*************************************************************************
- * class SwTxtGuess
- *************************************************************************/
-
class SwTxtGuess
{
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 8c303a0..d19f439 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -496,12 +496,7 @@ SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf
)
extern Color aGlobalRetoucheColor;
-/*************************************************************************
- * lcl_IsDarkBackground
- *
- * Returns if the current background color is dark.
- *************************************************************************/
-
+// Returns if the current background color is dark.
static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
{
const Color* pCol = rInf.GetFont()->GetBackColor();
@@ -536,10 +531,6 @@ static bool lcl_IsDarkBackground( const SwTxtPaintInfo&
rInf )
return pCol->IsDark();
}
-/*************************************************************************
- * SwTxtPaintInfo::_DrawText()
- *************************************************************************/
-
void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion
&rPor,
const sal_Int32 nStart, const sal_Int32
nLength,
const bool bKern, const bool bWrong,
@@ -788,17 +779,12 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
}
}
-/*************************************************************************
- * lcl_DrawSpecial
- *
- * Draws a special portion, e.g., line break portion, tab portion.
- * rPor - The portion
- * rRect - The rectangle surrounding the character
- * rCol - Specify a color for the character
- * bCenter - Draw the character centered, otherwise left aligned
- * bRotate - Rotate the character if character rotation is set
- *************************************************************************/
-
+// Draws a special portion, e.g., line break portion, tab portion.
+// rPor - The portion
+// rRect - The rectangle surrounding the character
+// rCol - Specify a color for the character
+// bCenter - Draw the character centered, otherwise left aligned
+// bRotate - Rotate the character if character rotation is set
static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion&
rPor,
SwRect& rRect, const Color& rCol, sal_Unicode cChar,
sal_uInt8 nOptions )
@@ -1377,14 +1363,11 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm
*pNewFrm, const bool bNewI
Init();
}
-/*************************************************************************
- * SwTxtFormatInfo::IsHyphenate()
- * If the Hyphenator returns ERROR or the language is set to NOLANGUAGE
- * we do not hyphenate.
- * Else, we always hyphenate if we do interactive hyphenation.
- * If we do not do interactive hyphenation, we only hyphenate if ParaFmt is
- * set to automatic hyphenation.
- *************************************************************************/
+// If the Hyphenator returns ERROR or the language is set to NOLANGUAGE
+// we do not hyphenate.
+// Else, we always hyphenate if we do interactive hyphenation.
+// If we do not do interactive hyphenation, we only hyphenate if ParaFmt is
+// set to automatic hyphenation.
bool SwTxtFormatInfo::IsHyphenate() const
{
if( !bInterHyph && !bAutoHyph )
@@ -1404,11 +1387,6 @@ bool SwTxtFormatInfo::IsHyphenate() const
return xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) );
}
-/*************************************************************************
- * SwTxtFormatInfo::GetDropFmt()
- * Dropcaps called by the SwTxtFormatter::CTOR
-*************************************************************************/
-
const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const
{
const SwFmtDrop *pDrop =
&GetTxtFrm()->GetTxtNode()->GetSwAttrSet().GetDrop();
@@ -1455,15 +1433,12 @@ void SwTxtFormatInfo::Init()
SetPaintOfst(0);
}
-/*--------------------------------------------------
- * There are a few differences between a copy constructor
- * and the following constructor for multi-line formatting.
- * The root is the first line inside the multi-portion,
- * the line start is the actual position in the text,
- * the line width is the rest width from the surrounding line
- * and the bMulti and bFirstMulti-flag has to be set correctly.
- * --------------------------------------------------*/
-
+// There are a few differences between a copy constructor
+// and the following constructor for multi-line formatting.
+// The root is the first line inside the multi-portion,
+// the line start is the actual position in the text,
+// the line width is the rest width from the surrounding line
+// and the bMulti and bFirstMulti-flag has to be set correctly.
SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
SwLineLayout& rLay, SwTwips nActWidth ) : SwTxtPaintInfo( rInf ),
bTabOverflow( false )
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 35c783e..a757222 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -70,11 +70,7 @@ class SwWrongList;
#define OPTDBG( rInf ) false
#endif
-/*************************************************************************
- * class SwLineInfo
- * Respects the attribute LineSpace when calculating the Height/Ascent
- *************************************************************************/
-
+// Respects the attribute LineSpace when calculating the Height/Ascent
class SwLineInfo
{
friend class SwTxtIter;
@@ -122,10 +118,6 @@ public:
friend SvStream & WriteSwLineInfo( SvStream &rOS, const SwLineInfo &rInf );
};
-/*************************************************************************
- * class SwTxtInfo
- *************************************************************************/
-
class SwTxtInfo
{
// Implementation in txthyph.cxx
@@ -149,10 +141,6 @@ public:
friend SvStream & WriteSwTxtInfo( SvStream &rOS, const SwTxtInfo &rInf );
};
-/*************************************************************************
- * class SwTxtSizeInfo
- *************************************************************************/
-
typedef ::std::map< sal_uLong, sal_IntPtr > SwTxtPortionMap;
class SwTxtSizeInfo : public SwTxtInfo
@@ -302,8 +290,6 @@ public:
KSHORT GetTxtHeight() const;
- // GetTxtSize
-
SwPosSize GetTxtSize( OutputDevice* pOut, const SwScriptInfo* pSI,
const OUString& rTxt, const sal_Int32 nIdx,
const sal_Int32 nLen, const sal_uInt16 nComp ) const;
@@ -315,8 +301,6 @@ public:
const sal_Int32 nLen, const sal_uInt16 nComp
) const;
inline SwPosSize GetTxtSize( const OUString &rTxt ) const;
- // GetTxtBreak
-
sal_Int32 GetTxtBreak( const long nLineWidth,
const sal_Int32 nMaxLen,
const sal_uInt16 nComp ) const;
@@ -393,10 +377,6 @@ public:
#endif
};
-/*************************************************************************
- * class SwTxtPaintInfo
- *************************************************************************/
-
class SwTxtPaintInfo : public SwTxtSizeInfo
{
const SwWrongList *pWrongList;
@@ -535,10 +515,6 @@ public:
inline const SwWrongList* GetSmartTags() const { return pSmartTags; }
};
-/*************************************************************************
- * class SwTxtFormatInfo
- *************************************************************************/
-
class SwTxtFormatInfo : public SwTxtPaintInfo
{
// temporary arguments for hyphenation
@@ -753,14 +729,11 @@ public:
inline bool IsTabOverflow() { return bTabOverflow; }
};
-/*************************************************************************
- * class SwTxtSlot
- * For the text replacement and restoration of SwTxtSizeInfo.
- * The way this is done is a bit of a hack: Although rInf is const we change it
- * anyway.
- * Because rInf is restorated again in the DTOR, we can do this.
- * You could call it a "logical const", if you wish.
-*************************************************************************/
+// For the text replacement and restoration of SwTxtSizeInfo.
+// The way this is done is a bit of a hack: Although rInf is const we change it
+// anyway.
+// Because rInf is restorated again in the DTOR, we can do this.
+// You could call it a "logical const", if you wish.
class SwTxtSlot
{
OUString aTxt;
@@ -782,10 +755,6 @@ public:
bool IsOn() const { return bOn; }
};
-/*************************************************************************
- * class SwFontSave
- *************************************************************************/
-
class SwFontSave
{
SwTxtSizeInfo *pInf;
@@ -797,9 +766,6 @@ public:
~SwFontSave();
};
-/*************************************************************************
- * Inline implementations of SwTxtSizeInfo
- *************************************************************************/
inline KSHORT SwTxtSizeInfo::GetAscent() const
{
SAL_WARN_IF( !GetOut(), "sw.core", "SwTxtSizeInfo::GetAscent() without
m_pOut" );
@@ -827,10 +793,6 @@ inline SwPosSize SwTxtSizeInfo::GetTxtSize( const
SwScriptInfo* pSI,
return GetTxtSize( m_pOut, pSI, *m_pTxt, nNewIdx, nNewLen, nCompress );
}
-/*************************************************************************
- * Inline implementations of SwTxtPaintInfo
- *************************************************************************/
-
inline SwTwips SwTxtPaintInfo::GetPaintOfst() const
{
return GetParaPortion()->GetRepaint()->GetOfst();
@@ -865,10 +827,6 @@ inline void SwTxtPaintInfo::DrawMarkedText( const
SwLinePortion &rPor,
((SwTxtPaintInfo*)this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern,
bWrong, bSmartTags, bGrammarCheck );
}
-/*************************************************************************
- * Inline implementations of SwTxtFormatInfo
- *************************************************************************/
-
inline sal_Int32 SwTxtFormatInfo::GetReformatStart() const
{
return GetParaPortion()->GetReformat()->Start();
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 2dca318..24e7111 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -35,10 +35,6 @@
using namespace ::com::sun::star;
-/*************************************************************************
- * SwTxtAdjuster::FormatBlock()
- *************************************************************************/
-
void SwTxtAdjuster::FormatBlock( )
{
// Block format does not apply to the last line.
@@ -113,9 +109,6 @@ void SwTxtAdjuster::FormatBlock( )
GetInfo().GetParaPortion()->GetRepaint()->SetOfst(0);
}
-/*************************************************************************
- * lcl_CheckKashidaPositions()
- *************************************************************************/
static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf,
SwTxtIter& rItr,
sal_Int32& rKashidas, sal_Int32& nGluePortion )
{
@@ -195,9 +188,6 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI,
SwTxtSizeInfo& rInf, S
return (rKashidas > 0);
}
-/*************************************************************************
- * lcl_CheckKashidaWidth()
- *************************************************************************/
static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf,
SwTxtIter& rItr, sal_Int32& rKashidas,
sal_Int32& nGluePortion, const long
nGluePortionWidth, long& nSpaceAdd )
{
@@ -255,14 +245,9 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI,
SwTxtSizeInfo& rInf, SwTx
return true;
}
-/*************************************************************************
- * SwTxtAdjuster::CalcNewBlock()
- *
- * CalcNewBlock() must only be called _after_ CalcLine()!
- * We always span between two RandPortions or FixPortions (Tabs and Flys).
- * We count the Glues and call ExpandBlock.
- *************************************************************************/
-
+// CalcNewBlock() must only be called _after_ CalcLine()!
+// We always span between two RandPortions or FixPortions (Tabs and Flys).
+// We count the Glues and call ExpandBlock.
void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
const SwLinePortion *pStopAt, SwTwips nReal,
bool bSkipKashida )
{
@@ -410,10 +395,6 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
}
}
-/*************************************************************************
- * SwTxtAdjuster::CalcKanaAdj()
- *************************************************************************/
-
SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
{
OSL_ENSURE( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing
CalcLine()" );
@@ -556,10 +537,6 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent
)
return nRepaintOfst;
}
-/*************************************************************************
- * SwTxtAdjuster::CalcRightMargin()
- *************************************************************************/
-
SwMarginPortion *SwTxtAdjuster::CalcRightMargin( SwLineLayout *pCurrent,
SwTwips nReal )
{
@@ -611,10 +588,6 @@ SwMarginPortion *SwTxtAdjuster::CalcRightMargin(
SwLineLayout *pCurrent,
return pRight;
}
-/*************************************************************************
- * SwTxtAdjuster::CalcFlyAdjust()
- *************************************************************************/
-
void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
{
// 1) We insert a left margin:
@@ -690,10 +663,6 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
pLeft->AdjustRight( pCurrent );
}
-/*************************************************************************
- * SwTxtAdjuster::CalcAdjLine()
- *************************************************************************/
-
void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
{
OSL_ENSURE( pCurrent->IsFormatAdj(), "CalcAdjLine: Why?" );
@@ -720,15 +689,10 @@ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
}
}
-/*************************************************************************
- * SwTxtAdjuster::CalcFlyPortion()
- *
- * This is a quite complicated calculation: nCurrWidth is the width _before_
- * adding the word, that still fits onto the line! For this reason the
FlyPortion's
- * width is still correct if we get a deadlock-situation of:
- * bFirstWord && !WORDFITS
- *************************************************************************/
-
+// This is a quite complicated calculation: nCurrWidth is the width _before_
+// adding the word, that still fits onto the line! For this reason the
FlyPortion's
+// width is still correct if we get a deadlock-situation of:
+// bFirstWord && !WORDFITS
SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long nRealWidth,
const SwRect &rCurrRect )
{
@@ -773,12 +737,7 @@ SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long
nRealWidth,
return pFlyPortion;
}
-/*************************************************************************
- * SwTxtPainter::_CalcDropAdjust()
- * Drops and Adjustment
- * CalcDropAdjust is called at the end by Format() if needed
- *************************************************************************/
-
+// CalcDropAdjust is called at the end by Format() if needed
void SwTxtAdjuster::CalcDropAdjust()
{
OSL_ENSURE( 1<GetDropLines() && SVX_ADJUST_LEFT!=GetAdjust() &&
SVX_ADJUST_BLOCK!=GetAdjust(),
@@ -862,10 +821,6 @@ void SwTxtAdjuster::CalcDropAdjust()
}
}
-/*************************************************************************
- * SwTxtAdjuster::CalcDropRepaint()
- *************************************************************************/
-
void SwTxtAdjuster::CalcDropRepaint()
{
Top();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
