diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 13:55:09 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 13:55:09 +0000 |
| commit | e916045dd5741e35e1d10b04b8be64e21cbf930f (patch) | |
| tree | ad710eddf2b3d34958ba92bb95c4d9c9ec70a021 /svx/source | |
| parent | a22d80eb80d0134bdfa81f100a6e6ea8b7806cf3 (diff) | |
INTEGRATION: CWS aw053 (1.31.80); FILE MERGED
2007/09/14 10:37:10 aw 1.31.80.1: #i80528# Removal of draft paint modes
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index e6064b3a51eb..407839431333 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdomeas.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2007-06-27 19:06:50 $ + * last change: $Author: ihi $ $Date: 2007-11-26 14:55:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -663,15 +663,9 @@ sal_Bool SdrMeasureObj::DoPaintObject(XOutputDevice& rXOut, const SdrPaintInfoRe // #b4899532# if not filled but fill draft, avoid object being invisible in using // a hair linestyle and COL_LIGHTGRAY SfxItemSet aItemSet(rSet); - BOOL bIsFillDraft(0 != (rInfoRec.nPaintMode & SDRPAINTMODE_DRAFTFILL)); - if(bIsFillDraft && XLINE_NONE == ((const XLineStyleItem&)(rSet.Get(XATTR_LINESTYLE))).GetValue()) - { - ImpPrepareLocalItemSetForDraftLine(aItemSet); - } // prepare line geometry - BOOL bIsLineDraft(0 != (rInfoRec.nPaintMode & SDRPAINTMODE_DRAFTLINE)); - ::std::auto_ptr< SdrLineGeometry > pLineGeometry( ImpPrepareLineGeometry(rXOut, aItemSet, bIsLineDraft) ); + ::std::auto_ptr< SdrLineGeometry > pLineGeometry( ImpPrepareLineGeometry(rXOut, aItemSet) ); // Shadows BOOL bShadOn = ((SdrShadowItem&)(aItemSet.Get(SDRATTR_SHADOW))).GetValue(); @@ -1372,7 +1366,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo) SetTextDirty(); } -::std::auto_ptr< SdrLineGeometry > SdrMeasureObj::CreateLinePoly(sal_Bool bForceOnePixel, sal_Bool bForceTwoPixel, sal_Bool bIsLineDraft ) const +::std::auto_ptr< SdrLineGeometry > SdrMeasureObj::CreateLinePoly(sal_Bool bForceOnePixel, sal_Bool bForceTwoPixel) const { basegfx::B2DPolyPolygon aAreaPolyPolygon; basegfx::B2DPolyPolygon aLinePolyPolygon; @@ -1381,8 +1375,8 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo) XPolyPolygon aTmpPolyPolygon(TakeXorPoly(TRUE)); // get ImpLineStyleParameterPack - ImpLineStyleParameterPack aLineAttr(GetMergedItemSet(), bForceOnePixel || bForceTwoPixel || bIsLineDraft); - ImpLineGeometryCreator aLineCreator(aLineAttr, aAreaPolyPolygon, aLinePolyPolygon, bIsLineDraft); + ImpLineStyleParameterPack aLineAttr(GetMergedItemSet(), bForceOnePixel || bForceTwoPixel); + ImpLineGeometryCreator aLineCreator(aLineAttr, aAreaPolyPolygon, aLinePolyPolygon); UINT16 nCount(aTmpPolyPolygon.Count()); basegfx::B2DPolygon aCandidate; UINT16 nLoopStart(0); |