[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/ui/chrdlg/drpcps.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 76682f53a4dbcd12b9d0c02a3bc6e264c32651af
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 4 11:31:14 2015 +0000

    tdf#88854 crash on opening drop caps
    
    Change-Id: I3ab56e4909d2a20dc8f0bafe0273e81065296f17
    (cherry picked from commit 727c3e088698dfd21cf4beaa5455d4c4d5b495fb)
    Reviewed-on: https://gerrit.libreoffice.org/14320
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 0dd8691..3449aab 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -393,7 +393,9 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
 
         rFnt.DrawPrev( this, mpPrinter, aPt, maText, nStart, nEnd - nStart );
 
-        aPt.X() += maScriptChanges[ nIdx ].textWidth;
+        if (!maScriptChanges.empty())
+            aPt.X() += maScriptChanges[ nIdx ].textWidth;
+
         if ( !GetNextScriptSegment(nIdx, nStart, nEnd, nScript) )
             break;
     }