svn commit: r1557658 - /openoffice/trunk/main/sc/source/core/data/drwlayer.cxx

[hanya]

Author: hanya
Date: Mon Jan 13 08:23:02 2014
New Revision: 1557658

URL: http://svn.apache.org/r1557658
Log:
#i91494# use the same font height for CJK text with Western in drawing object 
on Calc drawing layer

Modified:
    openoffice/trunk/main/sc/source/core/data/drwlayer.cxx

Modified: openoffice/trunk/main/sc/source/core/data/drwlayer.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/drwlayer.cxx?rev=1557658&r1=1557657&r2=1557658&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/drwlayer.cxx Mon Jan 13 08:23:02 
2014
@@ -274,11 +274,17 @@ ScDrawLayer::ScDrawLayer( ScDocument* pD
     // #95129# SJ: 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 )
         EnableUndo( pDoc->IsUndoEnabled() );