Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2DD219672 for ; Thu, 21 Jun 2012 12:36:37 +0000 (UTC) Received: (qmail 6641 invoked by uid 500); 21 Jun 2012 12:36:36 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 6614 invoked by uid 500); 21 Jun 2012 12:36:36 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 6607 invoked by uid 99); 21 Jun 2012 12:36:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2012 12:36:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2012 12:36:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B14A52388978; Thu, 21 Jun 2012 12:36:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1352519 - /incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Date: Thu, 21 Jun 2012 12:36:13 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120621123613.B14A52388978@eris.apache.org> Author: af Date: Thu Jun 21 12:36:13 2012 New Revision: 1352519 URL: http://svn.apache.org/viewvc?rev=1352519&view=rev Log: #i119537# Fixed extrusion of custom shapes to XLS. (rev. 1352497 has this same title by mistake, should refer to issue 119903) Reported by: Terry Yang Patch by: Jianyuan Li Review by: Andre Fischer Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1352519&r1=1352518&r2=1352519&view=diff ============================================================================== --- incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx (original) +++ incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Thu Jun 21 12:36:13 2012 @@ -1994,8 +1994,8 @@ void DffPropertyReader::ApplyCustomShape if ( IsProperty( DFF_Prop_c3DOriginX ) || IsProperty( DFF_Prop_c3DOriginY ) ) { const rtl::OUString sExtrusionOrigin( RTL_CONSTASCII_USTRINGPARAM ( "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;