diff options
author | Release Engineers <releng@openoffice.org> | 2009-05-06 21:51:02 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-05-06 21:51:02 +0000 |
commit | 8e11938f2eff90c5a9bcf294f40707ec3e5b11fd (patch) | |
tree | e71b76558c7f37e28a32cb7a2fdeb64f99780b1a /canvas/source | |
parent | c654a8009d17b5388b7831ba9604db963793d3af (diff) |
CWS-TOOLING: integrate CWS impress168
2009-04-24 11:26:33 +0200 wg r271204 : i101157
2009-04-24 10:17:59 +0200 wg r271200 : i101157
2009-04-23 15:50:12 +0200 wg r271178 : i101157
2009-04-23 15:16:58 +0200 wg r271176 : i101157
2009-04-23 13:04:41 +0200 wg r271158 : i101157
2009-04-22 15:39:32 +0200 wg r271123 : i101157
2009-04-22 14:27:24 +0200 wg r271111 : i101157
2009-04-22 14:14:02 +0200 wg r271109 : i101157
2009-04-17 14:34:19 +0200 wg r270946 : i101157
2009-04-17 13:49:15 +0200 wg r270939 : i101157
2009-03-31 14:54:52 +0200 sj r270281 : CWS-TOOLING: rebase CWS impress168 to trunk@270033 (milestone: DEV300:m45)
2009-03-26 16:56:44 +0100 sj r270089 : removed invalid file names
2009-03-24 14:02:54 +0100 sj r269944 : CWS-TOOLING: rebase CWS impress168 to trunk@269781 (milestone: DEV300:m44)
2009-03-06 16:32:14 +0100 sj r269020 : #i99970# importing customshapes without group object, taking care of the correct text alignment
2009-02-27 13:53:24 +0100 sj r268591 : #158501,158483# fixed positioning problem of 3d customshapes
2009-02-19 16:02:00 +0100 sj r268292 : #76543# fixed interactive hyperlink program action with relativ url
2009-02-18 15:36:52 +0100 sj r268233 : #158503# added import of circular gradients for ellipse shapes
2009-02-16 19:51:54 +0100 sj r267836 : #i99146# calculating correct text bounds
2009-02-12 13:59:46 +0100 sj r267654 : #i96179# fixed bullet problem
2009-02-10 17:26:41 +0100 sj r267566 : #158476# fixed import of the ribbon shape
2009-02-10 17:10:27 +0100 cl r267561 : #i95364# fixed type detection of linked images
2009-02-09 18:31:59 +0100 cl r267531 : #i98352# removed assertion
2009-02-09 18:31:17 +0100 cl r267530 : #i98355# fixed alien attribute import for sd in binfilter
2009-02-09 18:30:53 +0100 cl r267529 : #i98355# fixed alien attribute import for sd in binfilter
2009-02-09 09:52:15 +0100 cl r267501 : #i98573# fixed build error
2009-02-06 17:02:21 +0100 sj r267476 : #i96179# fixed bullet problem
2009-02-06 14:58:39 +0100 cl r267466 : #i14832# fixed page count field for handout printing
2009-02-06 10:23:01 +0100 cl r267447 : #i98573# fixed GetEditOutlinerParaObject() memory leak
2009-02-05 18:03:34 +0100 cl r267435 : #i98573# fixed GetEditOutlinerParaObject() memory leak
2009-02-05 18:03:08 +0100 cl r267434 : #i85481# added XMultiPropertyStates to text implementations
2009-02-05 18:02:54 +0100 cl r267433 : #i85481# added XMultiPropertyStates to text implementations
2009-02-05 18:02:42 +0100 cl r267432 : #i85481# added XMultiPropertyStates to text implementations
2009-02-04 18:54:46 +0100 sj r267400 : #i33630# fixed arrow size of word import
2009-02-04 15:40:16 +0100 cl r267389 : #i58702# fixed tiled bitmap fill for vcl canvas
2009-02-04 15:39:07 +0100 cl r267388 : #i58702# fixed tiled bitmap fill for vcl canvas
2009-02-04 14:23:27 +0100 cl r267382 : #i98573# fixed memory leaks caused by wron usage of GetEditOutlinerParaObject()
2009-02-04 14:22:34 +0100 cl r267381 : #i98573# fixed memory leaks caused by wron usage of GetEditOutlinerParaObject()
2009-02-04 12:51:50 +0100 cl r267371 : #i14832# added Page Count field to impress
2009-02-04 12:41:31 +0100 cl r267368 : #i14832# added Page Count field to impress
Diffstat (limited to 'canvas/source')
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 6127aa8f401b..571a8c4fc5a3 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -892,9 +892,9 @@ namespace vclcanvas } else if( textures[0].Bitmap.is() ) { - OSL_ENSURE( textures[0].RepeatModeX == rendering::TexturingMode::REPEAT && - textures[0].RepeatModeY == rendering::TexturingMode::REPEAT, - "CanvasHelper::fillTexturedPolyPolygon(): VCL canvas cannot currently clamp textures." ); +// OSL_ENSURE( textures[0].RepeatModeX == rendering::TexturingMode::REPEAT && +// textures[0].RepeatModeY == rendering::TexturingMode::REPEAT, +// "CanvasHelper::fillTexturedPolyPolygon(): VCL canvas cannot currently clamp textures." ); const geometry::IntegerSize2D aBmpSize( textures[0].Bitmap->getSize() ); @@ -970,6 +970,23 @@ namespace vclcanvas aLocalState ); } } + else if ( textures[0].RepeatModeX == rendering::TexturingMode::CLAMP &&
+ textures[0].RepeatModeY == rendering::TexturingMode::CLAMP )
+ {
+ rendering::RenderState aLocalState( renderState );
+ ::canvas::tools::appendToRenderState(aLocalState,
+ aTextureTransform);
+ ::basegfx::B2DHomMatrix aScaleCorrection;
+ aScaleCorrection.scale( 1.0/aBmpSize.Width,
+ 1.0/aBmpSize.Height );
+ ::canvas::tools::appendToRenderState(aLocalState,
+ aScaleCorrection);
+
+ return drawBitmap( pCanvas,
+ textures[0].Bitmap,
+ viewState,
+ aLocalState );
+ } else { // No easy mapping to drawBitmap() - calculate |