diff options
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/include/drawinglayer/attribute/fillgraphicattribute.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class Graphic; @@ -35,7 +35,7 @@ namespace drawinglayer { namespace attribute { class ImpFillGraphicAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -78,7 +78,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx index 30e054085815..aee4a2d233ac 100644 --- a/include/drawinglayer/attribute/fillhatchattribute.hxx +++ b/include/drawinglayer/attribute/fillhatchattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -48,7 +48,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -105,7 +105,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx index dda163f61519..001aa0b20a28 100644 --- a/include/drawinglayer/attribute/fontattribute.hxx +++ b/include/drawinglayer/attribute/fontattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace rtl { @@ -34,7 +34,7 @@ namespace drawinglayer { namespace attribute { class ImpFontAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -93,7 +93,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 58eb987714e3..7f65e8f6470b 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/drawing/LineCap.hpp> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -37,7 +37,7 @@ namespace drawinglayer { namespace attribute { class ImpLineAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -78,7 +78,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx index e02d3565aaf7..399e6c2fc08f 100644 --- a/include/drawinglayer/attribute/linestartendattribute.hxx +++ b/include/drawinglayer/attribute/linestartendattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -34,7 +34,7 @@ namespace drawinglayer { namespace attribute { class ImpLineStartEndAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx index 9c4d34dce155..69dfbc6e4f1a 100644 --- a/include/drawinglayer/attribute/materialattribute3d.hxx +++ b/include/drawinglayer/attribute/materialattribute3d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace attribute { @@ -34,7 +34,7 @@ namespace basegfx { class BColor; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -78,7 +78,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx index abd46bf273fe..8bb1d6659ae9 100644 --- a/include/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx @@ -28,10 +28,10 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -69,7 +69,7 @@ namespace drawinglayer } // end of namespace overlay } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx index a0dee88030bc..fa70f82d5845 100644 --- a/include/drawinglayer/attribute/sdrfillattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -37,7 +37,7 @@ namespace drawinglayer { namespace attribute { class SdrFillGraphicAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -80,7 +80,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx index 67aacd4b6846..d57b710c73ec 100644 --- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class Graphic; @@ -37,7 +37,7 @@ namespace drawinglayer { namespace attribute { class ImpSdrFillGraphicAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -91,7 +91,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLGRAPHICATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx index f9e35798cd3e..a05343cac680 100644 --- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -35,7 +35,7 @@ namespace drawinglayer { namespace attribute { class ImpSdr3DLightAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx index 0c3bb96b9f70..48e9cd710786 100644 --- a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -25,7 +25,7 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -38,7 +38,7 @@ namespace drawinglayer { namespace attribute { class Sdr3DLightAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -80,7 +80,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx index bedbd9f29bb9..3b3789426a81 100644 --- a/include/drawinglayer/attribute/sdrlineattribute.hxx +++ b/include/drawinglayer/attribute/sdrlineattribute.hxx @@ -26,7 +26,7 @@ #include <o3tl/cow_wrapper.hxx> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -37,7 +37,7 @@ namespace drawinglayer { namespace attribute { class ImpSdrLineAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -84,7 +84,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx index 19c1a5147db0..548751ce2c69 100644 --- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -34,7 +34,7 @@ namespace drawinglayer { namespace attribute { class ImpSdrLineStartEndAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -83,7 +83,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx index 860093a67666..872823505de7 100644 --- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/drawing/TextureMode.hpp> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace attribute { @@ -36,7 +36,7 @@ namespace drawinglayer { namespace attribute { class MaterialAttribute3D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -92,7 +92,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx index 61d4d8a67378..8ab2b01e4684 100644 --- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/drawing/ShadeMode.hpp> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace attribute { class ImpSdrSceneAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -75,7 +75,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx index ee1f36292505..d3b0d0ce988f 100644 --- a/include/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -35,7 +35,7 @@ namespace drawinglayer { namespace attribute { class ImpSdrShadowAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx index 6d4cea978482..83be2d6c0851 100644 --- a/include/drawinglayer/attribute/strokeattribute.hxx +++ b/include/drawinglayer/attribute/strokeattribute.hxx @@ -24,14 +24,14 @@ #include <o3tl/cow_wrapper.hxx> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace attribute { class ImpStrokeAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -68,7 +68,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 4268e26c03de..eca24c9c92d4 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace geometry { @@ -40,7 +40,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -171,7 +171,7 @@ namespace drawinglayer } // end of namespace geometry } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index 8ad8c3ec8882..c2105b4ae000 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <o3tl/cow_wrapper.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace geometry { @@ -38,7 +38,7 @@ namespace basegfx { class B3DHomMatrix; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -165,7 +165,7 @@ namespace drawinglayer } // end of namespace geometry } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 4d0358d06555..371b07bbac2d 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -26,13 +26,13 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace animation { class AnimationEntry; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -96,7 +96,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -127,7 +127,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -164,7 +164,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 1111cb3fcfa1..3cffeaafb69e 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + // BackgroundColorPrimitive2D class namespace drawinglayer @@ -79,7 +79,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 4361158b96f7..74ba4034fc67 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -28,7 +28,7 @@ #include <comphelper/broadcasthelper.hxx> #include <basegfx/range/b2drange.hxx> -////////////////////////////////////////////////////////////////////////////// + /** defines for DeclPrimitive2DIDBlock and ImplPrimitive2DIDBlock Added to be able to simply change identification stuff later, e.g. add a identification string and/or ID to the interface and to the implementation @@ -41,7 +41,7 @@ #define ImplPrimitive2DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive2DID() const { return TheID; } -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace geometry { @@ -55,7 +55,7 @@ namespace drawinglayer { namespace primitive2d { typedef ::com::sun::star::uno::Sequence< Primitive2DReference > Primitive2DSequence; }} -////////////////////////////////////////////////////////////////////////////// + // basePrimitive2D class namespace drawinglayer @@ -167,9 +167,9 @@ namespace drawinglayer /// The default implementation will return an empty sequence virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; - // + // Methods from XPrimitive2D - // + /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It will construct a ViewInformation2D from the ViewParameters for that purpose @@ -184,7 +184,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // BufferedDecompositionPrimitive2D class namespace drawinglayer @@ -255,7 +255,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // tooling namespace drawinglayer @@ -289,7 +289,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index de5b4245b70a..922c479a638a 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -26,7 +26,7 @@ #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // BitmapPrimitive2D class namespace drawinglayer @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 9726dcd6dd03..5650ee09cf0e 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/table/BorderLineStyle.hpp> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -142,7 +142,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index ea7622d721dd..e93a65bbf296 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -106,7 +106,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index a0d5279449f7..969bb86b8c5b 100644 --- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -95,7 +95,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CROPPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 5f5d5a5abc63..2cfcd9ad5870 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + // DiscreteBitmapPrimitive2D class namespace drawinglayer @@ -71,7 +71,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index 98ab5193e535..b7f94cd58fb5 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -26,7 +26,7 @@ #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // DiscreteShadowPrimitive2D class namespace drawinglayer @@ -114,7 +114,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETESHADOWPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx index b1fedbb17a94..68357caeedeb 100644 --- a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx +++ b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX -////////////////////////////////////////////////////////////////////////////// + // define ranges for other libraries #define PRIMITIVE2D_ID_RANGE_DRAWINGLAYER (0 << 16) @@ -29,7 +29,7 @@ #define PRIMITIVE2D_ID_RANGE_SW (3 << 16) #define PRIMITIVE2D_ID_RANGE_SC (4 << 16) -////////////////////////////////////////////////////////////////////////////// + // local primitives #define PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 0) @@ -104,7 +104,7 @@ #define PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 69) #define PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 70) -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index d8ffc3fd3754..55a5e44f22f6 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -27,7 +27,7 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // Embedded3DPrimitive2D class namespace drawinglayer @@ -115,7 +115,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index c5cce187d574..d3b88daca498 100644 --- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -27,7 +27,7 @@ #include <vcl/gfxlink.hxx> #include <vcl/gdimtf.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index b6ffc8df762f..4367e17556c1 100644 --- a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // FillbitmapPrimitive2D class namespace drawinglayer @@ -81,7 +81,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index a15e4547bcda..690028b3b38a 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -26,12 +26,12 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <drawinglayer/texture/texture.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { class B2DPolygon; } -////////////////////////////////////////////////////////////////////////////// + // FillGradientPrimitive2D class namespace drawinglayer @@ -103,7 +103,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index 17b8c5c6cac3..d5e6bb765a89 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -25,7 +25,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // FillbitmapPrimitive2D class namespace drawinglayer @@ -80,7 +80,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRAPHICPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 92641751ecc5..78454281ef51 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -27,7 +27,7 @@ #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + // FillHatchPrimitive2D class namespace drawinglayer @@ -91,7 +91,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index 27fa8ffea63d..f87ab2441e43 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svtools/grfmgr.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -91,7 +91,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx index 00e11b3c412e..7234f7c68deb 100644 --- a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx @@ -23,12 +23,12 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svtools/grfmgr.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class Graphic; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -64,7 +64,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVEHELPER2D_HXX diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 497b91bb8aa0..0ff6a44198bc 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -27,7 +27,7 @@ #include <basegfx/color/bcolor.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + // GridPrimitive2D class namespace drawinglayer @@ -112,7 +112,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index 283dc6762c40..a4b1680b36fe 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // GroupPrimitive2D class namespace drawinglayer @@ -88,7 +88,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index 71980a0bbb88..6e4b9afe56c5 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // HelplinePrimitive2D class namespace drawinglayer @@ -107,7 +107,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index 5f6548a0965e..d9ad23dd937e 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -57,7 +57,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx index 48af97a5d042..0e9dbe0ddcba 100644 --- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -52,7 +52,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 8009f3a416f6..1862b0ef89d5 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/color/bcolor.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + // MarkerArrayPrimitive2D class namespace drawinglayer @@ -81,7 +81,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 9a707c9676a2..ba988a6c974d 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -72,7 +72,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index d8ddd9e338ac..56b348437b29 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -27,7 +27,7 @@ #include <basegfx/color/bcolor.hxx> #include <vcl/graph.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -90,7 +90,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index 03f1b2ed8bd3..726b6b24f9bc 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gdimtf.hxx> -////////////////////////////////////////////////////////////////////////////// + // MetafilePrimitive2D class namespace drawinglayer @@ -87,7 +87,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index 6f68a89fcbc5..761feb907b57 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -27,7 +27,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/color/bcolormodifier.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 374f632e4fb7..79f9213406b3 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <rtl/ustring.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -66,11 +66,11 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OBJECTINFOPRIMITIVE2D_HXX -////////////////////////////////////////////////////////////////////////////// + // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 318588f544e5..cbaff76db65c 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -97,7 +97,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index ecd35d7c16e3..b35c2d96262d 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -25,7 +25,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PATTERNFILLPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index 7080ddceddf8..daccdc9bed2f 100644 --- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + // PointArrayPrimitive2D class namespace drawinglayer @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index bf6d83f19a10..e92de81f7cbc 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -30,7 +30,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + // PolygonHairlinePrimitive2D class namespace drawinglayer @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolygonMarkerPrimitive2D class namespace drawinglayer @@ -141,7 +141,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolygonStrokePrimitive2D class namespace drawinglayer @@ -199,7 +199,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolygonWavePrimitive2D class namespace drawinglayer @@ -254,7 +254,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolygonStrokeArrowPrimitive2D class namespace drawinglayer @@ -310,7 +310,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 4afb5edf501d..71163f44f149 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -33,7 +33,7 @@ #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonHairlinePrimitive2D class namespace drawinglayer @@ -79,7 +79,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonMarkerPrimitive2D class namespace drawinglayer @@ -135,7 +135,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonStrokePrimitive2D class namespace drawinglayer @@ -192,7 +192,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonColorPrimitive2D class namespace drawinglayer @@ -236,7 +236,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonGradientPrimitive2D class namespace drawinglayer @@ -281,7 +281,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonHatchPrimitive2D class namespace drawinglayer @@ -331,7 +331,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonGraphicPrimitive2D class namespace drawinglayer @@ -376,7 +376,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // PolyPolygonSelectionPrimitive2D class namespace drawinglayer @@ -440,7 +440,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index e7c64b465f15..7e5cbbf03c4c 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -71,7 +71,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -110,7 +110,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -149,7 +149,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -192,7 +192,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETOOLS2D_HXX diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 6153674de1e5..fb65285bc8ec 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -31,7 +31,7 @@ #include <drawinglayer/attribute/sdrlightingattribute3d.hxx> #include <drawinglayer/attribute/sdrlightattribute3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -152,7 +152,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index 5ac29383ff76..40d54ab173c4 100644 --- a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -32,7 +32,7 @@ namespace basegfx { class B2DHomMatrix; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -64,7 +64,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index 7993a205f452..f8f0769cbabc 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -81,7 +81,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 31a8aaac7453..91323b224035 100644 --- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <vcl/pdfwriter.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -64,7 +64,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index db45d60d0d8b..84b6cec8266f 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -28,7 +28,7 @@ #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // SvgGradientEntry class namespace drawinglayer @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // SvgGradientHelper class namespace drawinglayer @@ -172,7 +172,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // SvgLinearGradientPrimitive2D class namespace drawinglayer @@ -226,7 +226,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // SvgRadialGradientPrimitive2D class namespace drawinglayer @@ -298,7 +298,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // SvgLinearAtomPrimitive2D class namespace drawinglayer @@ -344,7 +344,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // SvgRadialAtomPrimitive2D class namespace drawinglayer @@ -413,7 +413,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SVGGRADIENTPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index 2f5cfbfc7286..b511e9472ff5 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -77,7 +77,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTBREAKUPHELPER_HXX diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 8a2d055ed4cd..a14ce4ba788e 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace basegfx { namespace tools { @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Boundary; }}}} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -139,7 +139,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 3184ee78e865..abf001c7a3dd 100644 --- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -99,7 +99,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 36531e6fce16..78a48c678284 100644 --- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/vclenum.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -97,7 +97,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 13fb133ddfde..2a64e3b74bbb 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <rtl/ustring.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -53,7 +53,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -99,7 +99,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -122,7 +122,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -176,7 +176,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -205,7 +205,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index 26e807093636..170c151119fc 100644 --- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -27,7 +27,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -77,7 +77,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 2eda670f3529..db2087e8f51b 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -32,12 +32,12 @@ #include <drawinglayer/attribute/fontattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class OutputDevice; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -174,7 +174,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index f608c97d23d8..bf1b5da11b42 100644 --- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -29,7 +29,7 @@ #include <drawinglayer/attribute/fontattribute.hxx> #include <com/sun/star/lang/Locale.hpp> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -63,7 +63,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -104,7 +104,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -145,7 +145,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index 0bb20b44f392..0f8f043b04b6 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -77,7 +77,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index b7611deae029..7646bdcb4675 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -81,7 +81,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 18031256d9b0..7f86ee1a9b9f 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -69,7 +69,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index 081519306681..d528ffd91e2d 100644 --- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -26,7 +26,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/wall.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -80,7 +80,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index acb37ee7e9fb..9410fb7f8d94 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // WrongSpellPrimitive2D class namespace drawinglayer @@ -85,7 +85,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 043e3d7c1bca..7f227a2eda03 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -28,7 +28,7 @@ #include <comphelper/broadcasthelper.hxx> #include <basegfx/range/b3drange.hxx> -////////////////////////////////////////////////////////////////////////////// + /** defines for DeclPrimitive3DIDBlock and ImplPrimitive3DIDBlock Added to be able to simply change identification stuff later, e.g. add a identification string and/or ID to the interface and to the implementation @@ -41,7 +41,7 @@ #define ImplPrimitive3DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive3DID() const { return TheID; } -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace geometry { @@ -55,7 +55,7 @@ namespace drawinglayer { namespace primitive3d { typedef ::com::sun::star::uno::Sequence< Primitive3DReference > Primitive3DSequence; }} -////////////////////////////////////////////////////////////////////////////// + // basePrimitive3D class namespace drawinglayer @@ -110,9 +110,9 @@ namespace drawinglayer /// The default implementation returns an empty sequence virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; - // + // Methods from XPrimitive3D - // + /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It will get the ViewInformation from the ViewParameters for that purpose @@ -127,7 +127,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // BufferedDecompositionPrimitive3D class namespace drawinglayer @@ -176,7 +176,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // tooling namespace drawinglayer @@ -206,7 +206,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index bb9aa2997162..30be6c30efea 100644 --- a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX -////////////////////////////////////////////////////////////////////////////// + // define ranges for other libraries #define PRIMITIVE3D_ID_RANGE_DRAWINGLAYER (0 << 16) -////////////////////////////////////////////////////////////////////////////// + // local primitives #define PRIMITIVE3D_ID_GROUPPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 0) @@ -48,7 +48,7 @@ #define PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 17) #define PRIMITIVE3D_ID_HIDDENGEOMETRYPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 18) -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index e35d93fa2fdd..f9a0aee95cfa 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index 345b5ea839b8..d5cd9b9f6ab0 100644 --- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive3d/textureprimitive3d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -79,7 +79,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index c9b22aa1e29e..0a510e7dc029 100644 --- a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -59,7 +59,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index c07aa21169cf..ad75029a8979 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/color/bcolormodifier.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -62,7 +62,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index 0d89a50bea37..a0b8dc032ec6 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -28,7 +28,7 @@ #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -122,7 +122,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 61bf1c4746fc..ed811a13857b 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -32,7 +32,7 @@ namespace basegfx { class B3DHomMatrix; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -101,7 +101,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 21a5baa98d1b..767d77fdc739 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -26,7 +26,7 @@ #include <basegfx/polygon/b3dpolypolygon.hxx> #include <drawinglayer/attribute/materialattribute3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index e7eda3faa410..8f3be710a860 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -62,7 +62,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index ffe0e2cea676..d5abec443466 100644 --- a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -44,7 +44,7 @@ namespace drawinglayer { namespace attribute { class SdrShadowAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -91,7 +91,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index d741b4c1b223..efb179ae9ba8 100644 --- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -26,14 +26,14 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace geometry { class ViewInformation3D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -130,7 +130,7 @@ namespace drawinglayer } // end of namespace overlay } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index a072db78481a..23c925050eb6 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -122,7 +122,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 2458294ba85c..a83a733e228d 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -140,7 +140,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 971bdcc3bed8..7b494b46b58f 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx index 6563f5172f67..bf3af11b5dee 100644 --- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -29,7 +29,7 @@ #include <drawinglayer/primitive3d/sdrextrudelathetools3d.hxx> #include <drawinglayer/attribute/sdrobjectattribute3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -81,7 +81,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index f611da345bc4..d0cba005d002 100644 --- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx index 67f716ba3149..40f427de943b 100644 --- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -26,7 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -77,7 +77,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx index 3c8473d006db..bac2d71f60a0 100644 --- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -28,7 +28,7 @@ #include <basegfx/vector/b2dvector.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -72,7 +72,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -114,7 +114,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -153,7 +153,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -192,7 +192,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -223,7 +223,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index edd481d0272e..105d8cd9056f 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -67,7 +67,7 @@ namespace drawinglayer } // end of namespace primitive3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index dcf52014a503..674045c7e1b0 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -189,7 +189,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx index 51b85f87c470..e742e039486a 100644 --- a/include/drawinglayer/processor2d/canvasprocessor.hxx +++ b/include/drawinglayer/processor2d/canvasprocessor.hxx @@ -32,7 +32,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vcl/mapmod.hxx> -////////////////////////////////////////////////////////////////////////////// + // forward declaration namespace basegfx { @@ -56,7 +56,7 @@ namespace drawinglayer { namespace primitive2d { class UnifiedTransparencePrimitive2D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -115,7 +115,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index af390a8cd7b7..e3fdd5f3ca01 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -61,7 +61,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx index 6526d93ceedf..11678e854822 100644 --- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -24,14 +24,14 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace basegfx { class B2DPolygon; } namespace basegfx { class B2DPolyPolygon; } namespace drawinglayer { namespace primitive2d { class ScenePrimitive2D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -101,7 +101,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx index 2fdc88dfbb76..3f9e46187165 100644 --- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -26,7 +26,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -59,7 +59,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx index c3ca87c194e1..85be428a2eec 100644 --- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx +++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx @@ -22,11 +22,11 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { namespace primitive2d { class ObjectInfoPrimitive2D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -55,7 +55,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_OBJECTINFOEXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx b/include/drawinglayer/processor2d/processor2dtools.hxx index fc34aa22abd1..99002005bd87 100644 --- a/include/drawinglayer/processor2d/processor2dtools.hxx +++ b/include/drawinglayer/processor2d/processor2dtools.hxx @@ -23,12 +23,12 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class OutputDevice; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx index ae0bda0f455d..b3302a6c1d53 100644 --- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx +++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/drawinglayerdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class OutputDevice; @@ -32,7 +32,7 @@ namespace drawinglayer { namespace processor2d { class BaseProcessor2D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -48,7 +48,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 239e624ccced..3da6b52ff4df 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -28,7 +28,7 @@ #include <basegfx/color/bcolormodifier.hxx> #include <vector> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -91,7 +91,7 @@ namespace drawinglayer } // end of namespace processor2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx index 834779982ba5..9738fb6d4c92 100644 --- a/include/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -68,7 +68,7 @@ namespace drawinglayer } // end of namespace processor3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index 2b4714ca3054..c8073b3bb5ed 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/processor3d/defaultprocessor3d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -84,7 +84,7 @@ namespace drawinglayer } // end of namespace processor3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index 63a1227fe1a3..2d52334606c4 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -29,7 +29,7 @@ #include <svtools/optionsdrawinglayer.hxx> #include <boost/shared_ptr.hpp> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -58,7 +58,7 @@ namespace drawinglayer { namespace texture { class GeoTexSvx; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -104,7 +104,7 @@ namespace drawinglayer bool mbFilter : 1; bool mbSimpleTextureActive : 1; - ////////////////////////////////////////////////////////////////////////////// + // rendering support void impRenderGradientTexturePrimitive3D(const primitive3d::GradientTexturePrimitive3D& rPrimitive, bool bTransparence); @@ -115,7 +115,7 @@ namespace drawinglayer void impRenderPolyPolygonMaterialPrimitive3D(const primitive3d::PolyPolygonMaterialPrimitive3D& rPrimitive); void impRenderTransformPrimitive3D(const primitive3d::TransformPrimitive3D& rTransformCandidate); - ////////////////////////////////////////////////////////////////////////////// + // rasterconversions for filled and non-filled polygons. These NEED to be // implemented from derivations @@ -151,7 +151,7 @@ namespace drawinglayer } // end of namespace processor3d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index d85e6843f54d..2a4218dc7c1f 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -28,7 +28,7 @@ #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 90b7e863474f..945129f1a7e8 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -32,7 +32,7 @@ #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 994a04f89e57..896685ce97e3 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -28,7 +28,7 @@ #include <basegfx/tools/gradienttools.hxx> #include <vector> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { namespace texture @@ -50,7 +50,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -66,7 +66,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -105,7 +105,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -131,7 +131,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -157,7 +157,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -184,7 +184,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -212,7 +212,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -240,7 +240,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -268,7 +268,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -300,7 +300,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -337,7 +337,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif //_DRAWINGLAYER_TEXTURE_TEXTURE_HXX diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx index 333f346c6b74..ec5925ed46ca 100644 --- a/include/drawinglayer/texture/texture3d.hxx +++ b/include/drawinglayer/texture/texture3d.hxx @@ -25,14 +25,14 @@ #include <drawinglayer/texture/texture.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace drawinglayer { namespace primitive3d { class HatchTexturePrimitive3D; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -57,7 +57,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -95,7 +95,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -127,7 +127,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -160,7 +160,7 @@ namespace drawinglayer } // end of namespace texture } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX diff --git a/include/drawinglayer/tools/converters.hxx b/include/drawinglayer/tools/converters.hxx index 5bc9ddbb18e4..957973f8bda1 100644 --- a/include/drawinglayer/tools/converters.hxx +++ b/include/drawinglayer/tools/converters.hxx @@ -24,7 +24,7 @@ #include <vcl/bitmapex.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -40,7 +40,7 @@ namespace drawinglayer } // end of namespace tools } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_DRAWINGLAYER_TOOLS_CONVERTERS_HXX diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index 3881a22d81b0..701f3b8d358a 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -206,7 +206,7 @@ namespace accessibility void Dispose (); // forwarder to given paragraphs - //------------------------------------------------------------------------ + /** Release the given range of paragraphs All ranges have the meaning [start,end), similar to STL diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx index 3936436489a1..3e86f609e9d0 100644 --- a/include/editeng/AccessibleStringWrap.hxx +++ b/include/editeng/AccessibleStringWrap.hxx @@ -29,11 +29,11 @@ class SvxFont; class Rectangle; class Point; -//------------------------------------------------------------------------ -// + + // AccessibleStringWrap declaration -// -//------------------------------------------------------------------------ + + class AccessibleStringWrap { diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index 760cce994513..3465a02b1d4c 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -36,7 +36,7 @@ #define DEF_LINE_WIDTH_4 100 #define DEF_LINE_WIDTH_5 10 -// ============================================================================ + namespace editeng { diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index f03ecb3a9eb0..128fdf50341e 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -107,7 +107,7 @@ struct EPaM; class DeletedNodeInfo; class ParaPortionList; -////////////////////////////////////////////////////////////////////////////// + /** values for GetAttribs */ diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx index ee17d17eb9d8..70849f25b718 100644 --- a/include/editeng/editund2.hxx +++ b/include/editeng/editund2.hxx @@ -40,9 +40,9 @@ public: virtual bool Redo(); }; -// ----------------------------------------------------------------------- + // EditUndo -// ------------------------------------------------------------------------ + class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction { private: diff --git a/include/editeng/eedata.hxx b/include/editeng/eedata.hxx index 38eff23f474c..cd1db6e0775c 100644 --- a/include/editeng/eedata.hxx +++ b/include/editeng/eedata.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_EDITENG_EEDATA_HXX #define INCLUDED_EDITENG_EEDATA_HXX -////////////////////////////////////////////////////////////////////////////// + // extended data definitions for EditEngine portion stripping (StripPortions() // support). These may be mapped to some primitive definitions from Drawinglayer // later. diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 9853474c4dfb..33db8b5d2aa6 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -90,9 +90,9 @@ public: static SvClassManager& GetClassManager(); }; -// ================================================================= + // The following are the derivatives of SvxFieldData ... -// ================================================================= + enum SvxDateType { SVXDATETYPE_FIX, SVXDATETYPE_VAR }; enum SvxDateFormat { SVXDATEFORMAT_APPDEFAULT = 0, // Set as in App diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx index c0cb4963e99a..fb034de135e9 100644 --- a/include/editeng/frmdir.hxx +++ b/include/editeng/frmdir.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_EDITENG_FRMDIR_HXX #define INCLUDED_EDITENG_FRMDIR_HXX -// ---------------------------------------------------------------------------- + /** Defines possible text directions in frames. */ enum SvxFrameDirection @@ -45,7 +45,7 @@ enum SvxFrameDirection FRMDIR_ENVIRONMENT }; -// ---------------------------------------------------------------------------- + #endif // INCLUDED_EDITENG_FRMDIR_HXX diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 74fdbe4d96eb..96fb3b6fe361 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -28,16 +28,16 @@ #include <editeng/editengdllapi.h> #include <i18nlangtag/mslangid.hxx> -//............................................................................. + namespace editeng { -//............................................................................. + class HangulHanjaConversion_Impl; - //========================================================================= + //= HangulHanjaConversion - //========================================================================= + /** encapsulates Hangul-Hanja conversion functionality <p>terminology: @@ -280,9 +280,9 @@ namespace editeng { return MsLangId::isChinese(nLang); } -//............................................................................. + } // namespace svx -//............................................................................. + #endif // INCLUDED_EDITENG_HANGULHANJA_HXX diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 998ebc0ed16f..b1687b0f616e 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -41,14 +41,14 @@ EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMap OUString GetColorString( const Color& rCol ); EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); -// ----------------------------------------------------------------------- + inline OUString GetBoolString(bool bVal) { return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE); } -// ----------------------------------------------------------------------- + inline long Scale( long nVal, long nMult, long nDiv ) { diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 2bbea27d9a36..15271a7a355d 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -56,7 +56,7 @@ public: } }; -//------------------------------------------------------------------------ + class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem { @@ -89,7 +89,7 @@ public: } }; -//------------------------------------------------------------------------ + class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem { diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index 47adc29d1db2..2e7e213f735b 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -50,7 +50,7 @@ public: void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_EDITENG_MEASFLD_HXX diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 7d711c0a30c6..3511d3dfcdc9 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -43,7 +43,7 @@ namespace com{namespace sun{ namespace star{ } }}} -// ----------------------------------------------------------------------- + //Feature-Flags (only sal_uInt16!) #define NUM_CONTINUOUS 0x0001 // consecutive numbers possible? #define NUM_CHAR_TEXT_DISTANCE 0x0002 // Distance Symbol<->Text? diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 52255562ee7d..3240b7229b3d 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -81,7 +81,7 @@ namespace svl #include <editeng/paragraphdata.hxx> class SvxFieldData; -////////////////////////////////////////////////////////////////////////////// + namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; diff --git a/include/editeng/paragraphdata.hxx b/include/editeng/paragraphdata.hxx index 16f2aeba9974..d08bdafb8d4c 100644 --- a/include/editeng/paragraphdata.hxx +++ b/include/editeng/paragraphdata.hxx @@ -25,7 +25,7 @@ // Only for internal use, oder some kind like hPara for the few // functions where you need it outside ( eg. moving paragraphs... ) -// + // Unfortunately NOT only local (formally in outliner.hxx), but also // used in outlobj.hxx. Moved to own header diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index 8083e299ebe6..4049df3ffcdc 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -12,9 +12,9 @@ #include <svl/intitem.hxx> #include <editeng/editengdllapi.h> -//---------------------- + // SvxRsidItem -//---------------------- + class EDITENG_DLLPUBLIC SvxRsidItem : public SfxUInt32Item { diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index b93da1df76ce..a233ffff09ce 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_EDITENG_SVXENUM_HXX #define INCLUDED_EDITENG_SVXENUM_HXX -// ----------------------------------------------------------------------- + enum SvxCaseMap { @@ -142,7 +142,7 @@ enum SvxCellOrientation enum SvxDrawToolEnum { SVX_SNAP_DRAW_SELECT, - // + SVX_SNAP_DRAW_LINE, SVX_SNAP_DRAW_RECT, SVX_SNAP_DRAW_ELLIPSE, diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 40cf23d208c9..7c2f816deedb 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { // Mapper-Classes for the various requirements on Document positions // Swg - NodePosition is a SwIndex, which is used internally // EditEngine - ULONG to list of paragraphs -// ..... + class SvxNodeIdx { @@ -170,7 +170,7 @@ struct RTFPardAttrMapIds -// ----------------------------------------------------------------------- + class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index 2bdbf517f06a..621deb9ef762 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -36,7 +36,7 @@ class LinguMgrExitLstnr; class Window; -/////////////////////////////////////////////////////////////////////////// + class EDITENG_DLLPUBLIC LinguMgr { @@ -108,7 +108,7 @@ public: ::com::sun::star::linguistic2::XDictionary > GetChangeAllList(); }; -/////////////////////////////////////////////////////////////////////////// + namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; @@ -138,7 +138,7 @@ EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord ); -/////////////////////////////////////////////////////////////////////////// + class EDITENG_DLLPUBLIC SvxDicListChgClamp { @@ -156,7 +156,7 @@ public: ~SvxDicListChgClamp(); }; -/////////////////////////////////////////////////////////////////////////// + //TODO: remove those functions or make them inline EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< @@ -179,9 +179,9 @@ EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SvxGetChangeAllList(); -/////////////////////////////////////////////////////////////////////////// + // misc functions -// + EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError ); diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index c6d8a4323f74..d43478d0c6bf 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -156,10 +156,10 @@ struct ESelection; EDITENG_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw(); EDITENG_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw(); -// ==================================================================== + // This class implements a SvxEditSource and SvxTextForwarder and does // nothing otherwise -// ==================================================================== + class SvxDummyTextSource : public SvxEditSource, public SvxTextForwarder { @@ -232,7 +232,7 @@ namespace accessibility class AccessibleEditableTextPara; } -// ==================================================================== + class EDITENG_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange, public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::beans::XMultiPropertySet, @@ -346,7 +346,7 @@ public: static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); }; -// ==================================================================== + class SvxUnoTextBase; class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase, @@ -455,7 +455,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// ==================================================================== + class EDITENG_DLLPUBLIC SvxUnoText : public SvxUnoTextBase, public ::cppu::OWeakAggObject { @@ -481,7 +481,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// ==================================================================== + class SvxUnoTextContentEnumeration : public ::cppu::WeakAggImplHelper1< ::com::sun::star::container::XEnumeration > { @@ -500,7 +500,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ==================================================================== + #include <com/sun/star/text/XTextContent.hpp> class SvxUnoTextContent : public SvxUnoTextRangeBase, @@ -576,7 +576,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// ==================================================================== + class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< ::com::sun::star::container::XEnumeration > { @@ -597,7 +597,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ==================================================================== + class EDITENG_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase, public ::com::sun::star::text::XTextCursor, diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 5d026942695b..bd2f0e37071d 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -25,7 +25,7 @@ class SvXMLNamespaceMap; -//============================================================================ + class SvXMLAttrContainerData; diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx index fcf19ff43aa9..3af2803b0e18 100644 --- a/include/filter/msfilter/countryid.hxx +++ b/include/filter/msfilter/countryid.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX #define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX @@ -26,7 +26,7 @@ #include <i18nlangtag/lang.h> #include <filter/msfilter/msfilterdllapi.h> -// ---------------------------------------------------------------------------- + namespace msfilter { @@ -300,11 +300,11 @@ MSFILTER_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage ); */ MSFILTER_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry ); -// ============================================================================ + } // namespace svx -// ============================================================================ + #endif diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 70a017ae0759..a97dd87015bd 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -344,7 +344,7 @@ enum ESCHER_wMode }; -// + enum ESCHER_ShapePath { ESCHER_ShapeLines, // A line of straight segments @@ -364,7 +364,7 @@ enum ESCHER_WrapMode ESCHER_WrapThrough }; -// + enum ESCHER_bwMode { ESCHER_bwColor, // only used for predefined shades @@ -486,7 +486,7 @@ enum ESCHER_BlipFlags ESCHER_BlipFlagLinkToFile = 8 }; -// + enum ESCHER_3DRenderMode { ESCHER_FullRender, // Generate a full rendering @@ -494,7 +494,7 @@ enum ESCHER_3DRenderMode ESCHER_BoundingCube // Generate a bounding cube }; -// + enum ESCHER_xFormType { ESCHER_xFormAbsolute, // Apply transform in absolute space centered on shape @@ -502,7 +502,7 @@ enum ESCHER_xFormType ESCHER_xFormDrawing // Apply transform in drawing space }; -// + enum ESCHER_ShadowType { ESCHER_ShadowOffset, // N pixel offset shadow @@ -942,7 +942,7 @@ enum ESCHER_LineCap const sal_uInt32 DFF_DGG_CLUSTER_SIZE = 0x00000400; /// Shape IDs per cluster in DGG atom. -// --------------------------------------------------------------------------------------------- + namespace com { namespace sun { namespace star { namespace awt { @@ -1012,7 +1012,7 @@ struct EscherPropertyValueHelper ); }; -// --------------------------------------------------------------------------------------------- + struct EscherPersistEntry { @@ -1023,7 +1023,7 @@ struct EscherPersistEntry }; -// --------------------------------------------------------------------------------------------- + class EscherBlibEntry { @@ -1065,7 +1065,7 @@ public: sal_Bool operator==( const EscherBlibEntry& ) const; }; -// --------------------------------------------------------------------------------------------- + #define _E_GRAPH_PROV_USE_INSTANCES 1 #define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2 @@ -1146,7 +1146,7 @@ public: ~EscherSolverContainer(); }; -// --------------------------------------------------------------------------------------------- + #define ESCHER_CREATEPOLYGON_LINE 1 #define ESCHER_CREATEPOLYGON_POLYLINE 2 @@ -1359,7 +1359,7 @@ public: static sal_Bool GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ); }; -// --------------------------------------------------------------------------------------------- + typedef ::std::vector< EscherPersistEntry* > EscherPersistTable_impl; @@ -1381,7 +1381,7 @@ public: virtual ~EscherPersistTable(); }; -// --------------------------------------------------------------------------------------------- + class EscherEx; @@ -1477,7 +1477,7 @@ public: }; -// ============================================================================ + /** Instance for global DFF data, shared through various instances of EscherEx. */ class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider @@ -1559,7 +1559,7 @@ private: typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef; -// --------------------------------------------------------------------------------------------- + class SdrObject; class SdrPage; @@ -1650,7 +1650,7 @@ public: sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); } // features during the creation of the following Containers: - // + // ESCHER_DggContainer: a EscherDgg Atom is automatically being created and managed // ESCHER_DgContainer: a EscherDg Atom is automatically being created and managed // ESCHER_SpgrContainer: diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index d7d5e65447ce..12da3b787be5 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -29,7 +29,7 @@ namespace msfilter { -// ============================================================================ + /** Encodes and decodes data from protected MSO 95- documents. */ @@ -173,7 +173,7 @@ public: }; -// ============================================================================ + /** Encodes and decodes data from protected MSO 97+ documents. @@ -361,7 +361,7 @@ private: sal_uInt8 m_pDocId[16]; }; -// ============================================================================ + } // namespace msfilter diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index be1c85d70d2a..5afa6fe5f8d4 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -30,7 +30,7 @@ namespace ooo { namespace vba { -// ============================================================================ + struct MSFILTER_DLLPUBLIC MacroResolvedInfo { @@ -49,7 +49,7 @@ MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, co MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller ); MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (::com::sun::star::uno::RuntimeException); MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException); -// ============================================================================ + typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, @@ -96,7 +96,7 @@ private: OUString maProjectName; }; -// ============================================================================ + } // namespace vba } // namespace ooo diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 10a13b1cbd39..e3762d93ed42 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -127,11 +127,11 @@ public: enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE }; enum PptPageFormat -{ PPTPF_SCREEN, // +{ PPTPF_SCREEN, PPTPF_USLETTER, // 8.5x11" PPTPF_A4, // 210x297mm PPTPF_35MMDIA, // DIA - PPTPF_OVERHEAD, // + PPTPF_OVERHEAD, PPTPF_CUSTOM }; @@ -446,7 +446,7 @@ public: void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SD_HEADERFOOTER_DATE 1 #define SD_HEADERFOOTER_TODAYDATE 2 @@ -508,7 +508,7 @@ struct ProcessData ~ProcessData() { delete[] pTableRowProperties; }; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + typedef ::std::vector< SdHyperlinkEntry* > SdHyperlinkEntryList; class SdrTextObj; diff --git a/include/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx index c83dffd9cf8d..6c93286129ce 100644 --- a/include/formula/ExternalReferenceHelper.hxx +++ b/include/formula/ExternalReferenceHelper.hxx @@ -33,9 +33,9 @@ namespace formula protected: ~ExternalReferenceHelper() {} }; -// ============================================================================= + } // formula -// ============================================================================= + #endif // INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 591103a1deaf..a38798a1a834 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -407,9 +407,9 @@ private: mutable NonConstOpCodeMapPtr mxSymbolsEnglishXL; // English Excel symbols (for VBA formula parsing) mutable NonConstOpCodeMapPtr mxSymbolsOOXML; // Excel OOXML symbols }; -// ============================================================================= + } // formula -// ============================================================================= + #endif // INCLUDED_FORMULA_FORMULACOMPILER_HXX diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 45e4966ab66a..84385b2548ef 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -75,9 +75,9 @@ private: throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// ============================================================================= + } // formula -// ============================================================================= + #endif // INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 639cadb9524f..63033f4258af 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -24,7 +24,7 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> -//============================================================================ + namespace formula { class FORMULA_DLLPUBLIC FormEditData diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 0051900168e4..e7db10033e6e 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -28,14 +28,14 @@ namespace formula { -//============================================================================ + #define STRUCT_END 1 #define STRUCT_FOLDER 2 #define STRUCT_ERROR 3 enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FORMDLG_EDIT }; -//============================================================================ + class FormulaDlg_Impl; class IControlReferenceHandler; @@ -45,7 +45,7 @@ class FormulaHelper; class RefEdit; class RefButton; class FormEditData; -//============================================================================ + class FORMULA_DLLPUBLIC FormulaModalDialog : public ModalDialog, public formula::IFormulaEditorHelper { friend class FormulaDlg_Impl; diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index 3985f6896601..4bcd8645a2e2 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -71,9 +71,9 @@ namespace formula sal_uInt16 nArgs, ::std::vector< OUString >& _rArgs ) const; }; -// ============================================================================= + } // formula -// ============================================================================= + #endif // INCLUDED_FORMULA_FORMULAHELPER_HXX diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 1971c4fb4d97..f74355e633da 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -252,9 +252,9 @@ public: } }; -// ============================================================================= + } // formula -// ============================================================================= + #endif // INCLUDED_FORMULA_GRAMMAR_HXX diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 3bf006f9e06c..baf050a82d33 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -418,9 +418,9 @@ public: virtual bool operator==( const FormulaToken& rToken ) const; }; -// ============================================================================= + } // formula -// ============================================================================= + #endif diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 49c1cfff2e57..6f0a0d43ff9a 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -27,11 +27,11 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ + // types, enums, ... -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @descr The method GetAddonsMenu() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ @@ -113,11 +113,11 @@ struct FWE_DLLPUBLIC MergeStatusbarInstruction typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionContainer; -//_________________________________________________________________________________________________________________ + // forward declarations -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -126,7 +126,7 @@ typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionCont class AddonsOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about menu features @descr - @@ -138,16 +138,16 @@ class AddonsOptions_Impl; class FWE_DLLPUBLIC AddonsOptions { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -166,11 +166,11 @@ class FWE_DLLPUBLIC AddonsOptions AddonsOptions(); ~AddonsOptions(); - //--------------------------------------------------------------------------------------------------------- + // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short clears completely the addons menu @descr Call this methods to clear the addons menu To fill it again use AppendItem(). @@ -185,7 +185,7 @@ class FWE_DLLPUBLIC AddonsOptions void Clear(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns if an addons menu is available @descr Call to retrieve if a addons menu is available @@ -195,7 +195,7 @@ class FWE_DLLPUBLIC AddonsOptions sal_Bool HasAddonsMenu() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns number of addons toolbars @descr Call to retrieve the number of addons toolbars @@ -204,7 +204,7 @@ class FWE_DLLPUBLIC AddonsOptions *//*-*****************************************************************************************************/ sal_Int32 GetAddonsToolBarCount() const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns the complete addons menu @descr Call it to get all entries of the addon menu. We return a list of all nodes with his names and properties. @@ -218,7 +218,7 @@ class FWE_DLLPUBLIC AddonsOptions const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenu() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets the menu bar part of all addon components registered @descr - @@ -231,7 +231,7 @@ class FWE_DLLPUBLIC AddonsOptions const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenuBarPart() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets a toolbar part of an single addon @descr - @@ -244,7 +244,7 @@ class FWE_DLLPUBLIC AddonsOptions const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsToolBarPart( sal_uInt32 nIndex ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets a unique toolbar resource name of an single addon @descr - @@ -257,7 +257,7 @@ class FWE_DLLPUBLIC AddonsOptions const OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Retrieves all available merge instructions for the Office menu bar @descr - @@ -270,7 +270,7 @@ class FWE_DLLPUBLIC AddonsOptions const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Retrieves all available merge instructions for a single toolbar @descr - @@ -282,7 +282,7 @@ class FWE_DLLPUBLIC AddonsOptions *//*-*****************************************************************************************************/ bool GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Gets the Add-On help menu part of all addon components registered @descr - @@ -296,7 +296,7 @@ class FWE_DLLPUBLIC AddonsOptions const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Retrieve an image for a command URL which is defined inside the addon menu configuration @descr Call it to retrieve an image for a command URL which is defined inside the addon menu configuration @@ -311,11 +311,11 @@ class FWE_DLLPUBLIC AddonsOptions Image GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; Image GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const; - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -331,7 +331,7 @@ class FWE_DLLPUBLIC AddonsOptions static ::osl::Mutex& GetOwnStaticMutex(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -346,9 +346,9 @@ class FWE_DLLPUBLIC AddonsOptions *//*-*****************************************************************************************************/ DECL_STATIC_LINK( AddonsOptions, Notify, void* ); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx index 3ae19e3c4ee7..905038cedb0c 100644 --- a/include/framework/documentundoguard.hxx +++ b/include/framework/documentundoguard.hxx @@ -26,14 +26,14 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace framework { -//...................................................................................................................... - //================================================================================================================== + + //= DocumentUndoGuard - //================================================================================================================== + struct DocumentUndoGuard_Data; /** a helper class guarding the Undo manager of a document @@ -54,9 +54,9 @@ namespace framework ::boost::scoped_ptr< DocumentUndoGuard_Data > m_pData; }; -//...................................................................................................................... + } // namespace framework -//...................................................................................................................... + #endif // INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index fa276ee82b11..1d132148190d 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -35,7 +35,7 @@ namespace framework{ */ class FWE_DLLPUBLIC FrameListAnalyzer { - //_______________________________________ + // types public: @@ -55,7 +55,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer E_ZOMBIE = 32768 // use it for special test scenarios only!!! }; - //_______________________________________ + // member public: @@ -152,7 +152,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer This value is undefined if m_eDetectMode doesn't have set the flag E_BACKINGCOMPONENT! */ sal_Bool m_bReferenceIsBacking; - //_______________________________________ + // interface public: @@ -178,7 +178,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer sal_uInt32 eDetectMode ); virtual ~FrameListAnalyzer(); - //_______________________________________ + // helper private: diff --git a/include/framework/iguard.hxx b/include/framework/iguard.hxx index f57fd3c8c9f3..46071b49e00b 100644 --- a/include/framework/iguard.hxx +++ b/include/framework/iguard.hxx @@ -24,14 +24,14 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr interface for guarding a lock *//*-*************************************************************************************************************/ class SAL_NO_VTABLE IGuard { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: /** clears the lock. If the guard does not currently hold the lock, nothing happens. diff --git a/include/framework/imutex.hxx b/include/framework/imutex.hxx index 39e9f50ebe39..7268db9d0737 100644 --- a/include/framework/imutex.hxx +++ b/include/framework/imutex.hxx @@ -24,17 +24,17 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr We need this interface to support using of different mutex implementations in a generic way. *//*-*************************************************************************************************************/ class SAL_NO_VTABLE IMutex { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @descr These functions must be supported by a derived class! acquire() -try to register thread release() -unregister thread diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index 0b316fb6505d..2855f30edd4b 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -39,7 +39,7 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short special request for interaction to ask user for right filter @descr These helper can be used to ask user for right filter, if filter detection failed. It capsulate communication with any interaction handler and supports an easy @@ -74,7 +74,7 @@ class FWE_DLLPUBLIC RequestFilterSelect com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short special request for interaction @descr User must decide between a preselected and another detected filter. It capsulate communication with any interaction handler and supports an easy diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 405f368298eb..3345537b4be3 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -54,7 +54,7 @@ struct ThreadHelpBase2 class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 > { - //_____________________________________ + // structs, types etcp. public: @@ -90,7 +90,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 typedef ::std::vector< InteractionInfo > InteractionList; - //_____________________________________ + // member private: @@ -106,11 +106,11 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 object was used.*/ InteractionList m_lInteractionRules; - //_____________________________________ + // uno interface public: - //_________________________________ + /** @interface XInteractionHandler @short called from outside to handle a problem @@ -124,7 +124,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) throw(css::uno::RuntimeException, std::exception); - //_________________________________ + /** @interface XInteractionHandler2 @short called from outside to handle a problem @@ -138,7 +138,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 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); - //_________________________________ + /** @interface XInterface @short called to query another interface of the component @@ -148,11 +148,11 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //_____________________________________ + // c++ interface public: - //_________________________________ + /** @short ctor to guarantee right initialized instances of this class @descr It uses the given uno service manager to create the global @@ -165,13 +165,13 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ PreventDuplicateInteraction(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //_________________________________ + /** @short dtor to free used memory. */ virtual ~PreventDuplicateInteraction(); - //_________________________________ + /** @short set the outside interaction handler, which must be used internally if the interaction will not be blocked by the set list of rules. @@ -183,7 +183,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual void setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler); - //_________________________________ + /** @short instead of setting an outside interaction handler, this method make sure the default UUI interaction handler of the office is used. @@ -192,7 +192,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual void useDefaultUUIHandler(); - //_________________________________ + /** @short add a new interaction to the list of interactions, which must be handled by this helper. @@ -210,7 +210,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 */ virtual void addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo); - //_________________________________ + /** @short return the info struct for the specified interaction. diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 2980f40b5b6d..361c83e83971 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -58,21 +58,21 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex css::frame::XFrameActionListener , css::document::XEventListener > { - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short lightweight constructor. */ TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short free all internally used resources. */ virtual ~TitleHelper(); - //--------------------------------------- + /** set an outside component which uses this container and must be set as source of all broadcasted messages, exceptions. @@ -86,7 +86,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex */ void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner); - //--------------------------------------- + /** set an outside component which provides the righht string and number for an untitled component. @@ -100,47 +100,47 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex */ void connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers); - //--------------------------------------- + /** @see XTitle */ virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitle */ virtual void SAL_CALL setTitle(const OUString& sTitle) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see XTitleChangeListener */ virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see css.document.XEventListener */ virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see css.lang.XEventListener */ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + /** @see css.frame.XFrameActionListener */ virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception); - //------------------------------------------- + // internal private: @@ -167,7 +167,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex OUString impl_convertURL2Title(const OUString& sURL); - //------------------------------------------- + // member private: diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index fe71eacb9a17..8c0c42897bb2 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -34,14 +34,14 @@ namespace svl class IUndoManager; } -//...................................................................................................................... + namespace framework { -//...................................................................................................................... - //================================================================================================================== + + //= IMutexGuard - //================================================================================================================== + class SAL_NO_VTABLE IMutexGuard : public IGuard { public: @@ -55,9 +55,9 @@ namespace framework ~IMutexGuard() {} }; - //================================================================================================================== + //= IUndoManagerImplementation - //================================================================================================================== + class SAL_NO_VTABLE IUndoManagerImplementation { public: @@ -80,9 +80,9 @@ namespace framework ~IUndoManagerImplementation() {} }; - //================================================================================================================== + //= UndoManagerHelper - //================================================================================================================== + class UndoManagerHelper_Impl; /** helper class for implementing an XUndoManager @@ -150,9 +150,9 @@ namespace framework ::boost::scoped_ptr< UndoManagerHelper_Impl > m_pImpl; }; -//...................................................................................................................... + } // namespace framework -//...................................................................................................................... + #endif // INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx index b12c34c9869d..63be1e913cfd 100644 --- a/include/i18nlangtag/mslangid.hxx +++ b/include/i18nlangtag/mslangid.hxx @@ -180,7 +180,7 @@ public: static void setConfiguredComplexFallback( LanguageType nLang ); static void setConfiguredAsianFallback( LanguageType nLang ); -// --------------------------------------------------------------------------- + /** Encapsulated methods that shall only be accessed through class LanguageTag. @@ -197,7 +197,7 @@ public: I18NLANGTAG_DLLPRIVATE static void setConfiguredSystemLanguage( LanguageType nLang ); }; -// --------------------------------------------------------------------------- + struct LanguagetagMapping { @@ -213,7 +213,7 @@ public: */ static ::std::vector< LanguagetagMapping > getDefinedLanguagetags(); -// --------------------------------------------------------------------------- + /** Encapsulated conversion methods used by LanguageTag and conversions, not to be used by anything else. diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx index 598079177701..6aee51faa80b 100644 --- a/include/i18nutil/paper.hxx +++ b/include/i18nutil/paper.hxx @@ -115,9 +115,9 @@ enum Paper // defined for 'equal size' test with the implementation array #define NUM_PAPER_ENTRIES (PAPER_SCREEN_16_10 - PAPER_A0 + 1) -// --------- + // - Paper - -// --------- + class I18NUTIL_DLLPUBLIC PaperInfo { diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index 08ea66ecb4c3..5fb1682cb63d 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -32,7 +32,7 @@ namespace oox { class AttributeList; } namespace oox { namespace core { -// ============================================================================ + class OOX_DLLPUBLIC CodecHelper { @@ -45,7 +45,7 @@ private: ~CodecHelper(); }; -// ============================================================================ + /** Encodes and decodes data from/to protected MS Office documents. @@ -170,7 +170,7 @@ private: sal_uInt16 mnHash; ///< Hash value from password. }; -// ============================================================================ + /** Encodes and decodes data from protected MSO 97+ documents. @@ -306,7 +306,7 @@ private: sal_uInt8 mpnUnique[16]; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index 2dda0122e11f..f49eb77844b6 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -42,7 +42,7 @@ class FragmentHandler; struct Relation; class Relations; -// ============================================================================ + class ContextHandler; typedef ::rtl::Reference< ContextHandler > ContextHandlerRef; @@ -108,7 +108,7 @@ private: FragmentBaseDataRef mxBaseData; ///< Base data of the fragment. }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index f1953f2c2aaa..7ee191eff6bd 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -30,11 +30,11 @@ namespace oox { namespace core { -// ============================================================================ + const sal_Int32 XML_ROOT_CONTEXT = SAL_MAX_INT32; -// ============================================================================ + struct ElementInfo; @@ -211,7 +211,7 @@ protected: bool mbEnableTrimSpace; ///< True = trim whitespace in characters(). }; -// ============================================================================ + class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public ContextHandler2Helper { @@ -264,7 +264,7 @@ public: virtual void onEndRecord(); }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index a673217c0eab..8d41deee87f5 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -35,7 +35,7 @@ namespace sax_fastparser { namespace oox { namespace core { -// ============================================================================ + /** Wrapper for a fast SAX parser that works on automatically generated OOXML token and namespace identifiers. @@ -95,7 +95,7 @@ private: sax_fastparser::FastSaxParser* mpParser; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 12b18667b3cc..5101197d4797 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -30,7 +30,7 @@ namespace oox { class TokenMap; } namespace oox { namespace core { -// ============================================================================ + typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::xml::sax::XFastTokenHandler > FastTokenHandler_BASE; @@ -62,7 +62,7 @@ private: const TokenMap& mrTokenMap; ///< Reference to global token map singleton. }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 45c1ef591132..32b8a13901f8 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -74,7 +74,7 @@ namespace oox { namespace ole { namespace oox { namespace core { -// ============================================================================ + enum OoxmlVersion { @@ -114,7 +114,7 @@ public: /** Derived classes implement export of the entire document. */ virtual bool exportDocument() = 0; - // ------------------------------------------------------------------------ + /** Returns the component context passed in the filter constructor (always existing). */ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& @@ -253,7 +253,7 @@ public: virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - // ------------------------------------------------------------------------ + protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; @@ -287,7 +287,7 @@ private: boost::scoped_ptr< FilterBaseImpl > mxImpl; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 57759f835fa0..7526dc3fb26c 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -40,7 +40,7 @@ namespace oox { class AttributeList; } namespace oox { namespace core { -// ============================================================================ + /** Document handler specifically designed for detecting OOXML file formats. @@ -85,7 +85,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; }; -// ============================================================================ + class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { @@ -152,7 +152,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index bd7a220bfd44..c33a49e5fd7a 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace core { -// ============================================================================ + /** Base data of a fragment. @@ -54,7 +54,7 @@ struct FragmentBaseData RelationsRef xRelations ); }; -// ============================================================================ + /** Describes record identifiers used to create contexts in a binary stream. @@ -72,7 +72,7 @@ struct RecordInfo sal_Int32 mnEndRecId; ///< Record identifier for context end, -1 = no record. }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; @@ -121,7 +121,7 @@ protected: typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 04a3eb4883fa..a10d51b3c87f 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -28,7 +28,7 @@ namespace oox { namespace core { -// ============================================================================ + class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper { @@ -113,7 +113,7 @@ public: typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index d358c13552ac..f3d1243ef29f 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -33,7 +33,7 @@ namespace core { namespace prv { class Locator; } namespace prv { class ContextStack; } -// ============================================================================ + struct RecordInputSource { @@ -42,7 +42,7 @@ struct RecordInputSource OUString maSystemId; }; -// ============================================================================ + class RecordParser { @@ -78,7 +78,7 @@ private: RecordInfoMap maEndMap; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index 05d00adbfeeb..4254b99bac42 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -28,7 +28,7 @@ namespace oox { namespace core { -// ============================================================================ + /** Expands to an OUString containing an 'officeDocument' transitional relation type created from the passed literal(!) ASCII(!) character array. */ @@ -50,7 +50,7 @@ namespace core { #define CREATE_MSOFFICE_RELATION_TYPE( ascii ) \ ( "http://schemas.microsoft.com/office/2006/relationships/" ascii ) -// ============================================================================ + struct Relation { @@ -62,7 +62,7 @@ struct Relation Relation() : mbExternal( false ) {} }; -// ============================================================================ + class Relations; typedef ::boost::shared_ptr< Relations > RelationsRef; @@ -102,7 +102,7 @@ private: OUString maFragmentPath; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index dea1a0adf7d6..756ef3e99f6c 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -25,7 +25,7 @@ namespace oox { namespace core { -// ============================================================================ + class RelationsFragment : public FragmentHandler { @@ -44,7 +44,7 @@ private: RelationsRef mxRelations; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 351910d29926..d39397b36066 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -65,7 +65,7 @@ struct TextField { }; typedef std::vector< TextField > TextFieldStack; -// ============================================================================ + struct XmlFilterBaseImpl; @@ -95,7 +95,7 @@ public: /** Has to be implemented by each filter to return the table style list. */ virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0; - // ------------------------------------------------------------------------ + /** Returns the fragment path from the first relation of the passed type, used for fragments referred by the root relations. */ @@ -260,7 +260,7 @@ private: typedef ::rtl::Reference< XmlFilterBase > XmlFilterRef; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx index 3b996592e46f..08ba65860075 100644 --- a/include/oox/drawingml/chart/axiscontext.hxx +++ b/include/oox/drawingml/chart/axiscontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct AxisDispUnitsModel; @@ -41,7 +41,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct AxisModel; @@ -57,7 +57,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a category axis context (c:catAx element). */ @@ -70,7 +70,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a date axis context (c:dateAx element). */ @@ -83,7 +83,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a series axis context (c:serAx element). */ @@ -96,7 +96,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a value axis context (c:valAx element). */ @@ -109,7 +109,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx index 7224b97fa508..3b7a58720004 100644 --- a/include/oox/drawingml/chart/axisconverter.hxx +++ b/include/oox/drawingml/chart/axisconverter.hxx @@ -31,7 +31,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct AxisDispUnitsModel; @@ -68,7 +68,7 @@ public: sal_Int32 nAxisIdx ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/axismodel.hxx b/include/oox/drawingml/chart/axismodel.hxx index d29af7fedfa3..b3a18f05bbff 100644 --- a/include/oox/drawingml/chart/axismodel.hxx +++ b/include/oox/drawingml/chart/axismodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct AxisDispUnitsModel { @@ -47,7 +47,7 @@ struct AxisDispUnitsModel ~AxisDispUnitsModel(); }; -// ============================================================================ + struct AxisModel { @@ -94,7 +94,7 @@ struct AxisModel ~AxisModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx index 057f133a5cdd..5c5b3b6d52f0 100644 --- a/include/oox/drawingml/chart/chartcontextbase.hxx +++ b/include/oox/drawingml/chart/chartcontextbase.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + template< typename ModelType > class ContextBase : public ::oox::core::ContextHandler2 @@ -42,7 +42,7 @@ protected: ModelType& mrModel; }; -// ============================================================================ + template< typename ModelType > class FragmentBase : public ::oox::core::FragmentHandler2 @@ -56,7 +56,7 @@ protected: ModelType& mrModel; }; -// ============================================================================ + /** Help class for all contexts that have only the c:spPr child element. */ @@ -69,7 +69,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct LayoutModel; @@ -84,7 +84,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index eefc11c8b3a8..4807655bd25e 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -41,7 +41,7 @@ namespace chart { struct ChartSpaceModel; struct DataSequenceModel; -// ============================================================================ + class OOX_DLLPUBLIC ChartConverter { @@ -93,7 +93,7 @@ private: ChartConverter& operator=( const ChartConverter& ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx index e86bffd4c645..b904e2f4e831 100644 --- a/include/oox/drawingml/chart/chartdrawingfragment.hxx +++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + /** Relative shape position in a chart object. */ struct AnchorPosModel @@ -39,7 +39,7 @@ struct AnchorPosModel bool isValid() const { return (0.0 <= mfX) && (mfX <= 1.0) && (0.0 <= mfY) && (mfY <= 1.0); } }; -// ---------------------------------------------------------------------------- + /** Absolute shape size in a chart object (in EMUs). */ struct AnchorSizeModel : public EmuSize @@ -48,7 +48,7 @@ struct AnchorSizeModel : public EmuSize bool isValid() const { return (Width >= 0) && (Height >= 0); } }; -// ============================================================================ + /** Contains the position of a shape in the chart object. Supports different shape anchor modes (absolute, relative). @@ -75,7 +75,7 @@ private: typedef ::boost::shared_ptr< ShapeAnchor > ShapeAnchorRef; -// ============================================================================ + /** Handler for a chart drawing fragment (c:userShapes root element). */ @@ -104,7 +104,7 @@ private: bool mbOleSupport; /// True = allow to insert OLE objects into the drawing page. }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartspaceconverter.hxx b/include/oox/drawingml/chart/chartspaceconverter.hxx index e79cb70f1685..a273ba91dbd8 100644 --- a/include/oox/drawingml/chart/chartspaceconverter.hxx +++ b/include/oox/drawingml/chart/chartspaceconverter.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct ChartSpaceModel; @@ -46,7 +46,7 @@ public: const ::com::sun::star::awt::Point& rChartPos ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx index 6e927ba1d51a..83c35621c89c 100644 --- a/include/oox/drawingml/chart/chartspacefragment.hxx +++ b/include/oox/drawingml/chart/chartspacefragment.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct ChartSpaceModel; @@ -46,7 +46,7 @@ public: ::oox::core::XmlFilterBase& mpFilterBase; }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartspacemodel.hxx b/include/oox/drawingml/chart/chartspacemodel.hxx index 07f119e58240..cc9015d2020a 100644 --- a/include/oox/drawingml/chart/chartspacemodel.hxx +++ b/include/oox/drawingml/chart/chartspacemodel.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct ChartSpaceModel { @@ -62,7 +62,7 @@ struct ChartSpaceModel ~ChartSpaceModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx index f16950f85564..e58eb9df3456 100644 --- a/include/oox/drawingml/chart/converterbase.hxx +++ b/include/oox/drawingml/chart/converterbase.hxx @@ -44,7 +44,7 @@ class ChartConverter; struct ChartSpaceModel; struct ConverterData; -// ============================================================================ + const sal_Int32 API_PRIM_AXESSET = 0; const sal_Int32 API_SECN_AXESSET = 1; @@ -53,7 +53,7 @@ const sal_Int32 API_X_AXIS = 0; const sal_Int32 API_Y_AXIS = 1; const sal_Int32 API_Z_AXIS = 2; -// ============================================================================ + class ConverterRoot { @@ -98,7 +98,7 @@ private: ::boost::shared_ptr< ConverterData > mxData; }; -// ============================================================================ + /** Base class of all converter classes. Holds a reference to a model structure of the specified type. @@ -118,7 +118,7 @@ protected: ModelType& mrModel; }; -// ============================================================================ + /** A layout converter calculates positions and sizes for various chart objects. */ @@ -144,7 +144,7 @@ public: bool getAutoLayout(){return mrModel.mbAutoLayout;} }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx index 9fbe866944a2..d9274d70ab4c 100644 --- a/include/oox/drawingml/chart/datasourcecontext.hxx +++ b/include/oox/drawingml/chart/datasourcecontext.hxx @@ -26,13 +26,13 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataSequenceModel; typedef ContextBase< DataSequenceModel > DataSequenceContextBase; -// ============================================================================ + /** Handler for a double sequence context (c:numLit, c:numRef elements). */ @@ -49,7 +49,7 @@ private: sal_Int32 mnPtIndex; /// Current data point index. }; -// ============================================================================ + /** Handler for a string sequence context (c:multiLvlStrRef, c:strLit, c:strRef elements). @@ -67,7 +67,7 @@ private: sal_Int32 mnPtIndex; /// Current data point index. }; -// ============================================================================ + struct DataSourceModel; @@ -83,7 +83,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/datasourceconverter.hxx b/include/oox/drawingml/chart/datasourceconverter.hxx index 4f8b2523c355..6b6ce95d8dfe 100644 --- a/include/oox/drawingml/chart/datasourceconverter.hxx +++ b/include/oox/drawingml/chart/datasourceconverter.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataSequenceModel; @@ -45,7 +45,7 @@ public: createDataSequence( const OUString& rRole ); }; -// ============================================================================ + struct DataSourceModel; @@ -60,7 +60,7 @@ public: createDataSequence( const OUString& rRole ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index efbcf6868274..75a5d012f82b 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataSequenceModel { @@ -42,7 +42,7 @@ struct DataSequenceModel ~DataSequenceModel(); }; -// ============================================================================ + struct DataSourceModel { @@ -54,7 +54,7 @@ struct DataSourceModel ~DataSourceModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 12370e273c5f..d46ebbda7c50 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + template< typename ModelType > class ModelRef : public ::boost::shared_ptr< ModelType > @@ -51,7 +51,7 @@ public: ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) this->reset( new ModelType( rParam1 ) ); return **this; } }; -// ============================================================================ + template< typename ModelType > class ModelVector : public RefVector< ModelType > @@ -71,7 +71,7 @@ private: ModelType& append( ModelType* pModel ) { this->push_back( value_type( pModel ) ); return *pModel; } }; -// ============================================================================ + template< typename KeyType, typename ModelType > class ModelMap : public RefMap< KeyType, ModelType > @@ -92,7 +92,7 @@ private: ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; } }; -// ============================================================================ + struct NumberFormat { @@ -104,7 +104,7 @@ struct NumberFormat void setAttributes( const AttributeList& rAttribs ); }; -// ============================================================================ + struct LayoutModel { @@ -123,7 +123,7 @@ struct LayoutModel ~LayoutModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/objectformatter.hxx b/include/oox/drawingml/chart/objectformatter.hxx index dd3d15aa5653..ebe5a01d8991 100644 --- a/include/oox/drawingml/chart/objectformatter.hxx +++ b/include/oox/drawingml/chart/objectformatter.hxx @@ -34,7 +34,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + /** Enumerates different object types for specific automatic formatting behaviour. */ enum ObjectType @@ -67,7 +67,7 @@ enum ObjectType OBJECTTYPE_DATATABLE /// Data table. }; -// ============================================================================ + struct ChartSpaceModel; struct ObjectFormatterData; @@ -146,7 +146,7 @@ private: ::boost::shared_ptr< ObjectFormatterData > mxData; }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx index 9caec48c0d73..bb7195f2e75d 100644 --- a/include/oox/drawingml/chart/plotareacontext.hxx +++ b/include/oox/drawingml/chart/plotareacontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct View3DModel; @@ -41,7 +41,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct WallFloorModel; @@ -57,7 +57,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct DataTableModel; @@ -72,7 +72,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct PlotAreaModel; @@ -87,7 +87,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx index aa38194c0ffe..3123c1595ec4 100644 --- a/include/oox/drawingml/chart/plotareaconverter.hxx +++ b/include/oox/drawingml/chart/plotareaconverter.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct View3DModel; class TypeGroupConverter; @@ -47,7 +47,7 @@ public: TypeGroupConverter& rTypeGroup ); }; -// ============================================================================ + struct WallFloorModel; @@ -63,7 +63,7 @@ public: ObjectType eObjType ); }; -// ============================================================================ + struct DataTableModel; @@ -78,7 +78,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram); }; -// ============================================================================ + struct PlotAreaModel; @@ -107,7 +107,7 @@ private: bool mbPieChart; }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/plotareamodel.hxx b/include/oox/drawingml/chart/plotareamodel.hxx index 7852ba868278..f0dd30469ef7 100644 --- a/include/oox/drawingml/chart/plotareamodel.hxx +++ b/include/oox/drawingml/chart/plotareamodel.hxx @@ -29,7 +29,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct View3DModel { @@ -44,7 +44,7 @@ struct View3DModel ~View3DModel(); }; -// ============================================================================ + struct WallFloorModel { @@ -58,7 +58,7 @@ struct WallFloorModel ~WallFloorModel(); }; -// ============================================================================ + struct DataTableModel { @@ -69,7 +69,7 @@ struct DataTableModel ~DataTableModel(); }; -// ============================================================================ + struct PlotAreaModel { @@ -89,7 +89,7 @@ struct PlotAreaModel ~PlotAreaModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx index 730ea6735ccb..6ee9a83b32ab 100644 --- a/include/oox/drawingml/chart/seriescontext.hxx +++ b/include/oox/drawingml/chart/seriescontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataLabelModel; @@ -42,7 +42,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct DataLabelsModel; @@ -58,7 +58,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct PictureOptionsModel; @@ -73,7 +73,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct ErrorBarModel; @@ -88,7 +88,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct TrendlineLabelModel; @@ -103,7 +103,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct TrendlineModel; @@ -119,7 +119,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct DataPointModel; @@ -134,7 +134,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct SeriesModel; @@ -149,7 +149,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for area chart types (c:ser element). */ @@ -162,7 +162,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for bar chart types (c:ser element). */ @@ -175,7 +175,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for bubble chart types (c:ser element). */ @@ -188,7 +188,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for line and stock chart types (c:ser element). @@ -202,7 +202,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for pie and doughnut chart types (c:ser element). @@ -216,7 +216,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for radar chart types (c:ser element). */ @@ -229,7 +229,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for scatter chart types (c:ser element). */ @@ -242,7 +242,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for scatter chart types (c:ser element). */ @@ -255,7 +255,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/seriesconverter.hxx b/include/oox/drawingml/chart/seriesconverter.hxx index 0e7a5493649f..2cbd5665a5c5 100644 --- a/include/oox/drawingml/chart/seriesconverter.hxx +++ b/include/oox/drawingml/chart/seriesconverter.hxx @@ -37,7 +37,7 @@ class TypeGroupConverter; // #i66858# enable this when Chart2 supports smoothed lines per data series #define OOX_CHART_SMOOTHED_PER_SERIES 0 -// ============================================================================ + class DataLabelConverter : public ConverterBase< DataLabelModel > { @@ -59,7 +59,7 @@ public: bool bDataSeriesLabel ); }; -// ============================================================================ + class DataLabelsConverter : public ConverterBase< DataLabelsModel > { @@ -73,7 +73,7 @@ public: const TypeGroupConverter& rTypeGroup ); }; -// ============================================================================ + class ErrorBarConverter : public ConverterBase< ErrorBarModel > { @@ -90,7 +90,7 @@ private: createLabeledDataSequence( ErrorBarModel::SourceType eSourceType ); }; -// ============================================================================ + class TrendlineLabelConverter : public ConverterBase< TrendlineLabelModel > { @@ -102,7 +102,7 @@ public: void convertFromModel( PropertySet& rPropSet ); }; -// ============================================================================ + class TrendlineConverter : public ConverterBase< TrendlineModel > { @@ -115,7 +115,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries ); }; -// ============================================================================ + class DataPointConverter : public ConverterBase< DataPointModel > { @@ -130,7 +130,7 @@ public: const SeriesModel& rSeries ); }; -// ============================================================================ + class SeriesConverter : public ConverterBase< SeriesModel > { @@ -156,7 +156,7 @@ private: bool bUseTextLabel ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx index 1d426cbbd699..e6e8a01639a5 100644 --- a/include/oox/drawingml/chart/seriesmodel.hxx +++ b/include/oox/drawingml/chart/seriesmodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataLabelModelBase { @@ -51,7 +51,7 @@ struct DataLabelModelBase ~DataLabelModelBase(); }; -// ============================================================================ + struct DataLabelModel : public DataLabelModelBase { @@ -66,7 +66,7 @@ struct DataLabelModel : public DataLabelModelBase ~DataLabelModel(); }; -// ============================================================================ + struct DataLabelsModel : public DataLabelModelBase { @@ -81,7 +81,7 @@ struct DataLabelsModel : public DataLabelModelBase ~DataLabelsModel(); }; -// ============================================================================ + struct PictureOptionsModel { @@ -95,7 +95,7 @@ struct PictureOptionsModel ~PictureOptionsModel(); }; -// ============================================================================ + struct ErrorBarModel { @@ -120,7 +120,7 @@ struct ErrorBarModel ~ErrorBarModel(); }; -// ============================================================================ + struct TrendlineLabelModel { @@ -139,7 +139,7 @@ struct TrendlineLabelModel ~TrendlineLabelModel(); }; -// ============================================================================ + struct TrendlineModel { @@ -162,7 +162,7 @@ struct TrendlineModel ~TrendlineModel(); }; -// ============================================================================ + struct DataPointModel { @@ -183,7 +183,7 @@ struct DataPointModel ~DataPointModel(); }; -// ============================================================================ + struct SeriesModel { @@ -226,7 +226,7 @@ struct SeriesModel ~SeriesModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx index 75305ac03d84..4a7327290873 100644 --- a/include/oox/drawingml/chart/titlecontext.hxx +++ b/include/oox/drawingml/chart/titlecontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct TextModel; @@ -42,7 +42,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct TitleModel; @@ -57,7 +57,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct LegendModel; @@ -72,7 +72,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/titleconverter.hxx b/include/oox/drawingml/chart/titleconverter.hxx index c93682dd4a32..5515efbc5821 100644 --- a/include/oox/drawingml/chart/titleconverter.hxx +++ b/include/oox/drawingml/chart/titleconverter.hxx @@ -35,7 +35,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct TextModel; @@ -63,7 +63,7 @@ private: bool bAddNewLine ) const; }; -// ============================================================================ + struct TitleModel; @@ -80,7 +80,7 @@ public: sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ); }; -// ============================================================================ + struct LegendModel; @@ -95,7 +95,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/titlemodel.hxx b/include/oox/drawingml/chart/titlemodel.hxx index 0a138be9d3cd..3d140c93f755 100644 --- a/include/oox/drawingml/chart/titlemodel.hxx +++ b/include/oox/drawingml/chart/titlemodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct TextModel { @@ -41,7 +41,7 @@ struct TextModel ~TextModel(); }; -// ============================================================================ + struct TitleModel { @@ -60,7 +60,7 @@ struct TitleModel ~TitleModel(); }; -// ============================================================================ + struct LegendModel { @@ -78,7 +78,7 @@ struct LegendModel ~LegendModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx index ef3d5d19c199..9a6e559f823e 100644 --- a/include/oox/drawingml/chart/typegroupcontext.hxx +++ b/include/oox/drawingml/chart/typegroupcontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct UpDownBarsModel; @@ -41,12 +41,12 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct TypeGroupModel; typedef ContextBase< TypeGroupModel > TypeGroupContextBase; -// ============================================================================ + /** Handler for area type group contexts (c:area3DChart, c:areaChart elements). */ @@ -59,7 +59,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for bar type group contexts (c:bar3DChart, c:barChart elements). */ @@ -72,7 +72,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for bubble type group context (c:bubbleChart element). */ @@ -85,7 +85,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for line type group contexts (c:line3DChart, c:lineChart, c:stockChart elements). @@ -99,7 +99,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for pie type group contexts (c:doughnutChart, c:ofPieChart, c:pie3DChart, c:pieChart elements). @@ -113,7 +113,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for radar type group context (c:radarChart element). */ @@ -126,7 +126,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for scatter type group context (c:scatterChart element). */ @@ -139,7 +139,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for surface type group contexts (c:surface3DChart, c:surfaceChart elements). @@ -153,7 +153,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx index 510ebfae231e..2219e88df9fb 100644 --- a/include/oox/drawingml/chart/typegroupconverter.hxx +++ b/include/oox/drawingml/chart/typegroupconverter.hxx @@ -34,7 +34,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + /** Enumerates different chart types. */ enum TypeId @@ -55,7 +55,7 @@ enum TypeId TYPEID_UNKNOWN /// Default for unknown chart types. }; -// ---------------------------------------------------------------------------- + /** Enumerates different categories of similar chart types. */ enum TypeCategory @@ -68,7 +68,7 @@ enum TypeCategory TYPECATEGORY_SURFACE /// Surface charts. }; -// ---------------------------------------------------------------------------- + /** Enumerates modes for varying point colors in a series. */ enum VarPointMode @@ -78,7 +78,7 @@ enum VarPointMode VARPOINTMODE_MULTI /// Supported for multiple series in a chart type group. }; -// ============================================================================ + /** Contains info for a chart type related to the OpenOffice.org chart module. */ struct TypeGroupInfo @@ -101,7 +101,7 @@ struct TypeGroupInfo bool mbPictureOptions; /// True = bitmaps support options from c:pictureOptions. }; -// ============================================================================ + struct UpDownBarsModel; @@ -116,7 +116,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType ); }; -// ============================================================================ + struct TypeGroupModel; struct View3DModel; @@ -187,7 +187,7 @@ private: bool mb3dChart; /// True = type is a 3D chart type. }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/typegroupmodel.hxx b/include/oox/drawingml/chart/typegroupmodel.hxx index 5d705a47d5c4..695634ca246c 100644 --- a/include/oox/drawingml/chart/typegroupmodel.hxx +++ b/include/oox/drawingml/chart/typegroupmodel.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct UpDownBarsModel { @@ -40,7 +40,7 @@ struct UpDownBarsModel ~UpDownBarsModel(); }; -// ============================================================================ + struct TypeGroupModel { @@ -85,7 +85,7 @@ struct TypeGroupModel ~TypeGroupModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index d3cd6a697e64..951e52b82e04 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -35,7 +35,7 @@ namespace oox { class GraphicHelper; } namespace oox { namespace drawingml { -// ============================================================================ + class OOX_DLLPUBLIC Color { @@ -152,7 +152,7 @@ private: typedef boost::shared_ptr< Color > ColorPtr; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx index b2246db719c0..8f283dd85285 100644 --- a/include/oox/drawingml/colorchoicecontext.hxx +++ b/include/oox/drawingml/colorchoicecontext.hxx @@ -27,7 +27,7 @@ namespace drawingml { class Color; -// ============================================================================ + /** Context handler for the different color value elements (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ @@ -49,7 +49,7 @@ private: Color& mrColor; }; -// ============================================================================ + /** Context handler for elements that *contain* a color value element (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ @@ -67,7 +67,7 @@ private: Color& mrColor; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx index 9843138dc312..15fc22a440d5 100644 --- a/include/oox/drawingml/customshapegeometry.hxx +++ b/include/oox/drawingml/customshapegeometry.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { -// --------------------------------------------------------------------- + // CT_CustomGeometry2D class CustomShapeGeometryContext : public ::oox::core::ContextHandler2 { @@ -40,7 +40,7 @@ private: CustomShapeProperties& mrCustomShapeProperties; }; -// --------------------------------------------------------------------- + // CT_PresetGeometry2D class PresetShapeGeometryContext : public ::oox::core::ContextHandler2 { @@ -52,7 +52,7 @@ private: CustomShapeProperties& mrCustomShapeProperties; }; -// --------------------------------------------------------------------- + // CT_PresetTextShape class PresetTextShapeContext : public ::oox::core::ContextHandler2 { diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 4500428de628..340c93003148 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -35,7 +35,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + const sal_Int32 PER_PERCENT = 1000; const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; @@ -43,7 +43,7 @@ const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; const sal_Int32 PER_DEGREE = 60000; const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; -// ============================================================================ + struct LineProperties; typedef ::boost::shared_ptr< LineProperties > LinePropertiesPtr; @@ -75,7 +75,7 @@ typedef ::boost::shared_ptr< Shape > ShapePtr; class Theme; typedef ::boost::shared_ptr< Theme > ThemePtr; -// --------------------------------------------------------------------------- + namespace table { @@ -84,7 +84,7 @@ typedef ::boost::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table -// ============================================================================ + /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ); @@ -138,7 +138,7 @@ OOX_DLLPUBLIC const char* GetTextVerticalAdjust( ::com::sun::star::drawing::Text // Converts a Hatch object to an ooxml pattern. const char* GetHatchPattern( const ::com::sun::star::drawing::Hatch& rHatch ); -// ============================================================================ + // CT_IndexRange struct IndexRange { @@ -149,7 +149,7 @@ struct IndexRange { /** retrieve the content of CT_IndexRange */ IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); -// ============================================================================ + const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm. @@ -166,7 +166,7 @@ inline sal_Int32 convertEmuToHmm( sal_Int64 nValue ) return getLimitedValue< sal_Int32, sal_Int64 >( (nValue + nCorrection) / EMU_PER_HMM, SAL_MIN_INT32, SAL_MAX_INT32 ); } -// ============================================================================ + /** A structure for a point with 64-bit interger components. */ struct EmuPoint @@ -178,7 +178,7 @@ struct EmuPoint explicit EmuPoint( sal_Int64 nX, sal_Int64 nY ) : X( nX ), Y( nY ) {} }; -// ============================================================================ + /** A structure for a size with 64-bit interger components. */ struct EmuSize @@ -190,7 +190,7 @@ struct EmuSize explicit EmuSize( sal_Int64 nWidth, sal_Int64 nHeight ) : Width( nWidth ), Height( nHeight ) {} }; -// ============================================================================ + /** A structure for a rectangle with 64-bit interger components. */ struct EmuRectangle : public EmuPoint, public EmuSize @@ -203,7 +203,7 @@ struct EmuRectangle : public EmuPoint, public EmuSize void setSize( const EmuSize& rSize ) { static_cast< EmuSize& >( *this ) = rSize; } }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx index ed64d34bd1cd..83519c0221a7 100644 --- a/include/oox/drawingml/effectproperties.hxx +++ b/include/oox/drawingml/effectproperties.hxx @@ -15,7 +15,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + struct EffectShadowProperties { @@ -28,7 +28,7 @@ struct EffectShadowProperties void assignUsed( const EffectShadowProperties& rSourceProps ); }; -// ============================================================================ + struct OOX_DLLPUBLIC EffectProperties { @@ -43,7 +43,7 @@ struct OOX_DLLPUBLIC EffectProperties const GraphicHelper& rGraphicHelper ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx index dde9015085a4..570b273ad507 100644 --- a/include/oox/drawingml/effectpropertiescontext.hxx +++ b/include/oox/drawingml/effectpropertiescontext.hxx @@ -15,7 +15,7 @@ namespace oox { namespace drawingml { -// --------------------------------------------------------------------- + struct EffectProperties; diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index fba56a617997..f58803374f7e 100644 --- a/include/oox/drawingml/fillproperties.hxx +++ b/include/oox/drawingml/fillproperties.hxx @@ -38,7 +38,7 @@ namespace drawingml { class ShapePropertyMap; -// ============================================================================ + struct GradientFillProperties { @@ -57,7 +57,7 @@ struct GradientFillProperties void assignUsed( const GradientFillProperties& rSourceProps ); }; -// ============================================================================ + struct PatternFillProperties { @@ -69,7 +69,7 @@ struct PatternFillProperties void assignUsed( const PatternFillProperties& rSourceProps ); }; -// ============================================================================ + struct BlipFillProperties { @@ -99,7 +99,7 @@ struct BlipFillProperties void assignUsed( const BlipFillProperties& rSourceProps ); }; -// ============================================================================ + struct OOX_DLLPUBLIC FillProperties { @@ -126,7 +126,7 @@ struct OOX_DLLPUBLIC FillProperties bool bFlipV = false ) const; }; -// ============================================================================ + struct GraphicProperties { @@ -143,7 +143,7 @@ struct GraphicProperties sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx index 3e8795e4a554..bbeed0837903 100644 --- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx +++ b/include/oox/drawingml/fillpropertiesgroupcontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + /** Context handler that imports the a:solidFill element. */ class SolidFillContext : public ColorContext @@ -38,7 +38,7 @@ public: FillProperties& rFillProps ); }; -// ============================================================================ + /** Context handler that imports the a:gradFill element. */ class GradientFillContext : public ::oox::core::ContextHandler2 @@ -76,7 +76,7 @@ private: PatternFillProperties& mrPatternProps; }; - // ============================================================================ + /** Context handler that imports the a:duotone element containing the colors of a bitmap duotone transformation. */ @@ -99,7 +99,7 @@ private: int mnColorIndex; }; - // ============================================================================ + /** Context handler that imports the a:clrChange element containing the colors of a bitmap color change transformation. */ diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 322f08e2f95c..a9afc0b20ebd 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -36,7 +36,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; }; -// ==================================================================== + class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext { @@ -49,7 +49,7 @@ private: bool mbEmbedShapesInChart; }; -// ==================================================================== + class OleObjectGraphicDataContext : public ShapeContext { @@ -62,7 +62,7 @@ private: ::oox::vml::OleObjectInfo& mrOleObjectInfo; }; -// ==================================================================== + class Diagram; @@ -81,7 +81,7 @@ private: OUString msCs; }; -// ==================================================================== + class ChartGraphicDataContext : public ShapeContext { @@ -99,7 +99,7 @@ private: ChartShapeInfo& mrChartShapeInfo; }; -// ==================================================================== + } } diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx index 2b6494e13cfe..5e0c06212eaa 100644 --- a/include/oox/drawingml/lineproperties.hxx +++ b/include/oox/drawingml/lineproperties.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + struct LineArrowProperties { @@ -39,7 +39,7 @@ struct LineArrowProperties void assignUsed( const LineArrowProperties& rSourceProps ); }; -// ============================================================================ + struct OOX_DLLPUBLIC LineProperties { @@ -73,7 +73,7 @@ struct OOX_DLLPUBLIC LineProperties sal_Int32 getLineWidth() const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx index f888e9d76ba8..f302f11431b0 100644 --- a/include/oox/drawingml/linepropertiescontext.hxx +++ b/include/oox/drawingml/linepropertiescontext.hxx @@ -25,7 +25,7 @@ namespace oox { namespace drawingml { -// --------------------------------------------------------------------- + struct LineProperties; diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 1419a1563fc0..fa3f58c83d9c 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -54,7 +54,7 @@ struct ShapeStyleRef typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap; -// ============================================================================ + /** Additional information for a chart embedded in a drawing shape. */ struct ChartShapeInfo @@ -65,7 +65,7 @@ struct ChartShapeInfo explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} }; -// ============================================================================ + class OOX_DLLPUBLIC Shape : public boost::enable_shared_from_this< Shape > @@ -286,7 +286,7 @@ private: com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms; }; -// ============================================================================ + } } diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx index 8e5d4fae7fa1..24c22afbd744 100644 --- a/include/oox/drawingml/shape3dproperties.hxx +++ b/include/oox/drawingml/shape3dproperties.hxx @@ -34,7 +34,7 @@ namespace oox { namespace core { class ModelObjectContainer; } } namespace oox { namespace drawingml { -// ============================================================================ + struct Shape3DPropertyNames { @@ -59,7 +59,7 @@ struct Shape3DPropertyNames Shape3DPropertyNames(); }; -// ============================================================================ + struct Shape3DProperties { @@ -115,7 +115,7 @@ struct Shape3DProperties sal_Int32 nShapeRotation, sal_Int32 nPhClr ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 6a6628b02805..16daf319356a 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -28,7 +28,7 @@ namespace oox { class ModelObjectHelper; } namespace oox { namespace drawingml { -// ============================================================================ + /** Enumeration for various properties related to drawing shape formatting. @@ -66,7 +66,7 @@ enum ShapePropertyId SHAPEPROP_END }; -// ============================================================================ + struct OOX_DLLPUBLIC ShapePropertyInfo { @@ -89,7 +89,7 @@ struct OOX_DLLPUBLIC ShapePropertyInfo sal_Int32 operator[]( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; } }; -// ============================================================================ + class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap { @@ -138,7 +138,7 @@ private: ShapePropertyInfo maShapePropInfo; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx index 725f7b95c599..c32c91a58721 100644 --- a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx +++ b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace table { -// ============================================================================ + class TableStyleListFragmentHandler : public ::oox::core::FragmentHandler2 { @@ -45,7 +45,7 @@ private: TableStyleList& mrTableStyleList; }; -// ============================================================================ + } // namespace table } // namespace drawingml diff --git a/include/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx index 3fb0684ec95a..4a3be878688a 100644 --- a/include/oox/drawingml/textbodyproperties.hxx +++ b/include/oox/drawingml/textbodyproperties.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + struct TextBodyProperties { @@ -46,7 +46,7 @@ struct TextBodyProperties void pushVertSimulation(); }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx index bddd25c5f735..cdcdd268acfc 100644 --- a/include/oox/drawingml/textcharacterproperties.hxx +++ b/include/oox/drawingml/textcharacterproperties.hxx @@ -30,7 +30,7 @@ namespace oox { class PropertySet; } namespace oox { namespace drawingml { -// ============================================================================ + struct TextCharacterProperties { @@ -78,7 +78,7 @@ struct TextCharacterProperties bool bUseOptional = false ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/textfont.hxx b/include/oox/drawingml/textfont.hxx index d3361fc3757c..bb6ae6d2af82 100644 --- a/include/oox/drawingml/textfont.hxx +++ b/include/oox/drawingml/textfont.hxx @@ -28,7 +28,7 @@ namespace oox { namespace core { class XmlFilterBase; } } namespace oox { namespace drawingml { -// ============================================================================ + /** carries a CT_TextFont*/ class TextFont @@ -66,7 +66,7 @@ private: sal_Int32 mnCharset; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 2f0938f62295..d0c18100d734 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -29,7 +29,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + const sal_Int32 THEMED_STYLE_SUBTLE = 1; const sal_Int32 THEMED_STYLE_MODERATE = 2; @@ -40,7 +40,7 @@ typedef RefVector< LineProperties > LineStyleList; typedef RefVector< EffectProperties > EffectStyleList; typedef RefMap< sal_Int32, TextCharacterProperties > FontScheme; -// ============================================================================ + class OOX_DLLPUBLIC Theme { @@ -106,7 +106,7 @@ private: ::com::sun::star::xml::dom::XDocument> mxFragment; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index cf17903da7df..c0db743ebd7a 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -28,7 +28,7 @@ namespace drawingml { class Theme; -// ============================================================================ + class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2 { @@ -45,7 +45,7 @@ private: Theme& mrTheme; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 1a269553c50a..5c500e847161 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -27,7 +27,7 @@ namespace oox { namespace dump { -// ============================================================================ + class DffStreamObject : public SequenceRecordObjectBase { @@ -59,7 +59,7 @@ private: sal_Int32 mnRealSize; }; -// ============================================================================ + } // namespace dump } // namespace oox diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index ae879556e6ab..7cca4b4490f9 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -61,7 +61,7 @@ namespace oox { namespace core { namespace oox { namespace dump { -// ============================================================================ + #define OOX_DUMP_UNUSED "unused" #define OOX_DUMP_UNKNOWN "?unknown" @@ -97,8 +97,8 @@ typedef ::std::pair< sal_Int64, sal_Int64 > Int64Pair; typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< sal_Int64 > Int64Vector; -// ============================================================================ -// ============================================================================ + + /** Static helper functions for system file and stream access. */ class InputOutputHelper @@ -137,7 +137,7 @@ public: rtl_TextEncoding eTextEnc ); }; -// ============================================================================ + class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef { @@ -155,8 +155,8 @@ public: ::oox::BinaryInputStreamRef( rxInStrm ) {} }; -// ============================================================================ -// ============================================================================ + + /** Specifiers for atomic data types. */ enum DataType @@ -174,7 +174,7 @@ enum DataType DATATYPE_DOUBLE ///< Floating-point, double precision. }; -// ---------------------------------------------------------------------------- + /** Specifiers for the output format of values. */ enum FormatType @@ -188,7 +188,7 @@ enum FormatType FORMATTYPE_BOOL ///< Boolean ('true' or 'false'). }; -// ---------------------------------------------------------------------------- + /** Describes the output format of a data item. @@ -249,8 +249,8 @@ struct ItemFormat OUStringVector parse( const OUString& rFormatStr ); }; -// ============================================================================ -// ============================================================================ + + struct Address { @@ -260,7 +260,7 @@ struct Address explicit Address( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} }; -// ---------------------------------------------------------------------------- + struct Range { @@ -269,11 +269,11 @@ struct Range Range() {} }; -// ---------------------------------------------------------------------------- + typedef ::std::vector< Range > RangeList; -// ============================================================================ + struct TokenAddress : public Address { @@ -282,7 +282,7 @@ struct TokenAddress : public Address TokenAddress() : mbRelCol( false ), mbRelRow( false ) {} }; -// ---------------------------------------------------------------------------- + struct TokenRange { @@ -291,8 +291,8 @@ struct TokenRange TokenRange() {} }; -// ============================================================================ -// ============================================================================ + + /** Static helper functions for formatted output to strings. */ class StringHelper @@ -404,7 +404,7 @@ public: static void convertStringToIntList( Int64Vector& orVec, const OUString& rData, bool bIgnoreEmpty ); }; -// ---------------------------------------------------------------------------- + template< typename Type > void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) @@ -427,7 +427,7 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm } } -// ============================================================================ + class String : public OUString { @@ -443,8 +443,8 @@ public: static const String EMPTY_STRING; -// ============================================================================ -// ============================================================================ + + class Base; typedef ::boost::shared_ptr< Base > BaseRef; @@ -512,8 +512,8 @@ protected: virtual bool implIsValid() const = 0; }; -// ============================================================================ -// ============================================================================ + + class ConfigItemBase { @@ -551,7 +551,7 @@ private: const OUString& rData ); }; -// ============================================================================ + class SharedConfigData; class Config; @@ -641,7 +641,7 @@ private: const SharedConfigData& mrCfgData; }; -// ============================================================================ + class ConstList : public NameListBase { @@ -673,7 +673,7 @@ private: bool mbQuoteNames; }; -// ============================================================================ + class MultiList : public ConstList { @@ -697,7 +697,7 @@ private: bool mbIgnoreEmpty; }; -// ============================================================================ + class FlagsList : public NameListBase { @@ -728,7 +728,7 @@ private: sal_Int64 mnIgnore; }; -// ============================================================================ + class CombiList : public FlagsList { @@ -761,7 +761,7 @@ private: ExtItemFormatMap maFmtMap; }; -// ============================================================================ + class UnitConverter : public NameListBase { @@ -786,7 +786,7 @@ private: double mfFactor; }; -// ============================================================================ + class NameListWrapper { @@ -806,7 +806,7 @@ private: static const NameListWrapper NO_LIST; -// ============================================================================ + class ItemFormatMap : public ::std::map< sal_Int64, ItemFormat > { @@ -817,8 +817,8 @@ public: void insertFormats( const NameListRef& rxNameList ); }; -// ============================================================================ -// ============================================================================ + + class SharedConfigData : public Base, public ConfigItemBase { @@ -876,7 +876,7 @@ private: bool mbPwCancelled; }; -// ---------------------------------------------------------------------------- + template< typename ListType > ::boost::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) @@ -898,7 +898,7 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi xList->readConfigBlock( rStrm ); } -// ============================================================================ + class Config : public Base { @@ -964,7 +964,7 @@ private: typedef ::boost::shared_ptr< Config > ConfigRef; -// ---------------------------------------------------------------------------- + template< typename Type > Type Config::getIntOption( const String& rKey, Type nDefault ) const @@ -995,8 +995,8 @@ bool Config::hasName( const NameListWrapper& rListWrp, Type nKey ) const return xList.get() && xList->hasName( nKey ); } -// ============================================================================ -// ============================================================================ + + class Output : public Base { @@ -1005,7 +1005,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& rFileName ); - // ------------------------------------------------------------------------ + void newLine(); void emptyLine( size_t nCount = 1 ); @@ -1031,7 +1031,7 @@ public: void startMultiItems(); void endMultiItems(); - // ------------------------------------------------------------------------ + void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 ); void writeAscii( const sal_Char* pcStr ); @@ -1062,7 +1062,7 @@ public: void writeName( const Config& rCfg, Type nData, const NameListWrapper& rListWrp ) { writeString( rCfg.getName( rListWrp, nData ) ); } - // ------------------------------------------------------------------------ + protected: virtual bool implIsValid() const; @@ -1086,7 +1086,7 @@ private: typedef ::boost::shared_ptr< Output > OutputRef; -// ============================================================================ + class IndentGuard { @@ -1100,7 +1100,7 @@ private: Output& mrOut; }; -// ---------------------------------------------------------------------------- + class TableGuard { @@ -1124,7 +1124,7 @@ private: Output& mrOut; }; -// ---------------------------------------------------------------------------- + class ItemGuard { @@ -1140,7 +1140,7 @@ private: Output& mrOut; }; -// ---------------------------------------------------------------------------- + class MultiItemsGuard { @@ -1154,7 +1154,7 @@ private: Output& mrOut; }; -// ============================================================================ + class StorageIterator : public Base { @@ -1177,8 +1177,8 @@ private: OUStringVector::const_iterator maIt; }; -// ============================================================================ -// ============================================================================ + + class ObjectBase : public Base { @@ -1190,7 +1190,7 @@ public: void dump(); - // ------------------------------------------------------------------------ + protected: ObjectBase() {} @@ -1200,7 +1200,7 @@ protected: virtual bool implIsValid() const; virtual void implDump(); - // ------------------------------------------------------------------------ + Config& cfg() const { return *mxConfig; } @@ -1210,8 +1210,8 @@ private: typedef ::boost::shared_ptr< ObjectBase > ObjectRef; -// ============================================================================ -// ============================================================================ + + class StorageObjectBase : public ObjectBase { @@ -1284,15 +1284,15 @@ private: typedef ::boost::shared_ptr< StorageObjectBase > StorageObjectRef; -// ============================================================================ -// ============================================================================ + + class OutputObjectBase : public ObjectBase { public: virtual ~OutputObjectBase(); - // ------------------------------------------------------------------------ + protected: OutputObjectBase() {} @@ -1302,7 +1302,7 @@ protected: virtual bool implIsValid() const; - // ------------------------------------------------------------------------ + void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); @@ -1347,7 +1347,7 @@ protected: typedef ::boost::shared_ptr< OutputObjectBase > OutputObjectRef; -// ---------------------------------------------------------------------------- + template< typename Type > void OutputObjectBase::addNameToItem( Type nData, const NameListWrapper& rListWrp ) @@ -1454,15 +1454,15 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type mxOut->writeHex( nData2 ); } -// ============================================================================ -// ============================================================================ + + class InputObjectBase : public OutputObjectBase { public: virtual ~InputObjectBase(); - // ------------------------------------------------------------------------ + protected: InputObjectBase() {} @@ -1473,12 +1473,12 @@ protected: virtual bool implIsValid() const; - // ------------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getXInputStream() const; - // ------------------------------------------------------------------------ + void skipBlock( sal_Int64 nBytes, bool bShowSize = true ); void dumpRawBinary( sal_Int64 nBytes, bool bShowOffset = true, bool bStream = false ); @@ -1543,7 +1543,7 @@ protected: typedef ::boost::shared_ptr< InputObjectBase > InputObjectRef; -// ---------------------------------------------------------------------------- + template< typename Type > Type InputObjectBase::dumpName( const String& rName, const NameListWrapper& rListWrp ) @@ -1666,8 +1666,8 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep ) writeHexPairItem( rName, nData1, nData2, cSep ); } -// ============================================================================ -// ============================================================================ + + class BinaryStreamObject : public InputObjectBase { @@ -1683,8 +1683,8 @@ protected: virtual void implDump(); }; -// ============================================================================ -// ============================================================================ + + class TextStreamObjectBase : public InputObjectBase { @@ -1714,7 +1714,7 @@ protected: ::boost::shared_ptr< TextInputStream > mxTextStrm; }; -// ============================================================================ + class TextLineStreamObject : public TextStreamObjectBase { @@ -1735,7 +1735,7 @@ protected: virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; -// ============================================================================ + class XmlStreamObject : public TextStreamObjectBase { @@ -1749,8 +1749,8 @@ protected: virtual void implDumpText( TextInputStream& rTextStrm ); }; -// ============================================================================ -// ============================================================================ + + class RecordObjectBase : public InputObjectBase { @@ -1800,7 +1800,7 @@ private: bool mbBinaryOnly; }; -// ============================================================================ + class SequenceRecordObjectBase : public RecordObjectBase { @@ -1825,8 +1825,8 @@ private: StreamDataSeqRef mxRecData; }; -// ============================================================================ -// ============================================================================ + + /** Base class for a file dumper. Derived classes implement the implDump() function to add functionality. @@ -1846,8 +1846,8 @@ protected: void construct( const ConfigRef& rxConfig ); }; -// ============================================================================ -// ============================================================================ + + } // namespace dump } // namespace oox diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index b9cac39f7adb..014bdeb2974b 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -32,8 +32,8 @@ namespace com { namespace sun { namespace star { namespace oox { namespace dump { -// ============================================================================ -// ============================================================================ + + class OleInputObjectBase : public InputObjectBase { @@ -51,8 +51,8 @@ protected: sal_uInt32 dumpOleColor( const String& rName ); }; -// ============================================================================ -// ============================================================================ + + class StdFontObject : public OleInputObjectBase { @@ -63,7 +63,7 @@ protected: virtual void implDump(); }; -// ============================================================================ + class StdPicObject : public OleInputObjectBase { @@ -74,8 +74,8 @@ protected: virtual void implDump(); }; -// ============================================================================ -// ============================================================================ + + class OleStreamObject : public OleInputObjectBase { @@ -83,7 +83,7 @@ public: explicit OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); }; -// ============================================================================ + class OleCompObjObject : public OleStreamObject { @@ -94,8 +94,8 @@ protected: virtual void implDump(); }; -// ============================================================================ -// ============================================================================ + + class OlePropertyStreamObject : public InputObjectBase { @@ -136,7 +136,7 @@ private: bool mbIsUnicode; }; -// ============================================================================ + class OleStorageObject : public StorageObjectBase { @@ -156,8 +156,8 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ -// ============================================================================ + + class ComCtlObjectBase : public OleInputObjectBase { @@ -187,7 +187,7 @@ protected: bool mbComplexPart; }; -// ============================================================================ + class ComCtlScrollBarObject : public ComCtlObjectBase { @@ -198,7 +198,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlProgressBarObject : public ComCtlObjectBase { @@ -209,7 +209,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlSliderObject : public ComCtlObjectBase { @@ -220,7 +220,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlUpDownObject : public ComCtlObjectBase { @@ -231,7 +231,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlImageListObject : public ComCtlObjectBase { @@ -244,7 +244,7 @@ protected: virtual void implDumpCommonTrailing(); }; -// ============================================================================ + class ComCtlTabStripObject : public ComCtlObjectBase { @@ -256,7 +256,7 @@ protected: virtual void implDumpCommonExtra( sal_Int64 nEndPos ); }; -// ============================================================================ + class ComCtlTreeViewObject : public ComCtlObjectBase { @@ -271,7 +271,7 @@ private: sal_uInt32 mnStringFlags; }; -// ============================================================================ + class ComCtlStatusBarObject : public ComCtlObjectBase { @@ -284,8 +284,8 @@ protected: virtual void implDumpCommonTrailing(); }; -// ============================================================================ -// ============================================================================ + + class AxPropertyObjectBase : public OleInputObjectBase { @@ -395,7 +395,7 @@ private: bool mbValid; }; -// ---------------------------------------------------------------------------- + template< typename Type > void AxPropertyObjectBase::alignInput() @@ -425,7 +425,7 @@ Type AxPropertyObjectBase::dumpHexProperty( Type nDefault, const NameListWrapper return nDefault; } -// ============================================================================ + class AxCFontNewObject : public AxPropertyObjectBase { @@ -436,7 +436,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxColumnInfoObject : public AxPropertyObjectBase { @@ -447,7 +447,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxCommandButtonObject : public AxPropertyObjectBase { @@ -459,7 +459,7 @@ protected: virtual void implDumpExtended(); }; -// ============================================================================ + class AxMorphControlObject : public AxPropertyObjectBase { @@ -478,7 +478,7 @@ private: sal_uInt8 mnCtrlType; }; -// ============================================================================ + class AxLabelObject : public AxPropertyObjectBase { @@ -490,7 +490,7 @@ protected: virtual void implDumpExtended(); }; -// ============================================================================ + class AxImageObject : public AxPropertyObjectBase { @@ -501,7 +501,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxScrollBarObject : public AxPropertyObjectBase { @@ -512,7 +512,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxSpinButtonObject : public AxPropertyObjectBase { @@ -523,7 +523,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxTabStripObject : public AxPropertyObjectBase { @@ -538,8 +538,8 @@ private: sal_Int32 mnTabFlagCount; }; -// ============================================================================ -// ============================================================================ + + class FormControlStreamObject : public OleInputObjectBase { @@ -565,8 +565,8 @@ private: bool mbReadGuid; }; -// ============================================================================ -// ============================================================================ + + struct VbaFormSiteInfo { @@ -580,7 +580,7 @@ struct VbaFormSiteInfo typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; -// ============================================================================ + struct VbaFormSharedData { @@ -588,7 +588,7 @@ struct VbaFormSharedData VbaFormSiteInfoVector maSiteInfos; }; -// ============================================================================ + class VbaFormClassInfoObject : public AxPropertyObjectBase { @@ -602,7 +602,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaFormSiteObject : public AxPropertyObjectBase { @@ -616,7 +616,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaFormDesignExtObject : public AxPropertyObjectBase { @@ -627,7 +627,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class VbaFStreamObject : public AxPropertyObjectBase { @@ -653,7 +653,7 @@ private: sal_uInt32 mnFlags; }; -// ============================================================================ + class VbaOStreamObject : public OleInputObjectBase { @@ -671,7 +671,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaPageObject : public AxPropertyObjectBase { @@ -682,7 +682,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class VbaMultiPageObject : public AxPropertyObjectBase { @@ -697,7 +697,7 @@ private: sal_Int32 mnPageCount; }; -// ============================================================================ + class VbaXStreamObject : public InputObjectBase { @@ -715,7 +715,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaContainerStorageObject : public OleStorageObject { @@ -744,8 +744,8 @@ private: VbaFormSharedData maFormData; }; -// ============================================================================ -// ============================================================================ + + struct VbaSharedData { @@ -760,7 +760,7 @@ struct VbaSharedData sal_Int32 getStreamOffset( const OUString& rStrmName ) const; }; -// ============================================================================ + class VbaDirStreamObject : public SequenceRecordObjectBase { @@ -789,7 +789,7 @@ private: sal_Int32 mnCurrOffset; }; -// ============================================================================ + class VbaModuleStreamObject : public InputObjectBase { @@ -809,7 +809,7 @@ private: sal_Int32 mnStrmOffset; }; -// ============================================================================ + class VbaStorageObject : public OleStorageObject { @@ -831,7 +831,7 @@ private: VbaSharedData& mrVbaData; }; -// ============================================================================ + class VbaFormStorageObject : public VbaContainerStorageObject { @@ -853,7 +853,7 @@ private: VbaSharedData& mrVbaData; }; -// ============================================================================ + class VbaProjectStorageObject : public OleStorageObject { @@ -876,8 +876,8 @@ private: VbaSharedData maVbaData; }; -// ============================================================================ -// ============================================================================ + + class ActiveXStorageObject : public VbaContainerStorageObject { @@ -893,8 +893,8 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ -// ============================================================================ + + } // namespace dump } // namespace oox diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 05f9dc61200f..cdcf7e52dcfc 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -28,7 +28,7 @@ namespace oox { namespace dump { namespace pptx { -// ============================================================================ + class RootStorageObject : public StorageObjectBase { @@ -43,7 +43,7 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ + class Dumper : public DumperBase { @@ -59,7 +59,7 @@ protected: virtual void implDump(); }; -// ============================================================================ + } // namespace pptx } // namespace dump diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index 72b57d20cdfe..8f0845738d44 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -35,7 +35,7 @@ namespace oox { namespace dump { namespace xlsb { -// ============================================================================ + class RecordObjectBase : public SequenceRecordObjectBase { @@ -51,13 +51,13 @@ protected: OUString getErrorName( sal_uInt8 nErrCode ) const; - // ------------------------------------------------------------------------ + void readAddress( Address& orAddress ); void readRange( Range& orRange ); void readRangeList( RangeList& orRanges ); - // ------------------------------------------------------------------------ + void writeBooleanItem( const String& rName, sal_uInt8 nBool ); void writeErrorCodeItem( const String& rName, sal_uInt8 nErrCode ); @@ -65,7 +65,7 @@ protected: void writeFontPortions( const ::oox::xls::FontPortionModelList& rPortions ); void writePhoneticPortions( const ::oox::xls::PhoneticPortionModelList& rPhonetics ); - // ------------------------------------------------------------------------ + sal_uInt8 dumpBoolean( const String& rName = EMPTY_STRING ); sal_uInt8 dumpErrorCode( const String& rName = EMPTY_STRING ); @@ -82,7 +82,7 @@ protected: Range dumpRange( const String& rName = EMPTY_STRING ); void dumpRangeList( const String& rName = EMPTY_STRING ); - // ------------------------------------------------------------------------ + private: bool readCompressedInt( BinaryInputStream& rStrm, sal_Int32& ornValue ); @@ -93,7 +93,7 @@ private: NameListRef mxErrCodes; }; -// ============================================================================ + class RootStorageObject : public StorageObjectBase { @@ -108,7 +108,7 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ + class Dumper : public DumperBase { @@ -124,7 +124,7 @@ protected: virtual void implDump(); }; -// ============================================================================ + } // namespace xlsb } // namespace dump diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx index 657ee4d38e98..186d50a53bcc 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -33,21 +33,21 @@ # endif #endif -// --------------------------------------------------------------------------------------------- + static inline sal_Int64 PPTtoEMU( sal_Int32 nPPT ) { return (sal_Int64)( (double)nPPT * 1587.5 ); } -// --------------------------------------------------------------------------------------------- + static inline sal_Int64 MM100toEMU( sal_Int32 nMM100 ) { return (sal_Int64)nMM100 * 360; } -// --------------------------------------------------------------------------------------------- + static inline sal_Int64 TwipsToEMU( sal_Int32 nTwips ) { diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index e22e8164caf1..e95d82404159 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -33,7 +33,7 @@ namespace sax_fastparser { namespace oox { -// ============================================================================ + /** Static helpers for conversion of strings to attribute values of various different data types. @@ -64,7 +64,7 @@ public: static sal_Int32 decodeIntegerHex( const OUString& rValue ); }; -// ============================================================================ + /** Provides access to attribute values of an element. @@ -170,7 +170,7 @@ private: sax_fastparser::FastAttributeList *getAttribList() const; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index a63a36b6708a..6ad33a3dcf8b 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -32,7 +32,7 @@ namespace oox { class BinaryOutputStream; -// ============================================================================ + /** Interface for binary input stream classes. @@ -223,7 +223,7 @@ protected: typedef ::boost::shared_ptr< BinaryInputStream > BinaryInputStreamRef; -// ---------------------------------------------------------------------------- + template< typename Type > void BinaryInputStream::readValue( Type& ornValue ) @@ -266,7 +266,7 @@ void BinaryInputStream::skipArray( sal_Int32 nElemCount ) skip( nSkipSize, sizeof( Type ) ); } -// ============================================================================ + /** Wraps a UNO input stream and provides convenient access functions. @@ -318,7 +318,7 @@ private: bool mbAutoClose; ///< True = automatically close stream on destruction. }; -// ============================================================================ + /** Wraps a StreamDataSequence and provides convenient access functions. @@ -358,7 +358,7 @@ private: { return getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mpData->getLength() - mnPos ); } }; -// ============================================================================ + /** Wraps a BinaryInputStream and provides access to a specific part of the stream data. @@ -429,7 +429,7 @@ private: sal_Int64 mnSize; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 19fabc20217e..007a7e8e7865 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** Interface for binary output stream classes. @@ -90,7 +90,7 @@ void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount ) typedef ::boost::shared_ptr< BinaryOutputStream > BinaryOutputStreamRef; -// ---------------------------------------------------------------------------- + template< typename Type > void BinaryOutputStream::writeValue( Type nValue ) @@ -99,7 +99,7 @@ void BinaryOutputStream::writeValue( Type nValue ) writeMemory( &nValue, static_cast< sal_Int32 >( sizeof( Type ) ), sizeof( Type ) ); } -// ============================================================================ + /** Wraps a UNO output stream and provides convenient access functions. @@ -149,7 +149,7 @@ private: bool mbAutoClose; ///< True = automatically close stream on destruction. }; -// ============================================================================ + /** Wraps a StreamDataSequence and provides convenient access functions. @@ -180,7 +180,7 @@ public: SequenceOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 29deac9d6424..0f794ede13b0 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -33,7 +33,7 @@ namespace oox { typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence; -// ============================================================================ + /** Base class for binary stream classes. */ @@ -121,7 +121,7 @@ private: const bool mbSeekable; ///< True = implementation supports seeking. }; -// ============================================================================ + /** Base class for binary input and output streams wrapping a UNO stream, seekable via the com.sun.star.io.XSeekable interface. @@ -149,7 +149,7 @@ private: mxSeekable; ///< Stream seeking interface. }; -// ============================================================================ + /** Base class for binary input and output streams wrapping a StreamDataSequence, which is always seekable. @@ -178,7 +178,7 @@ protected: sal_Int32 mnPos; ///< Current position in the sequence. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 7e3b98b22daf..989c7e2d7bcf 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** A range of signed 32-bit integer values. */ struct ValueRange @@ -55,11 +55,11 @@ struct ValueRange bool intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); } }; -// ---------------------------------------------------------------------------- + typedef ::std::vector< ValueRange > ValueRangeVector; -// ---------------------------------------------------------------------------- + /** An ordered list of value ranges. The insertion operation will merge consecutive value ranges. @@ -81,7 +81,7 @@ private: ValueRangeVector maRanges; }; -// ============================================================================ + /** Template for a 2-dimensional array of objects. @@ -150,7 +150,7 @@ private: size_type mnWidth; }; -// ============================================================================ + /** Static helper functions for improved API container handling. */ class OOX_DLLPUBLIC ContainerHelper @@ -310,7 +310,7 @@ public: matrixToSequenceSequence( const MatrixType& rMatrix ); }; -// ---------------------------------------------------------------------------- + template< typename VectorType > /*static*/ const typename VectorType::value_type* ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex ) @@ -401,7 +401,7 @@ template< typename MatrixType > return aSeq; } -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index b96e99395708..8def09e3d31d 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** Provides helper functions for colors, device measurement conversion, graphics, and graphic objects handling. @@ -140,7 +140,7 @@ public: @return The original Graphic size in 100thmm */ ::com::sun::star::awt::Size getOriginalSize( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const; - // ------------------------------------------------------------------------ + private: typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette; typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque; @@ -159,7 +159,7 @@ private: double mfPixelPerHmmY; ///< Number of screen pixels per 1/100 mm in Y direction. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 9f4cac598e2d..a5563f40ac35 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -78,7 +78,7 @@ const sal_uInt8 WINDOWS_CHARSET_THAI = 222; const sal_uInt8 WINDOWS_CHARSET_EASTERN = 238; const sal_uInt8 WINDOWS_CHARSET_OEM = 255; -// ---------------------------------------------------------------------------- + const sal_Int32 API_RGB_TRANSPARENT = -1; ///< Transparent color for API calls. const sal_Int32 API_RGB_BLACK = 0x000000; ///< Black color for API calls. @@ -103,7 +103,7 @@ const sal_Int16 API_ESCAPE_SUBSCRIPT = -101; ///< Subscript: lower ch const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; ///< Relative character height if not escaped. const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; ///< Relative character height if escaped. -// ============================================================================ + // Limitate values ------------------------------------------------------------ @@ -183,7 +183,7 @@ void insertValue( Type& ornBitField, InsertType nValue, sal_uInt8 nStartBit, sal (ornBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); } -// ============================================================================ + /** Optional value, similar to ::boost::optional<>, with convenience accessors. */ @@ -218,7 +218,7 @@ private: bool mbHasValue; }; -// ============================================================================ + /** Provides platform independent functions to convert from or to little-endian byte order, e.g. for reading data from or writing data to memory or a @@ -282,7 +282,7 @@ private: #endif }; -// ---------------------------------------------------------------------------- + template< typename Type > inline void ByteOrderConverter::readLittleEndian( Type& ornValue, const void* pSrcBuffer ) @@ -326,7 +326,7 @@ inline void ByteOrderConverter::swap8( sal_uInt8* pnData ) } #endif -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 5efa05440165..e57e0149a3e1 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** This helper manages named objects in a container, which is created on demand. */ @@ -66,7 +66,7 @@ private: sal_Int32 mnIndex; ///< Index to create unique identifiers. }; -// ============================================================================ + /** Contains tables for named drawing objects for a document model. @@ -116,7 +116,7 @@ private: const OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index cdcbd0f462e3..ce08a6beccfd 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -58,7 +58,7 @@ public: typedef ::boost::shared_ptr< IProgressBar > IProgressBarRef; -// ---------------------------------------------------------------------------- + class ISegmentProgressBar; typedef ::boost::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; @@ -78,8 +78,8 @@ public: virtual ISegmentProgressBarRef createSegment( double fLength ) = 0; }; -// ============================================================================ -// ============================================================================ + + /** A simple progress bar. */ @@ -103,7 +103,7 @@ private: double mfPosition; }; -// ============================================================================ + /** A progress bar containing several independent segments. */ @@ -129,7 +129,7 @@ private: double mfFreeStart; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index e1dcb3989458..8c8f212ae967 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -37,7 +37,7 @@ namespace oox { struct PropertyNameVector; -// ============================================================================ + typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapBase; @@ -102,7 +102,7 @@ private: const PropertyNameVector* mpPropNames; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index 0e9170537559..359d27db4351 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -29,7 +29,7 @@ namespace oox { class PropertyMap; -// ============================================================================ + /** A wrapper for a UNO property set. @@ -119,7 +119,7 @@ public: void dump(); #endif - // ------------------------------------------------------------------------ + private: /** Gets the specified property from the property set. @return true, if the any could be filled with the property value. */ @@ -137,7 +137,7 @@ private: mxPropSetInfo; ///< Property information. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index a9fdfe071e35..d2bcd6215536 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -27,7 +27,7 @@ namespace oox { -// ============================================================================ + /** Template for a map of ref-counted objects with additional accessor functions. @@ -176,7 +176,7 @@ private: } }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index dd9fa14b7646..0b3595279ff4 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -27,7 +27,7 @@ namespace oox { -// ============================================================================ + /** Template for a vector of ref-counted objects with additional accessor functions. @@ -186,7 +186,7 @@ private: } }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 68f594015e91..84e86373aff0 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + class StorageBase; typedef ::boost::shared_ptr< StorageBase > StorageRef; @@ -182,7 +182,7 @@ private: bool mbReadOnly; ///< True = storage opened read-only (based on input stream). }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx index af412dede090..3158d88379b0 100644 --- a/include/oox/helper/textinputstream.hxx +++ b/include/oox/helper/textinputstream.hxx @@ -33,7 +33,7 @@ namespace oox { class BinaryInputStream; -// ============================================================================ + class TextInputStream { @@ -87,7 +87,7 @@ public: */ OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); - // ------------------------------------------------------------------------ + /** Creates a UNO text input stream object from the passed UNO input stream. */ @@ -97,7 +97,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc ); - // ------------------------------------------------------------------------ + private: void init( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, @@ -113,7 +113,7 @@ private: sal_Unicode mcPendingChar; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index 0338b8b7cc58..e3e544bcca33 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** Implements stream access for ZIP storages containing XML streams. */ class ZipStorage : public StorageBase @@ -79,7 +79,7 @@ private: mxStorage; ///< Storage based on input or output stream. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index c334d380dcf2..f722281a5375 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -28,7 +28,7 @@ namespace oox { namespace ole { -// ============================================================================ + /** A wrapper for a binary input stream that supports aligned read operations. @@ -81,7 +81,7 @@ private: sal_Int64 mnStrmSize; ///< Size of the wrapped stream data. }; -// ============================================================================ + /** A pair of integer values as a property. */ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; @@ -89,7 +89,7 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; /** An array of string values as a property. */ typedef ::std::vector< OUString > AxArrayString; -// ============================================================================ + /** Import helper to read simple and complex ActiveX form control properties from a binary input stream. */ @@ -247,7 +247,7 @@ private: bool mbValid; ///< True = stream still valid. }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index ba7a4866c50b..abb2fafbe645 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -16,7 +16,7 @@ namespace oox { namespace ole { -// ============================================================================ + /** A wrapper for a binary output stream that supports aligned write operations. @@ -75,7 +75,7 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; /** An array of string values as a property. */ typedef ::std::vector< OUString > AxStringArray; -// ============================================================================ + /** Export helper to write simple and complex ActiveX form control properties to a binary input stream. */ @@ -167,7 +167,7 @@ private: bool mb64BitPropFlags; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 90d48a51e2f7..15994434e67d 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -45,7 +45,7 @@ namespace oox { namespace oox { namespace ole { -// ============================================================================ + #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" @@ -54,7 +54,7 @@ namespace ole { const sal_uInt16 COMCTL_VERSION_50 = 5; const sal_uInt16 COMCTL_VERSION_60 = 6; -// ---------------------------------------------------------------------------- + #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-a777-00dd01143c57}" #define AX_GUID_LABEL "{978C9E23-D4B0-11CE-bf2d-00aa003f40d0}" @@ -141,7 +141,7 @@ const sal_Int32 AX_SCROLLBAR_NONE = 0x00; const sal_Int32 AX_SCROLLBAR_HORIZONTAL = 0x01; const sal_Int32 AX_SCROLLBAR_VERTICAL = 0x02; -// ---------------------------------------------------------------------------- + /** Enumerates all UNO API control types supported by these filters. */ enum ApiControlType @@ -166,7 +166,7 @@ enum ApiControlType API_CONTROL_DIALOG // 17 }; -// ============================================================================ + /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode @@ -184,7 +184,7 @@ enum ApiDefaultStateMode API_DEFAULTSTATE_TRISTATE ///< Control supports tri-state, state is given as short. }; -// ---------------------------------------------------------------------------- + /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. @@ -344,7 +344,7 @@ private: bool mbDefaultColorBgr; }; -// ============================================================================ + /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase @@ -391,7 +391,7 @@ protected: typedef ::boost::shared_ptr< ControlModelBase > ControlModelRef; -// ============================================================================ + /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase @@ -435,7 +435,7 @@ private: bool mbComplexPart; ///< True = the COMCTL_COMPLEXDATA part exists. }; -// ============================================================================ + /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase @@ -458,7 +458,7 @@ private: sal_Int32 mnPosition; ///< Value of the spin button. }; -// ============================================================================ + /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase @@ -479,7 +479,7 @@ private: sal_uInt16 mnSmooth; ///< 0 = progress blocks, 1 = pixel resolution. }; -// ============================================================================ + /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase @@ -490,7 +490,7 @@ public: virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); }; -// ============================================================================ + /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase @@ -514,7 +514,7 @@ private: bool mbSupportsAlign; ///< True = UNO model supports Align property. }; -// ============================================================================ + /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel @@ -543,7 +543,7 @@ public: // direct access needed for legacy VML drawing controls bool mbFocusOnClick; ///< True = take focus on click. }; -// ============================================================================ + /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel @@ -571,7 +571,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only). }; -// ============================================================================ + /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase @@ -618,7 +618,7 @@ public: std::vector< ::rtl::OUString > maTabNames; // names for each tab }; -// ============================================================================ + /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel @@ -655,7 +655,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only). }; -// ============================================================================ + /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase @@ -669,7 +669,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase @@ -683,7 +683,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase @@ -700,7 +700,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase @@ -714,7 +714,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase @@ -728,7 +728,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase @@ -742,7 +742,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase @@ -756,7 +756,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase @@ -785,7 +785,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnDelay; ///< Repeat delay in milliseconds. }; -// ============================================================================ + /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase @@ -816,7 +816,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnDelay; ///< Repeat delay in milliseconds. }; -// ============================================================================ + typedef ::std::vector< OUString > AxClassTable; @@ -859,7 +859,7 @@ public: // direct access needed for legacy VML drawing controls typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef; -// ============================================================================ + /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase @@ -893,7 +893,7 @@ public: sal_uInt32 mnTabStyle; }; -// ============================================================================ + /** Model for a Forms 2.0 user form. */ @@ -922,7 +922,7 @@ public: explicit HtmlTextBoxModel(); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); }; -// ============================================================================ + /** A form control embedded in a document draw page. Contains a specific model structure according to the type of the control. */ @@ -968,7 +968,7 @@ private: OUString maName; ///< Name of the control. }; -// ---------------------------------------------------------------------------- + template< typename ModelType > inline ModelType& EmbeddedControl::createModel() @@ -988,7 +988,7 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) return *xModel; } -// ============================================================================ + /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm @@ -1021,7 +1021,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxFormIC; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 92173c1851b7..3139060f9030 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -28,7 +28,7 @@ namespace ole { class ControlModelBase; class EmbeddedControl; -// ============================================================================ + /** Context handler for ActiveX form control model properties. */ class AxControlPropertyContext : public ::oox::core::ContextHandler2 @@ -46,7 +46,7 @@ private: sal_Int32 mnPropId; ///< Identifier of currently processed property. }; -// ============================================================================ + /** Fragment handler for an embedded ActiveX form control fragment. */ class AxControlFragment : public ::oox::core::FragmentHandler2 @@ -64,7 +64,7 @@ private: EmbeddedControl& mrControl; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index ce1b0f6aaaf5..c8e764e997cc 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -28,7 +28,7 @@ namespace oox { namespace ole { -// ============================================================================ + const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}"; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 0b5dc4f03a3d..82afa4173112 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -55,13 +55,13 @@ typedef ::boost::shared_ptr< oox::BinaryXInputStream > BinaryXInputStreamRef; namespace ole { -// ============================================================================ + #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDHLINK "{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}" -// ============================================================================ + const sal_uInt16 OLE_STDFONT_NORMAL = 400; const sal_uInt16 OLE_STDFONT_BOLD = 700; @@ -88,7 +88,7 @@ struct StdFontInfo sal_uInt8 nFlags = 0 ); }; -// ============================================================================ + /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo @@ -99,7 +99,7 @@ struct StdHlinkInfo OUString maFrame; }; -// ============================================================================ + /** Static helper functions for OLE import/export. */ class OOX_DLLPUBLIC OleHelper @@ -197,7 +197,7 @@ public: }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index d869712067f2..a723949f539c 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -33,7 +33,7 @@ namespace oox { class PropertyMap; } namespace oox { namespace ole { -// ============================================================================ + /** Contains generic information about an OLE object. */ struct OleObjectInfo @@ -48,7 +48,7 @@ struct OleObjectInfo explicit OleObjectInfo(); }; -// ============================================================================ + /** Helper for OLE object handling. */ class OleObjectHelper @@ -69,7 +69,7 @@ private: sal_Int32 mnObjectId; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 78e4c4c442a6..22223aee2785 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace ole { -// ============================================================================ + /** Implements stream access for binary OLE storages. */ class OOX_DLLPUBLIC OleStorage : public StorageBase @@ -100,7 +100,7 @@ private: const OleStorage* mpParentStorage; ///< Parent OLE storage that contains this storage. }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index fa0ed5ebeda0..01612bdbd332 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -33,7 +33,7 @@ namespace oox { class StorageBase; } namespace oox { namespace ole { -// ============================================================================ + /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ @@ -94,7 +94,7 @@ protected: typedef ::boost::shared_ptr< VbaSiteModel > VbaSiteModelRef; -// ============================================================================ + /** A control that is embedded in a VBA user form or in another container control in a VBA user form. @@ -171,7 +171,7 @@ private: AxClassTable maClassTable; ///< Class identifiers for exotic embedded controls. }; -// ============================================================================ + class VbaUserForm : public VbaFormControl { @@ -196,7 +196,7 @@ private: ControlConverter maConverter; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index a593a176ba4b..3f9202f5b1cb 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -49,7 +49,7 @@ const sal_uInt16 VBA_ID_PROJECTMODULES = 0x000F; const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; -// ============================================================================ + /** Static helper functions for the VBA filters. */ class VbaHelper @@ -88,7 +88,7 @@ private: ~VbaHelper(); }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index c4c4f0c1aa51..c0adb5bda13f 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -26,7 +26,7 @@ namespace oox { namespace ole { -// ============================================================================ + /** A non-seekable input stream that implements run-length decompression. */ class VbaInputStream : public BinaryInputStream @@ -64,7 +64,7 @@ private: size_t mnChunkPos; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 01678bec5264..03d64f6ecd9e 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -38,7 +38,7 @@ namespace oox { namespace oox { namespace ole { -// ============================================================================ + class VbaModule { @@ -99,7 +99,7 @@ private: bool mbExecutable; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 9c83c67f4eba..0bfd244d04d6 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -41,7 +41,7 @@ namespace oox { class GraphicHelper; } namespace oox { namespace ole { -// ============================================================================ + class OOX_DLLPUBLIC VbaFilterConfig { @@ -63,7 +63,7 @@ private: mxConfigAccess; }; -// ============================================================================ + /** Base class for objects that attach a amcro to a specific action. @@ -104,7 +104,7 @@ private: typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; -// ============================================================================ + class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig { @@ -205,7 +205,7 @@ private: VbaModuleMap maModulesByStrm; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index e01ac84eff5d..7f5da0c39730 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -25,7 +25,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 6252ad558dcf..730a0e839042 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class QuickDiagrammingImport : public oox::core::XmlFilterBase { diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 3030c2465251..64131975bfd2 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class QuickDiagrammingLayout : public oox::core::XmlFilterBase { diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 4143461f4d52..308a7fb60e9b 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class PowerPointImport : public oox::core::XmlFilterBase { diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index ce23fbe600da..ed6e343ce92e 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -46,7 +46,7 @@ enum ShapeLocation Slide }; -// --------------------------------------------------------------------- + class TimeNode; class SlidePersist; diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx index cf1d0fdd7fe4..46c89d658b80 100644 --- a/include/oox/token/namespacemap.hxx +++ b/include/oox/token/namespacemap.hxx @@ -26,7 +26,7 @@ namespace oox { -// ============================================================================ + /** A map that contains all XML namespace URLs used in the filters. */ struct NamespaceMap @@ -43,7 +43,7 @@ struct NamespaceMap /** Thread-save singleton of a map of all supported XML namespace URLs. */ struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; -// ============================================================================ + } // namespace oox diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx index f8e1bbe97d45..3d0c8db6134c 100644 --- a/include/oox/token/propertynames.hxx +++ b/include/oox/token/propertynames.hxx @@ -26,7 +26,7 @@ namespace oox { -// ============================================================================ + /** A vector that contains all predefined property names used in the filters. */ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; @@ -34,7 +34,7 @@ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVecto /** Thread-save singleton of a vector of all supported property names. */ struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; -// ============================================================================ + } // namespace oox diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index bddc0ce6a34d..122d51e03494 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -27,7 +27,7 @@ namespace oox { -// ============================================================================ + class TokenMap { @@ -81,11 +81,11 @@ private: sal_Int32 mnAlphaTokens[26]; }; -// ============================================================================ + struct StaticTokenMap : public ::rtl::Static< TokenMap, StaticTokenMap > {}; -// ============================================================================ + } // namespace oox diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index ae6f79e3375b..c6c53fd19409 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -47,7 +47,7 @@ namespace vml { class ShapeBase; struct ClientData; -// ============================================================================ + /** Enumerates different types of VML drawings. */ enum DrawingType @@ -57,7 +57,7 @@ enum DrawingType VMLDRAWING_POWERPOINT ///< PowerPoint: OLE objects are part of DrawingML. }; -// ============================================================================ + /** Contains information about an OLE object embedded in a draw page. */ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo @@ -88,7 +88,7 @@ struct OOX_DLLPUBLIC ControlInfo void setShapeId( sal_Int32 nShapeId ); }; -// ============================================================================ + /** Represents the collection of VML shapes for a complete draw page. */ class OOX_DLLPUBLIC Drawing @@ -203,7 +203,7 @@ private: const DrawingType meType; ///< Application type containing the drawing. }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index d896f1e92621..eb5bb5571567 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -28,7 +28,7 @@ namespace vml { class Drawing; -// ============================================================================ + class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2 { @@ -50,7 +50,7 @@ private: Drawing& mrDrawing; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index c7d84ffe8ffc..070fb2a7e41f 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -37,12 +37,12 @@ namespace oox { namespace oox { namespace vml { -// ============================================================================ + typedef ::std::pair< sal_Int32, sal_Int32 > Int32Pair; typedef ::std::pair< double, double > DoublePair; -// ============================================================================ + class OOX_DLLPUBLIC ConversionHelper { @@ -162,7 +162,7 @@ private: ~ConversionHelper(); }; -// ============================================================================ + /** The stroke arrow model structure contains all properties for an line end arrow. */ struct StrokeArrowModel @@ -174,7 +174,7 @@ struct StrokeArrowModel void assignUsed( const StrokeArrowModel& rSource ); }; -// ============================================================================ + /** The stroke model structure contains all shape border properties. */ struct StrokeModel @@ -198,7 +198,7 @@ struct StrokeModel const GraphicHelper& rGraphicHelper ) const; }; -// ============================================================================ + /** The fill model structure contains all shape fill properties. */ struct OOX_DLLPUBLIC FillModel @@ -224,7 +224,7 @@ struct OOX_DLLPUBLIC FillModel const GraphicHelper& rGraphicHelper ) const; }; -// ============================================================================ + /** The shadow model structure contains all shape shadow properties. */ struct OOX_DLLPUBLIC ShadowModel diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index 55d8b1d2eefd..af94056156b9 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace vml { -// ============================================================================ + typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream > InputStream_BASE; @@ -88,7 +88,7 @@ private: sal_Int32 mnBufferPos; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index e45c87d1139b..8e0183d9c445 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -40,7 +40,7 @@ class Drawing; struct ShapeParentAnchor; class ShapeContainer; -// ============================================================================ + const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0; const sal_Int32 VML_CLIENTDATA_CHECKED = 1; @@ -52,7 +52,7 @@ const sal_Int32 VML_CLIENTDATA_NUMBER = 2; const sal_Int32 VML_CLIENTDATA_REFERENCE = 3; const sal_Int32 VML_CLIENTDATA_FORMULA = 4; -// ============================================================================ + /** The shape model structure contains all properties shared by all types of shapes. */ struct OOX_DLLPUBLIC ShapeTypeModel @@ -109,7 +109,7 @@ struct OOX_DLLPUBLIC ShapeTypeModel void assignUsed( const ShapeTypeModel& rSource ); }; -// ---------------------------------------------------------------------------- + /** A shape template contains all formatting properties of shapes and can serve as templates for several shapes in a drawing. */ @@ -148,7 +148,7 @@ protected: ShapeTypeModel maTypeModel; ///< The model structure containing shape type data. }; -// ============================================================================ + /** Excel specific shape client data (such as cell anchor). */ struct ClientData @@ -186,7 +186,7 @@ struct ClientData explicit ClientData(); }; -// ---------------------------------------------------------------------------- + struct ShapeModel { @@ -217,7 +217,7 @@ struct ShapeModel ClientData& createClientData(); }; -// ---------------------------------------------------------------------------- + /** A shape object that is part of a drawing. May inherit properties from a shape template. */ @@ -278,7 +278,7 @@ protected: ShapeModel maShapeModel; ///< The model structure containing shape data. }; -// ============================================================================ + /** A simple shape object based on a specific UNO shape service. */ class SimpleShape : public ShapeBase @@ -303,7 +303,7 @@ private: OUString maService; ///< Name of the UNO shape service. }; -// ============================================================================ + /** A rectangular shape object. */ class RectangleShape : public SimpleShape @@ -318,7 +318,7 @@ protected: const com::sun::star::awt::Rectangle& rShapeRect) const; }; -// ============================================================================ + /** An oval shape object. */ class EllipseShape : public SimpleShape @@ -327,7 +327,7 @@ public: explicit EllipseShape( Drawing& rDrawing ); }; -// ============================================================================ + /** A polygon shape object. */ class PolyLineShape : public SimpleShape @@ -371,7 +371,7 @@ protected: const ::com::sun::star::awt::Rectangle& rShapeRect ) const; }; -// ============================================================================ + /** A shape object with custom geometry. */ class CustomShape : public SimpleShape @@ -387,7 +387,7 @@ protected: const ::com::sun::star::awt::Rectangle& rShapeRect ) const; }; -// ============================================================================ + /** A complex shape object. This can be a picture shape, a custom shape, an OLE object, or an ActiveX form control. */ @@ -404,7 +404,7 @@ protected: const ::com::sun::star::awt::Rectangle& rShapeRect ) const; }; -// ============================================================================ + /** A group shape that extends the basic shape by a container of child shapes. */ class GroupShape : public ShapeBase @@ -440,7 +440,7 @@ private: ShapeContainerPtr mxChildren; ///< Shapes and templates that are part of this group. }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index f927ec83f599..cc8058595cee 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -36,7 +36,7 @@ class Drawing; class ShapeType; class ShapeBase; -// ============================================================================ + struct ShapeParentAnchor { @@ -44,7 +44,7 @@ struct ShapeParentAnchor ::com::sun::star::awt::Rectangle maCoordSys; }; -// ============================================================================ + /** Container that holds a list of shapes and shape templates. */ class ShapeContainer @@ -121,7 +121,7 @@ private: std::stack< size_t > markStack; ///< Recursion marks from pushMark()/popMark(). }; -// ---------------------------------------------------------------------------- + template< typename ShapeT > ShapeT& ShapeContainer::createShape() @@ -143,7 +143,7 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const return maShapes.findIf( rFunctor ).get(); } -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index 1509fc9b4700..a4b6b6eb76ce 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -38,7 +38,7 @@ class RectangleShape; class ShapeContainer; -// ============================================================================ + class ShapeLayoutContext : public ::oox::core::ContextHandler2 { @@ -54,7 +54,7 @@ private: Drawing& mrDrawing; }; -// ============================================================================ + class ClientDataContext : public ::oox::core::ContextHandler2 { @@ -74,7 +74,7 @@ private: OUString maElementText; }; -// ============================================================================ + class ShapeContextBase : public ::oox::core::ContextHandler2 { @@ -90,7 +90,7 @@ protected: explicit ShapeContextBase( ::oox::core::ContextHandler2Helper& rParent ); }; -// ============================================================================ + class ShapeTypeContext : public ShapeContextBase { @@ -114,7 +114,7 @@ private: ShapeTypeModel& mrTypeModel; }; -// ============================================================================ + class ShapeContext : public ShapeTypeContext { @@ -148,7 +148,7 @@ private: ShapeModel& mrShapeModel; }; -// ============================================================================ + class GroupShapeContext : public ShapeContext { @@ -165,7 +165,7 @@ private: ShapeContainer& mrShapes; }; -// ============================================================================ + class RectangleShapeContext : public ShapeContext { @@ -178,7 +178,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index ecc04c097f26..3ff88d48804a 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -35,7 +35,7 @@ namespace vml { struct ShapeTypeModel; -// ============================================================================ + /// A text paragraph in a textbox. struct TextParagraphModel @@ -59,7 +59,7 @@ struct OOX_DLLPUBLIC TextFontModel explicit TextFontModel(); }; -// ============================================================================ + /** A text portion in a textbox with the same formatting for all characters. */ struct TextPortionModel @@ -71,7 +71,7 @@ struct TextPortionModel explicit TextPortionModel( const TextParagraphModel& rParagraph, const TextFontModel& rFont, const OUString& rText ); }; -// ============================================================================ + /** The textbox contains all text contents and properties. */ class OOX_DLLPUBLIC TextBox @@ -102,7 +102,7 @@ private: PortionVector maPortions; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index 740b816ecb82..b7d6d72323da 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -28,7 +28,7 @@ namespace oox { namespace vml { -// ============================================================================ + class TextPortionContext : public ::oox::core::ContextHandler2 { @@ -54,7 +54,7 @@ private: size_t mnInitialPortions; }; -// ============================================================================ + class TextBoxContext : public ::oox::core::ContextHandler2 { @@ -75,7 +75,7 @@ private: TextParagraphModel maParagraph; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h index e51711edd899..2d8636f5fd17 100644 --- a/include/osl/diagnose.h +++ b/include/osl/diagnose.h @@ -91,7 +91,7 @@ extern "C" { #endif /* __cplusplus */ -/* ////////////////////////////////////////////////////////////////////////// +/* Diagnostic support */ diff --git a/include/osl/file.hxx b/include/osl/file.hxx index 7bff7e6f20c2..2518e5fdc656 100644 --- a/include/osl/file.hxx +++ b/include/osl/file.hxx @@ -38,7 +38,7 @@ namespace osl { -// ----------------------------------------------------------------------------- + /** Base class for all File System specific objects. @see Directory @@ -319,7 +319,7 @@ public: }; -// ----------------------------------------------------------------------------- + /** The VolumeDevice class. @see VolumeInfo @@ -396,7 +396,7 @@ public: friend class VolumeInfo; }; -// ----------------------------------------------------------------------------- + class Directory; @@ -638,7 +638,7 @@ public: friend class Directory; }; -// ----------------------------------------------------------------------------- + class DirectoryItem; /** The FileStatus class. @@ -894,7 +894,7 @@ public: }; -// ----------------------------------------------------------------------------- + /** The file class object provides access to file contents and attributes. @see Directory @@ -1429,7 +1429,7 @@ public: friend class DirectoryItem; }; -// ----------------------------------------------------------------------------- + /** The directory item class object provides access to file status information. @see FileStatus @@ -1601,7 +1601,7 @@ public: friend class Directory; }; -//########################################### + /** Base class for observers of directory creation notifications. @@ -1630,7 +1630,7 @@ public: virtual void DirectoryCreated(const rtl::OUString& aDirectoryUrl) = 0; }; -//########################################### + // This just an internal helper function for // private use. extern "C" inline void SAL_CALL onDirectoryCreated(void* pData, rtl_uString* aDirectoryUrl) diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx index fe4766f5ff99..b4a8bc955eb3 100644 --- a/include/osl/pipe.hxx +++ b/include/osl/pipe.hxx @@ -23,22 +23,22 @@ namespace osl { - //______________________________________________________________________________ + inline Pipe::Pipe() : m_handle( 0 ) {} - //______________________________________________________________________________ + inline Pipe::Pipe(const ::rtl::OUString& strName, oslPipeOptions Options ) : m_handle( osl_createPipe( strName.pData, Options , 0 ) ) {} - //______________________________________________________________________________ + inline Pipe::Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const Security & rSecurity) : m_handle( osl_createPipe( strName.pData, Options , rSecurity.getHandle() ) ) {} - //______________________________________________________________________________ + inline Pipe::Pipe(const Pipe& pipe ) : m_handle( pipe.m_handle ) { @@ -46,12 +46,12 @@ namespace osl osl_acquirePipe( m_handle ); } - //______________________________________________________________________________ + inline Pipe::Pipe( oslPipe pipe, __sal_NoAcquire ) : m_handle ( pipe ) {} - //______________________________________________________________________________ + inline Pipe::Pipe(oslPipe pipe) : m_handle( pipe ) { @@ -59,14 +59,14 @@ namespace osl osl_acquirePipe( m_handle ); } - //______________________________________________________________________________ + inline Pipe::~Pipe() { if( m_handle ) osl_releasePipe( m_handle ); } - //______________________________________________________________________________ + inline bool Pipe::create( const ::rtl::OUString & strName, oslPipeOptions Options, const Security &rSec ) { @@ -74,20 +74,20 @@ namespace osl return is(); } - //______________________________________________________________________________ + inline bool Pipe::create( const ::rtl::OUString & strName, oslPipeOptions Options ) { *this = Pipe( strName, Options ); return is(); } - //______________________________________________________________________________ + inline Pipe& SAL_CALL Pipe::operator= (const Pipe& pipe) { *this = pipe.getHandle(); return *this; } - //______________________________________________________________________________ + inline Pipe & SAL_CALL Pipe::operator=( oslPipe pipe) { if( pipe ) @@ -98,25 +98,25 @@ namespace osl return *this; } - //______________________________________________________________________________ + inline bool SAL_CALL Pipe::is() const { return m_handle != 0; } - //______________________________________________________________________________ + inline bool SAL_CALL Pipe::operator==( const Pipe& rPipe ) const { return m_handle == rPipe.m_handle; } - //______________________________________________________________________________ + inline void SAL_CALL Pipe::close() { osl_closePipe( m_handle ); } - //______________________________________________________________________________ + inline void SAL_CALL Pipe::clear() { if( m_handle ) @@ -126,7 +126,7 @@ namespace osl } } - //______________________________________________________________________________ + inline oslPipeError SAL_CALL Pipe::accept(StreamPipe& Connection) { Connection = StreamPipe( osl_acceptPipe( m_handle ), SAL_NO_ACQUIRE); @@ -136,65 +136,65 @@ namespace osl return getError(); } - //______________________________________________________________________________ + inline oslPipeError SAL_CALL Pipe::getError() const { return osl_getLastPipeError( 0 ); } - //______________________________________________________________________________ + inline oslPipe SAL_CALL Pipe::getHandle() const { return m_handle; } - //______________________________________________________________________________ + inline StreamPipe::StreamPipe(){} - //______________________________________________________________________________ + inline StreamPipe::StreamPipe(oslPipe hPipe) : Pipe( hPipe ) { } - //______________________________________________________________________________ + inline StreamPipe::StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options, const Security &rSec ) : Pipe( strName, Options , rSec ) {} - //______________________________________________________________________________ + inline StreamPipe::StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options ) : Pipe( strName, Options ) {} - //______________________________________________________________________________ + inline StreamPipe::StreamPipe(const StreamPipe& aPipe) : Pipe( aPipe ) {} - //______________________________________________________________________________ + inline StreamPipe::StreamPipe( oslPipe pipe, __sal_NoAcquire noacquire ) : Pipe( pipe , noacquire ) {} - //______________________________________________________________________________ + inline sal_Int32 SAL_CALL StreamPipe::read(void* pBuffer, sal_Int32 n) const { return osl_readPipe( m_handle, pBuffer, n ); } - //______________________________________________________________________________ + inline sal_Int32 SAL_CALL StreamPipe::write(const void* pBuffer, sal_Int32 n) const { return osl_writePipe( m_handle, pBuffer , n ); } - //______________________________________________________________________________ + inline sal_Int32 SAL_CALL StreamPipe::recv(void* pBuffer, sal_Int32 BytesToRead) const { return osl_receivePipe( m_handle, pBuffer , BytesToRead ); } - //______________________________________________________________________________ + inline sal_Int32 SAL_CALL StreamPipe::send(const void* pBuffer, sal_Int32 BytesToSend) const { return osl_sendPipe( m_handle, pBuffer , BytesToSend ); diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx index f62f6f340a91..716f0256c52d 100644 --- a/include/osl/socket.hxx +++ b/include/osl/socket.hxx @@ -23,30 +23,30 @@ namespace osl { - //______________________________________________________________________________ + inline SocketAddr::SocketAddr() : m_handle( osl_createEmptySocketAddr( osl_Socket_FamilyInet ) ) {} - //______________________________________________________________________________ + inline SocketAddr::SocketAddr(const SocketAddr& Addr) : m_handle( osl_copySocketAddr( Addr.m_handle ) ) { } - //______________________________________________________________________________ + inline SocketAddr::SocketAddr(oslSocketAddr Addr) : m_handle( osl_copySocketAddr( Addr ) ) { } - //______________________________________________________________________________ + inline SocketAddr::SocketAddr(oslSocketAddr Addr, __osl_socket_NoCopy ) : m_handle( Addr ) { } - //______________________________________________________________________________ + inline SocketAddr::SocketAddr( const ::rtl::OUString& strAddrOrHostName, sal_Int32 nPort) : m_handle( osl_createInetSocketAddr( strAddrOrHostName.pData, nPort ) ) { @@ -67,14 +67,14 @@ namespace osl } } - //______________________________________________________________________________ + inline SocketAddr::~SocketAddr() { if( m_handle ) osl_destroySocketAddr( m_handle ); } - //______________________________________________________________________________ + inline ::rtl::OUString SocketAddr::getHostname( oslSocketResult *pResult ) const { ::rtl::OUString hostname; @@ -84,13 +84,13 @@ namespace osl return hostname; } - //______________________________________________________________________________ + inline sal_Int32 SAL_CALL SocketAddr::getPort() const { return osl_getInetPortOfSocketAddr(m_handle); } - //______________________________________________________________________________ + inline bool SAL_CALL SocketAddr::setPort( sal_Int32 nPort ) { return osl_setInetPortOfSocketAddr(m_handle, nPort ); @@ -102,7 +102,7 @@ namespace osl return is(); } - //______________________________________________________________________________ + inline bool SAL_CALL SocketAddr::setAddr( const ::rtl::ByteSequence & address ) { return osl_setAddrOfSocketAddr( m_handle, address.getHandle() ) @@ -118,7 +118,7 @@ namespace osl return sequence; } - //______________________________________________________________________________ + inline SocketAddr & SAL_CALL SocketAddr::operator= (oslSocketAddr Addr) { oslSocketAddr pNewAddr = osl_copySocketAddr( Addr ); @@ -128,7 +128,7 @@ namespace osl return *this; } - //______________________________________________________________________________ + inline SocketAddr & SAL_CALL SocketAddr::operator= (const SocketAddr& Addr) { *this = (Addr.getHandle()); @@ -143,7 +143,7 @@ namespace osl return *this; } - //______________________________________________________________________________ + inline bool SAL_CALL SocketAddr::operator== (oslSocketAddr Addr) const { return osl_isEqualSocketAddr( m_handle, Addr ); @@ -154,7 +154,7 @@ namespace osl return m_handle; } - //______________________________________________________________________________ + inline bool SocketAddr::is() const { return m_handle != 0; @@ -185,39 +185,39 @@ namespace osl return osl_getServicePort( strServiceName.pData, strProtocolName.pData ); } - //______________________________________________________________________________ + inline Socket::Socket(oslSocketType Type, oslAddrFamily Family, oslProtocol Protocol) : m_handle( osl_createSocket(Family, Type, Protocol) ) {} - //______________________________________________________________________________ + inline Socket::Socket( oslSocket socketHandle, __sal_NoAcquire ) : m_handle( socketHandle ) {} - //______________________________________________________________________________ + inline Socket::Socket( oslSocket socketHandle ) : m_handle( socketHandle ) { osl_acquireSocket( m_handle ); } - //______________________________________________________________________________ + inline Socket::Socket( const Socket & socket ) : m_handle( socket.getHandle() ) { osl_acquireSocket( m_handle ); } - //______________________________________________________________________________ + inline Socket::~Socket() { osl_releaseSocket( m_handle ); } - //______________________________________________________________________________ + inline Socket& Socket::operator= ( oslSocket socketHandle) { osl_acquireSocket( socketHandle ); @@ -226,43 +226,43 @@ namespace osl return *this; } - //______________________________________________________________________________ + inline Socket& Socket::operator= (const Socket& sock) { return (*this) = sock.getHandle(); } - //______________________________________________________________________________ + inline bool Socket::operator==( const Socket& rSocket ) const { return m_handle == rSocket.getHandle(); } - //______________________________________________________________________________ + inline bool Socket::operator==( const oslSocket socketHandle ) const { return m_handle == socketHandle; } - //______________________________________________________________________________ + inline void Socket::shutdown( oslSocketDirection Direction ) { osl_shutdownSocket( m_handle , Direction ); } - //______________________________________________________________________________ + inline void Socket::close() { osl_closeSocket( m_handle ); } - //______________________________________________________________________________ + inline void Socket::getLocalAddr( SocketAddr & addr) const { addr.assign( osl_getLocalAddrOfSocket( m_handle ) , SAL_NO_COPY ); } - //______________________________________________________________________________ + inline sal_Int32 Socket::getLocalPort() const { SocketAddr addr( 0 ); @@ -270,7 +270,7 @@ namespace osl return addr.getPort(); } - //______________________________________________________________________________ + inline ::rtl::OUString Socket::getLocalHost() const { SocketAddr addr( 0 ); @@ -278,13 +278,13 @@ namespace osl return addr.getHostname(); } - //______________________________________________________________________________ + inline void Socket::getPeerAddr( SocketAddr &addr ) const { addr.assign( osl_getPeerAddrOfSocket( m_handle ), SAL_NO_COPY ); } - //______________________________________________________________________________ + inline sal_Int32 Socket::getPeerPort() const { SocketAddr addr( 0 ); @@ -292,7 +292,7 @@ namespace osl return addr.getPort(); } - //______________________________________________________________________________ + inline ::rtl::OUString Socket::getPeerHost() const { SocketAddr addr( 0 ); @@ -300,37 +300,37 @@ namespace osl return addr.getHostname(); } - //______________________________________________________________________________ + inline bool Socket::bind(const SocketAddr& LocalInterface) { return osl_bindAddrToSocket( m_handle , LocalInterface.getHandle() ); } - //______________________________________________________________________________ + inline bool Socket::isRecvReady(const TimeValue *pTimeout ) const { return osl_isReceiveReady( m_handle , pTimeout ); } - //______________________________________________________________________________ + inline bool Socket::isSendReady(const TimeValue *pTimeout ) const { return osl_isSendReady( m_handle, pTimeout ); } - //______________________________________________________________________________ + inline bool Socket::isExceptionPending(const TimeValue *pTimeout ) const { return osl_isExceptionPending( m_handle, pTimeout ); } - //______________________________________________________________________________ + inline oslSocketType Socket::getType() const { return osl_getSocketType( m_handle ); } - //______________________________________________________________________________ + inline sal_Int32 Socket::getOption( oslSocketOption Option, void* pBuffer, @@ -340,7 +340,7 @@ namespace osl return osl_getSocketOption( m_handle, Level, Option, pBuffer , BufferLen ); } - //______________________________________________________________________________ + inline bool Socket::setOption( oslSocketOption Option, void* pBuffer, sal_uInt32 BufferLen, @@ -349,13 +349,13 @@ namespace osl return osl_setSocketOption( m_handle, Level, Option , pBuffer, BufferLen ); } - //______________________________________________________________________________ + inline bool Socket::setOption( oslSocketOption option, sal_Int32 nValue ) { return setOption( option, &nValue, sizeof( nValue ) ); } - //______________________________________________________________________________ + inline sal_Int32 Socket::getOption( oslSocketOption option ) const { sal_Int32 n; @@ -363,32 +363,32 @@ namespace osl return n; } - //______________________________________________________________________________ + inline bool Socket::enableNonBlockingMode( bool bNonBlockingMode) { return osl_enableNonBlockingMode( m_handle , bNonBlockingMode ); } - //______________________________________________________________________________ + inline bool Socket::isNonBlockingMode() const { return osl_isNonBlockingMode( m_handle ); } - //______________________________________________________________________________ + inline void SAL_CALL Socket::clearError() const { sal_Int32 err = 0; getOption(osl_Socket_OptionError, &err, sizeof(err)); } - //______________________________________________________________________________ + inline oslSocketError Socket::getError() const { return osl_getLastSocketError( m_handle ); } - //______________________________________________________________________________ + inline ::rtl::OUString Socket::getErrorAsString( ) const { ::rtl::OUString error; @@ -396,48 +396,48 @@ namespace osl return error; } - //______________________________________________________________________________ + inline oslSocket Socket::getHandle() const { return m_handle; } - //______________________________________________________________________________ + inline StreamSocket::StreamSocket(oslAddrFamily Family, oslProtocol Protocol, oslSocketType Type ) : Socket( Type, Family, Protocol ) {} - //______________________________________________________________________________ + inline StreamSocket::StreamSocket( oslSocket socketHandle, __sal_NoAcquire noacquire ) : Socket( socketHandle, noacquire ) {} - //______________________________________________________________________________ + inline StreamSocket::StreamSocket( oslSocket socketHandle ) : Socket( socketHandle ) {} - //______________________________________________________________________________ + inline StreamSocket::StreamSocket( const StreamSocket & socket ) : Socket( socket ) {} - //______________________________________________________________________________ + inline sal_Int32 StreamSocket::read(void* pBuffer, sal_uInt32 n) { return osl_readSocket( m_handle, pBuffer, n ); } - //______________________________________________________________________________ + inline sal_Int32 StreamSocket::write(const void* pBuffer, sal_uInt32 n) { return osl_writeSocket( m_handle, pBuffer, n ); } - //______________________________________________________________________________ + inline sal_Int32 StreamSocket::recv(void* pBuffer, sal_uInt32 BytesToRead, oslSocketMsgFlag Flag) @@ -445,7 +445,7 @@ namespace osl return osl_receiveSocket( m_handle, pBuffer,BytesToRead, Flag ); } - //______________________________________________________________________________ + inline sal_Int32 StreamSocket::send(const void* pBuffer, sal_uInt32 BytesToSend, oslSocketMsgFlag Flag) @@ -453,34 +453,34 @@ namespace osl return osl_sendSocket( m_handle, pBuffer, BytesToSend, Flag ); } - //______________________________________________________________________________ + inline ConnectorSocket::ConnectorSocket(oslAddrFamily Family, oslProtocol Protocol, oslSocketType Type) : StreamSocket( Family, Protocol ,Type ) {} - //______________________________________________________________________________ + inline oslSocketResult ConnectorSocket::connect( const SocketAddr& TargetHost, const TimeValue* pTimeout ) { return osl_connectSocketTo( m_handle , TargetHost.getHandle(), pTimeout ); } - //______________________________________________________________________________ + inline AcceptorSocket::AcceptorSocket(oslAddrFamily Family , oslProtocol Protocol , oslSocketType Type ) : Socket( Type, Family, Protocol ) {} - //______________________________________________________________________________ + inline bool AcceptorSocket::listen(sal_Int32 MaxPendingConnections) { return osl_listenOnSocket( m_handle, MaxPendingConnections ); } - //______________________________________________________________________________ + inline oslSocketResult AcceptorSocket::acceptConnection( StreamSocket& Connection) { oslSocket o = osl_acceptConnectionOnSocket( m_handle, 0 ); @@ -497,7 +497,7 @@ namespace osl return status; } - //______________________________________________________________________________ + inline oslSocketResult AcceptorSocket::acceptConnection( StreamSocket& Connection, SocketAddr & PeerAddr) { @@ -516,14 +516,14 @@ namespace osl return status; } - //______________________________________________________________________________ + inline DatagramSocket::DatagramSocket(oslAddrFamily Family, oslProtocol Protocol, oslSocketType Type) : Socket( Type, Family, Protocol ) {} - //______________________________________________________________________________ + inline sal_Int32 DatagramSocket::recvFrom(void* pBuffer, sal_uInt32 BufferSize, SocketAddr* pSenderAddr, @@ -545,7 +545,7 @@ namespace osl return nByteRead; } - //______________________________________________________________________________ + inline sal_Int32 DatagramSocket::sendTo( const SocketAddr& ReceiverAddr, const void* pBuffer, sal_uInt32 BufferSize, diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 6b3438cad3f6..09194c428a3e 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -87,7 +87,7 @@ REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void); class RegistryKey; -//----------------------------------------------------------------------------- + /** The Registry provides the functionality to read and write information in a registry file. @@ -231,7 +231,7 @@ protected: }; -//----------------------------------------------------------------------------- + /** RegistryKeyArray represents an array of open keys. @@ -312,7 +312,7 @@ protected: Registry m_registry; }; -//----------------------------------------------------------------------------- + /** RegistryValueList represents a value list of the specified type. @@ -386,7 +386,7 @@ protected: Registry m_registry; }; -//----------------------------------------------------------------------------- + /** RegistryKey reads or writes information of the underlying key in a registry. @@ -672,7 +672,7 @@ protected: }; -//----------------------------------------------------------------------------- + inline RegistryKeyArray::RegistryKeyArray() : m_length(0) @@ -722,7 +722,7 @@ inline RegError RegistryKeyArray::closeKeyHandles() return(REG_INVALID_KEY); } -//----------------------------------------------------------------------------- + inline RegistryKeyNames::RegistryKeyNames() : m_length(0) @@ -773,7 +773,7 @@ inline RegError RegistryKeyNames::freeKeyNames() return REG_INVALID_KEY; } -//----------------------------------------------------------------------------- + inline RegistryKey::RegistryKey() : m_hImpl(NULL) @@ -1146,7 +1146,7 @@ inline rtl::OUString RegistryKey::getRegistryName() return rtl::OUString(); } -//----------------------------------------------------------------------------- + inline Registry::Registry() : m_pApi(initRegistry_Api()) diff --git a/include/rtl/allocator.hxx b/include/rtl/allocator.hxx index acfd4233f86f..6f9152dbbd5e 100644 --- a/include/rtl/allocator.hxx +++ b/include/rtl/allocator.hxx @@ -27,7 +27,7 @@ /// @cond INTERNAL -//###################################################### + // This is no general purpose STL allocator but one // necessary to use STL for some implementation but // avoid linking sal against the STLPort library!!! @@ -51,49 +51,49 @@ public: typedef ::std::size_t size_type; typedef ::std::ptrdiff_t difference_type; - //----------------------------------------- + template<class U> struct rebind { typedef Allocator<U> other; }; - //----------------------------------------- + pointer address (reference value) const { return &value; } - //----------------------------------------- + const_pointer address (const_reference value) const { return &value; } - //----------------------------------------- + Allocator() SAL_THROW(()) {} - //----------------------------------------- + template<class U> Allocator (SAL_UNUSED_PARAMETER const Allocator<U>&) SAL_THROW(()) {} - //----------------------------------------- + Allocator(const Allocator&) SAL_THROW(()) {} - //----------------------------------------- + ~Allocator() SAL_THROW(()) {} - //----------------------------------------- + size_type max_size() const SAL_THROW(()) { return size_type(-1)/sizeof(T); } - //----------------------------------------- + /* Normally the code for allocate should throw a std::bad_alloc exception if the requested memory could not be allocated: @@ -120,13 +120,13 @@ public: rtl_allocateMemory(sal_uInt32(n * sizeof(T)))); } - //----------------------------------------- + void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type /* n */) { rtl_freeMemory(p); } - //----------------------------------------- + #if HAVE_CXX11_PERFECT_FORWARDING && !defined(_LIBCPP_VERSION) template< typename... Args > void construct (pointer p, Args &&... value) @@ -140,7 +140,7 @@ public: } #endif - //----------------------------------------- + void destroy (pointer p) { p->~T(); @@ -148,7 +148,7 @@ public: } }; -//###################################################### + // Custom STL allocators must be stateless (see // references above) that's why the operators below // return always true or false diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx index b46d0bcb77a1..a5b51ea6bebd 100644 --- a/include/rtl/bootstrap.hxx +++ b/include/rtl/bootstrap.hxx @@ -148,9 +148,9 @@ namespace rtl SAL_THROW(()); }; - //---------------------------------------------------------------------------- + // IMPLEMENTATION - //---------------------------------------------------------------------------- + inline void Bootstrap::setIniFilename( const ::rtl::OUString &sFile ) { rtl_bootstrap_setIniFileName( sFile.pData ); diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx index c84bc9f4f916..200cff3c95e5 100644 --- a/include/rtl/byteseq.hxx +++ b/include/rtl/byteseq.hxx @@ -28,25 +28,25 @@ namespace rtl { -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence() SAL_THROW(()) : _pSequence( 0 ) { ::rtl_byte_sequence_construct( &_pSequence, 0 ); } -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence( const ByteSequence & rSeq ) SAL_THROW(()) : _pSequence( 0 ) { ::rtl_byte_sequence_assign( &_pSequence, rSeq._pSequence ); } -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence( sal_Sequence *pSequence) SAL_THROW(()) : _pSequence( pSequence ) { ::rtl_byte_sequence_acquire( pSequence ); } -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence( const sal_Int8 * pElements, sal_Int32 len ) : _pSequence( 0 ) { @@ -54,7 +54,7 @@ inline ByteSequence::ByteSequence( const sal_Int8 * pElements, sal_Int32 len ) if (_pSequence == 0) throw ::std::bad_alloc(); } -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence( sal_Int32 len, enum __ByteSequence_NoDefault ) : _pSequence( 0 ) { @@ -62,12 +62,12 @@ inline ByteSequence::ByteSequence( sal_Int32 len, enum __ByteSequence_NoDefault if (_pSequence == 0) throw ::std::bad_alloc(); } -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence( sal_Sequence *pSequence, enum __ByteSequence_NoAcquire ) SAL_THROW(()) : _pSequence( pSequence ) { } -//__________________________________________________________________________________________________ + inline ByteSequence::ByteSequence( sal_Int32 len ) : _pSequence( 0 ) { @@ -75,23 +75,23 @@ inline ByteSequence::ByteSequence( sal_Int32 len ) if (_pSequence == 0) throw ::std::bad_alloc(); } -//__________________________________________________________________________________________________ + inline ByteSequence::~ByteSequence() SAL_THROW(()) { ::rtl_byte_sequence_release( _pSequence ); } -//__________________________________________________________________________________________________ + inline ByteSequence & ByteSequence::operator = ( const ByteSequence & rSeq ) SAL_THROW(()) { ::rtl_byte_sequence_assign( &_pSequence, rSeq._pSequence ); return *this; } -//__________________________________________________________________________________________________ + inline bool ByteSequence::operator == ( const ByteSequence & rSeq ) const SAL_THROW(()) { return ::rtl_byte_sequence_equals( _pSequence, rSeq._pSequence ); } -//__________________________________________________________________________________________________ + inline sal_Int8 * ByteSequence::getArray() { ::rtl_byte_sequence_reference2One( &_pSequence ); @@ -99,19 +99,19 @@ inline sal_Int8 * ByteSequence::getArray() throw ::std::bad_alloc(); return (sal_Int8 *)_pSequence->elements; } -//__________________________________________________________________________________________________ + inline void ByteSequence::realloc( sal_Int32 nSize ) { ::rtl_byte_sequence_realloc( &_pSequence, nSize ); if (_pSequence == 0) throw ::std::bad_alloc(); } -//__________________________________________________________________________________________________ + inline sal_Int8 & ByteSequence::operator [] ( sal_Int32 nIndex ) { return getArray()[ nIndex ]; } -//__________________________________________________________________________________________________ + inline bool ByteSequence::operator != ( const ByteSequence & rSeq ) const SAL_THROW(()) { return (! operator == ( rSeq )); diff --git a/include/rtl/logfile.hxx b/include/rtl/logfile.hxx index 82ed1687425b..f511819d311e 100644 --- a/include/rtl/logfile.hxx +++ b/include/rtl/logfile.hxx @@ -176,9 +176,9 @@ namespace rtl // Normal RTL_LOGFILE_* entries will not make it into release versions, // TIMELOG is disabled a few versions prior relase build. -// + // We need some logs also in these builds, eg. for making performance regression tests. -// + // POLICY: Don't use RTL_LOGFILE_PRODUCT_* for your personal logging information. // Be aware that these logs make it into the product shipped to customers. // If you have good reasons for doing this, please contact product management. diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 9a1cb9b5570e..28eca0cb9a72 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -29,7 +29,7 @@ namespace salhelper { -//---------------------------------------------------------------------------- + class ReferenceObject : public rtl::IReference { @@ -95,7 +95,7 @@ protected: } }; -//---------------------------------------------------------------------------- + } // namespace salhelper diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx index 70606c7a1fdc..a2bd33648092 100644 --- a/include/salhelper/singletonref.hxx +++ b/include/salhelper/singletonref.hxx @@ -64,7 +64,7 @@ namespace salhelper{ template< class SingletonClass > class SingletonRef { - //------------------------------------------- + // member private : @@ -75,12 +75,12 @@ class SingletonRef /** @short ref count, which regulate creation and removing of m_pInstance. */ static sal_Int32 m_nRef; - //------------------------------------------- + // interface public : - //--------------------------------------- + /** @short standard ctor. @@ -104,7 +104,7 @@ class SingletonRef // <- GLOBAL SAFE } - //--------------------------------------- + /** @short standard dtor. @@ -129,7 +129,7 @@ class SingletonRef // <- GLOBAL SAFE } - //--------------------------------------- + /** @short Allows rSingle->someBodyOp(). */ @@ -141,7 +141,7 @@ class SingletonRef // <- GLOBAL SAFE } - //--------------------------------------- + /** @short Allows (*rSingle).someBodyOp(). */ @@ -153,12 +153,12 @@ class SingletonRef // <- GLOBAL SAFE } - //------------------------------------------- + // helper private : - //--------------------------------------- + /** @short creates an own mutex for guarding static contents. diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index 8b4b79b50a3e..1bf190fc270a 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -36,7 +36,7 @@ class XFastTokenHandler; namespace sax_fastparser { -// -------------------------------------------------------------------- + class FastSaxParserImpl; diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 5fb236529461..38a81548a9c7 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -30,15 +30,15 @@ #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <vector> -//________________________________________________________________________________________________________________ + // some other includes -//________________________________________________________________________________________________________________ + #include <sfx2/viewfrm.hxx> -//________________________________________________________________________________________________________________ + // forwards, typedefs, declarations -//________________________________________________________________________________________________________________ + class SystemWindow; class SfxSlot; @@ -74,7 +74,7 @@ enum SfxPopupAction SFX_POPUP_SHOW }; -//==================================================================== + class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster /* [Description] @@ -215,7 +215,7 @@ public: #define DLEAVEREGISTRATIONS() LeaveRegistrations() #endif -//-------------------------------------------------------------------- + inline bool SfxBindings::IsInRegistrations() const @@ -240,7 +240,7 @@ inline bool SfxBindings::IsInRegistrations() const return 0 != nRegLevel; } -//-------------------------------------------------------------------- + #endif diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 83a85e94c3bb..e0de7c7bef92 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -228,7 +228,7 @@ public: SAL_DLLPRIVATE void SetFactory_Impl( SfxChildWinFactory* ); }; -//------------------------------------------------------------------ + //! soon obsolete ! #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ static SfxChildWindowContext* CreateImpl(::Window *pParent, \ @@ -364,7 +364,7 @@ public: ((SfxToolbox*)GetWindow())->FillInfo( aInfo ); \ return aInfo; } -//------------------------------------------------------------------ + #endif diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index fcf94f2dec8c..96dfd7280123 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -33,20 +33,20 @@ #include <svtools/valueset.hxx> #include <svtools/ctrlbox.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + /** List position type of VCL ListBox. */ typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ typedef sal_uInt16 ValueSetPosType; -// ============================================================================ + // Helpers -// ============================================================================ + /** A helper class for mapping list positions from/to represented values. @@ -99,9 +99,9 @@ private: PosT mnNFPos; /// Special "not found" list position. }; -// ============================================================================ + // Base control wrapper classes -// ============================================================================ + /** Base class for all control wrappers. @@ -167,9 +167,9 @@ private: ControlWrapperBase& operator=( const ControlWrapperBase& ); }; -// ============================================================================ + // Single control wrappers -// ============================================================================ + /** Base class template for control wrappers containing one single control. @@ -212,7 +212,7 @@ private: ControlT& mrControl; /// The control of this wrapper. }; -// ============================================================================ + /** A dummy wrapper for a VCL Window that does nothing special. @@ -233,7 +233,7 @@ public: virtual void SetControlValue( void* ); }; -// ---------------------------------------------------------------------------- + /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: @@ -249,7 +249,7 @@ public: virtual void SetControlValue( sal_Bool bValue ); }; -// ---------------------------------------------------------------------------- + /** A wrapper for the SVTOOLS ColorListBox. */ class SFX2_DLLPUBLIC ColorListBoxWrapper: @@ -270,7 +270,7 @@ public: virtual void SetControlValue( Color aColor ); }; -// ============================================================================ + /** A wrapper for the VCL NumericField. */ template< typename ValueT > @@ -287,7 +287,7 @@ public: virtual void SetControlValue( ValueT nValue ); }; -// ---------------------------------------------------------------------------- + typedef NumericFieldWrapper< sal_Int16 > Int16NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper; @@ -297,7 +297,7 @@ typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper; typedef NumericFieldWrapper< sal_uIntPtr > ULongNumericFieldWrapper; -// ============================================================================ + /** A wrapper for the VCL MetricField. @@ -322,7 +322,7 @@ private: FieldUnit meUnit; }; -// ---------------------------------------------------------------------------- + typedef MetricFieldWrapper< sal_Int16 > Int16MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper; @@ -332,7 +332,7 @@ typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper; typedef MetricFieldWrapper< sal_uIntPtr > ULongMetricFieldWrapper; -// ============================================================================ + /** A wrapper for the VCL ListBox. @@ -364,7 +364,7 @@ public: virtual void SetControlValue( ValueT nValue ); }; -// ---------------------------------------------------------------------------- + typedef ListBoxWrapper< sal_Int16 > Int16ListBoxWrapper; typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper; @@ -374,7 +374,7 @@ typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper; typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper; typedef ListBoxWrapper< sal_uIntPtr > ULongListBoxWrapper; -// ============================================================================ + /** A wrapper for the SVTOOLS ValueSet. @@ -406,7 +406,7 @@ public: virtual void SetControlValue( ValueT nValue ); }; -// ---------------------------------------------------------------------------- + typedef ValueSetWrapper< sal_Int16 > Int16ValueSetWrapper; typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper; @@ -416,9 +416,9 @@ typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper; typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper; typedef ValueSetWrapper< sal_uIntPtr > ULongValueSetWrapper; -// ============================================================================ + // Multi control wrappers -// ============================================================================ + struct MultiControlWrapperHelper_Impl; @@ -451,7 +451,7 @@ private: std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; }; -// ---------------------------------------------------------------------------- + /** A multi control wrapper with extended interface. @@ -488,16 +488,16 @@ private: ValueT maDefValue; }; -// ============================================================================ -// ============================================================================ + + // *** Implementation of template functions *** -// ============================================================================ -// ============================================================================ + + // Helpers -// ============================================================================ + template< typename PosT, typename ValueT > ValueT PosValueMapper< PosT, ValueT >::GetValueFromPos( PosT nPos ) const @@ -535,9 +535,9 @@ PosT PosValueMapper< PosT, ValueT >::GetPosFromValue( ValueT nValue ) const return nPos; } -// ============================================================================ + // Single control wrappers -// ============================================================================ + template< typename ControlT, typename ValueT > inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eEnable, TriState eShow ) @@ -548,7 +548,7 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE mrControl.Show( eShow == TRISTATE_TRUE ); } -// ============================================================================ + template< typename ValueT > bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const @@ -575,7 +575,7 @@ void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SetValue( this->GetControl().Normalize( static_cast< sal_Int64 >( nValue ) ) ); } -// ============================================================================ + template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const @@ -602,7 +602,7 @@ void MetricFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SetValue( this->GetControl().Normalize( static_cast< sal_Int64 >( nValue ) ), meUnit ); } -// ============================================================================ + template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const @@ -618,7 +618,7 @@ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SelectEntryPos( nPos ); } -// ---------------------------------------------------------------------------- + template< typename ValueT > ValueT ValueSetWrapper< ValueT >::GetControlValue() const @@ -634,7 +634,7 @@ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) this->GetControl().SelectItem( nPos ); } -// ============================================================================ + } // namespace sfx diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 91bde6c834bc..c693fc961cf6 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -80,7 +80,7 @@ public: SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* ); }; -//==================================================================== + class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem { diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index fbc9ff2d1de2..74a3af3cd4a8 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -23,7 +23,7 @@ class VclBuilderContainer; //right, get both of their non-preview areas to request the same size so that //the preview appears in the same place in each one so flipping between tabs //isn't distracting as it jumps around -// + //there has to be a "maingrid" container which contains all the widgets //except for the preview widget void SFX2_DLLPUBLIC setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 49e4c1d58711..6c7e175abdf1 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -54,13 +54,13 @@ namespace com } } -//========================================================================= + #define SFX_SHELL_POP_UNTIL 4 #define SFX_SHELL_POP_DELETE 2 #define SFX_SHELL_PUSH 1 -//========================================================================= + class SFX2_DLLPUBLIC SfxDispatcher { diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 095691c5b9d9..016f94a3f0b7 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -29,14 +29,14 @@ #include <boost/shared_ptr.hpp> -//........................................................................ + namespace sfx2 { -//........................................................................ - //==================================================================== + + //= IMacroDocumentAccess - //==================================================================== + /** provides access to several settings of a document, which are needed by ->DocumentMacroMode to properly determine the current macro execution mode of this document */ @@ -186,9 +186,9 @@ namespace sfx2 ~IMacroDocumentAccess() {} }; - //==================================================================== + //= DocumentMacroMode - //==================================================================== + struct DocumentMacroMode_Data; /** encapsulates handling the macro mode of a document @@ -319,9 +319,9 @@ namespace sfx2 ::boost::shared_ptr< DocumentMacroMode_Data > m_pData; }; -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_DOCMACROMODE_HXX diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index 3be4a5ef30b2..21d13a60884d 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -28,14 +28,14 @@ namespace comphelper { class SolarMutex; } -//........................................................................ + namespace sfx2 { -//........................................................................ - //==================================================================== + + //= IModifiableDocument - //==================================================================== + /** callback for the DocumentStorageModifyListener class */ class SAL_NO_VTABLE IModifiableDocument @@ -48,9 +48,9 @@ namespace sfx2 ~IModifiableDocument() {} }; - //==================================================================== + //= DocumentStorageModifyListener - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::util::XModifyListener > DocumentStorageModifyListener_Base; class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base @@ -78,9 +78,9 @@ namespace sfx2 DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ); // never implemented }; -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 8fa2391bd469..2bebdddc6d01 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -33,7 +33,7 @@ class SfxObjectShell; -//------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { @@ -59,7 +59,7 @@ public: { return pObjShell; } }; -//------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint { @@ -82,7 +82,7 @@ public: { return xViewController; } }; -//------------------------------------------------------------------- + class SfxNamedHint : public SfxHint { diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 8cdd19ea22c6..0f7f20d73603 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -94,7 +94,7 @@ public: void AddEvent( const OUString&, const OUString&, sal_uInt16 ); }; -// ----------------------------------------------------------------------- + #define PROP_EVENT_TYPE "EventType" #define PROP_LIBRARY "Library" diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 94bee5ffa9b6..d44e11482e60 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -86,7 +86,7 @@ typedef ::std::vector<OUString> TargetList; #define SFXFRAME_HASTITLE 0x0001 -//========================================================================== + // SfxFrame is a management class for windows and their content. // A SfxApplication represent a hierarchy of SfxFrames, with which the actual // content in the derived classes is defined. The base class SfxFrame @@ -96,7 +96,7 @@ typedef ::std::vector<OUString> TargetList; // parent. By calling DoCloser() on any frame in the hierarchy, // a part of the "framework" can be removed, where frames unsubscribe // from their parent frames. -//========================================================================== + class SFX2_DLLPUBLIC SfxFrame { @@ -224,7 +224,7 @@ public: SfxFrame* NextFrame( SfxFrame& rPrev ); }; -//-------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index c6452b1bd829..ebc40e4cb432 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -32,7 +32,7 @@ struct SfxFrameDescriptor_Impl; class SfxFrameDescriptor; class Wallpaper; -//=========================================================================== + // The SfxFrame descriptors build a recursive structure, that covers all the // required data in-order to display the frame document. // Through a SfxFrameSetDescriptor access is given to the whole underlying @@ -41,7 +41,7 @@ class Wallpaper; // describes the view on it. The FrameSet is made up of lines, which in turn, // contains the actual window . A line can be horizontally or vertically // aligned, from which also the alignment of the FrameSet is given. -//=========================================================================== + enum ScrollingMode { diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index b9aca77fc3f2..f840f9619b23 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -22,11 +22,11 @@ #include <sfx2/genlink.hxx> #include <tools/ref.hxx> -//=================================================================== + class SfxHint; -//------------------------------------------------------------------- + class SfxHintPoster: public SvRefBase @@ -59,7 +59,7 @@ public: void SetEventHdl( const GenLink& rLink ); }; -//------------------------------------------------------------------- + SV_DECL_IMPL_REF(SfxHintPoster); diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 9550d3b64ed8..3c5864d03f7e 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -36,7 +36,7 @@ class SfxObjectShell; class Window; class Fraction; -//========================================================================= + class SFX2_DLLPUBLIC SfxInPlaceClient { diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 05126e05cdf4..789a7085cab6 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -29,11 +29,11 @@ #include <sfx2/itemwrapper.hxx> #include <sfx2/controlwrapper.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + typedef int ItemConnFlags; @@ -55,9 +55,9 @@ const ItemConnFlags ITEMCONN_HIDE_UNKNOWN = 0x0080; /** Default value for constructors. */ const ItemConnFlags ITEMCONN_DEFAULT = ITEMCONN_NONE; -// ============================================================================ + // Base connection classes -// ============================================================================ + /** A helper for SfxTabPages to connect controls to items. @@ -221,7 +221,7 @@ private: ItemConnFlags mnFlags; /// Flags for additional options. }; -// ---------------------------------------------------------------------------- + /** Base class template for single item <-> single control connection objects. @@ -271,9 +271,9 @@ protected: ControlWrapperRef mxCtrlWrp; }; -// ============================================================================ + // Standard connections -// ============================================================================ + /** This is a helper class to enable/disable/show/hide a control only. @@ -298,12 +298,12 @@ private: sal_uInt16 mnSlot; }; -// ---------------------------------------------------------------------------- + /** Connection between an SfxBoolItem and a VCL CheckBox. */ typedef ItemControlConnection< BoolItemWrapper, CheckBoxWrapper > CheckBoxConnection; -// ============================================================================ + /** Connection between an item and the VCL NumericField. */ template< typename ItemWrpT > @@ -321,14 +321,14 @@ public: ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef NumericConnection< Int16ItemWrapper > Int16NumericConnection; typedef NumericConnection< UInt16ItemWrapper > UInt16NumericConnection; typedef NumericConnection< Int32ItemWrapper > Int32NumericConnection; typedef NumericConnection< UInt32ItemWrapper > UInt32NumericConnection; -// ============================================================================ + /** Connection between an item and the VCL MetricField. @@ -352,14 +352,14 @@ public: FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef MetricConnection< Int16ItemWrapper > Int16MetricConnection; typedef MetricConnection< UInt16ItemWrapper > UInt16MetricConnection; typedef MetricConnection< Int32ItemWrapper > Int32MetricConnection; typedef MetricConnection< UInt32ItemWrapper > UInt32MetricConnection; -// ============================================================================ + /** Connection between an item and a VCL ListBox. @@ -384,14 +384,14 @@ public: const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef ListBoxConnection< Int16ItemWrapper > Int16ListBoxConnection; typedef ListBoxConnection< UInt16ItemWrapper > UInt16ListBoxConnection; typedef ListBoxConnection< Int32ItemWrapper > Int32ListBoxConnection; typedef ListBoxConnection< UInt32ItemWrapper > UInt32ListBoxConnection; -// ============================================================================ + /** Connection between an item and an SVTOOLS ValueSet. @@ -416,16 +416,16 @@ public: const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; -// ---------------------------------------------------------------------------- + typedef ValueSetConnection< Int16ItemWrapper > Int16ValueSetConnection; typedef ValueSetConnection< UInt16ItemWrapper > UInt16ValueSetConnection; typedef ValueSetConnection< Int32ItemWrapper > Int32ValueSetConnection; typedef ValueSetConnection< UInt32ItemWrapper > UInt32ValueSetConnection; -// ============================================================================ + // Array of connections -// ============================================================================ + class ItemConnectionArrayImpl; @@ -455,15 +455,15 @@ private: std::auto_ptr< ItemConnectionArrayImpl > mxImpl; }; -// ============================================================================ -// ============================================================================ + + // *** Implementation of template functions *** -// ============================================================================ -// ============================================================================ + + // Base connection classes -// ============================================================================ + template< typename ItemWrpT, typename ControlWrpT > ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection( @@ -533,9 +533,9 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet( return bChanged; } -// ============================================================================ + // Standard connections -// ============================================================================ + template< typename ItemWrpT > NumericConnection< ItemWrpT >::NumericConnection( @@ -544,7 +544,7 @@ NumericConnection< ItemWrpT >::NumericConnection( { } -// ============================================================================ + template< typename ItemWrpT > MetricConnection< ItemWrpT >::MetricConnection( @@ -553,7 +553,7 @@ MetricConnection< ItemWrpT >::MetricConnection( { } -// ============================================================================ + template< typename ItemWrpT > ListBoxConnection< ItemWrpT >::ListBoxConnection( @@ -562,7 +562,7 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection( { } -// ============================================================================ + template< typename ItemWrpT > ValueSetConnection< ItemWrpT >::ValueSetConnection( @@ -571,7 +571,7 @@ ValueSetConnection< ItemWrpT >::ValueSetConnection( { } -// ============================================================================ + } // namespace sfx diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index d8ffedb3a5e8..21424acf6467 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -27,13 +27,13 @@ #include <svl/intitem.hxx> #include <svl/itemset.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + // Helpers -// ============================================================================ + class SFX2_DLLPUBLIC ItemWrapperHelper { @@ -55,9 +55,9 @@ public: static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot ); }; -// ============================================================================ + // Item wrappers -// ============================================================================ + /** Base class wrapping a single item. @@ -120,7 +120,7 @@ private: sal_uInt16 mnSlot; /// The SID of this item wrapper. }; -// ============================================================================ + /** An item wrapper usable for most types of items. @@ -147,7 +147,7 @@ public: { rItem.SetValue( static_cast< InternalValueT >( aValue ) ); } }; -// ---------------------------------------------------------------------------- + typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; typedef ValueItemWrapper< SfxInt16Item, sal_Int16 > Int16ItemWrapper; @@ -156,7 +156,7 @@ typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper; typedef ValueItemWrapper< SfxStringItem, const OUString& > StringItemWrapper; -// ============================================================================ + /** An item wrapper that uses the item itself as value. */ template< typename ItemT > @@ -174,16 +174,16 @@ public: { rItem = rValue; } }; -// ============================================================================ -// ============================================================================ + + // *** Implementation of template functions *** -// ============================================================================ -// ============================================================================ + + // Item wrappers -// ============================================================================ + template< typename ItemT, typename ValueT > const ItemT* SingleItemWrapper< ItemT, ValueT >::GetUniqueItem( const SfxItemSet& rItemSet ) const @@ -197,7 +197,7 @@ const ItemT& SingleItemWrapper< ItemT, ValueT >::GetDefaultItem( const SfxItemSe return static_cast< const ItemT& >( ItemWrapperHelper::GetDefaultItem( rItemSet, mnSlot ) ); } -// ============================================================================ + } // namespace sfx diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 4624026a059e..1a5c91168db7 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -75,7 +75,7 @@ public: void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); }; -//-------------------------------------------------------------------- + class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 2e0aac28796e..ab52672dee23 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -54,7 +54,7 @@ class Window; namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } -//==================================================================== + class SFX2_DLLPUBLIC SfxModule : public SfxShell { diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index f48284cbbb4d..8bd6d0baaf38 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -25,7 +25,7 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -//-------------------------------------------------------------------- + #define SFX_SLOT_CACHABLE 0x0001L // exclusiv to VOLATILE, default #define SFX_SLOT_VOLATILE 0x0002L // per Timer every 2s get new, @@ -73,7 +73,7 @@ #define SFX_SLOT_IMAGEREFLECTION 0x800000L // Mirror image on Vertical/ // Bi-directional writing -//-------------------------------------------------------------------- + class SfxRequest; class SfxItemSet; @@ -99,7 +99,7 @@ class SfxItemSet; #define SFX_STUB_PTR_STATE_NONE &SfxShell::EmptyStateStub -//-------------------------------------------------------------------- + enum SfxSlotKind { @@ -108,7 +108,7 @@ enum SfxSlotKind SFX_KIND_ATTR }; -//========================================================================= + struct SfxTypeAttrib { @@ -213,7 +213,7 @@ SFX_DECL_TYPE(18); // for SvxSearchItem #define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \ { (const SfxType*) &a##ArgTypeId##_Impl, ArgName, ArgSlotId } -//-------------------------------------------------------------------- + class SfxPoolItem; @@ -229,7 +229,7 @@ struct SfxFormalArgument { return (SfxPoolItem*) pType->aTypeId(); } }; -//-------------------------------------------------------------------- + class SfxSlot { @@ -286,7 +286,7 @@ public: const SfxSlot* GetNextSlot() const { return pNextSlot; } }; -//========================================================================= + // returns the id of the function @@ -294,7 +294,7 @@ inline sal_uInt16 SfxSlot::GetSlotId() const { return nSlotId; } -//-------------------------------------------------------------------- + // returns the help-id of the slot inline sal_uIntPtr SfxSlot::GetHelpId() const @@ -302,7 +302,7 @@ inline sal_uIntPtr SfxSlot::GetHelpId() const return nHelpId; } -//-------------------------------------------------------------------- + // returns a bitfield with flags @@ -310,7 +310,7 @@ inline sal_uIntPtr SfxSlot::GetMode() const { return nFlags; } -//-------------------------------------------------------------------- + // determines if the specified mode is assigned @@ -318,7 +318,7 @@ inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const { return (nFlags & nMode) != 0; } -//-------------------------------------------------------------------- + // returns the id of the associated group diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index 9f0a4eb84c4e..be61a4cf041a 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -66,7 +66,7 @@ public: TypeId GetSlotType( sal_uInt16 nSlotId ) const; }; -//-------------------------------------------------------------------- + // seeks to the first func in the current group diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index a631653fa7fe..3b0a91607e30 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -28,13 +28,13 @@ #include <vcl/fixed.hxx> #include <sfx2/basedlgs.hxx> -//========================================================================= + class SfxObjectShellLock; class SfxObjectShell; class MoreButton; -//========================================================================= + #define SFXWB_PREVIEW 0x0003 #define SFXWB_LOAD_TEMPLATE 0x0004 diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index c54329f8c6c0..20c7d7689829 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -98,7 +98,7 @@ public: { return aNameResId.GetResMgr(); } }; -//-------------------------------------------------------------------- + // returns the number of functions in this cluster @@ -107,7 +107,7 @@ inline sal_uInt16 SfxInterface::Count() const return nCount; } -//-------------------------------------------------------------------- + // returns a function by position in the array diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index bee41067faf8..f19caa357790 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -25,7 +25,7 @@ #include <sfx2/shell.hxx> -//------------------------------------------------------------------------ + class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem { diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index a62cbb47f7ea..91cdfec9bb5c 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -31,9 +31,9 @@ #include <sfx2/tabdlg.hxx> -// -------------------------------- + // - SfxCommonPrintOptionsTabPage - -// -------------------------------- + class SvtBasePrintOptions; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 1d8575470d49..15a9a2881437 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -29,7 +29,7 @@ class SfxViewShell; -// ------------------------------------------------------------------------ + struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 8f656dd0967a..55f7f1c86f0f 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -38,7 +38,7 @@ class SfxSlot; class SfxViewFrame; struct SfxRequest_Impl; -//================================================================== + class SFX2_DLLPUBLIC SfxRequest: public SfxHint { @@ -48,7 +48,7 @@ friend struct SfxRequest_Impl; SfxAllItemSet* pArgs; SfxRequest_Impl* pImp; - //--------------------------------------------------------------------- + public: SAL_DLLPRIVATE void Record_Impl( SfxShell &rSh, const SfxSlot &rSlot, com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder, @@ -56,7 +56,7 @@ public: private: SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet ); - //--------------------------------------------------------------------- + public: SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); @@ -110,7 +110,7 @@ private: const SfxRequest& operator=(const SfxRequest &); // n.i.!! }; -//------------------------------------------------------------------------ + #define SFX_REQUEST_ARG(rReq, pItem, ItemType, nSlotId, bDeep) \ const ItemType *pItem = (const ItemType*) \ diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 6529c5af6781..5a21d82d09b7 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -27,7 +27,7 @@ #define RID_GROUPS_SFXOFFSET 32700 #define RID_GROUPS_END 32767 -//-------------------------------------------------------------------- + #define EVENT_SFX_START 5000 // EVENT_SFX_END 9999 @@ -84,7 +84,7 @@ #define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 ) #define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 ) -//-------------------------------------------------------------------- + #define RID_SFX_APP_START (RID_SFX_START + 256) #define RID_SFX_MENU_START (RID_SFX_START + 768) @@ -104,7 +104,7 @@ // RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) // RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) -//-------------------------------------------------------------------- + #define SFX_OBJECTBAR_APPLICATION 0 #define SFX_OBJECTBAR_OBJECT 1 @@ -185,13 +185,13 @@ #define SFX_FILE_THUMBNAIL_MATH (RID_SFX_START+167) #define SFX_FILE_THUMBNAIL_DEFAULT (RID_SFX_START+168) -//========================================================================= + // group ids -//========================================================================= + // !! If you add a new group, please change sfxbasecontroller.cxx and // !! com.sun.star.frame.CommandGroup accordingly! -//========================================================================= + #define GID_INTERN (RID_GROUPS_SFXOFFSET+ 0) #define GID_APPLICATION (RID_GROUPS_SFXOFFSET+ 1) @@ -221,7 +221,7 @@ #define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25) #define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26) -// ========================================================================= + #define RID_OPTIONS_START (SID_LIB_START + 2000) // RID_OPTIONS_END (RID_OPTIONS_START + 100) diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index b9396e4e4898..aba163fa2166 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -56,9 +56,9 @@ class SfxViewFrame; sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ); -//________________________________________________________________________________________________________ + // class declarations -//________________________________________________________________________________________________________ + typedef ::cppu::WeakImplHelper9 < css::frame::XController2 , css::frame::XControllerBorder @@ -74,15 +74,15 @@ typedef ::cppu::WeakImplHelper9 < css::frame::XController2 class SFX2_DLLPUBLIC SfxBaseController :public SfxBaseController_Base ,public ::cppu::BaseMutex { -//________________________________________________________________________________________________________ + // public methods -//________________________________________________________________________________________________________ + public: - //____________________________________________________________________________________________________ + // constructor/destructor - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -119,16 +119,15 @@ public: css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XController2 - //____________________________________________________________________________________________________ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XController - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -235,9 +234,9 @@ public: css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XDispatchProvider - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -271,18 +270,18 @@ public: virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XControllerBorder - //____________________________________________________________________________________________________ + virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XComponent - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -336,9 +335,8 @@ public: virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XDispatchInformationProvider - //____________________________________________________________________________________________________ virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception); @@ -371,9 +369,9 @@ private: DECL_LINK( CheckOutHandler, void * ); -//________________________________________________________________________________________________________ + // private variables -//________________________________________________________________________________________________________ + private: diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 8b5b17a0e02c..ecd0b269dd70 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -104,9 +104,9 @@ struct IMPL_SfxBaseModel_DataContainer ; // impl. struct to hold member o namespace sfx { namespace intern { class ViewCreationGuard; } } -//________________________________________________________________________________________________________ + // class declarations -//________________________________________________________________________________________________________ + /**_______________________________________________________________________________________________________ @short - @@ -172,15 +172,15 @@ class SFX2_DLLPUBLIC SfxBaseModel : protected ::cppu::BaseMutex , public SfxListener { -//________________________________________________________________________________________________________ + // public methods -//________________________________________________________________________________________________________ + public: - //____________________________________________________________________________________________________ + // constructor/destructor - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -212,9 +212,9 @@ public: virtual ~SfxBaseModel() ; - //____________________________________________________________________________________________________ + // XInterface - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short give answer, if interface is supported @@ -263,9 +263,9 @@ public: virtual void SAL_CALL release() throw() ; - //____________________________________________________________________________________________________ + // XTypeProvider - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short get information about supported interfaces @@ -299,9 +299,9 @@ public: virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XStarBasicAccess - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @seealso XStarBasicAccess @@ -330,9 +330,9 @@ public: throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XChild - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -365,9 +365,9 @@ public: virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XComponent - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -419,9 +419,9 @@ public: SAL_CALL getDocumentProperties() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XEventListener - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -438,9 +438,9 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XModel - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -610,9 +610,9 @@ public: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XModel2 - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() throw (css::uno::RuntimeException, std::exception); @@ -631,9 +631,9 @@ public: css::lang::IllegalArgumentException, css::uno::Exception, std::exception ); - //____________________________________________________________________________________________________ + // XModifiable2 - //____________________________________________________________________________________________________ + virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception); @@ -700,29 +700,29 @@ public: virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) ; - //____________________________________________________________________________________________________ + // XCloseable - //____________________________________________________________________________________________________ + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XCloseBroadcaster - //____________________________________________________________________________________________________ + virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XPrintJobBroadcaster - //____________________________________________________________________________________________________ + virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XPrintable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -770,16 +770,16 @@ public: virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XStorable2 - //____________________________________________________________________________________________________ + virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XStorable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -877,9 +877,9 @@ public: - //____________________________________________________________________________________________________ + // XLoadable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -919,9 +919,9 @@ public: css::uno::RuntimeException, css::uno::Exception, std::exception); - //____________________________________________________________________________________________________ + // XDocumentSubStorageSupplier - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw ( css::uno::RuntimeException, std::exception ); @@ -929,9 +929,9 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() throw ( css::io::IOException, css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XStorageBasedDocument - //____________________________________________________________________________________________________ + virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) @@ -967,9 +967,9 @@ public: const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XVisualObject - //____________________________________________________________________________________________________ + virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) throw ( css::lang::IllegalArgumentException, @@ -993,20 +993,19 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XScriptProviderSupplier - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XUIConfigurationManagerSupplier - //____________________________________________________________________________________________________ virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XTransferable - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1060,9 +1059,9 @@ public: throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XEventsSupplier - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1080,23 +1079,23 @@ public: virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XEmbeddedScripts - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XScriptInvocationContext - //____________________________________________________________________________________________________ + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XEventBroadcaster - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1128,17 +1127,17 @@ public: virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - //____________________________________________________________________________________________________ + // XDocumentEventBroadcaster - //____________________________________________________________________________________________________ + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // XUnoTunnel - //____________________________________________________________________________________________________ + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception); @@ -1200,7 +1199,7 @@ public: // css.document.XUndoManagerSupplier virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception); - //____________________________________________________________________________________________________ + // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() @@ -1337,9 +1336,9 @@ public: sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); - //____________________________________________________________________________________________________ + // SfxListener - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1357,9 +1356,9 @@ public: void Notify( SfxBroadcaster& aBC , const SfxHint& aHint ) ; - //____________________________________________________________________________________________________ + // public IMPL? - //____________________________________________________________________________________________________ + /**___________________________________________________________________________________________________ @short - @@ -1420,9 +1419,9 @@ protected: void setGrabBagItem(const com::sun::star::uno::Any& rVal); -//________________________________________________________________________________________________________ + // private methods -//________________________________________________________________________________________________________ + private: @@ -1467,9 +1466,9 @@ private: SAL_DLLPRIVATE void handleLoadError( sal_uInt32 nError, SfxMedium* pMedium ); -//________________________________________________________________________________________________________ + // private variables and methods -//________________________________________________________________________________________________________ + private: diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx index 70cfcf5b1507..7f7b05f7f5ec 100644 --- a/include/sfx2/sfxmodelfactory.hxx +++ b/include/sfx2/sfxmodelfactory.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -//........................................................................ + namespace sfx2 { -//........................................................................ + #define SFXMODEL_STANDARD (sal_uInt64)(0x0000) #define SFXMODEL_EMBEDDED_OBJECT (sal_uInt64)(0x0001) @@ -40,9 +40,9 @@ namespace sfx2 const sal_uInt64 _nCreationFlags ); - //==================================================================== + //= createSfxModelFactory - //==================================================================== + /** creates a XSingleServiceFactory which can be used to created instances of classes derived from SfxBaseModel @@ -58,9 +58,9 @@ namespace sfx2 const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames ); -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_SFXMODELFACTORY_HXX diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index bc26695585ba..b8bef217e73e 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -26,7 +26,7 @@ // Please be careful: // Changing just one part here doesn't add new // docking windows automatically! -// + #define SID_DOCKWIN_0 SID_DOCKWIN_START #define SID_DOCKWIN_1 SID_DOCKWIN_START+1 @@ -39,11 +39,11 @@ #define SID_DOCKWIN_8 SID_DOCKWIN_START+8 #define SID_DOCKWIN_9 SID_DOCKWIN_START+9 -//========================================================================= + #define SID_UNKNOWN SID_SFX_START -//------------------------------------------------------------------------- + // default-ids for application #define SID_QUITAPP (SID_SFX_START + 300) @@ -703,7 +703,7 @@ #define ID_VAL_ZOOM (SID_SD_START+234) #define SID_SIZE_OPTIMAL (SID_SD_START+99) -//----------------------------------------------------------------------- + #define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL) #define SID_ZOOM_ENTIRE_PAGE (SID_SIZE_PAGE) @@ -714,7 +714,7 @@ #define SID_ZOOM_150_PERCENT (SID_SVX_START + 1423) #define SID_ZOOM_200_PERCENT (SID_SVX_START + 1424) -//----------------------------------------------------------------------- + // SfxScriptOrganizerItem #define MID_SCRIPT_ORGANIZER_LANGUAGE 1 // Don't use zero for MID's. It's forbidden to do it! @@ -730,7 +730,7 @@ #endif // #ifndef _SFXSIDS_HRC -//----------------------------------------------------------------------- + // SfxSecurityPage related stuff #define FN_EDIT2 (SID_SW_START + 1800) diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 93e2e782b7dc..8b3664f5067c 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -61,7 +61,7 @@ namespace svl class IUndoManager; } -//==================================================================== + enum SfxInterfaceId @@ -123,7 +123,7 @@ enum SfxInterfaceId //TODO/CLEANUP: replace by UNO constant #define SVVERB_SHOW -1 -//==================================================================== + typedef void (*SfxExecFunc)(SfxShell *, SfxRequest &rReq); typedef void (*SfxStateFunc)(SfxShell *, SfxItemSet &rSet); @@ -258,7 +258,7 @@ public: SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); }; -//-------------------------------------------------------------------- + SfxItemPool& SfxShell::GetPool() const /* [Description] @@ -276,7 +276,7 @@ SfxItemPool& SfxShell::GetPool() const DBG_ASSERT( pPool, "no pool" ); return *pPool; } -//------------------------------------------------------------------- + inline void SfxShell::SetPool ( SfxItemPool* pNewPool // Pointer to the new Pool or null @@ -295,7 +295,7 @@ inline void SfxShell::SetPool pPool = pNewPool; } -//===================================================================== + #define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[] = diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc index 5c311127bda3..7d7fd12dc8b7 100644 --- a/include/sfx2/sidebar/ResourceDefinitions.hrc +++ b/include/sfx2/sidebar/ResourceDefinitions.hrc @@ -47,7 +47,7 @@ #define RID_PROPERTYPANEL_NUMFORMAT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START+23) #define RID_PANELDOCK_WINDOW ( RC_PROPERTYPANEL_START + 24 ) -#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 ) // +#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 ) #ifndef STD_MASKCOLOR #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 2231ab0f02cc..c9b5dc1e06cf 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -24,7 +24,7 @@ #include <svl/poolitem.hxx> #include <svtools/statusbarcontroller.hxx> -//------------------------------------------------------------------ + class SfxModule; class StatusBar; @@ -52,7 +52,7 @@ struct SfxStbCtrlFactory {} }; -//------------------------------------------------------------------ + class CommandEvent; class MouseEvent; @@ -123,7 +123,7 @@ public: }; -//------------------------------------------------------------------ + #define SFX_DECL_STATUSBAR_CONTROL() \ static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 8b0ed9b5eed7..14e6ac0d6af2 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -56,7 +56,7 @@ public: const SfxStyleFilter& GetFilterList() const { return aFilterList; } const Image& GetImage() const { return aImage; } - // -------------------------------------------------------------------- + class GrantAccess { friend class SfxStyleFamilies; }; void SetImage( const Image& _rImg ) { aImage = _rImg; } }; diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 559a091b2ed3..246e8cec145d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -35,14 +35,14 @@ namespace svt class ToolPanelDeck; } -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... - //================================================================================================================== + + //= ITaskPaneToolPanelAccess - //================================================================================================================== + class SAL_NO_VTABLE ITaskPaneToolPanelAccess { public: @@ -52,9 +52,9 @@ namespace sfx2 ~ITaskPaneToolPanelAccess() {} }; - //================================================================================================================== + //= TaskPaneWrapper - //================================================================================================================== + class SFX2_DLLPUBLIC TaskPaneWrapper :public SfxChildWindow ,public ITaskPaneToolPanelAccess { @@ -72,9 +72,9 @@ namespace sfx2 virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; - //================================================================================================================== + //= IToolPanelCompare - //================================================================================================================== + class SFX2_DLLPUBLIC SAL_NO_VTABLE IToolPanelCompare { public: @@ -95,9 +95,9 @@ namespace sfx2 ~IToolPanelCompare() {} }; - //================================================================================================================== + //= ModuleTaskPane - //================================================================================================================== + class ModuleTaskPane_Impl; /** SFX-less version of a module dependent task pane, filled with tool panels as specified in the respective module's configuration @@ -152,9 +152,9 @@ namespace sfx2 ::boost::scoped_ptr< ModuleTaskPane_Impl > m_pImpl; }; - //================================================================================================================== + //= TaskPaneController - //================================================================================================================== + class TaskPaneController_Impl; /** is a helper class for connecting a ModuleTaskPane and a TitledDockingWindow, for clients of the ModuleTaskPane which do not use the TaskPaneDockingWindow @@ -178,9 +178,9 @@ namespace sfx2 ::boost::scoped_ptr< TaskPaneController_Impl > m_pImpl; }; - //================================================================================================================== + //= TaskPaneDockingWindow - //================================================================================================================== + class TaskPaneDockingWindow :public TitledDockingWindow ,public ITaskPaneToolPanelAccess { @@ -203,9 +203,9 @@ namespace sfx2 TaskPaneController m_aPaneController; }; -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + #endif // INCLUDED_SFX2_TASKPANE_HXX diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index d2fbc7ac6a39..10177ea8392d 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> -//------------------------------------------------------------------ + class SfxToolBoxControl; class SfxBindings; @@ -63,7 +63,7 @@ struct SfxTbxCtrlFactory {} }; -//------------------------------------------------------------------ + enum SfxPopupWindowType { @@ -75,7 +75,7 @@ enum SfxPopupWindowType SFX_POPUPWINDOW_CONTEXTMENU }; -//------------------------------------------------------------------ + class SfxFrameStatusListener : public svt::FrameStatusListener { @@ -93,7 +93,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener SfxStatusListenerInterface* m_pCallee; }; -//------------------------------------------------------------------ + /* Floating windows that can be torn from tool boxes should be derived from this class. Since it is also derived from SfxControllerItem, its instances @@ -162,7 +162,7 @@ public: } }; -//------------------------------------------------------------------ + #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ @@ -293,7 +293,7 @@ public: { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } -//========================================================================= + class SfxDragButton_Impl : public FixedImage @@ -316,7 +316,7 @@ public: virtual void Select( sal_Bool bMod1 = sal_False ); }; -//------------------------------------------------------------------------ + /** Toolbox that implements recent files menu for the Open file toolbar button. diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index b9c1e03fb66e..cbac0878fc8b 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -26,14 +26,14 @@ #include <vcl/toolbox.hxx> #include <tools/svborder.hxx> -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... - //================================================================================================================== + + //= TitledDockingWindow - //================================================================================================================== + class SFX2_DLLPUBLIC TitledDockingWindow : public SfxDockingWindow { public: @@ -152,9 +152,9 @@ namespace sfx2 }; -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + #endif // INCLUDED_SFX2_TITLEDOCKWIN_HXX diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 5f4adcc76322..5825ac1d7d86 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -31,14 +31,14 @@ class NotifyEvent; namespace cppu { class OWeakObject; } -//........................................................................ + namespace sfx2 { -//........................................................................ - //==================================================================== + + //= UserInputInterception - //==================================================================== + struct UserInputInterception_Data; /** helper class for implementing the XUserInputInterception interface for a controller implementation @@ -66,9 +66,9 @@ namespace sfx2 ::std::auto_ptr< UserInputInterception_Data > m_pData; }; -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index b7fb8276842d..2129f55aeecc 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -62,7 +62,7 @@ namespace svtools SV_DECL_REF(SfxObjectShell) #endif -//======================================================================== + DBG_NAMEEX(SfxViewFrame) class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener { @@ -286,7 +286,7 @@ private: ); }; -//-------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem { diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index eb40c875d0a2..ae22a37b119a 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -77,7 +77,7 @@ class NotifyEvent; #define DEFAULT_MARGIN_WIDTH 8 #define DEFAULT_MARGIN_HEIGHT 12 -//======================================================================== + // @[SfxViewShell-Flags] @@ -96,7 +96,7 @@ class NotifyEvent; <SfxViewShell>. */ -//========================================================================= + #define SFX_DECL_VIEWFACTORY(Class) \ private: \ @@ -124,7 +124,7 @@ public: \ class SfxInPlaceClient; typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList; -// ----------------------------------------------------------------------- + class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener { #ifdef INCLUDED_SFX2_VIEWSH_HXX @@ -296,7 +296,7 @@ public: SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey); }; -//======================================================================== + inline void SfxViewShell::LostFocus() const @@ -317,7 +317,7 @@ inline void SfxViewShell::LostFocus() const { } -//------------------------------------------------------------------------ + inline SfxViewFrame* SfxViewShell::GetViewFrame() const diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index 10181da20678..1cfdc3db0f69 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -23,7 +23,7 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/dllapi.h> -//------------------------------------------------------------------------- + enum SvxZoomType { @@ -34,7 +34,7 @@ enum SvxZoomType SVX_ZOOM_PAGEWIDTH_NOBORDER // GetValue() pagewidth without border }; -//------------------------------------------------------------------------- + class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item { @@ -66,7 +66,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; -//------------------------------------------------------------------------ + #define SVX_ZOOM_ENABLE_50 0x0001 #define SVX_ZOOM_ENABLE_75 0x0002 diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx index 81bac49e792e..e6c08e84cb24 100644 --- a/include/svl/adrparse.hxx +++ b/include/svl/adrparse.hxx @@ -23,7 +23,7 @@ #include <svl/svldllapi.h> #include <vector> -//============================================================================ + struct SvAddressEntry_Impl { OUString m_aAddrSpec; @@ -41,10 +41,10 @@ struct SvAddressEntry_Impl } }; -//============================================================================ + typedef ::std::vector< SvAddressEntry_Impl* > SvAddressList_Impl; -//============================================================================ + class SVL_DLLPUBLIC SvAddressParser { friend class SvAddressParser_Impl; diff --git a/include/svl/brdcst.hxx b/include/svl/brdcst.hxx index c5e726e933b7..646b270b0d42 100644 --- a/include/svl/brdcst.hxx +++ b/include/svl/brdcst.hxx @@ -26,7 +26,7 @@ class SfxListener; class SfxHint; -//------------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxBroadcaster { diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 87a0b36716b3..8f697f36265f 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -24,7 +24,7 @@ #include <tools/debug.hxx> #include <svl/poolitem.hxx> -//============================================================================ + DBG_NAMEEX(SfxEnumItemInterface) class SVL_DLLPUBLIC SfxEnumItemInterface: public SfxPoolItem diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 94d1ed2153e2..5a02024224c9 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -24,7 +24,7 @@ #include <tools/debug.hxx> #include <svl/poolitem.hxx> -//============================================================================ + DBG_NAMEEX_VISIBILITY(CntByteItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem @@ -83,7 +83,7 @@ inline void CntByteItem::SetValue(sal_uInt8 nTheValue) m_nValue = nTheValue; } -//============================================================================ + DBG_NAMEEX_VISIBILITY(CntUInt16Item, SVL_DLLPUBLIC) class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem @@ -145,7 +145,7 @@ inline void CntUInt16Item::SetValue(sal_uInt16 nTheValue) m_nValue = nTheValue; } -//============================================================================ + DBG_NAMEEX_VISIBILITY(CntInt32Item, SVL_DLLPUBLIC) class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem @@ -207,7 +207,7 @@ inline void CntInt32Item::SetValue(sal_Int32 nTheValue) m_nValue = nTheValue; } -//============================================================================ + DBG_NAMEEX_VISIBILITY(CntUInt32Item, SVL_DLLPUBLIC) class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index 3a398bc7d171..45eff2d50563 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -64,7 +64,7 @@ public: sal_uInt16 GetStyle() const { return _nStyle; } }; -//////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVL_CNTWALL_HXX diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 2fa5f977b33f..1d520cae02a0 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -22,7 +22,7 @@ #include <svl/inettype.hxx> #include <svl/custritm.hxx> -//========================================================================= + class CntContentTypeItem : public CntUnencodedStringItem { diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 4c7e658f4b94..8226d3cde0e0 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -24,7 +24,7 @@ #include <tools/debug.hxx> #include <svl/poolitem.hxx> -//============================================================================ + DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 0feb03fd5a00..3b4176f78bf4 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -23,7 +23,7 @@ #include <svl/svldllapi.h> #include <svl/cenumitm.hxx> -//============================================================================ + class SVL_DLLPUBLIC SfxEnumItem : public SfxEnumItemInterface @@ -59,7 +59,7 @@ public: }; -//============================================================================ + class SVL_DLLPUBLIC SfxBoolItem : public SfxPoolItem diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx index b17f6b9b2600..bfee7570bf68 100644 --- a/include/svl/filenotation.hxx +++ b/include/svl/filenotation.hxx @@ -23,14 +23,14 @@ #include <svl/svldllapi.h> #include <rtl/ustring.hxx> -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= OFileNotation - //===================================================================== + class SVL_DLLPUBLIC OFileNotation { protected: @@ -55,9 +55,9 @@ namespace svt SVL_DLLPRIVATE bool implInitWithURLNotation( const OUString& _rURL ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVL_FILENOTATION_HXX diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx index f837b8d03947..39666d7fee9c 100644 --- a/include/svl/hint.hxx +++ b/include/svl/hint.hxx @@ -30,7 +30,7 @@ public: virtual ~SfxHint(); }; -//-------------------------------------------------------------------- + #define DECL_PTRHINT(Visibility, Name, Type) \ class Visibility Name: public SfxHint \ diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index 8f4254cde3e4..a69572b00222 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -24,7 +24,7 @@ #include <tools/inetmime.hxx> #include <i18nlangtag/languagetag.hxx> -//============================================================================ + /** Definitions for frequently used media type names. */ #define CONTENT_TYPE_STR_APP_OCTSTREAM "application/octet-stream" @@ -112,7 +112,7 @@ #define CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER_GLOBAL "application/vnd.sun.xml.writer-global" #define CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED "application/vnd.sun.xml.impress-packed" -//============================================================================ + /** Definitions for matching parts of URIs. */ #define INETTYPE_URL_PROT_DATA "data" @@ -138,7 +138,7 @@ #define INETTYPE_URL_SSSUB_GLOB "GlobalDocument" #define INETTYPE_URL_SSSUB_WEB "web" -//============================================================================ + enum INetContentType { CONTENT_TYPE_UNKNOWN, @@ -229,7 +229,7 @@ enum INetContentType CONTENT_TYPE_LAST = CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED }; -//============================================================================ + class SVL_DLLPUBLIC INetContentTypes { public: diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 1ff3f00f25d8..06988a8bafcf 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace io { class SvDataPipe_Impl; -//============================================================================ + class SVL_DLLPUBLIC SvInputStream: public SvStream { com::sun::star::uno::Reference< com::sun::star::io::XInputStream > diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 0ca7c29e8060..d74988119efa 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -23,7 +23,7 @@ #include <svl/svldllapi.h> #include <svl/cintitem.hxx> -//============================================================================ + class SVL_DLLPUBLIC SfxByteItem: public CntByteItem { public: @@ -38,7 +38,7 @@ public: { return new SfxByteItem(*this); } }; -//============================================================================ + DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC) class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem @@ -100,7 +100,7 @@ inline void SfxInt16Item::SetValue(sal_Int16 nTheValue) m_nValue = nTheValue; } -//============================================================================ + class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item { public: @@ -119,7 +119,7 @@ public: { return new SfxUInt16Item(*this); } }; -//============================================================================ + class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item { public: @@ -139,7 +139,7 @@ public: }; -//============================================================================ + class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item { public: diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index 1c542d4d8477..c1298aa5130a 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.hxx @@ -25,7 +25,7 @@ class SfxItemSet; -//-------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint { diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx index b7f2b47650e4..9cc753307695 100644 --- a/include/svl/lstner.hxx +++ b/include/svl/lstner.hxx @@ -31,7 +31,7 @@ typedef std::deque<SfxBroadcaster*> SfxBroadcasterArr_Impl; #define SFX_NOTIFY( rBC, rBCT, rHint, rHintT ) \ Notify( rBC, rHint ) -//------------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxListener { diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 4fc986ae62b2..3ffb875d6223 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -36,7 +36,7 @@ class SvStream; DBG_NAMEEX(SvxMacroItem) -// ----------------------------------------------------------------------- + //Ein Macro diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 0b6583fe9b21..6fe76e30bc06 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -24,7 +24,7 @@ DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC) -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item { diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index c6965378c681..6b3b5cc9c474 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -32,7 +32,7 @@ namespace comphelper class SharedMutex; } -//------------------------------------------------------------------ + // SvNumberFormatterServiceObj must be registered as service somewhere @@ -41,7 +41,7 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory>& rSMgr ); -//------------------------------------------------------------------ + // SvNumberFormatsSupplierObj: aggregate to document, // construct with SvNumberFormatter diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index 3850925cdf01..450bde03f24c 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } -//============================================================================ + class SVL_DLLPUBLIC SvOutputStream: public SvStream { com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx index a2076728de25..3d1e997dabc8 100644 --- a/include/svl/ownlist.hxx +++ b/include/svl/ownlist.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { } }}} -//========================================================================= + class SvCommand /* [Beschreibung] @@ -55,7 +55,7 @@ public: typedef ::std::vector< SvCommand > SvCommandList_impl; -//========================================================================= + class SVL_DLLPUBLIC SvCommandList /* [Beschreibung] diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx index 6f9a5309a122..4b848c879118 100644 --- a/include/svl/pickerhistoryaccess.hxx +++ b/include/svl/pickerhistoryaccess.hxx @@ -24,21 +24,21 @@ #include <com/sun/star/uno/Reference.hxx> -//......................................................................... + namespace svt { -//......................................................................... - // -------------------------------------------------------------------- + + SVL_DLLPUBLIC void addFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); SVL_DLLPUBLIC void addFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVL_PICKERHISTORYACCESS_HXX diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 0d2ce2722071..0b89e332456c 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -53,7 +53,7 @@ static const sal_uInt32 SFX_ITEMS_DEFAULT= 0xfffffffe; #define CONVERT_TWIPS 0x80 //Uno-Konvertierung fuer Massangaben (fuer MemberId) -// ----------------------------------------------------------------------- + // UNO3 shortcuts @@ -83,7 +83,7 @@ inline ::com::sun::star::uno::Any Bool2Any( bool bValue ) return ::com::sun::star::uno::Any( &bValue, ::getCppuBooleanType() ); } -// ----------------------------------------------------------------------- + //! Notloesung!!! enum SfxFieldUnit @@ -112,7 +112,7 @@ enum SfxMapUnit SFX_MAPUNIT_ABSOLUTE }; -// ----------------------------------------------------------------------- + enum SfxItemPresentation @@ -130,7 +130,7 @@ enum SfxItemPresentation SFX_ITEM_PRESENTATION_COMPLETE }; -// ----------------------------------------------------------------------- + typedef sal_uInt16 SfxItemState; @@ -157,7 +157,7 @@ class SfxItemPool; class SfxItemSet; -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxPoolItem { @@ -266,7 +266,7 @@ private: SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!! }; -// ----------------------------------------------------------------------- + inline void SfxPoolItem::SetRefCount( sal_uLong n ) { @@ -299,7 +299,7 @@ inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const return m_nRefCount; } -// ----------------------------------------------------------------------- + inline bool IsPoolDefaultItem(const SfxPoolItem *pItem ) { @@ -326,7 +326,7 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem) return pItem == (SfxPoolItem *)-1; } -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem { @@ -351,7 +351,7 @@ public: void SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; } }; -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem { @@ -385,7 +385,7 @@ public: { return *pSet; } }; -// ----------------------------------------------------------------------- + // Handle Klasse fuer PoolItems class SVL_DLLPUBLIC SfxItemHandle @@ -401,11 +401,11 @@ public: const SfxPoolItem &GetItem() const { return *pItem; } }; -// ----------------------------------------------------------------------- + DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem); -// ----------------------------------------------------------------------- + #endif // INCLUDED_SVL_POOLITEM_HXX diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index dedcc29c8391..c0ed4a3040cc 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -27,7 +27,7 @@ class SvStream; DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC) -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem { diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index c5a280b0fb38..9069cb94cc30 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -28,7 +28,7 @@ class SvStream; DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC) -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem { diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index daaad28eeb2b..f181593a2a1a 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -25,7 +25,7 @@ class SvStream; -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxRangeItem : public SfxPoolItem { @@ -53,7 +53,7 @@ public: virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; }; -// ----------------------------------------------------------------------- + class SVL_DLLPUBLIC SfxUShortRangesItem : public SfxPoolItem { diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx index 32e749ec4544..b7f728e2aa0b 100644 --- a/include/svl/smplhint.hxx +++ b/include/svl/smplhint.hxx @@ -67,7 +67,7 @@ public: sal_uLong GetId() const { return mnId; } }; -//-------------------------------------------------------------------- + #define DECL_OBJHINT(Name, Type) \ class Name: public SfxSimpleHint \ diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index ef95c9fb7ab9..0712ce3c1ae8 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -23,7 +23,7 @@ #include <svl/svldllapi.h> #include <svl/custritm.hxx> -//============================================================================ + class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem { public: diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx index 8299069368fc..54f5bcc80d96 100644 --- a/include/svl/strmadpt.hxx +++ b/include/svl/strmadpt.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/weak.hxx> #include <tools/stream.hxx> -//============================================================================ + class SVL_DLLPUBLIC SvOutputStreamOpenLockBytes: public SvOpenLockBytes { com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > @@ -64,7 +64,7 @@ public: virtual void Terminate(); }; -//============================================================================ + class SVL_DLLPUBLIC SvLockBytesInputStream: public cppu::OWeakObject, public com::sun::star::io::XInputStream, public com::sun::star::io::XSeekable diff --git a/include/svl/style.hxx b/include/svl/style.hxx index a91d20d9cb88..c597ecab480d 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -144,11 +144,11 @@ public: virtual sal_uInt16 GetVersion() const; }; -//========================================================================= + typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles; -//========================================================================= + class SVL_DLLPUBLIC SfxStyleSheetIterator @@ -192,7 +192,7 @@ friend class SfxStyleSheetBasePool; }; typedef ::boost::shared_ptr< SfxStyleSheetIterator > SfxStyleSheetIteratorPtr; -//========================================================================= + class SfxStyleSheetBasePool_Impl; @@ -264,7 +264,7 @@ public: SfxStyleFamily GetSearchFamily() const { return nSearchFamily; } }; -//========================================================================= + class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase, public SfxListener, public SfxBroadcaster, public svl::StyleSheetUser @@ -290,7 +290,7 @@ protected: virtual ~SfxStyleSheet(); }; -//========================================================================= + class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool { @@ -305,7 +305,7 @@ public: // virtual sal_Bool CopyTo(SfxStyleSheetPool &rDest, const String &rSourceName); }; -//========================================================================= + #define SFX_STYLESHEET_CREATED 1 // neu #define SFX_STYLESHEET_MODIFIED 2 // ver"andert @@ -318,7 +318,7 @@ public: // ueber die STYLESHEET Hints // verschickt werden sollen. -//======================================================================== + class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint { @@ -332,7 +332,7 @@ public: { return nHint; } }; -//========================================================================= + class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint { diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index da9af2b5ae51..289096679418 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -48,9 +48,9 @@ typedef ::std::vector< DdeService* > DdeServices; typedef ::std::vector< long > DdeFormats; typedef ::std::vector< Conversation* > ConvList; -// ----------- + // - DdeData - -// ----------- + class SVL_DLLPUBLIC DdeData { @@ -82,9 +82,9 @@ public: static sal_uLong GetInternalFormat( sal_uLong nFmt ); }; -// ------------------ + // - DdeTransaction - -// ------------------ + class SVL_DLLPUBLIC DdeTransaction { @@ -132,9 +132,9 @@ private: }; -// ----------- + // - DdeLink - -// ----------- + class SVL_DLLPUBLIC DdeLink : public DdeTransaction { @@ -149,9 +149,9 @@ public: virtual void Notify(); }; -// --------------- + // - DdeWarmLink - -// --------------- + class SVL_DLLPUBLIC DdeWarmLink : public DdeLink { @@ -159,9 +159,9 @@ public: DdeWarmLink( DdeConnection&, const OUString&, long = 0 ); }; -// -------------- + // - DdeHotLink - -// -------------- + class SVL_DLLPUBLIC DdeHotLink : public DdeLink { @@ -169,9 +169,9 @@ public: DdeHotLink( DdeConnection&, const OUString&, long = 0 ); }; -// -------------- + // - DdeRequest - -// -------------- + class SVL_DLLPUBLIC DdeRequest : public DdeTransaction { @@ -179,9 +179,9 @@ public: DdeRequest( DdeConnection&, const OUString&, long = 0 ); }; -// ----------- + // - DdePoke - -// ----------- + class SVL_DLLPUBLIC DdePoke : public DdeTransaction { @@ -192,9 +192,9 @@ public: DdePoke( DdeConnection&, const OUString&, const OUString&, long = 0 ); }; -// -------------- + // - DdeExecute - -// -------------- + class SVL_DLLPUBLIC DdeExecute : public DdeTransaction { @@ -202,9 +202,9 @@ public: DdeExecute( DdeConnection&, const OUString&, long = 0 ); }; -// ----------------- + // - DdeConnection - -// ----------------- + class SVL_DLLPUBLIC DdeConnection { @@ -234,9 +234,9 @@ private: const DdeConnection& operator= ( const DdeConnection& ); }; -// ----------- + // - DdeItem - -// ----------- + class SVL_DLLPUBLIC DdeItem { @@ -263,9 +263,9 @@ public: void NotifyClient(); }; -// ----------- + // - DdeItem - -// ----------- + class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem { @@ -279,9 +279,9 @@ public: virtual void AdviseLoop( bool ); // AdviseLoop starten/stoppen }; -// ------------ + // - DdeTopic - -// ------------ + class SVL_DLLPUBLIC DdeTopic { @@ -348,9 +348,9 @@ private: const DdeTopic& operator= ( const DdeTopic& ); }; -// -------------- + // - DdeService - -// -------------- + class SVL_DLLPUBLIC DdeService { @@ -403,9 +403,9 @@ private: //int operator= ( const DdeService& ); }; -// ------------------ + // - DdeTransaction - -// ------------------ + inline long DdeTransaction::GetError() { diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index e75d432f5bab..56965c627a5f 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -27,7 +27,7 @@ class SvStream; DBG_NAMEEX(SfxSizeItem) -// ----------------------------------------------------------------------- + class SfxSizeItem : public SfxPoolItem { diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 5c3b29ed37ff..af00e6ce0bf3 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -28,7 +28,7 @@ #include <vector> #include <limits> -//==================================================================== + class SVL_DLLPUBLIC SfxRepeatTarget { @@ -37,7 +37,7 @@ public: virtual ~SfxRepeatTarget() = 0; }; -//==================================================================== + class SVL_DLLPUBLIC SfxUndoContext { @@ -45,7 +45,7 @@ public: virtual ~SfxUndoContext() = 0; }; -//==================================================================== + class SfxLinkUndoAction; class SVL_DLLPUBLIC SfxUndoAction @@ -77,13 +77,13 @@ private: SfxUndoAction& operator=( const SfxUndoAction& ); // n.i.!! }; -//======================================================================== + /// is a mark on the Undo stack typedef sal_Int32 UndoStackMark; #define MARK_INVALID ::std::numeric_limits< UndoStackMark >::max() -//======================================================================== + struct MarkedUndoAction { @@ -129,7 +129,7 @@ public: } }; -//==================================================================== + /** do not make use of these implementation details, unless you really really have to! */ @@ -145,7 +145,7 @@ struct SVL_DLLPUBLIC SfxUndoArray virtual ~SfxUndoArray(); }; -//========================================================================= + /** do not make use of these implementation details, unless you really really have to! */ @@ -190,7 +190,7 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra }; -//========================================================================= + /** is a callback interface for notifications about state changes of an SfxUndoManager */ @@ -213,7 +213,7 @@ protected: ~SfxUndoListener() {} }; -//========================================================================= + namespace svl { @@ -327,7 +327,7 @@ namespace svl }; } -//========================================================================= + namespace svl { namespace undo { namespace impl { @@ -429,7 +429,7 @@ private: friend class ::svl::undo::impl::LockGuard; }; -//========================================================================= + class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx index 24c0f38d0fc5..b2e3771c4c10 100644 --- a/include/svl/urlbmk.hxx +++ b/include/svl/urlbmk.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> -//========================================================================= + class INetBookmark diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 3549cd65af27..02bdb32aed16 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -25,7 +25,7 @@ #include <svl/poolitem.hxx> #include <com/sun/star/frame/status/Visibility.hpp> -//============================================================================ + DBG_NAMEEX_VISIBILITY(SfxVisibilityItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem diff --git a/include/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx index 72132edc3abf..2b4f45fae2e0 100644 --- a/include/svtools/AccessibleBrowseBoxObjType.hxx +++ b/include/svtools/AccessibleBrowseBoxObjType.hxx @@ -21,11 +21,11 @@ #ifndef INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX #define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX -// ============================================================================ + namespace svt { -// ============================================================================ + /** This enumeration contains a constant for each kind of accessible object of a BrowseBox. */ @@ -41,11 +41,11 @@ enum AccessibleBrowseBoxObjType BBTYPE_CHECKBOXCELL /// A cell with a checkbox. }; -// ============================================================================ + } // namespace svt -// ============================================================================ + #endif diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 81ddaabb4e74..8cf6d3fe8e08 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -45,7 +45,7 @@ struct TMutexInit ::osl::Mutex m_aLock; }; -//=============================================== + /** @descr implements a helper, which can be used to convert vcl key codes into awt key codes ... @@ -71,7 +71,7 @@ struct TMutexInit */ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit { - //------------------------------------------- + // const, types private: @@ -80,7 +80,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit remove this resource here if we go forwards to next major */ typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; - //------------------------------------------- + // member private: @@ -108,11 +108,11 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit remove this resource here if we go forwards to next major */ ::vcl::EventPoster m_aAsyncCallback; - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short factory method to create new accelerator helper instance. @@ -138,11 +138,11 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit */ static AcceleratorExecute* createAcceleratorHelper(); - //--------------------------------------- + /** @short fight against inlining ... */ virtual ~AcceleratorExecute(); - //--------------------------------------- + /** @short init this instance. @descr It must be called as first method after creation. @@ -169,7 +169,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xEnv ); - //--------------------------------------- + /** @short trigger this accelerator. @descr The internal configuartions are used to find @@ -194,29 +194,29 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit * @return The command or an empty string if the key event could not be found. */ OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); - //--------------------------------------- + /** TODO document me */ static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); - //--------------------------------------- + /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xFrame); - //--------------------------------------- + /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); - //------------------------------------------- + // internal private: - //--------------------------------------- + /** @short allow creation of instances of this class by using our factory only! */ @@ -224,15 +224,15 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit AcceleratorExecute(const AcceleratorExecute& rCopy); void operator=(const AcceleratorExecute&) {}; - //--------------------------------------- + /** TODO document me */ SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); - //--------------------------------------- + /** TODO document me */ SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - //--------------------------------------- + /** @deprecated replaced by internal class AsyncAccelExec ... remove this resource here if we go forwards to next major */ diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index cd8a65483bed..c09c90562cb4 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -44,10 +44,10 @@ class VCLXWindow; class TextEngine; class TextView; -//........................................................................ + namespace svt { -//........................................................................ + class ToolPanelDeck; class IToolPanelDeck; @@ -67,9 +67,9 @@ namespace svt */ typedef void* (SAL_CALL * GetSvtAccessibilityComponentFactory)( ); - //================================================================ + //= IAccessibleFactory - //================================================================ + class IAccessibleFactory : public ::rtl::IReference { public: @@ -175,9 +175,9 @@ namespace svt ~IAccessibleFactory() {} }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index a922ed3f1726..dc72b9e2f896 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -35,14 +35,14 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <unotools/configitem.hxx> -// ....................................................................... + namespace svt { -// ....................................................................... - // =================================================================== + + // = AddressBookSourceDialog - // =================================================================== + struct AddressBookSourceDialogData; class SVT_DLLPUBLIC AddressBookSourceDialog : public ModalDialog { @@ -136,9 +136,9 @@ namespace svt }; -// ....................................................................... + } // namespace svt -// ....................................................................... + #endif // INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 2adca6c29f7e..9811b00891d7 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -23,14 +23,14 @@ #include <svtools/svtdllapi.h> #include <com/sun/star/frame/XModel.hpp> -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= GraphicAccess - //==================================================================== + /** helper class for obtaining streams (which also can be used with the ImageProducer) from a resource */ @@ -43,9 +43,9 @@ namespace svt SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 ); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 4581337cf0ae..37d8d4fedbcc 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -47,9 +47,9 @@ namespace utl { class AccessibleStateSetHelper; } -// ------------------- + // - BrowseBox-Types - -// ------------------- + #define BROWSER_INVALIDID SAL_MAX_UINT16 #define BROWSER_ENDOFSELECTION (static_cast<long>(SFX_ENDOFSELECTION)) @@ -122,9 +122,9 @@ typedef sal_uLong BrowserMode; #define BROWSER_MOVECOLUMNLEFT 756 #define BROWSER_MOVECOLUMNRIGHT 757 -// --------------- + // - BrowseEvent - -// --------------- + class BrowseEvent { @@ -148,9 +148,9 @@ public: const Rectangle& GetRect() const { return aRect; } }; -// --------------------- + // - BrowserMouseEvent - -// --------------------- + class BrowserMouseEvent: public MouseEvent, public BrowseEvent { @@ -162,9 +162,9 @@ public: const Rectangle& rRect ); }; -// -------------------------- + // - BrowserAcceptDropEvent - -// -------------------------- + class BrowserAcceptDropEvent : public AcceptDropEvent, public BrowseEvent { @@ -173,9 +173,9 @@ public: BrowserAcceptDropEvent( BrowserDataWin* pWin, const AcceptDropEvent& rEvt ); }; -// --------------------------- + // - BrowserExecuteDropEvent - -// --------------------------- + class BrowserExecuteDropEvent : public ExecuteDropEvent, public BrowseEvent { @@ -184,9 +184,9 @@ public: BrowserExecuteDropEvent( BrowserDataWin* pWin, const ExecuteDropEvent& rEvt ); }; -// ------------- + // - BrowseBox - -// ------------- + // TODO // The whole selection thingie in this class is somewhat .... suspicious to me. @@ -816,7 +816,7 @@ private: using Window::ToTop; }; -//------------------------------------------------------------------- + inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const { return *reinterpret_cast<DataFlavorExVector*>(implGetDataFlavors()); diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 66edce82457b..17d547d2116a 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -25,7 +25,7 @@ class BrowseBox; -//=================================================================== + class SVT_DLLPUBLIC BrowserHeader: public HeaderBar { diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 6fad42f27c74..265621d6f90c 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -130,9 +130,9 @@ calls or by ending a selection. *************************************************************************/ -// ------------------ + // - Calendar types - -// ------------------ + #define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) #define WB_BOLDTEXT ((WinBits)0x00008000) @@ -149,9 +149,9 @@ calls or by ending a selection. #define DIB_BOLD ((sal_uInt16)0x0001) -// ------------ + // - Calendar - -// ------------ + typedef std::set<sal_uInt32> IntDateSet; @@ -393,9 +393,9 @@ method in CalendarField and create an own calendar there ourselves. *************************************************************************/ -// ----------------- + // - CalendarField - -// ----------------- + class SVT_DLLPUBLIC CalendarField : public DateField { diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index ddc84850bf71..9d5f5d2ec8c5 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -27,7 +27,7 @@ #include <svl/lstner.hxx> #include <unotools/options.hxx> -//----------------------------------------------------------------------------- + namespace svtools{ enum ColorConfigEntry { diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 061868277ab0..834150fe0f19 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -26,9 +26,9 @@ class Window; -// --------------- + // - ColorDialog - -// --------------- + namespace svtools { diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hrc index 2d01ddc668e1..4a0e54a7e310 100644 --- a/include/svtools/controldims.hrc +++ b/include/svtools/controldims.hrc @@ -20,17 +20,17 @@ #ifndef _SVT_CONTROLDIMS_HRC_ #define _SVT_CONTROLDIMS_HRC_ -// + // From: Dialogue Specification and Guidelines - Visual Design V1.3 // by Christian Jansen -// -// + + // Usage: -// ====== -// + + // all values have to be mapped by MAP_APPFONT -// + // Base #define RSC_BS_CHARHEIGHT 8 diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 6571dddde9ee..2d0f4abacce5 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -147,9 +147,9 @@ FontList; FontNameBox; FontStyleBox; FontSizeMenu *************************************************************************/ -// ---------------- + // - ColorListBox - -// ---------------- + class SVT_DLLPUBLIC ColorListBox : public ListBox { @@ -228,9 +228,9 @@ inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const return aColor; } -// --------------- + // - LineListBox - -// --------------- + /** Class computing border widths shared between Line style listbox and the @@ -401,9 +401,9 @@ inline void LineListBox::SetNone( const OUString& sNone ) m_sNone = sNone; } -// --------------- + // - FontNameBox - -// --------------- + class SVT_DLLPUBLIC FontNameBox : public ComboBox { @@ -438,9 +438,9 @@ private: FontNameBox& operator =( const FontNameBox& ); }; -// ---------------- + // - FontStyleBox - -// ---------------- + class SVT_DLLPUBLIC FontStyleBox : public ComboBox { @@ -475,9 +475,9 @@ inline void FontStyleBox::SetText( const OUString& rText ) ComboBox::SetText( rText ); } -// --------------- + // - FontSizeBox - -// --------------- + class SVT_DLLPUBLIC FontSizeBox : public MetricBox { diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 65b19e30dcd1..cd06bce505a8 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -132,9 +132,9 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden. *************************************************************************/ -// ------------ + // - FontList - -// ------------ + #define FONTLIST_FONTINFO_NOTFOUND ((sal_uInt16)0xFFFF) @@ -212,9 +212,9 @@ private: }; -// ----------------- + // - FontSizeNames - -// ----------------- + class SVT_DLLPUBLIC FontSizeNames { diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index dcf973418617..b42a51be03fd 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp> #include <tools/link.hxx> -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= ODialogClosedListener - //===================================================================== + /** C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener */ @@ -60,9 +60,9 @@ namespace svt virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 269c8f6bdab6..c9875b4bac55 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -28,14 +28,14 @@ #include <vector> #include <boost/shared_ptr.hpp> -//........................................................................ + namespace svt { -//........................................................................ - //===================================================================== + + //= IWindowOperator - //===================================================================== + /** an abstract interface for operating on a ->Window */ class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowOperator @@ -55,9 +55,9 @@ namespace svt }; typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; - //===================================================================== + //= IWindowEventFilter - //===================================================================== + /** an abstract interface for deciding whether a ->VclWindowEvent is worth paying attention to */ @@ -70,9 +70,9 @@ namespace svt }; typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; - //===================================================================== + //= DialogController - //===================================================================== + struct DialogController_Data; /** a class controlling interactions between dialog controls @@ -125,9 +125,9 @@ namespace svt }; typedef ::boost::shared_ptr< DialogController > PDialogController; - //===================================================================== + //= ControlDependencyManager - //===================================================================== + struct ControlDependencyManager_Data; /** helper class for managing control dependencies @@ -185,9 +185,9 @@ namespace svt ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented }; - //===================================================================== + //= EnableOnCheck - //===================================================================== + /** a helper class implementing the ->IWindowOperator interface, which enables a dependent window depending on the check state of an instigator window. @@ -221,9 +221,9 @@ namespace svt } }; - //===================================================================== + //= FilterForRadioOrCheckToggle - //===================================================================== + /** a helper class implementing the ->IWindowEventFilter interface, which filters for radio buttons or check boxes being toggled. @@ -251,9 +251,9 @@ namespace svt } }; - //===================================================================== + //= RadioDependentEnabler - //===================================================================== + /** a ->DialogController derivee which enables or disables its dependent windows, depending on the check state of a radio button. @@ -285,9 +285,9 @@ namespace svt } }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_DIALOGCONTROLLING_HXX diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 900222d8c60b..d02a83b85162 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -35,7 +35,7 @@ #include <svtools/svmedit.hxx> #include <vcl/svapp.hxx> -//================================================================== + // EditBrowseBoxFlags (EBBF) #define EBBF_NONE ((sal_Int32)0x0000) @@ -65,22 +65,22 @@ /// @deprecated #define EBBF_NOROWPICTURE EBBF_NO_HANDLE_COLUMN_CONTENT -//================================================================== + class Edit; class SpinField; class FormattedField; -// ....................................................................... + namespace svt { -// ....................................................................... + class CellControllerRef; - //================================================================== + //= CellController - //================================================================== + class SVT_DLLPUBLIC CellController : public SvRefBase { friend class EditBrowseBox; @@ -118,9 +118,9 @@ namespace svt SV_DECL_IMPL_REF(CellController); - //================================================================== + //= IEditImplementation - //================================================================== + class SVT_DLLPUBLIC IEditImplementation { public: @@ -150,9 +150,9 @@ namespace svt virtual void SetModifyHdl( const Link& _rLink ) = 0; }; - //================================================================== + //= GenericEditImplementation - //================================================================== + template <class EDIT> class GenericEditImplementation : public IEditImplementation { @@ -188,9 +188,9 @@ namespace svt #include <svtools/editimplementation.hxx> - //================================================================== + //= MultiLineTextCell - //================================================================== + /** a multi line edit which can be used in a cell of a EditBrowseBox */ class SVT_DLLPUBLIC MultiLineTextCell : public MultiLineEdit @@ -212,9 +212,9 @@ namespace svt sal_Bool dispatchKeyEvent( const KeyEvent& _rEvent ); }; - //================================================================== + //= concrete edit implementations - //================================================================== + typedef GenericEditImplementation< Edit > EditImplementation; typedef GenericEditImplementation< MultiLineTextCell > MultiLineEditImplementation_Base; @@ -229,9 +229,9 @@ namespace svt virtual OUString GetSelected( LineEnd aSeparator ) const; }; - //================================================================== + //= EditCellController - //================================================================== + class SVT_DLLPUBLIC EditCellController : public CellController { IEditImplementation* m_pEditImplementation; @@ -255,9 +255,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= SpinCellController - //================================================================== + class SVT_DLLPUBLIC SpinCellController : public CellController { public: @@ -274,9 +274,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= CheckBoxControl - //================================================================== + class SVT_DLLPUBLIC CheckBoxControl : public Control { CheckBox* pBox; @@ -307,9 +307,9 @@ namespace svt DECL_LINK( OnClick, void* ); }; - //================================================================== + //= CheckBoxCellController - //================================================================== + class SVT_DLLPUBLIC CheckBoxCellController : public CellController { public: @@ -326,9 +326,9 @@ namespace svt virtual sal_Bool WantMouseEvent() const; }; - //================================================================== + //= ComboBoxControl - //================================================================== + class SVT_DLLPUBLIC ComboBoxControl : public ComboBox { friend class ComboBoxCellController; @@ -340,9 +340,9 @@ namespace svt virtual bool PreNotify( NotifyEvent& rNEvt ); }; - //================================================================== + //= ComboBoxCellController - //================================================================== + class SVT_DLLPUBLIC ComboBoxCellController : public CellController { public: @@ -359,9 +359,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= ListBoxControl - //================================================================== + class SVT_DLLPUBLIC ListBoxControl : public ListBox { friend class ListBoxCellController; @@ -373,9 +373,9 @@ namespace svt virtual bool PreNotify( NotifyEvent& rNEvt ); }; - //================================================================== + //= ListBoxCellController - //================================================================== + class SVT_DLLPUBLIC ListBoxCellController : public CellController { public: @@ -392,9 +392,9 @@ namespace svt virtual void SetModifyHdl(const Link& rLink); }; - //================================================================== + //= FormattedFieldCellController - //================================================================== + class SVT_DLLPUBLIC FormattedFieldCellController : public EditCellController { public: @@ -404,9 +404,9 @@ namespace svt virtual void CommitModifications(); }; - //================================================================== + //= EditBrowserHeader - //================================================================== + class SVT_DLLPUBLIC EditBrowserHeader : public BrowserHeader { public: @@ -417,9 +417,9 @@ namespace svt virtual void DoubleClick(); }; - //================================================================== + //= EditBrowseBox - //================================================================== + class EditBrowseBoxImpl; class SVT_DLLPUBLIC EditBrowseBox: public BrowseBox { @@ -675,9 +675,9 @@ namespace svt DECL_DLLPRIVATE_LINK(CellModifiedHdl, void* ); }; -// ....................................................................... + } // namespace svt -// ....................................................................... + #undef SVTOOLS_IN_EDITBROWSEBOX_HXX #endif // INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx index c6de2b783113..96eaf50964a0 100644 --- a/include/svtools/editimplementation.hxx +++ b/include/svtools/editimplementation.hxx @@ -21,21 +21,21 @@ #error "not to be included directly!" #endif -//---------------------------------------------------------------------- + template <class EDIT> GenericEditImplementation< EDIT >::GenericEditImplementation( EDIT& _rEdit ) :m_rEdit( _rEdit ) { } -//---------------------------------------------------------------------- + template <class EDIT> Control& GenericEditImplementation< EDIT >::GetControl() { return m_rEdit; } -//---------------------------------------------------------------------- + template <class EDIT> OUString GenericEditImplementation< EDIT >::GetText( LineEnd ) const { @@ -43,98 +43,98 @@ OUString GenericEditImplementation< EDIT >::GetText( LineEnd ) const return m_rEdit.GetText( ); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::SetText( const OUString& _rStr ) { m_rEdit.SetText( _rStr ); } -//---------------------------------------------------------------------- + template <class EDIT> Selection GenericEditImplementation< EDIT >::GetSelection() const { return m_rEdit.GetSelection( ); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::SetSelection( const Selection& _rSelection ) { m_rEdit.SetSelection( _rSelection ); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::SetReadOnly( sal_Bool bReadOnly ) { m_rEdit.SetReadOnly( bReadOnly ); } -//---------------------------------------------------------------------- + template <class EDIT> sal_Bool GenericEditImplementation< EDIT >::IsReadOnly() const { return m_rEdit.IsReadOnly(); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::ReplaceSelected( const OUString& _rStr ) { m_rEdit.ReplaceSelected( _rStr ); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::DeleteSelected() { m_rEdit.DeleteSelected(); } -//---------------------------------------------------------------------- + template <class EDIT> OUString GenericEditImplementation< EDIT >::GetSelected( LineEnd ) const { return m_rEdit.GetSelected( ); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::SetMaxTextLen( sal_Int32 _nMaxLen ) { m_rEdit.SetMaxTextLen( _nMaxLen ); } -//---------------------------------------------------------------------- + template <class EDIT> sal_Int32 GenericEditImplementation< EDIT >::GetMaxTextLen() const { return m_rEdit.GetMaxTextLen( ); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::SetModified() { m_rEdit.SetModifyFlag(); } -//---------------------------------------------------------------------- + template <class EDIT> sal_Bool GenericEditImplementation< EDIT >::IsModified() const { return m_rEdit.IsModified(); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::ClearModified() { m_rEdit.ClearModifyFlag(); } -//---------------------------------------------------------------------- + template <class EDIT> void GenericEditImplementation< EDIT >::SetModifyHdl( const Link& _rLink ) { diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index afafa1dc416d..cc20bea1a09f 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -26,7 +26,7 @@ #include <svl/brdcst.hxx> #include <svl/lstner.hxx> -//----------------------------------------------------------------------------- + namespace svtools{ class ExtendedColorConfig_Impl; diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index a0421ce2cb7e..42a7523d9b5a 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -23,12 +23,12 @@ #include <vcl/ctrl.hxx> #include <rtl/ustring.hxx> -// ============================================================================ + namespace svt { -// ============================================================================ + /** This abstract class provides methods to implement an extension list box. This header is needed for the automatic test tool @@ -87,11 +87,11 @@ public: */ virtual void select( const OUString & sName ) = 0; }; -// ============================================================================ + } // namespace svt -// ============================================================================ + #endif // INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 2ee919d80695..a79fb20b37c7 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -85,7 +85,7 @@ public: void SetReadOnly( sal_Bool bReadOnly = sal_True ) { maEdit.SetReadOnly( bReadOnly ); } sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); } - //------ + //use this to manipulate the dialog bevore executing it: void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 2d113cfb0450..1ba68e71f1dd 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -23,14 +23,14 @@ #include <svtools/svtdllapi.h> #include <svtools/inettbc.hxx> -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= FileURLBox - //===================================================================== + class SVT_DLLPUBLIC FileURLBox : public SvtURLBox { private: @@ -59,9 +59,9 @@ namespace svt void DisplayURL( const OUString& _rURL ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_FILEURLBOX_HXX diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index e617aac3eaa3..25f3a54c839a 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -211,9 +211,9 @@ struct SvtContentEntry namespace svtools { -// ----------------------------------------------------------------------- + // QueryDeleteDlg_Impl -// ----------------------------------------------------------------------- + enum QueryDeleteResult_Impl { diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index aa7d36af17c9..9c474d8be22c 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -32,7 +32,7 @@ typedef sal_uInt16 FORMAT_CHANGE_TYPE; #define FCT_PRECISION 0x02 // a new precision was set #define FCT_THOUSANDSSEP 0x03 // the thousands separator setting changed -//------------------------------------------------------------------------------ + class SVT_DLLPUBLIC FormattedField : public SpinField { private: @@ -259,7 +259,7 @@ protected: virtual void ReFormat(); }; -//------------------------------------------------------------------------------ + class SVT_DLLPUBLIC DoubleNumericField : public FormattedField { protected: @@ -282,11 +282,11 @@ protected: void ResetConformanceTester(); }; -//============================================================================== + #define FCT_CURRENCY_SYMBOL 0x10 #define FCT_CURRSYM_POSITION 0x20 -//------------------------------------------------------------------------------ + class DoubleCurrencyField : public FormattedField { OUString m_sCurrencySymbol; diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index e2c38d5f77b0..053be31409b2 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -24,7 +24,7 @@ struct SvtFontSubstConfig_Impl; -//----------------------------------------------------------------------------- + struct SubstitutionStruct { OUString sFont; @@ -32,7 +32,7 @@ struct SubstitutionStruct sal_Bool bReplaceAlways; sal_Bool bReplaceOnScreenOnly; }; -//----------------------------------------------------------------------------- + class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem { sal_Bool bIsEnabled; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 360f8e6dbe42..373e2a4aa3c2 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -43,12 +43,12 @@ class Dialog; class Window; class VclWindowEvent; -//......................................................................... + namespace svt { -//......................................................................... - //========================================================================= + + #define UNODIALOG_PROPERTY_ID_TITLE 1 #define UNODIALOG_PROPERTY_ID_PARENT 2 @@ -56,7 +56,7 @@ namespace svt #define UNODIALOG_PROPERTY_PARENT "ParentWindow" - //========================================================================= + typedef ::cppu::WeakImplHelper3 < com::sun::star::ui::dialogs::XExecutableDialog , com::sun::star::lang::XServiceInfo , com::sun::star::lang::XInitialization @@ -176,9 +176,9 @@ namespace svt ::osl::MutexGuard m_aGuard; }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 3bb3f0b70e04..f4560fb08149 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -182,23 +182,23 @@ class ImplHeadItem; typedef ::std::vector< ImplHeadItem* > ImplHeadItemList; -// ----------- + // - WinBits - -// ----------- + #define WB_BOTTOMBORDER ((WinBits)0x0400) #define WB_BUTTONSTYLE ((WinBits)0x0800) #define WB_STDHEADERBAR (WB_BUTTONSTYLE | WB_BOTTOMBORDER) -// --------------------- + // - HeaderBarItemBits - -// --------------------- + typedef sal_uInt16 HeaderBarItemBits; -// ---------------------------- + // - Bits fuer HeaderBarItems - -// ---------------------------- + #define HIB_LEFT ((HeaderBarItemBits)0x0001) #define HIB_CENTER ((HeaderBarItemBits)0x0002) @@ -217,9 +217,9 @@ typedef sal_uInt16 HeaderBarItemBits; #define HIB_USERDRAW ((HeaderBarItemBits)0x4000) #define HIB_STDSTYLE (HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE) -// ------------------- + // - HeaderBar-Types - -// ------------------- + #define HEADERBAR_APPEND ((sal_uInt16)0xFFFF) #define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) @@ -227,9 +227,9 @@ typedef sal_uInt16 HeaderBarItemBits; #define HEADERBAR_TEXTOFF 2 -// ------------- + // - HeaderBar - -// ------------- + class VCLXHeaderBar; diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index bc60e4a005b1..502a1bb7a2c6 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -27,10 +27,10 @@ #define LABELBASEMAPHEIGHT 8 -//......................................................................... + namespace svt { -//......................................................................... + class HyperLabelImpl; diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index c7bea711dbc4..93287db5a671 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/uno/XComponentContext.hpp> class SvStream; -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= GraphicAccess - //==================================================================== + /** helper class for obtaining streams (which also can be used with the ImageProducer) from a resource */ @@ -72,9 +72,9 @@ namespace svt ); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // DBA14_ INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index 5c19d429d6a5..f9b86f16f9d2 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -24,7 +24,7 @@ class SvData; class SotDataObject; -//========================================================================= + class INetImage { diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 6b8e904d24ee..a51693e048ba 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -179,7 +179,7 @@ public: sal_uInt16 GetSubItem() const { return nSubItem; } }; -//################################################################################################################################### + /* Window-Bits: WB_ICON // Text unter dem Icon diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 8c3163f6030f..509755d6dbcc 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.hxx @@ -24,9 +24,9 @@ #include <i18nlangtag/lang.h> #include <svtools/svtdllapi.h> -//======================================================================== + // class SvtLanguageTable -//======================================================================== + class SVT_DLLPUBLIC SvtLanguageTable : public ResStringArray { diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx index 61baf4620d9d..43368b4c6899 100644 --- a/include/svtools/localresaccess.hxx +++ b/include/svtools/localresaccess.hxx @@ -24,14 +24,14 @@ #include <tools/rcid.h> #include <osl/diagnose.h> -//......................................................................... + namespace svt { -//......................................................................... - //========================================================================= + + //= OLocalResourceAccess - //========================================================================= + /** helper class for acessing local resources */ class OLocalResourceAccess : public Resource @@ -66,9 +66,9 @@ namespace svt } }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_LOCALRESACCESS_HXX diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 12291879a92a..788dcc250723 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -25,7 +25,7 @@ #include <osl/mutex.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -35,7 +35,7 @@ class Link; class SvtMenuOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about menu features @descr - @@ -49,7 +49,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -71,7 +71,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." @descr These options describe internal states to enable/disable features of installed office. @@ -93,7 +93,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 14ff1168bf29..8d0e1db477b0 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -26,7 +26,7 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -36,7 +36,7 @@ class SvtMiscOptions_Impl; class Link; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about misc group @descr - @@ -51,7 +51,7 @@ class Link; class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -115,7 +115,7 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index e8e4d2e7e5ed..101ca4c06b7e 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -26,11 +26,11 @@ #include <rtl/ustring.hxx> #include <tools/color.hxx> -//_________________________________________________________________________________________________________________ + // forward declarations -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -39,7 +39,7 @@ class SvtOptionsDrawinglayer_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about startup features @descr - @@ -51,17 +51,17 @@ class SvtOptionsDrawinglayer_Impl; class SVT_DLLPUBLIC SvtOptionsDrawinglayer { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -80,11 +80,11 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer SvtOptionsDrawinglayer(); ~SvtOptionsDrawinglayer(); - //--------------------------------------------------------------------------------------------------------- + // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Drawinglayer/..." @descr These options describe internal states to enable/disable features of installed office. @@ -159,13 +159,13 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer void SetTransparentSelection( sal_Bool bState ); void SetTransparentSelectionPercent( sal_uInt16 nPercent ); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class use his own static mutex to be threadsafe. We create a static mutex only for one ime and use at different times. @@ -179,9 +179,9 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer *//*-*****************************************************************************************************/ SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx index 30a14bf3e095..2d90abfd30e9 100644 --- a/include/svtools/printoptions.hxx +++ b/include/svtools/printoptions.hxx @@ -28,9 +28,9 @@ class SvtPrintOptions_Impl; -// ----------------------- + // - SvtBasePrintOptions - -// ----------------------- + class PrinterOptions; @@ -81,9 +81,9 @@ public: void SetPrinterOptions( const PrinterOptions& rOptions ); }; -// --------------------- + // - SvtPrinterOptions - -// --------------------- + class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions { @@ -98,9 +98,9 @@ public: virtual ~SvtPrinterOptions(); }; -// ----------------------- + // - SvtPrintFileOptions - -// ----------------------- + class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions { diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 1d43f2f39a24..b0dbf621dac1 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -33,9 +33,9 @@ class Printer; class QueueInfo; -// ---------------------- + // - PrinterSetupDialog - -// ---------------------- + class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog { @@ -73,9 +73,9 @@ public: void SetOptionsHdl( const Link& rLink ); }; -// ------------------------------------- + // - Helper functions for print dialog - -// ------------------------------------- + #define IMPL_PRINTDLG_STATUS_UPDATE 15000 diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx index 1febec3cbb4a..154a392f7215 100644 --- a/include/svtools/roadmap.hxx +++ b/include/svtools/roadmap.hxx @@ -29,10 +29,10 @@ class Bitmap; -//......................................................................... + namespace svt { -//......................................................................... + struct RoadmapTypes { @@ -44,9 +44,9 @@ namespace svt class RoadmapImpl; class RoadmapItem; - //===================================================================== + //= Roadmap - //===================================================================== + class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes { protected: @@ -114,9 +114,9 @@ namespace svt void UpdatefollowingHyperLabels( ItemIndex _Index ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 62d4aa93800e..03ec7696618d 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -23,10 +23,10 @@ #include <svtools/svtdllapi.h> #include <svtools/wizardmachine.hxx> -//........................................................................ + namespace svt { -//........................................................................ + struct RoadmapWizardImpl; class RoadmapWizard; @@ -39,9 +39,9 @@ namespace svt typedef TabPage* (* RoadmapPageFactory)( RoadmapWizard& ); }; - //==================================================================== + //= RoadmapWizard - //==================================================================== + /** is - no, not a wizard for a roadmap, but the base class for wizards <em>supporting</em> a roadmap. @@ -237,9 +237,9 @@ protected: SVT_DLLPRIVATE void impl_construct(); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // OOO_ INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 1b2c4d9aa72b..6b8248c99a73 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -31,7 +31,7 @@ class Size; class Point; -//_____________________________________________________________________________ + /** This class provides drawing text with different script types on any output devices. @@ -88,7 +88,7 @@ public: void DrawText( const Point& _rPos ); }; -//_____________________________________________________________________________ + #endif diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 53f83b5c2f01..47eb307d481a 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -26,9 +26,9 @@ class DataChangedEvent; -// ------------------------- + // - ScrollableWindow-Type - -// ------------------------- + typedef sal_uInt16 ScrollableWindowFlags; @@ -37,9 +37,9 @@ typedef sal_uInt16 ScrollableWindowFlags; #define SCRWIN_HCENTER 4 #define SCRWIN_DEFAULT (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER) -// -------------------- + // - ScrollableWindow - -// -------------------- + class SVT_DLLPUBLIC ScrollableWindow: public Window { diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx index 3dd05675fa56..56643816dd56 100644 --- a/include/svtools/stdctrl.hxx +++ b/include/svtools/stdctrl.hxx @@ -25,9 +25,9 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -// ------------- + // - FixedInfo - -// ------------- + class SVT_DLLPUBLIC FixedInfo : public FixedText { diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index fd0f18674290..b6e23763065b 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -97,9 +97,9 @@ FontList; FontNameMenu; FontSizeBox *************************************************************************/ -// ---------------- + // - FontNameMenu - -// ---------------- + class SVT_DLLPUBLIC FontNameMenu : public PopupMenu { @@ -126,9 +126,9 @@ public: const Link& GetHighlightHdl() const { return maHighlightHdl; } }; -// ---------------- + // - FontSizeMenu - -// ---------------- + class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu { diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 12d6fdaf204a..dce78ebd184e 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -23,14 +23,14 @@ #include <svtools/svtdllapi.h> #include <svtools/transfer.hxx> -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= OStringTransferable - //==================================================================== + class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper { protected: @@ -45,9 +45,9 @@ namespace svt virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); }; - //==================================================================== + //= OStringTransfer - //==================================================================== + class OStringTransfer { public: @@ -67,9 +67,9 @@ namespace svt SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_STRINGTRANSFER_HXX diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index e11c5aea9a8f..83ecedb860d2 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -24,7 +24,7 @@ #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) -//............................................................................. + // various unsorted stuff #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) @@ -253,19 +253,19 @@ -//............................................................................. + // dialogs #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) -//............................................................................. + // bitmaps #define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3) #define BMP_LIST_ADD (RID_SVTOOLS_BITMAP_START + 4) -//............................................................................. + // image lists #define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1) @@ -284,7 +284,7 @@ #define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25) #define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26) -//............................................................................. + // images #define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0) #define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1) diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 70f6afee0b6e..8bdc26a66911 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -35,9 +35,9 @@ class TabBarEdit; struct ImplTabBarItem; typedef ::std::vector< ImplTabBarItem* > ImplTabBarList; -// ----------------- + // - Dokumentation - -// ----------------- + /* @@ -288,9 +288,9 @@ Uebergabe der Mausposition kann ermittelt werden, ob der Mausclick ueber einem bzw. ueber welchem Item durchgefuehrt wurde. */ -// ----------- + // - WinBits - -// ----------- + #define WB_RANGESELECT ((WinBits)0x00200000) #define WB_MULTISELECT ((WinBits)0x00400000) @@ -300,29 +300,29 @@ ueber einem bzw. ueber welchem Item durchgefuehrt wurde. #define WB_INSERTTAB ((WinBits)0x40000000) #define WB_STDTABBAR WB_BORDER -// ------------------ + // - TabBarPageBits - -// ------------------ + typedef sal_uInt16 TabBarPageBits; -// ------------------------- + // - Bits fuer TabBarPages - -// ------------------------- + #define TPB_SPECIAL ((TabBarPageBits)0x0001) -// ---------------- + // - TabBar-Types - -// ---------------- + #define TABBAR_RENAMING_YES ((long)sal_True) #define TABBAR_RENAMING_NO ((long)sal_False) #define TABBAR_RENAMING_CANCEL ((long)2) -// ---------- + // - TabBar - -// ---------- + struct TabBar_Impl; struct ImplTabBarItem; diff --git a/include/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx index 34f93b4d9424..11544fd5369c 100644 --- a/include/svtools/table/defaultinputhandler.hxx +++ b/include/svtools/table/defaultinputhandler.hxx @@ -25,16 +25,16 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace svt { namespace table { -//...................................................................................................................... + struct DefaultInputHandler_Impl; - //================================================================================================================== + //= DefaultInputHandler - //================================================================================================================== + class DefaultInputHandler : public ITableInputHandler { private: @@ -56,9 +56,9 @@ namespace svt { namespace table virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ); }; -//...................................................................................................................... + } } // namespace svt::table -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX diff --git a/include/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx index dda6b6ff3982..6842fc33cda2 100644 --- a/include/svtools/table/gridtablerenderer.hxx +++ b/include/svtools/table/gridtablerenderer.hxx @@ -24,16 +24,16 @@ #include <boost/scoped_ptr.hpp> -//........................................................................ + namespace svt { namespace table { -//........................................................................ + struct GridTableRenderer_Impl; - //==================================================================== + //= GridTableRenderer - //==================================================================== + /** a default implementation for the ->ITableRenderer interface This class is able to paint a table grid, table headers, and cell @@ -112,9 +112,9 @@ namespace svt { namespace table OUString const & i_text ); }; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX diff --git a/include/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx index 73f713d67b20..d8eee465d096 100644 --- a/include/svtools/table/tablecontrol.hxx +++ b/include/svtools/table/tablecontrol.hxx @@ -31,17 +31,17 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -//........................................................................ + namespace svt { namespace table { -//........................................................................ + class TableControl_Impl; - //==================================================================== + //= TableControl - //==================================================================== + /** a basic control which manages table-like data, i.e. a number of cells organized in <code>m</code> rows and <code>n</code> columns. @@ -164,7 +164,7 @@ namespace svt { namespace table void commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue ); void commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue ); - // ............................................................................................................. + // IAccessibleTable virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); @@ -198,7 +198,7 @@ namespace svt { namespace table virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const; virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ); virtual void SelectAllRows( bool const i_select ); - // ............................................................................................................. + private: DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* ); @@ -209,9 +209,9 @@ namespace svt { namespace table TableControl& operator=( const TableControl& ); // never implemented }; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX diff --git a/include/svtools/table/tablecontrolinterface.hxx b/include/svtools/table/tablecontrolinterface.hxx index 362f5e82cad5..553ce4078729 100644 --- a/include/svtools/table/tablecontrolinterface.hxx +++ b/include/svtools/table/tablecontrolinterface.hxx @@ -29,14 +29,14 @@ class Pointer; -//...................................................................................................................... + namespace svt { namespace table { -//...................................................................................................................... - //================================================================================================================== + + //= TableControlAction - //================================================================================================================== + enum TableControlAction { /// moves the cursor in the table control one row up, if possible, by keeping the current column @@ -78,18 +78,18 @@ namespace svt { namespace table invalidTableControlAction }; - //================================================================================================================== + //= TableCellArea - //================================================================================================================== + enum TableCellArea { CellContent, ColumnDivider }; - //================================================================================================================== + //= TableCell - //================================================================================================================== + struct TableCell { ColPos nColumn; @@ -111,9 +111,9 @@ namespace svt { namespace table } }; - //================================================================================================================== + //= ColumnMetrics - //================================================================================================================== + struct ColumnMetrics { /** the start of the column, in pixels. Might be negative, in case the column is scrolled out of the visible @@ -147,9 +147,9 @@ namespace svt { namespace table } }; - //================================================================================================================== + //= TableArea - //================================================================================================================== + enum TableArea { TableAreaColumnHeaders, @@ -158,9 +158,9 @@ namespace svt { namespace table TableAreaAll }; - //================================================================================================================== + //= ITableControl - //================================================================================================================== + /** defines a callback interface to be implemented by a concrete table control */ class SAL_NO_VTABLE ITableControl @@ -248,9 +248,9 @@ namespace svt { namespace table virtual ~ITableControl() {}; }; -//...................................................................................................................... + } } // namespace svt::table -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX diff --git a/include/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx index 1806dfd6b866..b08cf9908e17 100644 --- a/include/svtools/table/tableinputhandler.hxx +++ b/include/svtools/table/tableinputhandler.hxx @@ -28,16 +28,16 @@ class HelpEvent; class CommandEvent; class NotifyEvent; -//........................................................................ + namespace svt { namespace table { -//........................................................................ + class ITableControl; - //==================================================================== + //= ITableInputHandler - //==================================================================== + /** interface for components handling input in a ->TableControl */ class ITableInputHandler @@ -64,9 +64,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableInputHandler > PTableInputHandler; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx index 0711bb0b6ff9..67a0e16b9034 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/include/svtools/table/tablemodel.hxx @@ -37,15 +37,15 @@ #include <boost/optional.hpp> #include <boost/enable_shared_from_this.hpp> -//........................................................................ + namespace svt { namespace table { -//........................................................................ - //==================================================================== + + //= ScrollbarVisibility - //==================================================================== + enum ScrollbarVisibility { /** enumeration value denoting that a scrollbar should never be visible, even @@ -61,9 +61,9 @@ namespace svt { namespace table ScrollbarShowAlways }; - //==================================================================== + //= ITableModelListener - //==================================================================== + typedef sal_Int32 ColumnAttributeGroup; #define COL_ATTRS_NONE (0x00000000) /// denotes column attributes related to the width of the column @@ -73,9 +73,9 @@ namespace svt { namespace table /// denotes the entirety of column attributes #define COL_ATTRS_ALL (0x7FFFFFFF) - //==================================================================== + //= ITableModelListener - //==================================================================== + /** declares an interface to be implemented by components interested in changes in an ->ITableModel */ @@ -159,9 +159,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableModelListener > PTableModelListener; - //==================================================================== + //= IColumnModel - //==================================================================== + /** interface to be implemented by table column models */ class SAL_NO_VTABLE IColumnModel @@ -313,9 +313,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< IColumnModel > PColumnModel; - //==================================================================== + //= ITableModel - //==================================================================== + /** declares the interface to implement by an abtract table model */ class SAL_NO_VTABLE SVT_DLLPUBLIC ITableModel @@ -534,9 +534,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableModel > PTableModel; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index bbd7d85be31b..a365f33b6d56 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -28,14 +28,14 @@ class StyleSettings; -//........................................................................ + namespace svt { namespace table { -//........................................................................ - //==================================================================== + + //= ITableRenderer - //==================================================================== + /** interface to implement by components rendering a ->TableControl */ class SAL_NO_VTABLE ITableRenderer @@ -278,9 +278,9 @@ namespace svt { namespace table }; typedef ::boost::shared_ptr< ITableRenderer > PTableRenderer; -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX diff --git a/include/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx index bb0bf04c6473..493f7c199704 100644 --- a/include/svtools/table/tablesort.hxx +++ b/include/svtools/table/tablesort.hxx @@ -22,23 +22,23 @@ #include <svtools/table/tabletypes.hxx> -//...................................................................................................................... + namespace svt { namespace table { -//...................................................................................................................... - //================================================================================================================== + + //= ColumnSortDirection - //================================================================================================================== + enum ColumnSortDirection { ColumnSortAscending, ColumnSortDescending }; - //================================================================================================================== + //= ColumnSort - //================================================================================================================== + struct ColumnSort { ColPos nColumnPos; @@ -57,9 +57,9 @@ namespace svt { namespace table } }; - //================================================================================================================== + //= ITableDataSort - //================================================================================================================== + /** provides sorting functionality for the datta underlying an ITableModel */ class SAL_NO_VTABLE ITableDataSort @@ -80,9 +80,9 @@ namespace svt { namespace table ~ITableDataSort() {} }; -//...................................................................................................................... + } } // namespace svt::table -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX diff --git a/include/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx index 8e3ba7d9ae82..8c7258f71a4f 100644 --- a/include/svtools/table/tabletypes.hxx +++ b/include/svtools/table/tabletypes.hxx @@ -22,10 +22,10 @@ #include <sal/types.h> -//........................................................................ + namespace svt { namespace table { -//........................................................................ + /// a value denoting the size of a table typedef sal_Int32 TableSize; @@ -55,9 +55,9 @@ namespace svt { namespace table #define ROW_INVALID ((::svt::table::RowPos)-2) -//........................................................................ + } } // namespace svt::table -//........................................................................ + #endif // INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index 61c9f611d60b..b6f8ffd6b0a6 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -23,14 +23,14 @@ #include <svtools/svtdllapi.h> #include <sal/types.h> -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= TemplateFolderCache - //===================================================================== + class TemplateFolderCacheImpl; /** allows to cache the state of the template directories of OOo <p>Usually, this class is used together with an instance of a the @@ -93,9 +93,9 @@ namespace svt void storeState( sal_Bool _bForceRetrieval = sal_False ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX diff --git a/include/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx index 9b593d434836..11345e7106a3 100644 --- a/include/svtools/toolpanel/decklayouter.hxx +++ b/include/svtools/toolpanel/decklayouter.hxx @@ -32,14 +32,14 @@ namespace com { namespace sun { namespace star { namespace accessibility { class Rectangle; class Point; -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= IDeckLayouter - //==================================================================== + class IDeckLayouter : public ::rtl::IReference { public: @@ -90,9 +90,9 @@ namespace svt typedef ::rtl::Reference< IDeckLayouter > PDeckLayouter; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_DECKLAYOUTER_HXX diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index a086549568f9..c5867111db14 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -27,18 +27,18 @@ #include <boost/shared_ptr.hpp> -//...................................................................................................................... + namespace svt { -//...................................................................................................................... + class ToolPanelViewShell; class ToolPanelDrawer; typedef ::boost::shared_ptr< ToolPanelDrawer > PToolPanelDrawer; - //================================================================================================================== + //= ToolPanelDrawer - //================================================================================================================== + /** a class which implements a tool panel selector in the form of the classical drawers */ class SVT_DLLPUBLIC DrawerDeckLayouter :public RefBase @@ -88,9 +88,9 @@ private: ::boost::optional< size_t > m_aLastKnownActivePanel; }; -//...................................................................................................................... + } // namespace svt -//...................................................................................................................... + #endif // INCLUDED_SVTOOLS_TOOLPANEL_DRAWERLAYOUTER_HXX diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 3506fb71d4bb..35323d7aee6e 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -31,17 +31,17 @@ class PushButton; -//........................................................................ + namespace svt { -//........................................................................ + class PanelTabBar_Impl; class IToolPanelDeck; - //==================================================================== + //= PanelTabBar - //==================================================================== + /** a tab bar for selecting panels At the moment, this control aligns the tabs vertically, this might be extended to also support a horizontal @@ -87,9 +87,9 @@ namespace svt ::std::auto_ptr< PanelTabBar_Impl > m_pImpl; }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_PANELTABBAR_HXX diff --git a/include/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx index 06afe1fa06a6..7de482b37693 100644 --- a/include/svtools/toolpanel/refbase.hxx +++ b/include/svtools/toolpanel/refbase.hxx @@ -24,14 +24,14 @@ #include <rtl/ref.hxx> -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= RefBase - //==================================================================== + class SVT_DLLPUBLIC RefBase : public ::rtl::IReference { protected: @@ -66,9 +66,9 @@ namespace svt return RefBase::release(); \ } -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_REFBASE_HXX diff --git a/include/svtools/toolpanel/tabalignment.hxx b/include/svtools/toolpanel/tabalignment.hxx index 6dae547b758b..e75ffb83339f 100644 --- a/include/svtools/toolpanel/tabalignment.hxx +++ b/include/svtools/toolpanel/tabalignment.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX #define INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX -//........................................................................ + namespace svt { -//........................................................................ + enum TabAlignment { @@ -33,9 +33,9 @@ namespace svt TABS_BOTTOM }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX diff --git a/include/svtools/toolpanel/tabitemcontent.hxx b/include/svtools/toolpanel/tabitemcontent.hxx index 22e33f7898a8..5198cdd349f7 100644 --- a/include/svtools/toolpanel/tabitemcontent.hxx +++ b/include/svtools/toolpanel/tabitemcontent.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX #define INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX -//........................................................................ + namespace svt { -//........................................................................ + enum TabItemContent { @@ -34,9 +34,9 @@ namespace svt TABITEM_AUTO }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index b7f762f337ab..72e234ea5fc1 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -32,18 +32,18 @@ class Window; -//........................................................................ + namespace svt { -//........................................................................ + class IToolPanelDeck; struct TabDeckLayouter_Data; - //==================================================================== + //= TabDeckLayouter - //==================================================================== + class SVT_DLLPUBLIC TabDeckLayouter :public RefBase ,public IDeckLayouter ,public ::boost::noncopyable @@ -90,9 +90,9 @@ namespace svt ::std::auto_ptr< TabDeckLayouter_Data > m_pData; }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TABLAYOUTER_HXX diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx index d0a21a951889..6ecb29da3844 100644 --- a/include/svtools/toolpanel/toolpanel.hxx +++ b/include/svtools/toolpanel/toolpanel.hxx @@ -34,14 +34,14 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= IToolPanel - //==================================================================== + /** abstract interface for a single tool panel */ class SVT_DLLPUBLIC IToolPanel : public ::rtl::IReference @@ -111,9 +111,9 @@ namespace svt typedef ::rtl::Reference< IToolPanel > PToolPanel; - //==================================================================== + //= ToolPanelBase - //==================================================================== + /** base class for tool panel implementations, adding ref count implementation to the IToolPanel interface, but still being abstract */ @@ -129,9 +129,9 @@ namespace svt DECLARE_IREFERENCE() }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANEL_HXX diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 1bc2026183c6..7423d75e0488 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -29,17 +29,17 @@ #include <boost/optional.hpp> #include <memory> -//........................................................................ + namespace svt { -//........................................................................ + class ToolPanelCollection; class ToolPanelDeck_Impl; - //==================================================================== + //= IToolPanelDeckListener - //==================================================================== + class SAL_NO_VTABLE IToolPanelDeckListener { public: @@ -71,9 +71,9 @@ namespace svt ~IToolPanelDeckListener() {} }; - //==================================================================== + //= IToolPanelDeck - //==================================================================== + class SVT_DLLPUBLIC IToolPanelDeck { public: @@ -129,9 +129,9 @@ namespace svt ~IToolPanelDeck() {} }; - //==================================================================== + //= ToolPanelDeck - //==================================================================== + class SVT_DLLPUBLIC ToolPanelDeck :public Control ,public IToolPanelDeck { @@ -175,9 +175,9 @@ namespace svt ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl; }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANELDECK_HXX diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 85d538bc2b69..443f8f6c3665 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -23,14 +23,14 @@ #include <svtools/svtdllapi.h> #include <svtools/inettbc.hxx> -//......................................................................... + namespace svt { -//......................................................................... - //===================================================================== + + //= OFileURLControl - //===================================================================== + class SVT_DLLPUBLIC OFileURLControl : public SvtURLBox { private: @@ -45,9 +45,9 @@ namespace svt virtual bool Notify( NotifyEvent& rNEvt ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_URLCONTROL_HXX diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 87102c43e051..f128884d08c2 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -176,9 +176,9 @@ to be set (before Show) with SetStyle(). *************************************************************************/ -// ------------------ + // - ValueSet types - -// ------------------ + #define WB_RADIOSEL ((WinBits)0x00008000) #define WB_ITEMBORDER ((WinBits)0x00010000) @@ -189,9 +189,9 @@ to be set (before Show) with SetStyle(). #define WB_NO_DIRECTSELECT ((WinBits)0x04000000) #define WB_MENUSTYLEVALUESET ((WinBits)0x08000000) -// ------------ + // - ValueSet - -// ------------ + #define VALUESET_APPEND ((sal_uInt16)-1) #define VALUESET_ITEM_NOTFOUND ((sal_uInt16)-1) diff --git a/include/svtools/vclxaccessibleheaderbar.hxx b/include/svtools/vclxaccessibleheaderbar.hxx index b02f609d1e43..013322adb791 100644 --- a/include/svtools/vclxaccessibleheaderbar.hxx +++ b/include/svtools/vclxaccessibleheaderbar.hxx @@ -29,9 +29,9 @@ #endif class HeaderBar; -// ---------------------------------------------------- + // class VCLXAccessibleHeaderBar -// ---------------------------------------------------- + typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > > ListItems; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 2924f342d2ef..ecaeb624c34a 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -25,10 +25,10 @@ #include <vcl/tabpage.hxx> class Bitmap; -//......................................................................... + namespace svt { -//......................................................................... + // wizard buttons #define WZB_NONE 0x0000 @@ -41,9 +41,9 @@ namespace svt // wizard states #define WZS_INVALID_STATE ((WizardState)-1) - //===================================================================== + //= WizardTypes - //===================================================================== + struct WizardTypes { typedef sal_Int16 WizardState; @@ -59,7 +59,7 @@ namespace svt class SAL_NO_VTABLE IWizardPageController { public: - //----------------------------------------------------------------- + // This methods behave somewhat different than ActivatePage/DeactivatePage // The latter are handled by the base class itself whenever changing the pages is in the offing, // i.e., when it's already decided which page is the next. @@ -82,9 +82,9 @@ namespace svt ~IWizardPageController() {} }; - //===================================================================== + //= OWizardPage - //===================================================================== + class OWizardMachine; struct WizardPageImplData; @@ -119,9 +119,9 @@ namespace svt void updateDialogTravelUI(); }; - //===================================================================== + //= OWizardMachine - //===================================================================== + struct WizardMachineImplData; /** implements some kind of finite automata, where the states of the automata exactly correlate with tab pages. @@ -376,9 +376,9 @@ namespace svt OWizardMachine& m_rWizard; }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // INCLUDED_SVTOOLS_WIZARDMACHINE_HXX diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index f80a25a85cfa..517d439c12ea 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -196,16 +196,16 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn ) *************************************************************************/ -// ---------------------- + // - WizardDialog-Types - -// ---------------------- + #define WIZARDDIALOG_BUTTON_STDOFFSET_X 6 #define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3 -// ---------------- + // - WizardDialog - -// ---------------- + class SVT_DLLPUBLIC WizardDialog : public ModalDialog { diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 33ce019115e5..14399d0e45bb 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -29,7 +29,7 @@ class Window; -////////////////////////////////////////////////////////////////////// + class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem { @@ -51,7 +51,7 @@ public: com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } }; -////////////////////////////////////////////////////////////////////// + #endif diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 2544e51f3f41..9fa2c20e5a4f 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -375,7 +375,7 @@ namespace accessibility virtual sal_Bool IsSelected() const; // XAccessibleContext child handling methods - //----------------------------------------------------------------- + /** Implements getAccessibleChildCount @attention Don't call with locked mutexes. You may hold @@ -390,7 +390,7 @@ namespace accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)); // XAccessibleEventBroadcaster child related methods - //----------------------------------------------------------------- + /** Implements addEventListener @attention Don't call with locked mutexes @@ -403,7 +403,7 @@ namespace accessibility virtual void RemoveEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) SAL_THROW((::com::sun::star::uno::RuntimeException)); // XAccessibleComponent child related methods - //----------------------------------------------------------------- + /** Implements getAccessibleAt @attention Don't call with locked mutexes. You may hold diff --git a/include/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx index 574ebbbb6eec..bacbe7e8d733 100644 --- a/include/svx/ActionDescriptionProvider.hxx +++ b/include/svx/ActionDescriptionProvider.hxx @@ -25,7 +25,7 @@ // header for class OUString #include <rtl/ustring.hxx> -//----------------------------------------------------------------------------- + /** This class provides localized descriptions for some basic actions done with objects. The strings are intended to be provided to the user e.g. as description for undo actions in the menu. The name of the object acted on and the type of action needs to be given as input parameter. diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index b5480b0ac827..2f1746281b61 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -23,9 +23,9 @@ #include <svl/poolitem.hxx> #include <com/sun/star/geometry/AffineMatrix2D.hpp> -//--------------------- + // class AffineMatrixItem -//--------------------- + class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem { diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index d7ccad9ad00b..40aae99f363d 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -27,9 +27,9 @@ namespace svxform { - //========================================================================== + //= OSystemParseContext - //========================================================================== + class SVX_DLLPUBLIC OSystemParseContext : public ::connectivity::IParseContext { private: @@ -56,9 +56,9 @@ namespace svxform }; - //========================================================================== + //= OParseContextClient - //========================================================================== + /** helper class which needs access to a (shared and ref-counted) OSystemParseContext instance. */ diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 11e97ea26a98..a51955066883 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -22,11 +22,11 @@ #include <svtools/valueset.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + class XColorList; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet { @@ -47,7 +47,7 @@ public: Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount); }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVXCOLORVALUESET_HXX diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index 1f6c43c6e7b3..9859fc061caa 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <vcl/bitmap.hxx> -// --------------------- + // class XPropertyEntry class SVX_DLLPUBLIC XPropertyEntry diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 58caee409342..b7edcd5f70ab 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -27,7 +27,7 @@ class SvStream; -//------------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem { @@ -69,7 +69,7 @@ public: void SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked ); }; -//------------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem { diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 5d00482f26d9..296fccca34d6 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -27,12 +27,12 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace svt { class EmbeddedObjectRef; } -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC ChartHelper { @@ -60,7 +60,7 @@ public: bool bNoLineStyle = true); }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_CHARTHELPER_HXX diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 54c4ab0a5a4e..f1d193d5dc3d 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -22,7 +22,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------ + enum SvxChartStyle { @@ -162,7 +162,7 @@ enum SvxChartRegress #define CHREGRESS_COUNT (CHREGRESS_MOVING_AVERAGE + 1) -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem { @@ -180,7 +180,7 @@ public: { return (SvxChartStyle)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem { @@ -199,7 +199,7 @@ public: sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem { @@ -216,7 +216,7 @@ public: { return (SvxChartDataDescr)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem { @@ -238,7 +238,7 @@ public: { return (SvxChartTextOrder)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem { @@ -255,7 +255,7 @@ public: { return (SvxChartTextOrient)SfxEnumItem::GetValue(); } }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem { @@ -276,7 +276,7 @@ public: sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem { @@ -297,7 +297,7 @@ public: sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; -//------------------------------------------------------------------ + class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem { diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index a1eb813c7a2a..0c05252034a3 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -151,9 +151,9 @@ public: }; -//================================================================== + // Filter- Tabpage -//================================================================== + class SVX_DLLPUBLIC SvxTPFilter: public TabPage { private: @@ -284,9 +284,9 @@ public: }; -//================================================================== + // View- Tabpage -//================================================================== + class SVX_DLLPUBLIC SvxTPView: public TabPage { @@ -356,9 +356,9 @@ public: virtual void DeactivatePage(); }; -//================================================================== + // Redlining - Control (Accept- Changes) -//================================================================== + class SVX_DLLPUBLIC SvxAcceptChgCtr : public TabControl diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx index 4fb5b0cdd49f..da89069cd00a 100644 --- a/include/svx/dataaccessdescriptor.hxx +++ b/include/svx/dataaccessdescriptor.hxx @@ -24,16 +24,16 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ + class ODADescriptorImpl; - //==================================================================== + //= DataAccessDescriptorProperty - //==================================================================== + enum DataAccessDescriptorProperty { daDataSource, /// data source name (string) @@ -56,9 +56,9 @@ namespace svx daComponent /// component name (XContent) }; - //==================================================================== + //= ODataAccessDescriptor - //==================================================================== + /** class encapsulating the com::sun::star::sdb::DataAccessDescriptor service. */ class SVX_DLLPUBLIC ODataAccessDescriptor @@ -126,9 +126,9 @@ namespace svx void setDataSource(const OUString& _sDataSourceNameOrLocation); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx index 6a04e6f69d8a..b5af04f558a4 100644 --- a/include/svx/databaselocationinput.hxx +++ b/include/svx/databaselocationinput.hxx @@ -28,14 +28,14 @@ namespace svt { class OFileURLControl; } #include <memory> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= DatabaseLocationInputController - //==================================================================== + class DatabaseLocationInputController_Impl; /** helper class to control controls needed to input a database location @@ -78,9 +78,9 @@ namespace svx m_pImpl; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DATABASELOCATIONINPUT_HXX diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index 5b535cb7c019..b874ca8ac338 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -27,19 +27,19 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ + // column transfer formats #define CTF_FIELD_DESCRIPTOR 0x0001 // the field descriptor format #define CTF_CONTROL_EXCHANGE 0x0002 // the control exchange format #define CTF_COLUMN_DESCRIPTOR 0x0004 // data access descriptor for a column - //==================================================================== + //= OColumnTransferable - //==================================================================== + class SVX_DLLPUBLIC OColumnTransferable : public TransferableHelper { protected: @@ -161,9 +161,9 @@ namespace svx ); }; - //==================================================================== + //= ODataAccessObjectTransferable - //==================================================================== + /** class for transfering data access objects (tables, queries, statements ...) */ class SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper @@ -249,9 +249,9 @@ namespace svx ,const OUString& _sActiveCommand); }; - //==================================================================== + //= OMultiColumnTransferable - //==================================================================== + /** class for transfering multiple columns */ class SVX_DLLPUBLIC OMultiColumnTransferable : public TransferableHelper @@ -280,9 +280,9 @@ namespace svx static sal_uInt32 getDescriptorFormatId(); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DBAEXCHANGE_HXX diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index d8058483b76d..81374279069f 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -28,14 +28,14 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= OComponentTransferable - //==================================================================== + class SVX_DLLPUBLIC OComponentTransferable : public TransferableHelper { protected: @@ -68,9 +68,9 @@ namespace svx static sal_uInt32 getDescriptorFormatId(sal_Bool _bExtractForm); }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_DBAOBJECTEX_HXX diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx index a60310835c89..000cb405e0be 100644 --- a/include/svx/dbcharsethelper.hxx +++ b/include/svx/dbcharsethelper.hxx @@ -22,14 +22,14 @@ #include <svx/svxdllapi.h> #include <svx/dbtoolsclient.hxx> -//........................................................................ + namespace svxform { -//........................................................................ - //==================================================================== + + //= ODataAccessCharsetHelper - //==================================================================== + class SVX_DLLPUBLIC ODataAccessCharsetHelper : public ODbtoolsClient { protected: @@ -49,9 +49,9 @@ namespace svxform } }; -//........................................................................ + } // namespace svxform -//........................................................................ + #endif // SVX_DBCHARSETCLIENT_HXX diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index b8ea3153b29e..9c9b92bcab8d 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -31,7 +31,7 @@ class NumericField; namespace svx { -// ============================================================================ + class DialControlBmp : public VirtualDevice { @@ -166,7 +166,7 @@ private: DECL_LINK( LinkedFieldModifyHdl, NumericField* ); }; -// ============================================================================ + /** Wrapper for usage of a DialControl in item connections. */ class SVX_DLLPUBLIC DialControlWrapper : public sfx::SingleControlWrapper< DialControl, sal_Int32 > @@ -181,12 +181,12 @@ public: virtual void SetControlValue( sal_Int32 nValue ); }; -// ---------------------------------------------------------------------------- + /** An item<->control connection for a DialControl. */ typedef sfx::ItemControlConnection< sfx::Int32ItemWrapper, DialControlWrapper > DialControlConnection; -// ============================================================================ + } // namespace svx diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 65eb7c30145a..6871f8f99542 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -138,7 +138,7 @@ #define SID_SD_TP_MISC (RID_OFA_START + 231) #define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) -//--------------------------------------------------------------------- + // ResId's fuer Dialoge aus StarDraw #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) @@ -993,7 +993,7 @@ // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!! #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270) -// ---------------------------------------------------------------------------- + // if we have _a_lot_ time, we should group the resource ids by type, instead // of grouping them by semantics. The reason is that resource ids have to be // unique relative to a fixed type (you can't have two dialogs with the same @@ -1002,16 +1002,16 @@ // I suggest sticking to per-type ids instead of per-semantic ids, this is // better maintainable (IMO), and does not waste that much ids -// ---------------------------------------------------------------------------- + // "Window" resource ids -// ---------------------------------------------------------------------------- + // "ModalDialog" resource ids #define RID_SVX_MDLG_FONTWORK_GALLERY ( RID_SVX_START + 2 ) -// ---------------------------------------------------------------------------- + // "Menu" resource ids #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) @@ -1025,7 +1025,7 @@ #define RID_SVXPAGE_DOCRECOVERY_SAVE ( RID_SVX_START + 8 ) #define RID_SVXPAGE_DOCRECOVERY_RECOVER ( RID_SVX_START + 9 ) -// ---------------------------------------------------------------------------- + // !!!! double defined ID's (see below) !!! #define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 6f37b018f743..dddd4b8f4a00 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -27,7 +27,7 @@ #include <svx/svxdllapi.h> #include <basegfx/vector/b3dvector.hxx> -////////////////////////////////////////////////////////////////////////////// + class FmFormModel; class FmFormPage; @@ -35,12 +35,12 @@ class E3dView; class E3dPolyScene; class E3dObject; -////////////////////////////////////////////////////////////////////////////// + #define PREVIEW_OBJECTTYPE_SPHERE 0x0000 #define PREVIEW_OBJECTTYPE_CUBE 0x0001 -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC Svx3DPreviewControl : public Control { @@ -70,7 +70,7 @@ public: virtual void Set3DAttributes(const SfxItemSet& rAttr); }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl { @@ -149,7 +149,7 @@ public: basegfx::B3DVector GetLightDirection(sal_uInt32 nNum) const; }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxLightCtl3D : public Control { diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 38c0efd4cd99..f13d78744c82 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -353,7 +353,7 @@ public: void Modify( const XLineEndEntry& rEntry, sal_uInt16 nPos, const Bitmap& rBitmap, bool bStart = true ); }; -////////////////////////////////////////////////////////////////////////////// + class SdrObject; class SdrPathObj; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index a1b07f8f6eee..1de3e4609446 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/drawing/LineDash.hpp> #include <svx/svxdllapi.h> -//================================================================== + // SvxColorListItem -//================================================================== + class SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem { @@ -55,9 +55,9 @@ public: }; -//================================================================== + // SvxGradientListItem -//================================================================== + class SVX_DLLPUBLIC SvxGradientListItem: public SfxPoolItem { @@ -86,9 +86,9 @@ public: }; -//================================================================== + // SvxHatchListItem -//================================================================== + class SVX_DLLPUBLIC SvxHatchListItem: public SfxPoolItem { XHatchListRef pHatchList; @@ -117,9 +117,9 @@ public: -//================================================================== + // SvxBitmapListItem -//================================================================== + class SVX_DLLPUBLIC SvxBitmapListItem: public SfxPoolItem { XBitmapListRef pBitmapList; @@ -148,9 +148,9 @@ public: -//================================================================== + // SvxDashListItem -//================================================================== + class SVX_DLLPUBLIC SvxDashListItem: public SfxPoolItem { XDashListRef pDashList; @@ -176,9 +176,9 @@ public: }; -//================================================================== + // SvxLineEndListItem -//================================================================== + class SVX_DLLPUBLIC SvxLineEndListItem: public SfxPoolItem { XLineEndListRef pLineEndList; diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx index 039617a52905..54e5dcc040e5 100644 --- a/include/svx/e3dsceneupdater.hxx +++ b/include/svx/e3dsceneupdater.hxx @@ -22,7 +22,7 @@ #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; @@ -31,7 +31,7 @@ namespace drawinglayer { namespace geometry { class ViewInformation3D; }} -////////////////////////////////////////////////////////////////////////////// + // This class is a helper to encapsulate 3D object changes which shall change the // scene's 2D geometry. E.g. when moving one 3D object in a scene, the visualisation // would not change since the scene's 2D attributes are defined by it's 2D object diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 8998024db140..7f0d647fa3d2 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -68,7 +68,7 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + class FillControl : public Window { diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index 4868d7618e49..a3e637bea94f 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -90,7 +90,7 @@ enum SvxModeType #define TABFILL_SPECIAL 0x0100 #define TABFILL_ALL 0x01F0 -//----- + #endif diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 50a3fe405a76..3cd18c485e6c 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -50,7 +50,7 @@ class SdrPageView; class Svx3DCtrlItem; class SvxConvertTo3DItem; -//------------------------------------------------------------------------ + struct Svx3DWinImpl; class SVX_DLLPUBLIC Svx3DWin : public SfxDockingWindow @@ -209,7 +209,7 @@ private: sal_Bool bOnly3DChanged; - //------------------------------------ + DECL_LINK( ClickViewTypeHdl, void * ); DECL_LINK( ClickUpdateHdl, void * ); diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 8770b0269780..e91a393a1bec 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -24,9 +24,9 @@ #include <comphelper/uno3.hxx> #include <svx/svxdllapi.h> -//================================================================== + // SvxFmDrawPage -//================================================================== + class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage ,public ::com::sun::star::form::XFormsSupplier2 { diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 62ef3aede68e..e89241619563 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -26,9 +26,9 @@ #include <svtools/transfer.hxx> #include <svx/svxdllapi.h> -//================================================================== + // FmGridHeader -//================================================================== + struct FmGridHeaderData; class SVX_DLLPUBLIC FmGridHeader :public ::svt::EditBrowserHeader @@ -87,9 +87,9 @@ private: DECL_LINK( OnAsyncExecuteDrop, void* ); }; -//================================================================== + // FmGridControl -//================================================================== + class FmXGridPeer; class SVX_DLLPUBLIC FmGridControl : public DbGridControl diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 453788df3e0a..28537fd89091 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -69,9 +69,9 @@ public: virtual void SAL_CALL release() throw() { m_rParent.release(); } }; -//================================================================== + // FmXModifyMultiplexer -//================================================================== + class FmXModifyMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper ,public ::com::sun::star::util::XModifyListener @@ -92,9 +92,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXUpdateMultiplexer -//================================================================== + class FmXUpdateMultiplexer : public OWeakSubObject, public ::cppu::OInterfaceContainerHelper, public ::com::sun::star::form::XUpdateListener @@ -117,9 +117,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXSelectionMultiplexer -//================================================================== + class FmXSelectionMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper ,public ::com::sun::star::view::XSelectionChangeListener @@ -141,9 +141,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXGridControlMultiplexer -//================================================================== + class FmXGridControlMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper ,public ::com::sun::star::form::XGridControlListener @@ -165,9 +165,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXContainerMultiplexer -//================================================================== + class FmXContainerMultiplexer : public OWeakSubObject, public ::cppu::OInterfaceContainerHelper, public ::com::sun::star::container::XContainerListener @@ -190,9 +190,9 @@ public: void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } }; -//================================================================== + // FmXGridControl -//================================================================== + typedef ::cppu::ImplHelper10< ::com::sun::star::form::XBoundComponent, ::com::sun::star::form::XGridControl, ::com::sun::star::util::XModifyBroadcaster, @@ -314,9 +314,9 @@ protected: }; -//================================================================== + // FmXGridPeer -> Peer for the Gridcontrol -//================================================================== + typedef ::comphelper::ImplHelper19 < ::com::sun::star::form::XGridPeer, ::com::sun::star::form::XBoundComponent, ::com::sun::star::form::XGridControl, diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 7ec00279768c..b749efe137d2 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -33,7 +33,7 @@ #include <svx/ifaceids.hxx> -//======================================================================== + class FmFormModel; class FmFormPage; class FmXFormShell; @@ -54,7 +54,7 @@ namespace svx class ISdrObjectFilter; } -//======================================================================== + class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint { sal_Bool m_bDesignMode; @@ -67,7 +67,7 @@ public: sal_Bool GetDesignMode() const { return m_bDesignMode; } }; -//======================================================================== + class SVX_DLLPUBLIC FmFormShell : public SfxShell { friend class FmFormView; diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx index f807f2f99631..e3f6e0c7549c 100644 --- a/include/svx/fmsrccfg.hxx +++ b/include/svx/fmsrccfg.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -// =================================================================================================== + #define MATCHING_ANYWHERE 0 #define MATCHING_BEGINNING 1 @@ -37,14 +37,14 @@ // to be adapted) -//........................................................................ + namespace svxform { -//........................................................................ - // =================================================================================================== + + // = struct FmSearchParams - parameters of a search - // =================================================================================================== + struct SVX_DLLPUBLIC FmSearchParams { @@ -75,7 +75,7 @@ namespace svxform sal_Bool bSoundsLikeCJK; - // ...................................... + FmSearchParams(); sal_Bool isIgnoreWidthCJK( ) const; @@ -87,9 +87,9 @@ namespace svxform void setCaseSensitive( sal_Bool _bCase ); }; - // =================================================================================================== + // = class FmSearchConfigItem - a ConfigItem, that remembers search parameters - // =================================================================================================== + class SVX_DLLPUBLIC FmSearchConfigItem :protected FmSearchParams @@ -136,11 +136,11 @@ namespace svxform SVX_DLLPRIVATE void implTranslateToConfig( ); }; -//........................................................................ + } // namespace svxform -//........................................................................ -// =================================================================================================== + + #endif // INCLUDED_SVX_FMSRCCFG_HXX diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index e881ff73fd95..70ad5ef0b991 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -232,7 +232,7 @@ class SVX_DLLPUBLIC FmSearchEngine sal_Int32 m_nTransliterationFlags; -// ------------- + // member access private: SVX_DLLPRIVATE sal_Bool CancelRequested(); // provides a through m_aCancelAsynchAccess backed interpretation of m_bCancelAsynchRequest diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index f0e5c201eaf8..1756cbc36b18 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -72,9 +72,9 @@ class Window; -//================================================================== + // common types -//================================================================== + // displaying a database exception for the user // display info about a simple ::com::sun::star::sdbc::SQLException void displayException(const ::com::sun::star::sdbc::SQLException&, Window* _pParent = NULL); @@ -87,10 +87,10 @@ sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star SVX_DLLPUBLIC OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); -// =================================================================================================== + // = class CursorWrapper - a helper class which works in common with a ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>, // XDatabaseBookmarkCursor and XDatabaseDirectCursor each -// =================================================================================================== + class CursorWrapper { @@ -188,7 +188,7 @@ protected: void setAdapter(FmXDisposeMultiplexer* pAdapter); }; -//============================================================================== + class FmXDisposeMultiplexer :public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> { @@ -206,16 +206,16 @@ public: void dispose(); }; -// ================================================================== + sal_Int16 getControlTypeByObject(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject); // get the object type (OBJ_FM_...) from the services the object supports -//================================================================== + sal_Bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet); // checks if the ::com::sun::star::sdbcx::XColumnsSupplier provided by _rxRowSet supllies any columns -//================================================================== + typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > , ::comphelper::OInterfaceCompare< ::com::sun::star::uno::XInterface > > InterfaceBag; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index 185d1c172072..63fd156a72f6 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -25,7 +25,7 @@ #include <vcl/virdev.hxx> #include <svx/svxdllapi.h> -// ============================================================================ + /** A list box string item which stores its text and font. */ class SvLBoxFontString : public SvLBoxString @@ -56,7 +56,7 @@ public: }; -// ============================================================================ + /** A list box supporting formatted string entries. */ class SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox @@ -98,7 +98,7 @@ protected: SvLBoxButtonKind eButtonKind); }; -// ============================================================================ + #endif diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 1105bd677b5c..d792b135a7c4 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -43,7 +43,7 @@ class SdrModel; class SfxBindings; -//------------------------------------------------------------------------ + namespace svx { @@ -62,7 +62,7 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -//------------------------------------------------------------------------ + class FontworkCharacterSpacingDialog : public ModalDialog { diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index 71ab3585889c..b603c8876356 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -26,12 +26,12 @@ #include <vcl/timer.hxx> #include <svx/svxdllapi.h> -//............................................................................. + namespace svx { -//............................................................................. -//----------------------------------------------------------------------------- + + /** */ @@ -59,9 +59,9 @@ private: Timer m_aDoubleClickTimer; }; -//............................................................................. + } //namespace svx -//............................................................................. + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/framebordertype.hxx b/include/svx/framebordertype.hxx index 17dae9073335..e54b2eb7ef6d 100644 --- a/include/svx/framebordertype.hxx +++ b/include/svx/framebordertype.hxx @@ -24,7 +24,7 @@ namespace svx { -// ============================================================================ + /** Enumerates all borders a frame selection control can contain. */ enum FrameBorderType @@ -49,7 +49,7 @@ SVX_DLLPUBLIC FrameBorderType GetFrameBorderTypeFromIndex( size_t nIndex ); /** Returns the zero-based index of a valid frame border type. */ size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ); -// ============================================================================ + } // namespace svx diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index b8f2bfcd0b18..c4121f3fe9a0 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -36,9 +36,9 @@ class OutputDevice; namespace svx { namespace frame { -// ============================================================================ + // Enums -// ============================================================================ + /** Specifies how the reference points for frame borders are used. */ @@ -62,9 +62,9 @@ enum RefMode REFMODE_END }; -// ============================================================================ + // Classes -// ============================================================================ + /** Contains the widths of primary and secondary line of a frame style. @@ -180,7 +180,7 @@ inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; } inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); } inline bool operator>=( const Style& rL, const Style& rR ) { return !(rL < rR); } -// ---------------------------------------------------------------------------- + /** Extends the Style struct with an angle for diagonal frame borders. @@ -206,9 +206,9 @@ private: double mfAngle; /// Angle between this and hor. or vert. border. }; -// ============================================================================ + // Various helper functions -// ============================================================================ + /** Returns the angle between horizontal border of a rectangle and its diagonal. @@ -244,7 +244,7 @@ inline double GetHorDiagAngle( const Point& rP1, const Point& rP2 ) inline double GetHorDiagAngle( const Rectangle& rRect ) { return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } -// ---------------------------------------------------------------------------- + /** Returns the angle between vertical border of a rectangle and its diagonal. @@ -281,7 +281,7 @@ inline double GetVerDiagAngle( const Point& rP1, const Point& rP2 ) inline double GetVerDiagAngle( const Rectangle& rRect ) { return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } -// ============================================================================ + /** Returns an X coordinate for a diagonal frame border in the specified height. @@ -397,7 +397,7 @@ long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); */ long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); -// ============================================================================ + /** Checks whether two horizontal frame borders are "connectable". @@ -440,9 +440,9 @@ SVX_DLLPUBLIC bool CheckFrameBorderConnectable( const Style& rBFromBR /// Horizontal frame border from bottom-right to connection point. ); -// ============================================================================ + // Drawing functions -// ============================================================================ + /** Draws a horizontal frame border, regards all connected frame styles. @@ -580,7 +580,7 @@ SVX_DLLPUBLIC void DrawHorFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ============================================================================ + /** Draws a vertical frame border, regards all connected frame styles. @@ -651,7 +651,7 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( const Color* pForceColor = 0 /// If specified, overrides frame border color. ); -// ============================================================================ + /** Draws both diagonal frame borders, regards all connected frame styles. @@ -680,7 +680,7 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( bool bDiagDblClip = false /// true = Use clipping for crossing double frame borders. ); -// ============================================================================ + } // namespace frame } // namespace svx diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index caf0623efac8..f177215ed8c7 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -377,7 +377,7 @@ public: If not NULL, only this color will be used to draw all frame borders. */ void DrawArray( OutputDevice& rDev, const Color* pForceColor = 0 ) const; - // ------------------------------------------------------------------------ + private: typedef boost::scoped_ptr<ArrayImpl> ArrayImplPtr; @@ -385,7 +385,7 @@ private: ArrayImplPtr mxImpl; }; -// ============================================================================ + } // namespace frame } // namespace svx diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index dd13fc72044e..080a89ccec5d 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -29,7 +29,7 @@ class SvxFrameDirectionItem; namespace svx { -// ============================================================================ + /** This listbox contains entries to select horizontal text direction. @@ -66,7 +66,7 @@ private: typedef FrameDirectionListBox FrameDirListBox; -// ============================================================================ + /** Wrapper for usage of a FrameDirectionListBox in item connections. */ class SVX_DLLPUBLIC FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection > @@ -87,7 +87,7 @@ typedef sfx::ValueItemWrapper< SvxFrameDirectionItem, SvxFrameDirection, sal_uIn /** An item<->control connection for a FrameDirectionListBox. */ typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper > FrameDirListBoxConnection; -// ============================================================================ + } // namespace svx diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index c5d249e444a6..9c0db3010855 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -36,7 +36,7 @@ namespace svx { struct FrameSelectorImpl; -// ============================================================================ + typedef int FrameSelFlags; @@ -68,7 +68,7 @@ const FrameSelFlags FRAMESEL_DIAGONAL = FRAMESEL_DIAG_TLBR|FRAMESEL_DIAG_BLTR; /** If set, all frame borders will support the don't care state. */ const FrameSelFlags FRAMESEL_DONTCARE = 0x0100; -// ---------------------------------------------------------------------------- + /** All possible states of a frame border. */ enum FrameBorderState @@ -78,7 +78,7 @@ enum FrameBorderState FRAMESTATE_DONTCARE /// Frame border is in don't care state (if enabled). }; -// ============================================================================ + class SVX_DLLPUBLIC FrameSelector : public Control { @@ -178,7 +178,7 @@ public: /** Returns the bounding rectangle of the specified frame border (if enabled). */ Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; - // ------------------------------------------------------------------------ + protected: virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -193,7 +193,7 @@ private: std::auto_ptr< FrameSelectorImpl > mxImpl; }; -// ============================================================================ + } // namespace svx diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 1d7ac1f5eb29..74ce015345e6 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -28,9 +28,9 @@ #include <cstdio> #include <vector> -// --------------------- + // - GalleryThemeEntry - -// --------------------- + class SvStream; @@ -86,9 +86,9 @@ public: typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; -// ----------- + // - Gallery - -// ----------- + class SfxListener; class GalleryTheme; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 0f76524abfec..c996c4589fbb 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -33,12 +33,12 @@ #include <svx/galmisc.hxx> #include <vector> -// ----------------- + // - GalleryObject - -// ----------------- -// -------------- + + // - SgaObjKind - -// -------------- + struct GalleryObject { @@ -61,9 +61,9 @@ class SgaObject; class FmFormModel; class ListBox; -// ----------------- + // - GalDragParams - -// ----------------- + struct GalDragParams { @@ -74,9 +74,9 @@ struct GalDragParams SgaObjKind eObjKind; }; -// ---------------- + // - GalleryTheme - -// ---------------- + class Gallery; class GalleryProgress; diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index f8c118637166..fa86b2787141 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -25,9 +25,9 @@ #include <sfx2/tbxctrl.hxx> #include <svx/svxdllapi.h> -// ---------------- + // - TbxImageItem - -// ---------------- + class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { @@ -39,9 +39,9 @@ public: virtual bool operator==( const SfxPoolItem& ) const; }; -// ------------------------------- + // - SvxGrafFilterToolBoxControl - -// ------------------------------- + class SVX_DLLPUBLIC SvxGrafFilterToolBoxControl : public SfxToolBoxControl { @@ -57,9 +57,9 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -// ------------------------- + // - SvxGrafToolBoxControl - -// ------------------------- + class SvxGrafToolBoxControl : public SfxToolBoxControl { @@ -71,9 +71,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -// ---------------------------- + // - SvxGrafRedToolBoxControl - -// ---------------------------- + class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl { @@ -82,9 +82,9 @@ public: SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ------------------------------ + // - SvxGrafGreenToolBoxControl - -// ------------------------------ + class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl { @@ -93,9 +93,9 @@ public: SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ----------------------------- + // - SvxGrafBlueToolBoxControl - -// ----------------------------- + class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl { @@ -104,9 +104,9 @@ public: SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ---------------------------------- + // - SvxGrafLuminanceToolBoxControl - -// ---------------------------------- + class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxControl { @@ -115,9 +115,9 @@ public: SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// --------------------------------- + // - SvxGrafContrastToolBoxControl - -// --------------------------------- + class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl { @@ -126,9 +126,9 @@ public: SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ------------------------------ + // - SvxGrafGammaToolBoxControl - -// ------------------------------ + class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl { @@ -137,9 +137,9 @@ public: SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ------------------------------------- + // - SvxGrafTransparenceToolBoxControl - -// ------------------------------------- + class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxControl { @@ -148,9 +148,9 @@ public: SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; -// ----------------------------- + // - SvxGrafModeToolBoxControl - -// ----------------------------- + class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public SfxListener { @@ -163,9 +163,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -// --------------------- + // - SvxGrafAttrHelper - -// --------------------- + class SdrView; class SfxRequest; diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx index 6d21e22f8b5c..ecc5b3abfa6f 100644 --- a/include/svx/grfflt.hxx +++ b/include/svx/grfflt.hxx @@ -33,17 +33,17 @@ #include <svx/rectenum.hxx> #include <svx/svxdllapi.h> -// --------------- + // - Error codes - -// --------------- + #define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 #define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 #define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 -// -------------------- + // - SvxGraphicFilter - -// -------------------- + class SfxRequest; class SfxItemSet; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 9c457b8ec818..d534eff00e0d 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -57,9 +57,9 @@ enum GridRowStatus GRS_INVALID }; -//================================================================== + // DbGridRow, description of rows -//================================================================== + class DbGridRow : public SvRefBase { @@ -92,13 +92,13 @@ public: SV_DECL_REF(DbGridRow) -//================================================================== + // DbGridControl -//================================================================== + class DbGridColumn; typedef ::std::vector< DbGridColumn* > DbGridColumns; -//================================================================== + class FmGridListener { public: @@ -111,9 +111,9 @@ protected: #define GRID_COLUMN_NOT_FOUND SAL_MAX_UINT16 -//================================================================== + // InitWindowFacet, describing which aspect of a column's Window to (re-)initialize -//================================================================== + enum InitWindowFacet { InitFont = 0x01, @@ -123,7 +123,7 @@ enum InitWindowFacet InitAll = 0xFF }; -//================================================================== + class FmXGridSourcePropListener; class DisposeListenerGridBridge; typedef ::svt::EditBrowseBox DbGridControl_Base; @@ -134,9 +134,9 @@ class SVX_DLLPUBLIC DbGridControl : public DbGridControl_Base friend class DisposeListenerGridBridge; public: - //================================================================== + // NavigationBar - //================================================================== + class NavigationBar: public Control { class AbsolutePos : public NumericField diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx index 39b129e0e083..fa3b2b193c48 100644 --- a/include/svx/helperhittest3d.hxx +++ b/include/svx/helperhittest3d.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { @@ -38,7 +38,7 @@ namespace drawinglayer { namespace geometry { class E3dCompoundObject; class E3dScene; -////////////////////////////////////////////////////////////////////////////// + /** support for getting a ViewInformation3D for a given CompoudObject3D with correct ObjectTransformation filled out @@ -95,7 +95,7 @@ bool checkHitSingle3DObject( const basegfx::B2DPoint& rPoint, const E3dCompoundObject& rCandidate); -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_HELPERHITTEST3D_HXX diff --git a/include/svx/ifaceids.hxx b/include/svx/ifaceids.hxx index bdd4bd133621..04a9bbe4b546 100644 --- a/include/svx/ifaceids.hxx +++ b/include/svx/ifaceids.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_IFACEIDS_HXX #define INCLUDED_SVX_IFACEIDS_HXX -// ----------------------------------------------------------------------- + #include <sfx2/shell.hxx> diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx index 7107c3c89060..ac885ac7c4aa 100644 --- a/include/svx/ipolypolygoneditorcontroller.hxx +++ b/include/svx/ipolypolygoneditorcontroller.hxx @@ -23,9 +23,9 @@ #include <svx/svxdllapi.h> #include <svx/svdedtv.hxx> -//************************************************************ + // Defines -//************************************************************ + enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query SDRPATHSMOOTH_ANGULAR, // angular diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index f1016d97cd64..ef7aec6b409c 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -28,7 +28,7 @@ class ToolBox; class SvxPopupWindowListBox; -///////////////////////////////////////////////////////////////// + class SvxListBoxControl : public SfxToolBoxControl { @@ -52,7 +52,7 @@ public: const SfxPoolItem* pState ); }; -///////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 2e34aadec167..0744085c59ff 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -32,9 +32,9 @@ class SvxLineBox; class SvxMetricField; class SvxColorBox; -//======================================================================== + // SvxLineStyleController: -//======================================================================== + class SVX_DLLPUBLIC SvxLineStyleToolBoxControl : public SfxToolBoxControl { @@ -56,9 +56,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + // SvxLineWidthController: -//======================================================================== + class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl { @@ -73,9 +73,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + // SvxLineColorController: -//======================================================================== + class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl { @@ -91,9 +91,9 @@ public: virtual Window* CreateItemWindow( Window *pParent ); }; -//======================================================================== + // class SvxLineEndWindow -//======================================================================== + class SvxLineEndWindow : public SfxPopupWindow { using FloatingWindow::StateChanged; @@ -144,9 +144,9 @@ public: virtual SfxPopupWindow* Clone() const; }; -//======================================================================== + // class SvxLineEndToolBoxControl -//======================================================================== + class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl { diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 631163dc5b4e..924ac986b272 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -785,10 +785,10 @@ typedef enum } MSO_SPT; // different enums from the OfficeDraw documentation, Appendix D - beginning -// + // note: in opposite to the MS documentation, they all // start with "mso_" instead of "mso" -// + enum MSO_ShapePath { mso_shapeLines, // A line of straight segments mso_shapeLinesClosed, // A closed polygonal object diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 6b97a8b3262a..2cfe27c99f9e 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -36,9 +36,9 @@ #include <basegfx/vector/b2enums.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Forward declaration -//************************************************************ + class SfxPoolItem; class Viewport3D; diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 271e87a61d3e..44e69a0d9293 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -32,7 +32,7 @@ namespace svx { class DialControl; -// ============================================================================ + struct OrientationHelper_Impl; @@ -92,7 +92,7 @@ private: std::auto_ptr< OrientationHelper_Impl > mpImpl; }; -// ============================================================================ + /** Wrapper for usage of the stacked attribute of an OrientationHelper in item connections. */ class SVX_DLLPUBLIC OrientStackedWrapper : public sfx::SingleControlWrapper< OrientationHelper, bool > @@ -107,12 +107,12 @@ public: virtual void SetControlValue( bool bValue ); }; -// ---------------------------------------------------------------------------- + /** An item<->control connection for the stacked attribute of an OrientationHelper. */ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper > OrientStackedConnection; -// ============================================================================ + } // namespace diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index a61b7c6f3caa..f81adb3e918d 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//---------------------------------------------------------------------------- + // Alignment with rotated text enum SvxRotateMode diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 87c242527d7f..f6c354da6786 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -23,9 +23,9 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrAngleItem -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: TYPEINFO(); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index ce48d3697c02..354a94fd6126 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -109,18 +109,18 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem SdrCustomShapeReplacementURLItem(); }; -//--------------------------- + // class SdrTextWordWrapItem -//--------------------------- + class SdrTextWordWrapItem : public SdrOnOffItem { public: SdrTextWordWrapItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {} SdrTextWordWrapItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn ) {} }; -//------------------------------- + // class SdrTextAutoGrowSizeItem -//------------------------------- + class SdrTextAutoGrowSizeItem : public SdrOnOffItem { public: SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {} diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 9f49655b3126..7d313ff91d51 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//----------------- + // SdrGrafRedItem - -//----------------- + class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem { @@ -41,9 +41,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; -//------------------- + // SdrGrafGreenItem - -//------------------- + class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem { @@ -58,9 +58,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; -//------------------- + // SdrGrafBlueItem - -//------------------- + class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem { diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index c995dc1d49be..9fad5fd89a01 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -23,9 +23,9 @@ #include <svx/grfcrop.hxx> #include <svx/svddef.hxx> -//------------------ + // SdrGrafCropItem - -//------------------ + class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop { diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index e2cf192417d4..4930937c96cc 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//---------------------- + // SdrGrafGamma100Item - -//---------------------- + class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item { diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index 7eb90e895845..1e6ce5ec48d9 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//-------------------- + // SdrGrafInvertItem - -//-------------------- + class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem { diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 2c192f37153e..32d0064595ed 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//----------------------- + // SdrGrafLuminanceItem - -//----------------------- + class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem { @@ -41,9 +41,9 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; -//---------------------- + // SdrGrafContrastItem - -//---------------------- + class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem { diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 8bf9eaeca5d4..8936ee629e62 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -25,9 +25,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------ + // SdrGrafModeItem - -//------------------ + class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem { diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index 4f794f5963ce..076bb2af8c36 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -24,9 +24,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//-------------------------- + // SdrGrafTransparenceItem - -//-------------------------- + class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem { diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 2de0246f6e22..3e85dc790a35 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -23,11 +23,11 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrAngleItem // For all metrics. GetPresentation returns for example for // Value=2500 a "25mm". -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: TYPEINFO(); diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index d4c80caa8f59..8b86de71a176 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -23,11 +23,11 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrOnOffItem // here GetValueTextByVal() returns "an" or "aus" instead // of "TRUE" or "FALSE" -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: TYPEINFO(); diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 591d5ab1423e..65890a53a42c 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -23,10 +23,10 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrPercentItem // Integer percents of 0 -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { @@ -41,10 +41,10 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------------------------------------ + // class SdrSignedPercentItem // Integer percents of +/- -//------------------------------------------------------------ + class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item { diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index 971829978201..847f855069ca 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -25,7 +25,7 @@ #include <svx/sdr/animation/scheduler.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr @@ -36,7 +36,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index c5d463763faf..11f86d37001d 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -26,7 +26,7 @@ #include <svx/sdr/animation/scheduler.hxx> #include <svx/sdr/animation/animationstate.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -42,7 +42,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index d26ad67b4b90..90f13245ba31 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // event class namespace sdr @@ -58,7 +58,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + // eventlist class namespace sdr @@ -88,7 +88,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + // scheduler class namespace sdr @@ -141,7 +141,7 @@ namespace sdr } // end of namespace animation } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX diff --git a/include/svx/sdr/attribute/sdrfilltextattribute.hxx b/include/svx/sdr/attribute/sdrfilltextattribute.hxx index 1125c8e236a0..1f398abdd65c 100644 --- a/include/svx/sdr/attribute/sdrfilltextattribute.hxx +++ b/include/svx/sdr/attribute/sdrfilltextattribute.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -58,7 +58,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx index 025fba473334..970fbb50872c 100644 --- a/include/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx @@ -24,7 +24,7 @@ #include <svx/xenum.hxx> #include <tools/color.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SfxItemSet; @@ -34,7 +34,7 @@ namespace drawinglayer { namespace attribute { class SdrFormTextOutlineAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -76,7 +76,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx index d610ab41bb1a..03b58180ceb1 100644 --- a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace attribute { @@ -31,7 +31,7 @@ namespace drawinglayer { namespace attribute { class StrokeAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -67,7 +67,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx index d7be38c7b279..2cdc7c0a7103 100644 --- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -62,7 +62,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx index fae7b5203c98..a1b074487569 100644 --- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -60,7 +60,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx index 81903b6c47b4..4e208cdd385b 100644 --- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> #include <svx/sdr/attribute/sdrtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -57,7 +57,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx index 2fd04ac5c264..637b769faa97 100644 --- a/include/svx/sdr/attribute/sdrtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrtextattribute.hxx @@ -25,7 +25,7 @@ #include <editeng/outlobj.hxx> #include <svx/sdtaitm.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SdrText; @@ -42,7 +42,7 @@ namespace drawinglayer { namespace attribute { class ImpSdrTextAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -115,7 +115,7 @@ namespace drawinglayer } // end of namespace attribute } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index 40b799790517..98ce34519a6f 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -100,7 +100,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index b586927a4750..fd48a475d32e 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SetOfByte; @@ -47,7 +47,7 @@ namespace basegfx { class B2DHomMatrix; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -214,7 +214,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 07c028f0b72a..39ac83044e53 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -24,13 +24,13 @@ #include <svx/svxdllapi.h> #include <svx/svdpage.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; class SdrObject; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -102,7 +102,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -138,7 +138,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx index be94ea5eb678..a11770d7d74b 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/include/svx/sdr/contact/objectcontactofpageview.hxx @@ -22,13 +22,13 @@ #include <svx/sdr/contact/objectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPageWindow; class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -137,7 +137,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index 8a7bc69d6446..4e2d022d17b9 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SetOfByte; @@ -40,7 +40,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -161,7 +161,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index cd09684932d1..9a0610b1debe 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { @@ -41,7 +41,7 @@ namespace basegfx { class E3dObject; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -69,7 +69,7 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence impCreateWithGivenPrimitive3DSequence( const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const; - ////////////////////////////////////////////////////////////////////////////// + // primitive stuff protected: @@ -102,7 +102,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx index 3f46438b65e0..4aa9b34013cc 100644 --- a/include/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dCubeObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx index c6fb95a3ee01..8ae3a8cebe09 100644 --- a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dExtrudeObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx index ec57695301d0..cfcb59e02369 100644 --- a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dLatheObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 40b3a8be8f22..49c750e332a5 100644 --- a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dPolygonObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index 9fa4393abb62..db21a6c8c849 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -27,7 +27,7 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dScene; @@ -36,7 +36,7 @@ namespace basegfx { class B3DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -107,7 +107,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx index feb2b5e81b0f..3059bea07b24 100644 --- a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofe3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class E3dSphereObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx index 9b9e775b1b83..519dede43d8a 100644 --- a/include/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewcontactofgraphic.hxx @@ -23,14 +23,14 @@ #include <sal/types.h> #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrGrafObj; namespace drawinglayer { namespace attribute { class SdrLineFillShadowTextAttribute; }} class GraphicAttr; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -78,7 +78,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx index 47749d06de13..da388004f837 100644 --- a/include/svx/sdr/contact/viewcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewcontactofgroup.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObjGroup; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index ece81f73a8e4..b52926738b99 100644 --- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -24,13 +24,13 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdrmasterpagedescriptor.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SfxItemSet; class Bitmap; class MapMode; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -70,7 +70,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index 40b280af72dd..d2d1505060ca 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -23,13 +23,13 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPageObj; class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -61,7 +61,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index 967dabc76a1e..2100d827d7dd 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrCaptionObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 6bf6f91bcea1..5e5c68d3caaf 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrCircObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx index a31a8b30ae98..a83b48257e49 100644 --- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrEdgeObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index fe37170178d8..7fc3e8f532a4 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrMeasureObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 2e9f3fef54cd..a51edca45ad1 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -24,13 +24,13 @@ #include <svx/svxdllapi.h> #include <tools/gen.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrMediaObj; namespace avmedia { class MediaItem; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -76,7 +76,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 5ea75eb48e91..9b1d2b0c5e49 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -25,14 +25,14 @@ #include <svx/sdtakitm.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; class GeoStat; class Bitmap; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -75,7 +75,7 @@ namespace sdr // overload for acessing the SdrObject virtual SdrObject* TryToGetSdrObject() const; - ////////////////////////////////////////////////////////////////////////////// + // primitive stuff // add Gluepoints (if available) @@ -89,7 +89,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index 0d5c79be4a60..f4845e8411f9 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObjCustomShape; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -58,7 +58,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx index 89e51bf453b8..56b5d4007abf 100644 --- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -23,13 +23,13 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrOle2Obj; class Graphic; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -77,7 +77,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx index b18f37a77144..29a86a31c826 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <svx/sdr/contact/viewcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class ViewContactOfSdrPage; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -52,7 +52,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -71,7 +71,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -90,7 +90,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -109,7 +109,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -128,7 +128,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -147,7 +147,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -166,7 +166,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -188,7 +188,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -212,7 +212,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -236,7 +236,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -296,7 +296,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 0318cb240666..0a7b75ad5f74 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPathObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index d5d64cfbce99..51fae3e1b1dc 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactoftextobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrRectObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index 8ec1dc44667f..3fa4639e5e42 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrTextObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -50,7 +50,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx index 0dab8315923f..7c180cfa81a3 100644 --- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -36,13 +36,13 @@ namespace com { namespace sun { namespace star { } } } } -//........................................................................ + namespace sdr { namespace contact { -//........................................................................ - //==================================================================== + + //= ViewContactOfUnoControl - //==================================================================== + class ViewContactOfUnoControl_Impl; class SVX_DLLPRIVATE ViewContactOfUnoControl : public ViewContactOfSdrObj { @@ -83,9 +83,9 @@ namespace sdr { namespace contact { virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; }; -//........................................................................ + } } // namespace sdr::contact -//........................................................................ + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index 168bd0b32964..8ec989e9f8e9 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -22,11 +22,11 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrVirtObj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index d68c6f9138d4..bac055dc6911 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -26,7 +26,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class Region; @@ -42,7 +42,7 @@ namespace sdr { namespace animation { class PrimitiveAnimation; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -140,7 +140,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx index 1165b93f8e69..49997367aee6 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -23,14 +23,14 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { class ViewObjectContactOfE3dScene; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -67,7 +67,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index 8fd5c2e74d05..be505f326b57 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -47,7 +47,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx index cb34c65045aa..7072b9bbaab5 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrGrafObj; @@ -30,7 +30,7 @@ namespace sdr { namespace event { class AsynchGraphicLoadingEvent; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -66,7 +66,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx index ed68a5bfa616..2419c4c3b9f8 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -22,10 +22,10 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -47,7 +47,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 62e2fe766f0b..7d7bab75110f 100644 --- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -22,14 +22,14 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { class MasterPageDescriptor; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -50,7 +50,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 39f3a0047127..2e489e758edf 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -56,7 +56,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 1386d5b77727..f770a341fcc0 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -59,7 +59,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index cedb879371af..548378731ba4 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; class SetOfByte; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 7ca2d079704c..5b03e267c5c6 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -22,11 +22,11 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrOle2Obj; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -47,7 +47,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index f2bddb9bbe39..3a81301bb2b3 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -22,12 +22,12 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -48,7 +48,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -86,7 +86,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -106,7 +106,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -123,7 +123,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -140,7 +140,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -157,7 +157,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -174,7 +174,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -194,7 +194,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -214,7 +214,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -231,7 +231,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index dc99d95a6f3e..8194d1c91c73 100644 --- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -36,15 +36,15 @@ namespace com { namespace sun { namespace star { } } } } -//........................................................................ + namespace sdr { namespace contact { -//........................................................................ + class ViewContactOfUnoControl; class ObjectContactOfPageView; - //==================================================================== + //= ViewObjectContactOfUnoControl - //==================================================================== + class ViewObjectContactOfUnoControl_Impl; class SVX_DLLPRIVATE ViewObjectContactOfUnoControl : public ViewObjectContactOfSdrObj { @@ -105,9 +105,9 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ); // never implemented }; - //==================================================================== + //= UnoControlPrintOrPreviewContact - //==================================================================== + class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl { public: @@ -122,9 +122,9 @@ namespace sdr { namespace contact { virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const; }; -//........................................................................ + } } // namespace sdr::contact -//........................................................................ + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx index 4105510cdb64..40f4e617413d 100644 --- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr { namespace contact { @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class ViewObjectContact; }} -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -59,7 +59,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX diff --git a/include/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx index 66d8f7a07e71..3ab923e9ee94 100644 --- a/include/svx/sdr/event/eventhandler.hxx +++ b/include/svx/sdr/event/eventhandler.hxx @@ -25,7 +25,7 @@ #include <vector> #include <vcl/timer.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations namespace sdr @@ -40,7 +40,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -64,7 +64,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -101,7 +101,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -125,7 +125,7 @@ namespace sdr } // end of namespace event } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 5182f93a8f48..57605a4e165e 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -92,7 +92,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index c984c3093345..13feeec1eb1b 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -69,7 +69,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx index b56fe2e9ded1..10625aa8c198 100644 --- a/include/svx/sdr/overlay/overlaycrosshair.hxx +++ b/include/svx/sdr/overlay/overlaycrosshair.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -44,7 +44,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX diff --git a/include/svx/sdr/overlay/overlayhatchrect.hxx b/include/svx/sdr/overlay/overlayhatchrect.hxx index e5395533ef57..e69c61b87849 100644 --- a/include/svx/sdr/overlay/overlayhatchrect.hxx +++ b/include/svx/sdr/overlay/overlayhatchrect.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/hatch.hxx> -////////////////////////////////////////////////////////////////////////////// + class PolyPolygon; @@ -64,7 +64,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx index 3b9e91587357..3eff8fee6aa9 100644 --- a/include/svx/sdr/overlay/overlayhelpline.hxx +++ b/include/svx/sdr/overlay/overlayhelpline.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/svdhlpln.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -53,7 +53,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx index 4794cf9d598a..4561a2bafe75 100644 --- a/include/svx/sdr/overlay/overlayline.hxx +++ b/include/svx/sdr/overlay/overlayline.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -52,7 +52,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 8b480e58fde4..a2ab50d79122 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -31,7 +31,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class OutputDevice; @@ -45,7 +45,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -144,7 +144,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx index c95a0f2e32d5..6e219193f62c 100644 --- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -24,7 +24,7 @@ #include <basegfx/range/b2irange.hxx> #include <vcl/virdev.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -91,7 +91,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 420b5aff0da7..e4effa946efa 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -30,7 +30,7 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class OutputDevice; @@ -50,7 +50,7 @@ namespace basegfx class B2DRange; } // end of namespace basegfx -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -169,7 +169,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -192,7 +192,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 3ef85ddf05db..75c334b974c5 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -24,7 +24,7 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// + // #114409# namespace sdr @@ -55,7 +55,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index f1d21fa10ab7..a3bda78589cd 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -24,11 +24,11 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + #define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2L) -////////////////////////////////////////////////////////////////////////////// + class Point; @@ -71,7 +71,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 026a9608187f..c5f3d08376de 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -24,7 +24,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 78cf4d97dcb2..f888e480a0cf 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx index 36230b4e9c30..cdb49c174274 100644 --- a/include/svx/sdr/overlay/overlayrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrectangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <tools/gen.hxx> -////////////////////////////////////////////////////////////////////////////// + class PolyPolygon; @@ -77,7 +77,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx index 22df07292943..0f7399a84762 100644 --- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -68,7 +68,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index dbe521b2557d..c4ab9a345ff5 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <vcl/region.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -80,7 +80,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx index 181f8950db9f..85b0c0b1732e 100644 --- a/include/svx/sdr/overlay/overlaytools.hxx +++ b/include/svx/sdr/overlay/overlaytools.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class which holds a BotmapEx which is to be visualized // at the given logic position with the Bitmap's pixel size, unscaled and // unrotated (like a marker). The discrete pixel on the bitmap assocciated @@ -78,7 +78,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for a crosshair namespace drawinglayer { @@ -119,7 +119,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for a hatch rectangle as used e.g. for text object // selection hilighting namespace drawinglayer @@ -171,7 +171,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for a striped helpline namespace drawinglayer @@ -225,7 +225,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + // Overlay helper class for rolling rectangle helplines. This primitive is // only for the extended lines to the ends of the view @@ -268,7 +268,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index b463a27beb17..4f7b29b95c31 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -55,7 +55,7 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx index 498aee924579..1d9ef5a8ff9e 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predefines class SfxItemSet; class SdrText; @@ -49,7 +49,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -127,7 +127,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index de6d3b8b2de9..dc2840109bec 100644 --- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -25,10 +25,10 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -72,7 +72,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 2191aaf5ab4a..45c382517711 100644 --- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -24,10 +24,10 @@ #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -61,7 +61,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 0bc3af68214a..4ef0090978a2 100644 --- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -82,7 +82,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 61ded2f6676a..63a8ea4c67a4 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { class B2DPolygon; @@ -39,7 +39,7 @@ namespace drawinglayer { namespace attribute { class SdrTextAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 6dca6d6abc5c..4d133cb57931 100644 --- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -61,7 +61,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -105,7 +105,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index 2eb0f53909d1..fafa633a843f 100644 --- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -25,10 +25,10 @@ #include <svtools/grfmgr.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -69,7 +69,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index e663c5dd90b9..39783b1e487e 100644 --- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace drawinglayer { namespace primitive2d { @@ -40,7 +40,7 @@ namespace drawinglayer { namespace attribute { class SdrLineAttribute; }} -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -118,7 +118,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx index 064614b4826f..cbab4e6b7534 100644 --- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -63,7 +63,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index f760396bd862..3215c6f375d7 100644 --- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -24,12 +24,12 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdobj.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefinitions class SdrOle2Obj; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -73,7 +73,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index 20b5fe9d1bc8..d5bf6d35769a 100644 --- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -25,10 +25,10 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -65,7 +65,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx index f82c19df040d..a81aa0b12d7d 100644 --- a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx @@ -23,14 +23,14 @@ #include <vcl/bitmapex.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace basegfx { class BColor; } -////////////////////////////////////////////////////////////////////////////// + // helper methods namespace drawinglayer @@ -42,7 +42,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 55590fa0b5ad..4082b446ab51 100644 --- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -24,10 +24,10 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -74,7 +74,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index 37b9433ae34c..45a48d771d58 100644 --- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -30,11 +30,11 @@ #include <tools/weakbase.hxx> #include <svx/sdtaitm.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SdrText; -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -102,7 +102,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -144,7 +144,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -186,7 +186,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -248,7 +248,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -290,7 +290,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -331,7 +331,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX diff --git a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index fee435c612fa..0fae52a763c4 100644 --- a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -////////////////////////////////////////////////////////////////////////////// + #define PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 0) #define PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 1) @@ -49,7 +49,7 @@ #define PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 22) #define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 23) -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX diff --git a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx index c41e6c35edaf..4a7270690a1f 100644 --- a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predefines class SfxItemSet; @@ -34,7 +34,7 @@ namespace basegfx { class B2DRange; } -////////////////////////////////////////////////////////////////////////////// + namespace drawinglayer { @@ -48,7 +48,7 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx index dce031bc6a23..3309500871c3 100644 --- a/include/svx/sdr/properties/attributeproperties.hxx +++ b/include/svx/sdr/properties/attributeproperties.hxx @@ -25,7 +25,7 @@ #include <svx/sdr/properties/defaultproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -89,7 +89,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx index 764ad0e99038..1ce6903d3da9 100644 --- a/include/svx/sdr/properties/captionproperties.hxx +++ b/include/svx/sdr/properties/captionproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx index c0304a9407b9..4ac0dc5bfc63 100644 --- a/include/svx/sdr/properties/circleproperties.hxx +++ b/include/svx/sdr/properties/circleproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx index f05ef2846293..dbd3b49b52c5 100644 --- a/include/svx/sdr/properties/connectorproperties.hxx +++ b/include/svx/sdr/properties/connectorproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/textproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -56,7 +56,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx index 62a68bf2b6e8..14a558414b99 100644 --- a/include/svx/sdr/properties/customshapeproperties.hxx +++ b/include/svx/sdr/properties/customshapeproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/textproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -79,7 +79,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 305aeab859c7..4e372c2042c6 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/properties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx index 9fd7126db913..db04b384c1bc 100644 --- a/include/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/e3dproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -64,7 +64,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx index 2524ad4651e0..b5d64068a9f5 100644 --- a/include/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/include/svx/sdr/properties/e3dextrudeproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/e3dcompoundproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx index f65729a02084..e88c4964f217 100644 --- a/include/svx/sdr/properties/e3dlatheproperties.hxx +++ b/include/svx/sdr/properties/e3dlatheproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/e3dcompoundproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx index 5b1fe27ad2e3..c2ba41c9bf2f 100644 --- a/include/svx/sdr/properties/e3dproperties.hxx +++ b/include/svx/sdr/properties/e3dproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/attributeproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -57,7 +57,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx index 437bdac87480..9d14a5ae8529 100644 --- a/include/svx/sdr/properties/e3dsceneproperties.hxx +++ b/include/svx/sdr/properties/e3dsceneproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/e3dproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -81,7 +81,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx index 058e9f6488f2..2481af6a6007 100644 --- a/include/svx/sdr/properties/e3dsphereproperties.hxx +++ b/include/svx/sdr/properties/e3dsphereproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/e3dcompoundproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -50,7 +50,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx index 0de77d69304c..7498f0422b55 100644 --- a/include/svx/sdr/properties/emptyproperties.hxx +++ b/include/svx/sdr/properties/emptyproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/properties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx index 36274a9c8980..1232ec7e9f9b 100644 --- a/include/svx/sdr/properties/graphicproperties.hxx +++ b/include/svx/sdr/properties/graphicproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx index 31868f087b61..ee12bd2a0bfd 100644 --- a/include/svx/sdr/properties/groupproperties.hxx +++ b/include/svx/sdr/properties/groupproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/defaultproperties.hxx> -///////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -114,7 +114,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX diff --git a/include/svx/sdr/properties/itemsettools.hxx b/include/svx/sdr/properties/itemsettools.hxx index 3e6372fe1647..6c4ce0e59d20 100644 --- a/include/svx/sdr/properties/itemsettools.hxx +++ b/include/svx/sdr/properties/itemsettools.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; @@ -30,7 +30,7 @@ class SfxItemSet; class Rectangle; class Fraction; -////////////////////////////////////////////////////////////////////////////// + // class to remember broadcast start positions namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -61,7 +61,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx index eba0baa00f82..234aca895e8d 100644 --- a/include/svx/sdr/properties/measureproperties.hxx +++ b/include/svx/sdr/properties/measureproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/textproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -60,7 +60,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX diff --git a/include/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx index 0ca98a919857..5a10f87bd771 100644 --- a/include/svx/sdr/properties/oleproperties.hxx +++ b/include/svx/sdr/properties/oleproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/rectangleproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -51,7 +51,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx index f085e168fd86..08f583b5842b 100644 --- a/include/svx/sdr/properties/pageproperties.hxx +++ b/include/svx/sdr/properties/pageproperties.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/properties/emptyproperties.hxx> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -66,7 +66,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx index 80663f403a60..e754d9e4c081 100644 --- a/include/svx/sdr/properties/properties.hxx +++ b/include/svx/sdr/properties/properties.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; @@ -42,7 +42,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -186,7 +186,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx index c47f03a156ba..aa464546c7e4 100644 --- a/include/svx/sdr/properties/rectangleproperties.hxx +++ b/include/svx/sdr/properties/rectangleproperties.hxx @@ -23,7 +23,7 @@ #include <svx/sdr/properties/textproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -54,7 +54,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX diff --git a/include/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx index 69e598a09e82..0894af0d6d80 100644 --- a/include/svx/sdr/properties/textproperties.hxx +++ b/include/svx/sdr/properties/textproperties.hxx @@ -24,7 +24,7 @@ #include <svx/sdr/properties/attributeproperties.hxx> #include <svx/svxdllapi.h> -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -86,7 +86,7 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index 43ba26578706..63e0dec21b1b 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <tools/gen.hxx> -///////////////////////////////////////////////////////////////////// + // #i101872# new Object HitTest as View-tooling class SdrObject; @@ -33,7 +33,7 @@ class SdrObjList; namespace sdr { namespace contact { class ViewObjectContact; }} namespace basegfx { class B2DPoint; } -///////////////////////////////////////////////////////////////////// + // Wrappers for classic Sdr* Mode/View classes SVX_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit( @@ -52,7 +52,7 @@ SVX_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit( const SetOfByte* pVisiLayer, bool bTextOnly); -///////////////////////////////////////////////////////////////////// + // the pure HitTest based on a VOC SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( @@ -61,7 +61,7 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( double fLogicHitTolerance, bool bTextOnly); -///////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRHITTESTHELPER_HXX diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index 6ffb8df0e251..424b16ee8a11 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -23,7 +23,7 @@ #include <svx/sdrpageuser.hxx> #include <svx/svdsob.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; class SfxItemSet; @@ -37,7 +37,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + namespace sdr { @@ -87,7 +87,7 @@ namespace sdr }; } // end of namespace sdr -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRMASTERPAGEDESCRIPTOR_HXX diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx index d1e81c67a175..c7398ccc1fe0 100644 --- a/include/svx/sdrobjectfilter.hxx +++ b/include/svx/sdrobjectfilter.hxx @@ -24,14 +24,14 @@ class SdrObject; -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= SdrObjectFilter - //==================================================================== + /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter. */ class SVX_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter @@ -42,9 +42,9 @@ namespace svx virtual ~ISdrObjectFilter() = 0; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SDROBJECTFILTER_HXX diff --git a/include/svx/sdrobjectuser.hxx b/include/svx/sdrobjectuser.hxx index fbaa278632af..b480257fe274 100644 --- a/include/svx/sdrobjectuser.hxx +++ b/include/svx/sdrobjectuser.hxx @@ -22,11 +22,11 @@ #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrObject; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // To make things more safe, allow users of an object to register at it. The users need to be derived // from sdr::ObjectUser to get a call. The users do not need to call RemoveObjectUser() at the page // when they get called from ObjectInDestruction(). @@ -49,7 +49,7 @@ namespace sdr typedef ::std::vector< ObjectUser* > ObjectUserVector; } // end of namespace sdr -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDROBJECTUSER_HXX diff --git a/include/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx index d537861ced0b..d4eae047ac8b 100644 --- a/include/svx/sdrpageuser.hxx +++ b/include/svx/sdrpageuser.hxx @@ -22,11 +22,11 @@ #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPage; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // To make things more safe, allow users of the page to register at it. The users need to be derived // from sdr::PageUser to get a call. The users do not need to call RemovePageUser() at the page // when they get called from PageInDestruction(). @@ -49,7 +49,7 @@ namespace sdr typedef ::std::vector< PageUser* > PageUserVector; } // end of namespace sdr -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRPAGEUSER_HXX diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index af07e5477da9..36ea6b864137 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -32,7 +32,7 @@ #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class Region; @@ -62,7 +62,7 @@ namespace basegfx class SdrPaintWindow; class Link; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPageWindow { @@ -124,7 +124,7 @@ public: // typedefs for a list of SdrPageWindow typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRPAGEWINDOW_HXX diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 741ebb90f280..27c546063c78 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -24,7 +24,7 @@ #include <vcl/virdev.hxx> #include <svx/svxdllapi.h> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // predeclarations class SdrPaintView; @@ -39,7 +39,7 @@ namespace sdr #ifdef _MSC_VER // broken msvc template instantiation #include <svx/sdr/overlay/overlaymanager.hxx> #endif -//////////////////////////////////////////////////////////////////////////////////////////////////// + /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) @@ -66,7 +66,7 @@ public: OutputDevice& GetPreRenderDevice() { return maPreRenderDevice; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPaintWindow { @@ -150,7 +150,7 @@ public: // typedefs for a list of SdrPaintWindows typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRPAINTWINDOW_HXX diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 1cb2ef116551..3f3739d56958 100755 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -24,7 +24,7 @@ #include <editeng/editund2.hxx> #include <tools/link.hxx> -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrUndoManager : public EditUndoManager { @@ -63,7 +63,7 @@ public: bool isEndTextEditTriggeredFromUndo() { return mbEndTextEditTriggeredFromUndo; } }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SDRUNDOMANAGER_HXX // eof diff --git a/include/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx index 432fdbc50a77..e8653d8b56cd 100644 --- a/include/svx/sdsxyitm.hxx +++ b/include/svx/sdsxyitm.hxx @@ -22,18 +22,18 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -//--------------------- + // class SdrShadowXDistItem -//--------------------- + class SdrShadowXDistItem: public SdrMetricItem { public: SdrShadowXDistItem(long nDist=0) : SdrMetricItem(SDRATTR_SHADOWXDIST,nDist) {} SdrShadowXDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_SHADOWXDIST,rIn) {} }; -//--------------------- + // class SdrShadowYDistItem -//--------------------- + class SdrShadowYDistItem: public SdrMetricItem { public: SdrShadowYDistItem(long nDist=0) : SdrMetricItem(SDRATTR_SHADOWYDIST,nDist) {} diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 07e123314887..54ded50680f9 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -23,9 +23,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class SdrTextAniDirectionItem -//------------------------------ + enum SdrTextAniDirection {SDRTEXTANI_LEFT, SDRTEXTANI_RIGHT, diff --git a/include/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx index e576d48d60f9..f51b1b10a355 100644 --- a/include/svx/sdtagitm.hxx +++ b/include/svx/sdtagitm.hxx @@ -22,18 +22,18 @@ #include <svx/sdooitm.hxx> #include <svx/svddef.hxx> -//------------------------------------ + // class SdrTextAutoGrowHeightItem -//------------------------------------ + class SdrTextAutoGrowHeightItem: public SdrOnOffItem { public: SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {} SdrTextAutoGrowHeightItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn) {} }; -//------------------------------------ + // class SdrTextAutoGrowWidthItem -//------------------------------------ + class SdrTextAutoGrowWidthItem: public SdrOnOffItem { public: SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {} diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index cab0d069ade3..b6fd1c680672 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -23,9 +23,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class SdrTextVertAdjustItem -//------------------------------ + enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally used) SDRTEXTVERTADJUST_CENTER, // centered (for example for the title texts in Draw) @@ -51,9 +51,9 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------ + // class SdrTextHorzAdjustItem -//------------------------------ + enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted SDRTEXTHORZADJUST_CENTER, // centered (for example for title texts in Draw) diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index bb3deb37bd24..3d1e6c11ccd9 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -23,9 +23,9 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class SdrTextAniKindItem -//------------------------------ + enum SdrTextAniKind {SDRTEXTANI_NONE, SDRTEXTANI_BLINK, @@ -42,7 +42,7 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // (Only if count! = 0) // - SDRTEXTANI_SCROLL: // Text just scrolls all the way through, and starts over when it is done. -// + // Delay in ms: (except delay = 0 means 50ms (20Hz) default) // Count = number of passes (0 = go forever) // Direction: the direction to scroll diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx index 01f2e3307d5a..223fa3051150 100644 --- a/include/svx/sdtditm.hxx +++ b/include/svx/sdtditm.hxx @@ -22,9 +22,9 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -//---------------------------------------------- + // class SdrTextLeft/Right/Upper/LowerDistItem -//---------------------------------------------- + class SdrTextLeftDistItem: public SdrMetricItem { public: SdrTextLeftDistItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_LEFTDIST,nHgt) {} diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index a6a7782d23cc..5defc601c6c0 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -39,9 +39,9 @@ enum SdrFitToSizeType { // No automatic line breaks for AutoGrowingWidth as well (only if // TextMaxFrameWidth is reached). -//-------------------------------- + // class SdrTextFitToSizeTypeItem -//-------------------------------- + class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx index 5be20e768e34..a3e3b6641e0e 100644 --- a/include/svx/sdtmfitm.hxx +++ b/include/svx/sdtmfitm.hxx @@ -22,36 +22,36 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -//------------------------------ + // class SdrTextMinFrameHeighItem -//------------------------------ + class SdrTextMinFrameHeightItem: public SdrMetricItem { public: SdrTextMinFrameHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT,nHgt) {} SdrTextMinFrameHeightItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT,rIn) {} }; -//------------------------------ + // class SdrTextMaxFrameHeightItem -//------------------------------ + class SdrTextMaxFrameHeightItem: public SdrMetricItem { public: SdrTextMaxFrameHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT,nHgt) {} SdrTextMaxFrameHeightItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT,rIn) {} }; -//------------------------------ + // class SdrTextMinFrameWidthItem -//------------------------------ + class SdrTextMinFrameWidthItem: public SdrMetricItem { public: SdrTextMinFrameWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH,nWdt) {} SdrTextMinFrameWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH,rIn) {} }; -//------------------------------ + // class SdrTextMaxFrameWidthItem -//------------------------------ + class SdrTextMaxFrameWidthItem: public SdrMetricItem { public: SdrTextMaxFrameWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH,nWdt) {} diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index adb8ea6e0229..aebed63b3245 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> -//------------------------------------------------------------ + // class SdrYesNoItem // GetValueTextByVal() returns "yes" or "no" // instead of "TRUE" and "FALSE" diff --git a/include/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx index 06e45f9f3b22..6fd58bd82063 100644 --- a/include/svx/shapeproperty.hxx +++ b/include/svx/shapeproperty.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_SVX_SHAPEPROPERTY_HXX #define INCLUDED_SVX_SHAPEPROPERTY_HXX -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ShapeProperty - //==================================================================== + enum ShapeProperty { // generic (UNO) shape properties @@ -42,9 +42,9 @@ namespace svx eInvalidShapeProperty }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SHAPEPROPERTY_HXX diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 2c7047e62ba3..93140d670039 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -35,14 +35,14 @@ namespace cppu class OWeakObject; } -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= IPropertyValueProvider - //==================================================================== + /** a provider for a property value */ class SVX_DLLPUBLIC IPropertyValueProvider @@ -60,9 +60,9 @@ namespace svx }; typedef ::boost::shared_ptr< IPropertyValueProvider > PPropertyValueProvider; - //==================================================================== + //= PropertyValueProvider - //==================================================================== + /** default implementation of a IPropertyValueProvider This default implementation queries the object which it is constructed with for the XPropertySet interface, @@ -88,9 +88,9 @@ namespace svx const OUString m_sPropertyName; }; - //==================================================================== + //= PropertyChangeNotifier - //==================================================================== + struct PropertyChangeNotifier_Data; /** helper class for notifying XPropertyChangeListeners @@ -132,9 +132,9 @@ namespace svx ::std::auto_ptr< PropertyChangeNotifier_Data > m_pData; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX diff --git a/include/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx index f20191acf9c5..0d18ac803b28 100644 --- a/include/svx/subtoolboxcontrol.hxx +++ b/include/svx/subtoolboxcontrol.hxx @@ -22,9 +22,9 @@ #include <svx/svxdllapi.h> #include <sfx2/tbxctrl.hxx> -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- + + + class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl { @@ -39,8 +39,8 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); }; -// -//---------------------------------------------------------------------------- + + #endif diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 9dc09bce6a1a..92af4e19d514 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -158,7 +158,7 @@ public: // incompatible with the rest of the Create functionality of SvDraw, needs // to set the following flag. It affects the following object types: // OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL - // + // This flag should be regarded as temporary. The affected applications should // be changed soon. // Default = sal_False; diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 91a1fd0b4bb0..0e92e7f72654 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -42,7 +42,7 @@ // SdrItemPool V4+++, 07-06-1999 // 15 new Items for NotPersist (Reserve) // 15 new Items for GrafItems -// + // WhichMapping: // V1 Range = 1000..1065 (66) // V2 Range = 1000..1123 (124) (58 neue Whiches) diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 6b81fc498ad1..fc45d3f1a6ca 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -47,7 +47,7 @@ public: bool getAddToTransparent() const { return mbAddToTransparent; } }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrDragEntryPolyPolygon : public SdrDragEntry { @@ -61,7 +61,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SdrDragEntrySdrObject : public SdrDragEntry { @@ -84,7 +84,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SdrDragEntryPrimitive2DSequence : public SdrDragEntry { @@ -100,7 +100,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SdrDragEntryPointGlueDrag : public SdrDragEntry { @@ -115,7 +115,7 @@ public: virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); }; -////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrDragMethod { @@ -219,7 +219,7 @@ inline const Rectangle& SdrDragMethod::GetMarkedRect() const getSdrDragView().GetMarkedObjRect(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragMove class SVX_DLLPUBLIC SdrDragMove : public SdrDragMethod @@ -249,7 +249,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragResize class SVX_DLLPUBLIC SdrDragResize : public SdrDragMethod @@ -272,7 +272,7 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // SdrDragObjOwn class SVX_DLLPUBLIC SdrDragObjOwn : public SdrDragMethod diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 10b198da4bae..376c78d3a0c9 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -292,7 +292,7 @@ public: // aStr+=" ersetzen"; // BegUndo(aStr); // ReplaceObject(...); - // ... + // EndUndo(); void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index d1a9963fd944..2fbbe6c6ff1f 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -49,11 +49,11 @@ enum SdrEndTextEditKind {SDRENDTEXTEDIT_UNCHANGED, // Textobjekt unveraendert SDRENDTEXTEDIT_DELETED, // Textobjekt implizit geloescht SDRENDTEXTEDIT_SHOULDBEDELETED}; // Fuer Writer: Textobjekt sollte geloescht werden -//////////////////////////////////////////////////////////////////////////////////////////////////// + // - Allgemeines Edit fuer objektspeziefische Eigenschaften // - Textedit fuer alle vom SdrTextObj abgeleiteten Zeichenobjekte // - Macromodus -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrObjEditView: public SdrGlueEditView { @@ -134,7 +134,7 @@ protected: virtual ~SdrObjEditView(); public: - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used to call the old ImpPaintOutlinerView. Will be replaced when the // outliner will be displayed on the overlay in edit mode. void TextEditDrawing(SdrPaintWindow& rPaintWindow) const; @@ -150,9 +150,9 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); virtual void ModelHasChanged(); - //************************************************************************ + // TextEdit ueber einen Outliner - //************************************************************************ + // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken // editiert werden sollen. Default=TRUE. Persistent. void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; } @@ -237,9 +237,9 @@ public: sal_uInt16 GetSelectionLevel() const; - //************************************************************************ + // Object-MacroModus (z.B. Rect als Button oder sowas): - //************************************************************************ + // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei // SdrView::GetPreferredPointer() aus. Hat nur Wirkung, wenn das Dokument // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 87406f76304d..a2da4f39a7d8 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -26,7 +26,7 @@ #include <tools/shl.hxx> #include <vcl/outdev.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per // static sal_Bool CopyData(pData,nLen,nFormat); @@ -108,7 +108,7 @@ class SfxItemSet; // Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen // Liefert sal_True, wenn der Set solchen Items enthaelt. @@ -118,7 +118,7 @@ sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal // man dann irgendwann mit delete platthauen muss. sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd); -//////////////////////////////////////////////////////////////////////////////////////////////////// + class Link; @@ -250,13 +250,13 @@ namespace sdr SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID); } -///////////////////////////////////////////////////////////////////// + // #i101872# isolated GetTextEditBackgroundColor for tooling class SdrObjEditView; SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); -///////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDETC_HXX diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index 89199ef77d2e..8576da69e678 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -25,9 +25,9 @@ class SdrGluePoint; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Editieren von Klebepunkten an den Objekten (Klebepunkte fuer Verbinder) -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView { diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx index 3a5e555f3e85..b2bc406dd3b8 100644 --- a/include/svx/svdglob.hxx +++ b/include/svx/svdglob.hxx @@ -24,9 +24,9 @@ #include <sal/config.h> #include <svx/svxdllapi.h> -//************************************************************ + // forward declaration -//************************************************************ + class ResMgr; @@ -40,7 +40,7 @@ ResMgr* ImpGetResMgr(); // See also SvdStr.Hrc SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID); -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDGLOB_HXX diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index 386d84c67d91..d49e71b0ede4 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -29,7 +29,7 @@ class SdrObject; #include <svx/svxdllapi.h> #include <vector> -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SDRESC_SMART 0x0000 #define SDRESC_LEFT 0x0001 @@ -140,7 +140,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDGLUE_HXX diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index fc7382d417a9..fd7cdf65c1dd 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -43,7 +43,7 @@ class SdrObject; class SdrPageView; class MouseEvent; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Jedes Objekt muss in der Lage seine Handles zu erzeugen. Diese werden dann // bei einer Selektion abgeholt, bei der View angemeldet und sichtbar gemacht. @@ -87,7 +87,7 @@ enum SdrHdlKind HDL_SMARTTAG }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum BitmapColorIndex { @@ -99,7 +99,7 @@ enum BitmapColorIndex Yellow }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum BitmapMarkerKind { @@ -135,7 +135,7 @@ enum BitmapMarkerKind Customshape_11x11 }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrHdl { @@ -246,7 +246,7 @@ public: static BitmapEx createGluePointBitmap() { return ImpGetBitmapEx(Glue_Deselected, 0); } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SDR_HANDLE_COLOR_SIZE_NORMAL Size(13, 13) #define SDR_HANDLE_COLOR_SIZE_SELECTED Size(17, 17) @@ -290,7 +290,7 @@ public: const Link& GetColorChangeHdl() const { return aColorChangeHdl; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrHdlGradient : public SdrHdl { @@ -339,7 +339,7 @@ public: void SetMoveFirstHandle(bool bNew) { bMoveFirstHandle = bNew; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Spiegelachse class SdrHdlLine: public SdrHdl @@ -375,7 +375,7 @@ public: virtual ~SdrHdlBezWgt(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class E3dVolumeMarker : public SdrHdl { @@ -388,7 +388,7 @@ public: explicit E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpEdgeHdl: public SdrHdl { @@ -407,7 +407,7 @@ public: virtual Pointer GetPointer() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpMeasureHdl: public SdrHdl { @@ -421,7 +421,7 @@ public: virtual Pointer GetPointer() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class ImpTextframeHdl: public SdrHdl { @@ -434,9 +434,9 @@ public: explicit ImpTextframeHdl(const Rectangle& rRect); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + + class SVX_DLLPUBLIC SdrHdlList { @@ -498,7 +498,7 @@ public: SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrCropHdl : public SdrHdl { @@ -524,7 +524,7 @@ protected: static BitmapEx GetHandlesBitmap(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrCropViewHdl : public SdrHdl { @@ -550,7 +550,7 @@ protected: virtual void CreateB2dIAObject(); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDHDL_HXX diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 88c49b88c917..4a23d575da01 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> class OutputDevice; -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum SdrHelpLineKind {SDRHELPLINE_POINT,SDRHELPLINE_VERTICAL,SDRHELPLINE_HORIZONTAL}; @@ -100,7 +100,7 @@ public: sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDHLPLN_HXX diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index e43800885d36..fc9417d572fd 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -254,7 +254,7 @@ public: void operator=(const SdrMarkList& rLst); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // migrate selections namespace sdr diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index a624e852b9fc..16603fbf2764 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -85,7 +85,7 @@ namespace sfx2 { class LinkManager; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SDR_SWAPGRAPHICSMODE_NONE 0x00000000 #define SDR_SWAPGRAPHICSMODE_TEMP 0x00000001 @@ -93,7 +93,7 @@ namespace sfx2 #define SDR_SWAPGRAPHICSMODE_PURGE 0x00000100 #define SDR_SWAPGRAPHICSMODE_DEFAULT (SDR_SWAPGRAPHICSMODE_TEMP|SDR_SWAPGRAPHICSMODE_DOC|SDR_SWAPGRAPHICSMODE_PURGE) -//////////////////////////////////////////////////////////////////////////////////////////////////// + enum SdrHintKind { @@ -138,7 +138,7 @@ public: SdrHintKind GetKind() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts // neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv @@ -211,7 +211,7 @@ protected: sal_uInt32 nMaxUndoCount; -////////////////////////////////////////////////////////////////////////////// + // sdr::Comment interface private: // the next unique comment ID, used for counting added comments. Initialized @@ -682,11 +682,11 @@ public: typedef tools::WeakReference< SdrModel > SdrModelWeakRef; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDMODEL_HXX -/* ///////////////////////////////////////////////////////////////////////////////////////////////// +/* +-----------+ | SdrModel | +--+------+-+ diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 80518cca0be0..5dd5f9177f7c 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -230,7 +230,7 @@ public: sal_Bool HasMarkableObj() const; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // migrate selections protected: @@ -260,7 +260,7 @@ public: const SdrMarkList& GetMarkedEdgesOfMarkedNodes() const { return mpSdrViewSelection->GetMarkedEdgesOfMarkedNodes(); } const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// + // mechanism to complete disable handles at the view. Handles will be hidden and deleted // when set, no new ones created, no interaction allowed. Handles will be recreated and shown @@ -463,8 +463,8 @@ public: void UnmarkObj(SdrObject* pObj); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // - Hit tolarances: // It have to be declared in logical coordinates. So please translate the // wanted pixel value with PixelToLogic in Logical values. @@ -478,8 +478,8 @@ public: // 2*Tol (200 units for this example) is created around the object. // When an object is directly hit, the Edit method is called. // In opposite, a hit in the surrounding sensitive area enables Dragging. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + #endif // INCLUDED_SVX_SVDMRKV_HXX diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ac78bc5b940a..ca6be6ca6f7f 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -29,9 +29,9 @@ #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <svx/svxdllapi.h> -//************************************************************ + // Initial Declarations -//************************************************************ + class SdrObjList; class SdrObjListIter; @@ -71,9 +71,9 @@ struct SdrCustomShapeInteraction sal_Int32 nMode; }; -//************************************************************ + // SdrObjCustomShape -//************************************************************ + class SVX_DLLPUBLIC SdrObjCustomShape : public SdrTextObj { diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index dfbf6b601d50..daae14673dd1 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -28,9 +28,9 @@ #include <svx/svdattr.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Initial Declarations -//************************************************************ + class SfxPoolItem; class SfxSetItem; @@ -38,9 +38,9 @@ class SdrOutliner; class SfxItemSet; class SfxItemPool; -//************************************************************ + // SdrAttrObj -//************************************************************ + class SVX_DLLPUBLIC SdrAttrObj : public SdrObject { @@ -76,7 +76,7 @@ public: virtual void SetModel(SdrModel* pNewModel); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOATTR_HXX diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 7b922dd31a48..f87ea5d06f93 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -23,9 +23,9 @@ #include <svx/svdorect.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Forward Declarations -//************************************************************ + class ImpCaptParams; @@ -33,9 +33,9 @@ namespace sdr { namespace properties { class CaptionProperties; }} -//************************************************************ + // Helper Class SdrCaptObjGeoData -//************************************************************ + // #109872# class SdrCaptObjGeoData : public SdrTextObjGeoData @@ -44,9 +44,9 @@ public: Polygon aTailPoly; }; -//************************************************************ + // SdrCaptionObj -//************************************************************ + class SVX_DLLPUBLIC SdrCaptionObj : public SdrRectObj { @@ -154,7 +154,7 @@ public: ::basegfx::B2DPolygon getTailPolygon() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif //_SVDOCAPT_HXX diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 48c509adf2dc..51417e5ca439 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -24,9 +24,9 @@ #include <svx/svdglue.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class SdrDragMethod; class SdrPageView; @@ -35,9 +35,9 @@ namespace sdr { namespace properties { class ConnectorProperties; }} -//************************************************************ + // Hilfsklasse SdrObjConnection -//************************************************************ + class SdrObjConnection { @@ -79,9 +79,9 @@ public: inline SdrObject* GetObject() const { return pObj; } }; -//************************************************************ + // Hilfsklasse SdrEdgeInfoRec -//************************************************************ + enum SdrEdgeLineCode {OBJ1LINE2,OBJ1LINE3,OBJ2LINE2,OBJ2LINE3,MIDDLELINE}; @@ -123,9 +123,9 @@ public: long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; -//************************************************************ + // Hilfsklasse SdrEdgeObjGeoData -//************************************************************ + class SdrEdgeObjGeoData : public SdrTextObjGeoData { @@ -142,9 +142,9 @@ public: virtual ~SdrEdgeObjGeoData(); }; -//************************************************************ + // Hilfsklasse SdrEdgeObj -//************************************************************ + class SVX_DLLPUBLIC SdrEdgeObj : public SdrTextObj { @@ -317,8 +317,6 @@ public: basegfx::B2DPolygon ImplAddConnectorOverlay(SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet: // // sal_uInt16 EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000 @@ -430,8 +428,6 @@ public: // das gesamte Objekt umfasst, so versucht der // Verbinder von den 4 Scheitelpunktklebepunkten (und // zwar nur von denen) den guenstigsten herauszufinden. -// -////////////////////////////////////////////////////////////////////////////////////////////////// #endif // INCLUDED_SVX_SVDOEDGE_HXX diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 917f3d1b748d..4e0883c61ba2 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -23,17 +23,17 @@ #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class SdrObjList; class SdrObjListIter; class SfxItemSet; -//************************************************************ + // SdrObjGroup -//************************************************************ + class SVX_DLLPUBLIC SdrObjGroup : public SdrObject { diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 8167685d3d01..da1aa4ec0f6c 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -24,9 +24,9 @@ #include <svx/svxdllapi.h> #include <editeng/measfld.hxx> -//************************************************************ + // Initial Declarations -//************************************************************ + class SdrOutliner; struct ImpMeasureRec; @@ -36,9 +36,9 @@ namespace sdr { namespace properties { class MeasureProperties; }} -//************************************************************ + // Auxiliary Class SdrMeasureObjGeoData -//************************************************************ + class SdrMeasureObjGeoData : public SdrTextObjGeoData { @@ -51,9 +51,9 @@ public: virtual ~SdrMeasureObjGeoData(); }; -//************************************************************ + // SdrMeasureObj -//************************************************************ + class SVX_DLLPUBLIC SdrMeasureObj : public SdrTextObj { @@ -152,8 +152,6 @@ public: virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); }; -///////////////////////////////////////////////////////////////////////////////////////////////// -// // Creating: // ~~~~~~~~~ // dragging reference point 1 to reference point 2 -> reference edge @@ -202,8 +200,6 @@ public: // Connecting to a maximum of two objects // -> during Copy, etc. use the respective code of the connectors?!? // this probably will be pretty complicated ... -// -///////////////////////////////////////////////////////////////////////////////////////////////// #endif // INCLUDED_SVX_SVDOMEAS_HXX diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 018adfe5e2b6..2e1d55103c10 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -28,9 +28,9 @@ class Graphic; namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } } -// --------------- + // - SdrMediaObj - -// --------------- + class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj { diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index e909990aff33..5efa9e84e242 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -31,9 +31,9 @@ #include <sot/storage.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // SdrOle2Obj -//************************************************************ + class SvxUnoShapeModifyListener; class SdrOle2ObjImpl; diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 8b2eeaae26b6..59f959c28cf2 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -63,7 +63,7 @@ public: virtual OUString TakeObjNamePlural() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOPAGE_HXX diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index d23621d01bcc..021394e72789 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -23,9 +23,9 @@ #include <svx/svdotext.hxx> #include <svx/svxdllapi.h> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class XPolygon; @@ -33,12 +33,12 @@ namespace sdr { namespace properties { class RectangleProperties; }} -//************************************************************ + // SdrRectObj -// + // Rechteck-Objekte (Rechteck,Kreis,...) -// -//************************************************************ + + class SVX_DLLPUBLIC SdrRectObj : public SdrTextObj { diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 42411d8eaf90..b679d4a6e150 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -27,7 +27,7 @@ #include <svx/svdotext.hxx> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------ + class SvStream; class SfxStyleSheet; @@ -46,9 +46,9 @@ struct ImplTableShadowPaintInfo; typedef rtl::Reference< Cell > CellRef; #endif -//------------------------------------------------------------------------ + // SdrTableHitKind -//------------------------------------------------------------------------ + enum TableHitKind { @@ -59,7 +59,7 @@ enum TableHitKind SDRTABLEHIT_VERTICAL_BORDER }; -//------------------------------------------------------------------------ + struct CellPos { @@ -73,9 +73,9 @@ struct CellPos bool operator!=( const CellPos& r ) const { return (r.mnCol != mnCol) || (r.mnRow != mnRow); } }; -//------------------------------------------------------------------------ + // TableStyleSettings -//------------------------------------------------------------------------ + struct SVX_DLLPUBLIC TableStyleSettings { @@ -93,9 +93,9 @@ struct SVX_DLLPUBLIC TableStyleSettings bool operator==( const TableStyleSettings& r ) const; }; -//------------------------------------------------------------------------ + // SdrTableObj -//------------------------------------------------------------------------ + class SdrTableObjImpl; @@ -268,14 +268,14 @@ public: virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ); - //////////////////////////////////////////////////////////////////////////////////////////////////// - // + + // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. - // - //////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; @@ -319,7 +319,7 @@ private: SdrTableObjImpl* mpImpl; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + } } diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 2ce1358186fb..2329d16e339b 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -33,9 +33,9 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/svdpagv.hxx> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class OutlinerParaObject; class SdrOutliner; @@ -70,15 +70,15 @@ namespace sdr { namespace table { class SdrTableRTFParser; }} -//************************************************************ + // Defines -//************************************************************ + #define SDRUSERDATA_OBJTEXTLINK (1) -//************************************************************ + // Hilfsklasse SdrTextObjGeoData -//************************************************************ + class SdrTextObjGeoData : public SdrObjGeoData { @@ -87,9 +87,9 @@ public: GeoStat aGeo; }; -//************************************************************ + // Hilfsklasse ImpSdrObjTextLinkUserData -//************************************************************ + class ImpSdrObjTextLinkUserData : public SdrObjUserData { @@ -120,9 +120,9 @@ namespace sdr } // end of namespace properties } // end of namespace sdr -//************************************************************ + // SdrTextObj -//************************************************************ + class SVX_DLLPUBLIC SdrTextObj : public SdrAttrObj, public svx::ITextProvider { @@ -518,14 +518,14 @@ public: /** called from the SdrObjEditView during text edit when the status of the edit outliner changes */ virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ); - //////////////////////////////////////////////////////////////////////////////////////////////////// - // + + // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. - // - //////////////////////////////////////////////////////////////////////////////////////////////////// + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; @@ -555,7 +555,7 @@ public: void SetObjectItemNoBroadcast(const SfxPoolItem& rItem); public: - ////////////////////////////////////////////////////////////////////////////// + // text primitive decomposition helpers void impDecomposeContourTextPrimitive( drawinglayer::primitive2d::Primitive2DSequence& rTarget, @@ -578,7 +578,7 @@ public: const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; - ////////////////////////////////////////////////////////////////////////////// + // timing generators void impGetBlinkTextTiming(drawinglayer::animation::AnimationEntryList& rAnimList) const; void impGetScrollTextTiming(drawinglayer::animation::AnimationEntryList& rAnimList, double fFrameLength, double fTextLength) const; @@ -590,7 +590,7 @@ public: static bool HasTextImpl( SdrOutliner* pOutliner ); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOTEXT_HXX diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index b8cbf8560476..32180a86c1ae 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -27,9 +27,9 @@ #include <svx/svxdllapi.h> #include <svx/svdorect.hxx> -//************************************************************ + // Vorausdeklarationen -//************************************************************ + class SdrView; class SdrPageWindow; @@ -39,9 +39,9 @@ namespace sdr { namespace contact { class ViewContactOfUnoControl; }} -//************************************************************ + // SdrUnoObj -//************************************************************ + struct SdrUnoObjDataHolder; class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index b97b36412927..79347b99c484 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -23,15 +23,15 @@ #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// + + // SdrVirtObj -// + // Achtung! Das virtuelle Objekt ist noch nicht bis in alle Feinheiten // durchprogrammiert und getestet. Z.Zt. kommt es nur in abgeleiteter // beim Writer zum Einsatz. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// + + class SVX_DLLPUBLIC SdrVirtObj : public SdrObject { @@ -150,7 +150,7 @@ public: virtual const Point GetOffset() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDOVIRT_HXX diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index c6cfea4defbc..bfab233f158f 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -38,7 +38,7 @@ #include <svx/svdobj.hxx> #include <boost/scoped_ptr.hpp> -////////////////////////////////////////////////////////////////////////////// + // predefines namespace reportdesign { class OSection; } @@ -72,7 +72,7 @@ public: SdrInsertReasonKind GetReason() const { return eReason; } }; -////////////////////////////////////////////////////////////////////////////// + // class SdrObjList class SVX_DLLPUBLIC SdrObjList @@ -313,7 +313,7 @@ Objektes abgefragt sowie direkt gesetzt werden. // Used for all methods which return a page number #define SDRPAGE_NOTFOUND 0xFFFF -////////////////////////////////////////////////////////////////////////////// + // class SdrPageGridFrame // Fuer das Fangraster/Punkgitter im Writer @@ -366,7 +366,7 @@ public: const SdrPageGridFrame& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // class SdrPageProperties class SVX_DLLPUBLIC SdrPageProperties : public SfxListener, public svl::StyleSheetUser @@ -405,12 +405,12 @@ public: SfxStyleSheet* GetStyleSheet() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + // class SdrPage class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase< SdrPage > { - /////////////////////////////////////////////////////////////////////////////// + // start PageUser section private: // #111111# PageUser section @@ -420,10 +420,10 @@ public: void AddPageUser(sdr::PageUser& rNewUser); void RemovePageUser(sdr::PageUser& rOldUser); - /////////////////////////////////////////////////////////////////////////////// + // end PageUser section - /////////////////////////////////////////////////////////////////////////////// + // #110094# DrawContact section private: sdr::contact::ViewContact* mpViewContact; @@ -582,7 +582,7 @@ public: typedef tools::WeakReference< SdrPage > SdrPageWeakRef; -////////////////////////////////////////////////////////////////////////////// + // use new redirector instead of pPaintProc class SVX_DLLPUBLIC StandardCheckVisisbilityRedirector : public ::sdr::contact::ViewObjectContactRedirector @@ -598,7 +598,7 @@ public: const sdr::contact::DisplayInfo& rDisplayInfo); }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDPAGE_HXX diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 8e63d3b060ee..ae516010d1c9 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -33,7 +33,7 @@ #include <vector> #include <basegfx/polygon/b2dpolypolygon.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + class Region; class SdrObjList; @@ -60,7 +60,7 @@ namespace sdr class SdrPageWindow; typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPageView { @@ -262,7 +262,7 @@ public: Color GetApplicationDocumentColor() const; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDPAGV_HXX diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 89ce07a243d7..c7c61bad46ae 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -35,9 +35,9 @@ #include <svtools/optionsdrawinglayer.hxx> #include <unotools/options.hxx> -//************************************************************ + // Pre-Defines -//************************************************************ + class SdrPageWindow; @@ -61,9 +61,9 @@ namespace sdr { namespace contact { class ViewObjectContactRedirector; }} -//************************************************************ + // Defines for AnimationMode -//************************************************************ + enum SdrAnimationMode { @@ -72,9 +72,9 @@ enum SdrAnimationMode SDR_ANIMATION_DISABLE }; -//************************************************************ + // Typedef's und defines -//************************************************************ + typedef unsigned char TRISTATE; #define FUZZY (2) @@ -83,7 +83,7 @@ typedef unsigned char TRISTATE; #define SDRVIEWWIN_NOTFOUND (0xFFFF) -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SdrPaintView; namespace sdr @@ -94,7 +94,7 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SvxViewHint : public SfxHint @@ -113,7 +113,7 @@ private: class SdrPaintWindow; typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; -////////////////////////////////////////////////////////////////////////////// + // helper to convert any GDIMetaFile to a good quality BitmapEx, // using default parameters and graphic::XPrimitive2DRenderer @@ -122,7 +122,7 @@ BitmapEx SVX_DLLPUBLIC convertMetafileToBitmapEx( const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels = 500000); -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { @@ -365,12 +365,12 @@ public: // PrePaint call forwarded from app windows void PrePaint(); - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used internally for Draw/Impress/sch/chart2 virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); // #i72889# used from CompleteRedraw() implementation internally, added to be able to do a complete redraw in single steps - // + // BeginCompleteRedraw returns (or even creates) a SdrPaintWindow which shall then be used as // target for paints. Since paints may be buffered, use it's GetTargetOutputDevice() method which will // return the buffer in case of bufered. @@ -381,7 +381,7 @@ public: virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used for the other applications basctl/sc/sw which call DrawLayer at PageViews // #i74769# Interface change to use common BeginCompleteRedraw/EndCompleteRedraw // #i76114# bDisableIntersect disables intersecting rReg with the Window's paint region @@ -391,7 +391,7 @@ public: void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); protected: - //////////////////////////////////////////////////////////////////////////////////////////////////// + // used to paint the form layer after the PreRender device is flushed (painted) to the window. void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index ad026128e385..d2fd7799e2dd 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -27,7 +27,7 @@ class XLineAttrSetItem; class XFillAttrSetItem; -//////////////////////////////////////////////////////////////////////////////////////////////////// + class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool { diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 6c290cf96137..879a72423b03 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -262,8 +262,6 @@ public: long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Begriffsdefinition: // - Etwas fangen=Gefangen werden kann z.B. der Mauszeiger oder die z.Zt. im // Drag befindlichen markierten Objekte. @@ -306,8 +304,6 @@ public: // // Beim Resize, ... wird immer nur der logisch-umschliessende Rahmen der // markierten Objekte gefangen. -// -//////////////////////////////////////////////////////////////////////////////////////////////////// #endif // INCLUDED_SVX_SVDSNPV_HXX diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 150d29a3dd73..e049b5b96294 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -25,7 +25,7 @@ #include <svx/svxdllapi.h> -//////////////////////////////////////////////////////////////////////////////////////////////////// + /* Deklaration eines statischen Mengentyps. Die Menge kann die Elemente 0..255 aufnehmen und verbraucht stets 32 Bytes. diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 8a36426f5561..f228a69fdec3 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <tools/weakbase.hxx> -// -------------------------------------------------------------------- + class OutlinerParaObject; class SdrOutliner; diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index c275e81399f4..3cd736c63233 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -28,7 +28,7 @@ #include <vcl/field.hxx> #include <vcl/mapmod.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// + // Winkelangaben der DrawingEngine sind 1/100 Degree // #i19054# nowhere used, removed // const int nWinkDiv=100; @@ -295,7 +295,7 @@ public: static OUString GetUnitStr(FieldUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_SVX_SVDTRANS_HXX diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index b02f1204152d..c51e77ed3e33 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -394,7 +394,7 @@ public: virtual OUString GetComment() const; }; -////////////////////////////////////////////////////////////////////////////// + // #i11702# class SVX_DLLPUBLIC SdrUndoObjectLayerChange : public SdrUndoObj @@ -725,7 +725,7 @@ public: virtual OUString GetComment() const; }; -/////////////////////////////////////////////////////////////////////// + /** * The SdrUndoFactory can be set and retrieved from the SdrModel. diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 3fe604ddf27a..3da285411b55 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -31,8 +31,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Klassenhierarchie der View: // SfxListener // SdrPaintView PntV Action ModChg Attr Notify @@ -50,8 +48,6 @@ // // SdrCreateView CrtV Action // SdrView View -// -//////////////////////////////////////////////////////////////////////////////////////////////////// class SvxURLField; @@ -258,8 +254,6 @@ public: #endif // INCLUDED_SVX_SVDVIEW_HXX -//////////////////////////////////////////////////////////////////////////////////////////////////// -// // Die App macht sich zunaechst ein SdrModel. // Anschliessend oeffnet sie ein Win und erzeugt dann eine SdrView. // An der SdrView meldet sie dann mit der Methode ShowSdrPage() eine Seite an. @@ -299,7 +293,5 @@ public: // ~~~~~~~~~~ // Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; // OUString GetStatusText(); -// -///////////////////////////////////////////////////////////////////////////////////////////////// */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index f5c7a85711b1..22aa67014ddc 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -325,7 +325,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; -////////////////////////////////////////////////////////////////////////////// + // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed class Svx3DSmoothNormalsItem : public SfxBoolItem { public: diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index a845b693a1c1..a67f349e1839 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -80,7 +80,7 @@ class AbstractSvxZoomDialog : public VclAbstractDialog virtual const SfxItemSet* GetOutputItemSet() const = 0 ; }; -class AbstractSpellDialog : public VclAbstractDialog // +class AbstractSpellDialog : public VclAbstractDialog { public: virtual void SetLanguage( sal_uInt16 nLang ) = 0; diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 1e3f829dc5b4..ae66d26b5e79 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -32,9 +32,9 @@ #undef SID_INSERT_FRAME #endif -// -------------------------------------------------------------------------- + // Member-Id's -// -------------------------------------------------------------------------- + #define MID_APPFLAG 0x20 #define MID_AUTOBREAK 0x21 @@ -88,23 +88,23 @@ #define MID_ZOOMSLIDER_MINZOOM 0x7b #define MID_ZOOMSLIDER_MAXZOOM 0x7c -// -------------------------------------------------------------------------- + // Event-Id's Block 1 -// -------------------------------------------------------------------------- + #define SVX_EVENT_COLUM_WINDOW_EXECUTE (EVENT_SVX_START) -// -------------------------------------------------------------------------- + // Event-Id's Block 2 -// -------------------------------------------------------------------------- + #define SVX_EVENT_IMAGE_LOAD (SID_LIB_START) #define SVX_EVENT_IMAGE_ABORT (SID_LIB_START + 1) #define SVX_EVENT_IMAGE_ERROR (SID_LIB_START + 2) -// -------------------------------------------------------------------------- + // Function-Id's -// -------------------------------------------------------------------------- + // Function-Id's #define FID_SVX_START (SID_LIB_START + 500) @@ -118,9 +118,9 @@ #define FID_SEARCH_SEARCHSET (FID_SVX_START + 4) #define FID_SEARCH_REPLACESET (FID_SVX_START + 5) -// -------------------------------------------------------------------------- + // SFX-Id's -// -------------------------------------------------------------------------- + #define SID_POLY_MERGE (SID_SFX_START + 679) #define SID_POLY_SUBSTRACT (SID_SFX_START + 680) @@ -128,9 +128,9 @@ #define SID_POLY_FORMEN (SID_SFX_START + 682) #define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) -// -------------------------------------------------------------------------- + // Basic IDE-Id's -// -------------------------------------------------------------------------- + #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) @@ -174,17 +174,17 @@ #define SID_BASICIDE_IMAGESTART ( SID_BASICIDE_START + 50 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) -// -------------------------------------------------------------------------- + // StarBase-Id's -// -------------------------------------------------------------------------- + #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // Daten in Felder #define SID_SBA_BRW_INSERT (SID_SBA_START+101) // Daten in Text #define SID_SBA_BRW_MERGE (SID_SBA_START+102) // Serienbrief -// -------------------------------------------------------------------------- + // SD-Id's -// -------------------------------------------------------------------------- + #define SID_RULER (SID_SD_START+40) #define SID_BEZIER_CONVERT (SID_SD_START+65) @@ -232,9 +232,9 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) -// -------------------------------------------------------------------------- + // Writer-Id's -// -------------------------------------------------------------------------- + #define FN_EDIT (SID_SW_START + 100) #define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */ #define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit Bullets an */ @@ -267,12 +267,12 @@ #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) -// -------------------------------------------------------------------------- + // Svx-Id's // When adding new entries here, note that other SID_SVX_START entries exist in // include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the // same id for two different attributes -// -------------------------------------------------------------------------- + #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) @@ -963,9 +963,9 @@ // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_ATTR_BORDER_STYLES + 1) -// -------------------------------------------------------------------------- + // Overflow check for slot IDs -// -------------------------------------------------------------------------- + #if SID_SVX_FIRSTFREE > SID_SVX_END #error Resource-Ueberlauf in #line, #file diff --git a/include/svx/sxallitm.hxx b/include/svx/sxallitm.hxx index 730576529e04..95ebc0ff8d43 100644 --- a/include/svx/sxallitm.hxx +++ b/include/svx/sxallitm.hxx @@ -22,36 +22,36 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrAllPositionXItem -//------------------------------ + class SdrAllPositionXItem: public SdrMetricItem { public: SdrAllPositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX,nPosX) {} SdrAllPositionXItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLPOSITIONX,rIn) {} }; -//------------------------------ + // class SdrAllPositionYItem -//------------------------------ + class SdrAllPositionYItem: public SdrMetricItem { public: SdrAllPositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY,nPosY) {} SdrAllPositionYItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLPOSITIONY,rIn) {} }; -//------------------------------ + // class SdrAllSizeWidthItem -//------------------------------ + class SdrAllSizeWidthItem: public SdrMetricItem { public: SdrAllSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,nWdt) {} SdrAllSizeWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,rIn) {} }; -//------------------------------ + // class SdrAllSizeWidthItem -//------------------------------ + class SdrAllSizeHeightItem: public SdrMetricItem { public: SdrAllSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_ALLSIZEHEIGHT,nHgt) {} diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index c1eacf718f5a..9dac27b82f0b 100644 --- a/include/svx/sxcaitm.hxx +++ b/include/svx/sxcaitm.hxx @@ -24,23 +24,23 @@ #include <svx/sdangitm.hxx> #include <svx/sdooitm.hxx> -//------------------------------------ + // class SdrCaptionFixedAngleItem // sal_True=Winkel durch SdrCaptionAngleItem vorgegeben // sal_False=Freier Winkel -//------------------------------------ + class SdrCaptionFixedAngleItem: public SdrOnOffItem { public: SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {} }; -//------------------------------ + // class SdrCaptionAngleItem // Winkelangabe in 1/100 Degree // Nur bei Type2, Type3 und Type4 // und nur wenn SdrCaptionIsFixedAngleItem=TRUE -//------------------------------ + class SdrCaptionAngleItem: public SdrAngleItem { public: SdrCaptionAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {} diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 3812017feae8..af4e816db746 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -27,9 +27,9 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBESTFIT}; -//------------------------------ + // class SdrCaptionEscDirItem -//------------------------------ + class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem { public: TYPEINFO(); @@ -45,37 +45,37 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------------ + // class SdrCaptionEscIsRelItem // sal_True=Linienaustrittsposition relativ // sal_False=Linienaustrittsposition absolut -//------------------------------------ + class SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {} }; -//------------------------------------ + // class SdrCaptionEscRelItem // Relativer Linienaustritt // 0 = 0.00% = oben bzw. links, // 10000 = 100.00% = rechts bzw. unten // nur wenn SdrCaptionEscIsRelItem=TRUE -//------------------------------------ + class SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} SdrCaptionEscRelItem(SvStream& rIn) : SfxInt32Item(SDRATTR_CAPTIONESCREL,rIn) {} }; -//------------------------------------ + // class SdrCaptionEscAbsItem // Absoluter Linienaustritt // 0 = oben bzw. links, // >0 = in Richtung rechts bzw. unten // nur wenn SdrCaptionEscIsRelItem=FALSE -//------------------------------------ + class SdrCaptionEscAbsItem: public SdrMetricItem { public: SdrCaptionEscAbsItem(long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} diff --git a/include/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx index cb611d0ef35b..1ce901e7eb3b 100644 --- a/include/svx/sxciaitm.hxx +++ b/include/svx/sxciaitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -//------------------------------ + // class SdrCircStartAngleItem -//------------------------------ + class SdrCircStartAngleItem: public SdrAngleItem { public: SdrCircStartAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CIRCSTARTANGLE,nAngle) {} SdrCircStartAngleItem(SvStream& rIn): SdrAngleItem(SDRATTR_CIRCSTARTANGLE,rIn) {} }; -//------------------------------ + // class SdrCircEndAngleItem -//------------------------------ + class SdrCircEndAngleItem: public SdrAngleItem { public: SdrCircEndAngleItem(long nAngle=36000): SdrAngleItem(SDRATTR_CIRCENDANGLE,nAngle) {} diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 9b674a4ef01a..a8233cee25e8 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -23,24 +23,24 @@ #include <svx/sdynitm.hxx> #include <svx/sdmetitm.hxx> -//------------------------------------ + // class SdrCaptionLineLenItem // Laenge der ersten Austrittslinie // Nur bei Type3 und Type4 // Nur relevant, wenn SdrCaptionFitLineLenItem=FALSE -//------------------------------------ + class SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} SdrCaptionLineLenItem(SvStream& rIn) : SdrMetricItem(SDRATTR_CAPTIONLINELEN,rIn) {} }; -//------------------------------------ + // class SdrCaptionFitLineLenItem // Laenge der ersten Austrittslinie automatisch berechnen oder // Vorgabe (SdrCaptionLineLenItem) verwenden. // Nur bei Type3 und Type4 -//------------------------------------ + class SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index c081c466d7fa..c7ead86ea3db 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -25,9 +25,9 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; -//------------------------------ + // class SdrCaptionTypeItem -//------------------------------ + class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 1b8a2b6af651..30ce02a68666 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -29,9 +29,9 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES, SDREDGE_BEZIER, SDREDGE_ARC}; -//------------------------------ + // class SdrEdgeKindItem -//------------------------------ + class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxlayitm.hxx b/include/svx/sxlayitm.hxx index 40a88891b495..cff0f7914fe7 100644 --- a/include/svx/sxlayitm.hxx +++ b/include/svx/sxlayitm.hxx @@ -24,9 +24,9 @@ #include <svl/intitem.hxx> #include <svx/svdtypes.hxx> -//------------------------------ + // class SdrLayerIdItem -//------------------------------ + class SdrLayerIdItem: public SfxUInt16Item { public: SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} @@ -34,9 +34,9 @@ public: SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); } }; -//------------------------------ + // class SdrLayerNameItem -//------------------------------ + class SdrLayerNameItem: public SfxStringItem { public: diff --git a/include/svx/sxlogitm.hxx b/include/svx/sxlogitm.hxx index aeb65a257d00..dbf87753cf13 100644 --- a/include/svx/sxlogitm.hxx +++ b/include/svx/sxlogitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrLogicSizeWidthItem -//------------------------------ + class SdrLogicSizeWidthItem: public SdrMetricItem { public: SdrLogicSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,nWdt) {} SdrLogicSizeWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,rIn) {} }; -//------------------------------ + // class SdrLogicSizeWidthItem -//------------------------------ + class SdrLogicSizeHeightItem: public SdrMetricItem { public: SdrLogicSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_LOGICSIZEHEIGHT,nHgt) {} diff --git a/include/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx index 607ba62cb834..afc0f24abcd2 100644 --- a/include/svx/sxmkitm.hxx +++ b/include/svx/sxmkitm.hxx @@ -24,9 +24,9 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. -//------------------------------ + // class SdrMeasureKindItem (n.i.) -//------------------------------ + class SdrMeasureKindItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxmovitm.hxx b/include/svx/sxmovitm.hxx index 7c377fc2fb44..551e51252aa4 100644 --- a/include/svx/sxmovitm.hxx +++ b/include/svx/sxmovitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrMoveXItem -//------------------------------ + class SdrMoveXItem: public SdrMetricItem { public: SdrMoveXItem(long n=0): SdrMetricItem(SDRATTR_MOVEX,n) {} SdrMoveXItem(SvStream& rIn): SdrMetricItem(SDRATTR_MOVEX,rIn) {} }; -//------------------------------ + // class SdrMoveYItem -//------------------------------ + class SdrMoveYItem: public SdrMetricItem { public: SdrMoveYItem(long n=0): SdrMetricItem(SDRATTR_MOVEY,n) {} diff --git a/include/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx index 03d09bd402c0..6cfd5b2ca752 100644 --- a/include/svx/sxmspitm.hxx +++ b/include/svx/sxmspitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> -//------------------------------ + // class SdrMoveProtectItem -//------------------------------ + class SdrObjMoveProtectItem: public SdrYesNoItem { public: SdrObjMoveProtectItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,bOn) {} SdrObjMoveProtectItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,rIn) {} }; -//------------------------------ + // class SdrSizeProtectItem -//------------------------------ + class SdrObjSizeProtectItem: public SdrYesNoItem { public: SdrObjSizeProtectItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJSIZEPROTECT,bOn) {} diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 2a98ad941a74..824278ae70eb 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -26,9 +26,9 @@ enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BREAKEDLINE,SDRMEASURE_BELOW,SDRMEASURETEXT_VERTICALCENTERED}; -//------------------------------ + // class SdrMeasureTextHPosItem -//------------------------------ + class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: TYPEINFO(); @@ -46,9 +46,9 @@ public: virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; -//------------------------------ + // class SdrMeasureTextVPosItem -//------------------------------ + class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: TYPEINFO(); diff --git a/include/svx/sxoneitm.hxx b/include/svx/sxoneitm.hxx index 08d183bc39ac..5249345ca7cb 100644 --- a/include/svx/sxoneitm.hxx +++ b/include/svx/sxoneitm.hxx @@ -22,36 +22,36 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrOnePositionXItem -//------------------------------ + class SdrOnePositionXItem: public SdrMetricItem { public: SdrOnePositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX,nPosX) {} SdrOnePositionXItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONEPOSITIONX,rIn) {} }; -//------------------------------ + // class SdrOnePositionYItem -//------------------------------ + class SdrOnePositionYItem: public SdrMetricItem { public: SdrOnePositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY,nPosY) {} SdrOnePositionYItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONEPOSITIONY,rIn) {} }; -//------------------------------ + // class SdrOneSizeWidthItem -//------------------------------ + class SdrOneSizeWidthItem: public SdrMetricItem { public: SdrOneSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH,nWdt) {} SdrOneSizeWidthItem(SvStream& rIn): SdrMetricItem(SDRATTR_ONESIZEWIDTH,rIn) {} }; -//------------------------------ + // class SdrOneSizeWidthItem -//------------------------------ + class SdrOneSizeHeightItem: public SdrMetricItem { public: SdrOneSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_ONESIZEHEIGHT,nHgt) {} diff --git a/include/svx/sxopitm.hxx b/include/svx/sxopitm.hxx index b12ab64670a6..72bd6ec99be4 100644 --- a/include/svx/sxopitm.hxx +++ b/include/svx/sxopitm.hxx @@ -22,9 +22,9 @@ #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> -//------------------------------ + // class SdrObjPrintableItem -//------------------------------ + class SdrObjPrintableItem: public SdrYesNoItem { public: SdrObjPrintableItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn) {} diff --git a/include/svx/sxreaitm.hxx b/include/svx/sxreaitm.hxx index 686dc98ea797..9dd78ac68682 100644 --- a/include/svx/sxreaitm.hxx +++ b/include/svx/sxreaitm.hxx @@ -23,9 +23,9 @@ #include <svx/sxfiitm.hxx> -//------------------------------ + // class SdrResizeXAllItem -//------------------------------ + class SdrResizeXAllItem: public SdrFractionItem { public: SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} @@ -33,9 +33,9 @@ public: SdrResizeXAllItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXALL,rIn) {} }; -//------------------------------ + // class SdrResizeYAllItem -//------------------------------ + class SdrResizeYAllItem: public SdrFractionItem { public: SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} diff --git a/include/svx/sxreoitm.hxx b/include/svx/sxreoitm.hxx index 3b507c7b1ff3..2d664a1b57b2 100644 --- a/include/svx/sxreoitm.hxx +++ b/include/svx/sxreoitm.hxx @@ -23,9 +23,9 @@ #include <svx/sxfiitm.hxx> -//------------------------------ + // class SdrResizeXOneItem -//------------------------------ + class SdrResizeXOneItem: public SdrFractionItem { public: SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} @@ -33,9 +33,9 @@ public: SdrResizeXOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXONE,rIn) {} }; -//------------------------------ + // class SdrResizeYOneItem -//------------------------------ + class SdrResizeYOneItem: public SdrFractionItem { public: SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} diff --git a/include/svx/sxsalitm.hxx b/include/svx/sxsalitm.hxx index 9ced5fe85c98..fe5f665444c3 100644 --- a/include/svx/sxsalitm.hxx +++ b/include/svx/sxsalitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -//------------------------------ + // class SdrHorzShearAllItem -//------------------------------ + class SdrHorzShearAllItem: public SdrAngleItem { public: SdrHorzShearAllItem(long nAngle=0): SdrAngleItem(SDRATTR_HORZSHEARALL,nAngle) {} SdrHorzShearAllItem(SvStream& rIn): SdrAngleItem(SDRATTR_HORZSHEARALL,rIn) {} }; -//------------------------------ + // class SdrVertShearAllItem -//------------------------------ + class SdrVertShearAllItem: public SdrAngleItem { public: SdrVertShearAllItem(long nAngle=0): SdrAngleItem(SDRATTR_VERTSHEARALL,nAngle) {} diff --git a/include/svx/sxsoitm.hxx b/include/svx/sxsoitm.hxx index 17745902fa1a..1a63c9305ae6 100644 --- a/include/svx/sxsoitm.hxx +++ b/include/svx/sxsoitm.hxx @@ -22,18 +22,18 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -//------------------------------ + // class SdrHorzShearOneItem -//------------------------------ + class SdrHorzShearOneItem: public SdrAngleItem { public: SdrHorzShearOneItem(long nAngle=0): SdrAngleItem(SDRATTR_HORZSHEARONE,nAngle) {} SdrHorzShearOneItem(SvStream& rIn): SdrAngleItem(SDRATTR_HORZSHEARONE,rIn) {} }; -//------------------------------ + // class SdrVertShearOneItem -//------------------------------ + class SdrVertShearOneItem: public SdrAngleItem { public: SdrVertShearOneItem(long nAngle=0): SdrAngleItem(SDRATTR_VERTSHEARONE,nAngle) {} diff --git a/include/svx/sxtraitm.hxx b/include/svx/sxtraitm.hxx index d46faa1f6249..59bb5970ef45 100644 --- a/include/svx/sxtraitm.hxx +++ b/include/svx/sxtraitm.hxx @@ -22,36 +22,36 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -//------------------------------ + // class SdrTransformRef1XItem -//------------------------------ + class SdrTransformRef1XItem: public SdrMetricItem { public: SdrTransformRef1XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X,nHgt) {} SdrTransformRef1XItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF1X,rIn) {} }; -//------------------------------ + // class SdrTransformRef1YItem -//------------------------------ + class SdrTransformRef1YItem: public SdrMetricItem { public: SdrTransformRef1YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt) {} SdrTransformRef1YItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,rIn) {} }; -//------------------------------ + // class SdrTransformRef2XItem -//------------------------------ + class SdrTransformRef2XItem: public SdrMetricItem { public: SdrTransformRef2XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X,nHgt) {} SdrTransformRef2XItem(SvStream& rIn): SdrMetricItem(SDRATTR_TRANSFORMREF2X,rIn) {} }; -//------------------------------ + // class SdrTransformRef2YItem -//------------------------------ + class SdrTransformRef2YItem: public SdrMetricItem { public: SdrTransformRef2YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y,nHgt) {} diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index a5d7ee6c8282..f4de176b9614 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -162,11 +162,11 @@ namespace svx { class ToolboxButtonColorUpdater; } -//######################################################################## -//======================================================================== + + // class SvxStyleToolBoxControl ------------------------------------------ -//======================================================================== + class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl { struct Impl; @@ -215,9 +215,9 @@ friend class SfxStyleControllerItem_Impl; SVX_DLLPRIVATE SfxStyleFamily GetActFamily (); }; -//======================================================================== + // class SvxFontNameToolBoxControl --------------------------------------- -//======================================================================== + class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl @@ -233,9 +233,9 @@ public: -//======================================================================== + // class SvxFontColorToolBoxControl -------------------------------------- -//======================================================================== + @@ -257,9 +257,9 @@ public: -//======================================================================== + // class SvxColorExtToolBoxControl -------------------------------------- -//======================================================================== + @@ -286,9 +286,9 @@ public: -//======================================================================== + // class SvxColorToolBoxControl ------------------------------------------ -//======================================================================== + class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl @@ -308,9 +308,9 @@ public: -//======================================================================== + // class SvxFrameToolBoxControl ------------------------------------------ -//======================================================================== + class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl @@ -328,9 +328,9 @@ public: -//======================================================================== + // class SvxLineStyleToolBoxControl -------------------------------------- -//======================================================================== + class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl @@ -347,9 +347,9 @@ public: -//======================================================================== + // class SvxFrameLineColorToolBoxControl --------------------------------- -//======================================================================== + class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx index eaa8413b970c..23467408d489 100644 --- a/include/svx/tbxcolor.hxx +++ b/include/svx/tbxcolor.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <svx/svxdllapi.h> -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ToolboxAccess - //==================================================================== + class SVX_DLLPUBLIC ToolboxAccess { private: @@ -55,9 +55,9 @@ namespace svx inline void forceDocking() { m_bDocking = true; } }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_TBXCOLOR_HXX diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 4c6b87815e9e..343d0fe768f5 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -28,14 +28,14 @@ class ToolBox; class VirtualDevice; -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= ToolboxButtonColorUpdater - //==================================================================== + /** helper class to update a color in a toolbox button image formerly known as SvxTbxButtonColorUpdater_Impl, residing in svx/source/tbxctrls/colorwindow.hxx. @@ -60,9 +60,9 @@ namespace svx bool mbWasHiContrastMode; }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_TBXCOLORUPDATE_HXX diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index 6b5e88805089..fde0c81fe0d0 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -25,9 +25,9 @@ #include <tools/resary.hxx> -//======================================================================== + // class SvxTextEncodingTable -//======================================================================== + class SVX_DLLPUBLIC SvxTextEncodingTable : public ResStringArray { diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 883a8aace267..cd6b5bfffd16 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -23,7 +23,7 @@ #include <svx/svxids.hrc> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------- + class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item { @@ -48,7 +48,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer }; -//------------------------------------------------------------------------ + #endif diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx index 073d2080dfde..ea7966a4afd0 100644 --- a/include/svx/wrapfield.hxx +++ b/include/svx/wrapfield.hxx @@ -25,7 +25,7 @@ namespace svx { -// ============================================================================ + /** A numeric spin field that wraps around the value on limits. @descr Note: Use type "NumericField" in resources. */ @@ -41,7 +41,7 @@ protected: virtual void Down(); }; -// ============================================================================ + } // namespace svx diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index bbfcf7b08219..d2729dc772d3 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -27,13 +27,13 @@ class SdrModel; class BitmapColor; -////////////////////////////////////////////////////////////////////////////// + // helper to construct historical 8x8 bitmaps with two colors Bitmap SVX_DLLPUBLIC createHistorical8x8FromArray(const sal_uInt16* pArray, Color aColorPix, Color aColorBack); bool SVX_DLLPUBLIC isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront); -////////////////////////////////////////////////////////////////////////////// + // class XFillBitmapItem class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 0ed9e49bdfe8..0ba0ea7a0410 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -27,9 +27,9 @@ class XColorList; -//----------------- + // class XColorItem -//----------------- + class SVX_DLLPUBLIC XColorItem : public NameOrIndex { Color aColor; diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx index a92ce638b205..837f64a7b3f9 100644 --- a/include/svx/xdash.hxx +++ b/include/svx/xdash.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SVX_XDASH_HXX #define INCLUDED_SVX_XDASH_HXX -//------------- + // class XDash -//------------- + #include <svx/xenum.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 3b6cca667dc1..a4d3336f56f7 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -26,9 +26,9 @@ #include <svx/xenum.hxx> #include <svx/svxdllapi.h> -//--------------------- + // class XFillStyleItem -//--------------------- + class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem { diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index cccd32fbf67b..34784616108b 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -27,9 +27,9 @@ // Fuellattribute //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -//--------------------- + // class XFillColorItem -//--------------------- + class SVX_DLLPUBLIC XFillColorItem : public XColorItem { public: diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 8db65315aa10..55c9a201a3e6 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -23,9 +23,9 @@ #include <svx/xflgrit.hxx> #include <svx/svxdllapi.h> -//----------------------------------- + // class XFillFloatTransparenceItem - -//----------------------------------- + class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem { diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 592e11033549..34152b122310 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//------------------------ + // class XFillGradientItem -//------------------------ + class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex { XGradient aGradient; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 6b5115daf43c..84be34942e7d 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//--------------------- + // class XFillHatchItem -//--------------------- + class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex { XHatch aHatch; diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx index 1df95ee575ef..30c1741f31eb 100644 --- a/include/svx/xgrad.hxx +++ b/include/svx/xgrad.hxx @@ -26,9 +26,9 @@ class Gradient; -//----------------- + // class XGradient -//----------------- + class SVX_DLLPUBLIC XGradient { diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx index 0f5a0e1b9526..9dc725d84354 100644 --- a/include/svx/xhatch.hxx +++ b/include/svx/xhatch.hxx @@ -24,9 +24,9 @@ #include <tools/color.hxx> #include <svx/svxdllapi.h> -//-------------- + // class XHatch -//-------------- + class SVX_DLLPUBLIC XHatch { diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index e314154f67eb..337467971ad4 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -32,9 +32,9 @@ class NameOrIndex; typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); -//------------------- + // class NameOrIndex -//------------------- + class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem { sal_Int32 nPalIndex; diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index c2106a00305e..d202d7f1a10d 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -22,9 +22,9 @@ #include <svx/xenum.hxx> #include <svl/eitem.hxx> -//--------------------- + // class LineStyleItem -//--------------------- + #include <svx/svxdllapi.h> class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 462e797a6a65..5feb31837809 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -25,9 +25,9 @@ #include <svx/svxdllapi.h> #include <com/sun/star/drawing/LineJoint.hpp> -//--------------------- + // class XLineJointItem -//--------------------- + class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem { diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index a2c14af45cab..335cd5d8307b 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -25,9 +25,9 @@ #include <svx/xenum.hxx> #include <com/sun/star/drawing/LineCap.hpp> -//--------------------- + // class XLineCapItem -//--------------------- + class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem { diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 3ca6a873cea3..d6bafc4c9b2f 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -23,9 +23,9 @@ #include <svx/xcolit.hxx> #include <svx/svxdllapi.h> -//--------------------- + // class XLineColorItem -//--------------------- + class SVX_DLLPUBLIC XLineColorItem : public XColorItem { public: diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index bf4c63ced38c..21809d5ad9fe 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -27,9 +27,9 @@ class SdrModel; -//-------------------- + // class XLineDashItem -//-------------------- + class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex { XDash aDash; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 13f622891e98..8ef4e4eaf3f5 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -23,9 +23,9 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//---------------------------- + // class XLineEndCenterItem -//---------------------------- + class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index e5e3ff1b22fd..5c53f801c5d9 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//---------------------- + // class XLineEndItem -//---------------------- + class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex { basegfx::B2DPolyPolygon maPolyPolygon; diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index c5775c4d5358..fd272c14ff4d 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -25,9 +25,9 @@ #define LINE_END_WIDTH_DEFAULT (200) -//--------------------------- + // class XLineEndWidthItem -//--------------------------- + class SVX_DLLPUBLIC XLineEndWidthItem : public SfxMetricItem { diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index e289311577c2..0ac4b0917402 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -23,9 +23,9 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -//------------------------------ + // class XLineStartCenterItem -//------------------------------ + class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index e784ff5380da..66275c61faf7 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -26,9 +26,9 @@ class SdrModel; -//------------------------ + // class XLineStartItem -//------------------------ + class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex { basegfx::B2DPolyPolygon maPolyPolygon; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index d663411820cf..0db83c5c4559 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -25,9 +25,9 @@ #define LINE_START_WIDTH_DEFAULT (200) -//----------------------------- + // class XLineStartWidthItem -//----------------------------- + class SVX_DLLPUBLIC XLineStartWidthItem : public SfxMetricItem { public: diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 69495224273c..d819adaee8a0 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -23,9 +23,9 @@ #include <svl/metitem.hxx> #include <svx/svxdllapi.h> -//--------------------- + // class XLineWidthItem -//--------------------- + class SVX_DLLPUBLIC XLineWidthItem : public SfxMetricItem { public: diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index c8935d83be25..2773d8ef3260 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -30,9 +30,9 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svxdllapi.h> -// ----------------------------- + // - SvXMLEmbeddedObjectHelper - -// ----------------------------- + enum SvXMLEmbeddedObjectHelperMode { @@ -40,9 +40,9 @@ enum SvXMLEmbeddedObjectHelperMode EMBEDDEDOBJECTHELPER_MODE_WRITE = 1 }; -// ----------------------------- + // - SvXMLEmbeddedObjectHelper - -// ----------------------------- + namespace comphelper { class IEmbeddedHelper; diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 64de636dc1bb..441aac77d26e 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -34,15 +34,15 @@ namespace com { } } -//........................................................................ + namespace svx { -//........................................................................ - //==================================================================== + + //= OXFormsDescriptor - //==================================================================== + struct SVX_DLLPUBLIC OXFormsDescriptor { @@ -60,9 +60,9 @@ namespace svx } }; - //==================================================================== + //= OXFormsTransferable - //==================================================================== + class SVX_DLLPUBLIC OXFormsTransferable : public TransferableHelper { protected: @@ -85,9 +85,9 @@ namespace svx }; -//........................................................................ + } // namespace svx -//........................................................................ + #endif // INCLUDED_SVX_XMLEXCHG_HXX diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 35b1219689a8..7cd55a33fac2 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -22,9 +22,9 @@ #include <svx/xcolit.hxx> -//------------------------------ + // class XSecondaryFillColorItem -//------------------------------ + class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem { public: diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 71f0db76e78b..791583da7ed2 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -51,9 +51,9 @@ extern sal_Unicode pszStandard[]; // "standard" // enum COL_NAME nicht verglichen werden kann. SVX_DLLPUBLIC Color RGB_Color( ColorData nColorName ); -// ------------------ + // class XColorEntry -// ------------------ + class SVX_DLLPUBLIC XColorEntry : public XPropertyEntry { @@ -70,9 +70,9 @@ public: } }; -// -------------------- + // class XLineEndEntry -// -------------------- + class SVX_DLLPUBLIC XLineEndEntry : public XPropertyEntry { @@ -89,9 +89,9 @@ public: } }; -// ------------------ + // class XDashEntry -// ------------------ + class SVX_DLLPUBLIC XDashEntry : public XPropertyEntry { @@ -108,9 +108,9 @@ public: } }; -// ------------------ + // class XHatchEntry -// ------------------ + class SVX_DLLPUBLIC XHatchEntry : public XPropertyEntry { @@ -127,9 +127,9 @@ public: } }; -// --------------------- + // class XGradientEntry -// --------------------- + class SVX_DLLPUBLIC XGradientEntry : public XPropertyEntry { @@ -146,9 +146,9 @@ public: } }; -// --------------------- + // class XBitmapEntry -// --------------------- + class SVX_DLLPUBLIC XBitmapEntry : public XPropertyEntry { @@ -165,9 +165,9 @@ public: } }; -// -------------------- + // class XPropertyList -// -------------------- + enum XPropertyListType { XCOLOR_LIST, @@ -272,9 +272,9 @@ public: inline XGradientListRef AsGradientList(); }; -// ------------------ + // class XColorList -// ------------------ + class SVX_DLLPUBLIC XColorList : public XPropertyList { @@ -298,9 +298,9 @@ public: static XColorListRef GetStdColorList(); // returns a singleton }; -// ------------------- + // class XLineEndList -// ------------------- + class SVX_DLLPUBLIC XLineEndList : public XPropertyList { @@ -319,9 +319,9 @@ public: virtual bool Create(); }; -// ------------------- + // class XDashList -// ------------------- + class SVX_DLLPUBLIC XDashList : public XPropertyList { @@ -358,9 +358,9 @@ public: OUString GetStringForUiNoLine() const; }; -// ------------------- + // class XHatchList -// ------------------- + class SVX_DLLPUBLIC XHatchList : public XPropertyList { @@ -381,9 +381,9 @@ public: virtual bool Create(); }; -// ------------------- + // class XGradientList -// ------------------- + class SVX_DLLPUBLIC XGradientList : public XPropertyList { protected: @@ -403,9 +403,9 @@ public: virtual bool Create(); }; -// ------------------- + // class XBitmapList -// ------------------- + class SVX_DLLPUBLIC XBitmapList : public XPropertyList { diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index ff881917bc4b..6aa2ca8afb17 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <svx/svxdllapi.h> -//------------------------------------------------------------------------- + class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { @@ -53,7 +53,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; -//------------------------------------------------------------------------ + #endif diff --git a/include/systools/win32/comptr.hxx b/include/systools/win32/comptr.hxx index 7ef5123f3ac5..417796e8f4bb 100644 --- a/include/systools/win32/comptr.hxx +++ b/include/systools/win32/comptr.hxx @@ -31,7 +31,7 @@ class ComPtr { public: - //--------------------------------------------------------------------- + /** initialize com ptr with null. */ ComPtr() @@ -39,7 +39,7 @@ class ComPtr m_pInterface = NULL; } - //--------------------------------------------------------------------- + /** initialize com ptr with given interface. */ ComPtr(T_INTERFACE* pInterface) @@ -49,7 +49,7 @@ class ComPtr m_pInterface->AddRef(); } - //--------------------------------------------------------------------- + /** copy ctor. */ ComPtr(const ComPtr< T_INTERFACE, P_IID, P_CLSID >& aCopy) @@ -59,7 +59,7 @@ class ComPtr m_pInterface->AddRef(); } - //--------------------------------------------------------------------- + /** initialize object by quering external object for the right interface. */ ComPtr(IUnknown* pIUnknown) @@ -68,7 +68,7 @@ class ComPtr pIUnknown->QueryInterface(P_IID, (void**)&m_pInterface); } - //--------------------------------------------------------------------- + /** deinitialize com object right. */ ~ComPtr() @@ -78,37 +78,37 @@ class ComPtr public: - //--------------------------------------------------------------------- + HRESULT create() { return CoCreateInstance(P_CLSID, NULL, CLSCTX_ALL, P_IID, (void**)&m_pInterface); } - //--------------------------------------------------------------------- + operator T_INTERFACE*() const { return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE& operator*() const { return *m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE** operator&() { return &m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator->() const { return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator=(T_INTERFACE* pInterface) { if ( equals(pInterface) ) @@ -122,7 +122,7 @@ class ComPtr return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator=(IUnknown* pIUnknown) { if (pIUnknown) @@ -130,7 +130,7 @@ class ComPtr return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator=(const ComPtr< T_INTERFACE, P_IID, P_CLSID >& aCopy) { m_pInterface = aCopy.m_pInterface; @@ -140,13 +140,13 @@ class ComPtr return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* get() const { return m_pInterface; } - //--------------------------------------------------------------------- + void attach(T_INTERFACE* pInterface) { if (pInterface) @@ -156,7 +156,7 @@ class ComPtr } } - //--------------------------------------------------------------------- + T_INTERFACE* detach() { T_INTERFACE* pInterface = m_pInterface; @@ -164,7 +164,7 @@ class ComPtr return pInterface; } - //--------------------------------------------------------------------- + void release() { if (m_pInterface) @@ -175,7 +175,7 @@ class ComPtr } #ifndef __MINGW32__ - //--------------------------------------------------------------------- + template< class T_QUERYINTERFACE > HRESULT query(T_QUERYINTERFACE** pQuery) { @@ -183,20 +183,20 @@ class ComPtr } #endif - //--------------------------------------------------------------------- + HRESULT query(REFIID rIID , void** pQuery) { return m_pInterface->QueryInterface(rIID, pQuery); } - //--------------------------------------------------------------------- + HRESULT unknown(IUnknown** pQuery) { return m_pInterface->QueryInterface(IID_IUnknown, (void**)pQuery); } - //--------------------------------------------------------------------- + ::sal_Bool equals(IUnknown* pCheck) { if ( @@ -214,7 +214,7 @@ class ComPtr return bEquals; } - //--------------------------------------------------------------------- + ::sal_Bool is() { return (m_pInterface != 0); diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index fae461fe453d..0006e089fd89 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -30,14 +30,14 @@ #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... - //================================================================================================================== + + //= AnimatedImagesPeer - //================================================================================================================== + struct AnimatedImagesPeer_Data; typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow , ::com::sun::star::awt::XAnimation @@ -90,9 +90,9 @@ namespace toolkit ::boost::scoped_ptr< AnimatedImagesPeer_Data > m_pData; }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index b340efd49e1e..f2f2e060f653 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -23,7 +23,7 @@ #include <vcl/dialog.hxx> #include <vcl/scrbar.hxx> -//........................................................................ + namespace toolkit { class ScrollableInterface @@ -74,9 +74,9 @@ namespace toolkit // Window virtual void Resize(); }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index e6d44e25dae6..58a71293f918 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -45,9 +45,9 @@ class AccessibleStateSetHelper; } -// ---------------------------------------------------- + // class VCLXAccessibleComponent -// ---------------------------------------------------- + typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 6df90b1669e0..31c32c7d6002 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -29,9 +29,9 @@ #include <vcl/bitmapex.hxx> -// ---------------------------------------------------- + // class VCLXBitmap -// ---------------------------------------------------- + class VCLXBitmap : public ::com::sun::star::awt::XBitmap, public ::com::sun::star::awt::XDisplayBitmap, diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index e49a49c892fe..aeea9ca140ef 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -30,9 +30,9 @@ #include <toolkit/awt/vclxwindow.hxx> -// ---------------------------------------------------- + // class VCLXContainer -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXContainer : public ::com::sun::star::awt::XVclContainer, public ::com::sun::star::awt::XVclContainerPeer, diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index e28844e1492c..1657c14a97e7 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -32,9 +32,9 @@ class OutputDevice; class VirtualDevice; -// ---------------------------------------------------- + // class VCLXDevice -// ---------------------------------------------------- + // For using nDummy, no incompatible update, add a sal_Bool bCreatedWithToolkitMember later... #define FLAGS_CREATEDWITHTOOLKIT 0x00000001 @@ -98,9 +98,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXVirtualDevice -// ---------------------------------------------------- + class VCLXVirtualDevice : public VCLXDevice { diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index e77c38f3f28b..3d0f46a59976 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -29,9 +29,9 @@ #include <osl/mutex.hxx> #include <vcl/metric.hxx> -// ---------------------------------------------------- + // class VCLXFont -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXFont : public ::com::sun::star::awt::XFont2, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 1407bbb65625..9b6092715d07 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -43,9 +43,9 @@ class Region; #define INITOUTDEV_ALL 0xFFFF -// ---------------------------------------------------- + // class VCLXGraphics -// ---------------------------------------------------- + class VCLXGraphics : public ::com::sun::star::awt::XGraphics2, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index fdaa4c7570c4..63fab5e97694 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -45,9 +45,9 @@ typedef ::std::vector< css::uno::Reference< css::awt::XPopupMenu >* > PopupMenuRefList; -// ---------------------------------------------------- + // class VCLXMenu -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXMenu : public css::awt::XMenuBar, public css::awt::XPopupMenu, diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 757278db39b6..38c7f08f460d 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -29,9 +29,9 @@ #include <vcl/pointr.hxx> -// ---------------------------------------------------- + // class VCLXPointer -// ---------------------------------------------------- + class VCLXPointer : public ::com::sun::star::awt::XPointer, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index 395bdae56335..adf82e682879 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -45,9 +45,9 @@ sal_uInt16 Orientation; // PORTRAIT, LANDSCAPE */ -// ---------------------------------------------------- + // class VCLXPrinterPropertySet -// ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XPrinterPropertySet > VCLXPrinterPropertySet_Base; @@ -98,9 +98,9 @@ public: void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class VCLXPrinter -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper1 < VCLXPrinterPropertySet , ::com::sun::star::awt::XPrinter @@ -137,9 +137,9 @@ public: void SAL_CALL endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class VCLXInfoPrinter -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper1 < VCLXPrinterPropertySet , ::com::sun::star::awt::XInfoPrinter @@ -170,9 +170,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class VCLXPrinterServer -// ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XPrinterServer > VCLXPrinterServer_Base; diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 9bad42554973..6e6948f18709 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -29,9 +29,9 @@ #include <vcl/region.hxx> -// ---------------------------------------------------- + // class VCLXRegion -// ---------------------------------------------------- + class VCLXRegion : public ::com::sun::star::awt::XRegion, public ::com::sun::star::lang::XTypeProvider, diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 033d3b67c3c3..1743583a2d1a 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -25,14 +25,14 @@ #include <comphelper/uno3.hxx> #include <com/sun/star/awt/XSpinValue.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= VCLXSpinButton - //==================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XSpinValue > VCLXSpinButton_Base; @@ -84,9 +84,9 @@ namespace toolkit VCLXSpinButton& operator=( const VCLXSpinButton& ); // never implemented }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index 4aad076c81fb..e00e65660977 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -28,9 +28,9 @@ #include <toolkit/awt/vclxwindow.hxx> -// ---------------------------------------------------- + // class VCLXSystemDependendtWindow -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer, public VCLXWindow diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index 254359bb85e9..19b9d3ca7b54 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -33,7 +33,7 @@ #include <cppuhelper/implbase2.hxx> #include <toolkit/awt/vclxcontainer.hxx> -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2 < VCLXContainer , ::com::sun::star::awt::tab::XTabPageContainer , ::com::sun::star::container::XContainerListener diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 1b28ce0a266b..e37fb0314ec6 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -78,9 +78,9 @@ public: virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); }; -// ---------------------------------------------------- + // class VCLXTopWindow -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index ef3ea47d280a..399459a17649 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -57,9 +57,9 @@ namespace toolkit } -// ---------------------------------------------------- + // class VCLXWINDOW -// ---------------------------------------------------- + class UnoPropertyArrayHelper; class VCLXWindowImpl; diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 6c730fa69f0c..3ace6c255019 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -103,10 +103,10 @@ class ToolBox; class VclSimpleEvent; class VclMenuEvent; -// ---------------------------------------------------- + // class VCLXGraphicControl // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow @@ -142,9 +142,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXButton -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton @@ -191,9 +191,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXImageControl -// ---------------------------------------------------- + class VCLXImageControl : public VCLXGraphicControl { public: @@ -216,9 +216,9 @@ protected: virtual void ImplSetNewImage(); }; -// ---------------------------------------------------- + // class VCLXCheckBox -// ---------------------------------------------------- + class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, public ::com::sun::star::awt::XButton, public VCLXGraphicControl @@ -274,9 +274,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXRadioButton -// ---------------------------------------------------- + class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, public ::com::sun::star::awt::XButton, public VCLXGraphicControl @@ -332,9 +332,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXMessageBox -// ---------------------------------------------------- + class VCLXMessageBox : public ::com::sun::star::awt::XMessageBox, public VCLXTopWindow { @@ -366,9 +366,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFrame -// ---------------------------------------------------- + class VCLXFrame : public VCLXContainer { protected: @@ -402,9 +402,9 @@ public: -// ---------------------------------------------------- + // class VCLXDialog -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXDialog : public ::com::sun::star::awt::XDialog2, public VCLXTopWindow { @@ -445,9 +445,9 @@ public: }; -// ---------------------------------------------------- + // class VCLXTabPage -// ---------------------------------------------------- + class VCLXTabPage : public VCLXContainer { public: @@ -527,9 +527,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFixedHyperlink -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink : public ::com::sun::star::awt::XFixedHyperlink, public VCLXWindow @@ -582,9 +582,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFixedText -// ---------------------------------------------------- + class VCLXFixedText : public ::com::sun::star::awt::XFixedText, public VCLXWindow { @@ -619,9 +619,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXScrollBar -// ---------------------------------------------------- + class VCLXScrollBar : public ::com::sun::star::awt::XScrollBar, public VCLXWindow { @@ -680,9 +680,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXEdit -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXEdit : public ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextEditField, public ::com::sun::star::awt::XTextLayoutConstrains, @@ -748,9 +748,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXListBox -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow , ::com::sun::star::awt::XListBox , ::com::sun::star::awt::XTextLayoutConstrains @@ -825,9 +825,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXComboBox -// ---------------------------------------------------- + typedef ::cppu::ImplInheritanceHelper2 < VCLXEdit , ::com::sun::star::awt::XComboBox , ::com::sun::star::awt::XItemListListener > VCLXComboBox_Base; @@ -889,9 +889,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXSpinField -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXSpinField : public ::com::sun::star::awt::XSpinField, public VCLXEdit { @@ -927,9 +927,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXFormattedSpinField -// ---------------------------------------------------- + class VCLXFormattedSpinField : public VCLXSpinField { private: @@ -955,9 +955,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXDateField -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField, public VCLXFormattedSpinField { @@ -1003,9 +1003,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXTimeField -// ---------------------------------------------------- + class VCLXTimeField : public ::com::sun::star::awt::XTimeField, public VCLXFormattedSpinField { @@ -1048,9 +1048,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXNumericField -// ---------------------------------------------------- + class VCLXNumericField : public ::com::sun::star::awt::XNumericField, public VCLXFormattedSpinField { @@ -1093,9 +1093,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXMetricField -// ---------------------------------------------------- + class MetricFormatter; class MetricField; class VCLXMetricField : public ::com::sun::star::awt::XMetricField, @@ -1145,9 +1145,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXCurrencyField -// ---------------------------------------------------- + class VCLXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public VCLXFormattedSpinField { @@ -1191,9 +1191,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXPatternField -// ---------------------------------------------------- + class VCLXPatternField : public ::com::sun::star::awt::XPatternField, public VCLXFormattedSpinField { @@ -1227,9 +1227,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- + // class VCLXToolBox -// ---------------------------------------------------- + class VCLXToolBox : public VCLXWindow { private: diff --git a/include/toolkit/awt/xsimpleanimation.hxx b/include/toolkit/awt/xsimpleanimation.hxx index 786b4fa6e902..b41b81d23672 100644 --- a/include/toolkit/awt/xsimpleanimation.hxx +++ b/include/toolkit/awt/xsimpleanimation.hxx @@ -27,14 +27,14 @@ #include <boost/scoped_ptr.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= XSimpleAnimation - //==================================================================== + typedef ::cppu::ImplInheritanceHelper1 < VCLXWindow , ::com::sun::star::awt::XSimpleAnimation > XSimpleAnimation_Base; @@ -61,9 +61,9 @@ namespace toolkit XSimpleAnimation& operator=( const XSimpleAnimation& ); // never implemented }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX diff --git a/include/toolkit/awt/xthrobber.hxx b/include/toolkit/awt/xthrobber.hxx index e1b19c7b2b3f..fd2959b75442 100644 --- a/include/toolkit/awt/xthrobber.hxx +++ b/include/toolkit/awt/xthrobber.hxx @@ -28,14 +28,14 @@ #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= XThrobber - //==================================================================== + typedef ::cppu::ImplInheritanceHelper1 < VCLXWindow , ::com::sun::star::awt::XThrobber > XThrobber_Base; @@ -64,9 +64,9 @@ namespace toolkit XThrobber& operator=( const XThrobber& ); // never implemented }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index e5c00aae464c..6726f4e64fa8 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -28,14 +28,14 @@ #include <com/sun/star/awt/XWindow.hpp> class Window; -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= OAccessibleControlContext - //==================================================================== + typedef ::comphelper::OAccessibleComponentHelper OAccessibleControlContext_Base; typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener @@ -120,9 +120,9 @@ namespace toolkit Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index cf9baad50fb4..58e7b2f337da 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -31,10 +31,10 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace toolkit { -//...................................................................................................................... + struct AnimatedImagesControlModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel @@ -87,9 +87,9 @@ namespace toolkit m_pData; }; -//...................................................................................................................... + } // namespace toolkit -//...................................................................................................................... + #endif // INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 54e4ca17d640..90abe782b8db 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -40,9 +40,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <tools/gen.hxx> -// ---------------------------------------------------- + // class ControlModelContainerBase -// ---------------------------------------------------- + typedef UnoControlModel ControlModel_Base; typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base , ::com::sun::star::lang::XMultiServiceFactory diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index 70fcef1fa9f8..1d47f22e9bbc 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/util/XNumberFormatter.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - // =================================================================== + + // = UnoControlFormattedFieldModel - // =================================================================== + class UnoControlFormattedFieldModel : public UnoControlModel { protected: @@ -99,9 +99,9 @@ namespace toolkit void impl_updateCachedFormatKey_nothrow(); }; - // =================================================================== + // = UnoFormattedFieldControl - // =================================================================== + class UnoFormattedFieldControl : public UnoSpinFieldControl { public: @@ -115,9 +115,9 @@ namespace toolkit DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, szServiceName2_UnoControlFormattedField ) }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index fa389f2647d6..302b64258c54 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -45,14 +45,14 @@ namespace com { namespace sun { namespace star { } }}} -//........................................................................ + // namespace toolkit // { -//........................................................................ - //==================================================================== + + //= OGeometryControlModel_Base - //==================================================================== + typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::util::XCloneable , ::com::sun::star::script::XScriptEventsSupplier > OGCM_Base; @@ -165,17 +165,17 @@ namespace com { namespace sun { namespace star { void registerProperties(); }; - //==================================================================== + //= OTemplateInstanceDisambiguation - //==================================================================== + template <class CONTROLMODEL> class OTemplateInstanceDisambiguation { }; - //==================================================================== + //= OGeometryControlModel - //==================================================================== + /* example for usage: Reference< XAggregation > xIFace = new ::toolkit::OGeometryControlModel< UnoControlButtonModel > (); */ @@ -208,9 +208,9 @@ namespace com { namespace sun { namespace star { virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - //==================================================================== + //= OCommonGeometryControlModel - //==================================================================== + /** allows to extend an arbitrary com.sun.star.awt::UnoControlModel with geometry information. */ @@ -255,9 +255,9 @@ namespace com { namespace sun { namespace star { #include <toolkit/controls/geometrycontrolmodel_impl.hxx> -//........................................................................ + // } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx index de708b53bbad..c035c2e6ea47 100644 --- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx +++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx @@ -19,31 +19,31 @@ // no include protection. This is included from within geometrycontrolmodel.hxx only -//==================================================================== + //= OGeometryControlModel -//==================================================================== -//-------------------------------------------------------------------- + + template <class CONTROLMODEL> OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) :OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) ) { } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) :OGeometryControlModel_Base(_rxAggregateInstance) { } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> ::cppu::IPropertyArrayHelper& SAL_CALL OGeometryControlModel<CONTROLMODEL>::getInfoHelper() { return *this->getArrayHelper(); } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rProps, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rAggregateProps) const { @@ -54,7 +54,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno:: _rAggregateProps = m_xAggregateSet->getPropertySetInfo()->getProperties(); } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -71,7 +71,7 @@ template <class CONTROLMODEL> return pId->getImplementationId(); } -//-------------------------------------------------------------------- + template <class CONTROLMODEL> OGeometryControlModel_Base* OGeometryControlModel<CONTROLMODEL>::createClone_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index c0336806a5e5..d9e332d4add3 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -39,10 +39,10 @@ #include <comphelper/uno3.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ + typedef GraphicControlModel UnoControlRoadmapModel_Base; @@ -68,9 +68,9 @@ namespace toolkit css::awt::XItemEventBroadcaster> SVTXRoadmap_Base; - // =================================================================== + // = UnoControlRoadmapModel - // =================================================================== + class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base, public UnoControlRoadmapModel_IBase @@ -143,9 +143,9 @@ namespace toolkit }; - // =================================================================== + // = UnoRoadmapControl - // =================================================================== + class UnoRoadmapControl : public UnoControlRoadmap_Base, public UnoControlRoadmap_IBase { @@ -182,9 +182,9 @@ namespace toolkit DECLIMPL_SERVICEINFO_DERIVED( UnoRoadmapControl, UnoControlBase, szServiceName2_UnoControlRoadmap ) }; -//........................................................................ + } // toolkit -//........................................................................ + diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx index c047b7381a32..7d7beff9d6a0 100644 --- a/include/toolkit/controls/roadmapentry.hxx +++ b/include/toolkit/controls/roadmapentry.hxx @@ -65,7 +65,7 @@ protected: // other stuff - // ... + // (e.g. DECLARE_SERVICE_INFO();) protected: diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index 740167356f21..150b9b30778a 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -33,9 +33,9 @@ #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> -// ------------------------------------------------------------------ + // class ::com::sun::star::awt::tab::UnoControlTabPageContainerModel -// ------------------------------------------------------------------ + typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel , ::com::sun::star::awt::tab::XTabPageContainerModel > UnoControlTabPageContainerModel_Base; @@ -90,9 +90,9 @@ public: void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -// =================================================================== + // = UnoControlTabPageContainer -// =================================================================== + typedef ::cppu::AggImplInheritanceHelper1 < ControlContainerBase , ::com::sun::star::awt::tab::XTabPageContainer > UnoControlTabPageContainer_Base; diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx index c48250cf75be..780fbd1be69f 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/include/toolkit/controls/tabpagemodel.hxx @@ -55,9 +55,9 @@ public: css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); }; -// ---------------------------------------------------- + // class UnoTabPageControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase , ::com::sun::star::awt::tab::XTabPage , ::com::sun::star::awt::XWindowListener diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index c9f9cd395621..7b552a29e218 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/awt/XAdjustmentListener.hpp> #include <com/sun/star/awt/AdjustmentType.hpp> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= UnoControlScrollBarModel - //==================================================================== + class UnoControlScrollBarModel : public UnoControlModel { protected: @@ -57,9 +57,9 @@ namespace toolkit DECLIMPL_SERVICEINFO_DERIVED( UnoControlScrollBarModel, UnoControlModel, szServiceName2_UnoControlScrollBarModel ) }; - //==================================================================== + //= UnoControlScrollBarModel - //==================================================================== + class UnoScrollBarControl : public UnoControlBase, public ::com::sun::star::awt::XAdjustmentListener, public ::com::sun::star::awt::XScrollBar @@ -109,9 +109,9 @@ namespace toolkit -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX diff --git a/include/toolkit/controls/tksimpleanimation.hxx b/include/toolkit/controls/tksimpleanimation.hxx index 1936e6622251..482390c8fd96 100644 --- a/include/toolkit/controls/tksimpleanimation.hxx +++ b/include/toolkit/controls/tksimpleanimation.hxx @@ -28,14 +28,14 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= UnoSimpleAnimationControlModel - //==================================================================== + class UnoSimpleAnimationControlModel : public UnoControlModel { protected: @@ -59,9 +59,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; - //==================================================================== + //= UnoSimpleAnimationControl - //==================================================================== + typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase , ::com::sun::star::awt::XSimpleAnimation @@ -86,9 +86,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX diff --git a/include/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx index b32246a27857..f952b2785b01 100644 --- a/include/toolkit/controls/tkthrobber.hxx +++ b/include/toolkit/controls/tkthrobber.hxx @@ -28,14 +28,14 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= UnoThrobberControlModel - //==================================================================== + class UnoThrobberControlModel : public UnoControlModel { protected: @@ -59,9 +59,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; - //==================================================================== + //= UnoThrobberControl - //==================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XThrobber > UnoThrobberControl_Base; @@ -94,9 +94,9 @@ namespace toolkit ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; -//........................................................................ + } // namespacetoolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 8b2afac05e91..6a9e97fcb789 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -62,9 +62,9 @@ struct UnoControlComponentInfos }; struct UnoControl_Data; -// ---------------------------------------------------- + // class UnoControl -// ---------------------------------------------------- + typedef ::cppu::WeakAggImplHelper9 < ::com::sun::star::awt::XControl , ::com::sun::star::awt::XWindow2 , ::com::sun::star::awt::XView diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index 124671e7c181..fd833e66eb30 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -26,9 +26,9 @@ #include <toolkit/controls/unocontrol.hxx> -// ---------------------------------------------------- + // class UnoControlBase -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl { diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 5b6db2f1ae6a..7f8cd2787d01 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -35,9 +35,9 @@ class UnoControlHolderList; -// ---------------------------------------------------- + // class UnoControlContainer -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XUnoControlContainer , ::com::sun::star::awt::XControlContainer diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index 0347ff433884..ff8dd4374604 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -26,9 +26,9 @@ #include <toolkit/helper/servicenames.hxx> -// ---------------------------------------------------- + // class ::com::sun::star::awt::UnoControlContainerModel -// ---------------------------------------------------- + class UnoControlContainerModel : public UnoControlModel { protected: diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 65b28598acab..6fdd1a37c64b 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -45,9 +45,9 @@ typedef std::map<sal_uInt16, ::com::sun::star::uno::Any> ImplPropertyTable; -// ---------------------------------------------------- + // class UnoControlModel -// ---------------------------------------------------- + typedef ::cppu::WeakAggImplHelper7 < ::com::sun::star::awt::XControlModel , ::com::sun::star::beans::XPropertyState diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 5ed719967501..112342649f10 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -75,9 +75,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlEditModel -// ---------------------------------------------------- + class UnoControlEditModel : public UnoControlModel { protected: @@ -101,9 +101,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlEditModel, UnoControlModel, szServiceName2_UnoControlEditModel ) }; -// ---------------------------------------------------- + // class UnoEditControl -// ---------------------------------------------------- + typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XTextComponent , ::com::sun::star::awt::XTextListener , ::com::sun::star::awt::XLayoutConstrains @@ -179,9 +179,9 @@ public: sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); }; -// ---------------------------------------------------- + // class UnoControlFileControlModel -// ---------------------------------------------------- + class UnoControlFileControlModel : public UnoControlModel { protected: @@ -204,9 +204,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, szServiceName2_UnoControlFileControlModel ) }; -// ---------------------------------------------------- + // class UnoFileControl -// ---------------------------------------------------- + class UnoFileControl : public UnoEditControl { public: @@ -217,9 +217,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl ) }; -// ---------------------------------------------------- + // class GraphicControlModel -// ---------------------------------------------------- + class GraphicControlModel : public UnoControlModel { private: @@ -247,9 +247,9 @@ private: GraphicControlModel& operator=( const GraphicControlModel& ); // never implemented }; -// ---------------------------------------------------- + // class UnoControlButtonModel -// ---------------------------------------------------- + class UnoControlButtonModel : public GraphicControlModel { protected: @@ -272,9 +272,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel ) }; -// ---------------------------------------------------- + // class UnoButtonControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton @@ -322,9 +322,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton ) }; -// ---------------------------------------------------- + // class UnoControlImageControlModel -// ---------------------------------------------------- + class UnoControlImageControlModel : public GraphicControlModel { private: @@ -353,9 +353,9 @@ public: void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); }; -// ---------------------------------------------------- + // class UnoImageControlControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase , ::com::sun::star::awt::XLayoutConstrains > UnoImageControlControl_Base; @@ -384,9 +384,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl ) }; -// ---------------------------------------------------- + // class UnoControlRadioButtonModel -// ---------------------------------------------------- + class UnoControlRadioButtonModel : public GraphicControlModel { @@ -411,9 +411,9 @@ public: }; -// ---------------------------------------------------- + // class UnoRadioButtonControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XRadioButton @@ -464,9 +464,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlCheckBoxModel -// ---------------------------------------------------- + class UnoControlCheckBoxModel : public GraphicControlModel { protected: @@ -489,9 +489,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel ) }; -// ---------------------------------------------------- + // class UnoCheckBoxControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XCheckBox @@ -545,9 +545,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlFixedTextModel -// ---------------------------------------------------- + class UnoControlFixedHyperlinkModel : public UnoControlModel { protected: @@ -570,9 +570,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, szServiceName_UnoControlFixedHyperlinkModel ) }; -// ---------------------------------------------------- + // class UnoFixedHyperlinkControl -// ---------------------------------------------------- + class UnoFixedHyperlinkControl : public UnoControlBase, public ::com::sun::star::awt::XFixedHyperlink, public ::com::sun::star::awt::XLayoutConstrains @@ -619,9 +619,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, szServiceName_UnoControlFixedHyperlink ) }; -// ---------------------------------------------------- + // class UnoControlFixedTextModel -// ---------------------------------------------------- + class UnoControlFixedTextModel : public UnoControlModel { protected: @@ -645,9 +645,9 @@ public: }; -// ---------------------------------------------------- + // class UnoFixedTextControl -// ---------------------------------------------------- + class UnoFixedTextControl : public UnoControlBase, public ::com::sun::star::awt::XFixedText, public ::com::sun::star::awt::XLayoutConstrains @@ -684,9 +684,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlGroupBoxModel -// ---------------------------------------------------- + class UnoControlGroupBoxModel : public UnoControlModel { protected: @@ -710,9 +710,9 @@ public: }; -// ---------------------------------------------------- + // class UnoGroupBoxControl -// ---------------------------------------------------- + class UnoGroupBoxControl : public UnoControlBase { public: @@ -726,9 +726,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlListBoxModel -// ---------------------------------------------------- + struct UnoControlListBoxModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel , ::com::sun::star::awt::XItemList @@ -830,9 +830,9 @@ protected: ::cppu::OInterfaceContainerHelper m_aItemListListeners; }; -// ---------------------------------------------------- + // class UnoListBoxControl -// ---------------------------------------------------- + typedef ::cppu::AggImplInheritanceHelper5 < UnoControlBase , ::com::sun::star::awt::XListBox , ::com::sun::star::awt::XItemListener @@ -910,9 +910,9 @@ private: ItemListenerMultiplexer maItemListeners; }; -// ---------------------------------------------------- + // class UnoControlComboBoxModel -// ---------------------------------------------------- + class UnoControlComboBoxModel : public UnoControlListBoxModel { protected: @@ -939,9 +939,9 @@ public: }; -// ---------------------------------------------------- + // class UnoComboBoxControl -// ---------------------------------------------------- + class UnoComboBoxControl : public UnoEditControl , public ::com::sun::star::awt::XComboBox , public ::com::sun::star::awt::XItemListener @@ -1008,9 +1008,9 @@ protected: }; -// ---------------------------------------------------- + // class UnoSpinFieldControl -// ---------------------------------------------------- + class UnoSpinFieldControl : public UnoEditControl, public ::com::sun::star::awt::XSpinField { @@ -1047,9 +1047,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlDateFieldModel -// ---------------------------------------------------- + class UnoControlDateFieldModel : public UnoControlModel { protected: @@ -1073,9 +1073,9 @@ public: }; -// ---------------------------------------------------- + // class UnoDateFieldControl -// ---------------------------------------------------- + class UnoDateFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XDateField { @@ -1123,9 +1123,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlDateField ) }; -// ---------------------------------------------------- + // class UnoControlTimeFieldModel -// ---------------------------------------------------- + class UnoControlTimeFieldModel : public UnoControlModel { protected: @@ -1149,9 +1149,9 @@ public: }; -// ---------------------------------------------------- + // class UnoTimeFieldControl -// ---------------------------------------------------- + class UnoTimeFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XTimeField { @@ -1198,9 +1198,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlNumericFieldModel -// ---------------------------------------------------- + class UnoControlNumericFieldModel : public UnoControlModel { protected: @@ -1224,9 +1224,9 @@ public: }; -// ---------------------------------------------------- + // class UnoNumericFieldControl -// ---------------------------------------------------- + class UnoNumericFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XNumericField { @@ -1275,9 +1275,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlCurrencyFieldModel -// ---------------------------------------------------- + class UnoControlCurrencyFieldModel : public UnoControlModel { protected: @@ -1301,9 +1301,9 @@ public: }; -// ---------------------------------------------------- + // class UnoCurrencyFieldControl -// ---------------------------------------------------- + class UnoCurrencyFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XCurrencyField { @@ -1351,9 +1351,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlCurrencyField ) }; -// ---------------------------------------------------- + // class UnoControlPatternFieldModel -// ---------------------------------------------------- + class UnoControlPatternFieldModel : public UnoControlModel { protected: @@ -1377,9 +1377,9 @@ public: }; -// ---------------------------------------------------- + // class UnoPatternFieldControl -// ---------------------------------------------------- + class UnoPatternFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XPatternField { @@ -1412,9 +1412,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlProgressBarModel -// ---------------------------------------------------- + class UnoControlProgressBarModel : public UnoControlModel { protected: @@ -1437,9 +1437,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel ) }; -// ---------------------------------------------------- + // class UnoProgressBarControl -// ---------------------------------------------------- + class UnoProgressBarControl : public UnoControlBase, public ::com::sun::star::awt::XProgressBar { @@ -1468,9 +1468,9 @@ public: }; -// ---------------------------------------------------- + // class UnoControlFixedLineModel -// ---------------------------------------------------- + class UnoControlFixedLineModel : public UnoControlModel { protected: @@ -1494,9 +1494,9 @@ public: }; -// ---------------------------------------------------- + // class UnoFixedLineControl -// ---------------------------------------------------- + class UnoFixedLineControl : public UnoControlBase { public: diff --git a/include/toolkit/helper/accessibilityclient.hxx b/include/toolkit/helper/accessibilityclient.hxx index 73572154f579..a3915aff907f 100644 --- a/include/toolkit/helper/accessibilityclient.hxx +++ b/include/toolkit/helper/accessibilityclient.hxx @@ -22,14 +22,14 @@ #include <toolkit/helper/accessiblefactory.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ - //==================================================================== + + //= AccessibilityClient - //==================================================================== + /** a client for the accessibility implementations which have been outsourced from the main toolkit library @@ -57,9 +57,9 @@ namespace toolkit void ensureInitialized(); }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx index 0c90cd82be20..6428a10fa15d 100644 --- a/include/toolkit/helper/accessiblefactory.hxx +++ b/include/toolkit/helper/accessiblefactory.hxx @@ -41,10 +41,10 @@ class VCLXToolBox; class VCLXWindow; class Menu; -//........................................................................ + namespace toolkit { -//........................................................................ + /** a function which is able to create a factory for the standard Accessible/Context components needed for standard toolkit controls @@ -55,9 +55,9 @@ namespace toolkit */ typedef void* (SAL_CALL * GetStandardAccComponentFactory)( ); - //================================================================ + //= IAccessibleFactory - //================================================================ + class IAccessibleFactory : public ::rtl::IReference { public: @@ -125,9 +125,9 @@ namespace toolkit ~IAccessibleFactory() {} }; -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index d075b3910fff..d37a85e3ac35 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> -// ---------------------------------------------------- + // class EmptyFontDescriptor -// ---------------------------------------------------- + class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor { public: diff --git a/include/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx index f00f1edbbbf8..11fda9a000e7 100644 --- a/include/toolkit/helper/externallock.hxx +++ b/include/toolkit/helper/externallock.hxx @@ -22,9 +22,9 @@ #include <toolkit/dllapi.h> #include <comphelper/accessiblecontexthelper.hxx> -// ----------------------------------------------------------------------------- + // class VCLExternalSolarLock -// ----------------------------------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLExternalSolarLock : public ::comphelper::IMutex { diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx index eff8dfc92aa3..5ded833a00e3 100644 --- a/include/toolkit/helper/formpdfexport.hxx +++ b/include/toolkit/helper/formpdfexport.hxx @@ -33,10 +33,10 @@ namespace vcl class PDFExtOutDevData; } -//........................................................................ + namespace toolkitform { -//........................................................................ + /** creates a PDF compatible control descriptor for the given control */ @@ -46,9 +46,9 @@ namespace toolkitform ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(()); -//........................................................................ + } // namespace toolkitform -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX diff --git a/include/toolkit/helper/imagealign.hxx b/include/toolkit/helper/imagealign.hxx index ad4ba0134d49..7b063c9a14d5 100644 --- a/include/toolkit/helper/imagealign.hxx +++ b/include/toolkit/helper/imagealign.hxx @@ -23,10 +23,10 @@ #include <sal/types.h> #include <vcl/button.hxx> -//........................................................................ + namespace toolkit { -//........................................................................ + /** translates a VCL ImageAlign value into an css.awt.ImagePosition value */ @@ -44,9 +44,9 @@ namespace toolkit */ sal_Int16 getExtendedImagePosition( sal_Int16 _nImageAlign ); -//........................................................................ + } // namespace toolkit -//........................................................................ + #endif // INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index 4f9bea93f5c1..982ec4b44ac3 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -49,9 +49,9 @@ #include <toolkit/helper/macros.hxx> #include <com/sun/star/awt/grid/XGridSelectionListener.hpp> #include <com/sun/star/awt/tab/XTabPageContainerListener.hpp> -// ---------------------------------------------------- + // class ListenerMultiplexerBase -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper, public ::cppu::OInterfaceContainerHelper, @@ -74,24 +74,24 @@ public: }; -// ---------------------------------------------------- + // class EventListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, ::com::sun::star::lang::XEventListener ) DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class FocusListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class WindowListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -101,25 +101,25 @@ DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class VclContainerListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class KeyListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class MouseListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -127,24 +127,24 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::sta void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class MouseMotionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class PaintListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TopWindowListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -155,30 +155,30 @@ DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star:: void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TextListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class ActionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class ItemListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TabListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener ) void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -187,18 +187,18 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star: void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class ContainerListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class SpinListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -206,16 +206,16 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class AdjustmentListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class MenuListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -223,16 +223,16 @@ DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt:: void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TreeExpansionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -241,24 +241,24 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com:: virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TreeEditListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException, std::exception); virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class SelectionListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- + // class TabPageListenerMultiplexer -// ---------------------------------------------------- + DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener ) void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); DECL_LISTENERMULTIPLEXER_END diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 3f1ac4efdf33..f6622cb3f225 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -73,7 +73,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ } -// ------------------------------------------------------------------------------------- + #define IMPL_IMPLEMENTATION_ID( ClassName ) \ ::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) \ @@ -104,7 +104,7 @@ IMPL_IMPLEMENTATION_ID( ClassName ) \ static ::cppu::OTypeCollection collection( \ getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider>* ) NULL ), -// ------------------------------------------------------------------------------------- + #define IMPL_XTYPEPROVIDER_END \ ); \ @@ -114,7 +114,7 @@ IMPL_IMPLEMENTATION_ID( ClassName ) \ return (*pCollection).getTypes(); \ } -// ------------------------------------------------------------------------------------- + #define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ @@ -126,7 +126,7 @@ public: \ void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); -// ------------------------------------------------------------------------------------- + #define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public InterfaceName \ @@ -138,12 +138,12 @@ public: \ void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); -// ------------------------------------------------------------------------------------- + #define DECL_LISTENERMULTIPLEXER_END \ }; -// ------------------------------------------------------------------------------------- + #define IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ClassName, InterfaceName ) \ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ @@ -161,7 +161,7 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: { \ } -// ------------------------------------------------------------------------------------- + #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ @@ -257,7 +257,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa void ClassName::MethodName( const EventType& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType ) -// ------------------------------------------------------------------------------------- + #define DECLIMPL_SUPPORTS_SERVICE( ) \ sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ @@ -271,7 +271,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa return sal_False; \ } -// ------------------------------------------------------------------------------------- + #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit." #ImplName ); } \ @@ -283,7 +283,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa return aNames; \ } \ -// ------------------------------------------------------------------------------------- + #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \ OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit." #ImplName ); } \ diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx index 1f7a107ec4bf..949d644d9558 100644 --- a/include/toolkit/helper/mutexhelper.hxx +++ b/include/toolkit/helper/mutexhelper.hxx @@ -22,9 +22,9 @@ #include <osl/mutex.hxx> -// ---------------------------------------------------- + // class MutexHelper -// ---------------------------------------------------- + class MutexHelper { diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx index ac36b3bd0b4b..2c45c641ee0b 100644 --- a/include/toolkit/helper/unopropertyarrayhelper.hxx +++ b/include/toolkit/helper/unopropertyarrayhelper.hxx @@ -26,9 +26,9 @@ #include <list> #include <set> -// ---------------------------------------------------- + // class UnoPropertyArrayHelper -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper { private: diff --git a/include/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx index 95a9c1a9ff6b..f00977734e29 100644 --- a/include/toolkit/helper/unowrapper.hxx +++ b/include/toolkit/helper/unowrapper.hxx @@ -29,9 +29,9 @@ #include <vcl/unowrap.hxx> #include <vcl/window.hxx> -// ---------------------------------------------------- + // class UnoWrapper -// ---------------------------------------------------- + class UnoWrapper : public UnoWrapperBase { diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 444c04498c45..74c6ade01193 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -65,9 +65,9 @@ class OutputDevice; class MouseEvent; class KeyEvent; -// ---------------------------------------------------- + // class VclUnoHelper -// ---------------------------------------------------- + class TOOLKIT_DLLPUBLIC VCLUnoHelper { public: @@ -116,9 +116,9 @@ public: static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); static sal_Int32 VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit ); - //======================================================================== + //= MeasurementUnitConversion - //======================================================================== + /** small helper to convert between MeasurementUnit and FieldUnit */ diff --git a/include/typelib/typedescription.hxx b/include/typelib/typedescription.hxx index 9ac0db9e063e..7f61423242cd 100644 --- a/include/typelib/typedescription.hxx +++ b/include/typelib/typedescription.hxx @@ -137,53 +137,53 @@ public: inline bool SAL_CALL is() const SAL_THROW(()) { return (_pTypeDescr != 0); } }; -//__________________________________________________________________________________________________ + inline TypeDescription::TypeDescription( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) : _pTypeDescr( pTypeDescr ) { if (_pTypeDescr) typelib_typedescription_acquire( _pTypeDescr ); } -//__________________________________________________________________________________________________ + inline TypeDescription::TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW(()) : _pTypeDescr( 0 ) { if (pTypeDescrRef) typelib_typedescriptionreference_getDescription( &_pTypeDescr, pTypeDescrRef ); } -//__________________________________________________________________________________________________ + inline TypeDescription::TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW(()) : _pTypeDescr( 0 ) { if (rType.getTypeLibType()) typelib_typedescriptionreference_getDescription( &_pTypeDescr, rType.getTypeLibType() ); } -//__________________________________________________________________________________________________ + inline TypeDescription::TypeDescription( const TypeDescription & rTypeDescr ) SAL_THROW(()) : _pTypeDescr( rTypeDescr._pTypeDescr ) { if (_pTypeDescr) typelib_typedescription_acquire( _pTypeDescr ); } -//__________________________________________________________________________________________________ + inline TypeDescription::TypeDescription( rtl_uString * pTypeName ) SAL_THROW(()) : _pTypeDescr( 0 ) { typelib_typedescription_getByName( &_pTypeDescr , pTypeName ); } -//__________________________________________________________________________________________________ + inline TypeDescription::TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW(()) : _pTypeDescr( 0 ) { typelib_typedescription_getByName( &_pTypeDescr , rTypeName.pData ); } -//__________________________________________________________________________________________________ + inline TypeDescription::~TypeDescription() SAL_THROW(()) { if (_pTypeDescr) typelib_typedescription_release( _pTypeDescr ); } -//__________________________________________________________________________________________________ + inline TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { if (pTypeDescr) @@ -193,13 +193,13 @@ inline TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * _pTypeDescr = pTypeDescr; return *this; } -//__________________________________________________________________________________________________ + inline bool TypeDescription::equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW(()) { return (_pTypeDescr && pTypeDescr && typelib_typedescription_equals( _pTypeDescr, pTypeDescr )); } -//__________________________________________________________________________________________________ + inline void TypeDescription::makeComplete() const SAL_THROW(()) { if (_pTypeDescr && !_pTypeDescr->bComplete) diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index cfbf6bb6b4b4..deaf6aca4205 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -29,7 +29,7 @@ namespace ucbhelper { -//========================================================================= + /** * This class implements the interface com::sun::star::io::XActiveDataSink. diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx index eabfa659c0c8..799f7ee500d8 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/include/ucbhelper/activedatastreamer.hxx @@ -28,7 +28,7 @@ namespace ucbhelper { -//========================================================================= + /** * This class implements the interface com::sun::star::io::XActiveDataStreamer. diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx index 71e9ab19116a..9685d3938597 100644 --- a/include/ucbhelper/cancelcommandexecution.hxx +++ b/include/ucbhelper/cancelcommandexecution.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace ucbhelper { -//============================================================================ + /** Cancel the execution of a command by throwing the appropriate exception. If an Interaction Handler is given with the command environment and the handler handles the exception by selecting the supplied continuation, diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index a2b5397c1c86..1c9ce54a4741 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -31,7 +31,7 @@ namespace ucbhelper struct CommandEnvironment_Impl; -//========================================================================= + /** * This class implements the interface diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index 234158c3fc01..558027287076 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace uno { namespace ucbhelper { -//========================================================================= + /** * These are the possible values for the parameter eMode of method @@ -85,7 +85,7 @@ enum InsertOperation InsertOperation_CHECKIN // check-in source data }; -//========================================================================= + class Content_Impl; @@ -185,9 +185,9 @@ public: ::com::sun::star::uno::XComponentContext >& rCtx, Content& rContent ); - ////////////////////////////////////////////////////////////////////// + // Direct access to UCB content. - ////////////////////////////////////////////////////////////////////// + /** * This method provides access to the "native" UCB content interface(s). @@ -201,9 +201,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > get() const; - ////////////////////////////////////////////////////////////////////// + // Object identity. - ////////////////////////////////////////////////////////////////////// + /** * This method returns the URL of the content. @@ -212,9 +212,9 @@ public: */ const OUString& getURL() const; - ////////////////////////////////////////////////////////////////////// + // Command environment. - ////////////////////////////////////////////////////////////////////// + /** * This method returns the environment to use when executing commands. @@ -234,9 +234,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xNewEnv ); - ////////////////////////////////////////////////////////////////////// + // Access to supported commands/properties. - ////////////////////////////////////////////////////////////////////// + /** * This methods provides access to meta data of the commands supported @@ -264,9 +264,9 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ////////////////////////////////////////////////////////////////////// + // Access to property value(s). - ////////////////////////////////////////////////////////////////////// + /** * This method can be used to read a single property value. @@ -376,9 +376,9 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ////////////////////////////////////////////////////////////////////// + // General command execution. - ////////////////////////////////////////////////////////////////////// + /** * This method can be used to execute any command supported by the @@ -397,9 +397,9 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ////////////////////////////////////////////////////////////////////// + // Special commands. - ////////////////////////////////////////////////////////////////////// + /** * This methods gives access to the children of a folder content. @@ -686,9 +686,9 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ////////////////////////////////////////////////////////////////////// + // Required properties. - ////////////////////////////////////////////////////////////////////// + /** * This method returns the value of the content's property "IsFolder". diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 17091db95803..e1318eb6a618 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -56,7 +56,7 @@ namespace ucbhelper_impl { struct ContentImplHelper_Impl; } namespace ucbhelper { -//========================================================================= + class ContentProviderImplHelper; @@ -484,9 +484,9 @@ public: throw( com::sun::star::lang::NoSupportException, com::sun::star::uno::RuntimeException, std::exception ); - ////////////////////////////////////////////////////////////////////// + // Non-interface methods. - ////////////////////////////////////////////////////////////////////// + /** * This method returns the provider of the content. diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 6203a20d9777..f17ed6ef5cbc 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -31,7 +31,7 @@ namespace ucbhelper struct ContentIdentifier_Impl; -//========================================================================= + /** * This class implements a simple identifier object for UCB contents. diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index dcb5bc3a4c76..fbaa877cdb34 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -31,11 +31,11 @@ namespace ucbhelper { -//============================================================================ -// + + // class PropertySetInfo. -// -//============================================================================ + + class ContentImplHelper; @@ -90,11 +90,11 @@ public: void reset(); }; -//============================================================================ -// + + // class CommandProcessorInfo. -// -//============================================================================ + + /** * This class provides a command info ( the complete implementation of diff --git a/include/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx index 09b1ed1e88e4..892234d39fc2 100644 --- a/include/ucbhelper/fileidentifierconverter.hxx +++ b/include/ucbhelper/fileidentifierconverter.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace ucb { namespace ucbhelper { -//============================================================================ + /** Get a 'root' URL for the most 'local' file content provider. @descr @@ -45,7 +45,7 @@ namespace ucbhelper { UCBHELPER_DLLPUBLIC OUString getLocalFileURL() SAL_THROW((com::sun::star::uno::RuntimeException)); -//============================================================================ + /** Using a specific content provider manager, convert a file path in system dependent notation to a (file) URL. @@ -78,7 +78,7 @@ getFileURLFromSystemPath( OUString const & rSystemPath) SAL_THROW((com::sun::star::uno::RuntimeException)); -//============================================================================ + /** Using a specific content provider manager, convert a (file) URL to a file path in system dependent notation. diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 3326953f90ff..1fdd3797fded 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -37,7 +37,7 @@ namespace ucbhelper { class InteractionContinuation; -//============================================================================ + struct InteractionRequest_Impl; /** @@ -142,7 +142,7 @@ public: const rtl::Reference< InteractionContinuation > & rxSelection ); }; -//============================================================================ + struct InteractionContinuation_Impl; /** @@ -173,7 +173,7 @@ public: InteractionContinuation( InteractionRequest * pRequest ); }; -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionAbort. Instances of this class can be passed @@ -210,7 +210,7 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ); }; -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionRetry. Instances of this class can be passed @@ -247,7 +247,7 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ); }; -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionApprove. Instances of this class can be passed @@ -284,7 +284,7 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ); }; -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionDisapprove. Instances of this class can be passed @@ -321,7 +321,7 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ); }; -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionSupplyAuthentication. Instances of this class can be @@ -557,7 +557,7 @@ public: bool getUseSystemCredentials() const { return m_bUseSystemCredentials; } }; -//============================================================================ + inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( InteractionRequest * pRequest, bool bCanSetRealm, @@ -589,7 +589,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( = com::sun::star::ucb::RememberAuthentication_NO; } -//============================================================================ + inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( InteractionRequest * pRequest, bool bCanSetRealm, @@ -623,7 +623,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( { } -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionSupplyName. Instances of this class can be passed @@ -676,7 +676,7 @@ public: const OUString & getName() const { return m_aName; } }; -//============================================================================ + /** * This class implements a standard interaction continuation, namely the * interface XInteractionReplaceExistingData. Instances of this class can be diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx index 1c0a38028d58..7d4ba5a27081 100644 --- a/include/ucbhelper/interceptedinteraction.hxx +++ b/include/ucbhelper/interceptedinteraction.hxx @@ -42,28 +42,28 @@ namespace ucbhelper{ */ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionHandler > { - //------------------------------------------- + // types public: struct InterceptedRequest { - //----------------------------------- + /** @short marks an Handle as invalid. */ static const sal_Int32 INVALID_HANDLE = -1; - //----------------------------------- + /** @short contains the interaction request, which should be intercepted. */ ::com::sun::star::uno::Any Request; - //----------------------------------- + /** @short specify the fix continuation, which must be selected, if the interaction could be intercepted successfully. */ ::com::sun::star::uno::Type Continuation; - //----------------------------------- + /** @short specify, if both interactions must have the same type or can be derived from. @@ -80,7 +80,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper */ bool MatchExact; - //----------------------------------- + /** @short its an unique identifier, which must be managed by the outside code. @descr If there is a derived class, which overwrites the InterceptedInteraction::intercepted() @@ -89,7 +89,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper */ sal_Int32 Handle; - //----------------------------------- + /** @short default ctor. @descr Such constructed object cant be used really. @@ -102,7 +102,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper Handle = INVALID_HANDLE; } - //----------------------------------- + /** @short initialize this instance. @param nHandle @@ -133,7 +133,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper } }; - //--------------------------------------- + /** @short represent the different states, which can occur as result of an interception. @@ -151,11 +151,11 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper E_INTERCEPTED }; - //------------------------------------------- + // member protected: - //--------------------------------------- + /** @short reference to the intercepted interaction handler. @descr NULL is allowed for this member! @@ -165,21 +165,21 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper */ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xInterceptedHandler; - //--------------------------------------- + /** @short these list contains the requests, which should be intercepted. */ ::std::vector< InterceptedRequest > m_lInterceptions; - //------------------------------------------- + // native interface public: - //--------------------------------------- + /** @short initialize a new instance with default values. */ InterceptedInteraction(); - //--------------------------------------- + /** @short initialize a new instance with real values. @param xInterceptedHandler @@ -192,7 +192,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper InterceptedInteraction(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler, const ::std::vector< InterceptedRequest >& lInterceptions ); - //--------------------------------------- + /** @short initialize a new instance with the interaction handler, which should be intercepted. @@ -206,7 +206,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper */ void setInterceptedHandler(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler); - //--------------------------------------- + /** @short set a new list of intercepted interactions. @attention If the interface method handle() will be overwritten by @@ -218,7 +218,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper */ void setInterceptions(const ::std::vector< InterceptedRequest >& lInterceptions); - //--------------------------------------- + /** @short extract a requested continuation from te list of available ones. @param lContinuations @@ -235,11 +235,11 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations, const ::com::sun::star::uno::Type& aType ); - //------------------------------------------- + // useable for derived classes protected: - //--------------------------------------- + /** @short can be overwritten by a derived class to handle interceptions outside. @@ -271,11 +271,11 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper virtual EInterceptionState intercepted(const InterceptedRequest& rRequest , const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + /** @short implements the default handling of this class .... or can be overwritten by any derived class. @@ -296,17 +296,17 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper 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); - //------------------------------------------- + // helper private: - //--------------------------------------- + /** @short implements the default handling: - intercept or forward to internal handler. */ UCBHELPER_DLLPRIVATE void impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest); - //--------------------------------------- + /** @short implements the interception of requests. @descr The incoming request will be analyzed, if it match diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 356369fa7b31..3c6b395f4ef8 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -29,16 +29,16 @@ #include <osl/mutex.hxx> #include <ucbhelper/getcomponentcontext.hxx> -//========================================================================= + #define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) ) #define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > ) -//========================================================================= -// + + // XInterface decl. -// -//========================================================================= + + #define XINTERFACE_DECL() \ virtual com::sun::star::uno::Any SAL_CALL \ @@ -51,11 +51,11 @@ release() \ throw(); -//========================================================================= -// + + // XInterface impl. internals. -// -//========================================================================= + + #define XINTERFACE_COMMON_IMPL( Class ) \ void SAL_CALL Class::acquire() \ @@ -82,11 +82,11 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \ } -//========================================================================= -// + + // XInterface impl. -// -//========================================================================= + + // 1 interface implemented #define XINTERFACE_IMPL_1( Class, Ifc1 ) \ @@ -298,11 +298,11 @@ QUERYINTERFACE_IMPL_START( Class ) \ (static_cast< I15* >(this)) \ QUERYINTERFACE_IMPL_END -//========================================================================= -// + + // XTypeProvider decl. -// -//========================================================================= + + #define XTYPEPROVIDER_DECL() \ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \ @@ -312,11 +312,11 @@ QUERYINTERFACE_IMPL_END getTypes() \ throw( com::sun::star::uno::RuntimeException, std::exception ); -//========================================================================= -// + + // XTypeProvider impl. internals -// -//========================================================================= + + #define XTYPEPROVIDER_COMMON_IMPL( Class ) \ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \ @@ -357,11 +357,11 @@ Class::getTypes() \ return (*pCollection).getTypes(); \ } -//========================================================================= -// + + // XTypeProvider impl. -// -//========================================================================= + + // 1 interface supported #define XTYPEPROVIDER_IMPL_1( Class, I1 ) \ @@ -573,11 +573,11 @@ GETTYPES_IMPL_START( Class ) \ CPPU_TYPE_REF( I15 ) \ GETTYPES_IMPL_END -//========================================================================= -// + + // XServiceInfo decl. -// -//========================================================================= + + #define XSERVICEINFO_NOFACTORY_DECL() \ virtual OUString SAL_CALL \ @@ -603,11 +603,11 @@ GETTYPES_IMPL_END createServiceFactory( const com::sun::star::uno::Reference< \ com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ); -//========================================================================= -// + + // XServiceInfo impl. internals -// -//========================================================================= + + #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ @@ -670,11 +670,11 @@ Class##_CreateInstance( const com::sun::star::uno::Reference< \ com::sun::star::uno::XInterface >::query( pX ); \ } -//========================================================================= -// + + // XServiceInfo impl. -// -//========================================================================= + + #define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \ com::sun::star::uno::Reference< \ diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index 56c0561d8602..1a65aba46869 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -43,7 +43,7 @@ namespace ucbhelper { class PropertyValues; -//========================================================================= + /** * This class implements the interface XRow. After construction of a valueset @@ -180,9 +180,9 @@ public: throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception ); - ////////////////////////////////////////////////////////////////////// + // Non-interface methods - ////////////////////////////////////////////////////////////////////// + void appendString( const OUString& rPropName, const OUString& rValue ); void appendString( const sal_Char* pAsciiPropName, const OUString& rValue ) diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index f6f68040aeeb..88c1118d37be 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -32,7 +32,7 @@ #include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> -//========================================================================= + namespace com { namespace sun { namespace star { namespace ucb { class XPropertySetRegistry; @@ -43,7 +43,7 @@ namespace ucbhelper_impl { struct ContentProviderImplHelper_Impl; } namespace ucbhelper { -//========================================================================= + class ContentImplHelper; typedef rtl::Reference< ContentImplHelper > ContentImplHelperRef; @@ -131,30 +131,30 @@ protected: public: - ////////////////////////////////////////////////////////////////////// + // Contsruction/Destruction - ////////////////////////////////////////////////////////////////////// + ContentProviderImplHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~ContentProviderImplHelper(); - ////////////////////////////////////////////////////////////////////// + // XInterface - ////////////////////////////////////////////////////////////////////// + XINTERFACE_DECL() - ////////////////////////////////////////////////////////////////////// + // XTypeProvider - ////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_DECL() - ////////////////////////////////////////////////////////////////////// + // XServiceInfo - ////////////////////////////////////////////////////////////////////// + virtual OUString SAL_CALL getImplementationName() @@ -166,9 +166,9 @@ public: getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; - ////////////////////////////////////////////////////////////////////// + // XContentProvider - ////////////////////////////////////////////////////////////////////// + /** * This method returns a content with the requested id. @@ -194,9 +194,9 @@ public: ::com::sun::star::ucb::XContentIdentifier >& Id2 ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - ////////////////////////////////////////////////////////////////////// + // Non-interface methods. - ////////////////////////////////////////////////////////////////////// + /** * This method returns a mutex, which protects the content list of the diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx index 62dd09a277ab..d307f86c8c28 100644 --- a/include/ucbhelper/registerucb.hxx +++ b/include/ucbhelper/registerucb.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace ucbhelper { -//============================================================================ + /** Information about a content provider, passed to <method>configureUcb</method>. */ @@ -65,7 +65,7 @@ struct ContentProviderData }; typedef std::vector< ContentProviderData > ContentProviderDataList; -//============================================================================ + /** Register a content provider at a Universal Content Broker. @param rManager A content provider manager (normally, this would be a diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 0e9801641714..67e86b6257b4 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -40,11 +40,11 @@ namespace ucbhelper { -//========================================================================= + #define RESULTSET_SERVICE_NAME "com.sun.star.ucb.ContentResultSet" -//========================================================================= + class ResultSetDataSupplier; struct ResultSet_Impl; @@ -367,9 +367,9 @@ public: com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception ); - ///////////////////////////////////////////////////////////////////// + // Non-interface methods. - ///////////////////////////////////////////////////////////////////// + /** * This method propagates property value changes to all registered @@ -415,7 +415,7 @@ public: getEnvironment(); }; -//========================================================================= + /** * This is the base class for an object that supplies data to a result set diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index d16899931cf5..60dbbcfc1eed 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -37,11 +37,11 @@ namespace cppu { namespace ucbhelper { -//========================================================================= + #define DYNAMICRESULTSET_SERVICE_NAME "com.sun.star.ucb.DynamicResultSet" -//========================================================================= + /** * This is an abstract base class for implementations of the service @@ -183,9 +183,9 @@ public: getCapabilities() throw( com::sun::star::uno::RuntimeException, std::exception ); - ////////////////////////////////////////////////////////////////////// + // Non-interface methods. - ////////////////////////////////////////////////////////////////////// + /** * This method returns, whether the resultset is static or dynamic. diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index 461fec670b82..d663b3898685 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -42,7 +42,7 @@ namespace ucbhelper_impl { namespace ucbhelper { -//========================================================================= + /** * This is a structure that holds additional meta data for one column @@ -127,7 +127,7 @@ ResultSetColumnData::ResultSetColumnData() { } -//========================================================================= + /** * This is an implementation of the interface XResultSetMetaData. It can be diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx index e75f41fb3fe6..6efc506ebd4a 100644 --- a/include/uno/current_context.hxx +++ b/include/uno/current_context.hxx @@ -95,7 +95,7 @@ public: SAL_THROW(()) { return m_xPreviousContext; } }; -//__________________________________________________________________________________________________ + inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext ) SAL_THROW(()) : m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) @@ -103,7 +103,7 @@ inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewCont ::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 ); ::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, 0 ); } -//__________________________________________________________________________________________________ + inline ContextLayer::~ContextLayer() SAL_THROW(()) { diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx index fb90a2348529..e457713fff4d 100644 --- a/include/uno/dispatcher.hxx +++ b/include/uno/dispatcher.hxx @@ -81,27 +81,27 @@ private: inline bool operator != ( uno_Interface * ); // not impl }; -//______________________________________________________________________________ + inline UnoInterfaceReference::~UnoInterfaceReference() { if (m_pUnoI != 0) (*m_pUnoI->release)( m_pUnoI ); } -//______________________________________________________________________________ + inline UnoInterfaceReference::UnoInterfaceReference() : m_pUnoI( 0 ) { } -//______________________________________________________________________________ + inline UnoInterfaceReference::UnoInterfaceReference( uno_Interface * pUnoI, __sal_NoAcquire ) : m_pUnoI( pUnoI ) { } -//______________________________________________________________________________ + inline UnoInterfaceReference::UnoInterfaceReference( uno_Interface * pUnoI ) : m_pUnoI( pUnoI ) { @@ -109,7 +109,7 @@ inline UnoInterfaceReference::UnoInterfaceReference( uno_Interface * pUnoI ) (*m_pUnoI->acquire)( m_pUnoI ); } -//______________________________________________________________________________ + inline UnoInterfaceReference::UnoInterfaceReference( UnoInterfaceReference const & ref ) : m_pUnoI( ref.m_pUnoI ) @@ -118,7 +118,7 @@ inline UnoInterfaceReference::UnoInterfaceReference( (*m_pUnoI->acquire)( m_pUnoI ); } -//______________________________________________________________________________ + inline UnoInterfaceReference & UnoInterfaceReference::set( uno_Interface * pUnoI ) { @@ -130,7 +130,7 @@ inline UnoInterfaceReference & UnoInterfaceReference::set( return *this; } -//______________________________________________________________________________ + inline UnoInterfaceReference & UnoInterfaceReference::set( uno_Interface * pUnoI, __sal_NoAcquire ) { @@ -140,7 +140,7 @@ inline UnoInterfaceReference & UnoInterfaceReference::set( return *this; } -//______________________________________________________________________________ + inline void UnoInterfaceReference::clear() { if (m_pUnoI != 0) @@ -150,7 +150,7 @@ inline void UnoInterfaceReference::clear() } } -//______________________________________________________________________________ + inline void UnoInterfaceReference::dispatch( struct _typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) const diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx index 1eb5a2e46fb8..d4b9aefa5502 100644 --- a/include/uno/environment.hxx +++ b/include/uno/environment.hxx @@ -169,33 +169,33 @@ public: */ inline int SAL_CALL isValid(rtl::OUString * pReason) const SAL_THROW(()); }; -//__________________________________________________________________________________________________ + inline Environment::Environment( uno_Environment * pEnv ) SAL_THROW(()) : _pEnv( pEnv ) { if (_pEnv) (*_pEnv->acquire)( _pEnv ); } -//__________________________________________________________________________________________________ + inline Environment::Environment( rtl::OUString const & rEnvDcp, void * pContext ) SAL_THROW(()) : _pEnv(NULL) { uno_getEnvironment(&_pEnv, rEnvDcp.pData, pContext); } -//__________________________________________________________________________________________________ + inline Environment::Environment( const Environment & rEnv ) SAL_THROW(()) : _pEnv( rEnv._pEnv ) { if (_pEnv) (*_pEnv->acquire)( _pEnv ); } -//__________________________________________________________________________________________________ + inline Environment::~Environment() SAL_THROW(()) { if (_pEnv) (*_pEnv->release)( _pEnv ); } -//__________________________________________________________________________________________________ + inline void Environment::clear() SAL_THROW(()) { if (_pEnv) @@ -204,7 +204,7 @@ inline void Environment::clear() SAL_THROW(()) _pEnv = 0; } } -//__________________________________________________________________________________________________ + inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THROW(()) { if (pEnv != _pEnv) @@ -217,13 +217,13 @@ inline Environment & Environment::operator = ( uno_Environment * pEnv ) SAL_THRO } return *this; } -//__________________________________________________________________________________________________ + inline void SAL_CALL Environment::invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const SAL_THROW(()) { if (_pEnv) uno_Environment_invoke_v(_pEnv, pCallee, pParam); } -//__________________________________________________________________________________________________ + inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW(()) { if (_pEnv) @@ -236,17 +236,17 @@ inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL } } -//__________________________________________________________________________________________________ + inline void SAL_CALL Environment::enter() const SAL_THROW(()) { uno_Environment_enter(_pEnv); } -//__________________________________________________________________________________________________ + inline int SAL_CALL Environment::isValid(rtl::OUString * pReason) const SAL_THROW(()) { return uno_Environment_isValid(_pEnv, (rtl_uString **)pReason); } -//__________________________________________________________________________________________________ + inline Environment Environment::getCurrent(rtl::OUString const & typeName) SAL_THROW(()) { Environment environment; diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index c5621291cd18..dfc03ae1fdef 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -195,7 +195,7 @@ public: */ inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW(()); }; -//__________________________________________________________________________________________________ + inline Mapping::Mapping( const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose ) SAL_THROW(()) @@ -203,7 +203,7 @@ inline Mapping::Mapping( { uno_getMappingByName( &_pMapping, rFrom.pData, rTo.pData, rAddPurpose.pData ); } -//__________________________________________________________________________________________________ + inline Mapping::Mapping( uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose ) SAL_THROW(()) @@ -211,7 +211,7 @@ inline Mapping::Mapping( { uno_getMapping( &_pMapping, pFrom, pTo, rAddPurpose.pData ); } -//__________________________________________________________________________________________________ + inline Mapping::Mapping( const Environment & rFrom, const Environment & rTo, const ::rtl::OUString & rAddPurpose ) SAL_THROW(()) @@ -219,27 +219,27 @@ inline Mapping::Mapping( { uno_getMapping( &_pMapping, rFrom.get(), rTo.get(), rAddPurpose.pData ); } -//__________________________________________________________________________________________________ + inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(()) : _pMapping( pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } -//__________________________________________________________________________________________________ + inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(()) : _pMapping( rMapping._pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } -//__________________________________________________________________________________________________ + inline Mapping::~Mapping() SAL_THROW(()) { if (_pMapping) (*_pMapping->release)( _pMapping ); } -//__________________________________________________________________________________________________ + inline void Mapping::clear() SAL_THROW(()) { if (_pMapping) @@ -248,7 +248,7 @@ inline void Mapping::clear() SAL_THROW(()) _pMapping = 0; } } -//__________________________________________________________________________________________________ + inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(()) { if (pMapping) @@ -258,7 +258,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(()) _pMapping = pMapping; return *this; } -//__________________________________________________________________________________________________ + inline void Mapping::mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW(()) @@ -271,7 +271,7 @@ inline void Mapping::mapInterface( TYPELIB_DANGER_RELEASE( pTD ); } } -//__________________________________________________________________________________________________ + inline void * Mapping::mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW(()) @@ -280,7 +280,7 @@ inline void * Mapping::mapInterface( (*_pMapping->mapInterface)( _pMapping, &pOut, pInterface, pTypeDescr ); return pOut; } -//__________________________________________________________________________________________________ + inline void * Mapping::mapInterface( void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW(()) diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 12a4fdb9a8d3..135492c420a0 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -34,14 +34,14 @@ class AccessibleRelationSetHelperImpl; -//========================================================================= + //= XAccessibleRelationSet helper classes -//========================================================================= + //... namespace utl ....................................................... namespace utl { -//......................................................................... + /** @descr This base class provides an implementation of the @@ -145,7 +145,7 @@ private: AccessibleRelationSetHelperImpl* mpHelperImpl; }; -//......................................................................... + } //... namespace utl ....................................................... #endif diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index f1cce0691bb7..bbccf61937b5 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -33,14 +33,14 @@ class AccessibleStateSetHelperImpl; -//========================================================================= + //= XAccessibleStateSet helper classes -//========================================================================= + //... namespace utl ....................................................... namespace utl { -//......................................................................... + /** @descr This base class provides an implementation of the @@ -153,7 +153,7 @@ private: AccessibleStateSetHelperImpl* mpHelperImpl; }; -//......................................................................... + } //... namespace utl ....................................................... #endif diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx index 45086de72f21..1f23c11d396b 100644 --- a/include/unotools/closeveto.hxx +++ b/include/unotools/closeveto.hxx @@ -26,14 +26,14 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... + namespace utl { -//...................................................................................................................... - //================================================================================================================== + + //= CloseVeto - //================================================================================================================== + struct CloseVeto_Data; /** will add a XCloseListener to a given component, and veto its closing as long as the <code>CloseVeto</code> instance is alive. @@ -51,9 +51,9 @@ namespace utl ::boost::scoped_ptr< CloseVeto_Data > m_pData; }; -//...................................................................................................................... + } // namespace dbaui -//...................................................................................................................... + #endif // INCLUDED_UNOTOOLS_CLOSEVETO_HXX diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index a8bfba2fe7d0..ad53ee0b769e 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -27,12 +27,12 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -41,7 +41,7 @@ class SvtCommandOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @@ -63,7 +63,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: CMDOPTION_NONE }; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -82,7 +82,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: SvtCommandOptions(); virtual ~SvtCommandOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return complete specified list @descr Call it to get all entries of an dynamic menu. We return a list of all nodes with his names and properties. @@ -97,7 +97,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: bool HasEntries( CmdOption eOption ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Lookup if a command URL is inside a given list @descr Lookup if a command URL is inside a given lst @@ -112,7 +112,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short register an office frame, which must update its dispatches if the underlying configuration was changed. @@ -131,7 +131,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 1b47c5f24b63..a9afa0c9753d 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -26,9 +26,9 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ + // types, enums, ... -//_________________________________________________________________________________________________________________ + enum CompatibilityOptions { @@ -45,7 +45,7 @@ enum CompatibilityOptions COPT_EXPAND_WORDSPACE }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ @@ -65,11 +65,11 @@ enum CompatibilityOptions #define COMPATIBILITY_DEFAULT_NAME OUString( "_default" ) -//_________________________________________________________________________________________________________________ + // forward declarations -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -78,7 +78,7 @@ enum CompatibilityOptions class SvtCompatibilityOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @@ -90,17 +90,17 @@ class SvtCompatibilityOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -119,11 +119,11 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options SvtCompatibilityOptions(); virtual ~SvtCompatibilityOptions(); - //--------------------------------------------------------------------------------------------------------- + // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short clear complete specified list @descr Call this methods to clear the whole list. @@ -139,7 +139,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options void SetDefault( OUString sName, bool bValue ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return complete specified list @descr Call it to get all entries of compatibility options. We return a list of all nodes with its names and properties. @@ -154,7 +154,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short append a new item @descr @@ -194,13 +194,13 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options bool IsConsiderWrappingStyle() const; bool IsExpandWordSpace() const; - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -216,9 +216,9 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx index 64f4c886fa30..9c89affe7c7b 100644 --- a/include/unotools/componentresmodule.hxx +++ b/include/unotools/componentresmodule.hxx @@ -28,16 +28,16 @@ class ResMgr; -//........................................................................ + namespace utl { -//........................................................................ + class OComponentResModuleImpl; - //==================================================================== + //= OComponentResourceModule - //==================================================================== + /** extends the comphelper::OModule implementation with simply resource access */ @@ -62,9 +62,9 @@ namespace utl virtual void onLastClient(); }; - //========================================================================= + //= ModuleRes - //========================================================================= + /** specialized ResId, using the resource manager provided by a given OModule */ class UNOTOOLS_DLLPUBLIC ModuleRes : public ::ResId @@ -73,9 +73,9 @@ namespace utl ModuleRes( sal_uInt16 _nId, OComponentResourceModule& _rModule ) : ResId( _nId, *_rModule.getResManager() ) { } }; - //==================================================================== + //= defining a concrete module - //==================================================================== + #define DEFINE_MODULE( ModuleClass, ClientClass, ResClass ) \ /* -------------------------------------------------------------------- */ \ class ModuleClass : public ::utl::OComponentResourceModule \ @@ -140,9 +140,9 @@ namespace utl } \ }; - //==================================================================== + //= implementing a concrete module - //==================================================================== + #define IMPLEMENT_MODULE( ModuleClass, resprefix ) \ struct CreateModuleClass \ { \ @@ -171,9 +171,9 @@ namespace utl create( CreateModuleClass(), ::osl::GetGlobalMutex() ); \ } \ -//........................................................................ + } // namespace utl -//........................................................................ + #endif // INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index d278ccba6b7c..7865bdb3f60c 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -27,7 +27,7 @@ #include <unotools/unotoolsdllapi.h> #include <unotools/options.hxx> -//----------------------------------------------------------------------------- + namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; @@ -42,7 +42,7 @@ namespace com{ namespace sun{ namespace star{ class XChangesListener; } }}} -//----------------------------------------------------------------------------- + namespace utl { #define CONFIG_MODE_IMMEDIATE_UPDATE 0x00 @@ -82,7 +82,7 @@ namespace utl void CallNotify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); - //*********************************************************************************************************************** + // In special mode ALL_LOCALES we must support reading/writing of localized cfg entries as Sequence< PropertyValue >. // These methods are helper to convert given lists of names and Any-values. // format: PropertyValue.Name = <locale as ISO string> diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 295569de4c1b..50ed8e98af2b 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -33,14 +33,14 @@ namespace comphelper class ComponentContext; } -//........................................................................ + namespace utl { -//........................................................................ - //======================================================================== + + //= OConfigurationNode - //======================================================================== + class OConfigurationTreeRoot; /** a small wrapper around a configuration node.<p/> Nodes in the terminology used herein are <em>inner</em> nodes of a configuration @@ -178,7 +178,7 @@ namespace utl /// invalidate the object virtual void clear() throw(); - // ----------------------- + // meta information about the node /// checks whether or not the object represents a set node. @@ -211,9 +211,9 @@ namespace utl OUString normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const; }; - //======================================================================== + //= OConfigurationTreeRoot - //======================================================================== + /** a specialized version of a OConfigurationNode, representing the root of a configuration sub tree<p/> Only this class is able to commit any changes made any any OConfigurationNode @@ -316,9 +316,9 @@ namespace utl virtual void clear() throw(); }; -//........................................................................ + } // namespace utl -//........................................................................ + #endif // INCLUDED_UNOTOOLS_CONFIGNODE_HXX diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx index c8a1f1b3b8a2..a4a937e8bc4b 100644 --- a/include/unotools/configpaths.hxx +++ b/include/unotools/configpaths.hxx @@ -23,10 +23,10 @@ #include <sal/types.h> #include <rtl/ustring.hxx> -//---------------------------------------------------------------------------- + namespace utl { -//---------------------------------------------------------------------------- + /** extract the local nodename and the parent nodepath from a configuration path. @@ -56,7 +56,7 @@ namespace utl OUString& _rsOutPath, OUString& _rsLocalName); -//---------------------------------------------------------------------------- + /** extract the first nodename from a configuration path. @param _sInPath @@ -77,7 +77,7 @@ namespace utl UNOTOOLS_DLLPUBLIC OUString extractFirstFromConfigurationPath( OUString const& _sInPath, OUString* _sOutPath = 0); -//---------------------------------------------------------------------------- + /** check whether a path is to a nested node with respect to a parent path. @param _sNestedPath @@ -101,7 +101,7 @@ namespace utl bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath); -//---------------------------------------------------------------------------- + /** get the relative path to a nested node with respect to a parent path. @param _sNestedPath @@ -126,7 +126,7 @@ namespace utl UNOTOOLS_DLLPUBLIC OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath); -//---------------------------------------------------------------------------- + /** Create a one-level relative configuration path from a set element name without a known set element type. @@ -141,7 +141,7 @@ namespace utl */ UNOTOOLS_DLLPUBLIC OUString wrapConfigurationElementName(OUString const& _sElementName); -//---------------------------------------------------------------------------- + /** Create a one-level relative configuration path from a set element name and a known set element type. @@ -161,9 +161,9 @@ namespace utl OUString wrapConfigurationElementName(OUString const& _sElementName, OUString const& _sTypeName); -//---------------------------------------------------------------------------- + } // namespace utl -//---------------------------------------------------------------------------- + #endif // INCLUDED_UNOTOOLS_CONFIGPATHS_HXX diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index 5e3b738f2e2b..14a9dfc7a4e1 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> -//......................................................................... + namespace utl { -//......................................................................... + #define CVC_READONLY_ACCESS 0x0000 #define CVC_UPDATE_ACCESS 0x0001 @@ -36,9 +36,9 @@ namespace utl struct OConfigurationValueContainerImpl; struct NodeValueAccessor; - //===================================================================== + //= OConfigurationValueContainer - //===================================================================== + /** allows simple access to static configuration structures. <p>The basic idea of this class is that it's clients (usually derived classes) simply register an @@ -64,7 +64,7 @@ namespace utl m_pImpl; protected: - //----------------------------------------------------------------- + // construction/destruction /** constructs the object @@ -94,7 +94,7 @@ namespace utl /// dtor ~OConfigurationValueContainer(); - //----------------------------------------------------------------- + // registering data containers /** registers a data accessor of an arbitrary type. @@ -174,9 +174,9 @@ namespace utl void implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor ); }; -//......................................................................... + } // namespace utl -//......................................................................... + #endif // INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx index cb34dbd8beb0..3887df2df5e2 100644 --- a/include/unotools/datetime.hxx +++ b/include/unotools/datetime.hxx @@ -31,10 +31,10 @@ class Date; class Time; class DateTime; -//......................................................................... + namespace utl { -//......................................................................... + namespace starutil = ::com::sun::star::util; @@ -49,9 +49,9 @@ namespace utl UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const ::rtl::OUString &i_rIn, starutil::Date& o_rDate); UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const ::rtl::OUString &i_rIn, starutil::Time& o_Time); -//......................................................................... + } // namespace utl -//......................................................................... + #endif // INCLUDED_UNOTOOLS_DATETIME_HXX diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx index d817a1b8d7f8..4e9872ed2351 100644 --- a/include/unotools/desktopterminationobserver.hxx +++ b/include/unotools/desktopterminationobserver.hxx @@ -21,14 +21,14 @@ #ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX #define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX -//........................................................................ + namespace utl { -//........................................................................ - //==================================================================== + + //= ITerminationListener - //==================================================================== + /** non-UNO version of the com.sun.star.frame::XTerminateListener */ class ITerminationListener @@ -41,9 +41,9 @@ namespace utl ~ITerminationListener() {} }; - //==================================================================== + //= DesktopTerminationObserver - //==================================================================== + /** a class which allows non-UNO components to observe the desktop (aka application) for it's shutdown */ @@ -63,9 +63,9 @@ namespace utl DesktopTerminationObserver(); // never implemented, only static methods }; -//........................................................................ + } // namespace utl -//........................................................................ + #endif // INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx index 864743eca9c5..7f057e5b8fcf 100644 --- a/include/unotools/dynamicmenuoptions.hxx +++ b/include/unotools/dynamicmenuoptions.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ @@ -35,7 +35,7 @@ #define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER OUString("ImageIdentifier") #define DYNAMICMENU_PROPERTYNAME_TARGETNAME OUString("TargetName") -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr You can use these enum values to specify right menu if you call our interface methods. *//*-*************************************************************************************************************/ enum EDynamicMenuType @@ -45,7 +45,7 @@ enum EDynamicMenuType E_HELPBOOKMARKS = 2 }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -54,7 +54,7 @@ enum EDynamicMenuType class SvtDynamicMenuOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @@ -67,7 +67,7 @@ class SvtDynamicMenuOptions_Impl; class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -86,7 +86,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::det SvtDynamicMenuOptions(); virtual ~SvtDynamicMenuOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return complete specified list @descr Call it to get all entries of an dynamic menu. We return a list of all nodes with his names and properties. @@ -102,7 +102,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::det ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetMenu( EDynamicMenuType eMenu ) const; private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index 394c910be956..88d5e29c8d89 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -22,15 +22,15 @@ #define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX #include <com/sun/star/lang/XComponent.hpp> -//......................................................................... + namespace utl { -//......................................................................... + struct OEventListenerAdapterImpl; - //===================================================================== + //= OEventListenerAdapter - //===================================================================== + /** base class for non-UNO dispose listeners */ class UNOTOOLS_DLLPUBLIC OEventListenerAdapter @@ -55,9 +55,9 @@ namespace utl virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) = 0; }; -//......................................................................... + } // namespace utl -//......................................................................... + #endif // INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx index c75bb955cb90..8569c64ca2c1 100644 --- a/include/unotools/extendedsecurityoptions.hxx +++ b/include/unotools/extendedsecurityoptions.hxx @@ -26,7 +26,7 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -35,7 +35,7 @@ class SvtExtendedSecurityOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about security features @descr - @@ -58,7 +58,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl OPEN_ALWAYS }; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -81,7 +81,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -97,9 +97,9 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index f2467835b104..b95242fe4b12 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_UNOTOOLS_FLTRCFG_HXX #define INCLUDED_UNOTOOLS_FLTRCFG_HXX -// ----------------------------------------------------------------------- + #include <unotools/unotoolsdllapi.h> #include <unotools/configitem.hxx> diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx index 2a2310734669..a8974588b47d 100644 --- a/include/unotools/fontcvt.hxx +++ b/include/unotools/fontcvt.hxx @@ -24,9 +24,9 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> -// ------------------ + // - FontToSubsFont - -// ------------------ + #define FONTTOSUBSFONT_IMPORT ((sal_uLong)0x00000001) #define FONTTOSUBSFONT_EXPORT ((sal_uLong)0x00000002) @@ -38,9 +38,9 @@ UNOTOOLS_DLLPUBLIC void DestroyFontToSubsFontConverter( F UNOTOOLS_DLLPUBLIC sal_Unicode ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c ); UNOTOOLS_DLLPUBLIC OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter ); -// --------------------------- + // - StarSymbolToMSMultiFont - -// --------------------------- + class UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont { diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index 68d35f06aba7..8bc32d04c495 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -30,9 +30,9 @@ namespace utl { struct FontNameAttr; } -// ---------------- + // - SubsFontName - -// ---------------- + #define SUBSFONT_ONLYONE ((sal_uLong)0x00000001) #define SUBSFONT_MS ((sal_uLong)0x00000002) @@ -45,9 +45,9 @@ UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewT struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const OUString&) const; }; -// --------------- + // - ConvertChar - -// --------------- + class UNOTOOLS_DLLPUBLIC ConvertChar { diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index 39c881f1dc88..c62f7dd34d66 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -25,7 +25,7 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -34,7 +34,7 @@ class SvtFontOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about font features @descr - @@ -47,7 +47,7 @@ class SvtFontOptions_Impl; class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -66,7 +66,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op SvtFontOptions(); virtual ~SvtFontOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Font" @descr These values defines different states of font handling. @@ -95,7 +95,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op void EnableFontWYSIWYG ( bool bState ) ; private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class use his own static mutex to be threadsafe. We create a static mutex only for one ime and use at different times. diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx index 1fdddf6dd54c..3aaff6e7ac2b 100644 --- a/include/unotools/historyoptions.hxx +++ b/include/unotools/historyoptions.hxx @@ -27,7 +27,7 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ @@ -38,7 +38,7 @@ #define HISTORY_PROPERTYNAME_PASSWORD OUString("Password") #define HISTORY_PROPERTYNAME_THUMBNAIL OUString("Thumbnail") -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr You can use these enum values to specify right history if you call ouer interface methods. *//*-*************************************************************************************************************/ @@ -49,7 +49,7 @@ enum EHistoryType eHELPBOOKMARKS = 2 }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -58,7 +58,7 @@ enum EHistoryType class SvtHistoryOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about history features @descr - @@ -71,7 +71,7 @@ class SvtHistoryOptions_Impl; class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -90,13 +90,13 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: SvtHistoryOptions(); virtual ~SvtHistoryOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/History/..." @descr key "PickList" : The last used documents displayed in the file menu. key "History" : The last opened documents general. *//*-*****************************************************************************************************/ - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short set/get max size of specified history @descr Call this methods to get information about max. size of specified list. These value lay down the max count of items in these history. If a new one @@ -114,7 +114,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: sal_uInt32 GetSize( EHistoryType eHistory ) const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short clear complete sepcified list @descr Call this methods to clear the whole list. After that GetItemCount() will return 0 ... but GetSize() will return the old value! @@ -129,7 +129,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: void Clear( EHistoryType eHistory ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return complete sepcified list @descr If you will show the whole list call this method to get it completely. @@ -143,7 +143,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList( EHistoryType eHistory ) const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short append a new item to specified list @descr You can append items to a list only - removing isn't allowed for a special item! The oldest entry is deleted automaticly if max size arrived or you can call Clear() ... @@ -169,7 +169,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr Make these class threadsafe. diff --git a/include/unotools/idhelper.hxx b/include/unotools/idhelper.hxx index bbbe959b52a3..63e13ce002da 100644 --- a/include/unotools/idhelper.hxx +++ b/include/unotools/idhelper.hxx @@ -30,12 +30,12 @@ #include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> -//......................................................................... + namespace utl { -//......................................................................... -//========================================================================= + + // to shorten some lines ... typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > TypeSequence; @@ -74,11 +74,11 @@ public: typedef std::map<TypeSequence, ::cppu::OImplementationId, TypeSequenceLess> MapType2Id; -//......................................................................... + } // namespace utl -//......................................................................... -//========================================================================= + + /** defines a helper class for implementing the XTypeProvider::getImplementationId. it maps sequences of ::com::sun::star::uno::Type to implementation ids (which means sequences of bytes).<BR> diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx index 7b153f637252..16d40fff9451 100644 --- a/include/unotools/itemholderbase.hxx +++ b/include/unotools/itemholderbase.hxx @@ -34,57 +34,57 @@ struct ItemHolderMutexBase enum EItem { E_ACCESSIBILITYOPTIONS , // 2 - E_ADDXMLTOSTORAGEOPTIONS , // + E_ADDXMLTOSTORAGEOPTIONS , E_APEARCFG , // 2 E_CJKOPTIONS , // 2 - E_CMDOPTIONS , // + E_CMDOPTIONS , E_COLORCFG , // 2 - E_COMPATIBILITY , // + E_COMPATIBILITY , E_CTLOPTIONS , // 2 - E_DEFAULTOPTIONS , // - E_DYNAMICMENUOPTIONS , // + E_DEFAULTOPTIONS , + E_DYNAMICMENUOPTIONS , - E_EVENTCFG , // - E_EXTENDEDSECURITYOPTIONS , // + E_EVENTCFG , + E_EXTENDEDSECURITYOPTIONS , - E_FLTRCFG , // - E_FONTOPTIONS , // + E_FLTRCFG , + E_FONTOPTIONS , E_FONTSUBSTCONFIG , // 2 E_HELPOPTIONS , // 2 - E_HISTORYOPTIONS , // + E_HISTORYOPTIONS , E_LANGUAGEOPTIONS , // 2 - E_LINGUCFG , // - E_LOCALISATIONOPTIONS , // + E_LINGUCFG , + E_LOCALISATIONOPTIONS , - E_MENUOPTIONS , // + E_MENUOPTIONS , E_MISCCFG , // 2 - E_MISCOPTIONS , // - E_MODULEOPTIONS , // + E_MISCOPTIONS , + E_MODULEOPTIONS , - E_OPTIONSDLGOPTIONS , // + E_OPTIONSDLGOPTIONS , - E_PATHOPTIONS , // + E_PATHOPTIONS , E_PRINTOPTIONS , // 2 E_PRINTFILEOPTIONS , // 2 - E_PRINTWARNINGOPTIONS , // + E_PRINTWARNINGOPTIONS , - E_REGOPTIONS , // + E_REGOPTIONS , - E_SAVEOPTIONS , // - E_SEARCHOPT , // - E_SECURITYOPTIONS , // + E_SAVEOPTIONS , + E_SEARCHOPT , + E_SECURITYOPTIONS , E_SYSLOCALEOPTIONS , // 2 E_USEROPTIONS , // 2 - E_VIEWOPTIONS_DIALOG , // - E_VIEWOPTIONS_TABDIALOG , // - E_VIEWOPTIONS_TABPAGE , // - E_VIEWOPTIONS_WINDOW // + E_VIEWOPTIONS_DIALOG , + E_VIEWOPTIONS_TABDIALOG , + E_VIEWOPTIONS_TABPAGE , + E_VIEWOPTIONS_WINDOW }; struct TItemInfo diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 8ce4961c472c..1c5c76f479be 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -162,16 +162,16 @@ public: SvtLinguConfig(); virtual ~SvtLinguConfig(); - // + // borrowed from utl::ConfigItem - // + com::sun::star::uno::Sequence< OUString > GetNodeNames( const OUString &rNode ); - // + com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetProperties( const com::sun::star::uno::Sequence< OUString > &rNames ); - // + bool ReplaceSetProperties( const OUString &rNode, @@ -196,7 +196,7 @@ public: //! linguistic configuration only //! bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; - // + bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx index d359c374ee19..da77f65d68fb 100644 --- a/include/unotools/localisationoptions.hxx +++ b/include/unotools/localisationoptions.hxx @@ -24,7 +24,7 @@ #include <osl/mutex.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -33,7 +33,7 @@ class SvtLocalisationOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about localisation features @descr - @@ -46,7 +46,7 @@ class SvtLocalisationOptions_Impl; class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -65,7 +65,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de SvtLocalisationOptions(); virtual ~SvtLocalisationOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic" @descr These value specifies if shortcuts should be assigned automatically. @@ -79,7 +79,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de bool IsAutoMnemonic ( ) const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale" @descr These value specifies the factor for increasing controls. Value from [0..100] are allowed. @@ -100,7 +100,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de sal_Int32 GetDialogScale( ) const ; private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index fc4864f0e29e..d3f2003914a5 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -50,7 +50,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap { public: - //--------------------------------------- + /** @short these methods can be used to get the different property names as static const OUString values. @@ -100,10 +100,10 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap static const OUString& PROP_VIEWONLY(); static const OUString& PROP_DOCUMENTBASEURL(); - //------------------------------------------- + // interface public: - //--------------------------------------- + /** @short these ctors do nothing - excepting that they forward the given parameters to the base class ctors. @@ -113,7 +113,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap MediaDescriptor(); MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); - //--------------------------------------- + /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. @@ -131,7 +131,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ bool addInputStream(); - //--------------------------------------- + /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. @@ -150,7 +150,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ bool addInputStreamOwnLock(); - //--------------------------------------- + /** @short it checks if the descriptor describes a readonly stream. @descr The descriptor itself isnt changed doing so. @@ -170,7 +170,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ bool isStreamReadOnly() const; - //--------------------------------------- + /** Returns a value from the sequence contained in the property 'ComponentData' of this media descriptor. @@ -185,7 +185,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap ::com::sun::star::uno::Any getComponentDataEntry( const OUString& rName ) const; - //--------------------------------------- + /** Inserts a value into the sequence contained in the property 'ComponentData' of the media descriptor. @@ -205,7 +205,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap const OUString& rName, const ::com::sun::star::uno::Any& rValue ); - //--------------------------------------- + /** Removes a value from the sequence contained in the property 'ComponentData' of the media descriptor. @@ -265,11 +265,11 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap comphelper::DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords = 0 ); - //------------------------------------------- + // helper private: - //--------------------------------------- + /** @short tries to open a stream by using the given PostData stream. @descr The stream is used directly ... @@ -293,7 +293,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData ) throw(::com::sun::star::uno::RuntimeException); - //--------------------------------------- + /** @short tries to open a stream by using the given URL. @descr First it tries to open the content in r/w mode (if its @@ -320,7 +320,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap bool bLockFile ) throw(::com::sun::star::uno::RuntimeException); - //--------------------------------------- + /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 4ef1236633ba..9dac7166bcc5 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -38,7 +38,7 @@ #define FEATUREFLAG_IMPRESS 0x00008000 #define FEATUREFLAG_INSIGHT 0x00010000 -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -46,7 +46,7 @@ *//*-*************************************************************************************************************/ class SvtModuleOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about installation state of modules @descr Use these class to get installation state of different office modules like writer, calc etc Further you can ask for additional information; e.g. name of standard template file, which @@ -118,21 +118,21 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: void SetFactoryDefaultFilter ( EFactory eFactory , const OUString& sFilter ); - //_______________________________________ + /** @short return the corresponding application ID for the given document service name. */ static EFactory ClassifyFactoryByServiceName(const OUString& sName); - //_______________________________________ + /** @short return the corresponding application ID for the given short name. */ static EFactory ClassifyFactoryByShortName(const OUString& sName); - //_______________________________________ + /** @short return the corresponding application ID for the given properties. @@ -155,7 +155,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: static EFactory ClassifyFactoryByURL(const OUString& sURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lMediaDescriptor); - //_______________________________________ + /** @short return the corresponding application ID for the given properties. diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx index c83a1ed63260..d85094d88216 100644 --- a/include/unotools/printwarningoptions.hxx +++ b/include/unotools/printwarningoptions.hxx @@ -26,7 +26,7 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -35,7 +35,7 @@ class SvtPrintWarningOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about startup features @descr - @@ -48,7 +48,7 @@ class SvtPrintWarningOptions_Impl; class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::detail::Options { public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -67,7 +67,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::de SvtPrintWarningOptions(); virtual ~SvtPrintWarningOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Print/Warning..." @descr These options describe internal states to enable/disable features of installed office. @@ -86,7 +86,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::de private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class use his own static mutex to be threadsafe. We create a static mutex only for one ime and use at different times. diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index 6b05a2c6bbd0..0067b7da23ae 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -40,9 +40,9 @@ public: sal_Int32 GetTransliterationFlags() const; - // + // General Options - // + bool IsWholeWordsOnly() const; bool IsBackwards() const; @@ -61,9 +61,9 @@ public: void SetMatchCase( bool bVal ); // also Japanese search option void SetNotes( bool bVal); - // + // Japanese search options - // + bool IsMatchFullHalfWidthForms() const; bool IsMatchHiraganaKatakana() const; diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index 3e906b2c9624..df11b692197b 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -26,7 +26,7 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism @@ -35,7 +35,7 @@ class SvtSecurityOptions_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr These values present modes to handle StarOffice basic scripts. see GetBasicMode/SetBasicMode() for further information *//*-*************************************************************************************************************/ @@ -47,7 +47,7 @@ enum EBasicSecurityMode eALWAYS_EXECUTE = 2 }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about security features @descr - @@ -103,7 +103,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail */ public: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it @@ -122,7 +122,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail SvtSecurityOptions(); virtual ~SvtSecurityOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short returns readonly state @descr It can be called to get information about the readonly state of a provided item. @seealso - @@ -135,7 +135,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail bool IsReadOnly( EOption eOption ) const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" @descr These value displays the list of all trustworthy URLs. zB.: file:/ => All scripts from the local file system including a LAN; @@ -156,7 +156,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail ::com::sun::star::uno::Sequence< OUString > GetSecureURLs( ) const ; void SetSecureURLs( const ::com::sun::star::uno::Sequence< OUString >& seqURLList ) ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic" @descr These value determines how StarOffice Basic scripts should be handled. It exist 3 different modes: @@ -218,13 +218,13 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail bool IsConfirmationEnabled() const; void SetConfirmationEnabled( bool bSet ); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! @@ -240,9 +240,9 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index fe980db0fbd3..f4b3fc7fe056 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -31,14 +31,14 @@ namespace com { namespace sun { namespace star { class XComponent; } } } } -//............................................................................ + namespace utl { -//............................................................................ - //======================================================================== + + //= DisposableComponent - //======================================================================== + /** is a class which controls lifetime of an UNO component via ->XComponent::dispose You'll usually never use this class directly, but only as parameter for a @@ -71,9 +71,9 @@ namespace utl DisposableComponent& operator=( const DisposableComponent& ); // never implemented }; - //======================================================================== + //= CloseableComponent - //======================================================================== + class CloseableComponentImpl; /** is a class which controls lifetime of an UNO component via ->XCloseable::close @@ -113,9 +113,9 @@ namespace utl CloseableComponent& operator=( const CloseableComponent& ); // never implemented }; - //======================================================================== + //= SharedUNOComponent - //======================================================================== + /** is a helper class for sharing ownership of a UNO component If you need to share an UNO component, which normally needs a dedicated owner, @@ -236,14 +236,14 @@ namespace utl } }; - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > INTERFACE* SAL_CALL SharedUNOComponent< INTERFACE, COMPONENT >::operator->() const { return m_xTypedComponent.operator->(); } - //------------------------------------------------------------------------- + // assignments template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::reset( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode ) @@ -252,7 +252,7 @@ namespace utl m_xTypedComponent = _rxComponent; } - //------------------------------------------------------------------------- + // comparison operators template < class INTERFACE, class COMPONENT > bool operator==( const ::com::sun::star::uno::Reference< INTERFACE >& _rLHS, const SharedUNOComponent< INTERFACE, COMPONENT >& _rRHS ) @@ -266,7 +266,7 @@ namespace utl return _rLHS.getTyped() == _rRHS; } - //------------------------------------------------------------------------- + // conversion to Any template < class INTERFACE, class COMPONENT > inline void SAL_CALL operator <<= ( ::com::sun::star::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW(()) @@ -274,49 +274,49 @@ namespace utl rAny <<= value.getTyped(); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > inline ::com::sun::star::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW(()) { return makeAny( value.getTyped() ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _queryThrow ), TakeOwnership ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _queryThrow ), TakeOwnership ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rAny, _queryThrow ), TakeOwnership ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const INTERFACE* _pInterface, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _setThrow ), TakeOwnership ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Reference< INTERFACE >& _rRef, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _setThrow ), TakeOwnership ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const SharedUNOComponent& _rComp, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) { @@ -325,7 +325,7 @@ namespace utl m_xTypedComponent.set( m_xTypedComponent, _setThrow ); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_Query _query ) { @@ -333,7 +333,7 @@ namespace utl return is(); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference& _rRef, ::com::sun::star::uno::UnoReference_Query _query ) { @@ -341,7 +341,7 @@ namespace utl return is(); } - //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_Query _query ) { @@ -349,9 +349,9 @@ namespace utl return is(); } -//............................................................................ + } // namespace utl -//............................................................................ + #endif // INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index ddb5e1a070d7..fc0bc7e44903 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -37,9 +37,9 @@ namespace utl namespace stario = ::com::sun::star::io; namespace staruno = ::com::sun::star::uno; -//================================================================== + //= OInputStreamWrapper -//================================================================== + typedef ::cppu::WeakImplHelper1 < stario::XInputStream > InputStreamWrapper_Base; // needed for some compilers @@ -74,9 +74,9 @@ protected: void checkError() const; }; -//================================================================== + //= OSeekableInputStreamWrapper -//================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable > OSeekableInputStreamWrapper_Base; /** helper class for wrapping an SvStream into an com.sun.star.io::XInputStream @@ -96,9 +96,9 @@ public: virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; -//================================================================== + //= OOutputStreamWrapper -//================================================================== + typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamWrapper_Base; // needed for some compilers class OOutputStreamWrapper : public OutputStreamWrapper_Base @@ -121,9 +121,9 @@ protected: SvStream& rStream; }; -//================================================================== + //= OSeekableOutputStreamWrapper -//================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable > OSeekableOutputStreamWrapper_Base; /** helper class for wrapping an SvStream into an com.sun.star.io::XOutputStream diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 759343563e83..574070e0ba52 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -39,10 +39,10 @@ namespace com { } } -// ............................................................................ + namespace utl { -// ............................................................................ + // Utility class for searching class UNOTOOLS_DLLPUBLIC SearchParam @@ -58,7 +58,7 @@ private: bool m_bWordOnly : 1; // used by normal search bool m_bSrchInSel : 1; // search only in the selection - bool m_bCaseSense : 1; // + bool m_bCaseSense : 1; // values for the "weight Levenshtein-Distance" bool bLEV_Relaxed : 1; @@ -116,7 +116,7 @@ public: // - ordinary text (Bayer/Moore) // - regular expressions // - weighted Levenshtein distance -// + // This class allows forward and backward searching! class UNOTOOLS_DLLPUBLIC TextSearch @@ -173,9 +173,9 @@ public: }; -// ............................................................................ + } // namespace utl -// ............................................................................ + #endif diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index 89d2d20111e6..c5a4e676057d 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -29,13 +29,13 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> -//_________________________________________________________________________________________________________________ + // forward declarations -//_________________________________________________________________________________________________________________ + class SvtViewOptionsBase_Impl; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr Use these enum values to specify right list in configuration in which your view data are saved. *//*-*************************************************************************************************************/ @@ -47,7 +47,7 @@ enum EViewType E_WINDOW = 3 }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short collect information about view features @descr We support different basetypes of views like dialogs, tab-dialogs, tab-pages and normal windows. You must specify your basetype by using right enum value and must give us a valid name for your @@ -105,17 +105,17 @@ enum EViewType class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Options { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short standard constructor and destructor @descr This will de-/initialize an instance with default values. You must give us the basic type of your view and a name which specify right entry @@ -134,7 +134,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op const OUString& sViewName ); virtual ~SvtViewOptions(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short support preload of these config item @descr Sometimes we need preloading of these configuration data without real using of it. @@ -149,11 +149,11 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op static void AcquireOptions(); static void ReleaseOptions(); - //--------------------------------------------------------------------------------------------------------- + // interface - //--------------------------------------------------------------------------------------------------------- - /*-****************************************************************************************************//** + + /*-**************************************************************************************************** @short use it to get information about existing entries in configuration @descr The methods to set/get the position or size will create a new entry automaticly if it not already exist and work with default values! @@ -167,7 +167,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op bool Exists() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short use it to delete an entry of dynamic view set @descr You can use this method to delete anexisting node in configuration. But if you call a Set- or Get- method again on this instance @@ -183,7 +183,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op bool Delete(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short use it to set/get the window state of your view @descr These value describe position/size and some other states of a window. Use it with right vcl methods directly. Normaly it's not necessary to @@ -197,7 +197,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op OUString GetWindowState( ) const; void SetWindowState( const OUString& sState ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short use it to set/get the page number which was the last active one @descr It's only supported for: - tab-dialogs If you call it for other ones you will get an assertion in debug version. @@ -211,7 +211,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op sal_Int32 GetPageID( ) const; void SetPageID( sal_Int32 nID ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short use it to set/get the visual state of a window @descr It's only supported for: - windows If you call it for other ones you will get an assertion in debug version. @@ -232,7 +232,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op */ bool HasVisible() const; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short use it to set/get the extended user data (consisting of a set of named scalar values) @descr It's supported for ALL types! Every view can handle its own user defined data set. @@ -244,7 +244,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetUserData( ) const; void SetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lData ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short use it to set/get ONE special user data item directly @descr Normaly you can work on full user data list by using "Set/GetUserData()". With this function you have an access on special list entries directly without any @@ -258,13 +258,13 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op void SetUserItem( const OUString& sName , const ::com::sun::star::uno::Any& aValue ); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is threadsafe. We create a static mutex only for one time and use it to protect our refcount and container @@ -280,9 +280,9 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 61347bb6aca1..587479d125dd 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -37,11 +37,11 @@ #include <vector> -// ============================================================================ + typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE; -// ============================================================================ + /** A wrapper that holds a com.sun.star.container.XIndexAccess and provides a com.sun.star.container.XEnumeration. @@ -75,7 +75,7 @@ private: sal_Int32 mnIndex; }; -// ============================================================================ + /** A wrapper that holds a com.sun.star.container.XEnumeration or a com.sun.star.container.XIndexAccess and provides an enumeration of VBA objects. @@ -119,7 +119,7 @@ protected: css::uno::Reference< css::container::XEnumeration > mxEnumeration; }; -// ============================================================================ + // deprecated, use SimpleEnumerationBase instead! class VBAHELPER_DLLPUBLIC EnumerationHelperImpl : public EnumerationHelper_BASE diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 2d25ab99af26..8654a6e9281e 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -// ============================================================================ + typedef ::cppu::WeakImplHelper3< css::script::vba::XVBAEventProcessor, @@ -77,7 +77,7 @@ public: { checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); } protected: - // ------------------------------------------------------------------------ + struct EventHandlerInfo { @@ -102,7 +102,7 @@ protected: sal_Int32 nCancelIndex = -1, const css::uno::Any& rUserData = css::uno::Any() ); - // ------------------------------------------------------------------------ + struct EventQueueEntry { @@ -177,7 +177,7 @@ private: bool mbDisposed; }; -// ============================================================================ + #endif diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 66a1dc15449d..0a7cfd515e12 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -129,7 +129,7 @@ public: InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {} }; -// ============================================================================ + /** Helper macro to implement the method 'getServiceImplName()' of the 'ooo.vba.XHelperInterface' interface. Will return the class name as service @@ -141,7 +141,7 @@ OUString classname::getServiceImplName() \ return OUString( #classname ); \ } -// ---------------------------------------------------------------------------- + /** Helper macro to implement the method 'getServiceNames()' for a single service name. @@ -158,7 +158,7 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ return saServiceNames; \ } -// ---------------------------------------------------------------------------- + /** Helper macro to declare the methods 'getServiceImplName()' and 'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface in a class @@ -168,7 +168,7 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ virtual OUString getServiceImplName(); \ virtual css::uno::Sequence< OUString > getServiceNames(); -// ---------------------------------------------------------------------------- + /** Helper macro to implement the methods 'getServiceImplName()' and 'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface. Will @@ -178,7 +178,7 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \ VBAHELPER_IMPL_GETSERVICENAMES( classname, servicename ) -// ============================================================================ + #endif diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 282074f8d73e..483f7492a9ae 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -23,9 +23,9 @@ #include <vcl/dllapi.h> #include <vcl/bitmap.hxx> -// ------------- + // - AlphaMask - -// ------------- + class ImageList; class BitmapEx; diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 86e404ec6a83..a37399215d03 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -192,9 +192,9 @@ public: } }; -// -------------------- + // Resample kernels -// -------------------- + class Kernel { diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 97b3a5b1f66e..5fa7c81e7f3b 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -32,9 +32,9 @@ namespace com { namespace sun { namespace star { namespace rendering { class XBitmapCanvas; } } } } -// ------------------- + // - TransparentType - -// ------------------- + enum TransparentType { @@ -43,9 +43,9 @@ enum TransparentType TRANSPARENT_BITMAP }; -// ------------ + // - BitmapEx - -// ------------ + class VCL_DLLPUBLIC BitmapEx { @@ -453,7 +453,7 @@ public: const Size &rSize ); }; -// ------------------------------------------------------------------ + /** Create a blend frame as BitmapEx @param nAlpha @@ -494,7 +494,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame( Color aColorBottomRight, Color aColorBottomLeft); -// ------------------------------------------------------------------ + #endif // INCLUDED_VCL_BITMAPEX_HXX diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index a6472b479b27..e96f49c02d5f 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -25,9 +25,9 @@ #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> -// -------------------- + // - Access defines - -// -------------------- + #define DECL_FORMAT_GETPIXEL( Format ) \ static BitmapColor GetPixelFor##Format( ConstScanline pScanline, long nX, const ColorMask& rMask ); @@ -60,16 +60,16 @@ case( BMP_FORMAT##Format ): \ break; -// -------------------- + // - Access functions - -// -------------------- + typedef BitmapColor (*FncGetPixel)( ConstScanline pScanline, long nX, const ColorMask& rMask ); typedef void (*FncSetPixel)( Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask ); -// -------------------- + // - BitmapReadAccess - -// -------------------- + class VCL_DLLPUBLIC BitmapReadAccess { @@ -167,9 +167,9 @@ public: BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; }; -// --------------------- + // - BitmapWriteAccess - -// --------------------- + class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess { @@ -212,44 +212,44 @@ private: BitmapWriteAccess& operator=( const BitmapWriteAccess& ) { return *this; } }; -// ----------- + // - Inlines - -// ----------- + inline bool BitmapReadAccess::operator!() const { return( mpBuffer == NULL ); } -// ------------------------------------------------------------------ + inline long BitmapReadAccess::Width() const { return( mpBuffer ? mpBuffer->mnWidth : 0L ); } -// ------------------------------------------------------------------ + inline long BitmapReadAccess::Height() const { return( mpBuffer ? mpBuffer->mnHeight : 0L ); } -// ------------------------------------------------------------------ + inline Point BitmapReadAccess::TopLeft() const { return Point(); } -// ------------------------------------------------------------------ + inline Point BitmapReadAccess::BottomRight() const { return Point( Width() - 1L, Height() - 1L ); } -// ------------------------------------------------------------------ + inline bool BitmapReadAccess::IsTopDown() const { @@ -257,14 +257,14 @@ inline bool BitmapReadAccess::IsTopDown() const return( mpBuffer ? sal::static_int_cast<bool>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : false ); } -// ------------------------------------------------------------------ + inline bool BitmapReadAccess::IsBottomUp() const { return !IsTopDown(); } -// ------------------------------------------------------------------ + inline sal_uLong BitmapReadAccess::GetScanlineFormat() const { @@ -272,7 +272,7 @@ inline sal_uLong BitmapReadAccess::GetScanlineFormat() const return( mpBuffer ? BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ) : 0UL ); } -// ------------------------------------------------------------------ + inline sal_uLong BitmapReadAccess::GetScanlineSize() const { @@ -280,7 +280,7 @@ inline sal_uLong BitmapReadAccess::GetScanlineSize() const return( mpBuffer ? mpBuffer->mnScanlineSize : 0UL ); } -// ------------------------------------------------------------------ + inline sal_uInt16 BitmapReadAccess::GetBitCount() const { @@ -288,7 +288,7 @@ inline sal_uInt16 BitmapReadAccess::GetBitCount() const return( mpBuffer ? mpBuffer->mnBitCount : 0 ); } -// ------------------------------------------------------------------ + inline BitmapColor BitmapReadAccess::GetBestMatchingColor( const BitmapColor& rBitmapColor ) { @@ -298,7 +298,7 @@ inline BitmapColor BitmapReadAccess::GetBestMatchingColor( const BitmapColor& rB return rBitmapColor; } -// ------------------------------------------------------------------ + inline Scanline BitmapReadAccess::GetBuffer() const { @@ -306,7 +306,7 @@ inline Scanline BitmapReadAccess::GetBuffer() const return( mpBuffer ? mpBuffer->mpBits : NULL ); } -// ------------------------------------------------------------------ + inline Scanline BitmapReadAccess::GetScanline( long nY ) const { @@ -315,7 +315,7 @@ inline Scanline BitmapReadAccess::GetScanline( long nY ) const return( mpBuffer ? mpScanBuf[ nY ] : NULL ); } -// ------------------------------------------------------------------ + inline bool BitmapReadAccess::HasPalette() const { @@ -323,7 +323,7 @@ inline bool BitmapReadAccess::HasPalette() const return( mpBuffer && !!mpBuffer->maPalette ); } -// ------------------------------------------------------------------ + inline const BitmapPalette& BitmapReadAccess::GetPalette() const { @@ -331,7 +331,7 @@ inline const BitmapPalette& BitmapReadAccess::GetPalette() const return mpBuffer->maPalette; } -// ------------------------------------------------------------------ + inline sal_uInt16 BitmapReadAccess::GetPaletteEntryCount() const { @@ -339,7 +339,7 @@ inline sal_uInt16 BitmapReadAccess::GetPaletteEntryCount() const return( HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0 ); } -// ------------------------------------------------------------------ + inline const BitmapColor& BitmapReadAccess::GetPaletteColor( sal_uInt16 nColor ) const { @@ -348,14 +348,14 @@ inline const BitmapColor& BitmapReadAccess::GetPaletteColor( sal_uInt16 nColor ) return mpBuffer->maPalette[ nColor ]; } -// ------------------------------------------------------------------ + inline const BitmapColor& BitmapReadAccess::GetBestPaletteColor( const BitmapColor& rBitmapColor ) const { return GetPaletteColor( GetBestPaletteIndex( rBitmapColor ) ); } -// ------------------------------------------------------------------ + inline bool BitmapReadAccess::HasColorMask() const { @@ -369,7 +369,7 @@ inline bool BitmapReadAccess::HasColorMask() const nFormat == BMP_FORMAT_32BIT_TC_MASK ); } -// ------------------------------------------------------------------ + inline ColorMask& BitmapReadAccess::GetColorMask() const { @@ -377,7 +377,7 @@ inline ColorMask& BitmapReadAccess::GetColorMask() const return mpBuffer->maColorMask; } -// ------------------------------------------------------------------ + inline BitmapColor BitmapReadAccess::GetPixel( long nY, long nX ) const { @@ -392,7 +392,7 @@ inline sal_uInt8 BitmapReadAccess::GetPixelIndex( long nY, long nX ) const return GetPixel( nY, nX ).GetBlueOrIndex(); } -// ------------------------------------------------------------------ + inline BitmapColor BitmapReadAccess::GetPixelFromData( const sal_uInt8* pData, long nX ) const { @@ -400,7 +400,7 @@ inline BitmapColor BitmapReadAccess::GetPixelFromData( const sal_uInt8* pData, l return mFncGetPixel( pData, nX, maColorMask ); } -// ------------------------------------------------------------------ + inline void BitmapReadAccess::SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor ) { @@ -408,7 +408,7 @@ inline void BitmapReadAccess::SetPixelOnData( sal_uInt8* pData, long nX, const B mFncSetPixel( pData, nX, rBitmapColor, maColorMask ); } -// ------------------------------------------------------------------ + inline BitmapColor BitmapReadAccess::GetColor( long nY, long nX ) const { @@ -418,14 +418,14 @@ inline BitmapColor BitmapReadAccess::GetColor( long nY, long nX ) const return GetPixel( nY, nX ); } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapReadAccess::GetLuminance( long nY, long nX ) const { return GetColor( nY, nX ).GetLuminance(); } -// ------------------------------------------------------------------ + inline void BitmapWriteAccess::SetPalette( const BitmapPalette& rPalette ) { @@ -433,7 +433,7 @@ inline void BitmapWriteAccess::SetPalette( const BitmapPalette& rPalette ) mpBuffer->maPalette = rPalette; } -// ------------------------------------------------------------------ + inline void BitmapWriteAccess::SetPaletteEntryCount( sal_uInt16 nCount ) { @@ -441,7 +441,7 @@ inline void BitmapWriteAccess::SetPaletteEntryCount( sal_uInt16 nCount ) mpBuffer->maPalette.SetEntryCount( nCount ); } -// ------------------------------------------------------------------ + inline void BitmapWriteAccess::SetPaletteColor( sal_uInt16 nColor, const BitmapColor& rBitmapColor ) { @@ -450,7 +450,7 @@ inline void BitmapWriteAccess::SetPaletteColor( sal_uInt16 nColor, const BitmapC mpBuffer->maPalette[ nColor ] = rBitmapColor; } -// ------------------------------------------------------------------ + inline void BitmapWriteAccess::SetPixel( long nY, long nX, const BitmapColor& rBitmapColor ) { @@ -465,7 +465,7 @@ inline void BitmapWriteAccess::SetPixelIndex( long nY, long nX, sal_uInt8 cIndex SetPixel( nY, nX, BitmapColor( cIndex )); } -// ------------------------------------------------------------------ + #endif // INCLUDED_VCL_BMPACC_HXX diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 1da2e8ce894e..a27a1840b580 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -34,9 +34,9 @@ class UserDrawEvent; class ImplCommonButtonData; -// ---------- + // - Button - -// ---------- + class VCL_DLLPUBLIC Button : public Control { @@ -89,16 +89,16 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue); }; -// -------------------- + // - PushButton-Types - -// -------------------- + #define PUSHBUTTON_DROPDOWN_TOOLBOX ((sal_uInt16)0x0001) #define PUSHBUTTON_DROPDOWN_MENUBUTTON ((sal_uInt16)0x0002) -// -------------- + // - PushButton - -// -------------- + class VCL_DLLPUBLIC PushButton : public Button { @@ -204,9 +204,9 @@ inline bool PushButton::IsChecked() const return (GetState() == TRISTATE_TRUE); } -// ------------ + // - OKButton - -// ------------ + class VCL_DLLPUBLIC OKButton : public PushButton { @@ -226,9 +226,9 @@ public: virtual void Click(); }; -// ---------------- + // - CancelButton - -// ---------------- + class VCL_DLLPUBLIC CancelButton : public PushButton { @@ -255,9 +255,9 @@ public: }; -// -------------- + // - HelpButton - -// -------------- + class VCL_DLLPUBLIC HelpButton : public PushButton { @@ -277,9 +277,9 @@ public: virtual void Click(); }; -// --------------- + // - RadioButton - -// --------------- + class VCL_DLLPUBLIC RadioButton : public Button { @@ -408,9 +408,9 @@ public: void group(RadioButton &rOther); }; -// ------------ + // - CheckBox - -// ------------ + class VCL_DLLPUBLIC CheckBox : public Button { @@ -512,9 +512,9 @@ inline bool CheckBox::IsChecked() const return (GetState() == TRISTATE_TRUE); } -// --------------------------------- + // - Control-Layer fuer alten Code - -// --------------------------------- + class VCL_DLLPUBLIC ImageButton : public PushButton { diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx index 7172bd5b4149..49afcaf31414 100644 --- a/include/vcl/canvastools.hxx +++ b/include/vcl/canvastools.hxx @@ -73,7 +73,7 @@ namespace vcl namespace unotools { // Bitmap conversions - // =================================================================== + /** Create an XBitmap from VCL BitmapEx */ @@ -88,7 +88,7 @@ namespace vcl ::com::sun::star::rendering::XIntegerReadOnlyBitmap >& xInputBitmap ); // Color conversions (vcl/tools Color <-> canvas standard color space) - // =================================================================== + /** Create a device-specific color sequence from VCL/Tools color @@ -149,7 +149,7 @@ namespace vcl ::com::sun::star::rendering::XColorSpace> VCL_DLLPUBLIC createStandardColorSpace(); // Geometry conversions (vcl/tools <-> x) - // =================================================================== + // geometry::Real ::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index d62caa076820..95fbaa6db0ea 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -26,9 +26,9 @@ #include <vcl/keycod.hxx> #include <vcl/font.hxx> -// --------------------------- + // - CommandExtTextInputData - -// --------------------------- + #define EXTTEXTINPUT_ATTR_GRAYWAVELINE ((sal_uInt16)0x0100) #define EXTTEXTINPUT_ATTR_UNDERLINE ((sal_uInt16)0x0200) @@ -78,9 +78,9 @@ public: bool IsOnlyCursorChanged() const { return mbOnlyCursor; } }; -// --------------------------- + // - CommandInputContextData - -// --------------------------- + class VCL_DLLPUBLIC CommandInputContextData { @@ -104,9 +104,9 @@ inline CommandInputContextData::CommandInputContextData( LanguageType eLang ) meLanguage = eLang; } -// -------------------- + // - CommandWheelData - -// -------------------- + #define COMMAND_WHEEL_SCROLL ((sal_uInt16)0x0001) #define COMMAND_WHEEL_ZOOM ((sal_uInt16)0x0002) @@ -178,9 +178,9 @@ inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDel mbDeltaIsPixel = bDeltaIsPixel; } -// --------------------- + // - CommandScrollData - -// --------------------- + class VCL_DLLPUBLIC CommandScrollData { @@ -208,9 +208,9 @@ inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY ) mnDeltaY = nDeltaY; } -// --------------------- + // - CommandModKeyData - -// --------------------- + class VCL_DLLPUBLIC CommandModKeyData { @@ -247,9 +247,9 @@ inline CommandModKeyData::CommandModKeyData( sal_uInt16 nCode ) mnCode = nCode; } -// -------------------- + // - CommanDialogData - -// -------------------- + #define SHOWDIALOG_ID_PREFERENCES 1 #define SHOWDIALOG_ID_ABOUT 2 @@ -265,9 +265,9 @@ class VCL_DLLPUBLIC CommandDialogData int GetDialogId() const { return m_nDialogId; } }; -// -------------- + // Media Commands -// -------------- + #define MEDIA_COMMAND_CHANNEL_DOWN ((sal_Int16)1) // Decrement the channel value, for example, for a TV or radio tuner. #define MEDIA_COMMAND_CHANNEL_UP ((sal_Int16)2) // Increment the channel value, for example, for a TV or radio tuner. @@ -293,9 +293,9 @@ class VCL_DLLPUBLIC CommandDialogData #define MEDIA_COMMAND_PREVIOUSTRACK_HOLD ((sal_Int16)22)// Button Left holding pressed. -// ------------------------------ + // - CommandSelectionChangeData - -// ------------------------------ + class VCL_DLLPUBLIC CommandSelectionChangeData { @@ -323,9 +323,9 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, mnEnd = nEnd; } -// ---------------- + // - CommandEvent - -// ---------------- + #define COMMAND_CONTEXTMENU ((sal_uInt16)1) #define COMMAND_STARTDRAG ((sal_uInt16)2) diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 1e460878cfa4..7809188db1bb 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -31,9 +31,9 @@ class ImplListBoxFloatingWindow; class ImplListBox; class ImplBtn; -// ------------ + // - ComboBox - -// ------------ + class VCL_DLLPUBLIC ComboBox : public Edit { diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index 83ba494b06b6..93fee293eb11 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -26,17 +26,17 @@ #include <boost/unordered_map.hpp> -//........................................................................ + namespace vcl { -//........................................................................ + typedef boost::unordered_map< OUString, OUString, OUStringHash > OUStrMap; class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} }; - //==================================================================== + //= SettingsConfigItem - //==================================================================== + class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { @@ -57,9 +57,9 @@ namespace vcl virtual void Commit(); }; -//........................................................................ + } // namespace vcl -//........................................................................ + #endif // INCLUDED_VCL_CONFIGSETTINGS_HXX diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 8b3bc14d27df..34879707e115 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -30,9 +30,9 @@ namespace vcl { struct ImplControlData; struct ControlLayoutData; } class StyleSettings; -// ----------- + // - Control - -// ----------- + class VCL_DLLPUBLIC Control : public Window { diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index b1d0aaca820b..254d887b7251 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -24,9 +24,9 @@ #include <tools/link.hxx> #include <vcl/salctype.hxx> -// -------------------- + // - GraphicConverter - -// -------------------- + struct ConvertData; class Graphic; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 59a886227526..53e88f4ee4e3 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -30,9 +30,9 @@ // whereas NULL chooses the default dialog parent #define DIALOG_NO_PARENT ((Window*)0xffffffff) -// ---------- + // - Dialog - -// ---------- + struct DialogImpl; class VclBox; class VclButtonBox; @@ -117,7 +117,7 @@ public: virtual void SetText( const OUString& rStr ); virtual OUString GetText() const; - //////////////////////////////////////// + // Dialog::Execute replacement API public: // Link impl: DECL_LINK( MyEndDialogHdl, Dialog* ); <= param is dialog just ended @@ -129,7 +129,7 @@ private: public: // Dialog::Execute replacement API - //////////////////////////////////////// + void EndDialog( long nResult = 0 ); static void EndAllDialogs( Window* pParent=NULL ); @@ -144,9 +144,9 @@ public: void GrabFocusToFirstControl(); }; -// ------------------ + // - ModelessDialog - -// ------------------ + class VCL_DLLPUBLIC ModelessDialog : public Dialog { @@ -159,9 +159,9 @@ public: explicit ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; -// --------------- + // - ModalDialog - -// --------------- + class VCL_DLLPUBLIC ModalDialog : public Dialog { diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index b880147260e0..6091f6e1e768 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -24,14 +24,14 @@ #include <tools/rc.hxx> #include <vcl/region.hxx> -////////////////////////////////////////////////////////////////////////////// + // predefines class SvStream; class BitmapEx; class Bitmap; -////////////////////////////////////////////////////////////////////////////// + bool VCL_DLLPUBLIC ReadDIB( // ReadDIB(rBitmap, rIStm, true); Bitmap& rTarget, @@ -47,7 +47,7 @@ bool VCL_DLLPUBLIC ReadDIBV5( Bitmap& rTargetAlpha, SvStream& rIStm); -////////////////////////////////////////////////////////////////////////////// + bool VCL_DLLPUBLIC WriteDIB( // WriteDIB(rBitmap, rOStm, false, true); const Bitmap& rSource, @@ -64,10 +64,10 @@ bool VCL_DLLPUBLIC WriteDIBV5( const Bitmap& rSourceAlpha, SvStream& rOStm); -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_VCL_DIBTOOLS_HXX -////////////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 2c0a3d4ceb39..7330209ced8d 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -220,9 +220,9 @@ public: Rectangle GetPosSizePixel( const Window *pWin ); }; -// ----------------- + // - DockingWindow - -// ----------------- + class VCL_DLLPUBLIC DockingWindow : public Window { diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 3fe232d96539..2e22e25d9a2d 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -39,18 +39,18 @@ namespace i18n { struct DDInfo; struct Impl_IMEInfos; -// -------------- + // - Edit-Types - -// -------------- + #define EDIT_NOLIMIT SAL_MAX_INT32 #define EDIT_UPDATEDATA_TIMEOUT 350 typedef OUString (*FncGetSpecialChars)( Window* pWin, const Font& rFont ); -// -------- + // - Edit - -// -------- + enum AutocompleteAction{ AUTOCOMPLETE_KEYINPUT, AUTOCOMPLETE_TABFORWARD, AUTOCOMPLETE_TABBACKWARD }; diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index bdb983d19853..dbd6d131803f 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -42,9 +42,9 @@ enum TextDirectionality { TextDirectionality_TopToBottom_RightToLeft }; -// ------------ + // - KeyEvent - -// ------------ + class VCL_DLLPUBLIC KeyEvent { private: @@ -81,9 +81,9 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode, mnRepeat = nRepeat; } -// -------------------- + // - MouseEvent-Types - -// -------------------- + // Maus-Move-Modi #define MOUSE_SIMPLEMOVE ((sal_uInt16)0x0001) @@ -105,9 +105,9 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode, #define MOUSE_MIDDLE ((sal_uInt16)0x0002) #define MOUSE_RIGHT ((sal_uInt16)0x0004) -// -------------- + // - MouseEvent - -// -------------- + class VCL_DLLPUBLIC MouseEvent { @@ -237,9 +237,9 @@ public: } }; -// ------------- + // - HelpEvent - -// ------------- + #define HELPMODE_CONTEXT ((sal_uInt16)0x0001) #define HELPMODE_EXTENDED ((sal_uInt16)0x0002) @@ -283,9 +283,9 @@ inline HelpEvent::HelpEvent( sal_uInt16 nHelpMode ) mbKeyboardActivated = true; } -// ----------------- + // - UserDrawEvent - -// ----------------- + class VCL_DLLPUBLIC UserDrawEvent { @@ -324,9 +324,9 @@ inline UserDrawEvent::UserDrawEvent( OutputDevice* pOut, mnStyle = nStyle; } -// ------------------ + // - Tracking-Types - -// ------------------ + #define ENDTRACK_CANCEL ((sal_uInt16)0x0001) #define ENDTRACK_KEY ((sal_uInt16)0x0002) @@ -336,9 +336,9 @@ inline UserDrawEvent::UserDrawEvent( OutputDevice* pOut, #define TRACKING_REPEAT ((sal_uInt16)0x0100) -// ----------------- + // - TrackingEvent - -// ----------------- + class VCL_DLLPUBLIC TrackingEvent { @@ -375,9 +375,9 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, mnFlags = nTrackFlags; } -// --------------- + // - NotifyEvent - -// --------------- + #define EVENT_MOUSEBUTTONDOWN 1 #define EVENT_MOUSEBUTTONUP 2 @@ -461,9 +461,9 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const return NULL; } -// -------------------- + // - DataChangedEvent - -// -------------------- + #define DATACHANGED_SETTINGS ((sal_uInt16)1) #define DATACHANGED_DISPLAY ((sal_uInt16)2) diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx index 303958a19f94..3b502a4a9be7 100644 --- a/include/vcl/evntpost.hxx +++ b/include/vcl/evntpost.hxx @@ -22,7 +22,7 @@ #include <tools/link.hxx> #include <vcl/dllapi.h> -//=================================================================== + namespace vcl { diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index e3e066da01ab..47b77abda784 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -34,9 +34,9 @@ class CalendarWrapper; class LocaleDataWrapper; class LanguageTag; -// ----------------- + // - FormatterBase - -// ----------------- + class VCL_DLLPUBLIC FormatterBase { @@ -94,9 +94,9 @@ public: }; -// -------------------- + // - PatternFormatter - -// -------------------- + #define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001) @@ -135,9 +135,9 @@ public: bool IsStringModified() const { return !(GetString() == maFieldString ); } }; -// -------------------- + // - NumericFormatter - -// -------------------- + class VCL_DLLPUBLIC NumericFormatter : public FormatterBase { @@ -212,9 +212,9 @@ public: sal_Int64 Denormalize( sal_Int64 nValue ) const; }; -// ------------------- + // - MetricFormatter - -// ------------------- + class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter { @@ -272,9 +272,9 @@ public: }; -// --------------------- + // - CurrencyFormatter - -// --------------------- + class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter { @@ -298,9 +298,9 @@ public: }; -// ----------------- + // - DateFormatter - -// ----------------- + class VCL_DLLPUBLIC DateFormatter : public FormatterBase { @@ -354,15 +354,15 @@ public: const Date& GetMax() const { return maMax; } - // -------------------------------------------------------------- + // MT: Remove these methods too, ExtDateFormat should be enough! // What should happen if using DDMMYYYY, but ShowCentury=false? - // -------------------------------------------------------------- + void SetLongFormat( bool bLong ); bool IsLongFormat() const { return mbLongFormat; } void SetShowDateCentury( bool bShowCentury ); bool IsShowDateCentury() const { return mbShowDateCentury; } - // -------------------------------------------------------------- + void SetDate( const Date& rNewDate ); void SetUserDate( const Date& rNewDate ); @@ -395,9 +395,9 @@ public: }; -// ----------------- + // - TimeFormatter - -// ----------------- + class VCL_DLLPUBLIC TimeFormatter : public FormatterBase { @@ -476,9 +476,9 @@ public: }; -// ---------------- + // - PatternField - -// ---------------- + class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { @@ -492,9 +492,9 @@ public: }; -// ---------------- + // - NumericField - -// ---------------- + class VCL_DLLPUBLIC NumericField : public SpinField, public NumericFormatter { @@ -522,9 +522,9 @@ public: }; -// ---------------- + // - MetricField - -// ---------------- + class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter { @@ -593,9 +593,9 @@ public: }; -// ----------------- + // - CurrencyField - -// ----------------- + class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { @@ -617,9 +617,9 @@ public: }; -// ------------- + // - DateField - -// ------------- + class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter { @@ -653,9 +653,9 @@ public: Date GetLast() const { return maLast; } }; -// ------------- + // - TimeField - -// ------------- + class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter { @@ -692,9 +692,9 @@ public: }; -// -------------- + // - PatternBox - -// -------------- + class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { @@ -711,9 +711,9 @@ public: }; -// -------------- + // - NumericBox - -// -------------- + class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { @@ -736,9 +736,9 @@ public: }; -// ------------- + // - MetricBox - -// ------------- + class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { @@ -769,9 +769,9 @@ public: }; -// --------------- + // - CurrencyBox - -// --------------- + class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { @@ -791,9 +791,9 @@ public: virtual sal_Int64 GetValue() const; }; -// ----------- + // - DateBox - -// ----------- + class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { @@ -811,9 +811,9 @@ public: }; -// ----------- + // - TimeBox - -// ----------- + class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 8eba420ac504..e3193841bf92 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -29,9 +29,9 @@ class UserDrawEvent; -// ------------- + // - FixedText - -// ------------- + class VCL_DLLPUBLIC FixedText : public Control { @@ -90,9 +90,9 @@ public: virtual void LoseFocus(); }; -// ------------- + // - FixedLine - -// ------------- + class VCL_DLLPUBLIC FixedLine : public Control { @@ -124,9 +124,9 @@ public: virtual Size GetOptimalSize() const; }; -// --------------- + // - FixedBitmap - -// --------------- + class VCL_DLLPUBLIC FixedBitmap : public Control { @@ -160,9 +160,9 @@ public: const Bitmap& GetBitmap() const { return maBitmap; } }; -// -------------- + // - FixedImage - -// -------------- + class VCL_DLLPUBLIC FixedImage : public Control { diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 30a2ab5e6a7b..224c4fecab07 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -23,9 +23,9 @@ #include <vcl/dllapi.h> #include <vcl/fixed.hxx> - //===================================================================== + //= FixedHyperlink - //===================================================================== + class VCL_DLLPUBLIC FixedHyperlink : public FixedText { private: diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index fcc47519a7cb..92d1f488e3d7 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -26,9 +26,9 @@ class ToolBox; -// ------------------------ + // - FloatingWindow-Types - -// ------------------------ + #define FLOATWIN_POPUPMODE_ALLOWTEAROFF ((sal_uLong)0x00000001) #define FLOATWIN_POPUPMODE_ANIMATIONSLIDE ((sal_uLong)0x00000002) @@ -60,9 +60,9 @@ class ToolBox; #define FLOATWIN_TITLE_POPUP ((sal_uInt16)0x0004) #define FLOATWIN_TITLE_NONE ((sal_uInt16)0x0008) -// ------------------ + // - FloatingWindow - -// ------------------ + class VCL_DLLPUBLIC FloatingWindow : public SystemWindow { diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index dbd44fcddaf5..e7973a16c777 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -35,9 +35,9 @@ class Impl_Font; class ImplFontAttributes; class Size; -// -------- + // - Font - -// -------- + class VCL_DLLPUBLIC Font { diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index 863d9fe239f3..559edccaa2ee 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -21,7 +21,7 @@ #include <vcl/gdimtf.hxx> -////////////////////////////////////////////////////////////////////////////// + // #i121267# Added tooling to be able to support old exporters which are based on // metafiles as graphic content, but do not implement using the contained clip // regions. @@ -34,12 +34,12 @@ void VCL_DLLPUBLIC clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); -////////////////////////////////////////////////////////////////////////////// + // Allow to check if a Metafile contains clipping or not bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource); -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_VCL_GDIMETAFILETOOLS_HXX diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index fcb095ab6bba..4abf32da40f9 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -36,9 +36,9 @@ class Polygon; class PolyPolygon; class Gradient; -// --------------------- + // - GDIMetaFile-Types - -// --------------------- + #define GDI_METAFILE_END ((size_t)0xFFFFFFFF) #define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0xFFFFFFFF) @@ -62,9 +62,9 @@ enum MtfConversion MTF_CONVERSION_8BIT_GREYS = 2 }; -// ----------------------------- + // - Color conversion routines - -// ----------------------------- + typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 84d49314c53e..55c1eae3c3f2 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -26,9 +26,9 @@ #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> -// ------------- + // - ImpBuffer - -// ------------- + struct ImpBuffer { @@ -46,9 +46,9 @@ struct ImpBuffer ~ImpBuffer() { delete[] mpBuffer; } }; -// ----------- + // - ImpSwap - -// ----------- + struct ImpSwap { @@ -66,9 +66,9 @@ struct ImpSwap void WriteTo( SvStream& rOStm ) const; }; -// -------------- + // - ImpGfxLink - -// -------------- + struct ImpGfxLink { @@ -87,9 +87,9 @@ struct ImpGfxLink //#endif // __PRIVATE -// --------------- + // - GfxLinkType - -// --------------- + enum GfxLinkType { @@ -112,9 +112,9 @@ enum GfxLinkType #define GFX_LINK_FIRST_NATIVE_ID GFX_LINK_TYPE_NATIVE_GIF #define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP -// ----------- + // - GfxLink - -// ----------- + struct ImpBuffer; struct ImpSwap; diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 9b044f0f103d..c01e7b65b46c 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -26,9 +26,9 @@ #include <vcl/vclenum.hxx> -// ---------------- + // - Impl_Gradient - -// ---------------- + class Rectangle; class Point; @@ -56,9 +56,9 @@ public: Impl_Gradient( const Impl_Gradient& rImplGradient ); }; -// ------------ + // - Gradient - -// ------------ + class VCL_DLLPUBLIC Gradient { diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 3d19705f0aa0..e6fe04fc0b70 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -34,9 +34,9 @@ namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } } -// ----------- + // - Graphic - -// ----------- + class ImpGraphic; class OutputDevice; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 03403d7dac1b..a27fcbe98c2e 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -118,9 +118,9 @@ struct ConvertData; #define GFF_MOV ( (sal_uInt16)0x00fa ) #define GFF_XXX ( (sal_uInt16)0xffff ) -// --------------------- + // - GraphicDescriptor - -// --------------------- + class VCL_DLLPUBLIC GraphicDescriptor { diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 6deb4978d913..449788a90cbe 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -24,9 +24,9 @@ #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> -// ------------ + // - GroupBox - -// ------------ + class VCL_DLLPUBLIC GroupBox : public Control { diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 3b9b578b92d0..8be2fadeedb4 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -25,9 +25,9 @@ #include <vcl/vclenum.hxx> -// -------------- + // - Impl_Hatch - -// -------------- + class SvStream; @@ -46,9 +46,9 @@ struct ImplHatch friend SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch ); }; -// --------- + // - Hatch - -// --------- + class VCL_DLLPUBLIC Hatch { diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index fee319685088..f1048fec0747 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -28,9 +28,9 @@ class Point; class Rectangle; class Window; -// -------------- + // - Help-Types - -// -------------- + #define QUICKHELP_LEFT ((sal_uInt16)0x0001) #define QUICKHELP_CENTER ((sal_uInt16)0x0002) @@ -52,9 +52,9 @@ class Window; #define OOO_HELP_INDEX ".help:index" #define OOO_HELP_HELPONHELP ".help:helponhelp" -// -------- + // - Help - -// -------- + class VCL_DLLPUBLIC Help { diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx index 79f53b75bd1d..f6c50f2e457d 100644 --- a/include/vcl/imagerepository.hxx +++ b/include/vcl/imagerepository.hxx @@ -25,14 +25,14 @@ class BitmapEx; -//........................................................................ + namespace vcl { -//........................................................................ - //==================================================================== + + //= ImageRepository - //==================================================================== + // provides access to the application's image repository (image.zip) class VCL_DLLPUBLIC ImageRepository { @@ -59,9 +59,9 @@ namespace vcl ); }; -//........................................................................ + } // namespace vcl -//........................................................................ + #endif // INCLUDED_VCL_IMAGEREPOSITORY_HXX diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 505232569808..337746f66815 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -25,9 +25,9 @@ #include <vcl/fixed.hxx> #include <vcl/bitmapex.hxx> -// ---------------- + // - ImageControl - -// ---------------- + class VCL_DLLPUBLIC ImageControl : public FixedImage { diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index 76a35480f4d4..9e18c167a265 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -24,18 +24,18 @@ #include <vcl/dllapi.h> #include <vcl/font.hxx> -// ---------------------- + // - InputContext-Flags - -// ---------------------- + #define INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) #define INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) #define INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uLong)0x00000004) #define INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008) -// ---------------- + // - InputContext - -// ---------------- + class VCL_DLLPUBLIC InputContext { diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 3ed5862991d6..e876ac6cb888 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -772,7 +772,7 @@ VCL_DLLPUBLIC inline bool isContainerWindow(const Window *pWindow) //layout and isn't visible yet VCL_DLLPUBLIC bool isInitialLayout(const Window *pWindow); -// retro-fitting utilities // +// retro-fitting utilities //Get a Size which is large enough to contain all children with //an equal amount of space at top left and bottom right diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index d6a9028320f2..96418479c00a 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -26,9 +26,9 @@ #include <basegfx/vector/b2enums.hxx> #include <com/sun/star/drawing/LineCap.hpp> -// ---------------- + // - ImplLineInfo - -// ---------------- + class SvStream; namespace basegfx { class B2DPolyPolygon; } @@ -56,9 +56,9 @@ struct ImplLineInfo friend SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ); }; -// ------------ + // - LineInfo - -// ------------ + class VCL_DLLPUBLIC LineInfo { diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index f837d5d4d341..7a912388e4b8 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -26,9 +26,9 @@ class LocaleDataWrapper; -// ------------------------- + // - LongCurrencyFormatter - -// ------------------------- + class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase { @@ -75,9 +75,9 @@ public: BigInt GetCorrectedValue() const { return mnCorrectedValue; } }; -// --------------------- + // - LongCurrencyField - -// --------------------- + class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter { @@ -109,9 +109,9 @@ public: BigInt GetSpinSize() const { return mnSpinSize; } }; -// ------------------- + // - LongCurrencyBox - -// ------------------- + class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter { diff --git a/include/vcl/lstbox.h b/include/vcl/lstbox.h index bbc26e507f95..80383cfec234 100644 --- a/include/vcl/lstbox.h +++ b/include/vcl/lstbox.h @@ -24,7 +24,7 @@ #define LISTBOX_ENTRY_NOTFOUND ((sal_uInt16)0xFFFF) #define LISTBOX_ERROR ((sal_uInt16)0xFFFF) -// -------------------------------------------------------------------- + // the following defines can be used for the SetEntryFlags() // and GetEntryFlags() methods diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 76ec86b6673d..bfba165e8466 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -30,9 +30,9 @@ class ImplListBoxFloatingWindow; class ImplBtn; class ImplWin; -// -------------------------------------------------------------------- + // - ListBox - -// -------------------------------------------------------------------- + class VCL_DLLPUBLIC ListBox : public Control { @@ -236,9 +236,9 @@ public: void EnableQuickSelection( const bool& b ); }; -// ---------------- + // - MultiListBox - -// ---------------- + class VCL_DLLPUBLIC MultiListBox : public ListBox { diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index c95a11f22f82..10e06d2e9ca3 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -29,9 +29,9 @@ class SvStream; -// -------------- + // - ImplMapMode - -// -------------- + class OutputDevice; @@ -57,9 +57,9 @@ public: ImplMapMode( const ImplMapMode& rImpMapMode ); }; -// ----------- + // - MapMode - -// ----------- + class VCL_DLLPUBLIC MapMode { diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 8b081d17c391..3bf288095a2f 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -55,9 +55,9 @@ namespace accessibility { namespace vcl { struct MenuLayoutData; } -// -------------- + // - Menu-Types - -// -------------- + #define MENU_APPEND ((sal_uInt16)0xFFFF) #define MENU_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) @@ -91,9 +91,9 @@ struct ImplMenuDelData bool isDeleted() const { return mpMenu == 0; } }; -// -------- + // - Menu - -// -------- + struct MenuLogo { @@ -357,9 +357,9 @@ public: void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID }; -// ----------- + // - MenuBar - -// ----------- + class VCL_DLLPUBLIC MenuBar : public Menu { @@ -443,9 +443,9 @@ inline MenuBar& MenuBar::operator =( const MenuBar& rMenu ) } -// ------------- + // - PopupMenu - -// ------------- + class VCL_DLLPUBLIC PopupMenu : public Menu { diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 244171f9786e..27a849849911 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -28,9 +28,9 @@ class ImplFontCharMap; typedef sal_uInt32 sal_UCS4; -// ------------ + // - FontInfo - -// ------------ + class VCL_DLLPUBLIC FontInfo : public Font { @@ -52,9 +52,9 @@ public: { return !operator==( rInfo ); } }; -// -------------- + // - FontMetric - -// -------------- + class VCL_DLLPUBLIC FontMetric : public FontInfo { @@ -76,9 +76,9 @@ public: { return !operator==( rMetric ); } }; -// --------------- + // - FontCharMap - -// --------------- + class VCL_DLLPUBLIC FontCharMap { @@ -112,9 +112,9 @@ private: void operator=( const FontCharMap& ); }; -// ---------------- + // - TextRectInfo - -// ---------------- + class VCL_DLLPUBLIC TextRectInfo { diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 10eb7dea5c07..27fbbdd281c0 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -25,9 +25,9 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -// --------------------- + // - ImplMnemonicTypes - -// --------------------- + // Mnemonic Chars, which we want support // Latin 0-9 @@ -51,9 +51,9 @@ #define MNEMONIC_CHAR ((sal_Unicode)'~') #define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF) -// ------------------------- + // - MnemonicGenerator - -// ------------------------- + class VCL_DLLPUBLIC MnemonicGenerator { diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx index e07298da53ed..c8c40009f468 100644 --- a/include/vcl/mnemonicengine.hxx +++ b/include/vcl/mnemonicengine.hxx @@ -30,14 +30,14 @@ class KeyEvent; -//........................................................................ + namespace vcl { -//........................................................................ - //==================================================================== + + //= IMnemonicEntryList - //==================================================================== + /// callback for a MnemonicEngine class SAL_NO_VTABLE VCL_DLLPUBLIC IMnemonicEntryList { @@ -115,9 +115,9 @@ namespace vcl ~IMnemonicEntryList() {} }; - //==================================================================== + //= MnemonicEngine - //==================================================================== + struct MnemonicEngine_Data; class VCL_DLLPUBLIC MnemonicEngine { @@ -145,9 +145,9 @@ namespace vcl bool HandleKeyEvent( const KeyEvent& _rKEvt ); }; -//........................................................................ + } // namespace vcl -//........................................................................ + #endif // INCLUDED_VCL_MNEMONICENGINE_HXX diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 99b54a6090b2..432aea8be69f 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -27,9 +27,9 @@ struct ImplMoreButtonData; -// -------------- + // - MoreButton - -// -------------- + class VCL_DLLPUBLIC MoreButton : public PushButton { diff --git a/include/vcl/pngread.hxx b/include/vcl/pngread.hxx index b676872c2005..8513a1a6c446 100644 --- a/include/vcl/pngread.hxx +++ b/include/vcl/pngread.hxx @@ -24,9 +24,9 @@ #include <vcl/bitmapex.hxx> #include <vector> -// ------------- + // - PNGReader - -// ------------- + namespace vcl { diff --git a/include/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx index 89b218b75725..dfdd84667b74 100644 --- a/include/vcl/pngwrite.hxx +++ b/include/vcl/pngwrite.hxx @@ -26,9 +26,9 @@ #include <vcl/bitmapex.hxx> #include <vector> -// ------------- + // - PNGWriter - -// ------------- + namespace vcl { diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index aea233c7ba61..344b35cefce5 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -46,7 +46,7 @@ struct VCL_DLLPUBLIC PPDValue OUString m_aValue; }; -// ---------------------------------------------------------------------- + /* * PPDKey - a container for the available options (=values) of a PPD keyword @@ -105,7 +105,7 @@ struct PPDKeyhash { return (size_t)pKey; } }; -// ---------------------------------------------------------------------- + /* * PPDParser - parses a PPD file and contains all available keys from it @@ -255,7 +255,7 @@ public: const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; }; -// ---------------------------------------------------------------------- + /* * PPDContext - a class to manage user definable states based on the diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index f1c189930a66..7fc653a7d507 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -45,15 +45,15 @@ * ************************************************************************/ -// ----------- + // - WinBits - -// ----------- + #define WB_STDPROGRESSBAR WB_BORDER -// --------------- + // - ProgressBar - -// --------------- + class VCL_DLLPUBLIC ProgressBar : public Window { diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 386f43fc4a0c..4c254448a29e 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -50,9 +50,9 @@ namespace vcl { class PrintDialog; } -// ----------------- + // - Printer-Types - -// ----------------- + #define PAGEQUEUE_ALLPAGES 0xFFFF @@ -61,9 +61,9 @@ enum PrinterSupport { SUPPORT_SET_ORIENTATION, SUPPORT_SET_PAPERBIN, SUPPORT_COPY, SUPPORT_COLLATECOPY, SUPPORT_SETUPDIALOG, SUPPORT_FAX, SUPPORT_PDF }; -// --------------- + // - PrinterPage - -// --------------- + class VCL_DLLPUBLIC PrinterPage { @@ -84,9 +84,9 @@ public: }; -// ------------- + // - QueueInfo - -// ------------- + class VCL_DLLPUBLIC QueueInfo { @@ -118,9 +118,9 @@ public: friend VCL_DLLPUBLIC SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ); }; -// ------------------ + // - PrinterOptions - -// ------------------ + enum PrinterTransparencyMode { @@ -128,7 +128,7 @@ enum PrinterTransparencyMode PRINTER_TRANSPARENCY_NONE = 1 }; -// ----------------------------------------------------------------------------- + enum PrinterGradientMode { @@ -136,7 +136,7 @@ enum PrinterGradientMode PRINTER_GRADIENT_COLOR = 1 }; -// ----------------------------------------------------------------------------- + enum PrinterBitmapMode { @@ -145,7 +145,7 @@ enum PrinterBitmapMode PRINTER_BITMAP_RESOLUTION = 2 }; -// ----------------------------------------------------------------------------- + class VCL_DLLPUBLIC PrinterOptions { @@ -207,9 +207,9 @@ public: bool ReadFromConfig( bool bFile ); }; -// ----------- + // - Printer - -// ----------- + class VCL_DLLPUBLIC Printer : public OutputDevice { diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx index 2797fff1b6af..eee32352b4b9 100644 --- a/include/vcl/prntypes.hxx +++ b/include/vcl/prntypes.hxx @@ -23,21 +23,21 @@ #include <tools/solar.h> #include <i18nutil/paper.hxx> -// --------------- + // - Duplex Mode - -// --------------- + enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE }; -// --------------- + // - Orientation - -// --------------- + enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; -// ------------------- + // - QueueInfo-Types - -// ------------------- + #define QUEUE_STATUS_READY ((sal_uLong)0x00000001) #define QUEUE_STATUS_PAUSED ((sal_uLong)0x00000002) @@ -67,9 +67,9 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; #define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) -// ----------------- + // - Printer-Types - -// ----------------- + #define PRINTER_CAPABILITIES_SUPPORTDIALOG ((sal_uInt16)1) #define PRINTER_CAPABILITIES_COPIES ((sal_uInt16)2) diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx index 09ab22d3c4b7..08d1fa384b46 100644 --- a/include/vcl/quickselectionengine.hxx +++ b/include/vcl/quickselectionengine.hxx @@ -26,16 +26,16 @@ class KeyEvent; -//........................................................................ + namespace vcl { -//........................................................................ + typedef const void* StringEntryIdentifier; - //==================================================================== + //= ISearchableStringList - //==================================================================== + // TODO: consolidate this with ::vcl::IMnemonicEntryList class SAL_NO_VTABLE VCL_DLLPUBLIC ISearchableStringList { @@ -61,9 +61,9 @@ namespace vcl ~ISearchableStringList() {} }; - //==================================================================== + //= QuickSelectionEngine - //==================================================================== + struct QuickSelectionEngine_Data; class VCL_DLLPUBLIC QuickSelectionEngine { @@ -85,9 +85,9 @@ namespace vcl QuickSelectionEngine& operator=( const QuickSelectionEngine& ); // never implemented }; -//........................................................................ + } // namespace vcl -//........................................................................ + #endif // INCLUDED_VCL_QUICKSELECTIONENGINE_HXX diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 54889a35bde8..7829c1166a25 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -30,18 +30,18 @@ #include <tools/solar.h> #include <vcl/dllapi.h> -// ---------- + // - Memory - -// ---------- + typedef sal_uInt8* HPBYTE; typedef HPBYTE Scanline; typedef const sal_uInt8* ConstHPBYTE; typedef ConstHPBYTE ConstScanline; -// ------------------ + // - Bitmap formats - -// ------------------ + #define BMP_FORMAT_BOTTOM_UP 0x00000000UL #define BMP_FORMAT_TOP_DOWN 0x80000000UL @@ -73,7 +73,7 @@ typedef ConstHPBYTE ConstScanline; #define BMP_SCANLINE_ADJUSTMENT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x80000000UL ) #define BMP_SCANLINE_FORMAT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x7FFFFFFFUL ) -// ------------------------------------------------------------------ + #define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col ) \ sal_uLong _def_cR = (sal_uInt8) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ @@ -83,7 +83,7 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift (sal_uInt8) ( _def_cG | ( ( _def_cG & mnGOr ) >> mnGOrShift ) ), \ (sal_uInt8) ( _def_cB | ( ( _def_cB & mnBOr ) >> mnBOrShift ) ) ); -// ------------------------------------------------------------------ + #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS ) \ ( ( ( ( d_RS < 0L ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ @@ -93,9 +93,9 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift ( ( ( d_BS < 0L ) ? ( (sal_uInt32) (d_rCol).GetBlue() >> -d_BS ) : \ ( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) ) -// --------------- + // - BitmapColor - -// --------------- + class Color; @@ -155,9 +155,9 @@ public: inline sal_uLong GetColorError( const BitmapColor& rBitmapColor ) const; }; -// --------------- + // - BitmapPalette - -// --------------- + class Palette; @@ -198,9 +198,9 @@ public: bool IsGreyPalette() const; }; -// --------------- + // - ColorMask - -// --------------- + class VCL_DLLPUBLIC ColorMask { @@ -244,9 +244,9 @@ public: inline void SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; }; -// --------------- + // - BitmapBuffer - -// --------------- + struct VCL_DLLPUBLIC BitmapBuffer { @@ -263,15 +263,15 @@ struct VCL_DLLPUBLIC BitmapBuffer ~BitmapBuffer() {} }; -// --------------------- + // - StretchAndConvert - -// --------------------- + VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = NULL, const ColorMask* pDstMask = NULL ); -// ------------------------------------------------------------------ + inline BitmapColor::BitmapColor() : mcBlueOrIndex ( 0 ), @@ -281,7 +281,7 @@ inline BitmapColor::BitmapColor() : { } -// ------------------------------------------------------------------ + inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ) : mcBlueOrIndex ( cBlue ), @@ -291,7 +291,7 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBl { } -// ------------------------------------------------------------------ + inline BitmapColor::BitmapColor( const BitmapColor& rBitmapColor ) : mcBlueOrIndex ( rBitmapColor.mcBlueOrIndex ), @@ -301,7 +301,7 @@ inline BitmapColor::BitmapColor( const BitmapColor& rBitmapColor ) : { } -// ------------------------------------------------------------------ + inline BitmapColor::BitmapColor( const Color& rColor ) : mcBlueOrIndex ( rColor.GetBlue() ), @@ -311,7 +311,7 @@ inline BitmapColor::BitmapColor( const Color& rColor ) : { } -// ------------------------------------------------------------------ + inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) : mcBlueOrIndex ( cIndex ), @@ -321,7 +321,7 @@ inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) : { } -// ------------------------------------------------------------------ + inline bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const { @@ -330,14 +330,14 @@ inline bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const ( mcGreen == rBitmapColor.mcGreen && mcRed == rBitmapColor.mcRed ) ) ); } -// ------------------------------------------------------------------ + inline bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const { return !( *this == rBitmapColor ); } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapColor::operator=( const BitmapColor& rBitmapColor ) { @@ -349,14 +349,14 @@ inline BitmapColor& BitmapColor::operator=( const BitmapColor& rBitmapColor ) return *this; } -// ------------------------------------------------------------------ + inline bool BitmapColor::IsIndex() const { return mbIndex; } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapColor::GetRed() const { @@ -364,7 +364,7 @@ inline sal_uInt8 BitmapColor::GetRed() const return mcRed; } -// ------------------------------------------------------------------ + inline void BitmapColor::SetRed( sal_uInt8 cRed ) { @@ -372,7 +372,7 @@ inline void BitmapColor::SetRed( sal_uInt8 cRed ) mcRed = cRed; } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapColor::GetGreen() const { @@ -380,7 +380,7 @@ inline sal_uInt8 BitmapColor::GetGreen() const return mcGreen; } -// ------------------------------------------------------------------ + inline void BitmapColor::SetGreen( sal_uInt8 cGreen ) { @@ -388,7 +388,7 @@ inline void BitmapColor::SetGreen( sal_uInt8 cGreen ) mcGreen = cGreen; } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapColor::GetBlue() const { @@ -396,7 +396,7 @@ inline sal_uInt8 BitmapColor::GetBlue() const return mcBlueOrIndex; } -// ------------------------------------------------------------------ + inline void BitmapColor::SetBlue( sal_uInt8 cBlue ) { @@ -404,7 +404,7 @@ inline void BitmapColor::SetBlue( sal_uInt8 cBlue ) mcBlueOrIndex = cBlue; } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapColor::GetIndex() const { @@ -412,7 +412,7 @@ inline sal_uInt8 BitmapColor::GetIndex() const return mcBlueOrIndex; } -// ------------------------------------------------------------------ + inline void BitmapColor::SetIndex( sal_uInt8 cIndex ) { @@ -420,7 +420,7 @@ inline void BitmapColor::SetIndex( sal_uInt8 cIndex ) mcBlueOrIndex = cIndex; } -// ------------------------------------------------------------------ + inline BitmapColor::operator Color() const { @@ -428,7 +428,7 @@ inline BitmapColor::operator Color() const return Color( mcRed, mcGreen, mcBlueOrIndex ); } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapColor::GetBlueOrIndex() const { @@ -436,7 +436,7 @@ inline sal_uInt8 BitmapColor::GetBlueOrIndex() const return mcBlueOrIndex; } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapColor::Invert() { @@ -446,7 +446,7 @@ inline BitmapColor& BitmapColor::Invert() return *this; } -// ------------------------------------------------------------------ + inline sal_uInt8 BitmapColor::GetLuminance() const { @@ -454,7 +454,7 @@ inline sal_uInt8 BitmapColor::GetLuminance() const return( (sal_uInt8) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed * 77UL ) >> 8UL ) ); } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc ) { @@ -466,7 +466,7 @@ inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc ) return *this; } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapColor::DecreaseLuminance( sal_uInt8 cGreyDec ) { @@ -478,7 +478,7 @@ inline BitmapColor& BitmapColor::DecreaseLuminance( sal_uInt8 cGreyDec ) return *this; } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uInt8 cTransparency ) { @@ -491,7 +491,7 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn return *this; } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapColor::Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB, sal_uInt8 cTransparency ) { @@ -503,7 +503,7 @@ inline BitmapColor& BitmapColor::Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB return *this; } -// ------------------------------------------------------------------ + inline sal_uLong BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { @@ -514,7 +514,7 @@ inline sal_uLong BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) c labs( mcRed - rBitmapColor.mcRed ) ) ); } -// ------------------------------------------------------------------ + inline BitmapPalette::BitmapPalette() : mpBitmapColor ( NULL ), @@ -522,7 +522,7 @@ inline BitmapPalette::BitmapPalette() : { } -// ------------------------------------------------------------------ + inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : mnCount( rBitmapPalette.mnCount ) @@ -537,7 +537,7 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : mpBitmapColor = NULL; } -// ------------------------------------------------------------------ + inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : mnCount( nCount ) @@ -552,14 +552,14 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : mpBitmapColor = NULL; } -// ------------------------------------------------------------------ + inline BitmapPalette::~BitmapPalette() { delete[] (sal_uInt8*) mpBitmapColor; } -// ------------------------------------------------------------------ + inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPalette ) { @@ -578,7 +578,7 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale return *this; } -// ------------------------------------------------------------------ + inline bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) const { @@ -601,28 +601,28 @@ inline bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) con return bRet; } -// ------------------------------------------------------------------ + inline bool BitmapPalette::operator!=( const BitmapPalette& rBitmapPalette ) const { return !( *this == rBitmapPalette ); } -// ------------------------------------------------------------------ + inline bool BitmapPalette::operator!() { return( !mnCount || !mpBitmapColor ); } -// ------------------------------------------------------------------ + inline sal_uInt16 BitmapPalette::GetEntryCount() const { return mnCount; } -// ------------------------------------------------------------------ + inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount ) { @@ -647,7 +647,7 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount ) } } -// ------------------------------------------------------------------ + inline const BitmapColor& BitmapPalette::operator[]( sal_uInt16 nIndex ) const { @@ -655,7 +655,7 @@ inline const BitmapColor& BitmapPalette::operator[]( sal_uInt16 nIndex ) const return mpBitmapColor[ nIndex ]; } -// ------------------------------------------------------------------ + inline BitmapColor& BitmapPalette::operator[]( sal_uInt16 nIndex ) { @@ -663,14 +663,14 @@ inline BitmapColor& BitmapPalette::operator[]( sal_uInt16 nIndex ) return mpBitmapColor[ nIndex ]; } -// ------------------------------------------------------------------ + inline BitmapColor* BitmapPalette::ImplGetColorBuffer() const { DBG_ASSERT( mpBitmapColor, "No color buffer available!" ); return mpBitmapColor; } -// ------------------------------------------------------------------ + inline sal_uInt16 BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const { @@ -697,7 +697,7 @@ inline sal_uInt16 BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const return nRetIndex; } -// ------------------------------------------------------------------ + inline ColorMask::ColorMask( sal_uLong nRedMask, sal_uLong nGreenMask, sal_uLong nBlueMask ) : mnRMask( nRedMask ), @@ -715,7 +715,7 @@ inline ColorMask::ColorMask( sal_uLong nRedMask, sal_uLong nGreenMask, sal_uLong mnBShift = ( mnBMask ? ImplCalcMaskShift( mnBMask, mnBOr, mnBOrShift ) : 0L ); } -// ------------------------------------------------------------------ + inline long ColorMask::ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_uLong& rOrShift ) const { @@ -742,28 +742,28 @@ inline long ColorMask::ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_u return( nRet -= 7 ); } -// ------------------------------------------------------------------ + inline sal_uLong ColorMask::GetRedMask() const { return mnRMask; } -// ------------------------------------------------------------------ + inline sal_uLong ColorMask::GetGreenMask() const { return mnGMask; } -// ------------------------------------------------------------------ + inline sal_uLong ColorMask::GetBlueMask() const { return mnBMask; } -// ------------------------------------------------------------------ + inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const { @@ -771,14 +771,14 @@ inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -// ------------------------------------------------------------------ + inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const { *pPixel = (sal_uInt8) COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); } -// ------------------------------------------------------------------ + inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const { @@ -791,7 +791,7 @@ inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPi MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -// ------------------------------------------------------------------ + inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const { @@ -805,7 +805,7 @@ inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pP #endif } -// ------------------------------------------------------------------ + inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const { @@ -818,7 +818,7 @@ inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPi MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -// ------------------------------------------------------------------ + inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const { @@ -833,7 +833,7 @@ inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pP } -// ------------------------------------------------------------------ + inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const { @@ -841,7 +841,7 @@ inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -// ------------------------------------------------------------------ + inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const { @@ -849,7 +849,7 @@ inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixe pPixel[ 0 ] = (sal_uInt8) nVal; pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL ); pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL ); } -// ------------------------------------------------------------------ + inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const { @@ -863,7 +863,7 @@ inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -// ------------------------------------------------------------------ + inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, ConstHPBYTE pPixel ) const { @@ -878,7 +878,7 @@ inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } -// ------------------------------------------------------------------ + inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const { diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 28c891c15cde..f9b1e5df66e0 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -26,16 +26,16 @@ class AutoTimer; -// ------------------- + // - ScrollBar-Types - -// ------------------- + enum ScrollType { SCROLL_DONTKNOW, SCROLL_LINEUP, SCROLL_LINEDOWN, SCROLL_PAGEUP, SCROLL_PAGEDOWN, SCROLL_DRAG, SCROLL_SET }; -// ------------- + // - ScrollBar - -// ------------- + struct ImplScrollBarData; class VCL_DLLPUBLIC ScrollBar : public Control @@ -143,9 +143,9 @@ public: virtual Size GetOptimalSize() const; }; -// ---------------- + // - ScrollBarBox - -// ---------------- + class VCL_DLLPUBLIC ScrollBarBox : public Window { diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 6762a1e051a5..bdb2e3cb4248 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -35,9 +35,9 @@ class CommandEvent; enum SelectionMode { NO_SELECTION, SINGLE_SELECTION, RANGE_SELECTION, MULTIPLE_SELECTION }; -// --------------- + // - FunctionSet - -// --------------- + class VCL_DLLPUBLIC FunctionSet { @@ -60,9 +60,9 @@ public: virtual void DeselectAll() = 0; }; -// ------------------- + // - SelectionEngine - -// ------------------- + #define SELENG_DRG_ENAB 0x0001 #define SELENG_IN_SEL 0x0002 diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 588a1b9c9e75..ad47eef542c9 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -47,9 +47,7 @@ namespace vcl { class IconThemeInfo; } -// ----------------- // - MouseSettings - -// ----------------- #define MOUSE_OPTION_AUTOFOCUS ((sal_uLong)0x00000001) #define MOUSE_OPTION_AUTOCENTERPOS ((sal_uLong)0x00000002) @@ -157,9 +155,9 @@ struct FrameStyle #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 ) #define DEFAULT_WORKSPACE_GRADIENT_END_COLOR Color( 0x73, 0x7e, 0x88 ) -// ----------------- + // - StyleSettings - -// ----------------- + #define STYLE_OPTION_MONO ((sal_uLong)0x00000001) #define STYLE_OPTION_COLOR ((sal_uLong)0x00000002) @@ -565,9 +563,9 @@ public: bool operator !=( const StyleSettings& rSet ) const; }; -// ---------------- + // - MiscSettings - -// ---------------- + class VCL_DLLPUBLIC MiscSettings { @@ -593,9 +591,7 @@ public: }; -// ---------------- // - HelpSettings - -// ---------------- class VCL_DLLPUBLIC HelpSettings { @@ -616,9 +612,7 @@ public: }; -// --------------- // - AllSettings - -// --------------- const int SETTINGS_MOUSE = 0x00000001; const int SETTINGS_STYLE = 0x00000002; diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index d6374206d3c8..136f2fdc0ed2 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -24,9 +24,9 @@ class Window; -// --------- + // - Sound - -// --------- + class VCL_DLLPUBLIC Sound { diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index a48ae89d4b7d..206a5c3ab9f9 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -25,9 +25,9 @@ #include <vcl/ctrl.hxx> #include <vcl/timer.hxx> -// -------------- + // - SpinButton - -// -------------- + class VCL_DLLPUBLIC SpinButton : public Control { diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 117b0a773f4d..47441800e0d9 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -25,9 +25,9 @@ #include <vcl/edit.hxx> #include <vcl/timer.hxx> -// ------------- + // - SpinField - -// ------------- + class VCL_DLLPUBLIC SpinField : public Edit { diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 1d9271645092..830c0ac951ab 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -28,9 +28,9 @@ struct ImplStatusItem; typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; -// -------------------- + // - Progress-Ausgabe - -// -------------------- + void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, @@ -38,15 +38,15 @@ void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, const Rectangle& rFramePosSize ); -// --------------------- + // - StatusBarItemBits - -// --------------------- + typedef sal_uInt16 StatusBarItemBits; -// ---------------------------- + // - Bits fuer StatusBarItems - -// ---------------------------- + #define SIB_LEFT ((StatusBarItemBits)0x0001) #define SIB_CENTER ((StatusBarItemBits)0x0002) @@ -57,17 +57,17 @@ typedef sal_uInt16 StatusBarItemBits; #define SIB_AUTOSIZE ((StatusBarItemBits)0x0040) #define SIB_USERDRAW ((StatusBarItemBits)0x0080) -// ------------------- + // - StatusBar-Types - -// ------------------- + #define STATUSBAR_APPEND ((sal_uInt16)0xFFFF) #define STATUSBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define STATUSBAR_OFFSET ((long)5) -// ------------- + // - StatusBar - -// ------------- + class VCL_DLLPUBLIC StatusBar : public Window { diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx index a76e041538cd..d4173f9182d1 100644 --- a/include/vcl/svgdata.hxx +++ b/include/vcl/svgdata.hxx @@ -28,13 +28,13 @@ #include <vcl/bitmapex.hxx> #include <rtl/ustring.hxx> -////////////////////////////////////////////////////////////////////////////// + typedef boost::shared_array< sal_uInt8 > SvgDataArray; typedef ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > Primitive2DReference; typedef ::com::sun::star::uno::Sequence< Primitive2DReference > Primitive2DSequence; -////////////////////////////////////////////////////////////////////////////// + // helper to convert any Primitive2DSequence to a good quality BitmapEx, // using default parameters and graphic::XPrimitive2DRenderer @@ -43,7 +43,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels = 500000); -////////////////////////////////////////////////////////////////////////////// + class VCL_DLLPUBLIC SvgData : private boost::noncopyable { diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 9b25c950a522..e63c5af24754 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -28,9 +28,9 @@ class ModalDialog; class MenuBar; class TaskPaneList; -// -------------- + // - Icon-Types - -// -------------- + #define ICON_LO_DEFAULT 1 #define ICON_TEXT_DOCUMENT 2 @@ -48,9 +48,9 @@ class TaskPaneList; #define ICON_MACROLIBRARY 1 #define ICON_SETUP 500 -// ------------------- + // - WindowStateData - -// ------------------- + #define WINDOWSTATE_MASK_X ((sal_uLong)0x00000001) #define WINDOWSTATE_MASK_Y ((sal_uLong)0x00000002) @@ -117,9 +117,9 @@ public: unsigned int GetMaximizedHeight() const { return mnMaximizedHeight; } }; -// ---------------------- + // - SystemWindow-Types - -// ---------------------- + #define MENUBAR_MODE_NORMAL ((sal_uInt16)0) #define MENUBAR_MODE_HIDE ((sal_uInt16)1) @@ -128,9 +128,9 @@ public: #define TITLE_BUTTON_HIDE ((sal_uInt16)2) #define TITLE_BUTTON_MENU ((sal_uInt16)4) -// ---------------- + // - SystemWindow - -// ---------------- + class VCL_DLLPUBLIC SystemWindow : public Window diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index e6846ea48eac..e37469e1d68e 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -25,9 +25,9 @@ #include <vcl/builder.hxx> #include <vcl/window.hxx> -// ----------- + // - TabPage - -// ----------- + class VCL_DLLPUBLIC TabPage : public Window diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index ac4154cc57e4..7e226a64c1e3 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -116,9 +116,9 @@ namespace vcl { namespace svt { class PopupWindowControllerImpl; } -// --------------- + // - WindowTypes - -// --------------- + // Type fuer GetWindow() #define WINDOW_PARENT ((sal_uInt16)0) @@ -305,9 +305,9 @@ typedef sal_uInt16 StateChangedType; #define DLGWINDOW_NEXT 1 #define DLGWINDOW_FIRST 2 -// ---------- + // - Window - -// ---------- + #ifdef DBG_UTIL const char* ImplDbgCheckWindow( const void* pObj ); @@ -356,10 +356,10 @@ private: // to this central file, all members are now hidden // in the WindowImpl class and all inline functions // were removed - // + // Please do *not* add new members or inline functions to class Window, // but use class WindowImpl instead - // + WindowImpl* mpWindowImpl; // This is a first attempt to start to remove the dependency of Window on @@ -1254,9 +1254,9 @@ public: */ void reorderWithinParent(sal_uInt16 nNewPosition); - //------------------------------------- + // Native Widget Rendering functions - //------------------------------------- + // form controls must never use native widgets, this can be toggled here void EnableNativeWidget( bool bEnable = true ); @@ -1269,9 +1269,9 @@ public: */ void doLazyDelete(); - //------------------------------------- + // Keyboard access functions - //------------------------------------- + /** Query the states of keyboard indicators - Caps Lock, Num Lock and Scroll Lock. Use the following mask to retrieve the state of each diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 14702410b317..ac4b09bba13e 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -27,18 +27,18 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} struct SystemParentData; -// ---------------------- + // - WorkWindow - Types - -// ---------------------- + // Presentation Flags #define PRESENTATION_HIDEALLAPPS ((sal_uInt16)0x0001) #define PRESENTATION_NOFULLSCREEN ((sal_uInt16)0x0002) #define PRESENTATION_NOAUTOSHOW ((sal_uInt16)0x0004) -// -------------- + // - WorkWindow - -// -------------- + class VCL_DLLPUBLIC WorkWindow : public SystemWindow { diff --git a/include/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx index c229f517354e..a4bd011fb229 100644 --- a/include/xmloff/PageMasterStyleMap.hxx +++ b/include/xmloff/PageMasterStyleMap.hxx @@ -24,7 +24,7 @@ #include <xmloff/xmltypes.hxx> #include <xmloff/contextid.hxx> -//______________________________________________________________________________ + #define XML_PM_TYPE_PAGESTYLELAYOUT (XML_PM_TYPES_START + 0) #define XML_PM_TYPE_NUMFORMAT (XML_PM_TYPES_START + 1) diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 5579aec3da0c..713174bd1e86 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -53,7 +53,7 @@ class SvXMLTokenMap; class SvXMLImportContext; class SvXMLImport; -// ======================================== + /** With this class you can import a <chart:chart> element containing its data as <table:table> element or without internal table. In diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 20ed302d6064..c147d4d79251 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -59,7 +59,7 @@ public: virtual void InsertControlCharacter(sal_Int16 _nControl); virtual void InsertString(const OUString& _sString); }; -// --------------------------------------------------------------------- + #endif // INCLUDED_XMLOFF_XMLCHARCONTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index b7346473b01e..fef11b831a14 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -27,8 +27,8 @@ struct SvXMLEnumMapEntry; -/////////////////////////////////////////////////////////////////////////// -// + + /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index a9da8ec368a9..7abb531579e0 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -40,7 +40,7 @@ class XMLPropertyHandlerFactory; class XMLPropertySetMapper; class SvXMLExportPropertyMapper; -//______________________________________________________________________________ + struct XMLPageExportNameEntry { @@ -48,7 +48,7 @@ struct XMLPageExportNameEntry OUString sStyleName; }; -//______________________________________________________________________________ + class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase { diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index 36b985cef075..f8eeab2fa244 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -24,14 +24,14 @@ #include <xmloff/xmltoken.hxx> -//........................................................................ + namespace xmloff { -//........................................................................ - //==================================================================== + + //= XMLExporter - //==================================================================== + class SAL_NO_VTABLE XMLSettingsExportContext { public: @@ -53,9 +53,9 @@ namespace xmloff ~XMLSettingsExportContext() {} }; -//........................................................................ + } // namespace xmloff -//........................................................................ + #endif // INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 537ed67a6217..cedd322ef6c1 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -27,7 +27,7 @@ class SvXMLImport; -////////////////////////////////////////////////////////////////////////////// + // style:style context class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index 728d04d45a80..5b7775f421b0 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -30,17 +30,17 @@ struct SvXMLEnumMapEntry; class Color; -//......................................................................... + namespace xmloff { -//......................................................................... + class IFormsExportContext; class OFormLayerXMLImport_Impl; - //===================================================================== + //= ORotationAngleHandler - //===================================================================== + class ORotationAngleHandler : public XMLPropertyHandler { public: @@ -50,9 +50,9 @@ namespace xmloff virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; - //===================================================================== + //= OFontWidthHandler - //===================================================================== + class OFontWidthHandler : public XMLPropertyHandler { public: @@ -62,9 +62,9 @@ namespace xmloff virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; - //===================================================================== + //= OControlBorderHandlerBase - //===================================================================== + class OControlBorderHandler : public XMLPropertyHandler { public: @@ -83,9 +83,9 @@ namespace xmloff BorderFacet m_eFacet; }; - //===================================================================== + //= OControlTextEmphasisHandler - //===================================================================== + class OControlTextEmphasisHandler : public XMLPropertyHandler { public: @@ -95,18 +95,18 @@ namespace xmloff virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; - //===================================================================== + //= ImageScaleModeHandler - //===================================================================== + class XMLOFF_DLLPUBLIC ImageScaleModeHandler : public XMLConstantsPropertyHandler { public: ImageScaleModeHandler(); }; - //===================================================================== + //= OControlPropertyHandlerFactory - //===================================================================== + class XMLOFF_DLLPUBLIC OControlPropertyHandlerFactory : public XMLPropertyHandlerFactory { protected: @@ -127,9 +127,9 @@ namespace xmloff virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 _nType) const; }; -//......................................................................... + } // namespace xmloff -//......................................................................... + #endif // INCLUDED_XMLOFF_CONTROLPROPERTYHDL_HXX diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 57c1eed71481..92828adcffe7 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -35,17 +35,17 @@ namespace com { namespace sun { namespace star { namespace awt { } } } } class SvXMLExport; -//......................................................................... + namespace xmloff { -//......................................................................... + class OFormLayerXMLExport_Impl; class OFormsRootExport; - //===================================================================== + //= OFormLayerXMLExport - //===================================================================== + /** provides functionallity for exporting a complete form layer. */ class XMLOFF_DLLPUBLIC OFormLayerXMLExport @@ -166,9 +166,9 @@ namespace xmloff void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > _rxControl ); }; - //========================================================================= + //= OOfficeFormsExport - //========================================================================= + /// export helper for the office::forms element class XMLOFF_DLLPUBLIC OOfficeFormsExport { @@ -180,9 +180,9 @@ namespace xmloff ~OOfficeFormsExport(); }; -//......................................................................... + } // namespace xmloff -//......................................................................... + #endif // INCLUDED_XMLOFF_FORMLAYEREXPORT_HXX diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index b9f167e79a55..54d9c00a330d 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -34,14 +34,14 @@ class SvXMLImportContext; class SvXMLStylesContext; class XMLPropStyleContext; -//......................................................................... + namespace xmloff { -//......................................................................... - //===================================================================== + + //= OFormLayerXMLImport - //===================================================================== + class OFormLayerXMLImport_Impl; /** allows you to import a <form:form> element */ @@ -127,9 +127,9 @@ namespace xmloff void documentDone( ); }; -//......................................................................... + } // namespace xmloff -//......................................................................... + #endif // INCLUDED_XMLOFF_FORMLAYERIMPORT_HXX diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index a8c3c523bcd3..8bff58daec76 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -24,8 +24,8 @@ #include <xmloff/xmltoken.hxx> #include <unotools/saveopt.hxx> -/////////////////////////////////////////////////////////////////////////// -// + + /** Represents a property with its API-name, its XML-name and the type of its value. */ @@ -52,8 +52,8 @@ struct XMLPropertyMapEntry bool mbImportOnly; }; -/////////////////////////////////////////////////////////////////////////// -// + + /** Smart struct to transport an Any with an index to the appropriate property-name */ diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 53c4e86dd4f6..f15c8fab3d86 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -142,7 +142,7 @@ typedef std::vector< ImplXMLShapeExportInfo > ImplXMLShapeExportInfoVector; /** a map to store all cache data for already collected XShapes */ typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos; -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SvXMLExport; diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index c54a57f3448d..1f616ec8fe0d 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -44,7 +44,7 @@ class XMLSdPropHdlFactory; class XMLPropertySetMapper; class SvXMLImportPropertyMapper; -////////////////////////////////////////////////////////////////////////////// + enum SdXMLGroupShapeElemTokenMap { @@ -173,7 +173,7 @@ enum SdXML3DLightAttrTokenMap XML_TOK_3DLIGHT_SPECULAR }; -////////////////////////////////////////////////////////////////////////////// + // dr3d:3dlight context class SdXML3DLightContext: public SvXMLImportContext @@ -198,7 +198,7 @@ public: sal_Bool GetSpecular() { return mbSpecular; } }; -////////////////////////////////////////////////////////////////////////////// + typedef ::std::vector< SdXML3DLightContext* > Imp3DLightList; @@ -243,7 +243,7 @@ public: void setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); }; -////////////////////////////////////////////////////////////////////////////// + class SvXMLShapeContext : public SvXMLImportContext { @@ -263,7 +263,7 @@ public: void setHyperlink( const OUString& rHyperlink ); }; -////////////////////////////////////////////////////////////////////////////// + class ShapeSortContext; struct XMLShapeImportHelperImpl; diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index 5c077fdc97c9..8fe048c120e2 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -43,7 +43,7 @@ #include <xmloff/xmlexppr.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SvXMLExport; diff --git a/include/xmloff/uniref.hxx b/include/xmloff/uniref.hxx index d6aba789b922..578e45acace8 100644 --- a/include/xmloff/uniref.hxx +++ b/include/xmloff/uniref.hxx @@ -110,10 +110,10 @@ public: }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Inline-implementations of UniReference -// + /** Create a new reference with the same element as in rRef and acquire this one.*/ template< class T > diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx index 3ab3b79a3c89..1da3fa4653f3 100644 --- a/include/xmloff/xmlmultiimagehelper.hxx +++ b/include/xmloff/xmlmultiimagehelper.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <xmloff/xmlimp.hxx> -////////////////////////////////////////////////////////////////////////////// + class MultiImageImportHelper { @@ -54,7 +54,7 @@ public: void setSupportsMultipleContents(bool bNew) { mbSupportsMultipleContents = bNew; } }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx index 73d4d05d1a05..b57da8740ed4 100644 --- a/include/xmloff/xmlprhdl.hxx +++ b/include/xmloff/xmlprhdl.hxx @@ -30,8 +30,8 @@ namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } } class SvXMLUnitConverter; struct XMLPropertyState; -/////////////////////////////////////////////////////////////////////////// -// + + /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index fed1411a5183..8a6b27623fdd 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -37,8 +37,8 @@ class SvXMLUnitConverter; class XMLPropertyHandler; -/////////////////////////////////////////////////////////////////////////// -// + + /** Helper-class for XML-im/export: - Holds a pointer to a given array of XMLPropertyMapEntry - Provides several methods to access data from this array diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx index 3c8d7376db92..5511bf1abea2 100644 --- a/include/xmloff/xmltypes.hxx +++ b/include/xmloff/xmltypes.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_XMLOFF_XMLTYPES_HXX #define INCLUDED_XMLOFF_XMLTYPES_HXX -/////////////////////////////////////////////////////////////////////////////// + // Flags to specify how to im/export the property -// + // OLD: // 8421.8421.8421.8421.8421.8421.8421.8421 // n n m mmmd m baaa tttt.tttt.tttt @@ -57,7 +57,7 @@ #define MID_FLAG_NO_PROPERTY 0x50000000 // both import and export // Import only: there are more entries for the same xml attribute existing -#define MID_FLAG_MULTI_PROPERTY 0x02000000 // +#define MID_FLAG_MULTI_PROPERTY 0x02000000 // Import only: If a property with the same name has been set already, supply // the current value to the importXML call. @@ -104,10 +104,10 @@ #define XML_TYPE_PROP_CHART (0xe << XML_TYPE_PROP_SHIFT) #define XML_TYPE_PROP_END (0xf << XML_TYPE_PROP_SHIFT) -/////////////////////////////////////////////////////////////////////////////// -// + + // XML-data-type-ID's -// + // simple types, no special compare necessary #define XML_TYPE_BUILDIN_CMP 0x00002000 diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 772fc3274ecb..1ea19a756f11 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -39,7 +39,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class Time; diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index 9ec836433352..c2c08cc1394a 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -37,7 +37,7 @@ namespace xmlscript ##################################################################################################*/ -//================================================================================================== + class XMLSCRIPT_DLLPUBLIC XMLElement : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList > { diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx index e86a4d94392a..d0762b7722cb 100644 --- a/include/xmlscript/xmllib_imexp.hxx +++ b/include/xmlscript/xmllib_imexp.hxx @@ -28,7 +28,7 @@ namespace xmlscript { -//============================================================================== + // Library container export // HACK C++ struct to transport info. Later the container // itself should do the export/import and use exportet XML diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx index a11c0318469e..3015a14a96ae 100644 --- a/include/xmlscript/xmlmod_imexp.hxx +++ b/include/xmlscript/xmlmod_imexp.hxx @@ -27,7 +27,7 @@ namespace xmlscript { -//============================================================================== + // Script module import/export // HACK C++ struct to transport info. Later the container // itself should do the export/import and use exportet XML |