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

[Andre Fischer]

 filter/source/msfilter/msdffimp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b1e751d665599eeb7445b20837c079d84de2113f
Author: Andre Fischer <af at apache.org>
Date:   Thu Jun 21 11:36:13 2012 +0000

    Resolves: #i119537# Fixed extrusion of custom shapes to XLS
    
    Reported by: Terry Yang
    Patch by: Jianyuan Li
    Review by: Andre Fischer
    (cherry picked from commit 8954201783be3d0479dfa2338116427a17f0dab4)
    
    Conflicts:
    	filter/source/msfilter/msdffimp.cxx
    
    Change-Id: I994a2b14877c4e291d622665ec3f4a8ea9f3041b

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 637e2ab3..cc2dbf6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1826,8 +1826,8 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
         if ( IsProperty( DFF_Prop_c3DOriginX ) || IsProperty( DFF_Prop_c3DOriginY ) )
         {
             const OUString sExtrusionOrigin( "Origin" );
-            double fOriginX = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DOriginX, 0 ));
-            double fOriginY = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DOriginY, 0 ));
+            double fOriginX = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DOriginX, 32768 ));
+            double fOriginY = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DOriginY, (sal_uInt32)-32768 ));
             fOriginX /= 65536;
             fOriginY /= 65536;
             EnhancedCustomShapeParameterPair aOriginPair;