This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new e38dead826 Fixed typos, removed whitespace e38dead826 is described below commit e38dead826984fce4c06947f6b265a8f34a7aa72 Author: mseidel <msei...@apache.org> AuthorDate: Thu Aug 3 12:15:08 2023 +0200 Fixed typos, removed whitespace --- .../source/primitive2d/cropprimitive2d.cxx | 23 ++--- .../primitive2d/discretebitmapprimitive2d.cxx | 17 ++-- .../source/primitive2d/maskprimitive2d.cxx | 15 ++- .../source/primitive2d/pagepreviewprimitive2d.cxx | 103 ++++++++++----------- .../source/primitive2d/patternfillprimitive2d.cxx | 17 ++-- .../source/primitive2d/shadowprimitive2d.cxx | 51 +++++----- .../source/primitive2d/textlineprimitive2d.cxx | 19 ++-- 7 files changed, 120 insertions(+), 125 deletions(-) diff --git a/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx index 60a5efc19d..bbb1ab0392 100644 --- a/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,18 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_drawinglayer.hxx" @@ -43,7 +45,7 @@ namespace drawinglayer { CropPrimitive2D::CropPrimitive2D( const Primitive2DSequence& rChildren, - const basegfx::B2DHomMatrix& rTransformation, + const basegfx::B2DHomMatrix& rTransformation, double fCropLeft, double fCropTop, double fCropRight, @@ -95,7 +97,7 @@ namespace drawinglayer const double fRight(getCropRight() * fBackScaleX); const double fBottom(getCropBottom() * fBackScaleY); - // calc new unit range for comparisons; the original range is the unit range + // calculate new unit range for comparisons; the original range is the unit range const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0); const basegfx::B2DRange aNewRange( -fLeft, @@ -109,7 +111,7 @@ namespace drawinglayer { // create new transform; first take out old transform to get // to unit coordinates by inverting. Inverting should be flawless - // since we already cheched that object size is not zero in X or Y + // since we already checked that object size is not zero in X or Y basegfx::B2DHomMatrix aNewTransform(getTransformation()); aNewTransform.invert(); @@ -128,7 +130,7 @@ namespace drawinglayer // prepare TransformPrimitive2D with xPrimitive const Primitive2DReference xTransformPrimitive( new TransformPrimitive2D( - aNewTransform, + aNewTransform, getChildren())); if(aUnitRange.isInside(aNewRange)) @@ -146,7 +148,7 @@ namespace drawinglayer // create maskPrimitive with aMaskPolyPolygon and aMaskContentVector const Primitive2DReference xMask( new MaskPrimitive2D( - aMaskPolyPolygon, + aMaskPolyPolygon, Primitive2DSequence(&xTransformPrimitive, 1))); xRetval = Primitive2DSequence(&xMask, 1); @@ -164,5 +166,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */ diff --git a/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index 8bfb9cb8c8..7b989b4834 100644 --- a/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -36,8 +36,8 @@ namespace drawinglayer { Primitive2DSequence DiscreteBitmapPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { - // use getViewTransformation() and getObjectTransformation() from - // ObjectAndViewTransformationDependentPrimitive2D to create a BitmapPrimitive2D + // use getViewTransformation() and getObjectTransformation() from + // ObjectAndViewTransformationDependentPrimitive2D to create a BitmapPrimitive2D // with the correct mapping Primitive2DSequence xRetval; @@ -81,7 +81,7 @@ namespace drawinglayer } DiscreteBitmapPrimitive2D::DiscreteBitmapPrimitive2D( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const basegfx::B2DPoint& rTopLeft) : ObjectAndViewTransformationDependentPrimitive2D(), maBitmapEx(rBitmapEx), @@ -108,5 +108,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */ diff --git a/main/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/main/drawinglayer/source/primitive2d/maskprimitive2d.cxx index 10a38a91be..58b23221b5 100644 --- a/main/drawinglayer/source/primitive2d/maskprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/maskprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -38,7 +38,7 @@ namespace drawinglayer namespace primitive2d { MaskPrimitive2D::MaskPrimitive2D( - const basegfx::B2DPolyPolygon& rMask, + const basegfx::B2DPolyPolygon& rMask, const Primitive2DSequence& rChildren) : GroupPrimitive2D(rChildren), maMask(rMask) @@ -62,11 +62,10 @@ namespace drawinglayer return getMask().getB2DRange(); } - // provide unique ID + // provide unique ID ImplPrimitrive2DIDBlock(MaskPrimitive2D, PRIMITIVE2D_ID_MASKPRIMITIVE2D) } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */ diff --git a/main/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/main/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index 1c6e84ad6b..8a265cbf0b 100644 --- a/main/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -43,14 +43,14 @@ namespace drawinglayer namespace primitive2d { Primitive2DSequence PagePreviewPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { - Primitive2DSequence xRetval; - Primitive2DSequence aContent(getPageContent()); + { + Primitive2DSequence xRetval; + Primitive2DSequence aContent(getPageContent()); - if(aContent.hasElements() + if(aContent.hasElements() && basegfx::fTools::more(getContentWidth(), 0.0) && basegfx::fTools::more(getContentHeight(), 0.0)) - { + { // the decomposed matrix will be needed basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; @@ -58,7 +58,7 @@ namespace drawinglayer if(basegfx::fTools::more(aScale.getX(), 0.0) && basegfx::fTools::more(aScale.getY(), 0.0)) { - // check if content overlaps with tageted size and needs to be embedded with a + // check if content overlaps with targeted size and needs to be embedded with a // clipping primitive const basegfx::B2DRange aRealContentRange(getB2DRangeFromPrimitive2DSequence(aContent, rViewInformation)); const basegfx::B2DRange aAllowedContentRange(0.0, 0.0, getContentWidth(), getContentHeight()); @@ -66,9 +66,9 @@ namespace drawinglayer if(!aAllowedContentRange.isInside(aRealContentRange)) { const Primitive2DReference xReferenceA( - new MaskPrimitive2D( - basegfx::B2DPolyPolygon( - basegfx::tools::createPolygonFromRect(aAllowedContentRange)), aContent)); + new MaskPrimitive2D( + basegfx::B2DPolyPolygon( + basegfx::tools::createPolygonFromRect(aAllowedContentRange)), aContent)); aContent = Primitive2DSequence(&xReferenceA, 1); } @@ -77,13 +77,13 @@ namespace drawinglayer if(getKeepAspectRatio()) { - // #i101075# when keeping the aspect ratio is wanted, it is necessary to calculate - // an equidistant scaling in X and Y and a corresponding translation to - // center the output. Calculate needed scale factors - const double fScaleX(aScale.getX() / getContentWidth()); - const double fScaleY(aScale.getY() / getContentHeight()); - - // to keep the aspect, use the smaller scale and adapt missing size by translation + // #i101075# when keeping the aspect ratio is wanted, it is necessary to calculate + // an equidistant scaling in X and Y and a corresponding translation to + // center the output. Calculate needed scale factors + const double fScaleX(aScale.getX() / getContentWidth()); + const double fScaleY(aScale.getY() / getContentHeight()); + + // to keep the aspect, use the smaller scale and adapt missing size by translation if(fScaleX < fScaleY) { // height needs to be adapted @@ -102,43 +102,43 @@ namespace drawinglayer aPageTrans.translate(fSpaceToAdd * 0.5, 0.0); aPageTrans.scale(aScale.getX() / fNeededWidth, fScaleY); } - - // add the missing object transformation aspects + + // add the missing object transformation aspects const basegfx::B2DHomMatrix aCombined(basegfx::tools::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); - aPageTrans = aCombined * aPageTrans; + aPageTrans = aCombined * aPageTrans; } else { - // completely scale to PageObject size. Scale to unit size. + // completely scale to PageObject size. Scale to unit size. aPageTrans.scale(1.0/ getContentWidth(), 1.0 / getContentHeight()); - - // apply object matrix + + // apply object matrix aPageTrans *= getTransform(); } - + // embed in necessary transformation to map from SdrPage to SdrPageObject const Primitive2DReference xReferenceB(new TransformPrimitive2D(aPageTrans, aContent)); xRetval = Primitive2DSequence(&xReferenceB, 1); } - } + } - return xRetval; - } + return xRetval; + } PagePreviewPrimitive2D::PagePreviewPrimitive2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage, - const basegfx::B2DHomMatrix& rTransform, - double fContentWidth, - double fContentHeight, + const basegfx::B2DHomMatrix& rTransform, + double fContentWidth, + double fContentHeight, const Primitive2DSequence& rPageContent, bool bKeepAspectRatio) : BufferedDecompositionPrimitive2D(), - mxDrawPage(rxDrawPage), - maPageContent(rPageContent), - maTransform(rTransform), - mfContentWidth(fContentWidth), - mfContentHeight(fContentHeight), + mxDrawPage(rxDrawPage), + maPageContent(rPageContent), + maTransform(rTransform), + mfContentWidth(fContentWidth), + mfContentHeight(fContentHeight), mbKeepAspectRatio(bKeepAspectRatio) { } @@ -148,26 +148,26 @@ namespace drawinglayer if(BasePrimitive2D::operator==(rPrimitive)) { const PagePreviewPrimitive2D& rCompare = static_cast< const PagePreviewPrimitive2D& >(rPrimitive); - - return (getXDrawPage() == rCompare.getXDrawPage() - && getPageContent() == rCompare.getPageContent() - && getTransform() == rCompare.getTransform() - && getContentWidth() == rCompare.getContentWidth() - && getContentHeight() == rCompare.getContentHeight() - && getKeepAspectRatio() == rCompare.getKeepAspectRatio()); + + return (getXDrawPage() == rCompare.getXDrawPage() + && getPageContent() == rCompare.getPageContent() + && getTransform() == rCompare.getTransform() + && getContentWidth() == rCompare.getContentWidth() + && getContentHeight() == rCompare.getContentHeight() + && getKeepAspectRatio() == rCompare.getKeepAspectRatio()); } return false; } - basegfx::B2DRange PagePreviewPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation`*/) const - { - // nothing is allowed to stick out of a PagePreviewPrimitive, thus we - // can quickly deliver our range here + basegfx::B2DRange PagePreviewPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation`*/) const + { + // nothing is allowed to stick out of a PagePreviewPrimitive, thus we + // can quickly deliver our range here basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0); aRetval.transform(getTransform()); return aRetval; - } + } // provide unique ID ImplPrimitrive2DIDBlock(PagePreviewPrimitive2D, PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D) @@ -175,5 +175,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */ diff --git a/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index ab40ada685..fd64d561ab 100644 --- a/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -58,7 +58,7 @@ namespace drawinglayer // create tiling matrices ::std::vector< basegfx::B2DHomMatrix > aMatrices; texture::GeoTexSvxTiled aTiling(getReferenceRange()); - + aTiling.appendTransformations(aMatrices); // check if content needs to be clipped @@ -87,11 +87,11 @@ namespace drawinglayer aContent); } - // transform result which is in unit coordinates to mask's object coordiantes + // transform result which is in unit coordinates to mask's object coordinates { const basegfx::B2DHomMatrix aMaskTransform( basegfx::tools::createScaleTranslateB2DHomMatrix( - aMaskRange.getRange(), + aMaskRange.getRange(), aMaskRange.getMinimum())); const Primitive2DReference xRef( @@ -155,5 +155,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */ diff --git a/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index 7ec54919bf..7c2cc32da6 100644 --- a/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -44,8 +44,8 @@ namespace drawinglayer namespace primitive2d { ShadowPrimitive2D::ShadowPrimitive2D( - const basegfx::B2DHomMatrix& rShadowTransform, - const basegfx::BColor& rShadowColor, + const basegfx::B2DHomMatrix& rShadowTransform, + const basegfx::BColor& rShadowColor, const Primitive2DSequence& rChildren) : GroupPrimitive2D(rChildren), maShadowTransform(rShadowTransform), @@ -58,8 +58,8 @@ namespace drawinglayer if(BasePrimitive2D::operator==(rPrimitive)) { const ShadowPrimitive2D& rCompare = static_cast< const ShadowPrimitive2D& >(rPrimitive); - - return (getShadowTransform() == rCompare.getShadowTransform() + + return (getShadowTransform() == rCompare.getShadowTransform() && getShadowColor() == rCompare.getShadowColor()); } @@ -77,22 +77,22 @@ namespace drawinglayer { Primitive2DSequence aRetval; - if(getChildren().hasElements()) - { - // create a modifiedColorPrimitive containing the shadow color and the content - const basegfx::BColorModifierSharedPtr aBColorModifier( - new basegfx::BColorModifier_replace( - getShadowColor())); - const Primitive2DReference xRefA( - new ModifiedColorPrimitive2D( - getChildren(), - aBColorModifier)); - const Primitive2DSequence aSequenceB(&xRefA, 1L); - - // build transformed primitiveVector with shadow offset and add to target - const Primitive2DReference xRefB(new TransformPrimitive2D(getShadowTransform(), aSequenceB)); - aRetval = Primitive2DSequence(&xRefB, 1L); - } + if(getChildren().hasElements()) + { + // create a modifiedColorPrimitive containing the shadow color and the content + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_replace( + getShadowColor())); + const Primitive2DReference xRefA( + new ModifiedColorPrimitive2D( + getChildren(), + aBColorModifier)); + const Primitive2DSequence aSequenceB(&xRefA, 1L); + + // build transformed primitiveVector with shadow offset and add to target + const Primitive2DReference xRefB(new TransformPrimitive2D(getShadowTransform(), aSequenceB)); + aRetval = Primitive2DSequence(&xRefB, 1L); + } return aRetval; } @@ -103,5 +103,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */ diff --git a/main/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/main/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index 699822355d..c79b632c1d 100644 --- a/main/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/main/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -197,11 +197,11 @@ namespace drawinglayer aLine.append(basegfx::B2DPoint(0.0, fOffset)); aLine.append(basegfx::B2DPoint(getWidth(), fOffset)); - + const basegfx::B2DHomMatrix aUnscaledTransform( basegfx::tools::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate)); - + aLine.transform(aUnscaledTransform); if(bWaveLine) @@ -233,7 +233,7 @@ namespace drawinglayer // double line, create 2nd primitive with offset using TransformPrimitive based on // already created NewPrimitive double fLineDist(2.3 * fHeight); - + if(bWaveLine) { fLineDist = 6.3 * fHeight; @@ -253,7 +253,7 @@ namespace drawinglayer // add transform primitive const Primitive2DSequence aContent(&aNewPrimitive, 1); - appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, Primitive2DReference(new TransformPrimitive2D(aTransform, aContent))); } } @@ -301,5 +301,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// -// eof +/* vim: set noet sw=4 ts=4: */