[Libreoffice-commits] core.git: filter/source

[Stephan Bergmann]

 filter/source/msfilter/msdffimp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c000c1f38fd603512cf94d166eb7b779aa8d529
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 14 11:44:10 2014 +0100

    Fix conversion from MS-ODRAW gtextSpacing to SvxCharScaleWidthItem
    
    ... i.e., from 16.16 FixedPoint with default value 0x00010000 to percentage.  At
    least that is what I assume the odd code that looked like that since its
    inception in f90ea7408ebbe2a2d53e94f1dc16d0e3623f59d8 "INTEGRATION: CWS sj09"
    was acutally supposed to do.
    
    Change-Id: I482fb3c1d00757b2f18c587bbb6b4a6755392d2f

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 5522d64..2e9e5f4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4317,7 +4317,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                         }
                         if ( IsProperty( DFF_Prop_gtextSpacing ) )
                         {
-                            sal_Int32 nTextWidth = GetPropertyValue( DFF_Prop_gtextSpacing, 100 < 16 ) / 655;
+                            sal_Int32 nTextWidth = GetPropertyValue( DFF_Prop_gtextSpacing, 1 << 16 ) / 655;
                             if ( nTextWidth != 100 )
                                 aSet.Put( SvxCharScaleWidthItem( (sal_uInt16)nTextWidth, EE_CHAR_FONTWIDTH ) );
                         }