sw/source/core/text/porlay.cxx | 223 +++++++++++++----------------------------
1 file changed, 76 insertions(+), 147 deletions(-)
New commits:
commit cf6c32b7c4a5f7d182ae082aaf391553d6c1891a
Author: Philipp Weissenbacher <p.weissenbac...@gmail.com>
Date: Tue Jun 5 13:57:00 2012 +0200
Translate German comments, actualize some English ones
Change-Id: I460be3ddef4a5f2f71682895a5819923eb1d149e
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 533751e..2ca71cf 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -142,13 +142,11 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode
cPrevCh )
/*************************************************************************
* SwLineLayout::~SwLineLayout()
*
- * class SwLineLayout: Das Layout einer einzelnen Zeile. Dazu
- * gehoeren vor allen Dingen die Dimension, die Anzahl der
- * Character und der Wortzwischenraeume in der Zeile.
- * Zeilenobjekte werden in einem eigenen Pool verwaltet, um zu
- * erreichen, dass sie im Speicher moeglichst beeinander liegen
- * (d.h. zusammen gepaged werden und den Speicher nicht
- * fragmentieren).
+ * class SwLineLayout: This is the layout of a single line, which is made
+ * up of it's dimension, the character count and the word spacing in the
+ * line.
+ * Line objects are managed in an own pool, in order to store them continuously
+ * in memory so that they are paged out together and don't fragment memory.
*************************************************************************/
SwLineLayout::~SwLineLayout()
@@ -163,8 +161,8 @@ SwLineLayout::~SwLineLayout()
SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
{
- // Erster Attributwechsel, Masse und Laengen
- // aus *pCurr in die erste Textportion kopieren.
+ // First attribute change: copy mass and length from *pIns into the first
+ // text portion
if( !pPortion )
{
if( GetLen() )
@@ -182,21 +180,21 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
return pIns;
}
}
- // mit Skope aufrufen, sonst Rekursion !
+ // Call with scope or we'll end up with recursion!
return pPortion->SwLinePortion::Insert( pIns );
}
SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
{
- // Erster Attributwechsel, Masse und Laengen
- // aus *pCurr in die erste Textportion kopieren.
+ // First attribute change: copy mass and length from *pIns into the first
+ // text portion
if( !pPortion )
pPortion = new SwTxtPortion( *(SwLinePortion*)this );
- // mit Skope aufrufen, sonst Rekursion !
+ // Call with scope or we'll end up with recursion!
return pPortion->SwLinePortion::Append( pIns );
}
-// fuer die Sonderbehandlung bei leeren Zeilen
+// For special treatment of empty lines
sal_Bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
{
@@ -212,7 +210,8 @@ sal_Bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
/*************************************************************************
* SwLineLayout::CalcLeftMargin()
*
- * Wir sammeln alle FlyPortions am Anfang der Zeile zu einer MarginPortion.
+ * We collect all FlyPortions at the beginning of the line and make that a
+ * MarginPortion.
*************************************************************************/
SwMarginPortion *SwLineLayout::CalcLeftMargin()
@@ -242,7 +241,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
{
if( pPos->IsFlyPortion() )
{
- // Die FlyPortion wird ausgesogen ...
+ // The FlyPortion get's sucked out ...
pLeft->Join( (SwGluePortion*)pPos );
pPos = pLeft->GetPortion();
if( GetpKanaComp() && !GetKanaComp().empty() )
@@ -291,7 +290,7 @@ bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen
nStt, xub_StrLen nEnd
/*************************************************************************
* SwLineLayout::CalcLine()
*
- * Aus FormatLine() ausgelagert.
+ * Swapped out from FormatLine()
*************************************************************************/
void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
@@ -336,20 +335,19 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf )
SwLinePortion *pLast = this;
KSHORT nMaxDescent = 0;
- // Eine Gruppe ist ein Abschnitt in der Portion-Kette von
- // pCurr oder einer Fix-Portion bis zum Ende bzw. zur naechsten
- // Fix-Portion.
+ // A group is a segment in the portion chain of pCurr or a fixed
+ // portion spanning to the end or the next fixed portion
while( pPos )
{
OSL_ENSURE( POR_LIN != pPos->GetWhichPor(),
"SwLineLayout::CalcLine: don't use SwLinePortions !" );
- // Null-Portions werden eliminiert. Sie koennen entstehen,
- // wenn zwei FlyFrms ueberlappen.
+ // Null portions are eliminated. They can form if two FlyFrms
+ // overlap.
if( !pPos->Compress() )
{
- // 8110: Hoehe und Ascent nur uebernehmen, wenn sonst in
der
- // Zeile nichts mehr los ist.
+ // Only take over Height and Ascent if the rest of the line
+ // is empty.
if( !pPos->GetPortion() )
{
if( !Height() )
@@ -382,8 +380,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf )
bHasOnlyBlankPortions = false;
- // Es gab Attributwechsel: Laengen und Masse aufaddieren;
- // bzw.Maxima bilden.
+ // We had an attribute change: Sum up/build maxima of length
and mass
KSHORT nPosHeight = pPos->Height();
KSHORT nPosAscent = pPos->GetAscent();
@@ -397,8 +394,9 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf )
rInf.GetParaPortion()->SetMargin( sal_True );
}
- // Damit ein Paragraphende-Zeichen nicht durch ein Descent zu
einer
- // geaenderten Zeilenhoehe und zum Umformatieren fuehrt.
+ // To prevent that a paragraph-end-character does not change
+ // the line height through a Descent and thus causing the line
+ // to reformat.
if ( !pPos->IsBreakPortion() || !Height() )
{
bOnlyPostIts &= pPos->IsPostItsPortion();
@@ -1580,7 +1578,7 @@ sal_uInt8 SwScriptInfo::CompType( const xub_StrLen nPos )
const
/*************************************************************************
* SwScriptInfo::HasKana()
* returns, if there are compressable kanas or specials
- * betwenn nStart and nEnd
+ * between nStart and nEnd
*************************************************************************/
sal_uInt16 SwScriptInfo::HasKana( xub_StrLen nStart, const xub_StrLen nLen )
const
@@ -1735,7 +1733,7 @@ sal_uInt16 SwScriptInfo::KashidaJustify( sal_Int32*
pKernArray,
if( !IsKashidaLine(nStt))
return STRING_LEN;
- // evaluate kashida informatin in collected in SwScriptInfo
+ // evaluate kashida information in collected in SwScriptInfo
sal_uInt16 nCntKash = 0;
while( nCntKash < CountKashida() )
@@ -1996,7 +1994,7 @@ void SwScriptInfo::ClearNoKashidaLine ( xub_StrLen nStt,
xub_StrLen nLen )
}
/*************************************************************************
- * SwScriptInfo::MarkKashidasInvalid()
+ * SwScriptInfo::MarkKashidasInvalid()
*
* mark the given character indices as invalid kashida positions
************************************************************************/
@@ -2139,7 +2137,7 @@ void SwLineLayout::Init( SwLinePortion* pNextPortion )
* HangingMargin()
* looks for hanging punctuation portions in the paragraph
* and return the maximum right offset of them.
- * If no such portion is found, the Margin/Hanging-flags will be atualized.
+ * If no such portion is found, the Margin/Hanging-flags will be updated.
* --------------------------------------------------*/
SwTwips SwLineLayout::_GetHangingMargin() const
@@ -2161,7 +2159,7 @@ SwTwips SwLineLayout::_GetHangingMargin() const
pPor = pPor->GetPortion();
}
- if( !bFound ) // actualize the hanging-flag
+ if( !bFound ) // update the hanging-flag
((SwLineLayout*)this)->SetHanging( sal_False );
return nDiff;
}
@@ -2180,7 +2178,7 @@ SwTwips SwTxtFrm::HangingMargin() const
nRet = nDiff;
pLine = pLine->GetNext();
} while ( pLine );
- if( !nRet ) // actualize the margin-flag
+ if( !nRet ) // update the margin-flag
((SwParaPortion*)GetPara())->SetMargin( sal_False );
return nRet;
}
commit 561aeedfb7513342bcbb4e76d5f8348a195dc374
Author: Philipp Weissenbacher <p.weissenbac...@gmail.com>
Date: Tue Jun 5 13:31:22 2012 +0200
Clean up whitespace and remove silly comments
Change-Id: I7651c56cdf25e2f6ed8045b81fb3b3c49bb291d9
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 7d8bdee..533751e 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -34,8 +34,8 @@
#include "blink.hxx" // pBlink
#include "redlnitr.hxx" // SwRedlineItr
#include "porfly.hxx" // SwFlyCntPortion
-#include <porrst.hxx> // SwHangingPortion
-#include <pormulti.hxx> // SwMultiPortion
+#include <porrst.hxx> // SwHangingPortion
+#include <pormulti.hxx> // SwMultiPortion
#include <breakit.hxx>
#include <unicode/uchar.h>
#include <com/sun/star/i18n/ScriptType.hdl>
@@ -52,8 +52,8 @@
#include <i18npool/mslangid.hxx>
#include <charfmt.hxx>
#include <fchrfmt.hxx>
-#include <docary.hxx> // SwRedlineTbl
-#include <redline.hxx> // SwRedline
+#include <docary.hxx> // SwRedlineTbl
+#include <redline.hxx> // SwRedline
#include <section.hxx>
#include <switerator.hxx>
#include <IDocumentRedlineAccess.hxx>
@@ -94,7 +94,7 @@ sal_Bool isTransparentChar ( xub_Unicode cCh )
}
/*************************************************************************
- * lcl_IsLigature
+ * lcl_IsLigature
*
* Checks if cCh + cNectCh builds a ligature (used for Kashidas)
*************************************************************************/
@@ -106,7 +106,7 @@ sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode
cNextCh )
}
/*************************************************************************
- * lcl_ConnectToPrev
+ * lcl_ConnectToPrev
*
* Checks if cCh is connectable to cPrevCh (used for Kashidas)
*************************************************************************/
@@ -124,7 +124,7 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode
cPrevCh )
}
/*************************************************************************
- * lcl_HasStrongLTR
+ * lcl_HasStrongLTR
*************************************************************************/
bool lcl_HasStrongLTR ( const String& rTxt, xub_StrLen nStart, xub_StrLen
nEnd )
{
@@ -140,7 +140,7 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode
cPrevCh )
}
/*************************************************************************
- * SwLineLayout::~SwLineLayout()
+ * SwLineLayout::~SwLineLayout()
*
* class SwLineLayout: Das Layout einer einzelnen Zeile. Dazu
* gehoeren vor allen Dingen die Dimension, die Anzahl der
@@ -161,10 +161,6 @@ SwLineLayout::~SwLineLayout()
delete pKanaComp;
}
-/*************************************************************************
- * virtual SwLineLayout::Insert()
- *************************************************************************/
-
SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
{
// Erster Attributwechsel, Masse und Laengen
@@ -190,10 +186,6 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
return pPortion->SwLinePortion::Insert( pIns );
}
-/*************************************************************************
- * virtual SwLineLayout::Append()
- *************************************************************************/
-
SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
{
// Erster Attributwechsel, Masse und Laengen
@@ -204,10 +196,6 @@ SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
return pPortion->SwLinePortion::Append( pIns );
}
-/*************************************************************************
- * virtual SwLineLayout::Format()
- *************************************************************************/
-
// fuer die Sonderbehandlung bei leeren Zeilen
sal_Bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
@@ -222,7 +210,7 @@ sal_Bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwLineLayout::CalcLeftMargin()
+ * SwLineLayout::CalcLeftMargin()
*
* Wir sammeln alle FlyPortions am Anfang der Zeile zu einer MarginPortion.
*************************************************************************/
@@ -266,10 +254,6 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
return pLeft;
}
-/*************************************************************************
- * SwLineLayout::InitSpaceAdd()
- *************************************************************************/
-
void SwLineLayout::InitSpaceAdd()
{
if ( !pLLSpaceAdd )
@@ -278,10 +262,6 @@ void SwLineLayout::InitSpaceAdd()
SetLLSpaceAdd( 0, 0 );
}
-/*************************************************************************
- * SwLineLayout::CreateSpaceAdd()
- *************************************************************************/
-
void SwLineLayout::CreateSpaceAdd( const long nInit )
{
pLLSpaceAdd = new std::vector<long>;
@@ -309,7 +289,7 @@ bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen
nStt, xub_StrLen nEnd
}
/*************************************************************************
- * SwLineLayout::CalcLine()
+ * SwLineLayout::CalcLine()
*
* Aus FormatLine() ausgelagert.
*************************************************************************/
@@ -617,10 +597,6 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
}
}
-/*************************************************************************
- * class SwCharRange
- *************************************************************************/
-
SwCharRange &SwCharRange::operator+=(const SwCharRange &rRange)
{
if(0 != rRange.nLen ) {
@@ -641,28 +617,23 @@ SwCharRange &SwCharRange::operator+=(const SwCharRange
&rRange)
return *this;
}
-/*************************************************************************
- * SwScriptInfo::SwScriptInfo()
- *************************************************************************/
SwScriptInfo::SwScriptInfo() :
nInvalidityPos( 0 ),
nDefaultDir( 0 )
{
};
-/*************************************************************************
- * SwScriptInfo::~SwScriptInfo()
- *************************************************************************/
SwScriptInfo::~SwScriptInfo()
{
}
/*************************************************************************
- * SwScriptInfo::WhichFont()
+ * SwScriptInfo::WhichFont()
*
* Converts i18n Script Type (LATIN, ASIAN, COMPLEX, WEAK) to
* Sw Script Types (SW_LATIN, SW_CJK, SW_CTL), used to identify the font
- *************************************************************************/
+*************************************************************************/
+
sal_uInt8 SwScriptInfo::WhichFont( xub_StrLen nIdx, const String* pTxt, const
SwScriptInfo* pSI )
{
OSL_ENSURE( pTxt || pSI,"How should I determine the script type?" );
@@ -686,7 +657,7 @@ sal_uInt8 SwScriptInfo::WhichFont( xub_StrLen nIdx, const
String* pTxt, const Sw
}
/*************************************************************************
- * SwScriptInfo::InitScriptInfo()
+ * SwScriptInfo::InitScriptInfo()
*
* searches for script changes in rTxt and stores them
*************************************************************************/
@@ -1317,7 +1288,7 @@ void SwScriptInfo::UpdateBidiInfo( const String& rTxt )
/*************************************************************************
- * SwScriptInfo::NextScriptChg(..)
+ * SwScriptInfo::NextScriptChg(..)
* returns the position of the next character which belongs to another script
* than the character of the actual (input) position.
* If there's no script change until the end of the paragraph, it will return
@@ -1340,7 +1311,7 @@ xub_StrLen SwScriptInfo::NextScriptChg( const xub_StrLen
nPos ) const
}
/*************************************************************************
- * SwScriptInfo::ScriptType(..)
+ * SwScriptInfo::ScriptType(..)
* returns the script of the character at the input position
*************************************************************************/
@@ -1385,7 +1356,7 @@ sal_uInt8 SwScriptInfo::DirType( const xub_StrLen nPos )
const
}
/*************************************************************************
- * SwScriptInfo::MaskHiddenRanges(..)
+ * SwScriptInfo::MaskHiddenRanges(..)
* Takes a string and replaced the hidden ranges with cChar.
**************************************************************************/
@@ -1425,7 +1396,7 @@ sal_uInt16 SwScriptInfo::MaskHiddenRanges( const
SwTxtNode& rNode, XubString& rT
}
/*************************************************************************
- * SwScriptInfo::DeleteHiddenRanges(..)
+ * SwScriptInfo::DeleteHiddenRanges(..)
* Takes a SwTxtNode and deletes the hidden ranges from the node.
**************************************************************************/
@@ -1448,7 +1419,7 @@ void SwScriptInfo::DeleteHiddenRanges( SwTxtNode& rNode )
}
/*************************************************************************
- * SwScriptInfo::GetBoundsOfHiddenRange(..)
+ * SwScriptInfo::GetBoundsOfHiddenRange(..)
* static version
**************************************************************************/
@@ -1536,7 +1507,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const
SwTxtNode& rNode, xub_StrLen nP
}
/*************************************************************************
- * SwScriptInfo::GetBoundsOfHiddenRange(..)
+ * SwScriptInfo::GetBoundsOfHiddenRange(..)
* non-static version
**************************************************************************/
@@ -1574,10 +1545,6 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( xub_StrLen
nPos, xub_StrLen& rnStartP
return CountHiddenChg() > 0;
}
-/*************************************************************************
- * SwScriptInfo::IsInHiddenRange()
- **************************************************************************/
-
bool SwScriptInfo::IsInHiddenRange( const SwTxtNode& rNode, xub_StrLen nPos )
{
xub_StrLen nStartPos;
@@ -1589,7 +1556,7 @@ bool SwScriptInfo::IsInHiddenRange( const SwTxtNode&
rNode, xub_StrLen nPos )
#ifdef DBG_UTIL
/*************************************************************************
- * SwScriptInfo::CompType(..)
+ * SwScriptInfo::CompType(..)
* returns the type of the compressed character
*************************************************************************/
@@ -1611,7 +1578,7 @@ sal_uInt8 SwScriptInfo::CompType( const xub_StrLen nPos )
const
#endif
/*************************************************************************
- * SwScriptInfo::HasKana()
+ * SwScriptInfo::HasKana()
* returns, if there are compressable kanas or specials
* betwenn nStart and nEnd
*************************************************************************/
@@ -1636,10 +1603,6 @@ sal_uInt16 SwScriptInfo::HasKana( xub_StrLen nStart,
const xub_StrLen nLen ) con
return USHRT_MAX;
}
-/*************************************************************************
- * SwScriptInfo::Compress()
- *************************************************************************/
-
long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx,
xub_StrLen nLen,
const sal_uInt16 nCompress, const sal_uInt16
nFontHeight,
Point* pPoint ) const
@@ -1753,7 +1716,7 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray,
xub_StrLen nIdx, xub_StrLen
}
/*************************************************************************
- * SwScriptInfo::KashidaJustify()
+ * SwScriptInfo::KashidaJustify()
*************************************************************************/
// Note on calling KashidaJustify():
@@ -1845,7 +1808,7 @@ sal_uInt16 SwScriptInfo::KashidaJustify( sal_Int32*
pKernArray,
}
/*************************************************************************
- * SwScriptInfo::IsArabicText()
+ * SwScriptInfo::IsArabicText()
*
* Checks if the current text is 'Arabic' text. Note that only the first
* character has to be checked because a ctl portion only contains one
@@ -1887,10 +1850,6 @@ bool SwScriptInfo::IsArabicText( const rtl::OUString&
rTxt, sal_Int32 nStt, sal_
return false;
}
-/*************************************************************************
- * SwScriptInfo::IsKashidaValid()
- *************************************************************************/
-
sal_Bool SwScriptInfo::IsKashidaValid ( xub_StrLen nKashPos ) const
{
for ( size_t i = 0; i < aKashidaInvalid.size(); ++i )
@@ -1901,10 +1860,6 @@ sal_Bool SwScriptInfo::IsKashidaValid ( xub_StrLen
nKashPos ) const
return true;
}
-/*************************************************************************
- * SwScriptInfo::ClearKashidaInvalid()
- *************************************************************************/
-
void SwScriptInfo::ClearKashidaInvalid ( xub_StrLen nKashPos )
{
for ( size_t i = 0; i < aKashidaInvalid.size(); ++i )
@@ -1918,13 +1873,14 @@ void SwScriptInfo::ClearKashidaInvalid ( xub_StrLen
nKashPos )
}
/*************************************************************************
- * SwScriptInfo::MarkOrClearKashidaInvalid()
- *************************************************************************/
-// bMark == true:
-// marks the first valid kashida in the given text range as invalid
-
-// bMark == false:
-// clears all kashida invalid flags in the given text range
+ * SwScriptInfo::MarkOrClearKashidaInvalid()
+ *
+ * bMark == true:
+ * marks the first valid kashida in the given text range as invalid
+ *
+ * bMark == false:
+ * clears all kashida invalid flags in the given text range
+*************************************************************************/
bool SwScriptInfo::MarkOrClearKashidaInvalid ( xub_StrLen nStt, xub_StrLen
nLen, bool bMark, xub_StrLen nMarkCount )
{
@@ -1971,9 +1927,10 @@ void SwScriptInfo::MarkKashidaInvalid ( xub_StrLen
nKashPos )
}
/*************************************************************************
- * SwScriptInfo::GetKashidaPositions()
- *************************************************************************/
-// retrieve the kashida positions in the given text range
+ * SwScriptInfo::GetKashidaPositions()
+ * retrieve the kashida positions in the given text range
+*************************************************************************/
+
sal_uInt16 SwScriptInfo::GetKashidaPositions ( xub_StrLen nStt, xub_StrLen
nLen,
xub_StrLen* pKashidaPosition )
{
@@ -2009,9 +1966,9 @@ void SwScriptInfo::SetNoKashidaLine ( xub_StrLen nStt,
xub_StrLen nLen )
}
/*************************************************************************
- * SwScriptInfo::IsKashidaLine()
- *************************************************************************/
-// determines if the line uses kashida justification
+ * SwScriptInfo::IsKashidaLine()
+ * determines if the line uses kashida justification
+*************************************************************************/
bool SwScriptInfo::IsKashidaLine ( xub_StrLen nCharIdx ) const
{
@@ -2022,9 +1979,6 @@ bool SwScriptInfo::IsKashidaLine ( xub_StrLen nCharIdx )
const
}
return true;
}
-/*************************************************************************
- * SwScriptInfo::ClearKashidaLine()
- *************************************************************************/
void SwScriptInfo::ClearNoKashidaLine ( xub_StrLen nStt, xub_StrLen nLen )
{
@@ -2043,8 +1997,10 @@ void SwScriptInfo::ClearNoKashidaLine ( xub_StrLen nStt,
xub_StrLen nLen )
/*************************************************************************
* SwScriptInfo::MarkKashidasInvalid()
- *************************************************************************/
-// mark the given character indices as invalid kashida positions
+ *
+ * mark the given character indices as invalid kashida positions
+************************************************************************/
+
bool SwScriptInfo::MarkKashidasInvalid ( xub_StrLen nCnt, xub_StrLen*
pKashidaPositions )
{
OSL_ENSURE( pKashidaPositions && nCnt > 0, "Where are kashidas?" );
@@ -2071,10 +2027,6 @@ bool SwScriptInfo::MarkKashidasInvalid ( xub_StrLen
nCnt, xub_StrLen* pKashidaPo
return true;
}
-/*************************************************************************
- * SwScriptInfo::ThaiJustify()
- *************************************************************************/
-
sal_Int32 SwScriptInfo::ThaiJustify( const rtl::OUString& rTxt, sal_Int32*
pKernArray,
sal_Int32* pScrArray, sal_Int32 nStt,
sal_Int32 nLen, sal_Int32 nNumberOfBlanks,
@@ -2113,10 +2065,6 @@ sal_Int32 SwScriptInfo::ThaiJustify( const
rtl::OUString& rTxt, sal_Int32* pKern
return nCnt;
}
-/*************************************************************************
- * SwScriptInfo::GetScriptInfo()
- *************************************************************************/
-
SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd,
sal_Bool bAllowInvalid )
{
@@ -2137,9 +2085,6 @@ SwScriptInfo* SwScriptInfo::GetScriptInfo( const
SwTxtNode& rTNd,
return pScriptInfo;
}
-/*************************************************************************
- * SwParaPortion::SwParaPortion()
- *************************************************************************/
SwParaPortion::SwParaPortion()
{
FormatReset();
@@ -2147,16 +2092,10 @@ SwParaPortion::SwParaPortion()
SetWhichPor( POR_PARA );
}
-/*************************************************************************
- * SwParaPortion::~SwParaPortion()
- *************************************************************************/
SwParaPortion::~SwParaPortion()
{
}
-/*************************************************************************
- * SwParaPortion::GetParLen()
- *************************************************************************/
xub_StrLen SwParaPortion::GetParLen() const
{
xub_StrLen nLen = 0;
@@ -2169,10 +2108,6 @@ xub_StrLen SwParaPortion::GetParLen() const
return nLen;
}
-/*************************************************************************
- * SwParaPortion::FindDropPortion()
- *************************************************************************/
-
const SwDropPortion *SwParaPortion::FindDropPortion() const
{
const SwLineLayout *pLay = this;
@@ -2190,10 +2125,6 @@ const SwDropPortion *SwParaPortion::FindDropPortion()
const
return NULL;
}
-/*************************************************************************
- * SwLineLayout::Init()
- *************************************************************************/
-
void SwLineLayout::Init( SwLinePortion* pNextPortion )
{
Height( 0 );
@@ -2256,7 +2187,7 @@ SwTwips SwTxtFrm::HangingMargin() const
/*************************************************************************
- * SwScriptInfo::CalcHiddenRanges()
+ * SwScriptInfo::CalcHiddenRanges()
*
* Returns a MultiSection indicating the hidden ranges.
*************************************************************************/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
