From 8f0160a10dd2a5746c531040ffbf638e356f6d5d Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Fri, 30 May 2014 21:34:21 +0000 Subject: fdo#68849: Add header guards to all include files Added header guards to files in directories sc/, sd/, slideshow/, and solenv/ Change-Id: Ib4577761644fe72f5ddb3c5060e629bf94d6e6e2 Reviewed-on: https://gerrit.libreoffice.org/9583 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- sc/source/ui/inc/colorformat.hxx | 5 +++++ sc/source/ui/inc/datastreamdlg.hxx | 5 +++++ sd/source/ui/dlg/RemoteDialogClientBox.hxx | 5 +++++ sd/source/ui/dlg/dlgassim.hxx | 5 +++++ sd/source/ui/inc/unosrch.hxx | 5 +++++ sd/source/ui/slideshow/SlideShowRestarter.hxx | 4 ++++ sd/source/ui/unoidl/unohelp.hxx | 5 +++++ slideshow/source/engine/slide/targetpropertiescreator.hxx | 5 +++++ solenv/gcc-wrappers/wrapper.hxx | 5 +++++ 9 files changed, 44 insertions(+) diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index f3d40dd5013e..cc261d1855d3 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef INCLUDED_SC_SOURCE_UI_INC_COLORFORMAT_HXX +#define INCLUDED_SC_SOURCE_UI_INC_COLORFORMAT_HXX + #include #include #include @@ -51,4 +54,6 @@ public: ScDataBarFormatData* GetData(); }; +#endif // INCLUDED_SC_SOURCE_UI_INC_COLORFORMAT_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index 947f68389500..bde22e836ebf 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef INCLUDED_SC_SOURCE_UI_INC_DATASTREAMDLG_HXX +#define INCLUDED_SC_SOURCE_UI_INC_DATASTREAMDLG_HXX + #include #include @@ -59,4 +62,6 @@ public: } +#endif // INCLUDED_SC_SOURCE_UI_INC_DATASTREAMDLG_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 7b2ac25ed533..ad7464d7eff6 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOGCLIENTBOX_HXX +#define INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOGCLIENTBOX_HXX + #include "rtl/ustring.hxx" #include "vcl/scrbar.hxx" #include "vcl/fixed.hxx" @@ -171,4 +174,6 @@ public: } +#endif // INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOGCLIENTBOX_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 11c888a13377..d3012b924b31 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SD_SOURCE_UI_DLG_DLGASSIM_HXX +#define INCLUDED_SD_SOURCE_UI_DLG_DLGASSIM_HXX + #include "drawdoc.hxx" #include #include @@ -47,4 +50,6 @@ public: }; +#endif // INCLUDED_SD_SOURCE_UI_DLG_DLGASSIM_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 3ab929d5d24b..c0f86aa773f0 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX +#define INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX + #include #include #include @@ -138,4 +141,6 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; +#endif // INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 05d8fe69c468..6a216143bd8e 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWRESTARTER_HXX +#define INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWRESTARTER_HXX #include "slideshow.hxx" #include "ViewShellBase.hxx" @@ -83,4 +85,6 @@ private: } // end of namespace sd +#endif // INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWRESTARTER_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx index 130fd0fc41e9..8b435962074f 100644 --- a/sd/source/ui/unoidl/unohelp.hxx +++ b/sd/source/ui/unoidl/unohelp.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNOHELP_HXX +#define INCLUDED_SD_SOURCE_UI_UNOIDL_UNOHELP_HXX + namespace sd { inline void bool2any( bool bBool, ::com::sun::star::uno::Any& rAny ) @@ -30,4 +33,6 @@ inline void bool2any( bool bBool, ::com::sun::star::uno::Any& rAny ) if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ aAny <<= uno::Reference< xint >(this) +#endif // INCLUDED_SD_SOURCE_UI_UNOIDL_UNOHELP_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx index 6c6bef6fad4c..60c2268e9c2d 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.hxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_TARGETPROPERTIESCREATOR_HXX +#define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_TARGETPROPERTIESCREATOR_HXX + #include #include @@ -44,4 +47,6 @@ namespace slideshow } // namespace internal } // namespace slideshow +#endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_TARGETPROPERTIESCREATOR_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/gcc-wrappers/wrapper.hxx b/solenv/gcc-wrappers/wrapper.hxx index 985074196c75..b9a0bb3fe60e 100644 --- a/solenv/gcc-wrappers/wrapper.hxx +++ b/solenv/gcc-wrappers/wrapper.hxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef INCLUDED_SOLENV_GCC-WRAPPERS_WRAPPER_HXX +#define INCLUDED_SOLENV_GCC-WRAPPERS_WRAPPER_HXX + #include #include #include @@ -21,4 +24,6 @@ string processccargs(vector rawargs); int startprocess(string command, string args); +#endif // INCLUDED_SOLENV_GCC-WRAPPERS_WRAPPER_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit