diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-10-23 19:18:54 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-10-23 23:22:31 +0200 |
| commit | 1130a359cb89028b42f366f46bdf034ad13ae540 (patch) | |
| tree | 6acbd8d220fee0dab8d6911c1968ee9964534beb | |
| parent | 29c0fdc6457243e7b7262b4db86c82b23a7ee0f1 (diff) | |
fixincludeguards.sh: include - the rest
Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9
164 files changed, 416 insertions, 416 deletions
diff --git a/include/avmedia/avmediadllapi.h b/include/avmedia/avmediadllapi.h index 351b82854a7f..6abf77455d4d 100644 --- a/include/avmedia/avmediadllapi.h +++ b/include/avmedia/avmediadllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIADLLAPI_H -#define INCLUDED_AVMEDIADLLAPI_H +#ifndef INCLUDED_AVMEDIA_AVMEDIADLLAPI_H +#define INCLUDED_AVMEDIA_AVMEDIADLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_AVMEDIADLLAPI_H */ +#endif // INCLUDED_AVMEDIA_AVMEDIADLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index f14281999307..2baf0ba1b789 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef AVMEDIA_MEDIAITEM_HXX -#define AVMEDIA_MEDIAITEM_HXX +#ifndef INCLUDED_AVMEDIA_MEDIAITEM_HXX +#define INCLUDED_AVMEDIA_MEDIAITEM_HXX #include <boost/scoped_ptr.hpp> diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index b823f7c63b67..ce10455b7e43 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AVMEDIA_MEDIACHILD_HXX -#define _AVMEDIA_MEDIACHILD_HXX +#ifndef INCLUDED_AVMEDIA_MEDIAPLAYER_HXX +#define INCLUDED_AVMEDIA_MEDIAPLAYER_HXX #include <sfx2/ctrlitem.hxx> #include <sfx2/dockwin.hxx> diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 570167024aff..0087f969e59a 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AVMEDIA_MEDIATOOLBOX_HXX -#define _AVMEDIA_MEDIATOOLBOX_HXX +#ifndef INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX +#define INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX #include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> @@ -55,6 +55,6 @@ private: } -#endif // _AVMEDIA_MEDIATOOLBOX_HXX +#endif // INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index dcf4f36a72e9..92bd696b1833 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AVMEDIA_MEDIAWINDOW_HXX -#define _AVMEDIA_MEDIAWINDOW_HXX +#ifndef INCLUDED_AVMEDIA_MEDIAWINDOW_HXX +#define INCLUDED_AVMEDIA_MEDIAWINDOW_HXX #include <memory> #include <vector> @@ -122,6 +122,6 @@ namespace avmedia }; } -#endif // _AVMEDIA_MEDIAWINDOW_HXX +#endif // INCLUDED_AVMEDIA_MEDIAWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basebmp/paletteformats.hxx b/include/basebmp/paletteformats.hxx index 5c2c58d49b94..fce122a24f5e 100644 --- a/include/basebmp/paletteformats.hxx +++ b/include/basebmp/paletteformats.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX -#define INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX +#ifndef INCLUDED_BASEBMP_PALETTEFORMATS_HXX +#define INCLUDED_BASEBMP_PALETTEFORMATS_HXX #include <basebmp/color.hxx> #include <basebmp/colortraits.hxx> @@ -134,6 +134,6 @@ typedef PixelFormatTraitsTemplate_Palette< } // namespace basebmp -#endif /* INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX */ +#endif // INCLUDED_BASEBMP_PALETTEFORMATS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/AsyncronousLink.hxx b/include/dbaccess/AsyncronousLink.hxx index 6c62d66b470f..96c96f6f278c 100644 --- a/include/dbaccess/AsyncronousLink.hxx +++ b/include/dbaccess/AsyncronousLink.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_ASYNCRONOUSLINK_HXX -#define DBAUI_ASYNCRONOUSLINK_HXX +#ifndef INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX +#define INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX #include <tools/link.hxx> #include <osl/mutex.hxx> @@ -59,6 +59,6 @@ namespace dbaui DECL_LINK(OnAsyncCall, void*); }; } -#endif // DBAUI_ASYNCRONOUSLINK_HXX +#endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx index d699ef4c6c43..4a15679419dd 100644 --- a/include/dbaccess/IController.hxx +++ b/include/dbaccess/IController.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_ICONTROLLER_HXX -#define DBAUI_ICONTROLLER_HXX +#ifndef INCLUDED_DBACCESS_ICONTROLLER_HXX +#define INCLUDED_DBACCESS_ICONTROLLER_HXX #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -126,6 +126,6 @@ namespace dbaui ~IController() {} }; } -#endif // DBAUI_ICONTROLLER_HXX +#endif // INCLUDED_DBACCESS_ICONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/IReference.hxx b/include/dbaccess/IReference.hxx index bdfb8e1d99b7..d695c2720c37 100644 --- a/include/dbaccess/IReference.hxx +++ b/include/dbaccess/IReference.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 DBAUI_IREFERENCE_HXX -#define DBAUI_IREFERENCE_HXX +#ifndef INCLUDED_DBACCESS_IREFERENCE_HXX +#define INCLUDED_DBACCESS_IREFERENCE_HXX #include "dbaccessdllapi.h" @@ -34,7 +34,7 @@ namespace dbaui ~IReference() {} }; } -#endif // DBAUI_IREFERENCE_HXX +#endif // INCLUDED_DBACCESS_IREFERENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx index 298bbc83b11b..64c75000fcfb 100644 --- a/include/dbaccess/ToolBoxHelper.hxx +++ b/include/dbaccess/ToolBoxHelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_TOOLBOXHELPER_HXX -#define DBAUI_TOOLBOXHELPER_HXX +#ifndef INCLUDED_DBACCESS_TOOLBOXHELPER_HXX +#define INCLUDED_DBACCESS_TOOLBOXHELPER_HXX #include <sal/types.h> #include <tools/link.hxx> @@ -72,6 +72,6 @@ namespace dbaui DECL_LINK(SettingsChanged, VclWindowEvent* ); }; } -#endif // DBAUI_TOOLBOXHELPER_HXX +#endif // INCLUDED_DBACCESS_TOOLBOXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/controllerframe.hxx b/include/dbaccess/controllerframe.hxx index d6834e20e90f..0990865fac25 100644 --- a/include/dbaccess/controllerframe.hxx +++ b/include/dbaccess/controllerframe.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBACCESS_CONTROLLERFRAME_HXX -#define DBACCESS_CONTROLLERFRAME_HXX +#ifndef INCLUDED_DBACCESS_CONTROLLERFRAME_HXX +#define INCLUDED_DBACCESS_CONTROLLERFRAME_HXX #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/FrameAction.hpp> @@ -71,6 +71,6 @@ namespace dbaui } // namespace dbaui //........................................................................ -#endif // DBACCESS_CONTROLLERFRAME_HXX +#endif // INCLUDED_DBACCESS_CONTROLLERFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 70fcf034af6f..7994798c548e 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.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 DBAUI_DATAVIEW_HXX -#define DBAUI_DATAVIEW_HXX +#ifndef INCLUDED_DBACCESS_DATAVIEW_HXX +#define INCLUDED_DBACCESS_DATAVIEW_HXX #include "dbaccessdllapi.h" @@ -80,6 +80,6 @@ namespace dbaui virtual void resizeDocumentView( Rectangle& _rPlayground ); }; } -#endif // DBAUI_DATAVIEW_HXX +#endif // INCLUDED_DBACCESS_DATAVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/dbaccessdllapi.h b/include/dbaccess/dbaccessdllapi.h index aff4e9613ca2..6393cd6fb927 100644 --- a/include/dbaccess/dbaccessdllapi.h +++ b/include/dbaccess/dbaccessdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESSDLLAPI_H -#define INCLUDED_DBACCESSDLLAPI_H +#ifndef INCLUDED_DBACCESS_DBACCESSDLLAPI_H +#define INCLUDED_DBACCESS_DBACCESSDLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_DBACCESSDLLAPI_H */ +#endif // INCLUDED_DBACCESS_DBACCESSDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx index a04b57248053..63d2cc1ec772 100644 --- a/include/dbaccess/dbaundomanager.hxx +++ b/include/dbaccess/dbaundomanager.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBACCESS_DBAUNDOMANAGER_HXX -#define DBACCESS_DBAUNDOMANAGER_HXX +#ifndef INCLUDED_DBACCESS_DBAUNDOMANAGER_HXX +#define INCLUDED_DBACCESS_DBAUNDOMANAGER_HXX #include "dbaccessdllapi.h" @@ -91,6 +91,6 @@ namespace dbaui } // namespace dbaui //...................................................................................................................... -#endif // DBACCESS_DBAUNDOMANAGER_HXX +#endif // INCLUDED_DBACCESS_DBAUNDOMANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 17319cb84325..138a59c09dc1 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_SUBCOMPONENTCONTROLLER_HXX -#define DBAUI_SUBCOMPONENTCONTROLLER_HXX +#ifndef INCLUDED_DBACCESS_DBSUBCOMPONENTCONTROLLER_HXX +#define INCLUDED_DBACCESS_DBSUBCOMPONENTCONTROLLER_HXX #include "genericcontroller.hxx" @@ -199,6 +199,6 @@ namespace dbaui } // namespace dbaui //........................................................................ -#endif // DBAUI_SUBCOMPONENTCONTROLLER_HXX +#endif // INCLUDED_DBACCESS_DBSUBCOMPONENTCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 6a7fd7f4bc2c..0fcd56ad832c 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_GENERICCONTROLLER_HXX -#define DBAUI_GENERICCONTROLLER_HXX +#ifndef INCLUDED_DBACCESS_GENERICCONTROLLER_HXX +#define INCLUDED_DBACCESS_GENERICCONTROLLER_HXX #include "AsyncronousLink.hxx" #include "controllerframe.hxx" @@ -525,7 +525,7 @@ namespace dbaui }; } -#endif //DBAUI_GENERICCONTROLLER_HXX +#endif // INCLUDED_DBACCESS_GENERICCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index ad0ec527ea57..98ab5193e535 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX -#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETESHADOWPRIMITIVE2D_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETESHADOWPRIMITIVE2D_HXX #include <drawinglayer/drawinglayerdllapi.h> @@ -116,6 +116,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX +#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETESHADOWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx index 2899b37244e1..b1fedbb17a94 100644 --- a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx +++ b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETYPES2D_HXX -#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETYPES2D_HXX +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX ////////////////////////////////////////////////////////////////////////////// // define ranges for other libraries @@ -106,6 +106,6 @@ ////////////////////////////////////////////////////////////////////////////// -#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETYPES2D_HXX +#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 359fc0fa5e15..374f632e4fb7 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.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 INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INFOHIERARCHYPRIMITIVE2D_HXX -#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INFOHIERARCHYPRIMITIVE2D_HXX +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OBJECTINFOPRIMITIVE2D_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OBJECTINFOPRIMITIVE2D_HXX #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> @@ -68,7 +68,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INFOHIERARCHYPRIMITIVE2D_HXX +#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OBJECTINFOPRIMITIVE2D_HXX ////////////////////////////////////////////////////////////////////////////// // eof diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 3d208231b7ea..e7c64b465f15 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX -#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETOOLS2D_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETOOLS2D_HXX #include <drawinglayer/drawinglayerdllapi.h> @@ -194,6 +194,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX +#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETOOLS2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index 90ffb17a70f6..22111878e8b6 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX -#define INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLAYOUTDEVICE_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLAYOUTDEVICE_HXX #include <drawinglayer/drawinglayerdllapi.h> diff --git a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 3be15ad5e8bb..bb9aa2997162 100644 --- a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_PRIMITIVETYPES3D_HXX -#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_PRIMITIVETYPES3D_HXX +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX ////////////////////////////////////////////////////////////////////////////// // define ranges for other libraries @@ -50,6 +50,6 @@ ////////////////////////////////////////////////////////////////////////////// -#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_PRIMITIVETYPES3D_HXX +#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx index 5dea3b450c19..51b85f87c470 100644 --- a/include/drawinglayer/processor2d/canvasprocessor.hxx +++ b/include/drawinglayer/processor2d/canvasprocessor.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX -#define _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX +#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX +#define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX #include <drawinglayer/drawinglayerdllapi.h> @@ -117,6 +117,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -#endif //_DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX +#endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx index cd149db71e6d..8f72de08b974 100644 --- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx +++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PROCESSOR_FROM_OUTPUTDEVICE_HXX -#define _PROCESSOR_FROM_OUTPUTDEVICE_HXX +#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX +#define INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX #include <drawinglayer/geometry/viewinformation2d.hxx> #include "drawinglayer/drawinglayerdllapi.h" @@ -50,6 +50,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -#endif //_PROCESSOR_FROM_OUTPUTDEVICE_HXX +#endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/dllapi.h b/include/filter/dllapi.h index 5b93bff8f0dd..1f0f30349871 100644 --- a/include/filter/dllapi.h +++ b/include/filter/dllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FILTER_DLLAPI_H -#define _FILTER_DLLAPI_H +#ifndef INCLUDED_FILTER_DLLAPI_H +#define INCLUDED_FILTER_DLLAPI_H #include "sal/config.h" #include "sal/types.h" diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx index b70f649b05c3..2d3f6383753f 100644 --- a/include/filter/msfilter/countryid.hxx +++ b/include/filter/msfilter/countryid.hxx @@ -19,8 +19,8 @@ // ============================================================================ -#ifndef INCLUDED_SVX_COUNTRYID_HXX -#define INCLUDED_SVX_COUNTRYID_HXX +#ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX +#define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX #include <sal/types.h> #include <i18nlangtag/lang.h> diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index e4e9e90a5a6e..da24017229cf 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.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 _DFFPROPSET_HXX -#define _DFFPROPSET_HXX +#ifndef INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX +#define INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX #include <tools/solar.h> #include <filter/msfilter/msfilterdllapi.h> diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx index ca2fcc368c46..9453a0dd5f90 100644 --- a/include/filter/msfilter/dffrecordheader.hxx +++ b/include/filter/msfilter/dffrecordheader.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DFFRECORDHEADER_HXX -#define _DFFRECORDHEADER_HXX +#ifndef INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX +#define INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX #include <tools/solar.h> #include <tools/stream.hxx> diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index e21805a0d208..3aaf94a1c378 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVX_ESCHEREX_HXX -#define _SVX_ESCHEREX_HXX +#ifndef INCLUDED_FILTER_MSFILTER_ESCHEREX_HXX +#define INCLUDED_FILTER_MSFILTER_ESCHEREX_HXX #include <memory> #include <vector> diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index f321441e2941..4a69b4a0dff2 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVX_MSCODEC_HXX -#define SVX_MSCODEC_HXX +#ifndef INCLUDED_FILTER_MSFILTER_MSCODEC_HXX +#define INCLUDED_FILTER_MSFILTER_MSCODEC_HXX #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 16675dbe9f0e..d7328de834a6 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FLT_MSDFFIMP_HXX -#define FLT_MSDFFIMP_HXX +#ifndef INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX +#define INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX #include <string.h> diff --git a/include/filter/msfilter/msfilterdllapi.h b/include/filter/msfilter/msfilterdllapi.h index 03816baa92fc..492e2309a079 100644 --- a/include/filter/msfilter/msfilterdllapi.h +++ b/include/filter/msfilter/msfilterdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_MSFILTER_DLLAPI_H -#define INCLUDED_MSFILTER_DLLAPI_H +#ifndef INCLUDED_FILTER_MSFILTER_MSFILTERDLLAPI_H +#define INCLUDED_FILTER_MSFILTER_MSFILTERDLLAPI_H #include "sal/types.h" diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx index 79815e49126e..1cf6a1a17c6b 100644 --- a/include/filter/msfilter/msocximex.hxx +++ b/include/filter/msfilter/msocximex.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 _MSOCXIMEX_HXX -#define _MSOCXIMEX_HXX +#ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX +#define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX #include <sot/storage.hxx> diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx index 468fa6284513..6ec4da63783a 100644 --- a/include/filter/msfilter/msoleexp.hxx +++ b/include/filter/msfilter/msoleexp.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 _MSOLEEXP_HXX -#define _MSOLEEXP_HXX +#ifndef INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX +#define INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX #include <com/sun/star/uno/Reference.h> #include "filter/msfilter/msfilterdllapi.h" diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index b76d7790c379..438602cdd1f0 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -6,8 +6,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _MSTOOLBAR_HXX -#define _MSTOOLBAR_HXX +#ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX +#define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX #include "filter/msfilter/msfilterdllapi.h" #include <sot/storage.hxx> #include <ostream> diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index bafcc461a598..4cb318dfdfcb 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.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 _MSVBAHELPER_HXX -#define _MSVBAHELPER_HXX +#ifndef INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX +#define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX #include <sfx2/objsh.hxx> #include <cppuhelper/implbase3.hxx> diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx index dab61f82eb87..b9a1de290b09 100644 --- a/include/filter/msfilter/rtfutil.hxx +++ b/include/filter/msfilter/rtfutil.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_MSFILTER_RTFUTIL_HXX -#define INCLUDED_MSFILTER_RTFUTIL_HXX +#ifndef INCLUDED_FILTER_MSFILTER_RTFUTIL_HXX +#define INCLUDED_FILTER_MSFILTER_RTFUTIL_HXX #include <filter/msfilter/msfilterdllapi.h> #include <rtl/string.hxx> diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 239325df8cbe..a81b0f6b3992 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVDFPPT_HXX -#define _SVDFPPT_HXX +#ifndef INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX +#define INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX #include <rtl/ustring.hxx> #include <tools/solar.h> @@ -1561,6 +1561,6 @@ public : #define PPT_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart #define PPT_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip -#endif //_SVDFPPT_HXX +#endif // INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 8f87401edee5..61d2ff3e1068 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVXMSBAS_HXX -#define _SVXMSBAS_HXX +#ifndef INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX +#define INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX #include <tools/solar.h> #include "filter/msfilter/msfilterdllapi.h" diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 0da3aafde875..8c9f29a5ef30 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_MSFILTER_UTIL_HXX -#define INCLUDED_MSFILTER_UTIL_HXX +#ifndef INCLUDED_FILTER_MSFILTER_UTIL_HXX +#define INCLUDED_FILTER_MSFILTER_UTIL_HXX #include <rtl/textenc.h> #include <tools/datetime.hxx> diff --git a/include/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx index cd9b3b5b69c6..25422355b2e2 100644 --- a/include/formula/ExternalReferenceHelper.hxx +++ b/include/formula/ExternalReferenceHelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_EXTERNALREFERENCEHELPER_HXX -#define FORMULA_EXTERNALREFERENCEHELPER_HXX +#ifndef INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX +#define INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX #include <rtl/ustring.hxx> #include "formula/formuladllapi.h" @@ -36,6 +36,6 @@ namespace formula // ============================================================================= } // formula // ============================================================================= -#endif //FORMULA_EXTERNALREFERENCEHELPER_HXX +#endif // INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index ae46a6db1f80..4cd4631dcacc 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_COMPILER_HXX_INCLUDED -#define FORMULA_COMPILER_HXX_INCLUDED +#ifndef INCLUDED_FORMULA_FORMULACOMPILER_HXX +#define INCLUDED_FORMULA_FORMULACOMPILER_HXX #include <formula/formuladllapi.h> #include <rtl/ustrbuf.hxx> @@ -392,7 +392,7 @@ private: } // formula // ============================================================================= -#endif // FORMULA_COMPILER_HXX_INCLUDED +#endif // INCLUDED_FORMULA_FORMULACOMPILER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 07945ca27101..2fbdbcf6d8bf 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED -#define FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED +#ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX +#define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX #include "formula/formuladllapi.h" #include <cppuhelper/implbase2.hxx> @@ -79,6 +79,6 @@ private: } // formula // ============================================================================= -#endif // FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED +#endif // INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx index cc22e45a6088..57cb134172b7 100644 --- a/include/formula/IControlReferenceHandler.hxx +++ b/include/formula/IControlReferenceHandler.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 FORMULA_ICONTROL_REFERENCE_HANDLER_HXX_INCLUDED -#define FORMULA_ICONTROL_REFERENCE_HANDLER_HXX_INCLUDED +#ifndef INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX +#define INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX #include "formula/formuladllapi.h" @@ -37,6 +37,6 @@ namespace formula ~IControlReferenceHandler() {} }; } // formula -#endif // FORMULA_ICONTROL_REFERENCE_HANDLER_HXX_INCLUDED +#endif // INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx index 1e145e04132b..d178aec680bd 100644 --- a/include/formula/errorcodes.hxx +++ b/include/formula/errorcodes.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SC_ERRORCODES_HXX -#define SC_ERRORCODES_HXX +#ifndef INCLUDED_FORMULA_ERRORCODES_HXX +#define INCLUDED_FORMULA_ERRORCODES_HXX #include <rtl/math.hxx> #include <tools/solar.h> @@ -114,6 +114,6 @@ inline sal_uInt16 GetDoubleErrorValue( double fVal ) // yes, exceptionally we put a "using namespace" in a header file.. using namespace ScErrorCodes; -#endif // SC_ERRORCODES_HXX +#endif // INCLUDED_FORMULA_ERRORCODES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 536521a0329e..a772823e56fd 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_FORMDATA_HXX -#define FORMULA_FORMDATA_HXX +#ifndef INCLUDED_FORMULA_FORMDATA_HXX +#define INCLUDED_FORMULA_FORMDATA_HXX #include <formula/formuladllapi.h> #include <rtl/ustring.hxx> @@ -78,6 +78,6 @@ private: } // formula -#endif // FORMULA_FORMDATA_HXX +#endif // INCLUDED_FORMULA_FORMDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 99a8752c7eb3..4bb48473d108 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_FORMULA_HXX -#define FORMULA_FORMULA_HXX +#ifndef INCLUDED_FORMULA_FORMULA_HXX +#define INCLUDED_FORMULA_FORMULA_HXX #include <sfx2/basedlgs.hxx> #include <memory> @@ -136,6 +136,6 @@ protected: } // formula -#endif // FORMULA_FORMULA_HXX +#endif // INCLUDED_FORMULA_FORMULA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formuladllapi.h b/include/formula/formuladllapi.h index b2f4b06bd1a8..e633fd2a1076 100644 --- a/include/formula/formuladllapi.h +++ b/include/formula/formuladllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULADLLAPI_H -#define INCLUDED_FORMULADLLAPI_H +#ifndef INCLUDED_FORMULA_FORMULADLLAPI_H +#define INCLUDED_FORMULA_FORMULADLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define FORMULA_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_FORMULADLLAPI_H */ +#endif // INCLUDED_FORMULA_FORMULADLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index 41095da99364..737550d055f8 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_FORMULA_HELPER_HXX -#define FORMULA_FORMULA_HELPER_HXX +#ifndef INCLUDED_FORMULA_FORMULAHELPER_HXX +#define INCLUDED_FORMULA_FORMULAHELPER_HXX #include <formula/IFunctionDescription.hxx> #include <formula/formuladllapi.h> @@ -75,6 +75,6 @@ namespace formula } // formula // ============================================================================= -#endif //FORMULA_FORMULA_HELPER_HXX +#endif // INCLUDED_FORMULA_FORMULAHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index b34d56b85ee1..5163da5c65e3 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_FUNCUTL_HXX -#define FORMULA_FUNCUTL_HXX +#ifndef INCLUDED_FORMULA_FUNCUTL_HXX +#define INCLUDED_FORMULA_FUNCUTL_HXX #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -104,6 +104,6 @@ public: } // formula -#endif // FORMULA_FUNCUTL_HXX +#endif // INCLUDED_FORMULA_FUNCUTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 610cf4664a3a..130a5a3fb617 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_GRAMMAR_HXX -#define FORMULA_GRAMMAR_HXX +#ifndef INCLUDED_FORMULA_GRAMMAR_HXX +#define INCLUDED_FORMULA_GRAMMAR_HXX #include "com/sun/star/sheet/FormulaLanguage.hpp" #include "formula/formuladllapi.h" @@ -243,6 +243,6 @@ public: } // formula // ============================================================================= -#endif // FORMULA_GRAMMAR_HXX +#endif // INCLUDED_FORMULA_GRAMMAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/omoduleclient.hxx b/include/formula/omoduleclient.hxx index 76fcee97fb57..94211e8898cb 100644 --- a/include/formula/omoduleclient.hxx +++ b/include/formula/omoduleclient.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_MODULECLIENT_HXX -#define INCLUDED_FORMULA_MODULECLIENT_HXX +#ifndef INCLUDED_FORMULA_OMODULECLIENT_HXX +#define INCLUDED_FORMULA_OMODULECLIENT_HXX #include "sal/config.h" diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 384bd0d5d798..9ebd9d57db1a 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_OPCODE_HXX -#define FORMULA_OPCODE_HXX +#ifndef INCLUDED_FORMULA_OPCODE_HXX +#define INCLUDED_FORMULA_OPCODE_HXX #include "formula/compiler.hrc" #include <tools/solar.h> diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 905be7b5ef90..8fa8708b5133 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_TOKEN_HXX -#define FORMULA_TOKEN_HXX +#ifndef INCLUDED_FORMULA_TOKEN_HXX +#define INCLUDED_FORMULA_TOKEN_HXX #include <memory> #include <string.h> diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 45c0db0aa244..120a3bb550ff 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_TOKENARRAY_HXX -#define FORMULA_TOKENARRAY_HXX +#ifndef INCLUDED_FORMULA_TOKENARRAY_HXX +#define INCLUDED_FORMULA_TOKENARRAY_HXX #include <limits.h> #include "formula/token.hxx" @@ -282,6 +282,6 @@ private: // ============================================================================= -#endif // FORMULA_TOKENARRAY_HXX +#endif // INCLUDED_FORMULA_TOKENARRAY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/types.hxx b/include/formula/types.hxx index 33ead51620a6..c9e29929b9c5 100644 --- a/include/formula/types.hxx +++ b/include/formula/types.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_TYPES_HXX -#define FORMULA_TYPES_HXX +#ifndef INCLUDED_FORMULA_TYPES_HXX +#define INCLUDED_FORMULA_TYPES_HXX #include <boost/intrusive_ptr.hpp> diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index 0d3cbf767229..d02f9c5690e3 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef FORMULA_VECTORTOKEN_HXX -#define FORMULA_VECTORTOKEN_HXX +#ifndef INCLUDED_FORMULA_VECTORTOKEN_HXX +#define INCLUDED_FORMULA_VECTORTOKEN_HXX #include "formula/token.hxx" diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx index e942de94924f..392368e634d6 100644 --- a/include/framework/actiontriggerhelper.hxx +++ b/include/framework/actiontriggerhelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ -#define __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ +#ifndef INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX +#define INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX #include <com/sun/star/container/XIndexContainer.hpp> #include <vcl/menu.hxx> @@ -62,6 +62,6 @@ namespace framework }; } -#endif // __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ +#endif // INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index 6390459be0f1..3218cba98e41 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.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 __FRAMEWORK_CLASSES_ADDONMENU_HXX_ -#define __FRAMEWORK_CLASSES_ADDONMENU_HXX_ +#ifndef INCLUDED_FRAMEWORK_ADDONMENU_HXX +#define INCLUDED_FRAMEWORK_ADDONMENU_HXX #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -122,6 +122,6 @@ class FWE_DLLPUBLIC AddonMenuManager } // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_ +#endif // INCLUDED_FRAMEWORK_ADDONMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 0a926b865c0b..8119b09a617c 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.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 __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ -#define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ +#ifndef INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX +#define INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX #include <sal/types.h> #include <osl/mutex.hxx> @@ -367,6 +367,6 @@ class FWE_DLLPUBLIC AddonsOptions } -#endif // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ +#endif // INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/bmkmenu.hxx b/include/framework/bmkmenu.hxx index bf7e8d7868a8..76cd6652f510 100644 --- a/include/framework/bmkmenu.hxx +++ b/include/framework/bmkmenu.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 __FRAMEWORK_CLASSES_BMKMENU_HXX -#define __FRAMEWORK_CLASSES_BMKMENU_HXX +#ifndef INCLUDED_FRAMEWORK_BMKMENU_HXX +#define INCLUDED_FRAMEWORK_BMKMENU_HXX #include "framework/addonmenu.hxx" @@ -63,6 +63,6 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu } // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX +#endif // INCLUDED_FRAMEWORK_BMKMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx index 06b6467f6c2a..c5552a354592 100644 --- a/include/framework/configimporter.hxx +++ b/include/framework/configimporter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_ -#define __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_ +#ifndef INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX +#define INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/embed/XStorage.hpp> @@ -42,6 +42,6 @@ namespace framework } // namespace framework -#endif // __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_ +#endif // INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx index 1954a72b5c67..ea1fe9412afb 100644 --- a/include/framework/documentundoguard.hxx +++ b/include/framework/documentundoguard.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FRAMEWORK_DOCUMENTUNDOGUARD_HXX -#define FRAMEWORK_DOCUMENTUNDOGUARD_HXX +#ifndef INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX +#define INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX #include "framework/fwedllapi.h" @@ -58,6 +58,6 @@ namespace framework } // namespace framework //...................................................................................................................... -#endif // FRAMEWORK_DOCUMENTUNDOGUARD_HXX +#endif // INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx index 29694b7fb539..7a4dd3d9ac00 100644 --- a/include/framework/eventsconfiguration.hxx +++ b/include/framework/eventsconfiguration.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ +#ifndef INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX +#define INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX #include <framework/fwedllapi.h> #include <tools/stream.hxx> @@ -38,6 +38,6 @@ struct FWE_DLLPUBLIC EventsConfig } // namespace framework -#endif // __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ +#endif // INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index ab153311ccba..e039304c4181 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ -#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ +#ifndef INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX +#define INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX #include <com/sun/star/frame/XFrame.hpp> @@ -190,6 +190,6 @@ class FWE_DLLPUBLIC FrameListAnalyzer } // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ +#endif // INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/fwedllapi.h b/include/framework/fwedllapi.h index 14201508768a..06b1cc1a46ac 100644 --- a/include/framework/fwedllapi.h +++ b/include/framework/fwedllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FWEDLLAPI_H -#define INCLUDED_FWEDLLAPI_H +#ifndef INCLUDED_FRAMEWORK_FWEDLLAPI_H +#define INCLUDED_FRAMEWORK_FWEDLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define FWE_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_FWEDLLAPI_H */ +#endif // INCLUDED_FRAMEWORK_FWEDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/iguard.hxx b/include/framework/iguard.hxx index a522d6225e43..f57fd3c8c9f3 100644 --- a/include/framework/iguard.hxx +++ b/include/framework/iguard.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_THREADHELP_IGUARD_H_ -#define __FRAMEWORK_THREADHELP_IGUARD_H_ +#ifndef INCLUDED_FRAMEWORK_IGUARD_HXX +#define INCLUDED_FRAMEWORK_IGUARD_HXX #include <sal/types.h> @@ -49,6 +49,6 @@ class SAL_NO_VTABLE IGuard } // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_IGUARD_H_ +#endif // INCLUDED_FRAMEWORK_IGUARD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/imageproducer.hxx b/include/framework/imageproducer.hxx index 0d9398f7b2a3..876c635462e3 100644 --- a/include/framework/imageproducer.hxx +++ b/include/framework/imageproducer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ -#define __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ +#ifndef INCLUDED_FRAMEWORK_IMAGEPRODUCER_HXX +#define INCLUDED_FRAMEWORK_IMAGEPRODUCER_HXX #include <sal/types.h> #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/framework/imutex.hxx b/include/framework/imutex.hxx index f576297e0d14..39e9f50ebe39 100644 --- a/include/framework/imutex.hxx +++ b/include/framework/imutex.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_ -#define __FRAMEWORK_THREADHELP_IMUTEX_H_ +#ifndef INCLUDED_FRAMEWORK_IMUTEX_HXX +#define INCLUDED_FRAMEWORK_IMUTEX_HXX #include <sal/types.h> @@ -48,6 +48,6 @@ class SAL_NO_VTABLE IMutex } // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_ +#endif // INCLUDED_FRAMEWORK_IMUTEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index 1cd56bbd36d9..0b316fb6505d 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_ -#define __FRAMEWORK_DISPATCH_INTERACTION_HXX_ +#ifndef INCLUDED_FRAMEWORK_INTERACTION_HXX +#define INCLUDED_FRAMEWORK_INTERACTION_HXX #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/task/XInteractionContinuation.hpp> @@ -98,6 +98,6 @@ public: } // namespace framework -#endif // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_ +#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 1ccd6ba0d167..ad820f4e46cb 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ +#ifndef INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX +#define INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> @@ -102,6 +102,6 @@ class FWE_DLLPUBLIC MenuConfiguration } -#endif // __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ +#endif // INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/menuextensionsupplier.hxx b/include/framework/menuextensionsupplier.hxx index 6d3a6761e38e..303de1353ea6 100644 --- a/include/framework/menuextensionsupplier.hxx +++ b/include/framework/menuextensionsupplier.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ -#define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ +#ifndef INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX +#define INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX #include <rtl/ustring.hxx> #include <framework/fwedllapi.h> @@ -38,6 +38,6 @@ FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension(); } -#endif // __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ +#endif // INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 5be9d52f62cf..e466cf20996c 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ -#define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ +#ifndef INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX +#define INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX #include <framework/fwedllapi.h> @@ -231,6 +231,6 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 } // namespace framework -#endif // #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ +#endif // INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx index ce2b604f5e5e..bad672f1b009 100644 --- a/include/framework/sfxhelperfunctions.hxx +++ b/include/framework/sfxhelperfunctions.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ -#define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ +#ifndef INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX +#define INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX #include <framework/fwedllapi.h> #include <com/sun/star/frame/XFrame.hpp> @@ -92,6 +92,6 @@ FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel( const OUString& i_rPanelURL ); } -#endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ +#endif // INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx index e71a89fe0ca4..c63e0c33872e 100644 --- a/include/framework/statusbarconfiguration.hxx +++ b/include/framework/statusbarconfiguration.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 __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ -#define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ +#ifndef INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX +#define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX #include <framework/fwedllapi.h> #include <tools/stream.hxx> @@ -48,6 +48,6 @@ class FWE_DLLPUBLIC StatusBarConfiguration } // namespace framework -#endif // __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ +#endif // INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index c4cdc31a6329..1ddf064eb4bf 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FRAMEWORK_TITLEHELPER_HXX_ -#define _FRAMEWORK_TITLEHELPER_HXX_ +#ifndef INCLUDED_FRAMEWORK_TITLEHELPER_HXX +#define INCLUDED_FRAMEWORK_TITLEHELPER_HXX #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XInterface.hpp> @@ -201,6 +201,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex } // namespace framework -#endif // _FRAMEWORK_TITLEHELPER_HXX_ +#endif // INCLUDED_FRAMEWORK_TITLEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx index a296231a07ea..5bac1c323936 100644 --- a/include/framework/toolboxconfiguration.hxx +++ b/include/framework/toolboxconfiguration.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 __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ +#ifndef INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX +#define INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX #include <framework/fwedllapi.h> #include <vcl/bitmap.hxx> @@ -47,6 +47,6 @@ class FWE_DLLPUBLIC ToolBoxConfiguration } // namespace framework -#endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ +#endif // INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index ae91db981553..296092e203ea 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FRAMEWORK_UNDOMANAGERHELPER_HXX -#define FRAMEWORK_UNDOMANAGERHELPER_HXX +#ifndef INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX +#define INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX #include "framework/fwedllapi.h" #include "framework/iguard.hxx" @@ -154,6 +154,6 @@ namespace framework } // namespace framework //...................................................................................................................... -#endif // FRAMEWORK_UNDOMANAGERHELPER_HXX +#endif // INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/helpcompiler/HelpIndexer.hxx b/include/helpcompiler/HelpIndexer.hxx index 4be40eb827ce..47733a6d8a25 100644 --- a/include/helpcompiler/HelpIndexer.hxx +++ b/include/helpcompiler/HelpIndexer.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef HELPINDEXER_HXX -#define HELPINDEXER_HXX +#ifndef INCLUDED_HELPCOMPILER_HELPINDEXER_HXX +#define INCLUDED_HELPCOMPILER_HELPINDEXER_HXX #include <helpcompiler/dllapi.h> diff --git a/include/helpcompiler/HelpSearch.hxx b/include/helpcompiler/HelpSearch.hxx index a28af890ceb7..b177430a28e0 100644 --- a/include/helpcompiler/HelpSearch.hxx +++ b/include/helpcompiler/HelpSearch.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef HELPSEARCH_HXX -#define HELPSEARCH_HXX +#ifndef INCLUDED_HELPCOMPILER_HELPSEARCH_HXX +#define INCLUDED_HELPCOMPILER_HELPSEARCH_HXX #include <helpcompiler/dllapi.h> diff --git a/include/helpcompiler/compilehelp.hxx b/include/helpcompiler/compilehelp.hxx index 4ef706d32388..a86192e21b4a 100644 --- a/include/helpcompiler/compilehelp.hxx +++ b/include/helpcompiler/compilehelp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef COMPILE_HXX -#define COMPILE_HXX +#ifndef INCLUDED_HELPCOMPILER_COMPILEHELP_HXX +#define INCLUDED_HELPCOMPILER_COMPILEHELP_HXX #include "sal/types.h" diff --git a/include/helpcompiler/dllapi.h b/include/helpcompiler/dllapi.h index a2035bafb9c1..ff91bd5a446b 100644 --- a/include/helpcompiler/dllapi.h +++ b/include/helpcompiler/dllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _L10N_DLLAPI_H -#define _L10N_DLLAPI_H +#ifndef INCLUDED_HELPCOMPILER_DLLAPI_H +#define INCLUDED_HELPCOMPILER_DLLAPI_H #include "sal/config.h" #include "sal/types.h" diff --git a/include/i18nutil/i18nutildllapi.h b/include/i18nutil/i18nutildllapi.h index b208b51e9ee0..9bd051d79258 100644 --- a/include/i18nutil/i18nutildllapi.h +++ b/include/i18nutil/i18nutildllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_I18NUTILDLLAPI_H -#define INCLUDED_I18NUTILDLLAPI_H +#ifndef INCLUDED_I18NUTIL_I18NUTILDLLAPI_H +#define INCLUDED_I18NUTIL_I18NUTILDLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define I18NUTIL_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_I18NUTILDLLAPI_H */ +#endif // INCLUDED_I18NUTIL_I18NUTILDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx index 533e4ad52c59..b51eaa08cc44 100644 --- a/include/i18nutil/oneToOneMapping.hxx +++ b/include/i18nutil/oneToOneMapping.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 INCLUDED_I18NUTIL_TRANSLITERATION_ONETOONEMAPPING_HXX -#define INCLUDED_I18NUTIL_TRANSLITERATION_ONETOONEMAPPING_HXX +#ifndef INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX +#define INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX #include <boost/noncopyable.hpp> #include <rtl/ustring.hxx> diff --git a/include/i18nutil/scripttypedetector.hxx b/include/i18nutil/scripttypedetector.hxx index cf3b9b71e11b..40a43194b575 100644 --- a/include/i18nutil/scripttypedetector.hxx +++ b/include/i18nutil/scripttypedetector.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 _I18N_SCRIPTTYPEDETECTOR_HXX_ -#define _I18N_SCRIPTTYPEDETECTOR_HXX_ +#ifndef INCLUDED_I18NUTIL_SCRIPTTYPEDETECTOR_HXX +#define INCLUDED_I18NUTIL_SCRIPTTYPEDETECTOR_HXX #include "i18nutildllapi.h" #include <rtl/ustring.hxx> diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx index 0fb1d5ecb75e..c3edd44e28aa 100644 --- a/include/linguistic/hyphdta.hxx +++ b/include/linguistic/hyphdta.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _LINGUISTIC_HYPHDTA_HXX_ -#define _LINGUISTIC_HYPHDTA_HXX_ +#ifndef INCLUDED_LINGUISTIC_HYPHDTA_HXX +#define INCLUDED_LINGUISTIC_HYPHDTA_HXX #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> #include <com/sun/star/linguistic2/XPossibleHyphens.hpp> diff --git a/include/linguistic/lngdllapi.h b/include/linguistic/lngdllapi.h index 0da35fe7e123..99fcd952f0af 100644 --- a/include/linguistic/lngdllapi.h +++ b/include/linguistic/lngdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _LNG_DLLAPI_H -#define _LNG_DLLAPI_H +#ifndef INCLUDED_LINGUISTIC_LNGDLLAPI_H +#define INCLUDED_LINGUISTIC_LNGDLLAPI_H #include "sal/config.h" #include "sal/types.h" diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index b20a8e5d253a..d08258613a65 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _LINGUISTIC_LNGPROPHELP_HXX_ -#define _LINGUISTIC_LNGPROPHELP_HXX_ +#ifndef INCLUDED_LINGUISTIC_LNGPROPHELP_HXX +#define INCLUDED_LINGUISTIC_LNGPROPHELP_HXX #include <tools/solar.h> #include <uno/lbnames.h> diff --git a/include/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx index 2f8339f9b0b8..77d411af099d 100644 --- a/include/linguistic/lngprops.hxx +++ b/include/linguistic/lngprops.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _LINGUISTIC_LNGPROPS_HHX_ -#define _LINGUISTIC_LNGPROPS_HHX_ +#ifndef INCLUDED_LINGUISTIC_LNGPROPS_HXX +#define INCLUDED_LINGUISTIC_LNGPROPS_HXX #include <unotools/linguprops.hxx> diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 0a3688e918bd..805e3c155e9d 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _LINGUISTIC_MISC_HXX_ -#define _LINGUISTIC_MISC_HXX_ +#ifndef INCLUDED_LINGUISTIC_MISC_HXX +#define INCLUDED_LINGUISTIC_MISC_HXX #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.h> diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx index 92f9cd680c77..c4e8348a5f4a 100644 --- a/include/linguistic/spelldta.hxx +++ b/include/linguistic/spelldta.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _LINGUISTIC_SPELLDTA_HXX_ -#define _LINGUISTIC_SPELLDTA_HXX_ +#ifndef INCLUDED_LINGUISTIC_SPELLDTA_HXX +#define INCLUDED_LINGUISTIC_SPELLDTA_HXX #include <vector> #include <com/sun/star/linguistic2/XSpellAlternatives.hpp> diff --git a/include/package/Deflater.hxx b/include/package/Deflater.hxx index 7531e3a1ac66..4476b17bdd95 100644 --- a/include/package/Deflater.hxx +++ b/include/package/Deflater.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DEFLATER_HXX_ -#define _DEFLATER_HXX_ +#ifndef INCLUDED_PACKAGE_DEFLATER_HXX +#define INCLUDED_PACKAGE_DEFLATER_HXX #include <com/sun/star/uno/Sequence.hxx> #include "packagedllapi.hxx" diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx index 284451750e43..d241bb5efd5a 100644 --- a/include/package/Inflater.hxx +++ b/include/package/Inflater.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _INFLATER_HXX_ -#define _INFLATER_HXX_ +#ifndef INCLUDED_PACKAGE_INFLATER_HXX +#define INCLUDED_PACKAGE_INFLATER_HXX #include <com/sun/star/uno/Sequence.hxx> #include "packagedllapi.hxx" diff --git a/include/package/packagedllapi.hxx b/include/package/packagedllapi.hxx index 72a3dab60f07..cd8cb4f3d79a 100644 --- a/include/package/packagedllapi.hxx +++ b/include/package/packagedllapi.hxx @@ -6,8 +6,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_PACKAGEDLLAPI_H -#define INCLUDED_PACKAGEDLLAPI_H +#ifndef INCLUDED_PACKAGE_PACKAGEDLLAPI_HXX +#define INCLUDED_PACKAGE_PACKAGEDLLAPI_HXX #include "sal/types.h" @@ -17,6 +17,6 @@ #define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT #endif -#endif /* INCLUDED_PACKAGEDLLAPI_H */ +#endif // INCLUDED_PACKAGE_PACKAGEDLLAPI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/postx.h b/include/postx.h index ff5228a467da..e65bd546a13b 100644 --- a/include/postx.h +++ b/include/postx.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _POSTX_H -#define _POSTX_H +#ifndef INCLUDED_POSTX_H +#define INCLUDED_POSTX_H #if defined __cplusplus } diff --git a/include/registry/reflread.hxx b/include/registry/reflread.hxx index 541692443127..15fbe3780095 100644 --- a/include/registry/reflread.hxx +++ b/include/registry/reflread.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _REGISTRY_REFLREAD_HXX_ -#define _REGISTRY_REFLREAD_HXX_ +#ifndef INCLUDED_REGISTRY_REFLREAD_HXX +#define INCLUDED_REGISTRY_REFLREAD_HXX #include <registry/regdllapi.h> #include <registry/refltype.hxx> diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx index 0de7716a9ed3..69a96a75fca4 100644 --- a/include/registry/refltype.hxx +++ b/include/registry/refltype.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _REGISTRY_REFLTYPE_HXX_ -#define _REGISTRY_REFLTYPE_HXX_ +#ifndef INCLUDED_REGISTRY_REFLTYPE_HXX +#define INCLUDED_REGISTRY_REFLTYPE_HXX #include "registry/types.h" #include <sal/types.h> diff --git a/include/registry/reflwrit.hxx b/include/registry/reflwrit.hxx index 8e84aa9b1483..8fa2e3668c90 100644 --- a/include/registry/reflwrit.hxx +++ b/include/registry/reflwrit.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _REGISTRY_REFLWRIT_HXX_ -#define _REGISTRY_REFLWRIT_HXX_ +#ifndef INCLUDED_REGISTRY_REFLWRIT_HXX +#define INCLUDED_REGISTRY_REFLWRIT_HXX #include <registry/regdllapi.h> #include <registry/refltype.hxx> diff --git a/include/registry/regdllapi.h b/include/registry/regdllapi.h index 5116a7062d24..9871cca5a380 100644 --- a/include/registry/regdllapi.h +++ b/include/registry/regdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGDLLAPI_H -#define INCLUDED_REGDLLAPI_H +#ifndef INCLUDED_REGISTRY_REGDLLAPI_H +#define INCLUDED_REGISTRY_REGDLLAPI_H #include "sal/types.h" @@ -28,6 +28,6 @@ #define REG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif /* INCLUDED_REGDLLAPI_H */ +#endif // INCLUDED_REGISTRY_REGDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/registry.h b/include/registry/registry.h index 030e1a12a5de..9caa1331d2eb 100644 --- a/include/registry/registry.h +++ b/include/registry/registry.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _REGISTRY_REGISTRY_H_ -#define _REGISTRY_REGISTRY_H_ +#ifndef INCLUDED_REGISTRY_REGISTRY_H +#define INCLUDED_REGISTRY_REGISTRY_H #include <stddef.h> #include <rtl/ustring.h> diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index d165c594adff..0e322f37220e 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _REGISTRY_REGISTRY_HXX_ -#define _REGISTRY_REGISTRY_HXX_ +#ifndef INCLUDED_REGISTRY_REGISTRY_HXX +#define INCLUDED_REGISTRY_REGISTRY_HXX #include <registry/regdllapi.h> #include <registry/regtype.h> diff --git a/include/registry/regtype.h b/include/registry/regtype.h index 86ddb299fb37..518821c87f46 100644 --- a/include/registry/regtype.h +++ b/include/registry/regtype.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _REGISTRY_REGTYPE_H_ -#define _REGISTRY_REGTYPE_H_ +#ifndef INCLUDED_REGISTRY_REGTYPE_H +#define INCLUDED_REGISTRY_REGTYPE_H #include <sal/types.h> diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 4e8ca10090c7..81048e07fa47 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RSC_RSC_VCL_SHARED_TYPES_HXX -#define _RSC_RSC_VCL_SHARED_TYPES_HXX +#ifndef INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX +#define INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC, TIMEF_SEC_CS, TimeFieldFormat_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; diff --git a/include/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx index 8dc9687031d5..43f6149ef450 100644 --- a/include/rsc/rscsfx.hxx +++ b/include/rsc/rscsfx.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 _RSCSFX_HXX -#define _RSCSFX_HXX +#ifndef INCLUDED_RSC_RSCSFX_HXX +#define INCLUDED_RSC_RSCSFX_HXX // StarView (RSC_NOTYPE) bis (RSC_NOTYPE + 0x190) // Sfx (RSC_NOTYPE + 0x200) bis (RSC_NOTYPE + 0x20F) diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h index ef48d01719ee..f8f269690e65 100644 --- a/include/rtl/alloc.h +++ b/include/rtl/alloc.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_ALLOC_H_ -#define _RTL_ALLOC_H_ +#ifndef INCLUDED_RTL_ALLOC_H +#define INCLUDED_RTL_ALLOC_H #include "sal/config.h" @@ -252,6 +252,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cache_free ( } #endif -#endif /*_RTL_ALLOC_H_ */ +#endif // INCLUDED_RTL_ALLOC_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/bootstrap.h b/include/rtl/bootstrap.h index ccfdd0521e20..6a4e134cf8cf 100644 --- a/include/rtl/bootstrap.h +++ b/include/rtl/bootstrap.h @@ -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 _RTL_BOOTSTRAP_H_ -#define _RTL_BOOTSTRAP_H_ +#ifndef INCLUDED_RTL_BOOTSTRAP_H +#define INCLUDED_RTL_BOOTSTRAP_H #include "sal/config.h" diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx index 057e60625021..5ec010791029 100644 --- a/include/rtl/bootstrap.hxx +++ b/include/rtl/bootstrap.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 _RTL_BOOTSTRAP_HXX_ -#define _RTL_BOOTSTRAP_HXX_ +#ifndef INCLUDED_RTL_BOOTSTRAP_HXX +#define INCLUDED_RTL_BOOTSTRAP_HXX #include <rtl/ustring.hxx> #include <rtl/bootstrap.h> diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h index 99107143b601..a27721cf547f 100644 --- a/include/rtl/byteseq.h +++ b/include/rtl/byteseq.h @@ -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 _RTL_BYTESEQ_H_ -#define _RTL_BYTESEQ_H_ +#ifndef INCLUDED_RTL_BYTESEQ_H +#define INCLUDED_RTL_BYTESEQ_H #include "sal/config.h" diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx index aaff08ed97a6..1d39ddefcf15 100644 --- a/include/rtl/byteseq.hxx +++ b/include/rtl/byteseq.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 _RTL_BYTESEQ_HXX_ -#define _RTL_BYTESEQ_HXX_ +#ifndef INCLUDED_RTL_BYTESEQ_HXX +#define INCLUDED_RTL_BYTESEQ_HXX #include <osl/interlck.h> #include <rtl/byteseq.h> diff --git a/include/rtl/cipher.h b/include/rtl/cipher.h index a116e57ba071..36861a3dbd04 100644 --- a/include/rtl/cipher.h +++ b/include/rtl/cipher.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_CIPHER_H_ -#define _RTL_CIPHER_H_ +#ifndef INCLUDED_RTL_CIPHER_H +#define INCLUDED_RTL_CIPHER_H #include "sal/config.h" @@ -312,6 +312,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cipher_destroyARCFOUR ( } #endif -#endif /* !_RTL_CIPHER_H_ */ +#endif /* ! INCLUDED_RTL_CIPHER_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/crc.h b/include/rtl/crc.h index 7fad87ef4f37..d320c5381c55 100644 --- a/include/rtl/crc.h +++ b/include/rtl/crc.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_CRC_H_ -#define _RTL_CRC_H_ +#ifndef INCLUDED_RTL_CRC_H +#define INCLUDED_RTL_CRC_H #include "sal/config.h" @@ -58,6 +58,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL rtl_crc32 ( } #endif -#endif /* _RTL_CRC_H_ */ +#endif // INCLUDED_RTL_CRC_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/digest.h b/include/rtl/digest.h index cc49838821f7..403fbe8e8e78 100644 --- a/include/rtl/digest.h +++ b/include/rtl/digest.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_DIGEST_H_ -#define _RTL_DIGEST_H_ +#ifndef INCLUDED_RTL_DIGEST_H +#define INCLUDED_RTL_DIGEST_H #include "sal/config.h" @@ -638,6 +638,6 @@ SAL_DLLPUBLIC rtlDigestError SAL_CALL rtl_digest_PBKDF2 ( } #endif -#endif /* _RTL_DIGEST_H_ */ +#endif // INCLUDED_RTL_DIGEST_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/locale.h b/include/rtl/locale.h index 197a9152284d..68e1531d689b 100644 --- a/include/rtl/locale.h +++ b/include/rtl/locale.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_LOCALE_H_ -#define _RTL_LOCALE_H_ +#ifndef INCLUDED_RTL_LOCALE_H +#define INCLUDED_RTL_LOCALE_H #include "sal/config.h" @@ -130,7 +130,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_locale_equals( rtl_Locale * This, rtl_Local } #endif -#endif /* _RTL_LOCALE_H_ */ +#endif // INCLUDED_RTL_LOCALE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/logfile.h b/include/rtl/logfile.h index c14c5c118abd..ccb8d2957af8 100644 --- a/include/rtl/logfile.h +++ b/include/rtl/logfile.h @@ -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 _RTL_LOGFILE_H_ -#define _RTL_LOGFILE_H_ +#ifndef INCLUDED_RTL_LOGFILE_H +#define INCLUDED_RTL_LOGFILE_H #include "sal/config.h" diff --git a/include/rtl/logfile.hxx b/include/rtl/logfile.hxx index d911f5664f92..82ed1687425b 100644 --- a/include/rtl/logfile.hxx +++ b/include/rtl/logfile.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 _RTL_LOGFILE_HXX_ -#define _RTL_LOGFILE_HXX_ +#ifndef INCLUDED_RTL_LOGFILE_HXX +#define INCLUDED_RTL_LOGFILE_HXX #include <rtl/logfile.h> #include <rtl/string.hxx> diff --git a/include/rtl/process.h b/include/rtl/process.h index fa8fdda62e9d..d7ea575615cb 100644 --- a/include/rtl/process.h +++ b/include/rtl/process.h @@ -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 _RTL_PROCESS_H_ -#define _RTL_PROCESS_H_ +#ifndef INCLUDED_RTL_PROCESS_H +#define INCLUDED_RTL_PROCESS_H #include "sal/config.h" diff --git a/include/rtl/random.h b/include/rtl/random.h index 80c9c15a2c52..6471418b5f3c 100644 --- a/include/rtl/random.h +++ b/include/rtl/random.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_RANDOM_H_ -#define _RTL_RANDOM_H_ +#ifndef INCLUDED_RTL_RANDOM_H +#define INCLUDED_RTL_RANDOM_H #include "sal/config.h" @@ -105,6 +105,6 @@ SAL_DLLPUBLIC rtlRandomError SAL_CALL rtl_random_getBytes ( } #endif -#endif /* _RTL_RANDOM_H_ */ +#endif // INCLUDED_RTL_RANDOM_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx index 8306a839da46..2b93af231a22 100644 --- a/include/rtl/ref.hxx +++ b/include/rtl/ref.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_REF_HXX_ -#define _RTL_REF_HXX_ +#ifndef INCLUDED_RTL_REF_HXX +#define INCLUDED_RTL_REF_HXX #include <sal/types.h> #include <osl/diagnose.h> @@ -238,6 +238,6 @@ inline T * get_pointer( Reference<T> const& r ) } // namespace rtl -#endif /* !_RTL_REF_HXX_ */ +#endif /* ! INCLUDED_RTL_REF_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/strbuf.h b/include/rtl/strbuf.h index 05dd2de8c61c..aede740fa5f8 100644 --- a/include/rtl/strbuf.h +++ b/include/rtl/strbuf.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_STRBUF_H_ -#define _RTL_STRBUF_H_ +#ifndef INCLUDED_RTL_STRBUF_H +#define INCLUDED_RTL_STRBUF_H #include "sal/config.h" @@ -132,6 +132,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_stringbuffer_remove( } #endif -#endif /* _RTL_STRBUF_H_ */ +#endif // INCLUDED_RTL_STRBUF_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx index d04f828d3232..0b4afaced715 100644 --- a/include/rtl/strbuf.hxx +++ b/include/rtl/strbuf.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_STRBUF_HXX_ -#define _RTL_STRBUF_HXX_ +#ifndef INCLUDED_RTL_STRBUF_HXX +#define INCLUDED_RTL_STRBUF_HXX #include "sal/config.h" @@ -918,7 +918,7 @@ using ::rtl::OStringBuffer; #endif #endif /* __cplusplus */ -#endif /* _RTL_STRBUF_HXX_ */ +#endif // INCLUDED_RTL_STRBUF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/string.h b/include/rtl/string.h index 28b089b7e16b..d4c5420bda3c 100644 --- a/include/rtl/string.h +++ b/include/rtl/string.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_STRING_H_ -#define _RTL_STRING_H_ +#ifndef INCLUDED_RTL_STRING_H +#define INCLUDED_RTL_STRING_H #include "sal/config.h" @@ -1424,6 +1424,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_ensureCapacity( rtl_String ** str, sal_In } #endif -#endif /* _RTL_STRING_H_ */ +#endif // INCLUDED_RTL_STRING_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index e9c6350c006d..3a338fd8d05e 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_STRING_HXX_ -#define _RTL_STRING_HXX_ +#ifndef INCLUDED_RTL_STRING_HXX +#define INCLUDED_RTL_STRING_HXX #include "sal/config.h" @@ -1750,6 +1750,6 @@ using ::rtl::OStringHash; using ::rtl::OStringLiteral; #endif -#endif /* _RTL_STRING_HXX_ */ +#endif // INCLUDED_RTL_STRING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx index a6e3467209e3..8ab2ffcaf5e3 100644 --- a/include/rtl/stringconcat.hxx +++ b/include/rtl/stringconcat.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef RTL_STRINGCONCAT_HXX -#define RTL_STRINGCONCAT_HXX +#ifndef INCLUDED_RTL_STRINGCONCAT_HXX +#define INCLUDED_RTL_STRINGCONCAT_HXX #include <rtl/stringutils.hxx> diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx index fc47a248cde7..547df5f1f84e 100644 --- a/include/rtl/stringutils.hxx +++ b/include/rtl/stringutils.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _RTL_STRINGUTILS_HXX_ -#define _RTL_STRINGUTILS_HXX_ +#ifndef INCLUDED_RTL_STRINGUTILS_HXX +#define INCLUDED_RTL_STRINGUTILS_HXX #include "sal/config.h" @@ -182,6 +182,6 @@ struct Enable< T, true > } /* Namespace */ -#endif /* _RTL_STRINGUTILS_HXX_ */ +#endif // INCLUDED_RTL_STRINGUTILS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/tencinfo.h b/include/rtl/tencinfo.h index 34ba34f17374..0b1415da7ac4 100644 --- a/include/rtl/tencinfo.h +++ b/include/rtl/tencinfo.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_TENCINFO_H -#define _RTL_TENCINFO_H +#ifndef INCLUDED_RTL_TENCINFO_H +#define INCLUDED_RTL_TENCINFO_H #include "sal/config.h" @@ -273,6 +273,6 @@ rtl_getWindowsCodePageFromTextEncoding(rtl_TextEncoding nEncoding); } #endif -#endif /* _RTL_TENCINFO_H */ +#endif // INCLUDED_RTL_TENCINFO_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/textcvt.h b/include/rtl/textcvt.h index a67b2416ee7a..645c942c56dd 100644 --- a/include/rtl/textcvt.h +++ b/include/rtl/textcvt.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_TEXTCVT_H -#define _RTL_TEXTCVT_H +#ifndef INCLUDED_RTL_TEXTCVT_H +#define INCLUDED_RTL_TEXTCVT_H #include "sal/config.h" @@ -172,6 +172,6 @@ SAL_DLLPUBLIC sal_Size SAL_CALL rtl_convertUnicodeToText( } #endif -#endif /* _RTL_TEXTCVT_H */ +#endif // INCLUDED_RTL_TEXTCVT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/textenc.h b/include/rtl/textenc.h index 676f8c23186a..ba17f6841979 100644 --- a/include/rtl/textenc.h +++ b/include/rtl/textenc.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_TEXTENC_H -#define _RTL_TEXTENC_H +#ifndef INCLUDED_RTL_TEXTENC_H +#define INCLUDED_RTL_TEXTENC_H #ifdef _SOLAR_RSC_INVOKED /* Enable resources to use these values, rsc can't handle casts */ @@ -265,6 +265,6 @@ Japanese (JIS 0212) RTL_TEXTENCODING_JISX_0212 # Currently not implemented */ -#endif /* _RTL_TEXTENC_H */ +#endif // INCLUDED_RTL_TEXTENC_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/unload.h b/include/rtl/unload.h index 118b5cce9127..f38cd865a0f6 100644 --- a/include/rtl/unload.h +++ b/include/rtl/unload.h @@ -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 _RTL_UNLOAD_H_ -#define _RTL_UNLOAD_H_ +#ifndef INCLUDED_RTL_UNLOAD_H +#define INCLUDED_RTL_UNLOAD_H #include "sal/config.h" diff --git a/include/rtl/uri.h b/include/rtl/uri.h index 251af025ef82..a1ec51553623 100644 --- a/include/rtl/uri.h +++ b/include/rtl/uri.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_URI_H_ -#define _RTL_URI_H_ +#ifndef INCLUDED_RTL_URI_H +#define INCLUDED_RTL_URI_H #include "sal/config.h" @@ -347,6 +347,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL rtl_uriConvertRelToAbs( } #endif /* __cplusplus */ -#endif /* _RTL_URI_H_ */ +#endif // INCLUDED_RTL_URI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/uri.hxx b/include/rtl/uri.hxx index 6e9ca00281c3..3f62ac4f6d15 100644 --- a/include/rtl/uri.hxx +++ b/include/rtl/uri.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_URI_HXX_ -#define _RTL_URI_HXX_ +#ifndef INCLUDED_RTL_URI_HXX +#define INCLUDED_RTL_URI_HXX #include "rtl/malformeduriexception.hxx" #include "rtl/uri.h" @@ -139,6 +139,6 @@ inline rtl::OUString Uri::convertRelToAbs(rtl::OUString const & rBaseUriRef, } -#endif // _RTL_URI_HXX_ +#endif // INCLUDED_RTL_URI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/ustrbuf.h b/include/rtl/ustrbuf.h index 7df10c18cc40..2a1e3a9c94e0 100644 --- a/include/rtl/ustrbuf.h +++ b/include/rtl/ustrbuf.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_USTRBUF_H_ -#define _RTL_USTRBUF_H_ +#ifndef INCLUDED_RTL_USTRBUF_H +#define INCLUDED_RTL_USTRBUF_H #include "sal/config.h" @@ -207,6 +207,6 @@ SAL_DLLPUBLIC rtl_uString * SAL_CALL rtl_uStringBuffer_refReturn( rtl_uString *p } #endif -#endif /* _RTL_USTRBUF_H_ */ +#endif // INCLUDED_RTL_USTRBUF_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index ec40448b60d4..f7d640c0e415 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_USTRBUF_HXX_ -#define _RTL_USTRBUF_HXX_ +#ifndef INCLUDED_RTL_USTRBUF_HXX +#define INCLUDED_RTL_USTRBUF_HXX #include "sal/config.h" @@ -1381,6 +1381,6 @@ typedef rtlunittest::OUStringBuffer OUStringBuffer; using ::rtl::OUStringBuffer; #endif -#endif /* _RTL_USTRBUF_HXX_ */ +#endif // INCLUDED_RTL_USTRBUF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h index 8d206512904b..dfcf7209dada 100644 --- a/include/rtl/ustring.h +++ b/include/rtl/ustring.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_USTRING_H_ -#define _RTL_USTRING_H_ +#ifndef INCLUDED_RTL_USTRING_H +#define INCLUDED_RTL_USTRING_H #include "sal/config.h" @@ -2038,6 +2038,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_ensureCapacity( rtl_uString ** str, sal_ } #endif -#endif /* _RTL_USTRING_H_ */ +#endif // INCLUDED_RTL_USTRING_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 45a7441f9591..327f455f1648 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTL_USTRING_HXX_ -#define _RTL_USTRING_HXX_ +#ifndef INCLUDED_RTL_USTRING_HXX +#define INCLUDED_RTL_USTRING_HXX #include "sal/config.h" diff --git a/include/rtl/uuid.h b/include/rtl/uuid.h index 31d50968110a..e657950beb72 100644 --- a/include/rtl/uuid.h +++ b/include/rtl/uuid.h @@ -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 _RTL_UUID_H_ -#define _RTL_UUID_H_ +#ifndef INCLUDED_RTL_UUID_H +#define INCLUDED_RTL_UUID_H #include "sal/config.h" diff --git a/include/test/beans/xpropertyset.hxx b/include/test/beans/xpropertyset.hxx index d0f41eece4a3..cc4073a0a411 100644 --- a/include/test/beans/xpropertyset.hxx +++ b/include/test/beans/xpropertyset.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __TEST_BEANS_XPROPERTYSET_HXX__ -#define __TEST_BEANS_XPROPERTYSET_HXX__ +#ifndef INCLUDED_TEST_BEANS_XPROPERTYSET_HXX +#define INCLUDED_TEST_BEANS_XPROPERTYSET_HXX #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/include/test/testdllapi.hxx b/include/test/testdllapi.hxx index 83f49645bb84..25ed19522506 100644 --- a/include/test/testdllapi.hxx +++ b/include/test/testdllapi.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 INCLUDED_TEST_DETAIL_TESTDLLAPI_HXX -#define INCLUDED_TEST_DETAIL_TESTDLLAPI_HXX +#ifndef INCLUDED_TEST_TESTDLLAPI_HXX +#define INCLUDED_TEST_TESTDLLAPI_HXX #include "sal/config.h" #include "sal/types.h" diff --git a/include/test/text/xtext.hxx b/include/test/text/xtext.hxx index 9adf9c0a542f..72eb0490ce87 100644 --- a/include/test/text/xtext.hxx +++ b/include/test/text/xtext.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __TEST_TEXT_XTEXT_HXX__ -#define __TEST_TEXT_XTEXT_HXX__ +#ifndef INCLUDED_TEST_TEXT_XTEXT_HXX +#define INCLUDED_TEST_TEXT_XTEXT_HXX #include "test/testdllapi.hxx" diff --git a/include/tubes/file-transfer-helper.h b/include/tubes/file-transfer-helper.h index 54ede9e6bcaf..5754314f86bf 100644 --- a/include/tubes/file-transfer-helper.h +++ b/include/tubes/file-transfer-helper.h @@ -22,8 +22,8 @@ /* empathy-ft-handler.h */ -#ifndef __EMPATHY_FT_HANDLER_H__ -#define __EMPATHY_FT_HANDLER_H__ +#ifndef INCLUDED_TUBES_FILE_TRANSFER_HELPER_H +#define INCLUDED_TUBES_FILE_TRANSFER_HELPER_H #include <config_lgpl.h> #include <glib-object.h> @@ -124,6 +124,6 @@ gboolean empathy_ft_handler_is_cancelled (EmpathyFTHandler *handler); G_END_DECLS -#endif /* __EMPATHY_FT_HANDLER_H__ */ +#endif // INCLUDED_TUBES_FILE_TRANSFER_HELPER_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tubes/tubesdllapi.h b/include/tubes/tubesdllapi.h index ea1b70770277..3687eba05540 100644 --- a/include/tubes/tubesdllapi.h +++ b/include/tubes/tubesdllapi.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef INCLUDED_TUBESDLLAPI_H -#define INCLUDED_TUBESDLLAPI_H +#ifndef INCLUDED_TUBES_TUBESDLLAPI_H +#define INCLUDED_TUBES_TUBESDLLAPI_H #include "sal/types.h" @@ -11,6 +11,6 @@ #endif #define TUBES_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_TUBESDLLAPI_H */ +#endif // INCLUDED_TUBES_TUBESDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/typelib/typeclass.h b/include/typelib/typeclass.h index b3eeb5ddff52..434094fe3d8d 100644 --- a/include/typelib/typeclass.h +++ b/include/typelib/typeclass.h @@ -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 _TYPELIB_TYPECLASS_H_ -#define _TYPELIB_TYPECLASS_H_ +#ifndef INCLUDED_TYPELIB_TYPECLASS_H +#define INCLUDED_TYPELIB_TYPECLASS_H #include <sal/types.h> diff --git a/include/typelib/typedescription.h b/include/typelib/typedescription.h index 6f9ee33eec4a..a7b06eca56f6 100644 --- a/include/typelib/typedescription.h +++ b/include/typelib/typedescription.h @@ -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 _TYPELIB_TYPEDESCRIPTION_H_ -#define _TYPELIB_TYPEDESCRIPTION_H_ +#ifndef INCLUDED_TYPELIB_TYPEDESCRIPTION_H +#define INCLUDED_TYPELIB_TYPEDESCRIPTION_H #include <cppu/cppudllapi.h> #include <typelib/uik.h> diff --git a/include/typelib/typedescription.hxx b/include/typelib/typedescription.hxx index 1026755749f7..0db15ffc4977 100644 --- a/include/typelib/typedescription.hxx +++ b/include/typelib/typedescription.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 _TYPELIB_TYPEDESCRIPTION_HXX_ -#define _TYPELIB_TYPEDESCRIPTION_HXX_ +#ifndef INCLUDED_TYPELIB_TYPEDESCRIPTION_HXX +#define INCLUDED_TYPELIB_TYPEDESCRIPTION_HXX #include <rtl/alloc.h> #include <rtl/ustring.hxx> diff --git a/include/typelib/uik.h b/include/typelib/uik.h index ff8064f8f6ad..78e57bf5202f 100644 --- a/include/typelib/uik.h +++ b/include/typelib/uik.h @@ -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 _TYPELIB_UIK_H_ -#define _TYPELIB_UIK_H_ +#ifndef INCLUDED_TYPELIB_UIK_H +#define INCLUDED_TYPELIB_UIK_H #include <sal/types.h> diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 11bbff2426a9..833cd9227887 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.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 OOVBAAPI_VBA_ACCESS_HELPER_HXX -#define OOVBAAPI_VBA_ACCESS_HELPER_HXX +#ifndef INCLUDED_VBAHELPER_VBAACCESSHELPER_HXX +#define INCLUDED_VBAHELPER_VBAACCESSHELPER_HXX #include <com/sun/star/beans/XPropertySet.hpp> #include <basic/basmgr.hxx> diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index c63bce52c263..18552fefec61 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.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 VBA_APPLICATION_BASE_HXX -#define VBA_APPLICATION_BASE_HXX +#ifndef INCLUDED_VBAHELPER_VBAAPPLICATIONBASE_HXX +#define INCLUDED_VBAHELPER_VBAAPPLICATIONBASE_HXX #include <ooo/vba/XHelperInterface.hpp> #include <ooo/vba/XApplicationBase.hpp> diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 0640e259b183..dee5709d9497 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef OOVBAAPI_VBA_COLLECTION_IMPL_HXX -#define OOVBAAPI_VBA_COLLECTION_IMPL_HXX +#ifndef INCLUDED_VBAHELPER_VBACOLLECTIONIMPL_HXX +#define INCLUDED_VBAHELPER_VBACOLLECTIONIMPL_HXX #include <ooo/vba/XCollection.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index bb706cbaf17a..282e984fa10f 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.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 VBA_DIALOG_BASE_HXX -#define VBA_DIALOG_BASE_HXX +#ifndef INCLUDED_VBAHELPER_VBADIALOGBASE_HXX +#define INCLUDED_VBAHELPER_VBADIALOGBASE_HXX #include <cppuhelper/implbase1.hxx> #include <ooo/vba/XDialogBase.hpp> @@ -40,6 +40,6 @@ public: virtual OUString mapIndexToName( sal_Int32 nIndex ) = 0; }; -#endif /* VBA_DIALOG_BASE_HXX */ +#endif // INCLUDED_VBAHELPER_VBADIALOGBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx index 54c1fd33f107..83e4ac2db260 100644 --- a/include/vbahelper/vbadialogsbase.hxx +++ b/include/vbahelper/vbadialogsbase.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 VBA_DIALOGS_BASE_HXX -#define VBA_DIALOGS_BASE_HXX +#ifndef INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX +#define INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX #include <cppuhelper/implbase1.hxx> #include <ooo/vba/XHelperInterface.hpp> @@ -40,6 +40,6 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException); }; -#endif /* VBA_DIALOGS_BASE_HXX */ +#endif // INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbadllapi.h b/include/vbahelper/vbadllapi.h index 43beae86b676..367068ec3b0e 100644 --- a/include/vbahelper/vbadllapi.h +++ b/include/vbahelper/vbadllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VBADLLAPI_H -#define INCLUDED_VBADLLAPI_H +#ifndef INCLUDED_VBAHELPER_VBADLLAPI_H +#define INCLUDED_VBAHELPER_VBADLLAPI_H #include "sal/types.h" diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx index e4a9225d75fc..2a30cbcb4a6f 100644 --- a/include/vbahelper/vbadocumentbase.hxx +++ b/include/vbahelper/vbadocumentbase.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 VBA_DOCUMENTBASE_HXX -#define VBA_DOCUMENTBASE_HXX +#ifndef INCLUDED_VBAHELPER_VBADOCUMENTBASE_HXX +#define INCLUDED_VBAHELPER_VBADOCUMENTBASE_HXX #include <com/sun/star/frame/XModel.hpp> #include <ooo/vba/XDocumentBase.hpp> @@ -62,6 +62,6 @@ public: static OUString getNameFromModel( const css::uno::Reference< css::frame::XModel >& xModel ); }; -#endif /* VBA_DOCUMENTBASE_HXX */ +#endif // INCLUDED_VBAHELPER_VBADOCUMENTBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx index b8386d6e291e..f4427468a0ce 100644 --- a/include/vbahelper/vbadocumentsbase.hxx +++ b/include/vbahelper/vbadocumentsbase.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 VBA_WORKBOOKS_HXX -#define VBA_WORKBOOKS_HXX +#ifndef INCLUDED_VBAHELPER_VBADOCUMENTSBASE_HXX +#define INCLUDED_VBAHELPER_VBADOCUMENTSBASE_HXX #include <vbahelper/vbacollectionimpl.hxx> @@ -55,6 +55,6 @@ protected: css::uno::Any openDocument( const OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException); }; -#endif /* SC_VBA_WORKBOOKS_HXX */ +#endif /* SC_ INCLUDED_VBAHELPER_VBADOCUMENTSBASE_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 627970f9f623..75f22fdb4eaa 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef VBAHELPER_VBAEVENTSHELPERBASE_HXX -#define VBAHELPER_VBAEVENTSHELPERBASE_HXX +#ifndef INCLUDED_VBAHELPER_VBAEVENTSHELPERBASE_HXX +#define INCLUDED_VBAHELPER_VBAEVENTSHELPERBASE_HXX #include <deque> #include <map> diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index ddfb30899f82..72a99e86a766 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.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 VBAHELPER_FONTBASE_HXX -#define VBAHELPER_FONTBASE_HXX +#ifndef INCLUDED_VBAHELPER_VBAFONTBASE_HXX +#define INCLUDED_VBAHELPER_VBAFONTBASE_HXX #include <cppuhelper/implbase1.hxx> diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx index 4c30a26c95c0..0c48742842fe 100644 --- a/include/vbahelper/vbaglobalbase.hxx +++ b/include/vbahelper/vbaglobalbase.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 VBA_GLOBAL_BASE_HXX -#define VBA_GLOBAL_BASE_HXX +#ifndef INCLUDED_VBAHELPER_VBAGLOBALBASE_HXX +#define INCLUDED_VBAHELPER_VBAGLOBALBASE_HXX #include "vbahelperinterface.hxx" #include <ooo/vba/XGlobalsBase.hpp> diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index f2f69f7bdcd2..aab9be7d1a46 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.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 OOVBAAPI_VBA_HELPER_HXX -#define OOVBAAPI_VBA_HELPER_HXX +#ifndef INCLUDED_VBAHELPER_VBAHELPER_HXX +#define INCLUDED_VBAHELPER_VBAHELPER_HXX #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index a37bb59dc129..66a1dc15449d 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.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 OOVBAAPI_VBA_HELPERINTERFACE_HXX -#define OOVBAAPI_VBA_HELPERINTERFACE_HXX +#ifndef INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX +#define INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx index b063353af36a..8444bc6ac90f 100644 --- a/include/vbahelper/vbapagesetupbase.hxx +++ b/include/vbahelper/vbapagesetupbase.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 VBA_PAGESETUPBASE_HXX -#define VBA_PAGESETUPBASE_HXX +#ifndef INCLUDED_VBAHELPER_VBAPAGESETUPBASE_HXX +#define INCLUDED_VBAHELPER_VBAPAGESETUPBASE_HXX #include <cppuhelper/implbase1.hxx> #include <ooo/vba/XPageSetupBase.hpp> diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index d44252dc2999..826909e141f2 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.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 RETURNTYPES_HXX -#define RETURNTYPES_HXX +#ifndef INCLUDED_VBAHELPER_VBARETURNTYPES_HXX +#define INCLUDED_VBAHELPER_VBARETURNTYPES_HXX #include <cppuhelper/implbase1.hxx> #include <com/sun/star/script/XDefaultProperty.hpp> diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index ff9c99edf020..ee630235a088 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.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 SC_VBA_SHAPE_HXX -#define SC_VBA_SHAPE_HXX +#ifndef INCLUDED_VBAHELPER_VBASHAPE_HXX +#define INCLUDED_VBAHELPER_VBASHAPE_HXX #include <ooo/vba/office/MsoShapeType.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -106,6 +106,6 @@ public: // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException ); }; -#endif//SC_VBA_SHAPE_HXX +#endif // INCLUDED_VBAHELPER_VBASHAPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index e1a447ee3dbf..2467a43922b5 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.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 SC_VBA_SHAPERANGE_HXX -#define SC_VBA_SHAPERANGE_HXX +#ifndef INCLUDED_VBAHELPER_VBASHAPERANGE_HXX +#define INCLUDED_VBAHELPER_VBASHAPERANGE_HXX #include <com/sun/star/drawing/XShapes.hpp> #include <ooo/vba/msforms/XShapeRange.hpp> @@ -77,6 +77,6 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); }; -#endif//SC_VBA_SHAPERANGE_HXX +#endif // INCLUDED_VBAHELPER_VBASHAPERANGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 4c4b7c3e5a49..0c2dc3ea48f6 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.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 SC_VBA_SHAPES_HXX -#define SC_VBA_SHAPES_HXX +#ifndef INCLUDED_VBAHELPER_VBASHAPES_HXX +#define INCLUDED_VBAHELPER_VBASHAPES_HXX #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> @@ -69,6 +69,6 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); }; -#endif//SC_VBA_SHAPES_HXX +#endif // INCLUDED_VBAHELPER_VBASHAPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx index d8f44e32c826..08b54f4cc982 100644 --- a/include/vbahelper/vbatextframe.hxx +++ b/include/vbahelper/vbatextframe.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 VBA_TEXTFRAME_HXX -#define VBA_TEXTFRAME_HXX +#ifndef INCLUDED_VBAHELPER_VBATEXTFRAME_HXX +#define INCLUDED_VBAHELPER_VBATEXTFRAME_HXX #include <ooo/vba/msforms/XTextFrame.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -56,6 +56,6 @@ public: }; -#endif//SC_VBA_TEXTFRAME_HXX +#endif//SC_ INCLUDED_VBAHELPER_VBATEXTFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx index 33ef793eecd8..0e453af4a9fb 100644 --- a/include/vbahelper/vbawindowbase.hxx +++ b/include/vbahelper/vbawindowbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef VBA_WINDOWBASE_HXX -#define VBA_WINDOWBASE_HXX +#ifndef INCLUDED_VBAHELPER_VBAWINDOWBASE_HXX +#define INCLUDED_VBAHELPER_VBAWINDOWBASE_HXX #include <ooo/vba/XWindowBase.hpp> #include <com/sun/star/awt/XWindow2.hpp> @@ -71,6 +71,6 @@ private: css::uno::WeakReference< css::awt::XWindow > m_xWindow; }; -#endif //VBA_WINDOWBASE_HXX +#endif // INCLUDED_VBAHELPER_VBAWINDOWBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |