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 06db55ca6e Cleanup 06db55ca6e is described below commit 06db55ca6e7b86cf496b9e4c4bd824b1b77c53c0 Author: mseidel <msei...@apache.org> AuthorDate: Sat Apr 5 20:21:28 2025 +0200 Cleanup --- main/autodoc/inc/ary/object.hxx | 42 +++---- main/basebmp/source/intconversion.hxx | 106 ++++++++--------- main/basegfx/inc/basegfx/range/b2drectangle.hxx | 20 ++-- main/basegfx/inc/basegfx/range/b2irectangle.hxx | 20 ++-- main/basegfx/inc/basegfx/range/b3dvolume.hxx | 20 ++-- main/basegfx/inc/basegfx/range/b3ivolume.hxx | 20 ++-- main/basegfx/inc/basegfx/vector/b2dsize.hxx | 20 ++-- main/basegfx/inc/basegfx/vector/b2isize.hxx | 14 +-- main/basegfx/inc/basegfx/vector/b3dsize.hxx | 20 ++-- main/basegfx/inc/basegfx/vector/b3isize.hxx | 20 ++-- main/canvas/inc/canvas/verbosetrace.hxx | 14 +-- main/chart2/source/view/main/ChartItemPool.hxx | 19 ++-- main/configmgr/source/node.hxx | 126 ++++++++++----------- main/dbaccess/inc/controllerframe.hxx | 60 +++++----- .../source/deployment/gui/dp_gui_system.hxx | 15 ++- .../source/engine/transitions/boxwipe.hxx | 27 +++-- .../engine/transitions/doublediamondwipe.hxx | 21 ++-- .../source/engine/transitions/waterfallwipe.hxx | 23 ++-- main/xmloff/inc/xmloff/xmlreg.hxx | 14 +-- 19 files changed, 306 insertions(+), 315 deletions(-) diff --git a/main/autodoc/inc/ary/object.hxx b/main/autodoc/inc/ary/object.hxx index 62386a47bc..6d13269062 100644 --- a/main/autodoc/inc/ary/object.hxx +++ b/main/autodoc/inc/ary/object.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,60 +7,54 @@ * 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. - * + * *************************************************************/ - - #ifndef ARY_OBJECT_HXX #define ARY_OBJECT_HXX - - // USED SERVICES - // BASE CLASSES + // BASE CLASSES #include <cosv/tpl/processor.hxx> - // COMPONENTS - // PARAMETERS + // COMPONENTS + // PARAMETERS #include <ary/types.hxx> - namespace ary { - /** Interface for every class, that is stored within the - Autodoc Repository. + Autodoc Repository. */ class Object : public csv::ConstProcessorClient { - public: - virtual ~Object() {} + public: + virtual ~Object() {} - /// @return Type id of most derived class. - ClassId AryClass() const; + // @return Type id of most derived class. + ClassId AryClass() const; - private: - virtual ClassId get_AryClass() const = 0; + private: + virtual ClassId get_AryClass() const = 0; }; - - inline ClassId Object::AryClass() const { - return get_AryClass(); + return get_AryClass(); } -} // namespace ary +} // namespace ary #endif + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basebmp/source/intconversion.hxx b/main/basebmp/source/intconversion.hxx index 31c60152da..43fc509eb8 100644 --- a/main/basebmp/source/intconversion.hxx +++ b/main/basebmp/source/intconversion.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef INCLUDED_BASEBMP_INTCONVERSION_HXX #define INCLUDED_BASEBMP_INTCONVERSION_HXX @@ -29,56 +27,58 @@ namespace basebmp { - // metafunctions to retrieve correct POD from/to basebmp::Color - //------------------------------------------------------------------------ + // metafunctions to retrieve correct POD from/to basebmp::Color + //------------------------------------------------------------------------ - /// type-safe conversion from RgbValue to packed int32 - template< class RgbVal > struct UInt32FromRgbValue - { - sal_uInt32 operator()( RgbVal const& c ) const - { - return (c[0] << 16) | (c[1] << 8) | c[2]; - } - }; + // type-safe conversion from RgbValue to packed int32 + template< class RgbVal > struct UInt32FromRgbValue + { + sal_uInt32 operator()( RgbVal const& c ) const + { + return (c[0] << 16) | (c[1] << 8) | c[2]; + } + }; - /// type-safe conversion from packed int32 to RgbValue - template< class RgbVal > struct RgbValueFromUInt32 - { - RgbVal operator()( sal_uInt32 c ) const - { - return RgbVal((c >> 16) & 0xFF, - (c >> 8) & 0xFF, - c & 0xFF); - } - }; + // type-safe conversion from packed int32 to RgbValue + template< class RgbVal > struct RgbValueFromUInt32 + { + RgbVal operator()( sal_uInt32 c ) const + { + return RgbVal((c >> 16) & 0xFF, + (c >> 8) & 0xFF, + c & 0xFF); + } + }; - /// Get converter from given data type to sal_uInt32 - template< typename DataType > struct uInt32Converter - { - typedef std::identity<DataType> to; - typedef std::identity<DataType> from; - }; - template< unsigned int RedIndex, - unsigned int GreenIndex, - unsigned int BlueIndex > struct uInt32Converter< - vigra::RGBValue< sal_uInt8, - RedIndex, - GreenIndex, - BlueIndex > > - { - typedef UInt32FromRgbValue< - vigra::RGBValue< sal_uInt8, - RedIndex, - GreenIndex, - BlueIndex > > - to; - typedef RgbValueFromUInt32< - vigra::RGBValue< sal_uInt8, - RedIndex, - GreenIndex, - BlueIndex > > - from; - }; + // Get converter from given data type to sal_uInt32 + template< typename DataType > struct uInt32Converter + { + typedef std::identity<DataType> to; + typedef std::identity<DataType> from; + }; + template< unsigned int RedIndex, + unsigned int GreenIndex, + unsigned int BlueIndex > struct uInt32Converter< + vigra::RGBValue< sal_uInt8, + RedIndex, + GreenIndex, + BlueIndex > > + { + typedef UInt32FromRgbValue< + vigra::RGBValue< sal_uInt8, + RedIndex, + GreenIndex, + BlueIndex > > + to; + typedef RgbValueFromUInt32< + vigra::RGBValue< sal_uInt8, + RedIndex, + GreenIndex, + BlueIndex > > + from; + }; } #endif /* INCLUDED_BASEBMP_INTCONVERSION_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/range/b2drectangle.hxx b/main/basegfx/inc/basegfx/range/b2drectangle.hxx index 2f4682cd3b..d5fb24fefa 100644 --- a/main/basegfx/inc/basegfx/range/b2drectangle.hxx +++ b/main/basegfx/inc/basegfx/range/b2drectangle.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_RANGE_B2DRECTANGLE_HXX #define _BGFX_RANGE_B2DRECTANGLE_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B2DRange exactly models a Rectangle, thus, - // for interface clarity, we provide an alias name + // syntactic sugar: a B2DRange exactly models a Rectangle, thus, + // for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2DRange B2DRectangle; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B2DRange B2DRectangle; } #endif /* _BGFX_RANGE_B2DRECTANGLE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/range/b2irectangle.hxx b/main/basegfx/inc/basegfx/range/b2irectangle.hxx index e61003445c..3fca0ff46b 100644 --- a/main/basegfx/inc/basegfx/range/b2irectangle.hxx +++ b/main/basegfx/inc/basegfx/range/b2irectangle.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_RANGE_B2IRECTANGLE_HXX #define _BGFX_RANGE_B2IRECTANGLE_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B2IRange exactly models a Rectangle, thus, - // for interface clarity, we provide an alias name + // syntactic sugar: a B2IRange exactly models a Rectangle, thus, + // for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2IRange B2IRectangle; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B2IRange B2IRectangle; } #endif /* _BGFX_RANGE_B2IRECTANGLE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/range/b3dvolume.hxx b/main/basegfx/inc/basegfx/range/b3dvolume.hxx index d655f63226..9b14d35855 100644 --- a/main/basegfx/inc/basegfx/range/b3dvolume.hxx +++ b/main/basegfx/inc/basegfx/range/b3dvolume.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_RANGE_B3DBOX_HXX #define _BGFX_RANGE_B3DBOX_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B3DRange exactly models a Volume in 3D, thus, - // for interface clarity, we provide an alias name + // syntactic sugar: a B3DRange exactly models a Volume in 3D, thus, + // for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3DRange B3DVolume; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B3DRange B3DVolume; } #endif /* _BGFX_RANGE_B3DBOX_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/range/b3ivolume.hxx b/main/basegfx/inc/basegfx/range/b3ivolume.hxx index 3bd760085e..b5223d216b 100644 --- a/main/basegfx/inc/basegfx/range/b3ivolume.hxx +++ b/main/basegfx/inc/basegfx/range/b3ivolume.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_RANGE_B3IBOX_HXX #define _BGFX_RANGE_B3IBOX_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B3IRange exactly models a Box in 3D, thus, - // for interface clarity, we provide an alias name + // syntactic sugar: a B3IRange exactly models a Box in 3D, thus, + // for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3IRange B3IBox; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B3IRange B3IBox; } #endif /* _BGFX_RANGE_B3IBOX_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/vector/b2dsize.hxx b/main/basegfx/inc/basegfx/vector/b2dsize.hxx index e3d48f1f06..1621ab248e 100644 --- a/main/basegfx/inc/basegfx/vector/b2dsize.hxx +++ b/main/basegfx/inc/basegfx/vector/b2dsize.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_VECTOR_B2DSIZE_HXX #define _BGFX_VECTOR_B2DSIZE_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B2DVector exactly models a Size object, - // thus, for interface clarity, we provide an alias name + // syntactic sugar: a B2DVector exactly models a Size object, + // thus, for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2DVector B2DSize; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B2DVector B2DSize; } #endif /* _BGFX_VECTOR_B2DSIZE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/vector/b2isize.hxx b/main/basegfx/inc/basegfx/vector/b2isize.hxx index c73cf17235..194043f810 100644 --- a/main/basegfx/inc/basegfx/vector/b2isize.hxx +++ b/main/basegfx/inc/basegfx/vector/b2isize.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_VECTOR_B2ISIZE_HXX #define _BGFX_VECTOR_B2ISIZE_HXX @@ -31,8 +29,10 @@ namespace basegfx // syntactic sugar: a B2IVector exactly models a Size object, // thus, for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) + // Alias name for interface clarity (not everybody is aware of the identity) typedef B2IVector B2ISize; } #endif /* _BGFX_VECTOR_B2ISIZE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/vector/b3dsize.hxx b/main/basegfx/inc/basegfx/vector/b3dsize.hxx index 4b2aa001f9..6b6def5cfe 100644 --- a/main/basegfx/inc/basegfx/vector/b3dsize.hxx +++ b/main/basegfx/inc/basegfx/vector/b3dsize.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_VECTOR_B3DSIZE_HXX #define _BGFX_VECTOR_B3DSIZE_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B3DVector exactly models a Size3D object, - // thus, for interface clarity, we provide an alias name + // syntactic sugar: a B3DVector exactly models a Size3D object, + // thus, for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3DVector B3DSize; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B3DVector B3DSize; } #endif /* _BGFX_VECTOR_B3DSIZE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/basegfx/inc/basegfx/vector/b3isize.hxx b/main/basegfx/inc/basegfx/vector/b3isize.hxx index 35e0b2711c..5e74f596c8 100644 --- a/main/basegfx/inc/basegfx/vector/b3isize.hxx +++ b/main/basegfx/inc/basegfx/vector/b3isize.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _BGFX_VECTOR_B3ISIZE_HXX #define _BGFX_VECTOR_B3ISIZE_HXX @@ -28,11 +26,13 @@ namespace basegfx { - // syntactic sugar: a B3IVector exactly models a Size3D object, - // thus, for interface clarity, we provide an alias name + // syntactic sugar: a B3IVector exactly models a Size3D object, + // thus, for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3IVector B3ISize; + // Alias name for interface clarity (not everybody is aware of the identity) + typedef B3IVector B3ISize; } #endif /* _BGFX_VECTOR_B3ISIZE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/canvas/inc/canvas/verbosetrace.hxx b/main/canvas/inc/canvas/verbosetrace.hxx index 705abc574c..1a5f1bf8f3 100644 --- a/main/canvas/inc/canvas/verbosetrace.hxx +++ b/main/canvas/inc/canvas/verbosetrace.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,28 +7,28 @@ * 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. - * + * *************************************************************/ - - #ifndef INCLUDED_CANVAS_VERBOSETRACE_HXX #define INCLUDED_CANVAS_VERBOSETRACE_HXX #if defined(VERBOSE) && defined(DBG_UTIL) -/// Wrap OSL_TRACE with a verbosity switch +// Wrap OSL_TRACE with a verbosity switch #define VERBOSE_TRACE OSL_TRACE #else #define VERBOSE_TRACE 1 ? ((void)0) : OSL_TRACE #endif #endif /* INCLUDED_CANVAS_VERBOSETRACE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/chart2/source/view/main/ChartItemPool.hxx b/main/chart2/source/view/main/ChartItemPool.hxx index f3f5308ad0..e6553ad384 100644 --- a/main/chart2/source/view/main/ChartItemPool.hxx +++ b/main/chart2/source/view/main/ChartItemPool.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,19 +7,18 @@ * 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. - * + * *************************************************************/ - #ifndef _CHART2_ITEMPOOL_HXX #define _CHART2_ITEMPOOL_HXX @@ -32,7 +31,7 @@ class ChartItemPool : public SfxItemPool { private: SfxPoolItem** ppPoolDefaults; - SfxItemInfo* pItemInfos; + SfxItemInfo* pItemInfos; public: ChartItemPool(); @@ -44,11 +43,13 @@ public: virtual SfxItemPool* Clone() const; SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; - /// creates a pure chart item pool - static SfxItemPool* CreateChartItemPool(); + // creates a pure chart item pool + static SfxItemPool* CreateChartItemPool(); }; -} // namespace chart +} // namespace chart #endif // _CHART2_ITEMPOOL_HXX + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/configmgr/source/node.hxx b/main/configmgr/source/node.hxx index 8f442c5033..9e3801a127 100644 --- a/main/configmgr/source/node.hxx +++ b/main/configmgr/source/node.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef INCLUDED_CONFIGMGR_SOURCE_NODE_HXX #define INCLUDED_CONFIGMGR_SOURCE_NODE_HXX @@ -43,71 +41,73 @@ namespace configmgr { */ class Node: public salhelper::SimpleReferenceObject { public: - /// Identifies the type of configuration element. - enum Kind { - /** Property (<prop> element) - * - * Identifies instances of PropertyNode. - */ - KIND_PROPERTY, - /** Localized property (<prop> element) - * - * Identifies instances of LocalizedPropertyNode. - */ - KIND_LOCALIZED_PROPERTY, - /** - * Value of a property (<value> element) - * - * Identifies instances of LocalizedValueNode. - */ - KIND_LOCALIZED_VALUE, - /** Group member node (<node> element) - * - * Identifies instances of GroupNode. - */ - KIND_GROUP, - /** Set member node (<node> element) - * - * Identifies instances of SetNode. - */ - KIND_SET, - }; - - virtual Kind kind() const = 0; - - virtual rtl::Reference< Node > clone(bool keepTemplateName) const = 0; - - virtual NodeMap & getMembers(); - - virtual rtl::OUString getTemplateName() const; - - virtual void setMandatory(int layer); - - virtual int getMandatory() const; - - void setLayer(int layer); - - int getLayer() const; - - void setFinalized(int layer); - - int getFinalized() const; - - rtl::Reference< Node > getMember(rtl::OUString const & name); + // Identifies the type of configuration element. + enum Kind { + /** Property (<prop> element) + * + * Identifies instances of PropertyNode. + */ + KIND_PROPERTY, + /** Localized property (<prop> element) + * + * Identifies instances of LocalizedPropertyNode. + */ + KIND_LOCALIZED_PROPERTY, + /** + * Value of a property (<value> element) + * + * Identifies instances of LocalizedValueNode. + */ + KIND_LOCALIZED_VALUE, + /** Group member node (<node> element) + * + * Identifies instances of GroupNode. + */ + KIND_GROUP, + /** Set member node (<node> element) + * + * Identifies instances of SetNode. + */ + KIND_SET, + }; + + virtual Kind kind() const = 0; + + virtual rtl::Reference< Node > clone(bool keepTemplateName) const = 0; + + virtual NodeMap & getMembers(); + + virtual rtl::OUString getTemplateName() const; + + virtual void setMandatory(int layer); + + virtual int getMandatory() const; + + void setLayer(int layer); + + int getLayer() const; + + void setFinalized(int layer); + + int getFinalized() const; + + rtl::Reference< Node > getMember(rtl::OUString const & name); protected: - explicit Node(int layer); + explicit Node(int layer); - Node(const Node & other); + Node(const Node & other); - virtual ~Node(); + virtual ~Node(); - virtual void clear(); + virtual void clear(); - int layer_; - int finalized_; + int layer_; + int finalized_; }; } #endif + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/dbaccess/inc/controllerframe.hxx b/main/dbaccess/inc/controllerframe.hxx index 0a8ec053a6..2c0630aece 100644 --- a/main/dbaccess/inc/controllerframe.hxx +++ b/main/dbaccess/inc/controllerframe.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef DBACCESS_CONTROLLERFRAME_HXX #define DBACCESS_CONTROLLERFRAME_HXX @@ -36,41 +34,41 @@ namespace dbaui { //........................................................................ - class IController; + class IController; //==================================================================== //= ControllerFrame //==================================================================== - struct ControllerFrame_Data; - /** helper class to ancapsulate the frame which a controller is plugged into, - doing some common actions on it. - */ + struct ControllerFrame_Data; + /** helper class to ancapsulate the frame which a controller is plugged into, + doing some common actions on it. + */ class ControllerFrame { - public: - ControllerFrame( IController& _rController ); - ~ControllerFrame(); + public: + ControllerFrame( IController& _rController ); + ~ControllerFrame(); - /// attaches a new frame - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& - attachFrame( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame - ); + // attaches a new frame + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& + attachFrame( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame + ); - // retrieves the current frame - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& - getFrame() const; + // retrieves the current frame + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& + getFrame() const; - /** determines whether the frame is currently active - */ - bool isActive() const; + /** determines whether the frame is currently active + */ + bool isActive() const; - /** notifies the instance that a certain frame action happened with our frame - */ - void frameAction( ::com::sun::star::frame::FrameAction _eAction ); + /** notifies the instance that a certain frame action happened with our frame + */ + void frameAction( ::com::sun::star::frame::FrameAction _eAction ); - private: - ::std::auto_ptr< ControllerFrame_Data > m_pData; + private: + ::std::auto_ptr< ControllerFrame_Data > m_pData; }; //........................................................................ @@ -78,3 +76,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_CONTROLLERFRAME_HXX + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/desktop/source/deployment/gui/dp_gui_system.hxx b/main/desktop/source/deployment/gui/dp_gui_system.hxx index 1b0280ba9b..bfe3570fc0 100644 --- a/main/desktop/source/deployment/gui/dp_gui_system.hxx +++ b/main/desktop/source/deployment/gui/dp_gui_system.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,27 +7,26 @@ * 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. - * + * *************************************************************/ - - #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SYSTEM_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SYSTEM_HXX - -/// @HTML +// @HTML namespace dp_gui { bool isVista(); } #endif + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/slideshow/source/engine/transitions/boxwipe.hxx b/main/slideshow/source/engine/transitions/boxwipe.hxx index 60c272e0c3..440eead3f1 100644 --- a/main/slideshow/source/engine/transitions/boxwipe.hxx +++ b/main/slideshow/source/engine/transitions/boxwipe.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,44 +7,43 @@ * 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. - * + * *************************************************************/ - - #if ! defined INCLUDED_SLIDESHOW_BOXWIPE_HXX #define INCLUDED_SLIDESHOW_BOXWIPE_HXX #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" - namespace slideshow { namespace internal { -/// Generates a default topleft to right bottom box wipe +// Generates a default topleft to right bottom box wipe class BoxWipe : public ParametricPolyPolygon { public: - BoxWipe( bool topCentered ) : m_topCentered(topCentered), - m_unitRect( createUnitRect() ) - {} - virtual ::basegfx::B2DPolyPolygon operator () ( double t ); + BoxWipe( bool topCentered ) : m_topCentered(topCentered), + m_unitRect( createUnitRect() ) + {} + virtual ::basegfx::B2DPolyPolygon operator () ( double t ); private: - const bool m_topCentered; - const ::basegfx::B2DPolyPolygon m_unitRect; + const bool m_topCentered; + const ::basegfx::B2DPolyPolygon m_unitRect; }; } } #endif /* INCLUDED_SLIDESHOW_BOXWIPE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/slideshow/source/engine/transitions/doublediamondwipe.hxx b/main/slideshow/source/engine/transitions/doublediamondwipe.hxx index a79612ed1b..f29612b6e5 100644 --- a/main/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/main/slideshow/source/engine/transitions/doublediamondwipe.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #if ! defined INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX #define INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX @@ -29,21 +27,22 @@ #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" - namespace slideshow { namespace internal { -/// Generates a double diamond wipe: +// Generates a double diamond wipe: class DoubleDiamondWipe : public ParametricPolyPolygon { public: - DoubleDiamondWipe() : m_unitRect( createUnitRect() ) {} - virtual ::basegfx::B2DPolyPolygon operator()( double x ); + DoubleDiamondWipe() : m_unitRect( createUnitRect() ) {} + virtual ::basegfx::B2DPolyPolygon operator()( double x ); private: - const ::basegfx::B2DPolyPolygon m_unitRect; + const ::basegfx::B2DPolyPolygon m_unitRect; }; } } #endif /* INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/slideshow/source/engine/transitions/waterfallwipe.hxx b/main/slideshow/source/engine/transitions/waterfallwipe.hxx index 2b45503fb2..47c405b6e6 100644 --- a/main/slideshow/source/engine/transitions/waterfallwipe.hxx +++ b/main/slideshow/source/engine/transitions/waterfallwipe.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,42 +7,41 @@ * 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. - * + * *************************************************************/ - - #if ! defined INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX #define INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX #include "parametricpolypolygon.hxx" #include <basegfx/polygon/b2dpolygon.hxx> - namespace slideshow { namespace internal { -/// Generate a vertical left waterfall wipe +// Generate a vertical left waterfall wipe class WaterfallWipe : public ParametricPolyPolygon { public: - WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis = false ); - virtual ::basegfx::B2DPolyPolygon operator () ( double t ); + WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis = false ); + virtual ::basegfx::B2DPolyPolygon operator () ( double t ); private: - bool m_flipOnYAxis; - ::basegfx::B2DPolygon m_waterfall; + bool m_flipOnYAxis; + ::basegfx::B2DPolygon m_waterfall; }; } } #endif /* INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX */ + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/xmloff/inc/xmloff/xmlreg.hxx b/main/xmloff/inc/xmloff/xmlreg.hxx index 9688fa3fce..979767cb00 100644 --- a/main/xmloff/inc/xmloff/xmlreg.hxx +++ b/main/xmloff/inc/xmloff/xmlreg.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,20 +7,18 @@ * 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. - * + * *************************************************************/ - - #ifndef _XMLOFF_XMLREG_HXX #define _XMLOFF_XMLREG_HXX @@ -33,6 +31,8 @@ * * @return returns sal_False if at least one component could not be registered. */ -sal_Bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ); /// [all] ServiceProvider to register in. +sal_Bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ); // [all] ServiceProvider to register in. #endif // _XMLOFF_XMLREG_HXX + +/* vim: set noet sw=4 ts=4: */