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 3be598994e Fixed typos, removed whitespace 3be598994e is described below commit 3be598994e7b43df5b6acf9cd98e334f564d9374 Author: mseidel <msei...@apache.org> AuthorDate: Sun May 15 12:54:51 2022 +0200 Fixed typos, removed whitespace --- .../sdr/contact/viewcontactofsdrcaptionobj.cxx | 98 +++++++++++----------- .../sdr/contact/viewcontactofsdrmediaobj.cxx | 26 +++--- .../svx/source/sdr/contact/viewcontactofsdrobj.cxx | 54 ++++++------ 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 641d6b5488..e64d440f58 100644 --- a/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.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. - * + * *************************************************************/ @@ -64,17 +64,17 @@ namespace sdr const SfxItemSet& rItemSet = rCaptionObj.GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute( - rItemSet, - rCaptionObj.getText(0), - false)); + rItemSet, + rCaptionObj.getText(0), + false)); // take unrotated snap rect (direct model data) for position and size const Rectangle& rRectangle = rCaptionObj.GetGeoRect(); const ::basegfx::B2DRange aObjectRange( - rRectangle.Left(), rRectangle.Top(), + rRectangle.Left(), rRectangle.Top(), rRectangle.Right(), rRectangle.Bottom()); const GeoStat& rGeoStat(rCaptionObj.GetGeoStat()); - + // fill object matrix basegfx::B2DHomMatrix aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( aObjectRange.getWidth(), aObjectRange.getHeight(), @@ -92,10 +92,10 @@ namespace sdr // of SdrCaptionPrimitive2D create needed invisible elements for HitTest and BoundRect const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::SdrCaptionPrimitive2D( - aObjectMatrix, - aAttribute, - rCaptionObj.getTailPolygon(), - fCornerRadiusX, + aObjectMatrix, + aAttribute, + rCaptionObj.getTailPolygon(), + fCornerRadiusX, fCornerRadiusY)); xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); @@ -144,41 +144,41 @@ namespace sdr const sal_uInt32 nXDist(((SdrShadowXDistItem&)(rItemSet.Get(SDRATTR_SHADOWXDIST))).GetValue()); const sal_uInt32 nYDist(((SdrShadowYDistItem&)(rItemSet.Get(SDRATTR_SHADOWYDIST))).GetValue()); - if(nXDist || nYDist) - { - // #119750# create obect and shadow outline, clip shadow outline - // on object outline. If there is a rest, create shadow. Do this to - // emulate that shadow is *not* visible behind the object for - // transparent object fill for comments in excel - basegfx::B2DPolygon aObjectOutline( - basegfx::tools::createPolygonFromRect( - basegfx::B2DRange(0.0, 0.0, 1.0, 1.0), - fCornerRadiusX, - fCornerRadiusY)); - aObjectOutline.transform(aObjectMatrix); - - // create shadow outline - basegfx::B2DPolygon aShadowOutline(aObjectOutline); - aShadowOutline.transform( - basegfx::tools::createTranslateB2DHomMatrix(nXDist, nYDist)); - - // clip shadow outline against object outline - const basegfx::B2DPolyPolygon aClippedShadow( - basegfx::tools::clipPolygonOnPolyPolygon( - aShadowOutline, - basegfx::B2DPolyPolygon(aObjectOutline), - false, // take the outside - false)); - - if(aClippedShadow.count()) - { - // if there is shadow, create the specialized shadow primitive - xSpecialShadow = drawinglayer::primitive2d::createPolyPolygonFillPrimitive( - aClippedShadow, - aFill, - drawinglayer::attribute::FillGradientAttribute()); - } - } + if(nXDist || nYDist) + { + // #119750# create object and shadow outline, clip shadow outline + // on object outline. If there is a rest, create shadow. Do this to + // emulate that shadow is *not* visible behind the object for + // transparent object fill for comments in excel + basegfx::B2DPolygon aObjectOutline( + basegfx::tools::createPolygonFromRect( + basegfx::B2DRange(0.0, 0.0, 1.0, 1.0), + fCornerRadiusX, + fCornerRadiusY)); + aObjectOutline.transform(aObjectMatrix); + + // create shadow outline + basegfx::B2DPolygon aShadowOutline(aObjectOutline); + aShadowOutline.transform( + basegfx::tools::createTranslateB2DHomMatrix(nXDist, nYDist)); + + // clip shadow outline against object outline + const basegfx::B2DPolyPolygon aClippedShadow( + basegfx::tools::clipPolygonOnPolyPolygon( + aShadowOutline, + basegfx::B2DPolyPolygon(aObjectOutline), + false, // take the outside + false)); + + if(aClippedShadow.count()) + { + // if there is shadow, create the specialized shadow primitive + xSpecialShadow = drawinglayer::primitive2d::createPolyPolygonFillPrimitive( + aClippedShadow, + aFill, + drawinglayer::attribute::FillGradientAttribute()); + } + } } if(xSpecialShadow.is()) @@ -186,7 +186,7 @@ namespace sdr // if we really got a special shadow, create a two-element retval with the shadow // behind the standard object's geometry xRetval.realloc(2); - + xRetval[0] = xSpecialShadow; xRetval[1] = xReference; } diff --git a/main/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/main/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index db6d26bfc8..1e24a5ef85 100644 --- a/main/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/main/svx/source/sdr/contact/viewcontactofsdrmediaobj.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. - * + * *************************************************************/ @@ -87,7 +87,7 @@ Size ViewContactOfSdrMediaObj::getPreferredSize() const { ViewObjectContact* pCandidate = getViewObjectContact(a); Size aSize(pCandidate ? static_cast< ViewObjectContactOfSdrMediaObj* >(pCandidate)->getPreferredSize() : Size()); - + if(0 != aSize.getWidth() || 0 != aSize.getHeight()) { return aSize; @@ -98,7 +98,7 @@ Size ViewContactOfSdrMediaObj::getPreferredSize() const } // ------------------------------------------------------------------------------ - + void ViewContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const { // #i71805# Since we may have a whole bunch of VOCs here, make a loop @@ -116,7 +116,7 @@ void ViewContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) co } // ------------------------------------------------------------------------------ - + void ViewContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem ) { const sal_uInt32 nCount(getViewObjectContactCount()); @@ -148,11 +148,11 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrMediaObj::createViewIndependentPrimitive2DSequence() const { // create range using the model data directly. This is in SdrTextObj::aRect which i will access using - // GetGeoRect() to not trigger any calculations. It's the unrotated geometry which is okay for MediaObjects ATM. + // GetGeoRect() to not trigger any calculations. It's the unrotated geometry which is okay for MediaObjects ATM. const Rectangle& rRectangle(GetSdrMediaObj().GetGeoRect()); const basegfx::B2DRange aRange( - rRectangle.Left(), rRectangle.Top(), - rRectangle.Right(), rRectangle.Bottom()); + rRectangle.Left(), rRectangle.Top(), + rRectangle.Right(), rRectangle.Bottom()); // create object transform basegfx::B2DHomMatrix aTransform; @@ -161,15 +161,15 @@ namespace sdr aTransform.set(0, 2, aRange.getMinX()); aTransform.set(1, 2, aRange.getMinY()); - // create media primitive. Always create primitives to allow the + // create media primitive. Always create primitives to allow the // decomposition of MediaPrimitive2D to create needed invisible elements for HitTest // and/or BoundRect const basegfx::BColor aBackgroundColor(67.0 / 255.0, 67.0 / 255.0, 67.0 / 255.0); const rtl::OUString& rURL(GetSdrMediaObj().getURL()); const sal_uInt32 nPixelBorder(4L); const drawinglayer::primitive2d::Primitive2DReference xRetval( - new drawinglayer::primitive2d::MediaPrimitive2D( - aTransform, rURL, aBackgroundColor, nPixelBorder)); + new drawinglayer::primitive2d::MediaPrimitive2D( + aTransform, rURL, aBackgroundColor, nPixelBorder)); return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1); } diff --git a/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 5f1ee45c69..ae7df4ffd0 100644 --- a/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/main/svx/source/sdr/contact/viewcontactofsdrobj.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. - * + * *************************************************************/ @@ -137,12 +137,12 @@ namespace sdr ViewContact::ActionChanged(); } - // overload for acessing the SdrObject + // overload for accessing the SdrObject SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const { return &GetSdrObject(); } - + ////////////////////////////////////////////////////////////////////////////// // primitive stuff @@ -175,9 +175,9 @@ namespace sdr const basegfx::BColor aBackPen(1.0, 1.0, 1.0); const basegfx::BColor aRGBFrontColor(0.0, 0.0, 1.0); // COL_LIGHTBLUE const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::MarkerArrayPrimitive2D( - aGluepointVector, + aGluepointVector, drawinglayer::primitive2d::createDefaultGluepoint_7x7(aBackPen, aRGBFrontColor))); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } } } @@ -185,25 +185,25 @@ namespace sdr return xRetval; } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const - { - if(rSource.hasElements() && - (GetSdrObject().GetName().Len() || - GetSdrObject().GetTitle().Len() || - GetSdrObject().GetDescription().Len())) - { - const drawinglayer::primitive2d::Primitive2DReference xRef( - new drawinglayer::primitive2d::ObjectInfoPrimitive2D( - rSource, - GetSdrObject().GetName(), - GetSdrObject().GetTitle(), - GetSdrObject().GetDescription())); - - return drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1); - } - - return rSource; - } + drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const + { + if(rSource.hasElements() && + (GetSdrObject().GetName().Len() || + GetSdrObject().GetTitle().Len() || + GetSdrObject().GetDescription().Len())) + { + const drawinglayer::primitive2d::Primitive2DReference xRef( + new drawinglayer::primitive2d::ObjectInfoPrimitive2D( + rSource, + GetSdrObject().GetName(), + GetSdrObject().GetTitle(), + GetSdrObject().GetDescription())); + + return drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1); + } + + return rSource; + } } // end of namespace contact } // end of namespace sdr