sc/source/core/data/drwlayer.cxx | 8 ++++++++ 1 file changed, 8 insertions(+)
New commits: commit b78d6544eb7751af55ea302535efe42650d26353 Author: Caolán McNamara <[email protected]> Date: Mon Jan 13 11:14:40 2014 +0000 Related: #i91494# same for CTL as CJK Change-Id: I6dc5a720762e7c3cd7ccddeb607c386b7f68178e diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index aebeaa9..d352861 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -263,12 +263,14 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : { pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CJK )); // 12Pt + pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CTL )); // 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 + pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT_CTL )); // 12Pt } // initial undo mode as in Calc document commit c1516d668f3f9c86de2f6e9c4bce60f152c7eb32 Author: Tsutomu Uchino <[email protected]> Date: Mon Jan 13 08:23:02 2014 +0000 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 diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index bdb82f6..aebeaa9 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 )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
