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 /sw | |
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 'sw')
-rw-r--r-- | sw/source/ui/docvw/HeaderFooterWin.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/docvw/PageBreakWin.cxx | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 19c5b5e35185..600c42c97846 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -358,8 +358,12 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) // TODO Ghost it all if needed drawinglayer::primitive2d::Primitive2DSequence aGhostedSeq( 1 ); double nFadeRate = double( m_nFadeRate ) / 100.0; + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + Color( COL_WHITE ).getBColor(), + 1.0 - nFadeRate)); aGhostedSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::ModifiedColorPrimitive2D( - aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) ); + aSeq, aBColorModifier ) ); pProcessor->process( aGhostedSeq ); delete pProcessor; diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index 507f3f556038..a30fb0bcecc9 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -188,8 +188,12 @@ void SwPageBreakWin::Paint( const Rectangle& ) Primitive2DSequence aGhostedSeq( 1 ); double nFadeRate = double( m_nFadeRate ) / 100.0; + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + Color( COL_WHITE ).getBColor(), + 1.0 - nFadeRate)); aGhostedSeq[0] = Primitive2DReference( new drawinglayer::primitive2d::ModifiedColorPrimitive2D( - aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) ); + aSeq, aBColorModifier ) ); // Create the processor and process the primitives const drawinglayer::geometry::ViewInformation2D aNewViewInfos; |