[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - offapi/com sc/source

[Tsutomu Uchino]

 offapi/com/sun/star/awt/XMouseMotionListener.idl |    2 +-
 sc/source/core/data/drwlayer.cxx                 |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a66c0e11c326a072f0cb609af35d5e9d77fd3b63
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Mon Jan 13 09:14:35 2014 +0000

    #i72591# fix from mouse button to mouse pointer in documentation of mouseMoved method
    
    Patch By: christianjunker at gmail.com

diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 4d5ada4..223d6d9 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -56,7 +56,7 @@ published interface XMouseMotionListener: com::sun::star::lang::XEventListener
 
     //-------------------------------------------------------------------------
 
-    /** is invoked when the mouse button has been moved on a window
+    /** is invoked when the mouse pointer has been moved on a window
         (with no buttons down).
      */
     void mouseMoved( [in] com::sun::star::awt::MouseEvent e );
commit 0635f5cb82f0bb0717b8e74cded79a6fbb0f064c
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Mon Jan 13 08:23:02 2014 +0000

    #i91494# use the same font height for CJK text with Western in drawing object on Calc drawing layer

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 3f4e2d5..838a8a1 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -274,10 +274,16 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
     // #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 )