vcl/generic/fontmanager/parseAFM.hxx | 5 +++++ vcl/inc/graphite_features.hxx | 6 ++++++ vcl/inc/graphite_static.hxx | 5 +++++ vcl/osx/DragActionConversion.hxx | 5 +++++ vcl/quartz/ctfonts.hxx | 6 ++++++ vcl/source/filter/ixpm/rgbtable.hxx | 5 +++++ vcl/source/window/scrwnd.hxx | 5 +++++ 7 files changed, 37 insertions(+)
New commits: commit 6c3245fc69de59cb1de219203c489d891073ced9 Author: Jens Carl <j.car...@gmx.de> Date: Sat May 31 04:52:24 2014 +0000 fdo#68849: Add header guards to all include files Added header guards to files in directory vcl/ Change-Id: I76ad0c34f2b107d56e92c5a6a8f4c61554c93e2f Reviewed-on: https://gerrit.libreoffice.org/9597 Reviewed-by: Thomas Arnhold <tho...@arnhold.org> Tested-by: Thomas Arnhold <tho...@arnhold.org> diff --git a/vcl/generic/fontmanager/parseAFM.hxx b/vcl/generic/fontmanager/parseAFM.hxx index 2d25a27..720f7c6 100644 --- a/vcl/generic/fontmanager/parseAFM.hxx +++ b/vcl/generic/fontmanager/parseAFM.hxx @@ -89,6 +89,9 @@ * - fixed typos */ +#ifndef INCLUDED_VCL_GENERIC_FONTMANAGER_PARSEAFM_HXX +#define INCLUDED_VCL_GENERIC_FONTMANAGER_PARSEAFM_HXX + #include <stdio.h> namespace psp { @@ -317,4 +320,6 @@ void freeFontInfo(FontInfo *fi); } // namespace +#endif // INCLUDED_VCL_GENERIC_FONTMANAGER_PARSEAFM_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index d1587fd..2b8b81b 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -21,6 +21,10 @@ // Parse a string of features specified as ; separated pairs. // e.g. // 1001=1&2002=2&fav1=0 + +#ifndef INCLUDED_VCL_INC_GRAPHITE_FEATURES_HXX +#define INCLUDED_VCL_INC_GRAPHITE_FEATURES_HXX + #include <sal/types.h> #include <rtl/ustring.hxx> #include <graphite_static.hxx> @@ -67,4 +71,6 @@ namespace grutils } +#endif // INCLUDED_VCL_INC_GRAPHITE_FEATURES_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx index f7a826e..f57bd85 100644 --- a/vcl/inc/graphite_static.hxx +++ b/vcl/inc/graphite_static.hxx @@ -7,10 +7,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX +#define INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX + #ifdef WNT # ifndef GRAPHITE2_STATIC # define GRAPHITE2_STATIC 1 # endif #endif +#endif // INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx index 8539a79..fbb5ea3 100644 --- a/vcl/osx/DragActionConversion.hxx +++ b/vcl/osx/DragActionConversion.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_VCL_OSX_DRAGACTIONCONVERSION_HXX +#define INCLUDED_VCL_OSX_DRAGACTIONCONVERSION_HXX + #include <sal/types.h> #include <premac.h> @@ -35,4 +38,6 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions); */ sal_Int8 SystemToOfficeDragActions(unsigned int dragActions); +#endif // INCLUDED_VCL_OSX_DRAGACTIONCONVERSION_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/quartz/ctfonts.hxx b/vcl/quartz/ctfonts.hxx index 00dc6a9..e4b536d 100644 --- a/vcl/quartz/ctfonts.hxx +++ b/vcl/quartz/ctfonts.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_VCL_QUARTZ_CTFONTS_HXX +#define INCLUDED_VCL_QUARTZ_CTFONTS_HXX + #include "quartz/salgdi.h" #ifdef IOS #include "headless/svpgdi.hxx" @@ -25,4 +28,7 @@ SystemFontList* GetCoretextFontList(void); ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* ); + +#endif // INCLUDED_VCL_QUARTZ_CTFONTS_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/ixpm/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx index 375dbde..73786a4 100644 --- a/vcl/source/filter/ixpm/rgbtable.hxx +++ b/vcl/source/filter/ixpm/rgbtable.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_VCL_SOURCE_FILTER_IXPM_RGBTABLE_HXX +#define INCLUDED_VCL_SOURCE_FILTER_IXPM_RGBTABLE_HXX + struct XPMRGBTab { const char* name; @@ -686,4 +689,6 @@ static const XPMRGBTab pRGBTable[] = { { NULL, 0 , 0, 0} }; +#endif // INCLUDED_VCL_SOURCE_FILTER_IXPM_RGBTABLE_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 5e7fb09..fe416cb 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX +#define INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX + #include <vcl/floatwin.hxx> #include <vcl/bitmap.hxx> #include <vcl/image.hxx> @@ -74,4 +77,6 @@ public: sal_uLong ImplGetWheelMode() const { return mnWheelMode; } }; +#endif // INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits