diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-02-25 14:46:21 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-02-25 15:08:05 +0100 |
| commit | 804f47a893359baa0b72f1a72df3d79302225654 (patch) | |
| tree | d452f8b62f024984ea7e9a740fb8b8955680e103 | |
| parent | e6cccd3df8397a07d6d5e403fa08cf0fd658b31e (diff) | |
fdo#55931, fdo#57956: Fix both autofit and stretched width.
This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of
fdo#55931), and fixes it a better way.
Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index f6f091b181f0..48b25f79c6d2 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2643,7 +2643,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF // ugly on the screen! OutputDevice* pDev = pOut ? pOut : GetRefDevice(); rFont.SetPhysFont( pDev ); - Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() ); + FontMetric aMetric( pDev->GetFontMetric() ); + + // Set the font as we want it to look like & reset the Propr attribute + // so that it is not counted twice. + Size aRealSz( aMetric.GetSize() ); + rFont.SetPropr( 100 ); + if ( aStatus.DoStretch() ) { if ( nStretchY != 100 ) |