summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/txtnode/fntcache.cxx24
1 files changed, 13 insertions, 11 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 92cce0af2eda..8e2e3d43ad64 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -103,19 +103,21 @@ void SwFntCache::Flush( )
|*
|*************************************************************************/
-SwFntObj::SwFntObj( const SwSubFont &rFont, const void *pOwn, SwViewShell *pSh ) :
- SwCacheObj( (void*)pOwn ),
- aFont( rFont ),
- pScrFont( NULL ),
- pPrtFont( &aFont ),
- pPrinter( NULL ),
- nPropWidth( rFont.GetPropWidth() )
+SwFntObj::SwFntObj(const SwSubFont &rFont, const void *pOwn, SwViewShell *pSh)
+ : SwCacheObj((void*)pOwn)
+ , aFont(rFont)
+ , pScrFont(NULL)
+ , pPrtFont(&aFont)
+ , pPrinter(NULL)
+ , nGuessedLeading(USHRT_MAX)
+ , nExtLeading(USHRT_MAX)
+ , nScrAscent(0)
+ , nPrtAscent(USHRT_MAX)
+ , nScrHeight(0)
+ , nPrtHeight(USHRT_MAX)
+ , nPropWidth(rFont.GetPropWidth())
{
nZoom = pSh ? pSh->GetViewOptions()->GetZoom() : USHRT_MAX;
- nGuessedLeading = USHRT_MAX;
- nExtLeading = USHRT_MAX;
- nPrtAscent = USHRT_MAX;
- nPrtHeight = USHRT_MAX;
bSymbol = RTL_TEXTENCODING_SYMBOL == aFont.GetCharSet();
bPaintBlank = ( UNDERLINE_NONE != aFont.GetUnderline()
|| UNDERLINE_NONE != aFont.GetOverline()