diff options
Diffstat (limited to 'svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx')
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 12569813c5..60e0471aea 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,9 +53,7 @@ namespace drawinglayer if(pSource) { - Graphic* pOLEGraphic = (getHighContrast()) - ? pSource->getEmbeddedObjectRef().GetHCGraphic() - : pSource->GetGraphic(); + Graphic* pOLEGraphic = pSource->GetGraphic(); if(pOLEGraphic) { @@ -76,7 +75,7 @@ namespace drawinglayer const GraphicObject aGraphicObject(aGraphic); const GraphicAttr aGraphicAttr; drawinglayer::primitive2d::Primitive2DSequence xOLEContent; - + if(bScaleContent) { // get transformation atoms @@ -109,8 +108,8 @@ namespace drawinglayer const drawinglayer::primitive2d::Primitive2DReference aGraphicPrimitive( new drawinglayer::primitive2d::GraphicPrimitive2D( - aInnerObjectMatrix, - aGraphicObject, + aInnerObjectMatrix, + aGraphicObject, aGraphicAttr)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aGraphicPrimitive); } @@ -120,8 +119,8 @@ namespace drawinglayer // create graphic primitive for content const drawinglayer::primitive2d::Primitive2DReference aGraphicPrimitive( new drawinglayer::primitive2d::GraphicPrimitive2D( - getObjectTransform(), - aGraphicObject, + getObjectTransform(), + aGraphicObject, aGraphicAttr)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aGraphicPrimitive); } @@ -150,34 +149,32 @@ namespace drawinglayer SdrOleContentPrimitive2D::SdrOleContentPrimitive2D( const SdrOle2Obj& rSdrOle2Obj, - const basegfx::B2DHomMatrix& rObjectTransform, - sal_uInt32 nGraphicVersion, - bool bHighContrast) + const basegfx::B2DHomMatrix& rObjectTransform, + sal_uInt32 nGraphicVersion + ) : BufferedDecompositionPrimitive2D(), mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)), maObjectTransform(rObjectTransform), - mnGraphicVersion(nGraphicVersion), - mbHighContrast(bHighContrast) + mnGraphicVersion(nGraphicVersion) { } bool SdrOleContentPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const { - if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) + if( BufferedDecompositionPrimitive2D::operator==(rPrimitive) ) { const SdrOleContentPrimitive2D& rCompare = (SdrOleContentPrimitive2D&)rPrimitive; const bool bBothNot(!mpSdrOle2Obj.is() && !rCompare.mpSdrOle2Obj.is()); - const bool bBothAndEqual(mpSdrOle2Obj.is() && rCompare.mpSdrOle2Obj.is() + const bool bBothAndEqual(mpSdrOle2Obj.is() && rCompare.mpSdrOle2Obj.is() && mpSdrOle2Obj.get() == rCompare.mpSdrOle2Obj.get()); - + return ((bBothNot || bBothAndEqual) && getObjectTransform() == rCompare.getObjectTransform() // #i104867# to find out if the Graphic content of the // OLE has changed, use GraphicVersion number && getGraphicVersion() == rCompare.getGraphicVersion() - - && getHighContrast() == rCompare.getHighContrast()); + ); } return false; @@ -187,7 +184,7 @@ namespace drawinglayer { basegfx::B2DRange aRange(0.0, 0.0, 1.0, 1.0); aRange.transform(getObjectTransform()); - + return aRange; } @@ -199,3 +196,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |