From 57217e1e9f995ec413e5eecaf171481373a0a8d0 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Fri, 30 May 2014 22:09:54 +0000 Subject: fdo#68849: Add header guards to all include files Added header guards to files in directories stoc/, and svtools/ Change-Id: Ib6691b0e3fa09d71696ab947d357e489eb35df66 Reviewed-on: https://gerrit.libreoffice.org/9584 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- stoc/inc/stocservices.hxx | 4 ++++ stoc/source/corereflection/base.hxx | 5 +++++ stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx | 8 +++----- svtools/source/control/toolbarmenuimp.hxx | 5 +++++ svtools/source/control/valueimp.hxx | 5 +++++ svtools/source/toolpanel/toolpaneldrawer.hxx | 4 ++++ 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/stoc/inc/stocservices.hxx b/stoc/inc/stocservices.hxx index fb10f02f47fe..4136f2228f94 100644 --- a/stoc/inc/stocservices.hxx +++ b/stoc/inc/stocservices.hxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_STOC_INC_STOCSERVICES_HXX +#define INCLUDED_STOC_INC_STOCSERVICES_HXX #include #include @@ -83,4 +85,6 @@ namespace stoc_services } } // namespace +#endif // INCLUDED_STOC_INC_STOCSERVICES_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 17cae3c9facb..909b182ead58 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -18,6 +18,9 @@ */ // #define TEST_LIST_CLASSES +#ifndef INCLUDED_STOC_SOURCE_COREREFLECTION_BASE_HXX +#define INCLUDED_STOC_SOURCE_COREREFLECTION_BASE_HXX + #include #include #include @@ -432,4 +435,6 @@ inline bool coerce_assign( } +#endif // INCLUDED_STOC_SOURCE_COREREFLECTION_BASE_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx index 5e9cf9562ad0..5b39379cf8ea 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef \ - INCLUDED_stoc_source_uriproc_UriSchemeParser_vndDOTsunDOTstarDOTscript_hxx -#define \ - INCLUDED_stoc_source_uriproc_UriSchemeParser_vndDOTsunDOTstarDOTscript_hxx +#ifndef INCLUDED_STOC_SOURCE_URIPROC_URISCHEMEPARSER_VNDDOTSUNDOTSTARDOTSCRIPT_HXX +#define INCLUDED_STOC_SOURCE_URIPROC_URISCHEMEPARSER_VNDDOTSUNDOTSTARDOTSCRIPT_HXX #include #include @@ -50,6 +48,6 @@ namespace UriSchemeParser_vndDOTsunDOTstarDOTscript { } } -#endif +#endif // INCLUDED_STOC_SOURCE_URIPROC_URISCHEMEPARSER_VNDDOTSUNDOTSTARDOTSCRIPT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 235f1f4ce617..94e908d434e4 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX +#define INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX + #include #include #include @@ -311,4 +314,6 @@ struct ToolbarMenu_Impl } +#endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index c6e2a644a69e..7651de8e1864 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX +#define INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX + #include #include #include @@ -263,4 +266,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; +#endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index c237500caad2..536a88727106 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TOOLPANELDRAWER_HXX +#define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TOOLPANELDRAWER_HXX #include #include @@ -104,4 +106,6 @@ namespace svt } // namespace svt +#endif // INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_TOOLPANELDRAWER_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit