[Libreoffice-commits] core.git: 2 commits - offapi/com vcl/source

[Tsutomu Uchino]

 offapi/com/sun/star/awt/XMouseMotionListener.idl |    2 +-
 vcl/source/gdi/outdev3.cxx                       |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

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

    Resolves: #i72591# fix from mouse button to mouse pointer...
    
    in documentation of mouseMoved method
    
    Patch By: christianjunker at gmail.com
    (cherry picked from commit a66c0e11c326a072f0cb609af35d5e9d77fd3b63)
    
    Change-Id: Ia39fc56d4459f303cd48e5654d8ff35155cceb4a

diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 10d7422..d866aef 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -44,7 +44,7 @@ published interface XMouseMotionListener: com::sun::star::lang::XEventListener
     void mouseDragged( [in] com::sun::star::awt::MouseEvent e );
 
 
-    /** 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 0198f54d25e6ec939ca4f341169d0c90d47b56d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 13 11:22:58 2014 +0000

    longparas: make OutputDevice::GetGlyphBoundRects safe
    
    Change-Id: I3dbb42b14a03c5bd98ebc1f67963ffe4c5e4b6b8

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index b888e77..0ba187b 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7185,8 +7185,19 @@ sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString&
 
     rVector.clear();
 
-    if( nLen == STRING_LEN )
+    if(nLen == 0x0FFFF)
+    {
+        SAL_INFO("sal.rtl.xub",
+                 "GetGlyphBoundRects Suspicious arguments nLen:" << nLen);
+    }
+
+    if( nIndex >= rStr.getLength() )
+        return false;
+
+    if( nLen < 0 || nIndex + nLen >= rStr.getLength() )
+    {
         nLen = rStr.getLength() - nIndex;
+    }
 
     Rectangle aRect;
     for( int i = 0; i < nLen; i++ )