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

Thorsten Behrens thorsten at kemper.freedesktop.org
Wed Apr 13 01:07:07 PDT 2011


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

New commits:
commit 8240aa1f90379d36a27b08f9b01513e8caf00166
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Apr 13 10:05:09 2011 +0200

    Fix input list default selection on ww8 import
    
    Fix for i#100621 - more correct pre-selection of list item for input
    fields - aligns import with export at least, though still not
    perfect - format docs say this is a dynamically-sized value (i.e.
    we're going to be wrong for item numbers 32 and higher)

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index cdf6491..3680f68 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2158,7 +2158,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
         nType=1;
     }
     fUnknown = nHeaderByte & 0x3;
-    fDropdownIndex = (nHeaderByte & 0xFC) >> 2;
+    fDropdownIndex = (nHeaderByte & 0x7C) >> 2;
     *pDataStream >> nField;
     fToolTip = nField & 0x01;
     fNoMark = (nField & 0x02)>>1;


More information about the Libreoffice-commits mailing list