summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-06-07 11:31:05 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-06-07 11:34:39 +0200
commit85f892a3a1dbaa3c36ac3f31186eef1ec0eea464 (patch)
tree0ae6634ede656838493ab78c24fe62c1428a81ee /sw
parent6fb45a8c8bf7f5560e0e88f810e753c0d65b625e (diff)
ugly workaround for external leading with symbol fonts (bnc#823626)
I'd much rather find the code using external leading in Writer's layout, but this font rendering and layout stuff is so complicated. Change-Id: Iaf58af387a6727eb18f5a9d1613de3ae30d7c35e
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/txtnode/fntcache.cxx17
1 files changed, 17 insertions, 0 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 3609b8b553b8..f01aec7d0c83 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -379,6 +379,23 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& r
bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
GuessLeading( *pSh, aMet );
nExtLeading = static_cast<sal_uInt16>(aMet.GetExtLeading());
+ /* HACK: There is something wrong with Writer's bullet rendering, causing lines
+ with bullets to be higher than they should be. I think this is because
+ Writer uses font's external leading incorrect, as the vertical distance
+ added to every line instead of only a distance between multiple lines,
+ which means a single bullet has external leading added even though it
+ shouldn't, but frankly this is just an educated guess rather than understanding
+ Writer's layout (heh).
+ Symbol font in some documents is 'StarSymbol; Arial Unicode MS', and Windows
+ machines often do not have StarSymbol, falling back to Arial Unicode MS, which
+ has unusually high external leading. So just reset external leading for fonts
+ which are used to bullets, as those should not be used on multiple lines anyway,
+ so in correct rendering external leading should be irrelevant anyway.
+ Interestingly enough, bSymbol is false for 'StarSymbol; Arial Unicode MS', so
+ also check explicitly.
+ */
+ if( bSymbol || IsStarSymbol( pPrtFont->GetName()))
+ nExtLeading = 0;
}
const IDocumentSettingAccess& rIDSA = *pSh->getIDocumentSettingAccess();