From d77c03b022105acf37594a9545c9c867c4c1503e Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 13 Jan 2011 15:58:12 +0100 Subject: calc65: #i116371# fix backgrounds for polypolygons in metafile --- .../source/processor2d/vclmetafileprocessor2d.cxx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 0d2be85f9872..263cdeede4f8 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1379,6 +1379,7 @@ namespace drawinglayer { // need to handle PolyPolygonHatchPrimitive2D here to support XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END const primitive2d::PolyPolygonHatchPrimitive2D& rHatchCandidate = static_cast< const primitive2d::PolyPolygonHatchPrimitive2D& >(rCandidate); + const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch(); basegfx::B2DPolyPolygon aLocalPolyPolygon(rHatchCandidate.getB2DPolyPolygon()); // #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points @@ -1386,8 +1387,20 @@ namespace drawinglayer while(fillPolyPolygonNeededToBeSplit(aLocalPolyPolygon)) ; + if(rFillHatchAttribute.isFillBackground()) + { + // with fixing #i111954# (see below) the possible background + // fill of a hatched object was lost.Generate a background fill + // primitive and render it + const primitive2d::Primitive2DReference xBackground( + new primitive2d::PolyPolygonColorPrimitive2D( + aLocalPolyPolygon, + rHatchCandidate.getBackgroundColor())); + + process(primitive2d::Primitive2DSequence(&xBackground, 1)); + } + SvtGraphicFill* pSvtGraphicFill = 0; - const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch(); aLocalPolyPolygon.transform(maCurrentTransformation); if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count()) -- cgit From 846c70417e1aecc56a6ee1504c2c160e633d0754 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 13 Jan 2011 16:25:57 +0100 Subject: calc65: #i116318# Fixed the painting of axial gradients. --- cppcanvas/source/mtfrenderer/implrenderer.cxx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 1423cd42ed93..592aa6e41ba9 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -682,10 +682,23 @@ namespace cppcanvas case GRADIENT_AXIAL: { - basegfx::tools::createLinearODFGradientInfo(aGradInfo, + // Adapt the border so that it is suitable + // for the axial gradient. An axial + // gradient consists of two linear + // gradients. Each of those covers half + // of the total size. In order to + // compensate for the condensed display of + // the linear gradients, we have to + // enlarge the area taken up by the actual + // gradient (1-fBorder). After that we + // have to turn the result back into a + // border value, hence the second (left + // most 1-... + const double fAxialBorder (1-2*(1-fBorder)); + basegfx::tools::createAxialODFGradientInfo(aGradInfo, aBounds, nSteps, - fBorder, + fAxialBorder, fRotation); // map odf to svg gradient orientation - x // instead of y direction -- cgit From 5b68ceac72cd19f37d7021e9cc04d91a349b0c47 Mon Sep 17 00:00:00 2001 From: Niklas Nebel Date: Thu, 13 Jan 2011 16:37:20 +0100 Subject: calc65: #i116439# CopyToTable: ScShowRowsEntry has 'show' state, not 'hidden' --- sc/source/core/data/table2.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 86dd93da383b..9eaaf6c070e7 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -790,7 +790,7 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, nLastRow = nRow2; //pDestTab->SetRowHidden(i, nLastRow, bThisHidden); - aEntries.push_back(ScShowRowsEntry(i, nLastRow, bThisHidden)); + aEntries.push_back(ScShowRowsEntry(i, nLastRow, !bThisHidden)); bool bThisHiddenChange = (bThisHidden != bDestHidden); if (bThisHiddenChange && pCharts) -- cgit From 6103f40bc8c7e24efeb79e3a78587ac9cd78ba1e Mon Sep 17 00:00:00 2001 From: Niklas Nebel Date: Thu, 13 Jan 2011 17:00:01 +0100 Subject: calc65: fix pyuno environment script --- pyuno/demo/pyunoenv.tcsh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyuno/demo/pyunoenv.tcsh b/pyuno/demo/pyunoenv.tcsh index 1a831996325f..038cf2ddb45b 100644 --- a/pyuno/demo/pyunoenv.tcsh +++ b/pyuno/demo/pyunoenv.tcsh @@ -17,7 +17,12 @@ if( ! $?LD_LIBRARY_PATH ) then setenv LD_LIBRARY_PATH endif -setenv PYTHONPATH .:$OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH +if( "$PYTHONPATH" != "" ) then + setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH +else + setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib +endif + setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH if( $?PYTHONHOME ) then -- cgit From 957b629c92989ba5217546213732ce71f44fc044 Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Mon, 17 Jan 2011 15:17:36 +0100 Subject: OOO330 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 4c8eb6cca6a9..11748869457e 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m19(Build:9561) -BUILD=9561 -LAST_MINOR=m19 +RSCREVISION=330m20(Build:9567) +BUILD=9567 +LAST_MINOR=m20 SOURCEVERSION=OOO330 -- cgit