summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorTsutomu Uchino <hanya@apache.org>2014-01-13 08:23:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-13 11:13:37 +0000
commitc1516d668f3f9c86de2f6e9c4bce60f152c7eb32 (patch)
tree9add76fefd5333a3762af1c008e99b315385ad85 /sc
parent30bb1eddba2b4a36b4354303ffcb37a3a15f38a6 (diff)
Resolves: #i91494# use the same font height for CJK text...
with Western in drawing object on Calc drawing layer (cherry picked from commit 0635f5cb82f0bb0717b8e74cded79a6fbb0f064c) Change-Id: Icc5f4e5a51a9b1d3a3f7f9715e3192015996c4fe
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/drwlayer.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index bdb82f6e60c9..aebeaa99c33c 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -260,10 +260,16 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) :
// set FontHeight pool defaults without changing static SdrEngineDefaults
SfxItemPool* pOutlinerPool = rOutliner.GetEditTextObjectPool();
if ( pOutlinerPool )
+ {
pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
+ pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CJK )); // 12Pt
+ }
SfxItemPool* pHitOutlinerPool = rHitOutliner.GetEditTextObjectPool();
if ( pHitOutlinerPool )
+ {
pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
+ pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CJK )); // 12Pt
+ }
// initial undo mode as in Calc document
if( pDoc )