Kaydet (Commit) 4ec9f68f authored tarafından Ádám Csaba Király's avatar Ádám Csaba Király Kaydeden (comit) Cédric Bosdonnat

fdo#61458, index should be "flat"

Change-Id: I46db120fc5e7d616cd4c9eadee7fc4c502569e86
üst 730df392
...@@ -1559,6 +1559,32 @@ static String lcl_GetNumString( const SwTOXSortTabBase& rBase, bool bUsePrefix, ...@@ -1559,6 +1559,32 @@ static String lcl_GetNumString( const SwTOXSortTabBase& rBase, bool bUsePrefix,
return sRet; return sRet;
} }
/*--------------------------------------------------------------------
Description: Generate String with newlines changed to spaces,
consecutive spaces changed to a single space, and trailing space removed.
--------------------------------------------------------------------*/
String lcl_RemoveLineBreaks( String sRet )
{
xub_StrLen nOffset = 0;
sRet.SearchAndReplaceAll('\n', ' ');
for (xub_StrLen i = 1; i < sRet.Len(); i++)
{
if ( sRet.GetChar(i - 1) == ' ' && sRet.GetChar(i) == ' ' )
{
nOffset += 1;
}
else
{
sRet.SetChar(i - nOffset, sRet.GetChar(i));
}
}
if (sRet.GetChar(sRet.Len() - 1) == ' ')
{
nOffset += 1;
}
return sRet.Copy(0, sRet.Len() - nOffset);
}
// Add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> in order to control, // Add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> in order to control,
// which page description is used, no appropriate one is found. // which page description is used, no appropriate one is found.
void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
...@@ -1607,6 +1633,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, ...@@ -1607,6 +1633,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
{ {
SwIndex aIdx( pTOXNd, rTxt.Len() ); SwIndex aIdx( pTOXNd, rTxt.Len() );
rBase.FillText( *pTOXNd, aIdx ); rBase.FillText( *pTOXNd, aIdx );
rTxt = lcl_RemoveLineBreaks(rTxt);
} }
break; break;
...@@ -1617,6 +1644,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, ...@@ -1617,6 +1644,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
SwIndex aIdx( pTOXNd, rTxt.Len() ); SwIndex aIdx( pTOXNd, rTxt.Len() );
rBase.FillText( *pTOXNd, aIdx ); rBase.FillText( *pTOXNd, aIdx );
rTxt = lcl_RemoveLineBreaks(rTxt);
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment