summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-11-25 23:02:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-11-26 10:07:41 +0000
commite22ad3682a07ae45fcd53a0f9e29a8166eb2d48a (patch)
tree77060af1276b25f19bf70ec86b280d8184dcee70
parentef436bfd8032d326a00d6273940880d5d5623629 (diff)
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/13125 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/outdev/textline.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index a5887c803809..da1d15585d94 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -591,7 +591,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...