From ooo-commits-return-11993-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org Fri Jul 6 12:28:58 2012 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 F00C1D3EB for ; Fri, 6 Jul 2012 12:28:57 +0000 (UTC) Received: (qmail 8334 invoked by uid 500); 6 Jul 2012 12:28:57 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 8198 invoked by uid 500); 6 Jul 2012 12:28:56 -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 8180 invoked by uid 99); 6 Jul 2012 12:28:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jul 2012 12:28:56 +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; Fri, 06 Jul 2012 12:28:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8AD882388980; Fri, 6 Jul 2012 12:28:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1358158 - /incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Date: Fri, 06 Jul 2012 12:28:33 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120706122833.8AD882388980@eris.apache.org> Author: af Date: Fri Jul 6 12:28:33 2012 New Revision: 1358158 URL: http://svn.apache.org/viewvc?rev=1358158&view=rev Log: #i119877# Fixed import of FillBitmapMode. Reported by: Li Feng Wang Patch by: SunYing Reviewed by: Andre Fischer Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx?rev=1358158&r1=1358157&r2=1358158&view=diff ============================================================================== --- incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx (original) +++ incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Fri Jul 6 12:28:33 2012 @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -7612,6 +7613,16 @@ void ApplyCellAttributes( const SdrObjec static const rtl::OUString sFillBitmapURL( String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" ) ) ); xPropSet->setPropertyValue( sFillBitmapURL, Any( aURL ) ); + + static const rtl::OUString sFillBitmapMode( String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapMode" ) ) ); + const XFillBmpStretchItem aStretchItem(( const XFillBmpStretchItem&)pObj->GetMergedItem( XATTR_FILLBMP_STRETCH )); + const XFillBmpTileItem aTileItem(( const XFillBmpTileItem&)pObj->GetMergedItem( XATTR_FILLBMP_TILE )); + if( aTileItem.GetValue() ) + xPropSet->setPropertyValue( sFillBitmapMode, Any( com::sun::star::drawing::BitmapMode_REPEAT ) ); + else if( aStretchItem.GetValue() ) + xPropSet->setPropertyValue( sFillBitmapMode, Any( com::sun::star::drawing::BitmapMode_STRETCH ) ); + else + xPropSet->setPropertyValue( sFillBitmapMode, Any( com::sun::star::drawing::BitmapMode_NO_REPEAT ) ); } break; case XFILL_NONE :