Merge branch 'master' into feature/gnumake4

Conflicts:
basebmp/prj/d.lst
basebmp/test/basictest.cxx
basebmp/test/makefile.mk
basegfx/inc/basegfx/basegfxdllapi.h
basegfx/inc/basegfx/tools/debugplotter.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/prj/d.lst
basegfx/source/numeric/makefile.mk
basegfx/source/polygon/makefile.mk
basegfx/source/range/makefile.mk
basegfx/source/raster/makefile.mk
basegfx/source/tuple/makefile.mk
basegfx/source/vector/makefile.mk
basegfx/test/basegfx1d.cxx
basegfx/test/makefile.mk
basegfx/util/makefile.mk
canvas/Library_canvasfactory.mk
canvas/Module_canvas.mk
canvas/prj/build.lst
canvas/prj/d.lst
canvas/source/cairo/cairo_canvashelper_texturefill.cxx
canvas/source/cairo/makefile.mk
canvas/source/tools/makefile.mk
comphelper/qa/string/makefile.mk
cppcanvas/Module_cppcanvas.mk
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
cppcanvas/prj/build.lst
cppcanvas/prj/d.lst
cppcanvas/source/mtfrenderer/makefile.mk
cppcanvas/util/makefile.mk
i18npool/source/search/makefile.mk
regexp/Library_regexp.mk
regexp/prj/d.lst
sax/CppunitTest_sax.mk
sax/Library_sax.mk
sax/prj/d.lst
sax/qa/cppunit/test_converter.cxx
sax/source/expatwrap/attrlistimpl.hxx
sax/util/makefile.mk
svtools/Library_svt.mk
tools/Executable_sspretty.mk
ucbhelper/prj/d.lst
ucbhelper/source/provider/configureucb.cxx
ucbhelper/source/provider/provconf.cxx
ucbhelper/util/makefile.mk
unotools/Library_utl.mk
unotools/Module_unotools.mk
unotools/Package_inc.mk
unotools/prj/build.lst
vcl/Library_desktop_detector.mk
vcl/Library_vcl.mk
vcl/Library_vclplug_gtk.mk
vcl/aqua/source/gdi/salprn.cxx
vcl/inc/aqua/saldata.hxx
vcl/unx/generic/gdi/salgdi3.cxx

4 files changed, 21 insertions, 40 deletions

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 4e179c3a0ce0..bf4cafd16cb2 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1622,17 +1623,6 @@ struct StdMasks
     static const bool alphamask_polarity = true;
 };
 
-#if 0
-/** Clip and alpha masks for the generic renderer (of course, those
-    need to be generic, too)
- */
-struct MaskTraitsGeneric
-{
-    typedef PixelFormatTraits_GenericInteger   clipmask_format_traits;
-    typedef PixelFormatTraits_GenericInteger   alphamask_format_traits;
-};
-#endif
-
 //----------------------------------------------------------------------------------
 
 // Some compilers don't like the nested template wrap_accessor
@@ -2031,34 +2021,9 @@ BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector&        rSize,
 /// Clone our device, with GenericImageAccessor to handle all formats
 BitmapDeviceSharedPtr BitmapDevice::getGenericRenderer() const
 {
-#if 0
-    // xxx TODO
-    typedef BitmapRenderer< PixelFormatTraits_GenericInteger::iterator_type,
-                            PixelFormatTraits_GenericInteger::raw_accessor_type,
-                            PixelFormatTraits_GenericInteger::accessor_selector,
-                            MaskTraitsGeneric >
-            Renderer;
-
-    if( !mpImpl->mpGenericRenderer )
-    {
-        mpImpl->mpGenericRenderer.reset(
-            new Renderer(
-                mpImpl->maBounds,
-                isTopDown(),
-                getScanlineFormat(),
-                getScanlineStride(),
-                mpImpl->mpFirstScanline,
-                PixelFormatTraits_GenericInteger::iterator_type(),
-                GenericIntegerImageRawAccessor<Color>(
-                    const_cast<BitmapDevice*>(this)->shared_from_this()),
-                GenericIntegerImageAccessor<Color>(
-                    const_cast<BitmapDevice*>(this)->shared_from_this()),
-                getBuffer(),
-                getPalette() ));
-    }
-#endif
-
     return mpImpl->mpGenericRenderer;
 }
 
 } // namespace basebmp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index 7781e43c19bc..4e7abb0d613b 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,5 @@ namespace basebmp
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx
index 0fb7a0bf684a..407948e80c28 100644
--- a/basebmp/source/intconversion.hxx
+++ b/basebmp/source/intconversion.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,11 +57,18 @@ namespace basebmp
         }
     };
 
+    //Current c++0x draft (apparently) has std::identity, but not operator()
+    template<typename T> struct SGI_identity : public std::unary_function<T,T>
+    {
+        T& operator()(T& x) const { return x; }
+        const T& operator()(const T& x) const { return x; }
+    };
+
     /// Get converter from given data type to sal_uInt32
     template< typename DataType > struct uInt32Converter
     {
-        typedef std::identity<DataType> to;
-        typedef std::identity<DataType> from;
+        typedef SGI_identity<DataType> to;
+        typedef SGI_identity<DataType> from;
     };
     template< unsigned int RedIndex,
               unsigned int GreenIndex,
@@ -86,3 +94,5 @@ namespace basebmp
 }
 
 #endif /* INCLUDED_BASEBMP_INTCONVERSION_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/source/polypolygonrenderer.cxx b/basebmp/source/polypolygonrenderer.cxx
index 79453402ef4c..ea561533f2de 100644
--- a/basebmp/source/polypolygonrenderer.cxx
+++ b/basebmp/source/polypolygonrenderer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,3 +126,5 @@ namespace detail
 
 } // namespace detail
 } // namespace basebmp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */