diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:06:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 09:51:32 -0600 |
commit | 8792ec7b2129650777b7b4bfacaa7c13d923279b (patch) | |
tree | f181e37b61533b460397cc68625fd21f46bb6393 /include | |
parent | dff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff) |
Remove visual noise from include
Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx
Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
1090 files changed, 5758 insertions, 5787 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index b76a9b0ff35c..d64ba0fafc17 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -44,9 +44,9 @@ class SvStream; namespace avmedia { -//--------------- + // - MediaState - -// -------------- + enum MediaState { @@ -56,9 +56,9 @@ enum MediaState MEDIASTATE_PAUSE = 3 }; -// ------------- + // - MediaItem - -// ------------- + class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem { diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 0087f969e59a..5c7a4a3d1aca 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -27,9 +27,9 @@ namespace avmedia { -// ------------------------------- + // - SvxGrafFilterToolBoxControl - -// ------------------------------- + class MediaItem; diff --git a/include/basebmp/accessor.hxx b/include/basebmp/accessor.hxx index 0ef3b5716465..b77af908a0de 100644 --- a/include/basebmp/accessor.hxx +++ b/include/basebmp/accessor.hxx @@ -35,7 +35,7 @@ template<typename ValueType> class StandardAccessor public: typedef ValueType value_type; - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -49,7 +49,7 @@ public: return i[diff]; } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const @@ -64,7 +64,7 @@ public: } }; -//----------------------------------------------------------------------------- + /** Non-standard accessor type @@ -76,7 +76,7 @@ template<typename ValueType> class NonStandardAccessor public: typedef ValueType value_type; - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -90,7 +90,7 @@ public: return i.get(diff); } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const diff --git a/include/basebmp/accessoradapters.hxx b/include/basebmp/accessoradapters.hxx index f4a05dc331c2..e32533973ea8 100644 --- a/include/basebmp/accessoradapters.hxx +++ b/include/basebmp/accessoradapters.hxx @@ -91,12 +91,12 @@ public: maSetterFunctor( setterFunctor ) {} - // ------------------------------------------------------- + WrappedAccessor const& getWrappedAccessor() const { return maAccessor; } WrappedAccessor& getWrappedAccessor() { return maAccessor; } - // ------------------------------------------------------- + value_type getter(typename GetterFunctor::argument_type v) const { @@ -107,7 +107,7 @@ public: return maSetterFunctor(v); } - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -121,7 +121,7 @@ public: return maGetterFunctor( maAccessor(i,diff) ); } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const @@ -144,7 +144,7 @@ public: }; -//----------------------------------------------------------------------------- + /** Interpose given accessor's set methods with a binary function, taking both old and new value. @@ -201,12 +201,12 @@ public: maFunctor( functor ) {} - // ------------------------------------------------------- + WrappedAccessor const& getWrappedAccessor() const { return maAccessor; } WrappedAccessor& getWrappedAccessor() { return maAccessor; } - // ------------------------------------------------------- + typename SetterFunctor::result_type setter( typename SetterFunctor::first_argument_type v1, @@ -215,7 +215,7 @@ public: return maSetterFunctor(v1,v2); } - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -229,7 +229,7 @@ public: return maAccessor(i,diff); } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const @@ -252,7 +252,7 @@ public: }; -//----------------------------------------------------------------------------- + /** Write through a CompositeIterator's first wrapped iterator, by piping the first wrapped iterator value, the second iterator @@ -333,7 +333,7 @@ public: maFunctor( func ) {} - // ------------------------------------------------------- + WrappedAccessor1 const& get1stWrappedAccessor() const { return ma1stAccessor; } WrappedAccessor1& get1stWrappedAccessor() { return ma1stAccessor; } @@ -341,7 +341,7 @@ public: WrappedAccessor2 const& get2ndWrappedAccessor() const { return ma2ndAccessor; } WrappedAccessor2& get2ndWrappedAccessor() { return ma2ndAccessor; } - // ------------------------------------------------------- + typename Functor::result_type setter( typename Functor::first_argument_type v1, @@ -351,7 +351,7 @@ public: return maSetterFunctor(v1,v2,v3); } - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -365,7 +365,7 @@ public: return ma1stAccessor(i.second(),diff); } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const @@ -390,7 +390,7 @@ public: }; -//----------------------------------------------------------------------------- + /** Access two distinct images simultaneously @@ -457,7 +457,7 @@ public: ma2ndAccessor( accessor2 ) {} - // ------------------------------------------------------- + WrappedAccessor1 const& get1stWrappedAccessor() const { return ma1stAccessor; } WrappedAccessor1& get1stWrappedAccessor() { return ma1stAccessor; } @@ -465,7 +465,7 @@ public: WrappedAccessor2 const& get2ndWrappedAccessor() const { return ma2ndAccessor; } WrappedAccessor2& get2ndWrappedAccessor() { return ma2ndAccessor; } - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -481,7 +481,7 @@ public: ma2ndAccessor(i.second(),diff)); } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const diff --git a/include/basebmp/accessorfunctors.hxx b/include/basebmp/accessorfunctors.hxx index 58550b010512..87edfed17290 100644 --- a/include/basebmp/accessorfunctors.hxx +++ b/include/basebmp/accessorfunctors.hxx @@ -29,7 +29,7 @@ namespace basebmp { // Some common accessor functors -// ------------------------------------------------------------ + /// combine two values via XOR @@ -38,7 +38,7 @@ template< typename T > struct XorFunctor : public std::binary_function<T,T,T> T operator()( T v1, T v2 ) const { return v1 ^ v2; } }; -//----------------------------------------------------------------------------- + /// Base class, passing on the arg types template< typename T, typename M > struct MaskFunctorBase : @@ -129,7 +129,7 @@ template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,false } }; -//----------------------------------------------------------------------------- + /** Split a pair value from a JoinImageAccessorAdapter into its individual values, and pass it on to a ternary functor diff --git a/include/basebmp/accessortraits.hxx b/include/basebmp/accessortraits.hxx index 4ce9e6926e35..b68498410532 100644 --- a/include/basebmp/accessortraits.hxx +++ b/include/basebmp/accessortraits.hxx @@ -69,7 +69,7 @@ template< class Accessor, type; }; -//----------------------------------------------------------------------------- + /** Traits template for Accessor diff --git a/include/basebmp/colorblendaccessoradapter.hxx b/include/basebmp/colorblendaccessoradapter.hxx index c4511c709844..59055b06fe0a 100644 --- a/include/basebmp/colorblendaccessoradapter.hxx +++ b/include/basebmp/colorblendaccessoradapter.hxx @@ -83,19 +83,19 @@ public: maGetterValue(val) {} - // ------------------------------------------------------- + void setColor( color_type col ) { maBlendColor=col; } color_type getColor() { return maBlendColor; } void setGetterValue( value_type val ) { maGetterValue=val; } value_type getGetterValue() { return maGetterValue; } - // ------------------------------------------------------- + WrappedAccessor const& getWrappedAccessor() const { return maWrappee; } WrappedAccessor& getWrappedAccessor() { return maWrappee; } - // ------------------------------------------------------- + /// @return constant value, regardless of iterator content template< typename IteratorType > value_type operator()(SAL_UNUSED_PARAMETER IteratorType const& ) const @@ -109,7 +109,7 @@ public: return maGetterValue; } - // ------------------------------------------------------- + template< typename V, typename IteratorType > void set(V const& value, IteratorType const& i) const diff --git a/include/basebmp/colormisc.hxx b/include/basebmp/colormisc.hxx index d2142968d3ba..233c318e5079 100644 --- a/include/basebmp/colormisc.hxx +++ b/include/basebmp/colormisc.hxx @@ -105,7 +105,7 @@ template< bool polarity > struct ColorBlendFunctor32 } }; -//----------------------------------------------------------------------------- + template<> struct ColorTraits< Color > { diff --git a/include/basebmp/colortraits.hxx b/include/basebmp/colortraits.hxx index bcbc8f9b259d..0b0c4921f234 100644 --- a/include/basebmp/colortraits.hxx +++ b/include/basebmp/colortraits.hxx @@ -103,7 +103,7 @@ template< typename ValueType, } }; -//----------------------------------------------------------------------------- + template< typename ColorType > struct ColorTraits { diff --git a/include/basebmp/greylevelformats.hxx b/include/basebmp/greylevelformats.hxx index 3fcd90fcda5f..705c26d7d506 100644 --- a/include/basebmp/greylevelformats.hxx +++ b/include/basebmp/greylevelformats.hxx @@ -63,7 +63,7 @@ template< typename PixelType, } }; -//----------------------------------------------------------------------------- + template< class Iterator, class Accessor, @@ -95,7 +95,7 @@ template< int BitsPerPixel, (1UL << BitsPerPixel)-1 > {}; -//----------------------------------------------------------------------------- + // 1bpp MSB typedef PixelFormatTraitsTemplate_PackedGreylevel<1, true> PixelFormatTraits_GREY1_MSB; diff --git a/include/basebmp/metafunctions.hxx b/include/basebmp/metafunctions.hxx index e451dce8e4d9..597e01337614 100644 --- a/include/basebmp/metafunctions.hxx +++ b/include/basebmp/metafunctions.hxx @@ -65,7 +65,7 @@ template <typename T> struct remove_const<const T> typedef T type; }; -//-------------------------------------------------------------- + /// Base class for an adaptable ternary functor template< typename A1, typename A2, typename A3, typename R > struct TernaryFunctorBase @@ -76,7 +76,7 @@ template< typename A1, typename A2, typename A3, typename R > struct TernaryFunc typedef R result_type; }; -//-------------------------------------------------------------- + /** template meta function: ensure that given integer type is unsigned @@ -107,7 +107,7 @@ template< typename T > inline typename make_unsigned<T>::type unsigned_cast( T v return static_cast< typename make_unsigned<T>::type >(value); } -//-------------------------------------------------------------- + /// returns true, if given number is strictly less than 0 template< typename T > inline bool is_negative( T x ) @@ -122,7 +122,7 @@ inline bool is_negative( int x ) return static_cast<unsigned int>(x) >> (sizeof(int)*8-1); } -//-------------------------------------------------------------- + /// Results in VigraTrueType, if T is of integer type and scalar template< typename T, typename trueCase, typename falseCase > @@ -166,7 +166,7 @@ struct ifBothScalarIntegral falseCase >::type type; }; -//-------------------------------------------------------------- + /// Count number of trailing zeros template< unsigned int val > struct numberOfTrailingZeros @@ -182,7 +182,7 @@ template<> struct numberOfTrailingZeros<0> enum { value = 0 }; }; -//-------------------------------------------------------------- + /// Count number of one bits template< unsigned int val > struct bitcount @@ -196,7 +196,7 @@ template<> struct bitcount<0> enum { value = 0 }; }; -//-------------------------------------------------------------- + /// Shift left for positive shift value, and right otherwise template< typename T > inline T shiftLeft( T v, int shift ) @@ -210,7 +210,7 @@ template< typename T > inline T shiftRight( T v, int shift ) return shift > 0 ? v >> shift : v << (-shift); } -//-------------------------------------------------------------- + /// Replace non-std project2nd from SGI extensions template< typename T1, typename T2 > diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx index 55cc1742d4c5..664206240b43 100644 --- a/include/basebmp/packedpixeliterator.hxx +++ b/include/basebmp/packedpixeliterator.hxx @@ -636,7 +636,7 @@ public: } }; -//----------------------------------------------------------------------------- + // partial specialization for the accessor traits masked_accessor // selector metafunction - can employ fast mask functor for the 1bpp diff --git a/include/basebmp/paletteformats.hxx b/include/basebmp/paletteformats.hxx index fce122a24f5e..083164cd5ea6 100644 --- a/include/basebmp/paletteformats.hxx +++ b/include/basebmp/paletteformats.hxx @@ -35,7 +35,7 @@ namespace basebmp { -//----------------------------------------------------------------------------- + /** Lookup index value for given color value in a PaletteImageAccessor */ @@ -48,7 +48,7 @@ template< class Accessor > struct ColorLookup } }; -//----------------------------------------------------------------------------- + // partial specialization of AccessorTraits for PaletteAccessor template< class Accessor, typename ColorType > struct AccessorTraits< @@ -83,7 +83,7 @@ template< class Accessor, typename ColorType > struct AccessorTraits< }; }; -//----------------------------------------------------------------------------- + template< typename ColorType > struct PaletteAccessorSelector { @@ -93,7 +93,7 @@ template< typename ColorType > struct PaletteAccessorSelector }; }; -//----------------------------------------------------------------------------- + template< class Iterator, class Accessor > struct PixelFormatTraitsTemplate_Palette @@ -113,7 +113,7 @@ template< int BitsPerPixel, NonStandardAccessor< sal_uInt8 > > {}; -//----------------------------------------------------------------------------- + // 1bpp MSB typedef PixelFormatTraitsTemplate_PackedPalette<1, true> PixelFormatTraits_PAL1_MSB; diff --git a/include/basebmp/paletteimageaccessor.hxx b/include/basebmp/paletteimageaccessor.hxx index 6f0164e64af6..d19cd0344e32 100644 --- a/include/basebmp/paletteimageaccessor.hxx +++ b/include/basebmp/paletteimageaccessor.hxx @@ -86,12 +86,12 @@ public: mnNumEntries(numEntries) {} - // ------------------------------------------------------- + Accessor const& getWrappedAccessor() const { return maAccessor; } Accessor& getWrappedAccessor() { return maAccessor; } - // ------------------------------------------------------- + data_type lookup(value_type const& v) const { @@ -119,7 +119,7 @@ public: return best_entry-mpPalette; } - // ------------------------------------------------------- + template< class Iterator > value_type operator()(Iterator const& i) const @@ -133,7 +133,7 @@ public: return mpPalette[ maAccessor(i,diff) ]; } - // ------------------------------------------------------- + template< typename V, class Iterator > void set(V const& value, Iterator const& i) const diff --git a/include/basebmp/pixelformatadapters.hxx b/include/basebmp/pixelformatadapters.hxx index 09cc9368394d..3789b7eb0360 100644 --- a/include/basebmp/pixelformatadapters.hxx +++ b/include/basebmp/pixelformatadapters.hxx @@ -55,7 +55,7 @@ template< typename Getter, }; }; -//----------------------------------------------------------------------------- + /** Convert color value to pixel data type */ @@ -68,7 +68,7 @@ template< class Accessor, typename DataType > struct ColorConvert } }; -//----------------------------------------------------------------------------- + /** Macro generates partial specialization for color-conversion UnaryFunctionAccessorAdapter, and the given getter/setter functors diff --git a/include/basebmp/polypolygonrenderer.hxx b/include/basebmp/polypolygonrenderer.hxx index eeb0d477416f..88963ae0be9f 100644 --- a/include/basebmp/polypolygonrenderer.hxx +++ b/include/basebmp/polypolygonrenderer.hxx @@ -168,7 +168,7 @@ namespace basebmp // Perform actual scan conversion - //---------------------------------------------------------------------- + if( aGET.empty() ) return; @@ -192,7 +192,7 @@ namespace basebmp // now process each of the nMaxY - nMinY + 1 scanlines - // ------------------------------------------------------------ + for( sal_Int32 y=nMinY; y <= nMaxY; ++y ) { @@ -286,7 +286,7 @@ namespace basebmp // prune AET from ended edges, and keep it sorted - // --------------------------------------------------------- + pAETOther->clear(); if( pAET->size() == 2 ) diff --git a/include/basebmp/rgb24pixelformats.hxx b/include/basebmp/rgb24pixelformats.hxx index c4f460cc5e10..50c110a0dfd9 100644 --- a/include/basebmp/rgb24pixelformats.hxx +++ b/include/basebmp/rgb24pixelformats.hxx @@ -54,7 +54,7 @@ template< typename PixelType, typename ColorType > struct RGBValueSetter : } }; -//----------------------------------------------------------------------------- + template< typename PixelType > struct PixelFormatTraitsTemplate_RGBValue { @@ -71,7 +71,7 @@ template< typename PixelType > struct PixelFormatTraitsTemplate_RGBValue getter_type, setter_type> accessor_selector; }; -//----------------------------------------------------------------------------- + // 24bpp RGB typedef PixelFormatTraitsTemplate_RGBValue< diff --git a/include/basebmp/rgbmaskpixelformats.hxx b/include/basebmp/rgbmaskpixelformats.hxx index d82b79bdee7c..d1d9b8464e49 100644 --- a/include/basebmp/rgbmaskpixelformats.hxx +++ b/include/basebmp/rgbmaskpixelformats.hxx @@ -191,7 +191,7 @@ template< typename PixelType, } }; -//----------------------------------------------------------------------------- + template< typename PixelType, unsigned int RedMask, @@ -220,7 +220,7 @@ template< typename PixelType, getter_type, setter_type> accessor_selector; }; -//----------------------------------------------------------------------------- + // Hopefully this is an understandable plaintext explanation that matches // reality... @@ -251,7 +251,7 @@ template< typename PixelType, # endif #endif -//----------------------------------------------------------------------------- + // 16bpp MSB RGB typedef PixelFormatTraitsTemplate_RGBMask< diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx index 6533c6400123..457409b2cfde 100644 --- a/include/basegfx/color/bcolor.hxx +++ b/include/basegfx/color/bcolor.hxx @@ -26,14 +26,14 @@ #include <vector> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace com { namespace sun { namespace star { namespace rendering { class XGraphicDevice; }}}} -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 3c398708a717..14f9c0730ab4 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -26,7 +26,7 @@ #include <boost/utility.hpp> #include <vector> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -81,7 +81,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -107,7 +107,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -135,7 +135,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -167,7 +167,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -203,7 +203,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -243,7 +243,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -278,7 +278,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -315,7 +315,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -365,7 +365,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -413,7 +413,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx index 2b033ade73f3..24efc70df476 100644 --- a/include/basegfx/color/bcolortools.hxx +++ b/include/basegfx/color/bcolortools.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx index a20598c82b3b..24286d917295 100644 --- a/include/basegfx/curve/b2dbeziertools.hxx +++ b/include/basegfx/curve/b2dbeziertools.hxx @@ -24,7 +24,7 @@ #include <vector> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx @@ -32,7 +32,7 @@ namespace basegfx class B2DCubicBezier; } -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -50,7 +50,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX diff --git a/include/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx index 22c55b5ee10c..fb781cb4016c 100644 --- a/include/basegfx/curve/b2dcubicbezier.hxx +++ b/include/basegfx/curve/b2dcubicbezier.hxx @@ -24,7 +24,7 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace basegfx @@ -32,7 +32,7 @@ namespace basegfx class B2DPolygon; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx index b393faa86de2..b2aef896a659 100644 --- a/include/basegfx/matrix/b2dhommatrixtools.hxx +++ b/include/basegfx/matrix/b2dhommatrixtools.hxx @@ -27,7 +27,7 @@ #include <basegfx/basegfxdllapi.h> -/////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -136,7 +136,7 @@ namespace basegfx } // end of namespace tools } // end of namespace basegfx -/////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -175,7 +175,7 @@ namespace basegfx } // end of namespace tools } // end of namespace basegfx -/////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -224,7 +224,7 @@ namespace basegfx } // end of namespace basegfx -/////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx index 5cb42c07dfad..89b3aaeb2e4b 100644 --- a/include/basegfx/numeric/ftools.hxx +++ b/include/basegfx/numeric/ftools.hxx @@ -23,7 +23,7 @@ #include <rtl/math.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // standard PI defines from solar.h, but we do not want to link against tools #ifndef F_PI @@ -48,7 +48,7 @@ #define F_2PI (2.0*M_PI) #endif -////////////////////////////////////////////////////////////////////////////// + // fTools defines namespace basegfx @@ -89,7 +89,7 @@ namespace basegfx // 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 the original here, maybe there will be a better // solution some day. - // + //return fVal < 0.0 ? // (::std::min(fVal,-0.00001)) : // (::std::max(fVal,0.00001)); diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx index 86f9ea7f7817..6fec4ad4ccaa 100644 --- a/include/basegfx/pixel/bpixel.hxx +++ b/include/basegfx/pixel/bpixel.hxx @@ -25,10 +25,10 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -127,7 +127,7 @@ namespace basegfx } }; - ////////////////////////////////////////////////////////////////////////// + // external operators inline BPixel minimum(const BPixel& rTupA, const BPixel& rTupB) diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx index e853b78a9428..bd45342344e7 100644 --- a/include/basegfx/point/b3dpoint.hxx +++ b/include/basegfx/point/b3dpoint.hxx @@ -129,7 +129,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + /** Transform B3DPoint by given transformation matrix. diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index bc7ddf40c1ab..9d6ae0b53700 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/drawing/LineCap.hpp> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx index a79b6eec4d3f..821ed5bbf795 100644 --- a/include/basegfx/polygon/b2dpolygonclipper.hxx +++ b/include/basegfx/polygon/b2dpolygonclipper.hxx @@ -24,7 +24,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx index 6450a9ba1905..c5a2a0fb0cf9 100644 --- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx +++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx @@ -24,7 +24,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -51,7 +51,7 @@ namespace basegfx } // end of namespace tools } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx index 73137568c703..8fadce08b0d2 100644 --- a/include/basegfx/polygon/b2dpolygontools.hxx +++ b/include/basegfx/polygon/b2dpolygontools.hxx @@ -30,7 +30,7 @@ #include <vector> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -422,7 +422,7 @@ namespace basegfx */ BASEGFX_DLLPUBLIC B2DPolygon createWaveline(const B2DPolygon& rCandidate, double fWaveWidth, double fWaveHeight); - ////////////////////////////////////////////////////////////////////// + // comparators with tolerance for 2D Polygons BASEGFX_DLLPUBLIC bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, const double& rfSmallValue); diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx index 48457fcadc74..9ea03a5dcaa8 100644 --- a/include/basegfx/polygon/b2dpolygontriangulator.hxx +++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx @@ -23,7 +23,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx index 0b42f6ff4dfd..c43a8de55112 100644 --- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx +++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx @@ -23,7 +23,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -104,7 +104,7 @@ namespace basegfx // For convenience: The four basic operations OR, XOR, AND and DIFF for // two PolyPolygons. These are combinations of the above methods. To not be forced // to do evtl. already done preparations twice, You have to do the operations Yourself. - // + // A source preparation consists of preparing it to be seen as XOR-Rule PolyPolygon, // so it is freed of intersections, self-intersections and the orientations are corrected. // Important is that it will define the same areas as before, but is intersection-free. @@ -145,7 +145,7 @@ namespace basegfx } // end of namespace tools } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX diff --git a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx index e3b4be39c8d4..fb7d1ab4f676 100644 --- a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx +++ b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx index 182053bfbd90..e92fe5a2f01a 100644 --- a/include/basegfx/polygon/b2dpolypolygontools.hxx +++ b/include/basegfx/polygon/b2dpolypolygontools.hxx @@ -31,7 +31,7 @@ #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx index 1aff47467af9..569f1425f83a 100644 --- a/include/basegfx/polygon/b2dtrapezoid.hxx +++ b/include/basegfx/polygon/b2dtrapezoid.hxx @@ -25,7 +25,7 @@ #include <vector> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -36,7 +36,7 @@ namespace basegfx // Geometry data. YValues are down-oriented, this means bottom should // be bigger than top to be below it. The constructor implementation // guarantees: - // + // - mfBottomY >= mfTopY // - mfTopXRight >= mfTopXLeft // - mfBottomXRight >= mfBottomXLeft @@ -73,7 +73,7 @@ namespace basegfx } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -117,7 +117,7 @@ namespace basegfx } // end of namespace tools } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx index ccc7ffb514bb..17ab965a8bb6 100644 --- a/include/basegfx/polygon/b3dpolygon.hxx +++ b/include/basegfx/polygon/b3dpolygon.hxx @@ -24,7 +24,7 @@ #include <o3tl/cow_wrapper.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class ImplB3DPolygon; @@ -39,7 +39,7 @@ namespace basegfx class BColor; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -122,7 +122,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx index 8bd610394b2f..46198d313c0a 100644 --- a/include/basegfx/polygon/b3dpolygontools.hxx +++ b/include/basegfx/polygon/b3dpolygontools.hxx @@ -27,7 +27,7 @@ #include <vector> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -113,7 +113,7 @@ namespace basegfx // and a line given by start and end point BASEGFX_DLLPUBLIC bool getCutBetweenLineAndPlane(const B3DVector& rPlaneNormal, const B3DPoint& rPlanePoint, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut); - ////////////////////////////////////////////////////////////////////// + // comparators with tolerance for 3D Polygons BASEGFX_DLLPUBLIC bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB, const double& rfSmallValue); diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx index a720ef4b762c..461a325a95a7 100644 --- a/include/basegfx/polygon/b3dpolypolygon.hxx +++ b/include/basegfx/polygon/b3dpolypolygon.hxx @@ -34,7 +34,7 @@ namespace basegfx class B2DHomMatrix; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx index 24fb902e79cc..ff93ff0498bc 100644 --- a/include/basegfx/polygon/b3dpolypolygontools.hxx +++ b/include/basegfx/polygon/b3dpolypolygontools.hxx @@ -28,7 +28,7 @@ #include <vector> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx index dfd99064d6ef..bd8417f3bc30 100644 --- a/include/basegfx/range/b2dconnectedranges.hxx +++ b/include/basegfx/range/b2dconnectedranges.hxx @@ -122,10 +122,10 @@ namespace basegfx aNewConnectedComponent.maTotalBounds = rRange; - // + // STAGE 1: Search for intersecting maDisjunctAggregatesList entries - // ================================================================= - // + + // if rRange is empty, it will intersect with no // maDisjunctAggregatesList member. Thus, we can safe us @@ -197,10 +197,10 @@ namespace basegfx while( bSomeAggregatesChanged ); } - // + // STAGE 2: Add newly generated connected component list element - // ============================================================= - // + + // add new component to the end of the component list aNewConnectedComponent.maComponentList.push_back( diff --git a/include/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx index 19a898e31930..cac92e7a9cba 100644 --- a/include/basegfx/raster/bpixelraster.hxx +++ b/include/basegfx/raster/bpixelraster.hxx @@ -26,10 +26,10 @@ #include <basegfx/pixel/bpixel.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx index 6cca5aebd6ac..d21f316671ca 100644 --- a/include/basegfx/raster/bzpixelraster.hxx +++ b/include/basegfx/raster/bzpixelraster.hxx @@ -23,10 +23,10 @@ #include <basegfx/raster/bpixelraster.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx index ef44790a5323..162ef84a543b 100644 --- a/include/basegfx/raster/rasterconvert3d.hxx +++ b/include/basegfx/raster/rasterconvert3d.hxx @@ -28,7 +28,7 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace basegfx @@ -37,7 +37,7 @@ namespace basegfx class B3DPolyPolygon; } -////////////////////////////////////////////////////////////////////////////// + // interpolators for double precision namespace basegfx @@ -122,7 +122,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + // InterpolatorProvider3D to have a common source for allocating interpolators // which may then be addressed using the index to the vectors @@ -307,7 +307,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + // RasterConversionLineEntry3D for Raterconversion of 3D PolyPolygons namespace basegfx @@ -404,7 +404,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + // the basic RaterConverter itself. Only one method needs to be overloaded. The // class itself is strictly virtual @@ -443,7 +443,7 @@ namespace basegfx }; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX diff --git a/include/basegfx/tools/b2dclipstate.hxx b/include/basegfx/tools/b2dclipstate.hxx index f963e8849b57..5cb6721e6ede 100644 --- a/include/basegfx/tools/b2dclipstate.hxx +++ b/include/basegfx/tools/b2dclipstate.hxx @@ -24,7 +24,7 @@ #include <o3tl/cow_wrapper.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/tools/canvastools.hxx b/include/basegfx/tools/canvastools.hxx index ba7f644ef00b..08ccb23a23b8 100644 --- a/include/basegfx/tools/canvastools.hxx +++ b/include/basegfx/tools/canvastools.hxx @@ -71,7 +71,7 @@ namespace basegfx namespace unotools { // Polygon conversions - // =================================================================== + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference< @@ -115,7 +115,7 @@ namespace basegfx ::com::sun::star::rendering::XPolyPolygon2D >& rPoly ); // Matrix conversions - // =================================================================== + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D& matrix, @@ -140,7 +140,7 @@ namespace basegfx const ::com::sun::star::geometry::Matrix2D& matrix ); // Geometry conversions - // =================================================================== + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& ); @@ -159,7 +159,7 @@ namespace basegfx BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& ); // Geometry comparisons - // =================================================================== + /** Return smalltest integer range, which completely contains given floating point range. diff --git a/include/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx index f69cffc5e14c..2d45ad1d26ce 100644 --- a/include/basegfx/tools/rectcliptools.hxx +++ b/include/basegfx/tools/rectcliptools.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <basegfx/range/b2ibox.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/tools/zoomtools.hxx b/include/basegfx/tools/zoomtools.hxx index 1ebab9fb0c45..3b4cacf59553 100644 --- a/include/basegfx/tools/zoomtools.hxx +++ b/include/basegfx/tools/zoomtools.hxx @@ -13,7 +13,7 @@ #include <sal/types.h> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx index 773505306ac9..91df59c3ac6e 100644 --- a/include/basegfx/tuple/b2dtuple.hxx +++ b/include/basegfx/tuple/b2dtuple.hxx @@ -132,7 +132,7 @@ namespace basegfx } // comparators with tolerance - ////////////////////////////////////////////////////////////////////// + bool equalZero() const { @@ -163,7 +163,7 @@ namespace basegfx } // operators - ////////////////////////////////////////////////////////////////////// + B2DTuple& operator+=( const B2DTuple& rTup ) { @@ -234,7 +234,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + inline B2DTuple minimum(const B2DTuple& rTupA, const B2DTuple& rTupB) { diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx index a58013df9a8d..2d0bfcf6d485 100644 --- a/include/basegfx/tuple/b2i64tuple.hxx +++ b/include/basegfx/tuple/b2i64tuple.hxx @@ -122,7 +122,7 @@ namespace basegfx } // operators - ////////////////////////////////////////////////////////////////////// + B2I64Tuple& operator+=( const B2I64Tuple& rTup ) { @@ -192,7 +192,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + inline B2I64Tuple minimum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB) { diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx index ea4e4d2230e4..8713ac0367a0 100644 --- a/include/basegfx/tuple/b2ituple.hxx +++ b/include/basegfx/tuple/b2ituple.hxx @@ -122,7 +122,7 @@ namespace basegfx } // operators - ////////////////////////////////////////////////////////////////////// + B2ITuple& operator+=( const B2ITuple& rTup ) { @@ -195,7 +195,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + BASEGFX_DLLPUBLIC inline B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB) diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx index a2d3b44cfdef..bd98c1cd294a 100644 --- a/include/basegfx/tuple/b3dtuple.hxx +++ b/include/basegfx/tuple/b3dtuple.hxx @@ -145,7 +145,7 @@ namespace basegfx } // comparators with tolerance - ////////////////////////////////////////////////////////////////////// + bool equalZero() const { @@ -182,7 +182,7 @@ namespace basegfx } // operators - ////////////////////////////////////////////////////////////////////// + B3DTuple& operator+=( const B3DTuple& rTup ) { @@ -298,7 +298,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + inline B3DTuple minimum(const B3DTuple& rTupA, const B3DTuple& rTupB) { diff --git a/include/basegfx/tuple/b3i64tuple.hxx b/include/basegfx/tuple/b3i64tuple.hxx index 16098f33f8d2..6875ae9458dd 100644 --- a/include/basegfx/tuple/b3i64tuple.hxx +++ b/include/basegfx/tuple/b3i64tuple.hxx @@ -142,7 +142,7 @@ namespace basegfx } // operators - ////////////////////////////////////////////////////////////////////// + B3I64Tuple& operator+=( const B3I64Tuple& rTup ) { @@ -217,7 +217,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + inline B3I64Tuple minimum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB) { diff --git a/include/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx index 32a1c8fec94f..3bd9199f32e4 100644 --- a/include/basegfx/tuple/b3ituple.hxx +++ b/include/basegfx/tuple/b3ituple.hxx @@ -141,7 +141,7 @@ namespace basegfx } // operators - ////////////////////////////////////////////////////////////////////// + B3ITuple& operator+=( const B3ITuple& rTup ) { @@ -216,7 +216,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + inline B3ITuple minimum(const B3ITuple& rTupA, const B3ITuple& rTupB) { diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx index d55fdf41126f..f5148dbe7718 100644 --- a/include/basegfx/vector/b2dvector.hxx +++ b/include/basegfx/vector/b2dvector.hxx @@ -181,7 +181,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + /** Calculate the orientation to another 2D Vector diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx index c5b907132508..a3adbefccf8e 100644 --- a/include/basegfx/vector/b3dvector.hxx +++ b/include/basegfx/vector/b3dvector.hxx @@ -23,7 +23,7 @@ #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/basegfxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace basegfx { @@ -254,7 +254,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + /** get a 3D Vector which is in 2D (ignoring the Z-Coordinate) perpendicular to a given 3D Vector @@ -315,7 +315,7 @@ namespace basegfx } } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX diff --git a/include/basegfx/vector/b3ivector.hxx b/include/basegfx/vector/b3ivector.hxx index d56768384b31..0e4700c21451 100644 --- a/include/basegfx/vector/b3ivector.hxx +++ b/include/basegfx/vector/b3ivector.hxx @@ -214,7 +214,7 @@ namespace basegfx }; // external operators - ////////////////////////////////////////////////////////////////////////// + /** Transform vector by given transformation matrix. diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx index 6d0c4cb44343..f4da0163eeb1 100644 --- a/include/basic/basicmanagerrepository.hxx +++ b/include/basic/basicmanagerrepository.hxx @@ -26,14 +26,14 @@ class BasicManager; -//........................................................................ + namespace basic { -//........................................................................ - //==================================================================== + + //= BasicManagerRepository - //==================================================================== + /** specifies a callback for instances which are interested in BasicManagers created by the BasicManagerRepository. */ @@ -59,9 +59,9 @@ namespace basic ~BasicManagerCreationListener() {} }; - //==================================================================== + //= BasicManagerRepository - //==================================================================== + class BASIC_DLLPUBLIC BasicManagerRepository { public: @@ -133,9 +133,9 @@ namespace basic ); }; -//........................................................................ + } // namespace basic -//........................................................................ + #endif // INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx index 73528afd7d1d..0e4eb6d00db1 100644 --- a/include/basic/sbxform.hxx +++ b/include/basic/sbxform.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_BASIC_SBXFORM_HXX #define INCLUDED_BASIC_SBXFORM_HXX -//==================================================================== + // Implementation class for Basic command: Format$( d,formatStr ) -//==================================================================== + /* Grammar of format string (a try): ----------------------------------------------- @@ -158,7 +158,7 @@ class BASIC_DLLPUBLIC SbxBasicFormater { OUString sCurrencyFormatStrg; //*** temporary data for scan loop *** - //----------------------------------------------- + // String containing the number in scientific format OUString sSciNumStrg; // String containing the exponent of the number diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx index fe156f67e388..e447aa8d37e8 100644 --- a/include/basic/vbahelper.hxx +++ b/include/basic/vbahelper.hxx @@ -32,7 +32,7 @@ namespace vba { and from other VBA implementation modules such as vbahelper. */ -// ============================================================================ + /** Locks or unlocks the controllers of all documents that have the same type as the specified document. @@ -52,7 +52,7 @@ BASIC_DLLPUBLIC void lockControllersOfAllDocuments( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, sal_Bool bLockControllers ); -// ============================================================================ + /** Enables or disables the container windows of all controllers of all documents that have the same type as the specified document. @@ -73,7 +73,7 @@ BASIC_DLLPUBLIC void enableContainerWindowsOfAllDocuments( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, sal_Bool bEnableWindows ); -// ============================================================================ + /** Registers the passed path as working directory for the application the passed document belongs to. @@ -89,7 +89,7 @@ BASIC_DLLPUBLIC void registerCurrentDirectory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const OUString& rPath ); -// ============================================================================ + } // namespace vba } // namespace basic diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index 87fc8ff27134..03cbdc8e2bae 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -100,7 +100,7 @@ namespace canvas // Helper methods for derived classes - // ---------------------------------- + /// Calc sprite update area from given raw sprite bounds ::basegfx::B2DRange getUpdateArea( const ::basegfx::B2DRange& rUntransformedSpriteBounds ) const; @@ -219,7 +219,7 @@ namespace canvas */ bool updateClipState( const Sprite::Reference& rSprite ); - // -------------------------------------------------------------------- + /// Owning sprite canvas SpriteSurface::Reference mpSpriteCanvas; diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx index a4cebb828711..4e9c6064d92f 100644 --- a/include/canvas/canvastools.hxx +++ b/include/canvas/canvastools.hxx @@ -150,7 +150,7 @@ namespace canvas // View- and RenderState utilities - // =================================================================== + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& initRenderState( ::com::sun::star::rendering::RenderState& renderState ); @@ -189,7 +189,7 @@ namespace canvas // Matrix utilities - // =================================================================== + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix ); @@ -199,7 +199,7 @@ namespace canvas // Special utilities - // =================================================================== + /** Calc the bounding rectangle of a transformed rectangle. diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx index 9fc5ad31711f..275fc45d1279 100644 --- a/include/canvas/debug.hxx +++ b/include/canvas/debug.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CANVAS_DEBUG_HXX // shared_ptr debugging -// -------------------- + #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx index c31c0d826cd1..f68f74f34f91 100644 --- a/include/canvas/rendering/bitmap.hxx +++ b/include/canvas/rendering/bitmap.hxx @@ -169,7 +169,7 @@ namespace canvas // High-level drawing operations (from the XCanvas interface) - // ========================================================== + /// See XCanvas interface void drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint, diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx index 07d72b32ff6c..64d85670f12e 100644 --- a/include/canvas/verifyinput.hxx +++ b/include/canvas/verifyinput.hxx @@ -64,7 +64,7 @@ namespace canvas { // Input checking facilities - // =================================================================== + // This header provides methods to check all common // css::rendering::* method input parameters against diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx index c739aed58f83..e75b61d4dfa2 100644 --- a/include/codemaker/global.hxx +++ b/include/codemaker/global.hxx @@ -58,9 +58,9 @@ typedef ::std::list< ::rtl::OString > StringList; typedef ::std::vector< ::rtl::OString > StringVector; typedef ::std::set< ::rtl::OString, LessString > StringSet; -//************************************************************************* + // FileStream -//************************************************************************* + enum FileAccessMode { FAM_READ, // "r" @@ -99,9 +99,9 @@ private: }; -//************************************************************************* + // Helper functions -//************************************************************************* + ::rtl::OString getTempDir(const ::rtl::OString& sFileName); ::rtl::OString createFileNameFromType(const ::rtl::OString& destination, diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx index 8046c0d2cae8..f021894926dd 100644 --- a/include/com/sun/star/uno/Any.hxx +++ b/include/com/sun/star/uno/Any.hxx @@ -42,13 +42,13 @@ namespace star namespace uno { -//__________________________________________________________________________________________________ + inline Any::Any() SAL_THROW(()) { ::uno_any_construct( this, 0, 0, (uno_AcquireFunc)cpp_acquire ); } -//______________________________________________________________________________ + template <typename T> inline Any::Any( T const & value ) { @@ -57,7 +57,7 @@ inline Any::Any( T const & value ) ::cppu::getTypeFavourUnsigned(&value).getTypeLibType(), (uno_AcquireFunc) cpp_acquire ); } -//______________________________________________________________________________ + inline Any::Any( bool value ) { sal_Bool b = value; @@ -66,37 +66,37 @@ inline Any::Any( bool value ) (uno_AcquireFunc) cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const Any & rAny ) SAL_THROW(()) { ::uno_type_any_construct( this, rAny.pData, rAny.pType, (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const void * pData_, const Type & rType ) SAL_THROW(()) { ::uno_type_any_construct( this, const_cast< void * >( pData_ ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { ::uno_any_construct( this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(()) { ::uno_type_any_construct( this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::~Any() SAL_THROW(()) { ::uno_any_destruct( this, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(()) { if (this != &rAny) @@ -107,39 +107,39 @@ inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(()) } return *this; } -//__________________________________________________________________________________________________ + inline ::rtl::OUString Any::getValueTypeName() const SAL_THROW(()) { return ::rtl::OUString( pType->pTypeName ); } -//__________________________________________________________________________________________________ + inline void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW(()) { ::uno_type_any_assign( this, const_cast< void * >( pData_ ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(()) { ::uno_type_any_assign( this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { ::uno_any_assign( this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline void Any::clear() SAL_THROW(()) { ::uno_any_clear( this, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(()) { return ::uno_type_isAssignableFromData( @@ -147,7 +147,7 @@ inline bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(()) (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } -//______________________________________________________________________________ + template <typename T> inline bool Any::has() const { @@ -162,14 +162,14 @@ inline bool Any::has() const template <> bool Any::has<sal_uInt16>() const; -//__________________________________________________________________________________________________ + inline bool Any::operator == ( const Any & rAny ) const SAL_THROW(()) { return ::uno_type_equalData( pData, pType, rAny.pData, rAny.pType, (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(()) { return (! ::uno_type_equalData( @@ -177,7 +177,7 @@ inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(()) (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release )); } -//__________________________________________________________________________________________________ + template< class C > inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(()) { @@ -185,7 +185,7 @@ inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(()) } // additionally specialized for C++ bool -//______________________________________________________________________________ + template<> inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(()) { @@ -193,7 +193,7 @@ inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(()) return Any( &b, ::getCppuBooleanType() ); } -//__________________________________________________________________________________________________ + #ifdef RTL_FAST_STRING template< class C1, class C2 > inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value ) SAL_THROW(()) @@ -202,7 +202,7 @@ inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value ) SAL_TH return Any( &str, ::cppu::getTypeFavourUnsigned(&str) ); } #endif -//__________________________________________________________________________________________________ + template< class C > inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()) { @@ -213,7 +213,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()) } // additionally for C++ bool: -//______________________________________________________________________________ + template<> inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) SAL_THROW(()) @@ -224,7 +224,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) (uno_AcquireFunc) cpp_acquire, (uno_ReleaseFunc) cpp_release ); } -//______________________________________________________________________________ + #ifdef RTL_FAST_STRING template< class C1, class C2 > inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C2 >& value ) @@ -237,7 +237,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } #endif -//__________________________________________________________________________________________________ + template< class C > inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()) { @@ -250,7 +250,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()) } // bool -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(()) { @@ -261,7 +261,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal } return false; } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(()) { @@ -269,7 +269,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SA (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False)); } -//______________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) SAL_THROW(()) @@ -283,7 +283,7 @@ inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) return false; } -//______________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( Any const & rAny, bool const & value ) SAL_THROW(()) @@ -295,7 +295,7 @@ inline bool SAL_CALL operator == ( Any const & rAny, bool const & value ) } // byte -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(()) { @@ -307,7 +307,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal return false; } // short -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(()) { @@ -324,7 +324,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_TH return false; } } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(()) { @@ -342,7 +342,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_T } } // long -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(()) { @@ -365,7 +365,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_TH return false; } } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(()) { @@ -389,7 +389,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_T } } // hyper -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(()) { @@ -418,7 +418,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_TH return false; } } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(()) { @@ -448,7 +448,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_T } } // float -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(()) { @@ -471,7 +471,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( } } // double -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(()) { @@ -503,7 +503,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW } } // string -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(()) { @@ -514,7 +514,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) } return false; } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(()) { @@ -522,7 +522,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & val value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) )); } // type -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(()) { @@ -533,7 +533,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(( } return false; } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(()) { @@ -541,7 +541,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_TH value.equals( * reinterpret_cast< const Type * >( rAny.pData ) )); } // any -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()) { @@ -554,7 +554,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(() return true; } // interface -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(()) { @@ -566,7 +566,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value } // operator to compare to an any. -//__________________________________________________________________________________________________ + template< class C > inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(()) { @@ -577,7 +577,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } // operator to compare to an any. may use specialized operators ==. -//__________________________________________________________________________________________________ + template< class C > inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(()) { @@ -588,7 +588,7 @@ extern "C" rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( uno_Any const * pAny, typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C(); -//______________________________________________________________________________ + template <typename T> T Any::get() const { diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index 1e6a13bfa66b..c26550273abc 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -33,7 +33,7 @@ namespace star namespace uno { -//__________________________________________________________________________________________________ + inline XInterface * BaseReference::iquery( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ) @@ -50,7 +50,7 @@ inline XInterface * BaseReference::iquery( } return 0; } -//__________________________________________________________________________________________________ + template< class interface_type > inline XInterface * Reference< interface_type >::iquery( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) @@ -63,7 +63,7 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C(); -//__________________________________________________________________________________________________ + inline XInterface * BaseReference::iquery_throw( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ) @@ -75,7 +75,7 @@ inline XInterface * BaseReference::iquery_throw( ::rtl::OUString( cppu_unsatisfied_iquery_msg( rType.getTypeLibType() ), SAL_NO_ACQUIRE ), Reference< XInterface >( pInterface ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline XInterface * Reference< interface_type >::iquery_throw( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) @@ -83,7 +83,7 @@ inline XInterface * Reference< interface_type >::iquery_throw( return BaseReference::iquery_throw( pInterface, interface_type::static_type()); } -//__________________________________________________________________________________________________ + template< class interface_type > inline interface_type * Reference< interface_type >::iset_throw( interface_type * pInterface ) SAL_THROW( (RuntimeException) ) @@ -98,20 +98,20 @@ inline interface_type * Reference< interface_type >::iset_throw( NULL ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::~Reference() SAL_THROW(()) { if (_pInterface) _pInterface->release(); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference() SAL_THROW(()) { _pInterface = 0; } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW(()) { @@ -119,7 +119,7 @@ inline Reference< interface_type >::Reference( const Reference< interface_type > if (_pInterface) _pInterface->acquire(); } -//__________________________________________________________________________________________________ + template< class interface_type > template< class derived_type > inline Reference< interface_type >::Reference( const Reference< derived_type > & rRef, @@ -131,7 +131,7 @@ inline Reference< interface_type >::Reference( if (_pInterface) _pInterface->acquire(); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW(()) { @@ -139,70 +139,70 @@ inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL if (_pInterface) _pInterface->acquire(); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery( rRef.get() ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery( pInterface ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass ? iquery( static_cast< XInterface * >( rAny.pReserved ) ) : 0); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery_throw( rRef.get() ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery_throw( pInterface ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass ? static_cast< XInterface * >( rAny.pReserved ) : 0 ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = castToXInterface( iset_throw( rRef.get() ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = castToXInterface( iset_throw( pInterface ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::clear() SAL_THROW(()) { @@ -213,7 +213,7 @@ inline void Reference< interface_type >::clear() SAL_THROW(()) pOld->release(); } } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( interface_type * pInterface ) SAL_THROW(()) @@ -226,7 +226,7 @@ inline bool Reference< interface_type >::set( pOld->release(); return (0 != pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) @@ -237,7 +237,7 @@ inline bool Reference< interface_type >::set( pOld->release(); return (0 != pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) @@ -245,21 +245,21 @@ inline bool Reference< interface_type >::set( return set( pInterface, SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( const Reference< interface_type > & rRef ) SAL_THROW(()) { return set( castFromXInterface( rRef._pInterface ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { return set( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) @@ -267,7 +267,7 @@ inline bool Reference< interface_type >::set( return set( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE ); } -//______________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( Any const & rAny, UnoReference_Query ) @@ -280,14 +280,14 @@ inline bool Reference< interface_type >::set( SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { set( castFromXInterface(iquery_throw( pInterface )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) @@ -295,7 +295,7 @@ inline void Reference< interface_type >::set( set( castFromXInterface(iquery_throw( rRef.get() )), SAL_NO_ACQUIRE ); } -//______________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( Any const & rAny, UnoReference_QueryThrow ) @@ -306,14 +306,14 @@ inline void Reference< interface_type >::set( ? static_cast< XInterface * >( rAny.pReserved ) : 0 )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { set( iset_throw( pInterface ), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) @@ -321,7 +321,7 @@ inline void Reference< interface_type >::set( set( rRef.get(), UNO_SET_THROW ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( interface_type * pInterface ) SAL_THROW(()) @@ -329,7 +329,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( set( pInterface ); return *this; } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( const Reference< interface_type > & rRef ) SAL_THROW(()) @@ -338,7 +338,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( return *this; } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) ) @@ -346,7 +346,7 @@ inline Reference< interface_type > Reference< interface_type >::query( return Reference< interface_type >( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) @@ -355,9 +355,9 @@ inline Reference< interface_type > Reference< interface_type >::query( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE ); } -//################################################################################################## -//__________________________________________________________________________________________________ + + inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(()) { if (_pInterface == pInterface) @@ -375,7 +375,7 @@ inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THR } } -//______________________________________________________________________________ + inline bool BaseReference::operator < ( const BaseReference & rRef ) const SAL_THROW(()) { @@ -394,17 +394,17 @@ inline bool BaseReference::operator < ( } } -//__________________________________________________________________________________________________ + inline bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(()) { return (! operator == ( pInterface )); } -//__________________________________________________________________________________________________ + inline bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(()) { return operator == ( rRef._pInterface ); } -//__________________________________________________________________________________________________ + inline bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(()) { return (! operator == ( rRef._pInterface )); diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx index e32a64594bdc..c6456f554f21 100644 --- a/include/com/sun/star/uno/Type.hxx +++ b/include/com/sun/star/uno/Type.hxx @@ -32,60 +32,60 @@ namespace star namespace uno { -//__________________________________________________________________________________________________ + inline Type::Type() SAL_THROW(()) { _pType = reinterpret_cast< const ::com::sun::star::uno::Type * >( ::typelib_static_type_getByTypeClass( typelib_TypeClass_VOID ) )->getTypeLibType(); ::typelib_typedescriptionreference_acquire( _pType ); } -//__________________________________________________________________________________________________ + inline Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW(()) : _pType( 0 ) { ::typelib_typedescriptionreference_new( &_pType, (typelib_TypeClass)eTypeClass, rTypeName.pData ); } -//__________________________________________________________________________________________________ + inline Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW(()) : _pType( 0 ) { ::typelib_typedescriptionreference_newByAsciiName( &_pType, (typelib_TypeClass)eTypeClass, pTypeName ); } -//__________________________________________________________________________________________________ + inline Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW(()) : _pType( pType ) { ::typelib_typedescriptionreference_acquire( _pType ); } -//__________________________________________________________________________________________________ + inline Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW(()) : _pType( pType ) { } -//__________________________________________________________________________________________________ + inline Type::Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW(()) : _pType( pType ) { } -//__________________________________________________________________________________________________ + inline Type::Type( const Type & rType ) SAL_THROW(()) : _pType( rType._pType ) { ::typelib_typedescriptionreference_acquire( _pType ); } -//__________________________________________________________________________________________________ + inline ::rtl::OUString Type::getTypeName() const SAL_THROW(()) { return ::rtl::OUString( _pType->pTypeName ); } -//__________________________________________________________________________________________________ + inline Type & Type::operator = ( const Type & rType ) SAL_THROW(()) { ::typelib_typedescriptionreference_assign( &_pType, rType._pType ); return *this; } -//__________________________________________________________________________________________________ + template< class T > typelib_TypeDescriptionReference * Array< T >::s_pType = 0; diff --git a/include/com/sun/star/uno/genfunc.hxx b/include/com/sun/star/uno/genfunc.hxx index 1465af0a1ea9..3c230756a6e2 100644 --- a/include/com/sun/star/uno/genfunc.hxx +++ b/include/com/sun/star/uno/genfunc.hxx @@ -32,19 +32,19 @@ namespace star namespace uno { -//================================================================================================== + inline void SAL_CALL cpp_acquire( void * pCppI ) SAL_THROW(()) { reinterpret_cast< XInterface * >( pCppI )->acquire(); } -//================================================================================================== + inline void SAL_CALL cpp_release( void * pCppI ) SAL_THROW(()) { reinterpret_cast< XInterface * >( pCppI )->release(); } -//================================================================================================== + inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescriptionReference * pType ) SAL_THROW(()) { diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx index 1540530a9e5b..62d86d6137af 100644 --- a/include/comphelper/IdPropArrayHelper.hxx +++ b/include/comphelper/IdPropArrayHelper.hxx @@ -34,9 +34,9 @@ namespace cppu { class IPropertyArrayHelper; } namespace comphelper { - //************************************************************ + // OIdPropertyArrayUsageHelper - //************************************************************ + template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex : public rtl::Static< ::osl::Mutex, OIdPropertyArrayUsageHelperMutex<TYPE> > {}; @@ -82,14 +82,14 @@ namespace comphelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const = 0; }; - //------------------------------------------------------------------ + template<class TYPE> sal_Int32 OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; template<class TYPE> OIdPropertyArrayMap* OIdPropertyArrayUsageHelper< TYPE >::s_pMap = NULL; - //------------------------------------------------------------------ + template <class TYPE> OIdPropertyArrayUsageHelper<TYPE>::OIdPropertyArrayUsageHelper() { @@ -100,7 +100,7 @@ namespace comphelper ++s_nRefCount; } - //------------------------------------------------------------------ + template <class TYPE> ::cppu::IPropertyArrayHelper* OIdPropertyArrayUsageHelper<TYPE>::getArrayHelper(sal_Int32 nId) { diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx index 8f9ffa648a1c..482c62668e42 100644 --- a/include/comphelper/InlineContainer.hxx +++ b/include/comphelper/InlineContainer.hxx @@ -53,7 +53,7 @@ public: } }; -// ---------------------------------------- + /** Creates a vector which contains an arbitrary number of elements. @@ -76,7 +76,7 @@ public: } }; -// ---------------------------------------- + /** Creates a set which contains an arbitrary number of elements. @@ -100,7 +100,7 @@ public: } }; -// ---------------------------------------- + /** usage: diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx index 285760b68d25..06b19406d932 100644 --- a/include/comphelper/SelectionMultiplex.hxx +++ b/include/comphelper/SelectionMultiplex.hxx @@ -25,20 +25,20 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/comphelperdllapi.h> -//========================================================================= + //= selection helper classes -//========================================================================= -//......................................................................... + + namespace comphelper { -//......................................................................... + class OSelectionChangeMultiplexer; - //================================================================== + //= OSelectionChangeListener - //================================================================== + /// simple listener adapter for selections class COMPHELPER_DLLPUBLIC OSelectionChangeListener { @@ -61,9 +61,9 @@ namespace comphelper void setAdapter( OSelectionChangeMultiplexer* _pAdapter ); }; - //================================================================== + //= OSelectionChangeMultiplexer - //================================================================== + /// multiplexer for selection changes class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::view::XSelectionChangeListener> { @@ -97,9 +97,9 @@ namespace comphelper void dispose(); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index 6200448c861d..86f7585d6f89 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -27,14 +27,14 @@ #include <comphelper/uno3.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= OCommonAccessibleComponent - //===================================================================== + /** base class encapsulating common functionality for the helper classes implementing the XAccessibleComponent respectively XAccessibleExtendendComponent */ @@ -61,9 +61,9 @@ namespace comphelper ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); }; - //===================================================================== + //= OAccessibleComponentHelper - //===================================================================== + struct OAccessibleComponentHelper_Base : public ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleComponent > @@ -96,9 +96,9 @@ namespace comphelper virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //===================================================================== + //= OAccessibleExtendedComponentHelper - //===================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleExtendedComponent > OAccessibleExtendedComponentHelper_Base; @@ -127,9 +127,9 @@ namespace comphelper virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index a8cae5225604..19f34c2e08e7 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -27,14 +27,14 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= IMutex - //===================================================================== + // This whole thingie here (own mutex classes and such) is a HACK. I hate the SolarMutex. // See below for more explanations .... @@ -49,9 +49,9 @@ namespace comphelper virtual void release() = 0; }; - //===================================================================== + //= OMutexGuard - //===================================================================== + class OMutexGuard { @@ -71,9 +71,9 @@ namespace comphelper } }; - //===================================================================== + //= OAccessibleContextHelper - //===================================================================== + class OContextHelper_Impl; typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::accessibility::XAccessibleContext, @@ -239,27 +239,27 @@ namespace comphelper IMutex* getExternalLock( ); }; - //--------------------------------------------------------------------- + inline void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ) { ensureAlive(); } - //--------------------------------------------------------------------- + inline IMutex* OAccessibleContextHelper::getExternalLock( const OAccessControl& ) { return getExternalLock(); } - //--------------------------------------------------------------------- + inline ::osl::Mutex& OAccessibleContextHelper::GetMutex( const OAccessControl& ) { return GetMutex(); } - //===================================================================== + //= OContextEntryGuard - //===================================================================== + typedef ::osl::ClearableMutexGuard OContextEntryGuard_Base; /** helper class for guarding the entry into OAccessibleContextHelper methods. @@ -293,21 +293,21 @@ namespace comphelper inline ~OContextEntryGuard(); }; - //..................................................................... + inline OContextEntryGuard::OContextEntryGuard( OAccessibleContextHelper* _pContext ) :OContextEntryGuard_Base( _pContext->GetMutex( OAccessibleContextHelper::OAccessControl() ) ) { _pContext->ensureAlive( OAccessibleContextHelper::OAccessControl() ); } - //..................................................................... + inline OContextEntryGuard::~OContextEntryGuard() { } - //===================================================================== + //= OExternalLockGuard - //===================================================================== + class OExternalLockGuard :public OMutexGuard ,public OContextEntryGuard @@ -317,7 +317,7 @@ namespace comphelper inline ~OExternalLockGuard( ); }; - //..................................................................... + inline OExternalLockGuard::OExternalLockGuard( OAccessibleContextHelper* _pContext ) :OMutexGuard( _pContext->getExternalLock( OAccessibleContextHelper::OAccessControl() ) ) ,OContextEntryGuard( _pContext ) @@ -330,14 +330,14 @@ namespace comphelper clear(); } - //..................................................................... + inline OExternalLockGuard::~OExternalLockGuard( ) { } -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx index 19d51aaaf5f2..dfe188741749 100644 --- a/include/comphelper/accessibleeventnotifier.hxx +++ b/include/comphelper/accessibleeventnotifier.hxx @@ -25,14 +25,14 @@ #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= AccessibleEventNotifier - //===================================================================== + class COMPHELPER_DLLPUBLIC AccessibleEventNotifier { // typedefs @@ -121,9 +121,9 @@ namespace comphelper }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx index dc0274271023..48ba71f6c7d4 100644 --- a/include/comphelper/accessiblekeybindinghelper.hxx +++ b/include/comphelper/accessiblekeybindinghelper.hxx @@ -28,14 +28,14 @@ #include <comphelper/comphelperdllapi.h> -//.............................................................................. + namespace comphelper { -//.............................................................................. - //============================================================================== + + // OAccessibleKeyBindingHelper - //============================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessibleKeyBinding > OAccessibleKeyBindingHelper_Base; @@ -66,9 +66,9 @@ namespace comphelper virtual ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; -//.............................................................................. + } // namespace comphelper -//.............................................................................. + #endif // INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 49db8d82c773..1c3c4e493fe4 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -29,14 +29,14 @@ #define ACCESSIBLE_SELECTION_CHILD_ALL ((sal_Int32)-1) #define ACCESSIBLE_SELECTION_CHILD_SELF ((sal_Int32)-2) -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= OCommonAccessibleSelection - //===================================================================== + /** base class encapsulating common functionality for the helper classes implementing the XAccessibleSelection */ @@ -78,9 +78,9 @@ namespace comphelper void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); }; - //===================================================================== + //= OAccessibleSelectionHelper - //===================================================================== + typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base; @@ -115,9 +115,9 @@ namespace comphelper virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 346332c34487..5e350f20bd36 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -29,14 +29,14 @@ #include <comphelper/comphelperdllapi.h> -//.............................................................................. + namespace comphelper { -//.............................................................................. - //============================================================================== + + // OCommonAccessibleText - //============================================================================== + /** base class encapsulating common functionality for the helper classes implementing the XAccessibleText */ @@ -97,9 +97,9 @@ namespace comphelper }; - //============================================================================== + // OAccessibleTextHelper - //============================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleText > OAccessibleTextHelper_Base; @@ -135,20 +135,20 @@ namespace comphelper virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); }; -//.............................................................................. + } // namespace comphelper -//.............................................................................. + #endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX -// ----------------------------------------------------------------------------- -// + + // OAccessibleTextHelper is a helper class for implementing the // XAccessibleText interface. -// + // The following methods have a default implementation: -// + // getCharacter // getCharacterCount // getSelectedText @@ -159,9 +159,9 @@ namespace comphelper // getTextAtIndex // getTextBeforeIndex // getTextBehindIndex -// + // The following methods must be overridden by derived classes: -// + // implGetText // implGetLocale // implGetSelection @@ -172,7 +172,7 @@ namespace comphelper // getIndexAtPoint // setSelection // copyText -// -// ----------------------------------------------------------------------------- + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index d191c7638fc5..5c5fa4116e5c 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -42,14 +42,14 @@ #include <comphelper/stl_types.hxx> #include <comphelper/comphelperdllapi.h> -//............................................................................. + namespace comphelper { -//............................................................................. - //========================================================================= + + //= OAccessibleWrapper - //========================================================================= + class OAccessibleContextWrapper; class OWrappedAccessibleChildrenManager; @@ -122,9 +122,9 @@ namespace comphelper COMPHELPER_DLLPRIVATE OAccessibleWrapper& operator=( const OAccessibleWrapper& ); // never implemented }; - //========================================================================= + //= OAccessibleContextWrapperHelper - //========================================================================= + typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleEventListener > OAccessibleContextWrapperHelper_Base; @@ -233,9 +233,9 @@ namespace comphelper OAccessibleContextWrapperHelper& operator=( const OAccessibleContextWrapperHelper& ); // never implemented }; - //========================================================================= + //= OAccessibleContextWrapper - //========================================================================= + typedef ::cppu::PartialWeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster , ::com::sun::star::accessibility::XAccessibleContext > OAccessibleContextWrapper_CBase; @@ -317,9 +317,9 @@ namespace comphelper COMPHELPER_DLLPRIVATE OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ); // never implemented }; - //========================================================================= + //= OWrappedAccessibleChildrenManager - //========================================================================= + typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > , ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -405,9 +405,9 @@ namespace comphelper COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ); // never implemented }; -//............................................................................. + } // namespace accessibility -//............................................................................. + #endif // INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx index de57b9878f27..de4f8382627f 100644 --- a/include/comphelper/accimplaccess.hxx +++ b/include/comphelper/accimplaccess.hxx @@ -30,14 +30,14 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; }}}} -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= OAccessibleImplementationAccess - //===================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XUnoTunnel > OAccImpl_Base; struct OAccImpl_Impl; @@ -130,9 +130,9 @@ namespace comphelper COMPHELPER_DLLPRIVATE static const ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index 7bff8d456f17..0b1d74786f1e 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -30,14 +30,14 @@ #include <functional> #include <memory> -//...................................................................................................................... + namespace comphelper { -//...................................................................................................................... - //================================================================================================================== + + //= IKeyPredicateLess - //================================================================================================================== + class SAL_NO_VTABLE IKeyPredicateLess { public: @@ -45,9 +45,9 @@ namespace comphelper virtual ~IKeyPredicateLess() {} }; - //================================================================================================================== + //= LessPredicateAdapter - //================================================================================================================== + struct LessPredicateAdapter : public ::std::binary_function< ::com::sun::star::uno::Any, ::com::sun::star::uno::Any, bool > { LessPredicateAdapter( const IKeyPredicateLess& _predicate ) @@ -67,9 +67,9 @@ namespace comphelper LessPredicateAdapter(); // never implemented }; - //================================================================================================================== + //= ScalarPredicateLess - //================================================================================================================== + template< typename SCALAR > class ScalarPredicateLess : public IKeyPredicateLess { @@ -85,9 +85,9 @@ namespace comphelper } }; - //================================================================================================================== + //= StringPredicateLess - //================================================================================================================== + class StringPredicateLess : public IKeyPredicateLess { public: @@ -102,9 +102,9 @@ namespace comphelper } }; - //================================================================================================================== + //= StringCollationPredicateLess - //================================================================================================================== + class StringCollationPredicateLess : public IKeyPredicateLess { public: @@ -127,9 +127,9 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const m_collator; }; - //================================================================================================================== + //= TypePredicateLess - //================================================================================================================== + class TypePredicateLess : public IKeyPredicateLess { public: @@ -144,9 +144,9 @@ namespace comphelper } }; - //================================================================================================================== + //= EnumPredicateLess - //================================================================================================================== + class EnumPredicateLess : public IKeyPredicateLess { public: @@ -171,9 +171,9 @@ namespace comphelper ::com::sun::star::uno::Type const m_enumType; }; - //================================================================================================================== + //= InterfacePredicateLess - //================================================================================================================== + class InterfacePredicateLess : public IKeyPredicateLess { public: @@ -190,9 +190,9 @@ namespace comphelper } }; - //================================================================================================================== + //= getStandardLessPredicate - //================================================================================================================== + /** creates a default IKeyPredicateLess instance for the given UNO type @param i_type the type for which a predicate instance should be created @@ -210,9 +210,9 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator ); -//...................................................................................................................... + } // namespace comphelper -//...................................................................................................................... + #endif // INCLUDED_COMPHELPER_ANYCOMPARE_HXX diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index 03c083106e0e..f33d8231aef5 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -28,14 +28,14 @@ #include <sal/types.h> #include <salhelper/thread.hxx> -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= AnyEvent - //==================================================================== + /** the very basic instance to hold a description of an event */ class COMPHELPER_DLLPUBLIC AnyEvent : ::rtl::IReference @@ -57,14 +57,14 @@ namespace comphelper void operator=( AnyEvent& ); // not defined }; - //==================================================================== + //= typedefs - //==================================================================== + typedef ::rtl::Reference< AnyEvent > AnyEventRef; - //==================================================================== + //= IEventProcessor - //==================================================================== + /** an event processor @see AsyncEventNotifier @@ -83,9 +83,9 @@ namespace comphelper ~IEventProcessor() {} }; - //==================================================================== + //= AsyncEventNotifier - //==================================================================== + struct EventNotifierImpl; /** a helper class for notifying events asynchronously @@ -152,9 +152,9 @@ namespace comphelper void removeEventsForProcessor( const ::rtl::Reference< IEventProcessor >& _xProcessor ); }; - //==================================================================== + //= EventHolder - //==================================================================== + /** AnyEvent derivee holding an foreign event instance */ template < typename EVENT_OBJECT > @@ -175,9 +175,9 @@ namespace comphelper inline const EventObjectType& getEventObject() const { return m_aEvent; } }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx index 35b9bae841f8..feb530272a0c 100644 --- a/include/comphelper/basicio.hxx +++ b/include/comphelper/basicio.hxx @@ -24,10 +24,10 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... + namespace stario = ::com::sun::star::io; namespace staruno = ::com::sun::star::uno; @@ -93,9 +93,9 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun return _rxOutStream; } -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_BASICIO_HXX diff --git a/include/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx index 82559260f599..70dae2111887 100644 --- a/include/comphelper/broadcasthelper.hxx +++ b/include/comphelper/broadcasthelper.hxx @@ -26,14 +26,14 @@ //... namespace comphelper ....................................................... namespace comphelper { -//......................................................................... - //================================================================================== + + //= OMutexAndBroadcastHelper - a class which holds a Mutex and a OBroadcastHelper; //= needed because when deriving from OPropertySetHelper, //= the OBroadcastHelper has to be initialized before //= the OPropertySetHelper - //================================================================================== + class OMutexAndBroadcastHelper { protected: diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx index 3a0da99dc784..635f51fa1452 100644 --- a/include/comphelper/classids.hxx +++ b/include/comphelper/classids.hxx @@ -115,7 +115,7 @@ #define SO3_SWGLOB_CLASSID SO3_SWGLOB_CLASSID_60 -//--------------------------------------------------- + /* * StarCalc diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 474313e03f54..61dfe8a9d7ba 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -23,14 +23,14 @@ #include <comphelper/comphelperdllapi.h> #include <cppuhelper/interfacecontainer.hxx> -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= ComponentBase - //==================================================================== + class COMPHELPER_DLLPUBLIC ComponentBase { protected: @@ -145,9 +145,9 @@ namespace comphelper ::osl::ResettableMutexGuard m_aMutexGuard; }; -//........................................................................ + } // namespace ComponentBase -//........................................................................ + #endif // INCLUDED_COMPHELPER_COMPONENTBASE_HXX diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx index d9651675b9d2..2d64c492fb44 100644 --- a/include/comphelper/componentguard.hxx +++ b/include/comphelper/componentguard.hxx @@ -25,14 +25,14 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> -//...................................................................................................................... + namespace comphelper { -//...................................................................................................................... - //================================================================================================================== + + //= ComponentGuard - //================================================================================================================== + class ComponentGuard { public: @@ -54,9 +54,9 @@ namespace comphelper ::osl::ResettableMutexGuard m_aGuard; }; -//...................................................................................................................... + } // namespace comphelper -//...................................................................................................................... + #endif // INCLUDED_COMPHELPER_COMPONENTGUARD_HXX diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 41f3b4e76666..47299c910eff 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -31,10 +31,10 @@ #include <rtl/string.hxx> #include <rtl/instance.hxx> -//........................................................................ + namespace comphelper { -//........................................................................ + /** factory factory declaration */ @@ -46,9 +46,9 @@ namespace comphelper rtl_ModuleCount* ) SAL_THROW(()); - //========================================================================= + //= ComponentDescription - //========================================================================= + struct COMPHELPER_DLLPUBLIC ComponentDescription { /// the implementation name of the component @@ -89,9 +89,9 @@ namespace comphelper } }; - //========================================================================= + //= OModule - //========================================================================= + class OModuleImpl; class COMPHELPER_DLLPUBLIC OModule { @@ -166,9 +166,9 @@ namespace comphelper OModule& operator=( const OModule& ); // never implemented }; - //========================================================================= + //= OModuleClient - //========================================================================= + /** base class for objects which uses any global module-specific resources */ class COMPHELPER_DLLPUBLIC OModuleClient @@ -181,9 +181,9 @@ namespace comphelper ~OModuleClient() { m_rModule.revokeClient( OModule::ClientAccess() ); } }; - //========================================================================== + //= OAutoRegistration - //========================================================================== + template <class TYPE> class OAutoRegistration { @@ -214,9 +214,9 @@ namespace comphelper ); } - //========================================================================== + //= OSingletonRegistration - //========================================================================== + template <class TYPE> class OSingletonRegistration { @@ -240,7 +240,7 @@ namespace comphelper }; template <class TYPE> - //-------------------------------------------------------------------------- + OSingletonRegistration<TYPE>::OSingletonRegistration( OModule& _rModule ) { _rModule.registerImplementation( ComponentDescription( @@ -252,9 +252,9 @@ namespace comphelper ) ); } -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_COMPONENTMODULE_HXX diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx index 41d42238f24b..7af48b51b946 100644 --- a/include/comphelper/configurationhelper.hxx +++ b/include/comphelper/configurationhelper.hxx @@ -31,18 +31,18 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/comphelperdllapi.h> -//_______________________________________________ + // namespaces namespace comphelper{ -//----------------------------------------------- + class COMPHELPER_DLLPUBLIC ConfigurationHelper { public: - //----------------------------------------------- + /** specify all possible modes, which can be used to open a configuration access. * * @see openConfig() @@ -61,7 +61,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper E_LAZY_WRITE = 4 }; - //----------------------------------------------- + /** returns access to the specified configuration package. * * This method should be used, if e.g. more then one request to the same @@ -91,7 +91,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper const OUString& sPackage, sal_Int32 eMode ); - //----------------------------------------------- + /** reads the value of an existing(!) configuration key, * which is searched relative to the specified configuration access. * @@ -120,7 +120,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper const OUString& sRelPath, const OUString& sKey ); - //----------------------------------------------- + /** writes a new value for an existing(!) configuration key, * which is searched relative to the specified configuration access. * @@ -151,7 +151,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper const OUString& sKey , const css::uno::Any& aValue ); - //----------------------------------------------- + /** it checks if the specified set node exists ... or create an empty one * otherwise. * @@ -184,7 +184,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper const OUString& sRelPathToSet, const OUString& sSetNode ); - //----------------------------------------------- + /** commit all changes made on the specified configuration access. * * This method must be used in combination with openConfig(). @@ -199,7 +199,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper */ static void flush(const css::uno::Reference< css::uno::XInterface >& xCFG); - //----------------------------------------------- + /** does the same then openConfig() & readRelativeKey() together. * * This method should be used for reading one key at one code place only. @@ -215,7 +215,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper const OUString& sKey , sal_Int32 eMode ); - //----------------------------------------------- + /** does the same then openConfig() / writeRelativeKey() & flush() together. * * This method should be used for writing one key at one code place only. diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx index 6739f90312b4..a559a7326e20 100644 --- a/include/comphelper/container.hxx +++ b/include/comphelper/container.hxx @@ -24,14 +24,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... -//======================================================================== + + //= IndexAccessIterator -//======================================================================== + /** an iterator that iterates through all elements, starting from an XIndexAccess (pre-order) */ class COMPHELPER_DLLPUBLIC IndexAccessIterator @@ -70,9 +70,9 @@ protected: virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*xContainer*/) const { return true; } }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_CONTAINER_HXX diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index 53d1a6ae0957..2a56f1e77e50 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -25,15 +25,15 @@ #include <osl/mutex.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... + class OContainerListenerAdapter; - //===================================================================== + //= OContainerListener - //===================================================================== + /** a non-UNO container listener <p>Useful if you have a non-refcountable class which should act as container listener.<br/> In this case, derive this class from OContainerListener, and create an adapter @@ -67,9 +67,9 @@ namespace comphelper void setAdapter(OContainerListenerAdapter* _pAdapter); }; - //===================================================================== + //= OContainerListenerAdapter - //===================================================================== + class COMPHELPER_DLLPUBLIC OContainerListenerAdapter :public cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > { @@ -105,9 +105,9 @@ namespace comphelper getContainer() const { return m_xContainer; } }; -//......................................................................... + } // namespace dbaui -//......................................................................... + #endif // INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index b275be2d93ab..7a020ed85417 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -37,7 +37,7 @@ enum DocPasswordVerifierResult DocPasswordVerifierResult_ABORT }; -// ============================================================================ + /** Base class for a password verifier used by the DocPasswordHelper class below. @@ -89,14 +89,14 @@ public: }; -// ============================================================================ + /** Helper that asks for a document password and checks its validity. */ class COMPHELPER_DLLPUBLIC DocPasswordHelper { public: - // ------------------------------------------------------------------------ + /** This helper function generates the information related to "Password to modify" provided by user. The result @@ -113,7 +113,7 @@ public: static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GenerateNewModifyPasswordInfo( const OUString& aPassword ); - // ------------------------------------------------------------------------ + /** This helper function allows to check whether the "Password to modify" provided by user is the correct one. @@ -134,7 +134,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo ); - // ------------------------------------------------------------------------ + /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" feature of Word. @@ -149,7 +149,7 @@ public: static sal_uInt32 GetWordHashAsUINT32( const OUString& aString ); - // ------------------------------------------------------------------------ + /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" and passwords related to @@ -170,7 +170,7 @@ public: const OUString& aString, rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - // ------------------------------------------------------------------------ + /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" and passwords related to @@ -191,7 +191,7 @@ public: const OUString& aString, rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - // ------------------------------------------------------------------------ + /** This helper function generates a random sequence of bytes of requested length. @@ -200,7 +200,7 @@ public: static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateRandomByteSequence( sal_Int32 nLength ); - // ------------------------------------------------------------------------ + /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. @@ -210,7 +210,7 @@ public: const OUString& aPassword, const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId ); - // ------------------------------------------------------------------------ + /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. @@ -228,7 +228,7 @@ public: const sal_uInt16 pPassData[16], const sal_uInt8 pDocId[16] ); - // ------------------------------------------------------------------------ + /** This helper function tries to request and verify a password to load a protected document. @@ -298,7 +298,7 @@ private: ~DocPasswordHelper(); }; -// ============================================================================ + } // namespace comphelper diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index be1cf36c71ab..e9257939dae4 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -30,7 +30,7 @@ namespace comphelper { class AbortContinuation; class PasswordContinuation; -// ============================================================================ + /** Selects which UNO document password request type to use. */ enum DocPasswordRequestType @@ -39,7 +39,7 @@ enum DocPasswordRequestType DocPasswordRequestType_MS /// Uses the com.sun.star.task.DocumentMSPasswordRequest request. }; -// ============================================================================ + class COMPHELPER_DLLPUBLIC SimplePasswordRequest : public cppu::WeakImplHelper1<css::task::XInteractionRequest> @@ -63,7 +63,7 @@ private: PasswordContinuation * mpPassword; }; -// ============================================================================ + /** Implements the task.XInteractionRequest interface for requesting a password string for a document. @@ -97,7 +97,7 @@ private: PasswordContinuation * mpPassword; }; -// ============================================================================ + } // namespace comphelper diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx index 90e5975a2cd4..61cd9fc8ffe5 100644 --- a/include/comphelper/documentinfo.hxx +++ b/include/comphelper/documentinfo.hxx @@ -24,13 +24,13 @@ #include <com/sun/star/frame/XModel.hpp> -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= DocumentInfo - //==================================================================== + class COMPHELPER_DLLPUBLIC DocumentInfo { public: @@ -42,9 +42,9 @@ namespace comphelper { DocumentInfo(); // never implemented }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_DOCUMENTINFO_HXX diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx index a39f2bb30383..b9acb584f2e6 100644 --- a/include/comphelper/enumhelper.hxx +++ b/include/comphelper/enumhelper.hxx @@ -30,27 +30,27 @@ #include <osl/mutex.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... + namespace starcontainer = ::com::sun::star::container; namespace staruno = ::com::sun::star::uno; namespace starlang = ::com::sun::star::lang; -//================================================================== + //= OEnumerationLock -//================================================================== + struct OEnumerationLock { public: ::osl::Mutex m_aLock; }; -//================================================================== + //= OEnumerationByName -//================================================================== + /** provides an com.sun.star.container::XEnumeration access based on an object implementing the com.sun.star.container::XNameAccess interface */ @@ -80,9 +80,9 @@ private: COMPHELPER_DLLPRIVATE void impl_stopDisposeListening(); }; -//================================================================== + //= OEnumerationByIndex -//================================================================== + /** provides an com.sun.star.container::XEnumeration access based on an object implementing the com.sun.star.container::XNameAccess interface */ @@ -109,9 +109,9 @@ private: COMPHELPER_DLLPRIVATE void impl_stopDisposeListening(); }; -//================================================================== + //= OAnyEnumeration -//================================================================== + /** provides an com.sun.star.container::XEnumeration for an outside set vector of Any's. @@ -132,7 +132,7 @@ public: }; -//......................................................................... + } //... namespace comphelper ....................................................... diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx index ce4db20060f6..957b21aa5052 100644 --- a/include/comphelper/evtlistenerhlp.hxx +++ b/include/comphelper/evtlistenerhlp.hxx @@ -25,16 +25,16 @@ #include <cppuhelper/weakref.hxx> #include <comphelper/comphelperdllapi.h> -//........................................................................ + namespace comphelper { -//........................................................................ - //========================================================================== + + //= OCommandsListener // is helper class to avoid a cycle in refcount between the XEventListener // and the member XEventBroadcaster - //========================================================================== + class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > { ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XEventListener> m_xListener; @@ -42,9 +42,9 @@ namespace comphelper OEventListenerHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx index cf28dfe6ed09..115f5f7e7bc1 100644 --- a/include/comphelper/evtmethodhelper.hxx +++ b/include/comphelper/evtmethodhelper.hxx @@ -19,14 +19,14 @@ #ifndef INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX #define INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX #include <comphelper/sequence.hxx> -//........................................................................ + namespace comphelper { COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type); -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // COMPHELPER_EVENTMEHODHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx index 30b43b67eb52..30106c16ee94 100644 --- a/include/comphelper/flagguard.hxx +++ b/include/comphelper/flagguard.hxx @@ -22,14 +22,14 @@ #include <comphelper/scopeguard.hxx> -//...................................................................................................................... + namespace comphelper { -//...................................................................................................................... - //================================================================================================================== + + //= FlagRestorationGuard - //================================================================================================================== + class COMPHELPER_DLLPUBLIC FlagRestorationGuard : public ScopeGuard { public: @@ -48,9 +48,9 @@ namespace comphelper } }; - //================================================================================================================== + //= FlagGuard - //================================================================================================================== + class COMPHELPER_DLLPUBLIC FlagGuard : public ScopeGuard { public: @@ -69,9 +69,9 @@ namespace comphelper } }; -//...................................................................................................................... + } // namespace comphelper -//...................................................................................................................... + #endif // INCLUDED_COMPHELPER_FLAGGUARD_HXX diff --git a/include/comphelper/guarding.hxx b/include/comphelper/guarding.hxx index f52650a5da1c..64fca41f8044 100644 --- a/include/comphelper/guarding.hxx +++ b/include/comphelper/guarding.hxx @@ -22,14 +22,14 @@ #include <osl/mutex.hxx> -//......................................................................... + namespace comphelper { -//......................................................................... -// =================================================================================================== + + // = class MutexRelease - -// =================================================================================================== + /** opposite of OGuard :) (a mutex is released within the constructor and acquired within the desctructor) @@ -47,9 +47,9 @@ public: typedef ORelease< ::osl::Mutex > MutexRelease; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_GUARDING_HXX diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx index 24486e156a06..db2926868f05 100644 --- a/include/comphelper/ihwrapnofilter.hxx +++ b/include/comphelper/ihwrapnofilter.hxx @@ -46,32 +46,32 @@ namespace comphelper { static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - //____________________________________________________________________________________________________ + // XInteractionHandler - //____________________________________________________________________________________________________ + virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest) throw( com::sun::star::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XInteractionHandler2 - //____________________________________________________________________________________________________ + virtual sal_Bool SAL_CALL handleInteractionRequest( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest) throw( com::sun::star::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XInitialization - //____________________________________________________________________________________________________ + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, ::com::sun::star::frame::DoubleInitializationException ) ; - //____________________________________________________________________________________________________ + // XServiceInfo - //____________________________________________________________________________________________________ + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index 1450a4f39422..20317729ae6b 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -30,14 +30,14 @@ #include <com/sun/star/task/XInteractionRequest.hpp> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... - //========================================================================= + + //= OInteractionSelect - //========================================================================= + /** base class for concrete XInteractionContinuation implementations.<p/> Instances of the classes maintain a flag indicating if the handler was called. */ @@ -58,9 +58,9 @@ namespace comphelper void implSelected() { m_bSelected = true; } }; - //========================================================================= + //= OInteraction - //========================================================================= + /** template for instantiating concret interaction handlers<p/> the template argument must eb an interface derived from XInteractionContinuation */ @@ -76,36 +76,36 @@ namespace comphelper virtual void SAL_CALL select( ) throw(::com::sun::star::uno::RuntimeException); }; - //......................................................................... + template <class INTERACTION> void SAL_CALL OInteraction< INTERACTION >::select( ) throw(::com::sun::star::uno::RuntimeException) { implSelected(); } - //========================================================================= + //= OInteractionApprove - //========================================================================= + typedef OInteraction< ::com::sun::star::task::XInteractionApprove > OInteractionApprove; - //========================================================================= + //= OInteractionDispprove - //========================================================================= + typedef OInteraction< ::com::sun::star::task::XInteractionDisapprove > OInteractionDisapprove; - //========================================================================= + //= OInteractionAbort - //========================================================================= + typedef OInteraction< ::com::sun::star::task::XInteractionAbort > OInteractionAbort; - //========================================================================= + //= OInteractionRetry - //========================================================================= + typedef OInteraction< ::com::sun::star::task::XInteractionRetry > OInteractionRetry; - //========================================================================= + //= OInteractionPassword - //========================================================================= + class COMPHELPER_DLLPUBLIC OInteractionPassword : public OInteraction< ::com::sun::star::task::XInteractionPassword > { public: @@ -126,9 +126,9 @@ namespace comphelper OUString m_sPassword; }; - //========================================================================= + //= OInteractionRequest - //========================================================================= + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionRequest > OInteractionRequest_Base; /** implements an interaction request (com.sun.star.task::XInteractionRequest)<p/> @@ -151,9 +151,9 @@ namespace comphelper virtual ::com::sun::star::uno::Any SAL_CALL getRequest( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_INTERACTION_HXX diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index ecf77873d507..22deb018f876 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -27,14 +27,14 @@ #include <memory> -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= OListenerContainer - //==================================================================== + /** abstract base class which manages a listener container, including THB's listener notification pattern which cares for removing listeners which throw an DisposedException upon notification @@ -141,7 +141,7 @@ namespace comphelper ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) = 0; }; - //==================================================================== + inline bool OListenerContainer::empty() const SAL_THROW(()) { return ( m_aListeners.getLength() == 0 ); @@ -152,9 +152,9 @@ namespace comphelper return m_aListeners.getLength(); } - //==================================================================== + //= OSimpleListenerContainer - //==================================================================== + /** helper class for simple notification of the form LISTENER::METHOD( EVENT ) This class is not threadsafe! @@ -209,7 +209,7 @@ namespace comphelper ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); }; - //-------------------------------------------------------------------- + template< class LISTENER, class EVENT > inline bool OSimpleListenerContainer< LISTENER, EVENT >::notify( const EventClass& _rEvent, NotificationMethod _pNotify ) SAL_THROW(( ::com::sun::star::uno::Exception )) { @@ -219,7 +219,7 @@ namespace comphelper return bRet; } - //-------------------------------------------------------------------- + template< class LISTENER, class EVENT > inline bool OSimpleListenerContainer< LISTENER, EVENT >::implNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener, @@ -231,9 +231,9 @@ namespace comphelper return true; } - //==================================================================== + //= OListenerContainerBase - //==================================================================== + /** is a specialization of OListenerContainer which saves you some additional type casts, by making the required listener and event types template arguments. */ @@ -289,9 +289,9 @@ namespace comphelper ); } -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index c243c2be2544..2e528691743c 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -29,15 +29,15 @@ #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= string conversions, employed by the templatized log* members of //= EventLogger - //==================================================================== + namespace log { namespace convert { @@ -62,9 +62,9 @@ namespace comphelper } } // namespace log::convert - //==================================================================== + //= EventLogger - //==================================================================== + class EventLogger_Impl; typedef ::boost::optional< OUString > OptionalString; @@ -116,7 +116,7 @@ namespace comphelper /// determines whether an event with the given level would be logged bool isLoggable( const sal_Int32 _nLogLevel ) const; - //---------------------------------------------------------------- + //- XLogger::log equivalents/wrappers //- string messages @@ -209,7 +209,7 @@ namespace comphelper return false; } - //---------------------------------------------------------------- + //- XLogger::log equivalents/wrappers //- ASCII messages @@ -302,7 +302,7 @@ namespace comphelper return false; } - //---------------------------------------------------------------- + //- XLogger::logp equivalents/wrappers //- string messages @@ -395,7 +395,7 @@ namespace comphelper return false; } - //---------------------------------------------------------------- + //- XLogger::logp equivalents/wrappers //- ASCII messages @@ -503,9 +503,9 @@ namespace comphelper ) const; }; - //==================================================================== + //= ResourceBasedEventLogger - //==================================================================== + struct ResourceBasedEventLogger_Data; /** extends the EventLogger class with functionality to load log messages from a resource bundle. @@ -533,7 +533,7 @@ namespace comphelper const sal_Char* _pAsciiLoggerName = NULL ); - //---------------------------------------------------------------- + //- XLogger::log equivalents/wrappers //- resource IDs @@ -626,7 +626,7 @@ namespace comphelper return false; } - //---------------------------------------------------------------- + //- XLogger::logp equivalents/wrappers //- resource IDs @@ -718,9 +718,9 @@ namespace comphelper OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const; }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_LOGGING_HXX diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index c625f24cdcbc..bcd7ab7c31a2 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -31,14 +31,14 @@ #include <algorithm> #include <vector> -//........................................................................ + namespace comphelper { -//........................................................................ - // ==================================================================== + + // = NamedValueCollection - // ==================================================================== + struct NamedValueCollection_Impl; /** a collection of named values, packed in various formats. */ @@ -358,9 +358,9 @@ namespace comphelper } }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index 7d4e1328529b..7e1b549e91fa 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -48,7 +48,7 @@ namespace comphelper{ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex , public ::cppu::WeakImplHelper1< css::frame::XUntitledNumbers > { - //------------------------------------------- + // types, const private: @@ -66,21 +66,21 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex typedef ::std::vector< long > TDeadItemList; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short lightweight constructor. */ NumberedCollection(); - //--------------------------------------- + /** @short free all internally used resources. */ virtual ~NumberedCollection(); - //--------------------------------------- + /** set an outside component which uses this container and must be set as source of all broadcasted messages, exceptions. @@ -94,7 +94,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex */ void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner); - //--------------------------------------- + /** set the localized prefix to be used for untitled components. Localization has to be done outside. This container will return @@ -106,34 +106,34 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex */ void setUntitledPrefix(const OUString& sPrefix); - //--------------------------------------- + /** @see css.frame.XUntitledNumbers */ virtual ::sal_Int32 SAL_CALL leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); - //--------------------------------------- + /** @see css.frame.XUntitledNumbers */ virtual void SAL_CALL releaseNumber(::sal_Int32 nNumber) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); - //--------------------------------------- + /** @see css.frame.XUntitledNumbers */ virtual void SAL_CALL releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); - //--------------------------------------- + /** @see css.frame.XUntitledNumbers */ virtual OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException, std::exception); - //------------------------------------------- + // internal private: - //--------------------------------------- + /** @short trys to find an unique number not already used within this collection. @descr It reuses the smalles number which isnt used by any component @@ -155,7 +155,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex void impl_cleanUpDeadItems ( TNumberedItemHash& lItems , const TDeadItemList& lDeadItems); - //------------------------------------------- + // member private: diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx index f02604794749..373a74112c24 100644 --- a/include/comphelper/numbers.hxx +++ b/include/comphelper/numbers.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/lang/Locale.hpp> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... + namespace staruno = ::com::sun::star::uno; namespace starlang = ::com::sun::star::lang; @@ -58,9 +58,9 @@ namespace comphelper const OUString& _rPropertyName ); -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_NUMBERS_HXX diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx index 29279ab5b5c6..f893fbb84d72 100644 --- a/include/comphelper/officeresourcebundle.hxx +++ b/include/comphelper/officeresourcebundle.hxx @@ -27,14 +27,14 @@ #include <memory> -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= OfficeResourceBundle - //==================================================================== + class ResourceBundle_Impl; /** wraps the com::sun::star::resource::OfficeResourceAccess service */ @@ -85,9 +85,9 @@ namespace comphelper bool hasString( sal_Int32 _resourceId ) const; }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx index 62ca57d681b6..59e0566de396 100644 --- a/include/comphelper/oslfile2streamwrap.hxx +++ b/include/comphelper/oslfile2streamwrap.hxx @@ -31,10 +31,10 @@ namespace comphelper namespace stario = ::com::sun::star::io; namespace staruno = ::com::sun::star::uno; -//================================================================== + // FmUnoIOStream, // Stream to read and write data, based on File -//================================================================== + class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XInputStream> { ::osl::Mutex m_aMutex; @@ -52,10 +52,10 @@ public: virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception); }; -//================================================================== + // FmUnoOutStream, // data sink for the files -//================================================================== + class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream> { public: diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index f415d90cfa82..64bb2055b42b 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -26,19 +26,19 @@ #include <map> -//========================================================================= + //= property helper classes -//========================================================================= -//......................................................................... + + namespace comphelper { -//......................................................................... -//================================================================== + + //= OPropertyAccessor //= internal helper class for OPropertyArrayAggregationHelper -//================================================================== + namespace internal { struct OPropertyAccessor @@ -61,7 +61,7 @@ namespace internal typedef PropertyAccessorMap::const_iterator ConstPropertyAccessorMapIterator; } -//================================================================== + /** * used as callback for a OPropertyArrayAggregationHelper */ @@ -85,7 +85,7 @@ protected: */ #define DEFAULT_AGGREGATE_PROPERTY_ID 10000 -//------------------------------------------------------------------ + class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper: public ::cppu::IPropertyArrayHelper { friend class OPropertySetAggregationHelper; @@ -181,7 +181,7 @@ protected: const ::com::sun::star::beans::Property* findPropertyByName(const OUString& _rName) const; }; -//================================================================== + namespace internal { class PropertyForwarder; @@ -316,9 +316,9 @@ protected: void startListening(); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_PROPAGG_HXX diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx index 9928f78052fa..7ca60f86a70f 100644 --- a/include/comphelper/proparrhlp.hxx +++ b/include/comphelper/proparrhlp.hxx @@ -33,13 +33,13 @@ namespace cppu { //... namespace comphelper ................................................ namespace comphelper { -//......................................................................... + namespace staruno = ::com::sun::star::uno; namespace starbeans = ::com::sun::star::beans; -//================================================================== + template <typename TYPE> struct OPropertyArrayUsageHelperMutex : public rtl::Static< ::osl::Mutex, OPropertyArrayUsageHelperMutex<TYPE> > {}; @@ -85,7 +85,7 @@ protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 0; }; -//================================================================== + /** a OPropertyArrayUsageHelper which will create an OPropertyArrayAggregationHelper */ template <class TYPE> @@ -121,14 +121,14 @@ protected: virtual sal_Int32 getFirstAggregateId() const { return DEFAULT_AGGREGATE_PROPERTY_ID; } }; -//------------------------------------------------------------------ + template<class TYPE> sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; template<class TYPE> ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL; -//------------------------------------------------------------------ + template <class TYPE> OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper() { @@ -136,7 +136,7 @@ OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper() ++s_nRefCount; } -//------------------------------------------------------------------ + template <class TYPE> ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYPE>::getArrayHelper() { @@ -153,7 +153,7 @@ template <class TYPE> return s_pProps; } -//------------------------------------------------------------------ + template <class TYPE> inline ::cppu::IPropertyArrayHelper* OAggregationArrayUsageHelper<TYPE>::createArrayHelper() const { @@ -164,7 +164,7 @@ template <class TYPE> inline return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, getInfoService(), getFirstAggregateId()); } -//......................................................................... + } //... namespace comphelper ................................................ diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index ab2e795902c2..5dc53bc33ac0 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -28,21 +28,21 @@ #include <comphelper/comphelperdllapi.h> #include <cppu/unotype.hxx> -//========================================================================= + //= property helper classes -//========================================================================= + //... namespace comphelper ....................................................... namespace comphelper { -//......................................................................... + namespace starbeans = ::com::sun::star::beans; namespace staruno = ::com::sun::star::uno; /** compare two properties by name */ - //-------------------------------------------------------------------------- + // comparing two property instances struct PropertyCompareByName : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool > { @@ -52,23 +52,23 @@ namespace comphelper } }; - //-------------------------------------------------------------------------- + /** compare two properties by name */ struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, OUString, bool > { - // ................................................................ + inline bool operator()( const ::com::sun::star::beans::Property& lhs, const OUString& rhs ) const { return lhs.Name == rhs ; } - // ................................................................ + inline bool operator()( const OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const { return lhs == rhs.Name ; } }; - //-------------------------------------------------------------------------- + // comparing two property instances struct PropertyEqualByName : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool > { @@ -78,11 +78,11 @@ namespace comphelper } }; -//------------------------------------------------------------------ + /// remove the property with the given name from the given sequence COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& seqProps, const OUString& _rPropName); -//------------------------------------------------------------------ + /** within the given property sequence, modify attributes of a special property @param _rProps the sequence of properties to search in @param _sPropName the name of the property which's attributes should be modified @@ -91,21 +91,21 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& */ COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib); -//------------------------------------------------------------------ + /** check if the given set has the given property. */ COMPHELPER_DLLPUBLIC bool hasProperty(const OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet); -//------------------------------------------------------------------ + /** copy properties between property sets, in compliance with the property attributes of the target object */ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPropertySet>& _rxSource, const staruno::Reference<starbeans::XPropertySet>& _rxDest); -//================================================================== + //= property conversion helpers -//================================================================== + /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue @param _rConvertedValue the conversion result (if successful) @@ -196,7 +196,7 @@ inline bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any */ COMPHELPER_DLLPUBLIC bool tryPropertyValue(staruno::Any& _rConvertedValue, staruno::Any& _rOldValue, const staruno::Any& _rValueToSet, const staruno::Any& _rCurrentValue, const staruno::Type& _rExpectedType); -//......................................................................... + } //... namespace comphelper ....................................................... diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx index b8caf54868de..573f0efd2ecc 100644 --- a/include/comphelper/propertybag.hxx +++ b/include/comphelper/propertybag.hxx @@ -25,15 +25,15 @@ #include <memory> -//........................................................................ + namespace comphelper { -//........................................................................ + struct PropertyBag_Impl; - //==================================================================== + //= PropertyBag - //==================================================================== + /** provides a bag of properties associated with their values This class can, for instance, be used for components which need to implement @@ -218,9 +218,9 @@ namespace comphelper using OPropertyContainerHelper::getFastPropertyValue; }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_PROPERTYBAG_HXX diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index 20361a8703e2..2f620e977e7b 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/uno/Type.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... + /** a OPropertySetHelper implementation which is just a simple container for properties represented by class members, usually in a derived class. @@ -77,9 +77,9 @@ protected: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx index 821903de3639..c52dd0aace6a 100644 --- a/include/comphelper/propertycontainerhelper.hxx +++ b/include/comphelper/propertycontainerhelper.hxx @@ -26,10 +26,10 @@ #include <vector> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... + // infos about one single property struct COMPHELPER_DLLPUBLIC PropertyDescription @@ -61,9 +61,9 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription } }; -//========================================================================== + //= OPropertyContainerHelper -//========================================================================== + /** helper class for managing property values, and implementing most of the X*Property* interfaces The property values are usually held in derived classes, but can also be given to the @@ -194,9 +194,9 @@ private: COMPHELPER_DLLPRIVATE OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ); // never implemented }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx index ad27dfaea6b5..05f8fde728b6 100644 --- a/include/comphelper/propertysethelper.hxx +++ b/include/comphelper/propertysethelper.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <comphelper/comphelperdllapi.h> -//========================================================================= + //= property helper classes -//========================================================================= + //... namespace comphelper ................................................ namespace comphelper { -//......................................................................... + class PropertySetInfo; struct PropertyMapEntry; @@ -82,7 +82,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } //... namespace comphelper.................................................. diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx index 687398316508..5ee554f2b8b9 100644 --- a/include/comphelper/propertysetinfo.hxx +++ b/include/comphelper/propertysetinfo.hxx @@ -28,14 +28,14 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/comphelperdllapi.h> -//========================================================================= + //= property helper classes -//========================================================================= + //... namespace comphelper ....................................................... namespace comphelper { -//......................................................................... + struct PropertyMapEntry { @@ -80,7 +80,7 @@ public: virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -//......................................................................... + } //... namespace comphelper ....................................................... diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index c8f2e11c9065..2c41d3bf098a 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -29,14 +29,14 @@ #include <map> -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= OPropertyStateContainer - //===================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::beans::XPropertyState > OPropertyStateContainer_TBase; @@ -57,14 +57,14 @@ namespace comphelper */ OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper ); - // ................................................................ + // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - // ................................................................ + // own overridables // these are the impl-methods for the XPropertyState members - they are implemented already by this class, // but you may want to override them for whatever reasons (for instance, if your derived class @@ -105,9 +105,9 @@ namespace comphelper sal_Int32 getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) ); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index 7492e564cdb1..5e520faf6d49 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -24,20 +24,20 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/comphelperdllapi.h> -//========================================================================= + //= property helper classes -//========================================================================= -//......................................................................... + + namespace comphelper { -//......................................................................... + class OPropertyChangeMultiplexer; - //================================================================== + //= OPropertyChangeListener - //================================================================== + /// simple listener adapter for property sets class COMPHELPER_DLLPUBLIC OPropertyChangeListener { @@ -65,9 +65,9 @@ namespace comphelper void setAdapter( OPropertyChangeMultiplexer* _pAdapter ); }; - //================================================================== + //= OPropertyChangeMultiplexer - //================================================================== + /// multiplexer for property changes class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> { @@ -101,9 +101,9 @@ namespace comphelper void dispose(); }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index e61be5ea002a..070a8b299040 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -32,18 +32,18 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <comphelper/comphelperdllapi.h> -//========================================================================= + //= property helper classes -//========================================================================= -//......................................................................... + + namespace comphelper { -//......................................................................... - //================================================================== + + //= OPropertyStateHelper - //================================================================== + /// helper class for implementing property states class COMPHELPER_DLLPUBLIC OPropertyStateHelper :public ::cppu::OPropertySetHelper2 ,public ::com::sun::star::beans::XPropertyState @@ -79,9 +79,9 @@ namespace comphelper virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); }; - //================================================================== + //= OPropertyStateHelper - //================================================================== + class COMPHELPER_DLLPUBLIC OStatefulPropertySet :public ::cppu::OWeakObject ,public ::com::sun::star::lang::XTypeProvider ,public OMutexAndBroadcastHelper // order matters: before OPropertyStateHelper/OPropertySetHelper @@ -96,9 +96,9 @@ namespace comphelper DECLARE_XTYPEPROVIDER() }; -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_PROPSTATE_HXX diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 2cf6894f8e10..8f95f71c1af7 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -71,14 +71,14 @@ namespace com { namespace sun { namespace star { namespace uno { - call baseAggregateProxyFor in your ctor */ -//............................................................................. + namespace comphelper { -//............................................................................. - //========================================================================= + + //= OProxyAggregation - //========================================================================= + /** helper class for aggregating a proxy for a foreign object */ class OProxyAggregation @@ -115,9 +115,9 @@ namespace comphelper OProxyAggregation& operator=( const OProxyAggregation& ); // never implemented }; - //========================================================================= + //= OComponentProxyAggregationHelper - //========================================================================= + /** a helper class for aggregating a proxy to an XComponent <p>The object couples the life time of itself and the component: if one of the both @@ -176,9 +176,9 @@ namespace comphelper COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ); // never implemented }; - //========================================================================= + //= OComponentProxyAggregation - //========================================================================= + class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex ,public cppu::WeakComponentImplHelperBase ,public OComponentProxyAggregationHelper @@ -215,9 +215,9 @@ namespace comphelper COMPHELPER_DLLPRIVATE OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ); // never implemented }; -//............................................................................. + } // namespace comphelper -//............................................................................. + #endif // COMPHELPER_PROXY_AGGREGATION diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index d85626586b40..857620bbe22c 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -32,10 +32,10 @@ namespace comphelper { -//================================================================== + // SequenceInputStream // stream for reading data from a sequence of bytes -//================================================================== + class COMPHELPER_DLLPUBLIC SequenceInputStream diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index 38947231b713..235c4c9b31a4 100644 --- a/include/comphelper/sequence.hxx +++ b/include/comphelper/sequence.hxx @@ -27,14 +27,14 @@ #include <vector> -//......................................................................... + namespace comphelper { -//......................................................................... + namespace staruno = ::com::sun::star::uno; - //------------------------------------------------------------------------- + /** search the given string within the given sequence, return the positions where it was found. if _bOnlyFirst is sal_True, only the first occurrence will be returned. */ @@ -49,7 +49,7 @@ namespace comphelper *_pDest = *_pSource; } } - //------------------------------------------------------------------------- + /// concat two sequences template <class T> staruno::Sequence<T> concatSequences(const staruno::Sequence<T>& _rLeft, const staruno::Sequence<T>& _rRight) @@ -68,7 +68,7 @@ namespace comphelper return aReturn; } - //------------------------------------------------------------------------- + /// concat three sequences template <class T> staruno::Sequence<T> concatSequences(const staruno::Sequence<T>& _rLeft, const staruno::Sequence<T>& _rMiddle, const staruno::Sequence<T>& _rRight) @@ -89,7 +89,7 @@ namespace comphelper return aReturn; } - //------------------------------------------------------------------------- + /// remove a specified element from a sequences template<class T> void removeElementAt(staruno::Sequence<T>& _rSeq, sal_Int32 _nPos) @@ -106,9 +106,9 @@ namespace comphelper _rSeq.realloc(nLength-1); } - //===================================================================== + //= iterating through sequences - //===================================================================== + /** a helper class for iterating through a sequence */ template <class TYPE> @@ -133,7 +133,7 @@ namespace comphelper void construct(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq); }; - //--------------------------------------------------------------------- + template <class TYPE> OSequenceIterator<TYPE>::OSequenceIterator(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq) :m_pElements(NULL) @@ -143,7 +143,7 @@ namespace comphelper construct(_rSeq); } - //--------------------------------------------------------------------- + template <class TYPE> OSequenceIterator<TYPE>::OSequenceIterator(const ::com::sun::star::uno::Any& _rSequenceAny) :m_pElements(NULL) @@ -157,7 +157,7 @@ namespace comphelper construct(aContainer); } - //--------------------------------------------------------------------- + template <class TYPE> void OSequenceIterator<TYPE>::construct(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq) { @@ -166,21 +166,21 @@ namespace comphelper m_pCurrent = m_pElements; } - //--------------------------------------------------------------------- + template <class TYPE> bool OSequenceIterator<TYPE>::hasMoreElements() const { return m_pCurrent - m_pElements < m_nLen; } - //--------------------------------------------------------------------- + template <class TYPE> ::com::sun::star::uno::Any OSequenceIterator<TYPE>::nextElement() { return ::com::sun::star::uno::makeAny(*m_pCurrent++); } - //------------------------------------------------------------------------- + /** Copy from a plain C/C++ array into a Sequence. @tpl SrcType @@ -210,7 +210,7 @@ namespace comphelper return result; } - //------------------------------------------------------------------------- + /** Copy from a Sequence into a plain C/C++ array @tpl SrcType @@ -240,7 +240,7 @@ namespace comphelper return io_pArray; } - //------------------------------------------------------------------------- + /** Copy from a container into a Sequence @tpl SrcType @@ -279,7 +279,7 @@ namespace comphelper v.empty() ? 0 : &v[0], static_cast<sal_Int32>(v.size()) ); } - //------------------------------------------------------------------------- + /** Copy from a Sequence into a container @tpl SrcType @@ -310,7 +310,7 @@ namespace comphelper ::std::copy( i_Sequence.getConstArray(), i_Sequence.getConstArray()+i_Sequence.getLength(), result.begin() ); return result; } - //------------------------------------------------------------------------- + /** Copy from a Sequence into an existing container This potentially saves a needless extra copy operation over @@ -349,9 +349,9 @@ namespace comphelper return o_Output; } -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_SEQUENCE_HXX diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index f5e495f2e1cc..63a409b1ebd7 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -52,40 +52,40 @@ struct SequenceAsHashMapBase : public ::boost::unordered_map< class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase { - //------------------------------------------- + public: - //--------------------------------------- + /** @short creates an empty hash map. */ SequenceAsHashMap(); - //--------------------------------------- + /** @see operator<<(const ::com::sun::star::uno::Any&) */ SequenceAsHashMap(const ::com::sun::star::uno::Any& aSource); - //--------------------------------------- + /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&) */ SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource); - //--------------------------------------- + /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&) */ SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); - //--------------------------------------- + /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >&) */ SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); - //--------------------------------------- + /** @short not really used but maybe useful :-) */ ~SequenceAsHashMap(); - //--------------------------------------- + /** @short fill this map from the given any, which of course must contain a suitable sequence of element types @@ -105,7 +105,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ void operator<<(const ::com::sun::star::uno::Any& aSource); - //--------------------------------------- + /** @short fill this map from the given sequence, where every Any must contain an item from type "css.beans.PropertyValue" @@ -120,7 +120,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ void operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource); - //--------------------------------------- + /** @short fill this map from the given PropertyValue sequence. @@ -129,7 +129,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ void operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); - //--------------------------------------- + /** @short fill this map from the given NamedValue sequence. @@ -138,7 +138,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ void operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); - //--------------------------------------- + /** @short converts this map instance to an PropertyValue sequence. @@ -147,7 +147,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ void operator>>(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lDestination) const; - //--------------------------------------- + /** @short converts this map instance to an NamedValue sequence. @@ -156,7 +156,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ void operator>>(::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lDestination) const; - //--------------------------------------- + /** @short return this map instance as an Any, which can be used in const environments only. @@ -174,7 +174,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ const ::com::sun::star::uno::Any getAsConstAny(bool bAsPropertyValue) const; - //--------------------------------------- + /** @short return this map instance to as a NamedValue sequence, which can be used in const environments only. @@ -188,7 +188,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getAsConstNamedValueList() const; - //--------------------------------------- + /** @short return this map instance to as a PropertyValue sequence, which can be used in const environments only. @@ -202,7 +202,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getAsConstPropertyValueList() const; - //--------------------------------------- + /** @short check if the specified item exists and return its (unpacked!) value or it returns the specified default value otherwise. @@ -240,7 +240,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase return aValue; } - //--------------------------------------- + /** @short creates a new item with the specified name and value only in case such item name does not already exist. @@ -274,7 +274,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase return false; } - //--------------------------------------- + /** @short check if all items of given map exists in these called map also. @@ -292,7 +292,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase */ bool match(const SequenceAsHashMap& rCheck) const; - //--------------------------------------- + /** @short merge all values from the given map into this one. diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx index 5f1435da62ee..01d6b5cbb2d4 100644 --- a/include/comphelper/sequenceasvector.hxx +++ b/include/comphelper/sequenceasvector.hxx @@ -42,38 +42,38 @@ namespace comphelper{ template< class TElementType > class SequenceAsVector : public ::std::vector< TElementType > { - //------------------------------------------- + // types public: - //--------------------------------------- + /** @short When inheriting from a template using typename is generally required when using types from the base! */ typedef typename ::std::vector< TElementType >::const_iterator const_iterator; - //--------------------------------------- + /** @short When inheriting from a template using typename is generally required when using types from the base! */ typedef typename ::std::vector< TElementType >::iterator iterator; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short default ctor, to create an empty list. */ SequenceAsVector() {} - //--------------------------------------- + /** @short default dtor */ ~SequenceAsVector() {} - //--------------------------------------- + /** @short creates a new vector with the given length. @param nLength @@ -84,7 +84,7 @@ class SequenceAsVector : public ::std::vector< TElementType > { } - //--------------------------------------- + /** @short creates a new deque from the given uno sequence. @param lSource @@ -95,7 +95,7 @@ class SequenceAsVector : public ::std::vector< TElementType > (*this) << lSource; } - //--------------------------------------- + /** @short creates a new instance from the given Any, which of course must contain a valid sequence using the right element type for every item. @@ -117,7 +117,7 @@ class SequenceAsVector : public ::std::vector< TElementType > (*this) << aSource; } - //--------------------------------------- + /** @short fill this instance from the given uno sequence. @param lSource @@ -134,7 +134,7 @@ class SequenceAsVector : public ::std::vector< TElementType > this->push_back(pSource[i]); } - //--------------------------------------- + /** @short fill this instance from the given Any, which of course must contain a valid sequence using the right element type for every item. @@ -169,7 +169,7 @@ class SequenceAsVector : public ::std::vector< TElementType > (*this) << lSource; } - //--------------------------------------- + /** @short converts this instance to an uno sequence. @param lDestination @@ -191,7 +191,7 @@ class SequenceAsVector : public ::std::vector< TElementType > } } - //--------------------------------------- + /** @short converts this instance to an uno any which contains a suitable sequence of items of this stl struct. @@ -217,7 +217,7 @@ class SequenceAsVector : public ::std::vector< TElementType > aDestination <<= lDestination; } - //--------------------------------------- + /** @short converts this deque to a suitable uno sequence which contains all items. diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx index f210fcd4fdfa..894a57a09346 100644 --- a/include/comphelper/servicedecl.hxx +++ b/include/comphelper/servicedecl.hxx @@ -299,9 +299,9 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT explicit class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {} }; -// + // component_... helpers with arbitrary service declarations: -// + #define COMPHELPER_SERVICEDECL_getFactory(z_, n_, unused_) \ if (pRet == 0) \ diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index a7282e291825..03397d6bed61 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -26,14 +26,14 @@ #include <boost/shared_ptr.hpp> -//........................................................................ + namespace comphelper { -//........................................................................ - //============================================================ + + //= SharedMutex - //============================================================ + class COMPHELPER_DLLPUBLIC SharedMutex { public: @@ -51,9 +51,9 @@ namespace comphelper ::boost::shared_ptr< ::osl::Mutex > m_pMutexImpl; }; - //============================================================ + //= SharedMutexBase - //============================================================ + /** sometimes, it's necessary to have an initialized ::osl::Mutex to pass to some ctor call of your base class. In this case, you can't hold the SharedMutex as member, but you need to move it into another base class, @@ -77,9 +77,9 @@ namespace comphelper mutable SharedMutex m_aMutex; }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_SHAREDMUTEX_HXX diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 73726f7c7564..28f3a14ad6a6 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -36,9 +36,9 @@ //... namespace comphelper ................................................ namespace comphelper { -//......................................................................... -//======================================================================== + + // comparison functors struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool> @@ -57,7 +57,7 @@ public: bool isCaseSensitive() const {return m_bCaseSensitive;} }; -//------------------------------------------------------------------------ + class UStringMixEqual: public std::binary_function<OUString, OUString, bool> { bool m_bCaseSensitive; @@ -70,7 +70,7 @@ public: } bool isCaseSensitive() const {return m_bCaseSensitive;} }; -//------------------------------------------------------------------------ + class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,OUString,bool> { public: @@ -81,7 +81,7 @@ public: return !!(lhs.Name == rhs); } }; -//------------------------------------------------------------------------ + class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,OUString,bool> { public: @@ -93,9 +93,9 @@ public: } }; -//===================================================================== + //= OInterfaceCompare -//===================================================================== + /** is stl-compliant structure for comparing Reference< <iface> > instances */ template < class IAFCE > @@ -132,7 +132,7 @@ inline mem_fun1_t<_Tp,_Arg> mem_fun(void (_Tp::*__f)(_Arg)) return mem_fun1_t<_Tp,_Arg>(__f); } -//......................................................................... + /** output iterator that appends OUStrings into an OUStringBuffer. */ class OUStringBufferAppender : @@ -161,7 +161,7 @@ private: OUStringBuffer & m_rBuffer; }; -//......................................................................... + /** algorithm similar to std::copy, but inserts a separator between elements. */ template< typename ForwardIter, typename OutputIter, typename T > @@ -185,7 +185,7 @@ OutputIter intersperse( return out; } -//......................................................................... + } //... namespace comphelper ................................................ diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx index a61dbd69e257..3347e83c79cd 100644 --- a/include/comphelper/synchronousdispatch.hxx +++ b/include/comphelper/synchronousdispatch.hxx @@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { } } } -//........................................................................ + namespace comphelper { -//........................................................................ - //==================================================================== + + //= SynchronousDispatch - //==================================================================== + /** a helper class for working with the dispatch interface replacing loadComponentFromURL */ @@ -57,9 +57,9 @@ namespace comphelper const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &lArguments ); }; -//........................................................................ + } // namespace comphelper -//........................................................................ + #endif // INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 3adf5cc290d6..58223161897f 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -34,10 +34,10 @@ namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } } } } -//......................................................................... + namespace comphelper { -//......................................................................... + namespace staruno = ::com::sun::star::uno; namespace starawt = ::com::sun::star::awt; @@ -46,14 +46,14 @@ namespace comphelper typedef staruno::Reference< staruno::XInterface > InterfaceRef; typedef staruno::Sequence< OUString > StringSequence; - //------------------------------------------------------------------------- + /** compare the two given Anys The comparison is deep, means if one of the Any's contains an Any which contains an Any ..., this is resolved <br/> Other types recognized currently : FontDescriptor, ::com::sun::star::util::Date/Tim/DateTime, staruno::Sequence<sal_Int8> */ COMPHELPER_DLLPUBLIC bool compare(const staruno::Any& rLeft, const staruno::Any& rRight); - //------------------------------------------------------------------------- + /** compare two FontDescriptor's */ COMPHELPER_DLLPUBLIC bool operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight); @@ -62,11 +62,11 @@ namespace comphelper return !(_rLeft == _rRight); } - //------------------------------------------------------------------------- + /// returns sal_True if objects of the types given are "compatible" COMPHELPER_DLLPUBLIC bool isAssignableFrom(const staruno::Type& _rAssignable, const staruno::Type& _rFrom); - //------------------------------------------------------------------------- + /** just a small shortcut ... check if a type you have at hand at runtime is equal to another type you have at compile time if all our compiler would accept function calls with explicit template arguments (like @@ -80,7 +80,7 @@ namespace comphelper return _rType.equals(cppu::getTypeFavourUnsigned(pDummy)); } - //------------------------------------------------------------------------- + /** check if a type you have at hand at runtime is equal to another type you have at compile time same comment as for the other isA .... */ @@ -91,7 +91,7 @@ namespace comphelper cppu::getTypeFavourUnsigned(pDummy)); } - //------------------------------------------------------------------------- + /** check if a type you have at hand at runtime is equal to another type you have at compile time */ template <class TYPE> @@ -102,7 +102,7 @@ namespace comphelper static_cast<staruno::Reference<TYPE>*>(NULL))); } - //------------------------------------------------------------------------- + /** ask the given object for an XComponent interface and dispose on it */ template <class TYPE> @@ -115,7 +115,7 @@ namespace comphelper _rxComp = NULL; } } - //------------------------------------------------------------------------- + template <class TYPE> bool getImplementation(TYPE*& _pObject, const staruno::Reference< staruno::XInterface >& _rxIFace) { @@ -128,7 +128,7 @@ namespace comphelper } - //------------------------------------------------------------------------- + /** get a com::sun::star::awt::FontDescriptor that is fully initialized with the XXX_DONTKNOW enum values (which isn't the case if you instantiate it via the default constructor) @@ -139,7 +139,7 @@ namespace comphelper */ COMPHELPER_DLLPUBLIC staruno::Type getSequenceElementType(const staruno::Type& _rSequenceType); -//========================================================================= + //= replacement of the former UsrAny.getXXX methods // may be used if you need the return value just as temporary, else it's may be too inefficient .... @@ -165,9 +165,9 @@ namespace comphelper inline staruno::Any makeBoolAny(bool _b) { return staruno::Any(&_b, ::getBooleanCppuType()); } -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_TYPES_HXX diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index 70ec09c031ea..e04585de17a3 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -27,18 +27,18 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> -//......................................................................... + namespace comphelper { -//......................................................................... -//========================================================================= + + /// manipulate ref counts without calling acquire/release inline oslInterlockedCount increment(oslInterlockedCount& _counter) { return osl_atomic_increment(&_counter); } inline oslInterlockedCount decrement(oslInterlockedCount& _counter) { return osl_atomic_decrement(&_counter); } -//========================================================================= + /** used for declaring UNO3-Defaults, i.e. acquire/release */ @@ -143,11 +143,11 @@ namespace comphelper void SAL_CALL PUT_SEMICOLON_AT_THE_END() - //===================================================================== + //= deriving from multiple XInterface-derived classes - //===================================================================== + //= forwarding/merging XInterface funtionality - //===================================================================== + #define DECLARE_XINTERFACE( ) \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ virtual void SAL_CALL acquire() throw(); \ @@ -181,9 +181,9 @@ namespace comphelper return aReturn; \ } - //===================================================================== + //= forwarding/merging XTypeProvider funtionality - //===================================================================== + #define DECLARE_XTYPEPROVIDER( ) \ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -221,7 +221,7 @@ namespace comphelper \ IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) -//========================================================================= + /** ask for an iface of an aggregated object usage:<br/> @@ -266,9 +266,9 @@ namespace comphelper return false; } -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_UNO3_HXX diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx index 3679fddb2edb..6c76f9dcbde4 100644 --- a/include/comphelper/unwrapargs.hxx +++ b/include/comphelper/unwrapargs.hxx @@ -31,9 +31,9 @@ namespace comphelper { -// + // generating helper functions to unwrap the service's argument sequence: -// + /// @internal namespace detail { diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 734f91511d53..7ed2bb86eec1 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -27,14 +27,14 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> -//......................................................................... + namespace comphelper { -//......................................................................... - //===================================================================== + + //= OWeakListenerAdapterBase - //===================================================================== + /** (the base for) an adapter which allows to add as listener to a foreign component, without being held hard. @@ -84,9 +84,9 @@ namespace comphelper }; - //===================================================================== + //= OWeakListenerAdapter - //===================================================================== + template< class BROADCASTER, class LISTENER > /** yet another base for weak listener adapters, this time with some type safety @@ -125,9 +125,9 @@ namespace comphelper virtual void SAL_CALL disposing( ) = 0; }; - //===================================================================== + //= OWeakEventListenerAdapter - //===================================================================== + typedef OWeakListenerAdapter < ::com::sun::star::lang::XComponent , ::com::sun::star::lang::XEventListener > OWeakEventListenerAdapter_Base; @@ -149,10 +149,10 @@ namespace comphelper virtual void SAL_CALL disposing( ); }; - //===================================================================== + //= OWeakListenerAdapter - //===================================================================== - //--------------------------------------------------------------------- + + template< class BROADCASTER, class LISTENER > OWeakListenerAdapter< BROADCASTER, LISTENER >::OWeakListenerAdapter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener, @@ -163,7 +163,7 @@ namespace comphelper { } - //--------------------------------------------------------------------- + template< class BROADCASTER, class LISTENER > void SAL_CALL OWeakListenerAdapter< BROADCASTER, LISTENER >::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException) { @@ -172,9 +172,9 @@ namespace comphelper xListener->disposing( _rSource ); } -//......................................................................... + } // namespace comphelper -//......................................................................... + #endif // INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx index ec732b91a2fb..e578fb51bbb6 100644 --- a/include/connectivity/ConnectionWrapper.hxx +++ b/include/connectivity/ConnectionWrapper.hxx @@ -33,10 +33,10 @@ namespace connectivity { - //========================================================================== + //= OConnectionWrapper - wraps all methods to the real connection from the driver //= but when disposed it doesn't dispose the real connection - //========================================================================== + typedef ::cppu::ImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XUnoTunnel > OConnection_BASE; diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx index b2f2c7631e57..143f5326d90a 100644 --- a/include/connectivity/DriversConfig.hxx +++ b/include/connectivity/DriversConfig.hxx @@ -52,9 +52,9 @@ namespace connectivity const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; } }; - // + // Allows to access all driver which are located in the configuration - // + class OOO_DLLPUBLIC_DBTOOLS DriversConfig { typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode; diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 80512576b828..7e1ef9fd7c85 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -465,7 +465,7 @@ namespace connectivity }; typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef; - // ------------------------------------------------------------------------- + /// TSetBound is a unary_function to set the bound value with e.q. for_each call struct OOO_DLLPUBLIC_DBTOOLS TSetBound : ::std::unary_function<ORowSetValue,void> { @@ -475,7 +475,7 @@ namespace connectivity }; - // ------------------------------------------------------------------------- + /// TSetBound is a unary_function to set the bound value with e.q. for_each call struct OOO_DLLPUBLIC_DBTOOLS TSetRefBound : ::std::unary_function<ORowSetValueDecoratorRef,void> { @@ -485,9 +485,9 @@ namespace connectivity }; - // ---------------------------------------------------------------------------- + // Vector for file based rows - // ---------------------------------------------------------------------------- + template< class VectorVal > class ODeleteVector : public connectivity::ORowVector< VectorVal > { bool m_bDeleted; diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx index 0f7840caaea0..3b4001b9eb96 100644 --- a/include/connectivity/IParseContext.hxx +++ b/include/connectivity/IParseContext.hxx @@ -27,9 +27,9 @@ namespace connectivity { class OSQLParseNode; } namespace connectivity { - //========================================================================== + //= IParseContext - //========================================================================== + class IParseContext { public: diff --git a/include/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx index 265054c4d904..f57e0b09a51d 100644 --- a/include/connectivity/OSubComponent.hxx +++ b/include/connectivity/OSubComponent.hxx @@ -44,9 +44,9 @@ namespace connectivity ::cppu::OBroadcastHelper& rBHelper, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, ::com::sun::star::lang::XComponent* _pObject); - //************************************************************ + // OSubComponent - //************************************************************ + template <class SELF, class WEAK> class OSubComponent { protected: diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx index b1c33264ca85..e67c0dddcb21 100644 --- a/include/connectivity/ParameterCont.hxx +++ b/include/connectivity/ParameterCont.hxx @@ -25,9 +25,9 @@ namespace dbtools { -//==================================================================== + //= OParameterContinuation - //==================================================================== + class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation : public comphelper::OInteraction< ::com::sun::star::sdb::XInteractionSupplyParameters > { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aValues; diff --git a/include/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx index 2076285c635a..7472719328b1 100644 --- a/include/connectivity/SQLStatementHelper.hxx +++ b/include/connectivity/SQLStatementHelper.hxx @@ -22,7 +22,7 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//......................................................................... + namespace dbtools { class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper @@ -34,9 +34,9 @@ namespace dbtools ~ISQLStatementHelper() {} }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index 318d713dacac..716a444c31ab 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <connectivity/dbtoolsdllapi.hxx> -//......................................................................... + namespace dbtools { -//......................................................................... - //===================================================================== + + //= OAutoConnectionDisposer - //===================================================================== + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::sdbc::XRowSetListener > OAutoConnectionDisposer_Base; @@ -81,9 +81,9 @@ namespace dbtools sal_Bool isPropertyListening() const { return m_bPropertyListening; } }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index f3ff3c7f25b8..09ac780ff0d7 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -30,14 +30,14 @@ #include <rtl/ustring.hxx> #include <connectivity/dbtoolsdllapi.hxx> -//......................................................................... + namespace dbtools { -//......................................................................... - //========================================================================= + + //= OCharsetMap - //========================================================================= + /** is a class which translates between different charset representations. <p>The set of recognized charsets is very limited: only the ones which are database relevant are @@ -94,9 +94,9 @@ namespace dbtools virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; }; - //------------------------------------------------------------------------- + //- CharsetIteratorDerefHelper - //------------------------------------------------------------------------- + class OOO_DLLPUBLIC_DBTOOLS CharsetIteratorDerefHelper { friend class OCharsetMap::CharsetIterator; @@ -116,9 +116,9 @@ namespace dbtools }; - //------------------------------------------------------------------------- + //- OCharsetMap::CharsetIterator - //------------------------------------------------------------------------- + class OOO_DLLPUBLIC_DBTOOLS OCharsetMap::CharsetIterator { friend class OCharsetMap; @@ -155,9 +155,9 @@ namespace dbtools CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos ); }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_DBCHARSET_HXX diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 82345b1a00ae..887147b48048 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -64,10 +64,10 @@ namespace com } } -//......................................................................... + namespace dbtools { -//......................................................................... + class OOO_DLLPUBLIC_DBTOOLS DBTypeConversion { @@ -200,9 +200,9 @@ namespace dbtools SAL_THROW((::com::sun::star::sdbc::SQLException)); }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_DBCONVERSION_HXX diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 85f21488af5b..9882d7ef8492 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -42,22 +42,22 @@ namespace com } } } -//......................................................................... + namespace dbtools { -//......................................................................... -//============================================================================== + + //= Special exception if cancel is pressed in DBA UI -//============================================================================== + enum OOoBaseErrorCode { ParameterInteractionCancelled = 1 }; -//============================================================================== + //= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class -//============================================================================== + class OOO_DLLPUBLIC_DBTOOLS SQLExceptionInfo { @@ -148,9 +148,9 @@ protected: void implDetermineType(); }; -//============================================================================== + //= SQLExceptionIteratorHelper - iterating through an SQLException chain -//============================================================================== + class OOO_DLLPUBLIC_DBTOOLS SQLExceptionIteratorHelper { @@ -210,10 +210,10 @@ public: void next( SQLExceptionInfo& _out_rInfo ); }; -//================================================================================== + //= StandardExceptions -//================================================================================== -//---------------------------------------------------------------------------------- + + /** returns a standard error string for a given SQLState @param _eState @@ -223,7 +223,7 @@ public: */ OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState ); -//---------------------------------------------------------------------------------- + /** throws an exception with SQL state IM001, saying that a certain function is not supported */ OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( @@ -233,7 +233,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( ) throw ( ::com::sun::star::sdbc::SQLException ); -//---------------------------------------------------------------------------------- + /** throws a function sequence (HY010) exception */ OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException( @@ -242,7 +242,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException( ) throw ( ::com::sun::star::sdbc::SQLException ); -//---------------------------------------------------------------------------------- + /** throw a invalid index sqlexception */ OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException( @@ -251,7 +251,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException( ) throw ( ::com::sun::star::sdbc::SQLException ); -//---------------------------------------------------------------------------------- + /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( @@ -260,7 +260,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( ) throw (::com::sun::star::sdbc::SQLException); -//---------------------------------------------------------------------------------- + /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( @@ -270,7 +270,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( ) throw (::com::sun::star::sdbc::SQLException); -//---------------------------------------------------------------------------------- + /** throw a SQLException with SQLState HYC00 (Optional feature not implemented) @param _rFeatureName a description of the feature which is not implemented. It's recommended that the feature @@ -287,7 +287,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedException( ) throw (::com::sun::star::sdbc::SQLException); -//---------------------------------------------------------------------------------- + /** throw a SQLException with SQLState 42S22 (Column Not Found) @param _rColumnNameName The column that couldn't be found. @@ -300,7 +300,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidColumnException( ) throw (::com::sun::star::sdbc::SQLException); -//---------------------------------------------------------------------------------- + /** throws an SQLException */ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( @@ -312,7 +312,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( ) throw (::com::sun::star::sdbc::SQLException); -//---------------------------------------------------------------------------------- + /** throws an SQLException */ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( @@ -324,9 +324,9 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( ) throw (::com::sun::star::sdbc::SQLException); -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index eb477508b2c5..b1825c8a93d3 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -26,14 +26,14 @@ #include <memory> #include <connectivity/dbtoolsdllapi.hxx> -//........................................................................ + namespace dbtools { -//........................................................................ - //==================================================================== + + //= DatabaseMetaData - //==================================================================== + struct DatabaseMetaData_Impl; /** encapsulates meta data about a database/connection which cannot be obtained from the usual XDatabaseMetaData result set. @@ -179,9 +179,9 @@ namespace dbtools bool supportsThreads() const; }; -//........................................................................ + } // namespace dbtools -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_DBMETADATA_HXX diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index d7fd0f5f89ff..531a4b5d8a09 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -74,7 +74,7 @@ namespace task { } } } -//......................................................................... + namespace dbtools { class ISQLStatementHelper; @@ -89,7 +89,7 @@ namespace dbtools eInPrivilegeDefinitions, eComplete }; -//========================================================================= + // date conversion // calculates the default numberformat for a given datatype and a give language @@ -108,7 +108,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes, const ::com::sun::star::lang::Locale& _rLocale); -//========================================================================= + /** creates a connection which can be used for the rowset given @@ -446,7 +446,7 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); - //---------------------------------------------------------------------------------- + /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules */ OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, @@ -477,7 +477,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ); - //---------------------------------------------------------------------------------- + /** compose the table name out of the property set which must support the properties from the service <member scope= "com::sun::star::sdbcx">table</member> @param _xMetaData The metadata from the connection. @@ -492,7 +492,7 @@ namespace dbtools bool _bSuppressSchemaName, bool _bQuote); - //---------------------------------------------------------------------------------- + OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, sal_Int32 _nDataType); // return the datasource for the given datasource name @@ -791,9 +791,9 @@ namespace dbtools OUStringBuffer& _out_rSQLPredicate ); -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_DBTOOLS_HXX diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 7c9b9640e49d..2753d950eb1f 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -28,14 +28,14 @@ #include <vector> #include <connectivity/dbtoolsdllapi.hxx> -//........................................................................ + namespace dbtools { -//........................................................................ - //==================================================================== + + //= FilterManager - //==================================================================== + /** manages the filter of a database component with filter properties The idea is that the filter which a database component actually really uses is composed of several single @@ -109,9 +109,9 @@ namespace dbtools } }; -//........................................................................ + } // namespacefrm -//........................................................................ + #endif // CONNECTIVITY_FORMFILTERMANAGER_HXX diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 2da03f8aa96f..85f7ec5f0d83 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -32,15 +32,15 @@ #include <memory> #include <connectivity/dbtoolsdllapi.hxx> -//........................................................................ + namespace dbtools { -//........................................................................ + struct FormattedColumnValue_Data; - //==================================================================== + //= FormattedColumnValue - //==================================================================== + /** a class which helps retrieving and setting the value of a database column as formatted string. */ @@ -100,9 +100,9 @@ namespace dbtools ::std::auto_ptr< FormattedColumnValue_Data > m_pData; }; -//........................................................................ + } // namespace dbtools -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx index 35a06342a487..b0d3ead82752 100644 --- a/include/connectivity/internalnode.hxx +++ b/include/connectivity/internalnode.hxx @@ -24,9 +24,9 @@ namespace connectivity { - //========================================================================== + //= OSQLInternalNode - //========================================================================== + /** special node for avoiding memory leaks */ class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode : public OSQLParseNode diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 2224750e7786..7b63a029897b 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -38,17 +38,17 @@ #include <comphelper/implementationreference.hxx> #include <cppuhelper/interfacecontainer.hxx> -//........................................................................ + namespace dbtools { -//........................................................................ + typedef ::utl::SharedUNOComponent< ::com::sun::star::sdb::XSingleSelectQueryComposer, ::utl::DisposableComponent > SharedQueryComposer; - //==================================================================== + //= ParameterManager - //==================================================================== + class FilterManager; class OOO_DLLPUBLIC_DBTOOLS ParameterManager { @@ -408,9 +408,9 @@ namespace dbtools ParameterManager& operator=( const ParameterManager& ); // never implemented }; -//........................................................................ + } // namespacefrm -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_PARAMETERS_HXX diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index d5fc3ccbddfd..ba2e7fc47f78 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -37,16 +37,16 @@ #include <memory> #include <vector> -//........................................................................ + namespace dbtools { namespace param { -//........................................................................ - //==================================================================== + + //= ParameterWrapper - //==================================================================== + /** wraps a parameter column as got from an SQLQueryComposer, so that it has an additional property "Value", which is forwarded to an XParameters interface */ @@ -117,14 +117,14 @@ namespace param ParameterWrapper(); // not implemented }; - //==================================================================== + //= ParameterWrapper - //==================================================================== + typedef ::std::vector< ::rtl::Reference< ParameterWrapper > > Parameters; - //==================================================================== + //= ParameterWrapperContainer - //==================================================================== + typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::container::XEnumerationAccess > ParameterWrapperContainer_Base; @@ -186,14 +186,14 @@ namespace param void impl_checkDisposed_throw(); }; - //==================================================================== + //= ParametersContainer - //==================================================================== + typedef ::rtl::Reference< ParameterWrapperContainer > ParametersContainerRef; -//........................................................................ + } } // namespace dbtools::param -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx index 4687f170f8e4..6c0829915794 100644 --- a/include/connectivity/predicateinput.hxx +++ b/include/connectivity/predicateinput.hxx @@ -28,14 +28,14 @@ #include <connectivity/sqlparse.hxx> #include <connectivity/dbtoolsdllapi.hxx> -//......................................................................... + namespace dbtools { -//......................................................................... - //===================================================================== + + //= OPredicateInputController - //===================================================================== + /** A class which allows input of an SQL predicate for a row set column into a edit field. */ @@ -116,9 +116,9 @@ namespace dbtools OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const; }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 76433bc94355..ae7f635848ca 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -85,9 +85,9 @@ namespace connectivity virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0; virtual sal_Bool isCaseSensitive() const = 0; }; - //************************************************************ + // OCollection - //************************************************************ + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCollection : public OCollectionBase { diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index 418f1e38a04f..2e7cb64e9504 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -32,9 +32,9 @@ namespace connectivity { namespace sdbcx { - // ========================================================================= + // = ODescriptor - // ========================================================================= + typedef ::comphelper::OPropertyContainer ODescriptor_PBASE; class OOO_DLLPUBLIC_DBTOOLS ODescriptor :public ODescriptor_PBASE diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx index 60f4bffb5492..f381cc7e0c21 100644 --- a/include/connectivity/sqlerror.hxx +++ b/include/connectivity/sqlerror.hxx @@ -27,14 +27,14 @@ #include <boost/optional.hpp> #include <connectivity/dbtoolsdllapi.hxx> -//........................................................................ + namespace connectivity { -//........................................................................ - //==================================================================== + + //= ErrorCondition - //==================================================================== + /** the type of error codes to be used in SQLExceptions @see com::sun::star::sdbc::SQLException::ErrorCode @@ -45,9 +45,9 @@ namespace connectivity */ typedef ::sal_Int32 ErrorCondition; - //==================================================================== + //= SQLError - //==================================================================== + class SQLError_Impl; /** a class which provides helpers for working with SQLErrors @@ -62,9 +62,9 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS SQLError { public: - // -------------------------------------------------------------------- + // - optional - // -------------------------------------------------------------------- + /** convenience wrapper around boost::optional, allowing implicit construction */ class ParamValue : public ::boost::optional< OUString > @@ -308,9 +308,9 @@ namespace connectivity ::boost::shared_ptr< SQLError_Impl > m_pImpl; }; -//........................................................................ + } // namespace connectivity -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_SQLERROR_HXX diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index edbf754214ca..9713135806b4 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -71,9 +71,9 @@ namespace connectivity SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT}; typedef ::std::set< OUString > QueryNameSet; - //================================================================== + //= SQLParseNodeParameter - //================================================================== + struct OOO_DLLPUBLIC_DBTOOLS SQLParseNodeParameter { const ::com::sun::star::lang::Locale& rLocale; @@ -107,9 +107,9 @@ namespace connectivity ~SQLParseNodeParameter(); }; - //========================================================================== + //= OSQLParseNode - //========================================================================== + class OOO_DLLPUBLIC_DBTOOLS OSQLParseNode { friend class OSQLParser; @@ -441,7 +441,7 @@ namespace connectivity void parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; }; - //----------------------------------------------------------------------------- + inline OSQLParseNode* OSQLParseNode::getChild(sal_uInt32 nPos) const { OSL_ENSURE(nPos < m_aChildren.size(), "Invalid Position"); diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 9ad1c322bf1c..10fd1f957dd2 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -66,9 +66,9 @@ namespace connectivity class OSQLScanner; class SQLError; - //========================================================================== + //= OParseContext - //========================================================================== + class OOO_DLLPUBLIC_DBTOOLS OParseContext : public IParseContext { public: @@ -93,10 +93,10 @@ namespace connectivity virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const; }; - //========================================================================== + // OSQLParseNodesContainer // grabage collection of nodes - //========================================================================== + class OSQLParseNodesContainer { ::osl::Mutex m_aMutex; @@ -113,9 +113,9 @@ namespace connectivity typedef salhelper::SingletonRef<OSQLParseNodesContainer> OSQLParseNodesGarbageCollector; - //========================================================================== + //= OSQLParser - //========================================================================== + struct OSQLParser_Data { ::com::sun::star::lang::Locale aLocale; diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 459a137faf8f..72c2070a051a 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -25,9 +25,9 @@ namespace connectivity { - //========================================================================== + //= OSQLScanner - //========================================================================== + /** Scanner for SQL92 */ class OOO_DLLPUBLIC_DBTOOLS OSQLScanner diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx index 757a98cb6583..34420d85aaf2 100644 --- a/include/connectivity/standardsqlstate.hxx +++ b/include/connectivity/standardsqlstate.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX #define INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX -//......................................................................... + namespace dbtools { -//......................................................................... - //---------------------------------------------------------------------------------- + + /** standard SQLStates to be used with an SQLException Extend this list whenever you need a new state ... @@ -59,9 +59,9 @@ namespace dbtools SQL_ERROR_UNSPECIFIED = SAL_MAX_ENUM // special value indicating that an SQLState is not to be specified }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index 10513ca35d28..2d22cbec5f1c 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -28,14 +28,14 @@ #include <memory> #include <connectivity/dbtoolsdllapi.hxx> -//........................................................................ + namespace dbtools { -//........................................................................ - //==================================================================== + + //= StatementComposer - //==================================================================== + struct StatementComposer_Data; /** a class which is able to compose queries (SELECT statements) from a command and a command type */ @@ -93,9 +93,9 @@ namespace dbtools StatementComposer(); // not implemented }; -//........................................................................ + } // namespace dbtools -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx index 73b48f07e65c..5eb73a08d3de 100644 --- a/include/connectivity/virtualdbtools.hxx +++ b/include/connectivity/virtualdbtools.hxx @@ -31,9 +31,9 @@ #include <memory> #include <connectivity/dbtoolsdllapi.hxx> -//======================================================================== + //= forward declarations -//======================================================================== + namespace com { namespace sun { namespace star { @@ -76,9 +76,9 @@ namespace dbtools { class FormattedColumnValue; } -//======================================================================== + //= entry into this library -//======================================================================== + /** this is the entry point for the load-on-call usage of the DBTOOLS library. <p>When you need one of the simple objects in this library, load the lib @@ -90,25 +90,25 @@ namespace dbtools { */ extern "C" OOO_DLLPUBLIC_DBTOOLS void* SAL_CALL createDataAccessToolsFactory(); -//======================================================================== + //= -//======================================================================== -//........................................................................ + + namespace connectivity { -//........................................................................ + class IParseContext; - //.................................................................... + namespace simple { - //.................................................................... + typedef void* (SAL_CALL * createDataAccessToolsFactoryFunction)( ); - //================================================================ + //= IDataAccessTools - //================================================================ + class OOO_DLLPUBLIC_DBTOOLS IDataAccessTools : public ::rtl::IReference { public: @@ -221,9 +221,9 @@ namespace connectivity ~IDataAccessTools() {} }; - //================================================================ + //= IDataAccessCharSet - //================================================================ + /** simple wrapper for the OCharsetMap */ class OOO_DLLPUBLIC_DBTOOLS IDataAccessCharSet : @@ -242,9 +242,9 @@ namespace connectivity ~IDataAccessCharSet() {} }; - //================================================================ + //= IDataAccessTypeConversion - //================================================================ + class OOO_DLLPUBLIC_DBTOOLS IDataAccessTypeConversion : public ::rtl::IReference { @@ -273,9 +273,9 @@ namespace connectivity ~IDataAccessTypeConversion() {} }; - //================================================================ + //= ISQLParseNode - //================================================================ + /** a simple version of the OSQLParseNode, with all methods beeing virtual */ class OOO_DLLPUBLIC_DBTOOLS ISQLParseNode : public ::rtl::IReference @@ -300,9 +300,9 @@ namespace connectivity ~ISQLParseNode() {} }; - //================================================================ + //= ISQLParser - //================================================================ + /** a simple version of the OSQLParser, with all methods beeing virtual */ class OOO_DLLPUBLIC_DBTOOLS ISQLParser : public ::rtl::IReference @@ -321,9 +321,9 @@ namespace connectivity ~ISQLParser() {} }; - //================================================================ + //= IDataAccessToolsFactory - //================================================================ + /** the main factory for runtime-loadable tools in the DBTOOLS library */ class OOO_DLLPUBLIC_DBTOOLS IDataAccessToolsFactory : @@ -355,13 +355,13 @@ namespace connectivity ~IDataAccessToolsFactory() {} }; - //.................................................................... + } // namespace simple - //.................................................................... -//........................................................................ + + } // namespace connectivity -//........................................................................ + #endif // INCLUDED_CONNECTIVITY_VIRTUALDBTOOLS_HXX diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx index b40ace99d30a..89cf6086b1e7 100644 --- a/include/connectivity/warningscontainer.hxx +++ b/include/connectivity/warningscontainer.hxx @@ -25,14 +25,14 @@ #include <connectivity/dbtoolsdllapi.hxx> -//......................................................................... + namespace dbtools { -//......................................................................... - //===================================================================== + + //= IWarningsContainer - //===================================================================== + class SAL_NO_VTABLE IWarningsContainer { public: @@ -44,9 +44,9 @@ namespace dbtools ~IWarningsContainer() {} }; - //==================================================================== + //= WarningsContainer - //==================================================================== + /** helper class for implementing XWarningsSupplier, which mixes own warnings with warnings obtained from an external instance */ @@ -93,9 +93,9 @@ namespace dbtools void SAL_CALL clearWarnings( ); }; -//......................................................................... + } // namespace dbtools -//......................................................................... + #endif // INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index 60fabb44e7dc..bde35a7cfcc2 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <cppuhelper/cppuhelperdllapi.h> -//################################################################################################## + #define COMPONENT_GETENV "component_getImplementationEnvironment" #define COMPONENT_GETENVEXT "component_getImplementationEnvironmentExt" @@ -112,7 +112,7 @@ typedef sal_Bool (SAL_CALL * component_writeInfoFunc)( typedef void * (SAL_CALL * component_getFactoryFunc)( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); -//################################################################################################## + namespace cppu { diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index bc8be9aa56ab..4c6b8fca2741 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -142,11 +142,11 @@ struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(()); } -// + // settle down beavis, here comes the macro template hell :] -// -//================================================================================================== + + #if defined _MSC_VER // public -> protected changes mangled names there #define CPPUHELPER_DETAIL_IMPLHELPER_PROTECTED public @@ -281,7 +281,7 @@ ClassData##N WeakAggImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 2 ); */ #define __DEF_IMPLHELPER_POST_C( N ) \ } -//================================================================================================== + /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE */ #define __DEF_IMPLHELPER_POST( N ) \ diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index dd3f6a9fc73d..fade8bb52517 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -47,7 +47,7 @@ namespace detail { } -//=================================================================== + class OInterfaceContainerHelper; /** This is the iterator of a InterfaceContainerHelper. Typically @@ -107,7 +107,7 @@ private: OInterfaceIteratorHelper & operator = ( const OInterfaceIteratorHelper & ) SAL_THROW(()); }; -//=================================================================== + /** A container of interfaces. To access the elements use an iterator. This implementation is thread save. @@ -289,7 +289,7 @@ inline void OInterfaceContainerHelper::notifyEach( void ( SAL_CALL ListenerT::*N forEach< ListenerT, NotifySingleListener< ListenerT, EventT > >( NotifySingleListener< ListenerT, EventT >( NotificationMethod, Event ) ); } -//=================================================================== + /** A helper class to store interface references of different types. diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx index 70c457d2b0ce..88f340b60c41 100644 --- a/include/cppuhelper/interfacecontainer.hxx +++ b/include/cppuhelper/interfacecontainer.hxx @@ -33,7 +33,7 @@ inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::OMul m_pMap = new InterfaceMap; } -//=================================================================== + template< class key , class hashImpl , class equalImpl > inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::~OMultiTypeInterfaceContainerHelperVar() SAL_THROW(()) @@ -50,7 +50,7 @@ inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::~OMu delete m_pMap; } -//=================================================================== + template< class key , class hashImpl , class equalImpl > inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainedTypes() const SAL_THROW(()) @@ -83,7 +83,7 @@ inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelper return ::com::sun::star::uno::Sequence<key>(); } -//=================================================================== + template< class key , class hashImpl , class equalImpl > OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainer( const key & rKey ) const SAL_THROW(()) @@ -96,7 +96,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImp return 0; } -//=================================================================== + template< class key , class hashImpl , class equalImpl > sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface( const key & rKey, @@ -115,7 +115,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::a return ((OInterfaceContainerHelper*)(*iter).second)->addInterface( rListener ); } -//=================================================================== + template< class key , class hashImpl , class equalImpl > inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface( const key & rKey, @@ -134,7 +134,7 @@ inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalIm return 0; } -//=================================================================== + template< class key , class hashImpl , class equalImpl > void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) @@ -172,7 +172,7 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos delete [] ppListenerContainers; } -//=================================================================== + template< class key , class hashImpl , class equalImpl > void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear() SAL_THROW(()) { diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index 2581f4b77c32..acbe6cdd4140 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -207,7 +207,7 @@ private: }; -//----------------------------------------------------------------------------- + // helper defines needed for an interface container with a 32 bit key values struct equalInt32_Impl @@ -730,7 +730,7 @@ protected: }; } // end namespace cppuhelper -#endif // +#endif diff --git a/include/dbaccess/AsyncronousLink.hxx b/include/dbaccess/AsyncronousLink.hxx index 96c96f6f278c..2a1cfc06a4f2 100644 --- a/include/dbaccess/AsyncronousLink.hxx +++ b/include/dbaccess/AsyncronousLink.hxx @@ -25,9 +25,9 @@ namespace dbaui { - // ========================================================================= + // a helper for multi-threaded handling of async events - // ------------------------------------------------------------------------- + /** handles asynchronous links which may be called in multi-threaded environments If you use an instance of this class as member of your own class, it will handle several crucial points for you (for instance the case that somebody posts the diff --git a/include/dbaccess/controllerframe.hxx b/include/dbaccess/controllerframe.hxx index 0990865fac25..e39c63251586 100644 --- a/include/dbaccess/controllerframe.hxx +++ b/include/dbaccess/controllerframe.hxx @@ -25,16 +25,16 @@ #include <memory> -//........................................................................ + namespace dbaui { -//........................................................................ + class IController; - //==================================================================== + //= ControllerFrame - //==================================================================== + struct ControllerFrame_Data; /** helper class to ancapsulate the frame which a controller is plugged into, doing some common actions on it. @@ -67,9 +67,9 @@ namespace dbaui ::std::auto_ptr< ControllerFrame_Data > m_pData; }; -//........................................................................ + } // namespace dbaui -//........................................................................ + #endif // INCLUDED_DBACCESS_CONTROLLERFRAME_HXX diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx index 7bdb450169e1..01e5417045af 100644 --- a/include/dbaccess/dbaundomanager.hxx +++ b/include/dbaccess/dbaundomanager.hxx @@ -30,14 +30,14 @@ class SfxUndoManager; -//...................................................................................................................... + namespace dbaui { -//...................................................................................................................... - //================================================================================================================== + + //= UndoManager - //================================================================================================================== + struct UndoManager_Impl; typedef ::cppu::ImplHelper1< ::com::sun::star::document::XUndoManager > UndoManager_Base; class DBACCESS_DLLPUBLIC UndoManager : public UndoManager_Base @@ -87,9 +87,9 @@ namespace dbaui ::boost::scoped_ptr< UndoManager_Impl > m_pImpl; }; -//...................................................................................................................... + } // namespace dbaui -//...................................................................................................................... + #endif // INCLUDED_DBACCESS_DBAUNDOMANAGER_HXX diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 4c093d693686..6ffa59a62f07 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -37,14 +37,14 @@ #include <memory> -//........................................................................ + namespace dbaui { -//........................................................................ - //==================================================================== + + //= DBSubComponentController - //==================================================================== + class DBSubComponentController; typedef ::cppu::ImplInheritanceHelper2 < OGenericUnoController @@ -82,7 +82,7 @@ namespace dbaui sal_Bool isEditable() const; void setEditable(sal_Bool _bEditable); - // ---------------------------------------------------------------- + // asking for connection-related stuff sal_Bool isConnected() const; @@ -90,7 +90,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > getMetaData( ) const; - // ---------------------------------------------------------------- + // access to the data source / document OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& @@ -195,9 +195,9 @@ namespace dbaui DBSubComponentController(); // never implemented }; -//........................................................................ + } // namespace dbaui -//........................................................................ + #endif // INCLUDED_DBACCESS_DBSUBCOMPONENTCONTROLLER_HXX diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 526719fe2620..1694da644127 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -70,9 +70,9 @@ namespace dbaui { class ODataView; - // ==================================================================== + // = optional - // ==================================================================== + /** convenience wrapper around boost::optional, allowing typed assignments */ template < typename T > @@ -113,9 +113,9 @@ namespace dbaui return !!_value; } - // ==================================================================== + // = FeatureState - // ==================================================================== + /** describes the state of a feature In opposite to the FeatureStateEvent in css.frame, this one allows for multiple states to be specified at once. @@ -134,33 +134,33 @@ namespace dbaui FeatureState() : bEnabled(sal_False) { } }; - // ==================================================================== + // = helper - // ==================================================================== - // .................................................................... + + struct ControllerFeature : public ::com::sun::star::frame::DispatchInformation { sal_uInt16 nFeatureId; }; - // .................................................................... + typedef ::std::map < OUString , ControllerFeature , ::std::less< OUString > > SupportedFeatures; - // .................................................................... + struct CompareFeatureById : ::std::binary_function< SupportedFeatures::value_type, sal_Int32, bool > { - // ................................................................ + inline bool operator()( const SupportedFeatures::value_type& _aType, const sal_Int32& _nId ) const { return !!( _nId == _aType.second.nFeatureId ); } }; - // .................................................................... + struct FeatureListener { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > @@ -169,20 +169,20 @@ namespace dbaui sal_Bool bForceBroadcast; }; - // .................................................................... + typedef ::std::deque< FeatureListener > FeatureListeners; - // .................................................................... + struct FindFeatureListener : ::std::binary_function< FeatureListener, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >, bool > { - // ................................................................ + inline bool operator()( const FeatureListener& lhs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& rhs ) const { return !!( lhs.xListener == rhs ); } }; - // .................................................................... + typedef ::comphelper::SharedMutexBase OGenericUnoController_MBASE; typedef ::cppu::WeakComponentImplHelper11 < ::com::sun::star::frame::XDispatch @@ -199,7 +199,7 @@ namespace dbaui > OGenericUnoController_Base; struct OGenericUnoController_Data; - // ==================================================================== + class DBACCESS_DLLPUBLIC OGenericUnoController :public OGenericUnoController_MBASE ,public OGenericUnoController_Base @@ -219,7 +219,7 @@ namespace dbaui #endif protected: - // ---------------------------------------------------------------- + // attributes struct DispatchTarget { @@ -257,12 +257,12 @@ namespace dbaui - // ---------------------------------------------------------------- + // attribute access ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } - // ---------------------------------------------------------------- + // methods OGenericUnoController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM ); const ::comphelper::NamedValueCollection& diff --git a/include/default.rc b/include/default.rc index 3af09c07e46d..782baab0bc22 100644 --- a/include/default.rc +++ b/include/default.rc @@ -19,9 +19,9 @@ #include <windows.h> #include "version.hrc" -// ----------------------------------------------------------------------- + // version information -// ----------------------------------------------------------------------- + VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index 08ee95090f6c..ef46e4c841f1 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -24,13 +24,13 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { namespace animation { - ////////////////////////////////////////////////////////////////////////////// + class DRAWINGLAYER_DLLPUBLIC AnimationEntry { @@ -49,7 +49,7 @@ namespace drawinglayer virtual double getNextEventTime(double fTime) const = 0; }; - ////////////////////////////////////////////////////////////////////////////// + class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { @@ -68,7 +68,7 @@ namespace drawinglayer virtual double getNextEventTime(double fTime) const; }; - ////////////////////////////////////////////////////////////////////////////// + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { @@ -89,7 +89,7 @@ namespace drawinglayer virtual double getNextEventTime(double fTime) const; }; - ////////////////////////////////////////////////////////////////////////////// + class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { @@ -112,7 +112,7 @@ namespace drawinglayer virtual double getNextEventTime(double fTime) const; }; - ////////////////////////////////////////////////////////////////////////////// + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList { @@ -130,11 +130,11 @@ namespace drawinglayer virtual double getNextEventTime(double fTime) const; }; - ////////////////////////////////////////////////////////////////////////////// + } // end of namespace animation } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX diff --git a/include/drawinglayer/attribute/fillbitmapattribute.hxx b/include/drawinglayer/attribute/fillbitmapattribute.hxx index 851dc5ed0697..cebcca818e4d 100644 --- a/include/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/include/drawinglayer/attribute/fillbitmapattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class BitmapEx; @@ -37,7 +37,7 @@ namespace drawinglayer { namespace attribute { class ImpFillBitmapAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -77,7 +77,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index e791193651a0..454e633cf46b 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -51,7 +51,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -100,7 +100,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx index 55a8d8933f7d..9d9dbd635c32 100644 --- a/include/drawinglayer/attribute/fillgraphicattribute.hxx +++ b/< |