diff options
| author | Armin Le Grand <alg@apache.org> | 2012-05-14 14:21:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-15 23:43:01 +0000 |
| commit | 33b4c9938ddcf5555b55088531cce3f2493c1459 (patch) | |
| tree | 187b02fbff85a3b3bffd04a451c7b67cc962317f /vcl | |
| parent | e799a47983c6e9f0ff312124ebf8fbea1e336b66 (diff) | |
Resolves: #i119125# various actions implemented, clipping added.
Esp hard was ImpSdrGDIMetaFileImport, but working now. Needed to hand-craft
alpha addition for alpha in Metafile content and gradient of action. Also added
better BitmapEx creation for convert to bitmap for draw objects.
Conflicts:
svx/source/svdraw/svdxcgv.cxx
vcl/source/gdi/impgraph.cxx
Change-Id: Ic6ac9fb3132dd122e16a5cd8f9c5ddd155ec9882
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/svgdata.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/svgdata.cxx | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/vcl/inc/vcl/svgdata.hxx b/vcl/inc/vcl/svgdata.hxx index eaba0041e6fe..8de8d3a6bfa1 100644 --- a/vcl/inc/vcl/svgdata.hxx +++ b/vcl/inc/vcl/svgdata.hxx @@ -40,7 +40,8 @@ typedef ::com::sun::star::uno::Sequence< Primitive2DReference > Primitive2DSeque BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, - const basegfx::B2DRange& rTargetRange); + const basegfx::B2DRange& rTargetRange, + const sal_uInt32 nMaximumQuadraticPixels = 500000); ////////////////////////////////////////////////////////////////////////////// diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 2421bcb32841..fc161a2cfed6 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -25,9 +25,7 @@ #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/helpers.hxx> - #include <ucbhelper/content.hxx> - #include <unotools/ucbstreamhelper.hxx> #include <unotools/tempfile.hxx> #include <vcl/outdev.hxx> @@ -36,9 +34,7 @@ #include <vcl/cvtgrf.hxx> #include <vcl/graph.hxx> #include <vcl/metaact.hxx> - #include <impgraph.hxx> - #include <com/sun/star/ucb/CommandAbortedException.hpp> // ----------- diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 9772e92221df..1db7c37e088a 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -37,7 +37,8 @@ using namespace ::com::sun::star; BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, - const basegfx::B2DRange& rTargetRange) + const basegfx::B2DRange& rTargetRange, + const sal_uInt32 nMaximumQuadraticPixels) { BitmapEx aRetval; @@ -72,7 +73,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( aDPI.getWidth(), aDPI.getHeight(), aRealRect, - 500000)); + nMaximumQuadraticPixels)); if(xBitmap.is()) { |