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

1 files changed, 2 insertions, 27 deletions

diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index 3ce183ecbead..ac1e30061c05 100644
--- a/svl/inc/svl/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.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.
@@ -67,26 +68,20 @@ public:
     virtual int operator ==(const SfxPoolItem & rItem) const;
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const;
-
     virtual SvStream & Store(SvStream & rStream, sal_uInt16) const;
 
     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const
     { return new SfxFontItem(*this); }
 
     sal_Bool hasFont() const { return m_bHasFont; }
-
     sal_Bool hasColor() const { return m_bHasColor; }
-
     sal_Bool hasFillColor() const { return m_bHasFillColor; }
 
     const XubString & getName() const { return m_aName; }
-
     const XubString & getStyleName() const { return m_aStyleName; }
 
     const Size & getSize() const { return m_aSize; }
-
     const Color & getColor() const { return m_aColor; }
-
     const Color & getFillColor() const { return m_aFillColor; }
 
     rtl_TextEncoding getCharSet() const { return m_nCharSet; }
@@ -94,51 +89,30 @@ public:
     LanguageType getLanguage() const { return m_nLanguage; }
 
     sal_Int16 getFamily() const { return m_nFamily; }
-
     sal_Int16 getPitch() const { return m_nPitch; }
-
     sal_Int16 getWeight() const { return m_nWeight; }
-
     sal_Int16 getWidthType() const { return m_nWidthType; }
-
     sal_Int16 getItalic() const { return m_nItalic; }
-
     sal_Int16 getUnderline() const { return m_nUnderline; }
-
     sal_Int16 getStrikeout() const { return m_nStrikeout; }
-
     sal_Int16 getOrientation() const { return m_nOrientation; }
-
     sal_Bool getWordLine() const { return m_bWordLine; }
-
     sal_Bool getOutline() const { return m_bOutline; }
-
     sal_Bool getShadow() const { return m_bShadow; }
-
     sal_Bool getKerning() const { return m_bKerning; }
 
     inline void setFont(sal_Int16 nTheFamily, const XubString & rTheName,
                         const XubString & rTheStyleName, sal_Int16 nThePitch,
                         rtl_TextEncoding nTheCharSet);
-
     inline void setWeight(sal_Int16 nTheWeight);
-
     inline void setItalic(sal_Int16 nTheItalic);
-
     inline void setHeight(sal_Int32 nHeight);
-
     inline void setColor(const Color & rTheColor);
-
     inline void setFillColor(const Color & rTheFillColor);
-
     inline void setUnderline(sal_Int16 nTheUnderline);
-
     inline void setStrikeout(sal_Int16 nTheStrikeout);
-
     inline void setOutline(sal_Bool bTheOutline);
-
     inline void setShadow(sal_Bool bTheShadow);
-
     inline void setLanguage(LanguageType nTheLanguage);
 };
 
@@ -239,3 +213,4 @@ inline void SfxFontItem::setLanguage(LanguageType nTheLanguage)
 
 #endif // _SFONTITM_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */