[openoffice] branch trunk updated: Fixed typos, removed whitespace
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 201d50f Fixed typos, removed whitespace 201d50f is described below commit 201d50ff746b6abb0a3ac7f3daa35ffddeb81623 Author: mseidel AuthorDate: Fri Nov 12 17:44:57 2021 +0100 Fixed typos, removed whitespace --- main/basegfx/inc/basegfx/numeric/ftools.hxx| 218 ++--- main/basegfx/source/numeric/ftools.cxx | 24 +-- .../source/customshapes/EnhancedCustomShape3d.hxx | 11 +- .../customshapes/EnhancedCustomShapeEngine.hxx | 40 ++-- .../customshapes/EnhancedCustomShapeFontWork.hxx | 8 +- .../customshapes/EnhancedCustomShapeHandle.cxx | 8 +- .../customshapes/EnhancedCustomShapeHandle.hxx | 22 +-- main/svx/source/customshapes/tbxcustomshapes.cxx | 95 - main/svx/source/toolbars/fontworkbar.src | 10 +- 9 files changed, 213 insertions(+), 223 deletions(-) diff --git a/main/basegfx/inc/basegfx/numeric/ftools.hxx b/main/basegfx/inc/basegfx/numeric/ftools.hxx index 08ed018..c04b492 100644 --- a/main/basegfx/inc/basegfx/numeric/ftools.hxx +++ b/main/basegfx/inc/basegfx/numeric/ftools.hxx @@ -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. - * + * */ @@ -27,7 +27,7 @@ #include #include -// + // standard PI defines from solar.h, but we do not want to link against tools #ifndef F_PI @@ -52,95 +52,95 @@ #define F_2PI (2.0*M_PI) #endif -// + // fTools defines namespace basegfx { /** Round double to nearest integer - @return the nearest integer -*/ -inline sal_Int32 fround( double fVal ) -{ -return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); -} + @return the nearest integer + */ + inline sal_Int32 fround( double fVal ) + { + return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); + } /** Round double to nearest integer - - @return the nearest 64 bit integer -*/ -inline sal_Int64 fround64( double fVal ) -{ -return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); -} - -/** Prune a small epsilon range around zero. - - Use this method e.g. for calculating scale values. There, it - is usually advisable not to set a scaling to 0.0, because that - yields singular transformation matrices. - -@param fVal -An arbitrary, but finite and valid number - -@return either fVal, or a small value slightly above (when -fVal>0) or below (when fVal<0) zero. - */ -inline double pruneScaleValue( double fVal ) -{ + + @return the nearest 64 bit integer + */ + inline sal_Int64 fround64( double fVal ) + { + return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); + } + + /** Prune a small epsilon range around zero. + + Use this method e.g. for calculating scale values. There, it + is usually advisable not to set a scaling to 0.0, because that + yields singular transformation matrices. + + @param fVal + An arbitrary, but finite and valid number + + @return either fVal, or a small value slightly above (when + fVal>0) or below (when fVal<0) zero. +*/ + inline double pruneScaleValue( double fVal ) + { // old version used ::std::min/max, but this collides if min is defined as preprocessor // macro which is the case e.g with windows.h headers. The simplest way to avoid
[openoffice] branch trunk updated: Fixed small error from last commit
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 c2aa676 Fixed small error from last commit c2aa676 is described below commit c2aa6762603290a3bb12637f1cdccb182d5b89fb Author: mseidel AuthorDate: Fri Nov 12 17:51:25 2021 +0100 Fixed small error from last commit --- main/basegfx/inc/basegfx/numeric/ftools.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/basegfx/inc/basegfx/numeric/ftools.hxx b/main/basegfx/inc/basegfx/numeric/ftools.hxx index c04b492..8a22fe7 100644 --- a/main/basegfx/inc/basegfx/numeric/ftools.hxx +++ b/main/basegfx/inc/basegfx/numeric/ftools.hxx @@ -27,7 +27,7 @@ #include #include - +// // standard PI defines from solar.h, but we do not want to link against tools #ifndef F_PI @@ -52,7 +52,7 @@ #define F_2PI (2.0*M_PI) #endif - +// // fTools defines namespace basegfx
[openoffice] 01/02: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git commit b056bc42624b5f82a66d6e9e1ffdd433aae20b45 Author: mseidel AuthorDate: Fri Nov 12 17:44:57 2021 +0100 Fixed typos, removed whitespace (cherry picked from commit 201d50ff746b6abb0a3ac7f3daa35ffddeb81623) --- main/basegfx/inc/basegfx/numeric/ftools.hxx| 218 ++--- main/basegfx/source/numeric/ftools.cxx | 24 +-- .../source/customshapes/EnhancedCustomShape3d.hxx | 11 +- .../customshapes/EnhancedCustomShapeEngine.hxx | 40 ++-- .../customshapes/EnhancedCustomShapeFontWork.hxx | 8 +- .../customshapes/EnhancedCustomShapeHandle.cxx | 8 +- .../customshapes/EnhancedCustomShapeHandle.hxx | 22 +-- main/svx/source/customshapes/tbxcustomshapes.cxx | 95 - main/svx/source/toolbars/fontworkbar.src | 10 +- 9 files changed, 213 insertions(+), 223 deletions(-) diff --git a/main/basegfx/inc/basegfx/numeric/ftools.hxx b/main/basegfx/inc/basegfx/numeric/ftools.hxx index 08ed018..c04b492 100644 --- a/main/basegfx/inc/basegfx/numeric/ftools.hxx +++ b/main/basegfx/inc/basegfx/numeric/ftools.hxx @@ -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. - * + * */ @@ -27,7 +27,7 @@ #include #include -// + // standard PI defines from solar.h, but we do not want to link against tools #ifndef F_PI @@ -52,95 +52,95 @@ #define F_2PI (2.0*M_PI) #endif -// + // fTools defines namespace basegfx { /** Round double to nearest integer - @return the nearest integer -*/ -inline sal_Int32 fround( double fVal ) -{ -return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); -} + @return the nearest integer + */ + inline sal_Int32 fround( double fVal ) + { + return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); + } /** Round double to nearest integer - - @return the nearest 64 bit integer -*/ -inline sal_Int64 fround64( double fVal ) -{ -return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); -} - -/** Prune a small epsilon range around zero. - - Use this method e.g. for calculating scale values. There, it - is usually advisable not to set a scaling to 0.0, because that - yields singular transformation matrices. - -@param fVal -An arbitrary, but finite and valid number - -@return either fVal, or a small value slightly above (when -fVal>0) or below (when fVal<0) zero. - */ -inline double pruneScaleValue( double fVal ) -{ + + @return the nearest 64 bit integer + */ + inline sal_Int64 fround64( double fVal ) + { + return fVal > 0.0 ? static_cast( fVal + .5 ) : -static_cast( -fVal + .5 ); + } + + /** Prune a small epsilon range around zero. + + Use this method e.g. for calculating scale values. There, it + is usually advisable not to set a scaling to 0.0, because that + yields singular transformation matrices. + + @param fVal + An arbitrary, but finite and valid number + + @return either fVal, or a small value slightly above (when + fVal>0) or below (when fVal<0) zero. +*/ + inline double pruneScaleValue( double fVal ) + { // old version used ::std::min/max, but this collides if min is defined as preprocessor // macro which is the case e.g with windows.h headers. The simplest way to avoid this is to // just use the full comparison. I keep th
[openoffice] branch AOO42X updated (5ffb42a -> ac83614)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git. from 5ffb42a Fixed typos, removed whitespace new b056bc4 Fixed typos, removed whitespace new ac83614 Fixed small error from last commit The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/basegfx/inc/basegfx/numeric/ftools.hxx| 214 ++--- main/basegfx/source/numeric/ftools.cxx | 24 +-- .../source/customshapes/EnhancedCustomShape3d.hxx | 11 +- .../customshapes/EnhancedCustomShapeEngine.hxx | 40 ++-- .../customshapes/EnhancedCustomShapeFontWork.hxx | 8 +- .../customshapes/EnhancedCustomShapeHandle.cxx | 8 +- .../customshapes/EnhancedCustomShapeHandle.hxx | 22 +-- main/svx/source/customshapes/tbxcustomshapes.cxx | 95 + main/svx/source/toolbars/fontworkbar.src | 10 +- 9 files changed, 211 insertions(+), 221 deletions(-)
[openoffice] 02/02: Fixed small error from last commit
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git commit ac8361426011f9c839c039c81197d1113ade88dd Author: mseidel AuthorDate: Fri Nov 12 17:51:25 2021 +0100 Fixed small error from last commit (cherry picked from commit c2aa6762603290a3bb12637f1cdccb182d5b89fb) --- main/basegfx/inc/basegfx/numeric/ftools.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/basegfx/inc/basegfx/numeric/ftools.hxx b/main/basegfx/inc/basegfx/numeric/ftools.hxx index c04b492..8a22fe7 100644 --- a/main/basegfx/inc/basegfx/numeric/ftools.hxx +++ b/main/basegfx/inc/basegfx/numeric/ftools.hxx @@ -27,7 +27,7 @@ #include #include - +// // standard PI defines from solar.h, but we do not want to link against tools #ifndef F_PI @@ -52,7 +52,7 @@ #define F_2PI (2.0*M_PI) #endif - +// // fTools defines namespace basegfx