summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-08 14:32:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-08 14:33:40 +0100
commitfd702d8c2809fc0d640a46db6cfca79cadc29da0 (patch)
treef1a63a1f77abf2d85748216717c73ae5252a3797
parent73a9de430716486d4bd7d535df257fb50889a12b (diff)
fix loss of init on merge
(cherry picked from commit 0e530a0cf6e4a06b9c59033f23bb09470db256c1)
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index fc63edccf9..dbb8d2ce63 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1919,7 +1919,7 @@ String WW8ReadPString(SvStream& rStrm, rtl_TextEncoding eEnc,
String WW8Read_xstz(SvStream& rStrm, sal_uInt16 nChars, bool bAtEndSeekRel1)
{
- sal_uInt16 b;
+ sal_uInt16 b(0);
if( nChars )
b = nChars;