incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1358158 - /incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
Date Fri, 06 Jul 2012 12:28:33 GMT
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 <com/sun/star/text/XText.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/drawing/BitmapMode.hpp>
 #include <unotools/streamwrap.hxx>
 #include <filter/msfilter/svdfppt.hxx>
 #include <svx/xpoly.hxx>
@@ -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 :



Mime
View raw message