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

[Julien Nabet]

 vcl/source/outdev/textline.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ab7e79e30f792b0c021b437064776a42b6ebda4
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Nov 25 23:02:48 2014 +0100

    Resolves fdo#86689: Strikethrough: "With /" and "With X"
    
    "static" keyword explains why first time the option is well taken into account and not the other times.
    So let's remove this and the option will be taken into account all the times.
    
    Cherry-picked from: f46a5d6dfddf86be0d77e00cf44f26af54a97c75
    
    Change-Id: I9db84373e425dfe21c307b965b1796c781cd7863
    Reviewed-on: https://gerrit.libreoffice.org/13126
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 862e1ac..541fed3 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -587,7 +587,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
         return;
 
     // prepare string for strikeout measurement
-    static char cStrikeoutChar =  eStrikeout == STRIKEOUT_SLASH ? '/' : 'X';
+    char cStrikeoutChar =  eStrikeout == STRIKEOUT_SLASH ? '/' : 'X';
     static const int nTestStrLen = 4;
     static const int nMaxStrikeStrLen = 2048;
     sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind...