Remove visual noise from include

Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx

Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

16 files changed, 63 insertions, 63 deletions

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<