diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-10-22 17:03:24 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-23 10:28:07 +0000 |
| commit | f852bda5ecf68c9450925bc95138509ffadb4a43 (patch) | |
| tree | ccb34263bd4a07f7fbc0aa57c487ec9c10331d0f /sw/source | |
| parent | b009e8fd4fce06d9abae8aaac8750ece7df212e4 (diff) | |
clean up some include guards
Conflicts:
sw/source/ui/inc/content.hxx
Change-Id: I58d81881271fc6e3320bf3b5f1321594b28614a6
Reviewed-on: https://gerrit.libreoffice.org/6388
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/inc/concustomshape.hxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/inc/content.hxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/inc/optload.hxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbarevisions.hxx | 6 |
4 files changed, 10 insertions, 12 deletions
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx index 39a712e7f147..96d6707b9a90 100644 --- a/sw/source/ui/inc/concustomshape.hxx +++ b/sw/source/ui/inc/concustomshape.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SW_CONCUSTOMSHAPE_HXX -#define _SW_CONCUSTOMSHAPE_HXX +#ifndef INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX +#define INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX #include <rtl/ustring.hxx> #include "drawbase.hxx" @@ -58,8 +58,6 @@ class ConstCustomShape : public SwDrawBase virtual bool doConstructOrthogonal() const; }; - - -#endif // _SW_CONRECT_HXX +#endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 3ae614e92609..b812d05ca87e 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CONTENT_HXX -#define _CONTENT_HXX +#ifndef INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX +#define INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX #include <limits.h> #include "swcont.hxx" diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 3bf231e5bbde..7825ab5354ac 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _OPTLOAD_HXX -#define _OPTLOAD_HXX +#ifndef INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX +#define INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX #include <sfx2/tabdlg.hxx> diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index acf0dc459436..693bbd25fae7 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SW_VBA_PANES_HXX -#define SW_VBA_PANES_HXX +#ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX +#define INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/word/XRevisions.hpp> @@ -52,6 +52,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; -#endif /* SW_VBA_PANES_HXX */ +#endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |