diff options
| author | Armin Le Grand <alg@apache.org> | 2013-11-05 16:13:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-06 11:46:04 +0000 |
| commit | f120005ea41d59caf4b7d7f6017f3549d25b4287 (patch) | |
| tree | 10fffb159ac615a2c3e8cdcd2c356c60cb0d61d3 /svx | |
| parent | 3476768dc52dac9ed10a204ffcf000cd042d8993 (diff) | |
Resolves: #i123500# redefined ColorModifiers and ColorModifierStack...
redefined GraphicAttr to be expressed as primitives if needed, enhanced render
and export quality if graphic is modified using graphic attributes
(cherry picked from commit 1e79e8da3f8042f7d7bd94b2c9f03cff7545b05c)
Conflicts:
basegfx/inc/basegfx/color/bcolor.hxx
basegfx/inc/basegfx/color/bcolormodifier.hxx
basegfx/source/color/bcolormodifier.cxx
drawinglayer/inc/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
drawinglayer/source/primitive2d/graphicprimitive2d.cxx
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
Change-Id: Ief2172efc9cc1b9838de48ec7f536c05573c7dc3
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontact.cxx | 11 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 11 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx | 10 |
3 files changed, 26 insertions, 6 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index b2443d6a381e..5cc4e2daa5da 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -328,8 +328,15 @@ namespace sdr if(isPrimitiveGhosted(rDisplayInfo)) { const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); - const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE); - const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier)); + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + aRGBWhite, + 0.5)); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::ModifiedColorPrimitive2D( + xRetval, + aBColorModifier)); + xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 35183bfb7343..f929aec52d06 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -54,8 +54,15 @@ namespace sdr if(isPrimitiveGhosted(rDisplayInfo)) { const ::basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); - const ::basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, ::basegfx::BCOLORMODIFYMODE_INTERPOLATE); - const drawinglayer::primitive3d::Primitive3DReference xReference(new drawinglayer::primitive3d::ModifiedColorPrimitive3D(xRetval, aBColorModifier)); + const ::basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + aRGBWhite, + 0.5)); + const drawinglayer::primitive3d::Primitive3DReference xReference( + new drawinglayer::primitive3d::ModifiedColorPrimitive3D( + xRetval, + aBColorModifier)); + xRetval = drawinglayer::primitive3d::Primitive3DSequence(&xReference, 1); } diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index e9515f082762..196e2d7a7fda 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -108,8 +108,14 @@ namespace sdr if(isPrimitiveGhosted(rDisplayInfo)) { const ::basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); - const ::basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, ::basegfx::BCOLORMODIFYMODE_INTERPOLATE); - const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier)); + const ::basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + aRGBWhite, + 0.5)); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::ModifiedColorPrimitive2D( + xRetval, + aBColorModifier)); xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } |