summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2012-07-06 11:28:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-04-15 10:38:00 +0100
commitca09d2df977d473341546882cf48c70ebd322d42 (patch)
tree734d97288062ba5442b0f2b74570f8ec0ccb7079 /filter
parentc115d63bf4b5c80aa66b01f48d0c4b51560b8bd3 (diff)
Resolves: #i119877# Fixed import of FillBitmapMode
Reported by: Li Feng Wang Patch by: SunYing Reviewed by: Andre Fischer (cherry picked from commit 830bd984a9db75a76057a969a96a17233ed4d7ee) Conflicts: filter/source/msfilter/svdfppt.cxx Change-Id: Ibf3b7ea395c552ca8d0205e4c2eb4a4f8075a246
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/svdfppt.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index f8530c1d2fa4..104db58723a7 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -31,6 +31,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>
@@ -7378,6 +7379,15 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
RTL_TEXTENCODING_ASCII_US);
xPropSet->setPropertyValue( OUString("FillBitmapURL"), Any( aURL ) );
+
+ 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( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_REPEAT ) );
+ else if( aStretchItem.GetValue() )
+ xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_STRETCH ) );
+ else
+ xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_NO_REPEAT ) );
}
break;
case XFILL_NONE :