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

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jun 8 06:33:48 PDT 2011


 sw/source/filter/ww8/ww8scan.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd702d8c2809fc0d640a46db6cfca79cadc29da0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 8 14:32:06 2011 +0100

    fix loss of init on merge
    (cherry picked from commit 0e530a0cf6e4a06b9c59033f23bb09470db256c1)

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index fc63edc..dbb8d2c 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;


More information about the Libreoffice-commits mailing list