diff options
355 files changed, 877 insertions, 877 deletions
diff --git a/include/sal/ByteBufferWrapper.hxx b/include/sal/ByteBufferWrapper.hxx index 17edfa48af01..d90fec5501d3 100644 --- a/include/sal/ByteBufferWrapper.hxx +++ b/include/sal/ByteBufferWrapper.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _SAL_BYTEBUFFERWRAPPER_HXX -#define _SAL_BYTEBUFFERWRAPPER_HXX +#ifndef INCLUDED_SAL_BYTEBUFFERWRAPPER_HXX +#define INCLUDED_SAL_BYTEBUFFERWRAPPER_HXX #ifdef ANDROID diff --git a/include/sal/config.h b/include/sal/config.h index a7943a50210f..da7ef5362f8f 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_CONFIG_H_ -#define _SAL_CONFIG_H_ +#ifndef INCLUDED_SAL_CONFIG_H +#define INCLUDED_SAL_CONFIG_H #if defined LIBO_INTERNAL_ONLY #include "config_global.h" @@ -91,7 +91,7 @@ #define sun sun #endif -#endif /*_SAL_CONFIG_H_ */ +#endif // INCLUDED_SAL_CONFIG_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sal/macros.h b/include/sal/macros.h index 262f81996657..e5d233801295 100644 --- a/include/sal/macros.h +++ b/include/sal/macros.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_MACROS_H_ -#define _SAL_MACROS_H_ +#ifndef INCLUDED_SAL_MACROS_H +#define INCLUDED_SAL_MACROS_H #include <stddef.h> diff --git a/include/sal/main.h b/include/sal/main.h index 6abf58824f20..207e84788cc3 100644 --- a/include/sal/main.h +++ b/include/sal/main.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_MAIN_H_ -#define _SAL_MAIN_H_ +#ifndef INCLUDED_SAL_MAIN_H +#define INCLUDED_SAL_MAIN_H #include "sal/config.h" @@ -144,6 +144,6 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh } /* extern "C" */ #endif -#endif /* _SAL_MAIN_H_ */ +#endif // INCLUDED_SAL_MAIN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sal/saldllapi.h b/include/sal/saldllapi.h index f45e50e1cc5b..2eca05de7e18 100644 --- a/include/sal/saldllapi.h +++ b/include/sal/saldllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SALDLLAPI_H -#define INCLUDED_SALDLLAPI_H +#ifndef INCLUDED_SAL_SALDLLAPI_H +#define INCLUDED_SAL_SALDLLAPI_H #include "sal/config.h" @@ -30,6 +30,6 @@ #define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif /* INCLUDED_SALDLLAPI_H */ +#endif // INCLUDED_SAL_SALDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx index 459f39d354bc..e7c3ed6e1110 100644 --- a/include/salhelper/condition.hxx +++ b/include/salhelper/condition.hxx @@ -18,8 +18,8 @@ */ -#ifndef _SALHELPER_CONDITION_HXX_ -#define _SALHELPER_CONDITION_HXX_ +#ifndef INCLUDED_SALHELPER_CONDITION_HXX +#define INCLUDED_SALHELPER_CONDITION_HXX #include <osl/conditn.h> diff --git a/include/salhelper/dynload.hxx b/include/salhelper/dynload.hxx index f79bb2277987..fe3365de4960 100644 --- a/include/salhelper/dynload.hxx +++ b/include/salhelper/dynload.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SALHELPER_DYNLOAD_HXX_ -#define _SALHELPER_DYNLOAD_HXX_ +#ifndef INCLUDED_SALHELPER_DYNLOAD_HXX +#define INCLUDED_SALHELPER_DYNLOAD_HXX #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/include/salhelper/linkhelper.hxx b/include/salhelper/linkhelper.hxx index 67fde02843bf..217373c37d4b 100644 --- a/include/salhelper/linkhelper.hxx +++ b/include/salhelper/linkhelper.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _SALHELPER_LINKHELPER_HXX -#define _SALHELPER_LINKHELPER_HXX +#ifndef INCLUDED_SALHELPER_LINKHELPER_HXX +#define INCLUDED_SALHELPER_LINKHELPER_HXX #include <rtl/ustring.hxx> #include <osl/file.hxx> diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 5d7d322b6140..16e85fbd0b8b 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SALHELPER_REFOBJ_HXX_ -#define _SALHELPER_REFOBJ_HXX_ +#ifndef INCLUDED_SALHELPER_REFOBJ_HXX +#define INCLUDED_SALHELPER_REFOBJ_HXX #include <sal/types.h> #include <rtl/alloc.h> @@ -99,6 +99,6 @@ protected: } // namespace salhelper -#endif /* !_SALHELPER_REFOBJ_HXX_ */ +#endif /* ! INCLUDED_SALHELPER_REFOBJ_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/salhelper/salhelperdllapi.h b/include/salhelper/salhelperdllapi.h index d80cf8b0ec56..3fec057609f4 100644 --- a/include/salhelper/salhelperdllapi.h +++ b/include/salhelper/salhelperdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SALHELPERDLLAPI_H -#define INCLUDED_SALHELPERDLLAPI_H +#ifndef INCLUDED_SALHELPER_SALHELPERDLLAPI_H +#define INCLUDED_SALHELPER_SALHELPERDLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define SALHELPER_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_SALHELPERDLLAPI_H */ +#endif // INCLUDED_SALHELPER_SALHELPERDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx index 12886e111128..32e2bf991938 100644 --- a/include/salhelper/simplereferenceobject.hxx +++ b/include/salhelper/simplereferenceobject.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ -#define _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ +#ifndef INCLUDED_SALHELPER_SIMPLEREFERENCEOBJECT_HXX +#define INCLUDED_SALHELPER_SIMPLEREFERENCEOBJECT_HXX #include "osl/interlck.h" #include "sal/types.h" @@ -126,6 +126,6 @@ protected: } -#endif // _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ +#endif // INCLUDED_SALHELPER_SIMPLEREFERENCEOBJECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx index 3a63b08180e1..ad8b1fbeb4cb 100644 --- a/include/salhelper/singletonref.hxx +++ b/include/salhelper/singletonref.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SALHELPER_SINGLETONREF_HXX_ -#define _SALHELPER_SINGLETONREF_HXX_ +#ifndef INCLUDED_SALHELPER_SINGLETONREF_HXX +#define INCLUDED_SALHELPER_SINGLETONREF_HXX #include <osl/mutex.hxx> #include "rtl/instance.hxx" @@ -192,6 +192,6 @@ sal_Int32 SingletonRef< SingletonClass >::m_nRef = 0; } // namespace salhelper -#endif // _SALHELPER_SINGLETONREF_HXX_ +#endif // INCLUDED_SALHELPER_SINGLETONREF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/salhelper/timer.hxx b/include/salhelper/timer.hxx index 0afd593b8c2b..b05c273dd4ec 100644 --- a/include/salhelper/timer.hxx +++ b/include/salhelper/timer.hxx @@ -18,8 +18,8 @@ */ -#ifndef _SALHELPER_TIMER_HXX_ -#define _SALHELPER_TIMER_HXX_ +#ifndef INCLUDED_SALHELPER_TIMER_HXX +#define INCLUDED_SALHELPER_TIMER_HXX #include <salhelper/simplereferenceobject.hxx> #include <osl/time.h> @@ -225,6 +225,6 @@ private: } -#endif //_SALHELPER_TIMER_HXX_ +#endif // INCLUDED_SALHELPER_TIMER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 238b7d4297f8..8a8fffb5b81c 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAX_FASTATTRIBS_HXX_ -#define _SAX_FASTATTRIBS_HXX_ +#ifndef INCLUDED_SAX_FASTATTRIBS_HXX +#define INCLUDED_SAX_FASTATTRIBS_HXX #include <com/sun/star/xml/sax/XFastAttributeList.hpp> #include <com/sun/star/xml/sax/XFastTokenHandler.hpp> diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx index e0945fc07ddf..06700c5f3ac6 100644 --- a/include/sax/fshelper.hxx +++ b/include/sax/fshelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAX_FS_HELPER_HXX_ -#define _SAX_FS_HELPER_HXX_ +#ifndef INCLUDED_SAX_FSHELPER_HXX +#define INCLUDED_SAX_FSHELPER_HXX #include <com/sun/star/uno/XReference.hpp> #include <com/sun/star/io/XOutputStream.hpp> @@ -194,6 +194,6 @@ typedef boost::shared_ptr< FastSerializerHelper > FSHelperPtr; } -#endif // _SAX_FS_HELPER_HXX_ +#endif // INCLUDED_SAX_FSHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sax/saxdllapi.h b/include/sax/saxdllapi.h index e4716975bec7..9b56b94ce891 100644 --- a/include/sax/saxdllapi.h +++ b/include/sax/saxdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAX_DLLAPI_H -#define INCLUDED_SAX_DLLAPI_H +#ifndef INCLUDED_SAX_SAXDLLAPI_H +#define INCLUDED_SAX_SAXDLLAPI_H #include <sal/types.h> diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx index 7126f1508d0a..d984c2ac094d 100644 --- a/include/sax/tools/converter.hxx +++ b/include/sax/tools/converter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAX_CONVERTER_HXX -#define _SAX_CONVERTER_HXX +#ifndef INCLUDED_SAX_TOOLS_CONVERTER_HXX +#define INCLUDED_SAX_TOOLS_CONVERTER_HXX #include "sax/saxdllapi.h" @@ -209,6 +209,6 @@ public: } -#endif // _SAX_CONVERTER_HXX +#endif // INCLUDED_SAX_TOOLS_CONVERTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx index c0e6f3345699..26bdacaf687d 100644 --- a/include/sax/tools/documenthandleradapter.hxx +++ b/include/sax/tools/documenthandleradapter.hxx @@ -8,8 +8,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _DOCUMENTHANDLERADAPTER_H_ -#define _DOCUMENTHANDLERADAPTER_H_ +#ifndef INCLUDED_SAX_TOOLS_DOCUMENTHANDLERADAPTER_HXX +#define INCLUDED_SAX_TOOLS_DOCUMENTHANDLERADAPTER_HXX #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> @@ -230,5 +230,5 @@ namespace sax ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > m_handler; }; } -#endif /* _DOCUMENTHANDLERADAPTER_H_ */ +#endif // INCLUDED_SAX_TOOLS_DOCUMENTHANDLERADAPTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx index d81401266ac3..a1bc8dc65aea 100644 --- a/include/sfx2/DocumentMetadataAccess.hxx +++ b/include/sfx2/DocumentMetadataAccess.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_DOCUMENTMETADATAACCESS_HXX_ -#define _SFX_DOCUMENTMETADATAACCESS_HXX_ +#ifndef INCLUDED_SFX2_DOCUMENTMETADATAACCESS_HXX +#define INCLUDED_SFX2_DOCUMENTMETADATAACCESS_HXX #include <sal/config.h> @@ -203,6 +203,6 @@ private: } // namespace sfx2 -#endif // _SFX_DOCUMENTMETADATAACCESS_HXX_ +#endif // INCLUDED_SFX2_DOCUMENTMETADATAACCESS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx index 9b0f9585838a..6bf8aad57adc 100644 --- a/include/sfx2/Metadatable.hxx +++ b/include/sfx2/Metadatable.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 METADATABLE_HXX -#define METADATABLE_HXX +#ifndef INCLUDED_SFX2_METADATABLE_HXX +#define INCLUDED_SFX2_METADATABLE_HXX #include <sal/config.h> @@ -176,6 +176,6 @@ protected: } // namespace sfx2 -#endif // METADATABLE_HXX +#endif // INCLUDED_SFX2_METADATABLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx index ecdf0aa6a67e..5c84050fcca4 100644 --- a/include/sfx2/QuerySaveDocument.hxx +++ b/include/sfx2/QuerySaveDocument.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 SFX_QUERYSAVEDOCUMENT_HXX -#define SFX_QUERYSAVEDOCUMENT_HXX +#ifndef INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX +#define INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> @@ -33,6 +33,6 @@ class Window; SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( Window* _pParent, const OUString& _rTitle); -#endif //SFX_QUERYSAVEDOCUMENT_HXX +#endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx index a7540dc469b0..3b1dff4432b1 100644 --- a/include/sfx2/XmlIdRegistry.hxx +++ b/include/sfx2/XmlIdRegistry.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_XMLIDREGISTRY_HXX_ -#define _SFX_XMLIDREGISTRY_HXX_ +#ifndef INCLUDED_SFX2_XMLIDREGISTRY_HXX +#define INCLUDED_SFX2_XMLIDREGISTRY_HXX #include <sal/config.h> @@ -79,6 +79,6 @@ public: } // namespace sfx2 -#endif // _SFX_XMLIDREGISTRY_HXX_ +#endif // INCLUDED_SFX2_XMLIDREGISTRY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index d24b40abf53d..d28a373bc5bf 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.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 _SFXAPP_HXX -#define _SFXAPP_HXX +#ifndef INCLUDED_SFX2_APP_HXX +#define INCLUDED_SFX2_APP_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/appuno.hxx b/include/sfx2/appuno.hxx index 1845867acc99..a513dbc7505c 100644 --- a/include/sfx2/appuno.hxx +++ b/include/sfx2/appuno.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 _SFX_APPUNO_HXX -#define _SFX_APPUNO_HXX +#ifndef INCLUDED_SFX2_APPUNO_HXX +#define INCLUDED_SFX2_APPUNO_HXX #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index a201f7494ece..819953b4d098 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.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 _BASEDLGS_HXX -#define _BASEDLGS_HXX +#ifndef INCLUDED_SFX2_BASEDLGS_HXX +#define INCLUDED_SFX2_BASEDLGS_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 5a1cbabb8711..0a3cbc578da8 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.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 _SFX_BINDINGS_HXX -#define _SFX_BINDINGS_HXX +#ifndef INCLUDED_SFX2_BINDINGS_HXX +#define INCLUDED_SFX2_BINDINGS_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx index f8bf451e2b22..c964299cccdf 100644 --- a/include/sfx2/chalign.hxx +++ b/include/sfx2/chalign.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 _SFX_CHILDALIGN_HXX -#define _SFX_CHILDALIGN_HXX +#ifndef INCLUDED_SFX2_CHALIGN_HXX +#define INCLUDED_SFX2_CHALIGN_HXX #include <tools/solar.h> diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index 9a9c20f485d7..b5b87b0c9f31 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.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 _SFX_CHECKIN_HXX -#define _SFX_CHECKIN_HXX +#ifndef INCLUDED_SFX2_CHECKIN_HXX +#define INCLUDED_SFX2_CHECKIN_HXX #include <vcl/button.hxx> #include <vcl/dialog.hxx> diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 3337e71654df..b2a7aeba86b8 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.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 _SFX_CHILDWIN_HXX -#define _SFX_CHILDWIN_HXX +#ifndef INCLUDED_SFX2_CHILDWIN_HXX +#define INCLUDED_SFX2_CHILDWIN_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 18696240b1ac..2d28cb5f4a87 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX_CONTROLWRAPPER_HXX -#define SFX_CONTROLWRAPPER_HXX +#ifndef INCLUDED_SFX2_CONTROLWRAPPER_HXX +#define INCLUDED_SFX2_CONTROLWRAPPER_HXX #include <tools/debug.hxx> #include "sal/config.h" diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index af6288e772e9..5f433e08fdb6 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.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 _SFXCTRLITEM_HXX -#define _SFXCTRLITEM_HXX +#ifndef INCLUDED_SFX2_CTRLITEM_HXX +#define INCLUDED_SFX2_CTRLITEM_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index a1a6dacf8ffe..dfff3627154c 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _SFX_DIALOGHELPER_HXX -#define _SFX_DIALOGHELPER_HXX +#ifndef INCLUDED_SFX2_DIALOGHELPER_HXX +#define INCLUDED_SFX2_DIALOGHELPER_HXX #include "sfx2/dllapi.h" #include <rtl/ustring.hxx> diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 2834ca25f9a5..c43b85260a2d 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.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 SFX_DINFDLG_HXX -#define SFX_DINFDLG_HXX +#ifndef INCLUDED_SFX2_DINFDLG_HXX +#define INCLUDED_SFX2_DINFDLG_HXX #include <boost/optional/optional.hpp> @@ -636,6 +636,6 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); }; -#endif // #ifndef _SFX_DINFDLG_HXX +#endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx index b24908a7d081..3560e0e2fc39 100644 --- a/include/sfx2/dinfedt.hxx +++ b/include/sfx2/dinfedt.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 _SFX_DINFEDT_HXX -#define _SFX_DINFEDT_HXX +#ifndef INCLUDED_SFX2_DINFEDT_HXX +#define INCLUDED_SFX2_DINFEDT_HXX #include <vcl/button.hxx> #include <vcl/dialog.hxx> diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 711dbdac6689..701381840583 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.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 _SFXDISPATCH_HXX -#define _SFXDISPATCH_HXX +#ifndef INCLUDED_SFX2_DISPATCH_HXX +#define INCLUDED_SFX2_DISPATCH_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 96034944e0a2..11ee0faf7dd0 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.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 _SFX_OBJFAC_HXX -#define _SFX_OBJFAC_HXX +#ifndef INCLUDED_SFX2_DOCFAC_HXX +#define INCLUDED_SFX2_DOCFAC_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -120,6 +120,6 @@ public: \ static SfxObjectFactory aObjectFactory(GlobName, Flags, ShortName); \ return aObjectFactory; \ } -#endif // #ifndef _SFX_OBJFAC_HXX +#endif // INCLUDED_SFX2_DOCFAC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 917cc2ced113..50c9a2b6c461 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXDOCFILE_HXX -#define _SFXDOCFILE_HXX +#ifndef INCLUDED_SFX2_DOCFILE_HXX +#define INCLUDED_SFX2_DOCFILE_HXX #include <com/sun/star/io/XSeekable.hpp> #include "sal/config.h" diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index 2470155462e8..85f93da8edf6 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.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 _SFX_DOCFILT_HACK_HXX -#define _SFX_DOCFILT_HACK_HXX +#ifndef INCLUDED_SFX2_DOCFILT_HXX +#define INCLUDED_SFX2_DOCFILT_HXX #include <com/sun/star/plugin/PluginDescription.hpp> #include <com/sun/star/embed/XStorage.hpp> diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx index 8ab57ffe2ae4..0b9179aa14a9 100644 --- a/include/sfx2/docinf.hxx +++ b/include/sfx2/docinf.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 _SFXDOCINF_HXX -#define _SFXDOCINF_HXX +#ifndef INCLUDED_SFX2_DOCINF_HXX +#define INCLUDED_SFX2_DOCINF_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 414991d7728d..62d43deee264 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_DOCINSERT_HXX -#define _SFX_DOCINSERT_HXX +#ifndef INCLUDED_SFX2_DOCINSERT_HXX +#define INCLUDED_SFX2_DOCINSERT_HXX #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> @@ -65,6 +65,6 @@ public: } // namespace sfx2 -#endif // _SFX_DOCINSERT_HXX +#endif // INCLUDED_SFX2_DOCINSERT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index d64b6ed7a6f7..85d6fe9004e1 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.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 _SFXDOCKWIN_HXX -#define _SFXDOCKWIN_HXX +#ifndef INCLUDED_SFX2_DOCKWIN_HXX +#define INCLUDED_SFX2_DOCKWIN_HXX #include "sal/config.h" #include "sal/types.h" @@ -125,6 +125,6 @@ class SfxDockingWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW(SfxDockingWrapper); }; -#endif // #ifndef _SFXDOCKWIN_HXX +#endif // INCLUDED_SFX2_DOCKWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 4e089d7e3d55..c4c8a1621920 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX2_DOCMACROMODE_HXX -#define SFX2_DOCMACROMODE_HXX +#ifndef INCLUDED_SFX2_DOCMACROMODE_HXX +#define INCLUDED_SFX2_DOCMACROMODE_HXX #include "sfx2/dllapi.h" @@ -323,6 +323,6 @@ namespace sfx2 } // namespace sfx2 //........................................................................ -#endif // SFX2_DOCMACROMODE_HXX +#endif // INCLUDED_SFX2_DOCMACROMODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index 792a8dab0d97..032f6bec181b 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX2_DOCSTORAGEMODIFYLISTENER_HXX -#define SFX2_DOCSTORAGEMODIFYLISTENER_HXX +#ifndef INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX +#define INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX #include "sfx2/dllapi.h" @@ -82,6 +82,6 @@ namespace sfx2 } // namespace sfx2 //........................................................................ -#endif // SFX2_DOCSTORAGEMODIFYLISTENER_HXX +#endif // INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index f178a40544cd..7dcb12ff432c 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.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 _SFXEVENT_HXX -#define _SFXEVENT_HXX +#ifndef INCLUDED_SFX2_EVENT_HXX +#define INCLUDED_SFX2_EVENT_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index f4605759bc61..f33fb332eebb 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.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 _SFX_EVENTCONF_HXX -#define _SFX_EVENTCONF_HXX +#ifndef INCLUDED_SFX2_EVNTCONF_HXX +#define INCLUDED_SFX2_EVNTCONF_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index d064d1bf406b..8ccbbd94ae95 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.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 _SFX_FCONTNR_HXX -#define _SFX_FCONTNR_HXX +#ifndef INCLUDED_SFX2_FCONTNR_HXX +#define INCLUDED_SFX2_FCONTNR_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 163eef9a1388..97ca3b5bc531 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.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 _FILEDLGHELPER_HXX -#define _FILEDLGHELPER_HXX +#ifndef INCLUDED_SFX2_FILEDLGHELPER_HXX +#define INCLUDED_SFX2_FILEDLGHELPER_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 510f79bdd664..93b6fcecf933 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.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 _SFXFRAME_HXX -#define _SFXFRAME_HXX +#ifndef INCLUDED_SFX2_FRAME_HXX +#define INCLUDED_SFX2_FRAME_HXX #ifndef TF_NEWDESKTOP #define TF_NEWDESKTOP 1 diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx index 356d778e6590..d79e09874232 100644 --- a/include/sfx2/frmhtml.hxx +++ b/include/sfx2/frmhtml.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FRMHTML_HXX -#define _FRMHTML_HXX +#ifndef INCLUDED_SFX2_FRMHTML_HXX +#define INCLUDED_SFX2_FRMHTML_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx index cc5e7be79b31..83487881e8bf 100644 --- a/include/sfx2/frmhtmlw.hxx +++ b/include/sfx2/frmhtmlw.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 _FRMHTMLW_HXX -#define _FRMHTMLW_HXX +#ifndef INCLUDED_SFX2_FRMHTMLW_HXX +#define INCLUDED_SFX2_FRMHTMLW_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/genlink.hxx b/include/sfx2/genlink.hxx index 045047d9d0c7..6d210057cf94 100644 --- a/include/sfx2/genlink.hxx +++ b/include/sfx2/genlink.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 _SFXGENLINK_HXX -#define _SFXGENLINK_HXX +#ifndef INCLUDED_SFX2_GENLINK_HXX +#define INCLUDED_SFX2_GENLINK_HXX #include <tools/link.hxx> diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 25adb3ea3d58..b9aca77fc3f2 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.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 _SFXHINTPOST_HXX -#define _SFXHINTPOST_HXX +#ifndef INCLUDED_SFX2_HINTPOST_HXX +#define INCLUDED_SFX2_HINTPOST_HXX #include <sfx2/genlink.hxx> #include <tools/ref.hxx> diff --git a/include/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx index 0ce8e430869e..952b93d9b07c 100644 --- a/include/sfx2/htmlmode.hxx +++ b/include/sfx2/htmlmode.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 _SFX_HTMLMODE_HXX_ -#define _SFX_HTMLMODE_HXX_ +#ifndef INCLUDED_SFX2_HTMLMODE_HXX +#define INCLUDED_SFX2_HTMLMODE_HXX #define HTMLMODE_ON 0x0001 #define HTMLMODE_PARA_DISTANCE 0x0004 diff --git a/include/sfx2/imgmgr.hxx b/include/sfx2/imgmgr.hxx index 7ef278023336..c06d480ae964 100644 --- a/include/sfx2/imgmgr.hxx +++ b/include/sfx2/imgmgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXIMGMGR_HXX -#define _SFXIMGMGR_HXX +#ifndef INCLUDED_SFX2_IMGMGR_HXX +#define INCLUDED_SFX2_IMGMGR_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index b91d01ad4927..9cd504d50b8f 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.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 _SFX2_MESSAGEBAR_HXX_ -#define _SFX2_MESSAGEBAR_HXX_ +#ifndef INCLUDED_SFX2_INFOBAR_HXX +#define INCLUDED_SFX2_INFOBAR_HXX #include <vector> diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index e97b628d4b1a..126a36e1484f 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.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 _SFX_IPCLIENT_HXX -#define _SFX_IPCLIENT_HXX +#ifndef INCLUDED_SFX2_IPCLIENT_HXX +#define INCLUDED_SFX2_IPCLIENT_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 3f73a90e3f30..455a9c643448 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX_ITEMCONNECT_HXX -#define SFX_ITEMCONNECT_HXX +#ifndef INCLUDED_SFX2_ITEMCONNECT_HXX +#define INCLUDED_SFX2_ITEMCONNECT_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 072da9eed4cf..5c24fd72b1a0 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX_ITEMWRAPPER_HXX -#define SFX_ITEMWRAPPER_HXX +#ifndef INCLUDED_SFX2_ITEMWRAPPER_HXX +#define INCLUDED_SFX2_ITEMWRAPPER_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 909a5ae09823..f62b07319b31 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.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 _LINKMGR_HXX -#define _LINKMGR_HXX +#ifndef INCLUDED_SFX2_LINKMGR_HXX +#define INCLUDED_SFX2_LINKMGR_HXX #include <rtl/ustring.hxx> #include <sal/config.h> diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index c19da26306f5..b512408e1bc2 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.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 _LINKSRC_HXX -#define _LINKSRC_HXX +#ifndef INCLUDED_SFX2_LINKSRC_HXX +#define INCLUDED_SFX2_LINKSRC_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 71ccb16b8888..6fe28bf97ea3 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.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 _LNKBASE_HXX -#define _LNKBASE_HXX +#ifndef INCLUDED_SFX2_LNKBASE_HXX +#define INCLUDED_SFX2_LNKBASE_HXX #include <com/sun/star/io/XInputStream.hpp> #include <rtl/ustring.hxx> diff --git a/include/sfx2/macropg.hxx b/include/sfx2/macropg.hxx index e75549609b0c..ceaa6f6ffce5 100644 --- a/include/sfx2/macropg.hxx +++ b/include/sfx2/macropg.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 _MACROPG_HXX -#define _MACROPG_HXX +#ifndef INCLUDED_SFX2_MACROPG_HXX +#define INCLUDED_SFX2_MACROPG_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx index ff89a4d5cc0b..c688cf051897 100644 --- a/include/sfx2/mailmodelapi.hxx +++ b/include/sfx2/mailmodelapi.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_SFX_MAILMODEL_HXX -#define INCLUDED_SFX_MAILMODEL_HXX +#ifndef INCLUDED_SFX2_MAILMODELAPI_HXX +#define INCLUDED_SFX2_MAILMODELAPI_HXX #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -129,6 +129,6 @@ public: sal_Bool CreateFromAddress_Impl( OUString& rFrom ); -#endif // INCLUDED_SFX_MAILMODEL_HXX +#endif // INCLUDED_SFX2_MAILMODELAPI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index e324946c4164..bbd8f5b765c5 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _MIECLIP_HXX -#define _MIECLIP_HXX +#ifndef INCLUDED_SFX2_MIECLIP_HXX +#define INCLUDED_SFX2_MIECLIP_HXX #include <rtl/ustring.hxx> #include <sal/config.h> @@ -51,6 +51,6 @@ public: }; -#endif //_MIECLIP_HXX +#endif // INCLUDED_SFX2_MIECLIP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 41780767474f..83e023b74ed2 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.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 _SFX_MINFITEM_HXX -#define _SFX_MINFITEM_HXX +#ifndef INCLUDED_SFX2_MINFITEM_HXX +#define INCLUDED_SFX2_MINFITEM_HXX #include <rtl/ustring.hxx> #include <sal/config.h> diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 5fa53213e559..51d2c65d69d0 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.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 _SFXMNUITEM_HXX -#define _SFXMNUITEM_HXX +#ifndef INCLUDED_SFX2_MNUITEM_HXX +#define INCLUDED_SFX2_MNUITEM_HXX #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 3b285faf6593..2d3988a10a1b 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.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 _SFXMODULE_HXX -#define _SFXMODULE_HXX // internal +#ifndef INCLUDED_SFX2_MODULE_HXX +#define INCLUDED_SFX2_MODULE_HXX // internal #define _SFXMOD_HXX // external #include "sal/config.h" diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index eca6618cc118..f48284cbbb4d 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.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 _SFXMSG_HXX -#define _SFXMSG_HXX +#ifndef INCLUDED_SFX2_MSG_HXX +#define INCLUDED_SFX2_MSG_HXX #include <tools/rtti.hxx> #include <sfx2/shell.hxx> diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 7f0dc928818e..8ae93a8ef088 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXNAVI_HXX -#define _SFXNAVI_HXX +#ifndef INCLUDED_SFX2_NAVIGAT_HXX +#define INCLUDED_SFX2_NAVIGAT_HXX #include <sfx2/childwin.hxx> #include <sfx2/dockwin.hxx> diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 34ca4ba305bf..d44d49718dfe 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.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 _SFXOBJFACE_HXX -#define _SFXOBJFACE_HXX +#ifndef INCLUDED_SFX2_OBJFACE_HXX +#define INCLUDED_SFX2_OBJFACE_HXX #include <rtl/ustring.hxx> #include <sal/config.h> diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 8e607c9f0ce5..3297cac145f3 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.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 _SFX_OBJITEM_HXX -#define _SFX_OBJITEM_HXX +#ifndef INCLUDED_SFX2_OBJITEM_HXX +#define INCLUDED_SFX2_OBJITEM_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index e2f2c6e3d42e..eb9479af11ba 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.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 _SFX_OBJSH_HXX -#define _SFX_OBJSH_HXX +#ifndef INCLUDED_SFX2_OBJSH_HXX +#define INCLUDED_SFX2_OBJSH_HXX #include <config_features.h> diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 13e7a6bcd84b..0a7c12c01c3d 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.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 _SFX2_OPENGRF_HXX -#define _SFX2_OPENGRF_HXX +#ifndef INCLUDED_SFX2_OPENGRF_HXX +#define INCLUDED_SFX2_OPENGRF_HXX #include <memory> #include <vcl/graphicfilter.hxx> diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 21c5e0107fe1..821b311bc4ae 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.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 _SFX_PASSWD_HXX -#define _SFX_PASSWD_HXX +#ifndef INCLUDED_SFX2_PASSWD_HXX +#define INCLUDED_SFX2_PASSWD_HXX #include "sal/config.h" #include <sfx2/dllapi.h> @@ -118,6 +118,6 @@ public: virtual short Execute(); }; -#endif // #ifndef _SFX_PASSWD_HXX +#endif // INCLUDED_SFX2_PASSWD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx index 3b17333366ee..03500f24dc23 100644 --- a/include/sfx2/printer.hxx +++ b/include/sfx2/printer.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 _SFX_PRINTER_HXX -#define _SFX_PRINTER_HXX +#ifndef INCLUDED_SFX2_PRINTER_HXX +#define INCLUDED_SFX2_PRINTER_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 44d37d0a4558..ebe0fd29f39e 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_PRINTOPT_HXX -#define _SFX_PRINTOPT_HXX +#ifndef INCLUDED_SFX2_PRINTOPT_HXX +#define INCLUDED_SFX2_PRINTOPT_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -104,6 +104,6 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; -#endif // #ifndef _SFX_PRINTOPT_HXX +#endif // INCLUDED_SFX2_PRINTOPT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx index bb598b8a62bf..433c4272819f 100644 --- a/include/sfx2/progress.hxx +++ b/include/sfx2/progress.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 _SFX_PROGRESS_HXX -#define _SFX_PROGRESS_HXX +#ifndef INCLUDED_SFX2_PROGRESS_HXX +#define INCLUDED_SFX2_PROGRESS_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx index 475d3cd00765..05d72e756b19 100644 --- a/include/sfx2/querystatus.hxx +++ b/include/sfx2/querystatus.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXQUERYSTATUS_HXX -#define _SFXQUERYSTATUS_HXX +#ifndef INCLUDED_SFX2_QUERYSTATUS_HXX +#define INCLUDED_SFX2_QUERYSTATUS_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -50,6 +50,6 @@ class SFX2_DLLPUBLIC SfxQueryStatus SfxQueryStatus_Impl* m_pSfxQueryStatusImpl; }; -#endif // _SFXQUERYSTATUS_HXX +#endif // INCLUDED_SFX2_QUERYSTATUS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 1c3949e7159a..05526368b961 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_RECENTDOCSVIEW_HXX__ -#define __SFX2_RECENTDOCSVIEW_HXX__ +#ifndef INCLUDED_SFX2_RECENTDOCSVIEW_HXX +#define INCLUDED_SFX2_RECENTDOCSVIEW_HXX #include <sfx2/thumbnailview.hxx> #include <sfx2/recentdocsviewitem.hxx> @@ -68,6 +68,6 @@ protected: long mnItemMaxTextLength; }; -#endif // __SFX2_RECENTDOCSVIEW_HXX__ +#endif // INCLUDED_SFX2_RECENTDOCSVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index 33d3bb938fb3..4442e3266cc2 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_RECENTDOCSVIEWITEM_HXX__ -#define __SFX2_RECENTDOCSVIEWITEM_HXX__ +#ifndef INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX +#define INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX #include <sfx2/thumbnailview.hxx> @@ -22,6 +22,6 @@ public: OUString maURL; }; -#endif // __SFX2_RECENTDOCSVIEWITEM_HXX__ +#endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 9a044e6f7e72..d8d95fe8c9bf 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.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 _SFXREQUEST_HXX -#define _SFXREQUEST_HXX +#ifndef INCLUDED_SFX2_REQUEST_HXX +#define INCLUDED_SFX2_REQUEST_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index 994fd0befa41..bfe62f248ed6 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.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 _SECURITYPAGE_HXX_ -#define _SECURITYPAGE_HXX_ +#ifndef INCLUDED_SFX2_SECURITYPAGE_HXX +#define INCLUDED_SFX2_SECURITYPAGE_HXX #include "sfx2/tabdlg.hxx" #include "sfx2/htmlmode.hxx" @@ -44,6 +44,6 @@ public: }; -#endif // #ifndef _SECURITYPAGE_HXX_ +#endif // INCLUDED_SFX2_SECURITYPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index df2635f711ed..6628200b6116 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_SFXBASECONTROLLER_HXX_ -#define _SFX_SFXBASECONTROLLER_HXX_ +#ifndef INCLUDED_SFX2_SFXBASECONTROLLER_HXX +#define INCLUDED_SFX2_SFXBASECONTROLLER_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 4d4d4dd9e036..30e51ebd2d47 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_SFXBASEMODEL_HXX_ -#define _SFX_SFXBASEMODEL_HXX_ +#ifndef INCLUDED_SFX2_SFXBASEMODEL_HXX +#define INCLUDED_SFX2_SFXBASEMODEL_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -1557,6 +1557,6 @@ private: SolarMutexResettableGuard m_aGuard; }; -#endif // _SFX_SFXBASEMODEL_HXX_ +#endif // INCLUDED_SFX2_SFXBASEMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h index 4d4a9d3ac3df..63a4dc2c616b 100644 --- a/include/sfx2/sfxcommands.h +++ b/include/sfx2/sfxcommands.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 SFX2_SFXCOMMANDS_HRC -#define SFX2_SFXCOMMANDS_HRC +#ifndef INCLUDED_SFX2_SFXCOMMANDS_H +#define INCLUDED_SFX2_SFXCOMMANDS_H #define CMD_SID_ABOUT ".uno:About" #define CMD_SID_NEWDOC ".uno:NewDoc" diff --git a/include/sfx2/sfxdefs.hxx b/include/sfx2/sfxdefs.hxx index cca545f7e2f7..0e92214f68e8 100644 --- a/include/sfx2/sfxdefs.hxx +++ b/include/sfx2/sfxdefs.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXDEFS_HXX -#define _SFXDEFS_HXX +#ifndef INCLUDED_SFX2_SFXDEFS_HXX +#define INCLUDED_SFX2_SFXDEFS_HXX #define SfxFilterFlags sal_uLong diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 1d809fdd598a..6ab744c2594a 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.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 _SFX2_DIALOG_HXX -#define _SFX2_DIALOG_HXX +#ifndef INCLUDED_SFX2_SFXDLG_HXX +#define INCLUDED_SFX2_SFXDLG_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index b92bc9dd66ab..9ab5b5d8cfd3 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.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 _SFX_HELP_HXX -#define _SFX_HELP_HXX +#ifndef INCLUDED_SFX2_SFXHELP_HXX +#define INCLUDED_SFX2_SFXHELP_HXX #include <rtl/ustring.hxx> #include "sal/config.h" @@ -55,6 +55,6 @@ public: static OUString GetCurrentModuleIdentifier(); }; -#endif // #ifndef _SFX_HELP_HXX +#endif // INCLUDED_SFX2_SFXHELP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 77035ce0ba75..ced819c01c14 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXHTML_HXX -#define _SFXHTML_HXX +#ifndef INCLUDED_SFX2_SFXHTML_HXX +#define INCLUDED_SFX2_SFXHTML_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx index 612aea61d07e..b4dccc202c51 100644 --- a/include/sfx2/sfxmodelfactory.hxx +++ b/include/sfx2/sfxmodelfactory.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX2_SFXMODELFACTORY_HXX -#define SFX2_SFXMODELFACTORY_HXX +#ifndef INCLUDED_SFX2_SFXMODELFACTORY_HXX +#define INCLUDED_SFX2_SFXMODELFACTORY_HXX #include "sfx2/dllapi.h" @@ -62,6 +62,6 @@ namespace sfx2 } // namespace sfx2 //........................................................................ -#endif // SFX2_SFXMODELFACTORY_HXX +#endif // INCLUDED_SFX2_SFXMODELFACTORY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx index f90221847579..c3ea0689e163 100644 --- a/include/sfx2/sfxresid.hxx +++ b/include/sfx2/sfxresid.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 _SFX_SFXRESID_HXX -#define _SFX_SFXRESID_HXX +#ifndef INCLUDED_SFX2_SFXRESID_HXX +#define INCLUDED_SFX2_SFXRESID_HXX #include "sfx2/dllapi.h" #include <tools/resid.hxx> diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index 9913b911ffed..a466b2f08f06 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXSTATUSLISTENER_HXX -#define _SFXSTATUSLISTENER_HXX +#ifndef INCLUDED_SFX2_SFXSTATUSLISTENER_HXX +#define INCLUDED_SFX2_SFXSTATUSLISTENER_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -80,6 +80,6 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2< ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xDispatch; }; -#endif // _SFXSTATUSLISTENER_HXX +#endif // INCLUDED_SFX2_SFXSTATUSLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index 70029b1d9228..b926f9890e04 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_SFXUNO_HXX -#define _SFX_SFXUNO_HXX +#ifndef INCLUDED_SFX2_SFXUNO_HXX +#define INCLUDED_SFX2_SFXUNO_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -277,6 +277,6 @@ typedef sal_Int32 FrameSearchFlags; CREATEFACTORY ( CLASS ) \ } -#endif // _SFX_SFXUNO_HXX +#endif // INCLUDED_SFX2_SFXUNO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 7bde39f915da..93e2e782b7dc 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.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 _SFX_SHELL_HXX -#define _SFX_SHELL_HXX +#ifndef INCLUDED_SFX2_SHELL_HXX +#define INCLUDED_SFX2_SHELL_HXX #include <com/sun/star/embed/VerbDescriptor.hpp> #include <rtl/ustring.hxx> diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx index 412455d4e0a7..fdfb26a581a2 100644 --- a/include/sfx2/sidebar/CommandInfoProvider.hxx +++ b/include/sfx2/sidebar/CommandInfoProvider.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 SIDEBAR_COMMAND_INFO_PROVIDER_HXX -#define SIDEBAR_COMMAND_INFO_PROVIDER_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_COMMANDINFOPROVIDER_HXX +#define INCLUDED_SFX2_SIDEBAR_COMMANDINFOPROVIDER_HXX #include "sfx2/dllapi.h" diff --git a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx b/include/sfx2/sidebar/ContextChangeBroadcaster.hxx index b1012da342b8..923fb382fb69 100644 --- a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx +++ b/include/sfx2/sidebar/ContextChangeBroadcaster.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 SFX_SIDEBAR_CONTEXT_CHANGE_BROADCASTER_HXX -#define SFX_SIDEBAR_CONTEXT_CHANGE_BROADCASTER_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX +#define INCLUDED_SFX2_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index af6d77121360..aebb0b348eb4 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.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 SFX_SIDEBAR_CONTROL_FACTORY_HXX -#define SFX_SIDEBAR_CONTROL_FACTORY_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLFACTORY_HXX +#define INCLUDED_SFX2_SIDEBAR_CONTROLFACTORY_HXX #include <sfx2/dllapi.h> #include <sfx2/sidebar/SidebarToolBox.hxx> diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx index 97d32a44ad6d..4871ce048f9c 100644 --- a/include/sfx2/sidebar/ControllerFactory.hxx +++ b/include/sfx2/sidebar/ControllerFactory.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 SFX_SIDEBAR_CONTROLLER_FACTORY_HXX -#define SFX_SIDEBAR_CONTROLLER_FACTORY_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX +#define INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX #include "sfx2/dllapi.h" #include <com/sun/star/awt/XWindow.hpp> diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 8b889e64e3e0..858bf5d990fb 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.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 SVX_SIDEBAR_CONTROLLER_ITEM_HXX -#define SVX_SIDEBAR_CONTROLLER_ITEM_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX +#define INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX #include <sfx2/ctrlitem.hxx> diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index 53292fecfea8..1b80a9f42663 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.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 SFX_SIDEBAR_ENUM_CONTEXT_HXX -#define SFX_SIDEBAR_ENUM_CONTEXT_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_ENUMCONTEXT_HXX +#define INCLUDED_SFX2_SIDEBAR_ENUMCONTEXT_HXX #include "sfx2/dllapi.h" diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx index e926045eace9..37ccc103197e 100644 --- a/include/sfx2/sidebar/IContextChangeReceiver.hxx +++ b/include/sfx2/sidebar/IContextChangeReceiver.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 SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX -#define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX +#define INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX #include "EnumContext.hxx" #include "sfx2/dllapi.h" diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index c0415af8f81d..9a3d85debd11 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.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 SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX -#define SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX +#define INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX #include "sfx2/dllapi.h" #include <tools/gen.hxx> diff --git a/include/sfx2/sidebar/PopupContainer.hxx b/include/sfx2/sidebar/PopupContainer.hxx index 689f77c19a1e..622fb2eff1d0 100644 --- a/include/sfx2/sidebar/PopupContainer.hxx +++ b/include/sfx2/sidebar/PopupContainer.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 SFX_SIDEBAR_POPUP_CONTAINER_HXX -#define SFX_SIDEBAR_POPUP_CONTAINER_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_POPUPCONTAINER_HXX +#define INCLUDED_SFX2_SIDEBAR_POPUPCONTAINER_HXX #include "sfx2/dllapi.h" #include <vcl/floatwin.hxx> diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx index 458100ebb8b1..aac42b7a3a2a 100644 --- a/include/sfx2/sidebar/Sidebar.hxx +++ b/include/sfx2/sidebar/Sidebar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX_SIDEBAR_SIDEBAR_HXX -#define SFX_SIDEBAR_SIDEBAR_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX +#define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX #include "sfx2/dllapi.h" #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx index c78c17f64129..f74931b40c63 100644 --- a/include/sfx2/sidebar/SidebarChildWindow.hxx +++ b/include/sfx2/sidebar/SidebarChildWindow.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 SFX_SIDEBAR_CHILD_WINDOW_HXX -#define SFX_SIDEBAR_CHILD_WINDOW_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARCHILDWINDOW_HXX +#define INCLUDED_SFX2_SIDEBAR_SIDEBARCHILDWINDOW_HXX #include "sfx2/childwin.hxx" diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index cab01ceaba42..e20fbbb8f575 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.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 SFX_SIDEBAR_PANEL_BASE_HXX -#define SFX_SIDEBAR_PANEL_BASE_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX +#define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX #include "EnumContext.hxx" #include "IContextChangeReceiver.hxx" diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 098b63d7ed0c..069a8ab8ed47 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.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 SFX_SIDEBAR_THEME_HXX -#define SFX_SIDEBAR_THEME_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_THEME_HXX +#define INCLUDED_SFX2_SIDEBAR_THEME_HXX #include "sfx2/dllapi.h" diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx index 1515d1b4ccbb..8ea20b6970a0 100644 --- a/include/sfx2/sidebar/Tools.hxx +++ b/include/sfx2/sidebar/Tools.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 SFX_SIDEBAR_TOOLS_HXX -#define SFX_SIDEBAR_TOOLS_HXX +#ifndef INCLUDED_SFX2_SIDEBAR_TOOLS_HXX +#define INCLUDED_SFX2_SIDEBAR_TOOLS_HXX #include <vcl/image.hxx> #include <vcl/gradient.hxx> diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx index ff17355d2f48..0e795d5d5255 100644 --- a/include/sfx2/signaturestate.hxx +++ b/include/sfx2/signaturestate.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX2_SIGNATURESTATE_HXX -#define SFX2_SIGNATURESTATE_HXX +#ifndef INCLUDED_SFX2_SIGNATURESTATE_HXX +#define INCLUDED_SFX2_SIGNATURESTATE_HXX // xmlsec05, check with SFX team #define SIGNATURESTATE_UNKNOWN (sal_Int16)(-1) @@ -33,6 +33,6 @@ //OOo 2.x - OOo 3.1.1. This state is only used together with document signatures. #define SIGNATURESTATE_SIGNATURES_PARTIAL_OK (sal_Int16)5 -#endif // SFX2_SIGNATURESTATE_HXX +#endif // INCLUDED_SFX2_SIGNATURESTATE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 0512c310d3b7..1c825703ef9b 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.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 _SFXSTBITEM_HXX -#define _SFXSTBITEM_HXX +#ifndef INCLUDED_SFX2_STBITEM_HXX +#define INCLUDED_SFX2_STBITEM_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 69915308004f..8b0ed9b5eed7 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.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 _SFX_STYFITEM_HXX -#define _SFX_STYFITEM_HXX +#ifndef INCLUDED_SFX2_STYFITEM_HXX +#define INCLUDED_SFX2_STYFITEM_HXX #include <rtl/ustring.hxx> #include <sal/config.h> diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index c6880d39e9ae..0828f9dea2f9 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.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 _SFXTABDLG_HXX -#define _SFXTABDLG_HXX +#ifndef INCLUDED_SFX2_TABDLG_HXX +#define INCLUDED_SFX2_TABDLG_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 0e25fcef0e7a..ad6351205f05 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX_TASKPANE_HXX -#define SFX_TASKPANE_HXX +#ifndef INCLUDED_SFX2_TASKPANE_HXX +#define INCLUDED_SFX2_TASKPANE_HXX #include "sfx2/dllapi.h" #include "sfx2/childwin.hxx" @@ -207,6 +207,6 @@ namespace sfx2 } // namespace sfx2 //...................................................................................................................... -#endif // SFX_TASKPANE_HXX +#endif // INCLUDED_SFX2_TASKPANE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 3d4037661a7d..9170f04de60b 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.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 _SFXTBXCTRL_HXX -#define _SFXTBXCTRL_HXX +#ifndef INCLUDED_SFX2_TBXCTRL_HXX +#define INCLUDED_SFX2_TBXCTRL_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 962e75477762..fc2df865e954 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_TEMPLATEABSTRACTVIEW_HXX__ -#define __SFX2_TEMPLATEABSTRACTVIEW_HXX__ +#ifndef INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX +#define INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX #include <sfx2/templateproperties.hxx> #include <sfx2/thumbnailview.hxx> @@ -145,6 +145,6 @@ protected: Link maOpenTemplateHdl; }; -#endif // __SFX2_TEMPLATEABSTRACTVIEW_HXX__ +#endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx index 9d69ddf57d2e..b33b3946e248 100644 --- a/include/sfx2/templatecontaineritem.hxx +++ b/include/sfx2/templatecontaineritem.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef TEMPLATEFOLDERVIEWITEM_HXX -#define TEMPLATEFOLDERVIEWITEM_HXX +#ifndef INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX +#define INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX #include <sfx2/templateproperties.hxx> #include <sfx2/thumbnailviewitem.hxx> @@ -41,6 +41,6 @@ private: Rectangle maThumbnailArea; }; -#endif // TEMPLATEFOLDERVIEWITEM_HXX +#endif // INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx index 69d79b20da9a..d064109736c0 100644 --- a/include/sfx2/templateinfodlg.hxx +++ b/include/sfx2/templateinfodlg.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_TEMPLATEINFODLG_HXX__ -#define __SFX2_TEMPLATEINFODLG_HXX__ +#ifndef INCLUDED_SFX2_TEMPLATEINFODLG_HXX +#define INCLUDED_SFX2_TEMPLATEINFODLG_HXX #include <vcl/dialog.hxx> #include <vcl/button.hxx> @@ -45,6 +45,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; }; -#endif // __SFX2_TEMPLATEINFODLG_HXX__ +#endif // INCLUDED_SFX2_TEMPLATEINFODLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 02cc26a352ab..5e065e774005 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef TEMPLATEFOLDERVIEW_HXX -#define TEMPLATEFOLDERVIEW_HXX +#ifndef INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX +#define INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX #include <set> @@ -102,6 +102,6 @@ private: std::vector<TemplateContainerItem* > maRegions; }; -#endif // TEMPLATEFOLDERVIEW_HXX +#endif // INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templateproperties.hxx b/include/sfx2/templateproperties.hxx index 493c092ad8b1..60a406595458 100644 --- a/include/sfx2/templateproperties.hxx +++ b/include/sfx2/templateproperties.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_TEMPLATEPROPERTIES_HXX__ -#define __SFX2_TEMPLATEPROPERTIES_HXX__ +#ifndef INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX +#define INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX #include <rtl/ustring.hxx> #include <vcl/bitmapex.hxx> @@ -24,6 +24,6 @@ struct TemplateItemProperties BitmapEx aThumbnail; }; -#endif // __SFX2_TEMPLATEPROPERTIES_HXX__ +#endif // INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx index bcb2b68fc0a4..7cf6fbb8acf4 100644 --- a/include/sfx2/templateremoteview.hxx +++ b/include/sfx2/templateremoteview.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_TEMPLATEREMOTEVIEW_HXX__ -#define __SFX2_TEMPLATEREMOTEVIEW_HXX__ +#ifndef INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX +#define INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX #include <sfx2/templateabstractview.hxx> #include <sfx2/templateproperties.hxx> @@ -42,7 +42,7 @@ private: com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv; }; -#endif // __SFX2_TEMPLATEREMOTEVIEW_HXX__ +#endif // INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templaterepository.hxx b/include/sfx2/templaterepository.hxx index f134c9897bf6..ac502f5d1eb8 100644 --- a/include/sfx2/templaterepository.hxx +++ b/include/sfx2/templaterepository.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SFX2_TEMPLATEREPOSITORY_HXX__ -#define __SFX2_TEMPLATEREPOSITORY_HXX__ +#ifndef INCLUDED_SFX2_TEMPLATEREPOSITORY_HXX +#define INCLUDED_SFX2_TEMPLATEREPOSITORY_HXX #include <sfx2/templateproperties.hxx> @@ -41,6 +41,6 @@ private: std::vector<TemplateItemProperties> maTemplates; }; -#endif // __SFX2_TEMPLATEREPOSITORY_HXX__ +#endif // INCLUDED_SFX2_TEMPLATEREPOSITORY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 92d591995189..95b0abc79d51 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef TEMPLATEVIEWITEM_HXX -#define TEMPLATEVIEWITEM_HXX +#ifndef INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX +#define INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX #include <sfx2/thumbnailviewitem.hxx> @@ -56,6 +56,6 @@ private: Point maSubTitlePos; }; -#endif // TEMPLATEVIEWITEM_HXX +#endif // INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index bfb08bc8b4fa..6ce43d550612 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef THUMBNAILVIEW_HXX -#define THUMBNAILVIEW_HXX +#ifndef INCLUDED_SFX2_THUMBNAILVIEW_HXX +#define INCLUDED_SFX2_THUMBNAILVIEW_HXX #include "sfx2/dllapi.h" @@ -344,6 +344,6 @@ protected: boost::function<bool (const ThumbnailViewItem*) > maFilterFunc; }; -#endif // THUMBNAILVIEW_HXX +#endif // INCLUDED_SFX2_THUMBNAILVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index ea7bf933c637..fff3bdfc30f9 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef THUMBNAILVIEWITEM_HXX -#define THUMBNAILVIEWITEM_HXX +#ifndef INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX +#define INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX #include <basegfx/vector/b2dvector.hxx> #include <drawinglayer/attribute/fontattribute.hxx> @@ -129,6 +129,6 @@ protected: Rectangle maTextEditMaxArea; }; -#endif // THUMBNAILVIEWITEM_HXX +#endif // INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 5712d32ad614..7b43c6756da5 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX_TITLEDOCKWIN_HXX -#define SFX_TITLEDOCKWIN_HXX +#ifndef INCLUDED_SFX2_TITLEDOCKWIN_HXX +#define INCLUDED_SFX2_TITLEDOCKWIN_HXX #include "sfx2/dllapi.h" #include "sfx2/dockwin.hxx" @@ -156,6 +156,6 @@ namespace sfx2 } // namespace sfx2 //...................................................................................................................... -#endif // SFX_TITLEDOCKWIN_HXX +#endif // INCLUDED_SFX2_TITLEDOCKWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 321de229e340..2641c455566b 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.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 _SFX_UNOCTITM_HXX -#define _SFX_UNOCTITM_HXX +#ifndef INCLUDED_SFX2_UNOCTITM_HXX +#define INCLUDED_SFX2_UNOCTITM_HXX #include <functional> #include <com/sun/star/frame/XNotifyingDispatch.hpp> diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 7350314b4835..7f07511c8b8d 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef USERINPUTINTERCEPTION_HXX -#define USERINPUTINTERCEPTION_HXX +#ifndef INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX +#define INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX #include "sfx2/dllapi.h" @@ -70,6 +70,6 @@ namespace sfx2 } // namespace sfx2 //........................................................................ -#endif // USERINPUTINTERCEPTION_HXX +#endif // INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index a4184c15dc2f..687be03d1b1a 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.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 _VIEWFAC_HXX -#define _VIEWFAC_HXX +#ifndef INCLUDED_SFX2_VIEWFAC_HXX +#define INCLUDED_SFX2_VIEWFAC_HXX #include <rtl/ustring.hxx> #include <sal/config.h> diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index dce9b89c7e95..4c3b493d6714 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.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 _SFXVIEWFRM_HXX -#define _SFXVIEWFRM_HXX +#ifndef INCLUDED_SFX2_VIEWFRM_HXX +#define INCLUDED_SFX2_VIEWFRM_HXX #include "sal/config.h" #include "sfx2/dllapi.h" diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 17ae07be30ab..315ae17362af 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.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 _SFXVIEWSH_HXX -#define _SFXVIEWSH_HXX +#ifndef INCLUDED_SFX2_VIEWSH_HXX +#define INCLUDED_SFX2_VIEWSH_HXX #include "sal/config.h" #include "sfx2/dllapi.h" @@ -127,7 +127,7 @@ typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList; // ----------------------------------------------------------------------- class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener { -#ifdef _SFXVIEWSH_HXX +#ifdef INCLUDED_SFX2_VIEWSH_HXX friend class SfxViewFrame; friend class SfxBaseController; friend class SfxPrinterController; @@ -337,7 +337,7 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const return pFrame; } -#endif // #ifndef _SFXVIEWSH_HXX +#endif // INCLUDED_SFX2_VIEWSH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index ab5c81c425aa..44c8082e034a 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.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 _SVX_ZOOMITEM_HXX -#define _SVX_ZOOMITEM_HXX +#ifndef INCLUDED_SFX2_ZOOMITEM_HXX +#define INCLUDED_SFX2_ZOOMITEM_HXX #include <svl/intitem.hxx> #include <sfx2/sfxsids.hrc> diff --git a/include/shell/kde_headers.h b/include/shell/kde_headers.h index 3ca3fa69ef26..8041cf3d9188 100644 --- a/include/shell/kde_headers.h +++ b/include/shell/kde_headers.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_KDE_HEADERS_H -#define INCLUDED_VCL_KDE_HEADERS_H +#ifndef INCLUDED_SHELL_KDE_HEADERS_H +#define INCLUDED_SHELL_KDE_HEADERS_H #include <config_vclplug.h> diff --git a/include/shell/tde_defines.h b/include/shell/tde_defines.h index 603076008822..0bf40fe407dd 100644 --- a/include/shell/tde_defines.h +++ b/include/shell/tde_defines.h @@ -10,8 +10,8 @@ * Copyright (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> */ -#ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H -#define INCLUDED_VCL_TDE_DEFINE_HEADERS_H +#ifndef INCLUDED_SHELL_TDE_DEFINES_H +#define INCLUDED_SHELL_TDE_DEFINES_H #define QObject TQObject #define QWidget TQWidget diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h index 221f679aca2b..dc9da8fc3210 100644 --- a/include/shell/tde_headers.h +++ b/include/shell/tde_headers.h @@ -10,8 +10,8 @@ * Copyright (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> */ -#ifndef INCLUDED_VCL_TDE_HEADERS_H -#define INCLUDED_VCL_TDE_HEADERS_H +#ifndef INCLUDED_SHELL_TDE_HEADERS_H +#define INCLUDED_SHELL_TDE_HEADERS_H /* ********* Suppress warnings if needed */ #include "sal/config.h" diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx index e4df9f9e6a93..5228b6a8544b 100644 --- a/include/sot/exchange.hxx +++ b/include/sot/exchange.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_EXCHANGE_HXX -#define _SOT_EXCHANGE_HXX +#ifndef INCLUDED_SOT_EXCHANGE_HXX +#define INCLUDED_SOT_EXCHANGE_HXX #include <list> #include <vector> diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index dd5a78b497f1..5a53f40b0793 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_FACTORY_HXX -#define _SOT_FACTORY_HXX +#ifndef INCLUDED_SOT_FACTORY_HXX +#define INCLUDED_SOT_FACTORY_HXX #include <tools/globname.hxx> #include <tools/rtti.hxx> diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index 9dc70a77e894..a9b6009ef374 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FILELIST_HXX -#define _FILELIST_HXX +#ifndef INCLUDED_SOT_FILELIST_HXX +#define INCLUDED_SOT_FILELIST_HXX #include "sot/sotdllapi.h" #include <tools/stream.hxx> @@ -60,6 +60,6 @@ public: }; -#endif // _FILELIST_HXX +#endif // INCLUDED_SOT_FILELIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx index 74d3552a0e26..dc4feaaee52c 100644 --- a/include/sot/formats.hxx +++ b/include/sot/formats.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_FORMATS_HXX -#define _SOT_FORMATS_HXX +#ifndef INCLUDED_SOT_FORMATS_HXX +#define INCLUDED_SOT_FORMATS_HXX #ifdef _SOT_FORMATS_INCLUDE_SYSTEMFORMATS @@ -178,6 +178,6 @@ #define SOT_FORMATSTR_ID_PNG ((sal_uLong)141) #define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_PNG -#endif // _SOT_FORMATS_HXX +#endif // INCLUDED_SOT_FORMATS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 349efbc23cac..f29173412df4 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_OBJECT_HXX -#define _SOT_OBJECT_HXX +#ifndef INCLUDED_SOT_OBJECT_HXX +#define INCLUDED_SOT_OBJECT_HXX #include <sot/sotdata.hxx> #include <tools/globname.hxx> diff --git a/include/sot/sotdata.hxx b/include/sot/sotdata.hxx index da045079c76e..4dd3fa577f20 100644 --- a/include/sot/sotdata.hxx +++ b/include/sot/sotdata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_DATA_HXX -#define _SOT_DATA_HXX +#ifndef INCLUDED_SOT_SOTDATA_HXX +#define INCLUDED_SOT_SOTDATA_HXX /************************************************************************* *************************************************************************/ diff --git a/include/sot/sotdllapi.h b/include/sot/sotdllapi.h index 722d2ee25f47..67ae5621efb1 100644 --- a/include/sot/sotdllapi.h +++ b/include/sot/sotdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SOTDLLAPI_H -#define INCLUDED_SOTDLLAPI_H +#ifndef INCLUDED_SOT_SOTDLLAPI_H +#define INCLUDED_SOT_SOTDLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define SOT_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_SOTDLLAPI_H */ +#endif // INCLUDED_SOT_SOTDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 4a4472d8b47b..15a13fc342fe 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _STG_HXX -#define _STG_HXX +#ifndef INCLUDED_SOT_STG_HXX +#define INCLUDED_SOT_STG_HXX #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Reference.h> diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index a46373f2d99c..6767ddf32ec9 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_STORAGE_HXX -#define _SOT_STORAGE_HXX +#ifndef INCLUDED_SOT_STORAGE_HXX +#define INCLUDED_SOT_STORAGE_HXX #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx index a91b636a8440..6a19e91f1e28 100644 --- a/include/sot/storinfo.hxx +++ b/include/sot/storinfo.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOT_STORINFO_HXX -#define _SOT_STORINFO_HXX +#ifndef INCLUDED_SOT_STORINFO_HXX +#define INCLUDED_SOT_STORINFO_HXX #include <tools/globname.hxx> #include <tools/solar.h> diff --git a/include/store/store.h b/include/store/store.h index ff3f1ef0a390..48852c7fe119 100644 --- a/include/store/store.h +++ b/include/store/store.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _STORE_STORE_H_ -#define _STORE_STORE_H_ +#ifndef INCLUDED_STORE_STORE_H +#define INCLUDED_STORE_STORE_H #include <store/types.h> #include <store/storedllapi.h> @@ -397,7 +397,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_remove ( } #endif -#endif /* _STORE_STORE_H_ */ +#endif // INCLUDED_STORE_STORE_H diff --git a/include/store/store.hxx b/include/store/store.hxx index 43ef8859c52e..b7fb8e02cf0d 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _STORE_STORE_HXX_ -#define _STORE_STORE_HXX_ +#ifndef INCLUDED_STORE_STORE_HXX +#define INCLUDED_STORE_STORE_HXX #include "sal/types.h" #include "rtl/ustring.hxx" @@ -597,7 +597,7 @@ private: } // namespace store -#endif /* !_STORE_STORE_HXX_ */ +#endif /* ! INCLUDED_STORE_STORE_HXX */ diff --git a/include/store/storedllapi.h b/include/store/storedllapi.h index 0a4b27a333ca..5f6c7a1ddf00 100644 --- a/include/store/storedllapi.h +++ b/include/store/storedllapi.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 INCLUDED_STOREDLLAPI_H -#define INCLUDED_STOREDLLAPI_H +#ifndef INCLUDED_STORE_STOREDLLAPI_H +#define INCLUDED_STORE_STOREDLLAPI_H #include "sal/types.h" @@ -27,6 +27,6 @@ #define STORE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif /* INCLUDED_STOREDLLAPI_H */ +#endif // INCLUDED_STORE_STOREDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/store/types.h b/include/store/types.h index 0d51995348a0..dd4fafccd324 100644 --- a/include/store/types.h +++ b/include/store/types.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _STORE_TYPES_H_ -#define _STORE_TYPES_H_ +#ifndef INCLUDED_STORE_TYPES_H +#define INCLUDED_STORE_TYPES_H #include <sal/types.h> #include <rtl/ustring.h> @@ -155,6 +155,6 @@ typedef struct __store_FindData storeFindData; } #endif -#endif /* _STORE_TYPES_H_ */ +#endif // INCLUDED_STORE_TYPES_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx index 7204ebdc845b..bc5c02f50eea 100644 --- a/include/svl/PasswordHelper.hxx +++ b/include/svl/PasswordHelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_PASSWORDHELPER_HXX -#define _SVTOOLS_PASSWORDHELPER_HXX +#ifndef INCLUDED_SVL_PASSWORDHELPER_HXX +#define INCLUDED_SVL_PASSWORDHELPER_HXX #include "svl/svldllapi.h" #include "sal/types.h" diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx index 063ba11a95a9..cc5477d6e72c 100644 --- a/include/svl/adrparse.hxx +++ b/include/svl/adrparse.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _ADRPARSE_HXX -#define _ADRPARSE_HXX +#ifndef INCLUDED_SVL_ADRPARSE_HXX +#define INCLUDED_SVL_ADRPARSE_HXX #include "svl/svldllapi.h" #include <vector> @@ -73,6 +73,6 @@ public: } }; -#endif // _ADRPARSE_HXX +#endif // INCLUDED_SVL_ADRPARSE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 7dd741592015..6c85142e5c7b 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.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 _AEITEM_HXX -#define _AEITEM_HXX +#ifndef INCLUDED_SVL_AEITEM_HXX +#define INCLUDED_SVL_AEITEM_HXX #include "svl/svldllapi.h" #include <svl/poolitem.hxx> diff --git a/include/svl/brdcst.hxx b/include/svl/brdcst.hxx index 258cf6066e58..ca254c3512b1 100644 --- a/include/svl/brdcst.hxx +++ b/include/svl/brdcst.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 _SFXBRDCST_HXX -#define _SFXBRDCST_HXX +#ifndef INCLUDED_SVL_BRDCST_HXX +#define INCLUDED_SVL_BRDCST_HXX #include "svl/svldllapi.h" #include <tools/rtti.hxx> diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx index ac2931986914..a09039e70f92 100644 --- a/include/svl/broadcast.hxx +++ b/include/svl/broadcast.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 _SVT_BROADCAST_HXX -#define _SVT_BROADCAST_HXX +#ifndef INCLUDED_SVL_BROADCAST_HXX +#define INCLUDED_SVL_BROADCAST_HXX #include "svl/svldllapi.h" #include <tools/rtti.hxx> diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index c8fb8bb33c80..f96e7713b25b 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_CENUMITM_HXX -#define SVTOOLS_CENUMITM_HXX +#ifndef INCLUDED_SVL_CENUMITM_HXX +#define INCLUDED_SVL_CENUMITM_HXX #include "svl/svldllapi.h" #include <tools/debug.hxx> @@ -81,6 +81,6 @@ public: virtual void SetBoolValue(sal_Bool bValue); }; -#endif // SVTOOLS_CENUMITM_HXX +#endif // INCLUDED_SVL_CENUMITM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index e781ada09a35..2003b51c71eb 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_CINTITEM_HXX -#define _SVTOOLS_CINTITEM_HXX +#ifndef INCLUDED_SVL_CINTITEM_HXX +#define INCLUDED_SVL_CINTITEM_HXX #include "svl/svldllapi.h" #include <tools/debug.hxx> @@ -269,6 +269,6 @@ inline void CntUInt32Item::SetValue(sal_uInt32 nTheValue) m_nValue = nTheValue; } -#endif // _SVTOOLS_CINTITEM_HXX +#endif // INCLUDED_SVL_CINTITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx index 22055e404b42..2361eaaff295 100644 --- a/include/svl/cjkoptions.hxx +++ b/include/svl/cjkoptions.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 _SVTOOLS_CJKOPTIONS_HXX -#define _SVTOOLS_CJKOPTIONS_HXX +#ifndef INCLUDED_SVL_CJKOPTIONS_HXX +#define INCLUDED_SVL_CJKOPTIONS_HXX #include "svl/svldllapi.h" #include <sal/types.h> @@ -65,6 +65,6 @@ public: sal_Bool IsReadOnly(EOption eOption) const; }; -#endif // _SVTOOLS_CJKOPTIONS_HXX +#endif // INCLUDED_SVL_CJKOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index 581c558b2575..fc1fa721c35a 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.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 _CNTWALL_HXX -#define _CNTWALL_HXX +#ifndef INCLUDED_SVL_CNTWALL_HXX +#define INCLUDED_SVL_CNTWALL_HXX #include "svl/svldllapi.h" @@ -66,6 +66,6 @@ public: //////////////////////////////////////////////////////////////////////////////// -#endif // _CNTWALL_HXX +#endif // INCLUDED_SVL_CNTWALL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/converter.hxx b/include/svl/converter.hxx index 8f423f786307..495e034fc193 100644 --- a/include/svl/converter.hxx +++ b/include/svl/converter.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 _SV_CONVERTER_HXX_ -#define _SV_CONVERTER_HXX_ +#ifndef INCLUDED_SVL_CONVERTER_HXX +#define INCLUDED_SVL_CONVERTER_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx index 525e8e73a795..a379ddb33173 100644 --- a/include/svl/ctloptions.hxx +++ b/include/svl/ctloptions.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 _SVTOOLS_CTLOPTIONS_HXX -#define _SVTOOLS_CTLOPTIONS_HXX +#ifndef INCLUDED_SVL_CTLOPTIONS_HXX +#define INCLUDED_SVL_CTLOPTIONS_HXX #include "svl/svldllapi.h" #include <sal/types.h> @@ -82,6 +82,6 @@ public: bool IsReadOnly(EOption eOption) const; }; -#endif // _SVTOOLS_CTLOPTIONS_HXX +#endif // INCLUDED_SVL_CTLOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 1a783bca78d8..a4bf8ccd66f9 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.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 _SVTOOLS_CTYPEITM_HXX -#define _SVTOOLS_CTYPEITM_HXX +#ifndef INCLUDED_SVL_CTYPEITM_HXX +#define INCLUDED_SVL_CTYPEITM_HXX #include <svl/inettype.hxx> #include <svl/custritm.hxx> @@ -68,6 +68,6 @@ public: void SetValue( const INetContentType eType ); }; -#endif /* !_SVTOOLS_CTYPEITM_HXX */ +#endif /* ! INCLUDED_SVL_CTYPEITM_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 70948d8fbf43..760296797f21 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_CUSTRITM_HXX -#define _SVTOOLS_CUSTRITM_HXX +#ifndef INCLUDED_SVL_CUSTRITM_HXX +#define INCLUDED_SVL_CUSTRITM_HXX #include "svl/svldllapi.h" #include <tools/debug.hxx> @@ -80,6 +80,6 @@ inline void CntUnencodedStringItem::SetValue(const OUString & rTheValue) m_aValue = rTheValue; } -#endif // _SVTOOLS_CUSTRITM_HXX +#endif // INCLUDED_SVL_CUSTRITM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/dateitem.hxx b/include/svl/dateitem.hxx index 043502966ffc..1a3a7c28ba0b 100644 --- a/include/svl/dateitem.hxx +++ b/include/svl/dateitem.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 _DATETIMEITEM_HXX -#define _DATETIMEITEM_HXX +#ifndef INCLUDED_SVL_DATEITEM_HXX +#define INCLUDED_SVL_DATEITEM_HXX #include <tools/rtti.hxx> #include <tools/datetime.hxx> diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index ec741da2f6bc..51d85c696513 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_DOCUMENTLOCKFILE_HXX -#define _SVT_DOCUMENTLOCKFILE_HXX +#ifndef INCLUDED_SVL_DOCUMENTLOCKFILE_HXX +#define INCLUDED_SVL_DOCUMENTLOCKFILE_HXX #include <svl/svldllapi.h> diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 65938e2c21e7..acd7b587cfe2 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFXENUMITEM_HXX -#define SFXENUMITEM_HXX +#ifndef INCLUDED_SVL_EITEM_HXX +#define INCLUDED_SVL_EITEM_HXX #include "svl/svldllapi.h" #include <svl/cenumitm.hxx> @@ -117,6 +117,6 @@ public: }; -#endif // SFXENUMITEM_HXX +#endif // INCLUDED_SVL_EITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx index 00c2c16ed77c..9a1925c9a9a3 100644 --- a/include/svl/filenotation.hxx +++ b/include/svl/filenotation.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_FILENOTATION_HXX -#define SVTOOLS_FILENOTATION_HXX +#ifndef INCLUDED_SVL_FILENOTATION_HXX +#define INCLUDED_SVL_FILENOTATION_HXX #include "svl/svldllapi.h" #include <rtl/ustring.hxx> @@ -59,6 +59,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // SVTOOLS_FILENOTATION_HXX +#endif // INCLUDED_SVL_FILENOTATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 7ace888944ef..bd41bb7ba7dc 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXFILEREC_HXX -#define _SFXFILEREC_HXX +#ifndef INCLUDED_SVL_FILEREC_HXX +#define INCLUDED_SVL_FILEREC_HXX #include "svl/svldllapi.h" #include <tools/debug.hxx> diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 6b0c88ef8f7e..83107421276e 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.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 _SFXFLAGITEM_HXX -#define _SFXFLAGITEM_HXX +#ifndef INCLUDED_SVL_FLAGITEM_HXX +#define INCLUDED_SVL_FLAGITEM_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/fstathelper.hxx b/include/svl/fstathelper.hxx index 9e69c6ed28ec..c3588a965369 100644 --- a/include/svl/fstathelper.hxx +++ b/include/svl/fstathelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_FSTATHELPER_HXX -#define _SVTOOLS_FSTATHELPER_HXX +#ifndef INCLUDED_SVL_FSTATHELPER_HXX +#define INCLUDED_SVL_FSTATHELPER_HXX #include "svl/svldllapi.h" #include <rtl/ustring.hxx> diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 618791bebb92..ff08215a73ee 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.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 _GLOBALNAMEITEM_HXX -#define _GLOBALNAMEITEM_HXX +#ifndef INCLUDED_SVL_GLOBALNAMEITEM_HXX +#define INCLUDED_SVL_GLOBALNAMEITEM_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index f32e8e5a51a2..ac2d9987f3bd 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.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 _SFXGRABBAGITEM_HXX -#define _SFXGRABBAGITEM_HXX +#ifndef INCLUDED_SVL_GRABBAGITEM_HXX +#define INCLUDED_SVL_GRABBAGITEM_HXX #include <map> diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx index 8f5356ac9a13..e479d18920e6 100644 --- a/include/svl/hint.hxx +++ b/include/svl/hint.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 _SFXHINT_HXX -#define _SFXHINT_HXX +#ifndef INCLUDED_SVL_HINT_HXX +#define INCLUDED_SVL_HINT_HXX #include "svl/svldllapi.h" #include <tools/rtti.hxx> diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index 6c04ff239c74..f79f50d63e05 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXILSTITEM_HXX -#define _SFXILSTITEM_HXX +#ifndef INCLUDED_SVL_ILSTITEM_HXX +#define INCLUDED_SVL_ILSTITEM_HXX #include "svl/svldllapi.h" #include <svl/poolitem.hxx> @@ -51,6 +51,6 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; }; -#endif // _SFXINTITEM_HXX +#endif // INCLUDED_SVL_ILSTITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index 66ae68f97722..f2de34b7e114 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_IMAGEITM_HXX -#define _SVT_IMAGEITM_HXX +#ifndef INCLUDED_SVL_IMAGEITM_HXX +#define INCLUDED_SVL_IMAGEITM_HXX #include "svl/svldllapi.h" #include <svl/intitem.hxx> diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index bdf69260ff21..78fb9936c279 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.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 _INETHIST_HXX -#define _INETHIST_HXX +#ifndef INCLUDED_SVL_INETHIST_HXX +#define INCLUDED_SVL_INETHIST_HXX #include "svl/svldllapi.h" #include <tools/solar.h> @@ -119,6 +119,6 @@ public: *=======================================================================*/ DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject); -#endif /* _INETHIST_HXX */ +#endif // INCLUDED_SVL_INETHIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index f1554764fb35..c7b2ea8eb705 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _INETTYPE_HXX -#define _INETTYPE_HXX +#ifndef INCLUDED_SVL_INETTYPE_HXX +#define INCLUDED_SVL_INETTYPE_HXX #include "svl/svldllapi.h" #include <tools/inetmime.hxx> @@ -283,6 +283,6 @@ public: INetContentTypeParameterList * pParameters = 0); }; -#endif // _INETTYPE_HXX +#endif // INCLUDED_SVL_INETTYPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 39c3a8589be9..70da3796c7ca 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INSTRM_HXX -#define SVTOOLS_INSTRM_HXX +#ifndef INCLUDED_SVL_INSTRM_HXX +#define INCLUDED_SVL_INSTRM_HXX #include "svl/svldllapi.h" #include <com/sun/star/uno/Reference.h> @@ -68,6 +68,6 @@ public: virtual void RemoveMark(sal_uLong nPos); }; -#endif // SVTOOLS_INSTRM_HXX +#endif // INCLUDED_SVL_INSTRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index a9cb341aec10..7a17ad63a383 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXINTITEM_HXX -#define _SFXINTITEM_HXX +#ifndef INCLUDED_SVL_INTITEM_HXX +#define INCLUDED_SVL_INTITEM_HXX #include "svl/svldllapi.h" #include <svl/cintitem.hxx> @@ -158,6 +158,6 @@ public: { return new SfxUInt32Item(*this); } }; -#endif // _SFXINTITEM_HXX +#endif // INCLUDED_SVL_INTITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index cd966f5fcc4f..4df3c595ff59 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.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 _SFXISETHINT_HXX -#define _SFXISETHINT_HXX +#ifndef INCLUDED_SVL_ISETHINT_HXX +#define INCLUDED_SVL_ISETHINT_HXX #include "svl/svldllapi.h" diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx index 4dada91a42b7..aad2c594aa80 100644 --- a/include/svl/itemiter.hxx +++ b/include/svl/itemiter.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 _SFXITEMITER_HXX -#define _SFXITEMITER_HXX +#ifndef INCLUDED_SVL_ITEMITER_HXX +#define INCLUDED_SVL_ITEMITER_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 4ce510ad133f..98f8a01f426a 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXITEMPOOL_HXX -#define _SFXITEMPOOL_HXX +#ifndef INCLUDED_SVL_ITEMPOOL_HXX +#define INCLUDED_SVL_ITEMPOOL_HXX #include <limits.h> #include <rtl/string.hxx> diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 46280d7fa34e..006157ecec60 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.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 _SFX_ITEMPROP_HXX -#define _SFX_ITEMPROP_HXX +#ifndef INCLUDED_SVL_ITEMPROP_HXX +#define INCLUDED_SVL_ITEMPROP_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 1a4b121a56a9..b4e4655d5582 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.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 _SFXITEMSET_HXX -#define _SFXITEMSET_HXX +#ifndef INCLUDED_SVL_ITEMSET_HXX +#define INCLUDED_SVL_ITEMSET_HXX #include "svl/svldllapi.h" @@ -186,6 +186,6 @@ public: sal_Bool bInvalidAsDefault = sal_True ); }; -#endif // #ifndef _SFXITEMSET_HXX +#endif // INCLUDED_SVL_ITEMSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index 08a28e504f17..56f499cbfb57 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.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 _SVTOOLS_LANGUAGEOPTIONS_HXX -#define _SVTOOLS_LANGUAGEOPTIONS_HXX +#ifndef INCLUDED_SVL_LANGUAGEOPTIONS_HXX +#define INCLUDED_SVL_LANGUAGEOPTIONS_HXX #include "svl/svldllapi.h" #include <sal/types.h> @@ -113,6 +113,6 @@ public: bool isCJKKeyboardLayoutInstalled() const; }; -#endif // _SVTOOLS_LANGUAGEOPTIONS_HXX +#endif // INCLUDED_SVL_LANGUAGEOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 163c2168c4c0..fb3ab8eab628 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.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 _LCKBITEM_HXX -#define _LCKBITEM_HXX +#ifndef INCLUDED_SVL_LCKBITEM_HXX +#define INCLUDED_SVL_LCKBITEM_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx index eeb275e302aa..67a8f133c085 100644 --- a/include/svl/listener.hxx +++ b/include/svl/listener.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 _SVT_LISTENER_HXX -#define _SVT_LISTENER_HXX +#ifndef INCLUDED_SVL_LISTENER_HXX +#define INCLUDED_SVL_LISTENER_HXX #include "svl/svldllapi.h" #include <tools/rtti.hxx> diff --git a/include/svl/listeneriter.hxx b/include/svl/listeneriter.hxx index 9a621d80e244..9a4cc498cd4d 100644 --- a/include/svl/listeneriter.hxx +++ b/include/svl/listeneriter.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 _SVT_LISTENERITER_HXX -#define _SVT_LISTENERITER_HXX +#ifndef INCLUDED_SVL_LISTENERITER_HXX +#define INCLUDED_SVL_LISTENERITER_HXX #include "svl/svldllapi.h" #include <tools/rtti.hxx> diff --git a/include/svl/lngmisc.hxx b/include/svl/lngmisc.hxx index c1b4a0160277..ca3e10127c1c 100644 --- a/include/svl/lngmisc.hxx +++ b/include/svl/lngmisc.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_LNGMISC_HXX_ -#define _SVTOOLS_LNGMISC_HXX_ +#ifndef INCLUDED_SVL_LNGMISC_HXX +#define INCLUDED_SVL_LNGMISC_HXX #include "svl/svldllapi.h" diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx index b9f62cd78504..7f32d8494911 100644 --- a/include/svl/lockfilecommon.hxx +++ b/include/svl/lockfilecommon.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_LOCKFILECOMMON_HXX -#define _SVT_LOCKFILECOMMON_HXX +#ifndef INCLUDED_SVL_LOCKFILECOMMON_HXX +#define INCLUDED_SVL_LOCKFILECOMMON_HXX #include <svl/svldllapi.h> diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx index e54368abb557..a6906dc4fc9e 100644 --- a/include/svl/lstner.hxx +++ b/include/svl/lstner.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 _SFXLSTNER_HXX -#define _SFXLSTNER_HXX +#ifndef INCLUDED_SVL_LSTNER_HXX +#define INCLUDED_SVL_LSTNER_HXX #include "svl/svldllapi.h" #include <tools/rtti.hxx> diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index c6c218aec46f..774453848994 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.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 _SFXMACITEM_HXX -#define _SFXMACITEM_HXX +#ifndef INCLUDED_SVL_MACITEM_HXX +#define INCLUDED_SVL_MACITEM_HXX // class SvxMacroItem ---------------------------------------------------- diff --git a/include/svl/mailenum.hxx b/include/svl/mailenum.hxx index a01c6bc109ed..70581f7a82b7 100644 --- a/include/svl/mailenum.hxx +++ b/include/svl/mailenum.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 _MAILENUM_HXX -#define _MAILENUM_HXX +#ifndef INCLUDED_SVL_MAILENUM_HXX +#define INCLUDED_SVL_MAILENUM_HXX // enum ------------------------------------------------------------------ diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 090d95450159..81dac6345632 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.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 _SFXMETRICITEM_HXX -#define _SFXMETRICITEM_HXX +#ifndef INCLUDED_SVL_METITEM_HXX +#define INCLUDED_SVL_METITEM_HXX #include "svl/svldllapi.h" #include <svl/intitem.hxx> diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx index 5ed3fbf9838e..4438c7fc0417 100644 --- a/include/svl/nfkeytab.hxx +++ b/include/svl/nfkeytab.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_NFKEYTAB_HXX -#define INCLUDED_SVTOOLS_NFKEYTAB_HXX +#ifndef INCLUDED_SVL_NFKEYTAB_HXX +#define INCLUDED_SVL_NFKEYTAB_HXX #include <vector> #include <rtl/ustring.hxx> @@ -117,6 +117,6 @@ public: const OUString & operator[] (Keywords_t::size_type n) const { return m_keywords[n]; } }; -#endif // INCLUDED_SVTOOLS_NFKEYTAB_HXX +#endif // INCLUDED_SVL_NFKEYTAB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/nfsymbol.hxx b/include/svl/nfsymbol.hxx index 0edfc33e112d..8a659857e088 100644 --- a/include/svl/nfsymbol.hxx +++ b/include/svl/nfsymbol.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_NFSYMBOL_HXX -#define INCLUDED_SVTOOLS_NFSYMBOL_HXX +#ifndef INCLUDED_SVL_NFSYMBOL_HXX +#define INCLUDED_SVL_NFSYMBOL_HXX /* ATTENTION! If new types arrive that had its content previously handled as * SYMBOLTYPE_STRING, they have to be added at several places in zforscan.cxx @@ -58,6 +58,6 @@ enum NfSymbolType } // namespace svt -#endif // INCLUDED_SVTOOLS_NFSYMBOL_HXX +#endif // INCLUDED_SVL_NFSYMBOL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/nfversi.hxx b/include/svl/nfversi.hxx index 3e86af078fe4..c18dda2dcadb 100644 --- a/include/svl/nfversi.hxx +++ b/include/svl/nfversi.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef NF_NFVERSI_HXX -#define NF_NFVERSI_HXX +#ifndef INCLUDED_SVL_NFVERSI_HXX +#define INCLUDED_SVL_NFVERSI_HXX // file IDs diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx index 993b35e28ea8..ec4a5503de83 100644 --- a/include/svl/nranges.hxx +++ b/include/svl/nranges.hxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #ifdef MACOSX -// We need an empty block in here. Otherwise, if the #ifndef _SFXNRANGES_HXX +// We need an empty block in here. Otherwise, if the #ifndef INCLUDED_SVL_NRANGES_HXX // line is the first line, the Mac OS X version of the gcc preprocessor will // incorrectly optimize the inclusion process and will never include this file // a second time #endif -#ifndef _SFXNRANGES_HXX -#define _SFXNRANGES_HXX +#ifndef INCLUDED_SVL_NRANGES_HXX +#define INCLUDED_SVL_NRANGES_HXX #include <tools/solar.h> diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 515a73fb26a6..7b3db7bfea6b 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.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 _NUMUNO_HXX -#define _NUMUNO_HXX +#ifndef INCLUDED_SVL_NUMUNO_HXX +#define INCLUDED_SVL_NUMUNO_HXX #include "svl/svldllapi.h" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> @@ -86,7 +86,7 @@ public: ::comphelper::SharedMutex& getSharedMutex() const; }; -#endif // #ifndef _NUMUNO_HXX +#endif // INCLUDED_SVL_NUMUNO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx index d61b31f570d2..6b6473c5cad9 100644 --- a/include/svl/ondemand.hxx +++ b/include/svl/ondemand.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_ONDEMAND_HXX -#define INCLUDED_SVTOOLS_ONDEMAND_HXX +#ifndef INCLUDED_SVL_ONDEMAND_HXX +#define INCLUDED_SVL_ONDEMAND_HXX #include <unotools/syslocale.hxx> #include <i18nlangtag/lang.h> @@ -379,6 +379,6 @@ public: NativeNumberWrapper& operator*() { return *get(); } }; -#endif // INCLUDED_SVTOOLS_ONDEMAND_HXX +#endif // INCLUDED_SVL_ONDEMAND_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index 31899599fc90..50f5b0465c63 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_OUTSTRM_HXX -#define SVTOOLS_OUTSTRM_HXX +#ifndef INCLUDED_SVL_OUTSTRM_HXX +#define INCLUDED_SVL_OUTSTRM_HXX #include "svl/svldllapi.h" #include <com/sun/star/uno/Reference.h> @@ -54,6 +54,6 @@ public: virtual sal_uInt16 IsA() const; }; -#endif // SVTOOLS_OUTSTRM_HXX +#endif // INCLUDED_SVL_OUTSTRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx index e4cead159c8b..1c0b368b2a74 100644 --- a/include/svl/ownlist.hxx +++ b/include/svl/ownlist.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _OWNLIST_HXX -#define _OWNLIST_HXX +#ifndef INCLUDED_SVL_OWNLIST_HXX +#define INCLUDED_SVL_OWNLIST_HXX #include "svl/svldllapi.h" #include <com/sun/star/uno/Sequence.hxx> @@ -85,6 +85,6 @@ public: } }; -#endif // _OWNLIST_HXX +#endif // INCLUDED_SVL_OWNLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx index 5f91d3578f9a..04c3de0ec186 100644 --- a/include/svl/pickerhistoryaccess.hxx +++ b/include/svl/pickerhistoryaccess.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_PICKERHISTORYACCESS_HXX -#define SVTOOLS_PICKERHISTORYACCESS_HXX +#ifndef INCLUDED_SVL_PICKERHISTORYACCESS_HXX +#define INCLUDED_SVL_PICKERHISTORYACCESS_HXX #include "svl/svldllapi.h" @@ -40,6 +40,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // SVTOOLS_PICKERHISTORYACCESS_HXX +#endif // INCLUDED_SVL_PICKERHISTORYACCESS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/poolcach.hxx b/include/svl/poolcach.hxx index eaf6ad3deef9..de3251927ea0 100644 --- a/include/svl/poolcach.hxx +++ b/include/svl/poolcach.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 _SFXPOOLCACH_HXX -#define _SFXPOOLCACH_HXX +#ifndef INCLUDED_SVL_POOLCACH_HXX +#define INCLUDED_SVL_POOLCACH_HXX #include "svl/svldllapi.h" #include <tools/solar.h> diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 1a7765c9995e..c22c19dcb437 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.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 _SFXPOOLITEM_HXX -#define _SFXPOOLITEM_HXX +#ifndef INCLUDED_SVL_POOLITEM_HXX +#define INCLUDED_SVL_POOLITEM_HXX #include "svl/svldllapi.h" #include <com/sun/star/uno/Any.hxx> @@ -407,6 +407,6 @@ DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem); // ----------------------------------------------------------------------- -#endif // #ifndef _SFXPOOLITEM_HXX +#endif // INCLUDED_SVL_POOLITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 6906e24baaf7..08d880434690 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.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 _SFXPTITEM_HXX -#define _SFXPTITEM_HXX +#ifndef INCLUDED_SVL_PTITEM_HXX +#define INCLUDED_SVL_PTITEM_HXX #include "svl/svldllapi.h" #include <svl/poolitem.hxx> diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index b9f0f950eb63..dbb021c7d2d9 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.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 _SFXRECTITEM_HXX -#define _SFXRECTITEM_HXX +#ifndef INCLUDED_SVL_RECTITEM_HXX +#define INCLUDED_SVL_RECTITEM_HXX #include "svl/svldllapi.h" #include <tools/debug.hxx> diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 450e958ec179..4b17fd2400df 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXRNGITEM_HXX -#define _SFXRNGITEM_HXX +#ifndef INCLUDED_SVL_RNGITEM_HXX +#define INCLUDED_SVL_RNGITEM_HXX #include "svl/svldllapi.h" #include <svl/poolitem.hxx> diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx index d2c842d98ebb..87520fdddee2 100644 --- a/include/svl/sharecontrolfile.hxx +++ b/include/svl/sharecontrolfile.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_SHARECONTROLFILE_HXX -#define _SVT_SHARECONTROLFILE_HXX +#ifndef INCLUDED_SVL_SHARECONTROLFILE_HXX +#define INCLUDED_SVL_SHARECONTROLFILE_HXX #include <svl/svldllapi.h> diff --git a/include/svl/sharedstring.hxx b/include/svl/sharedstring.hxx index 413717f9da22..a36ae135fa2a 100644 --- a/include/svl/sharedstring.hxx +++ b/include/svl/sharedstring.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SVL_SHAREDSTRING_HXX -#define SVL_SHAREDSTRING_HXX +#ifndef INCLUDED_SVL_SHAREDSTRING_HXX +#define INCLUDED_SVL_SHAREDSTRING_HXX #include "svl/svldllapi.h" #include "rtl/ustring.hxx" diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx index c1b76981f229..1b2796d1d514 100644 --- a/include/svl/sharedstringpool.hxx +++ b/include/svl/sharedstringpool.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SVL_STRINGPOOL_HXX -#define SVL_STRINGPOOL_HXX +#ifndef INCLUDED_SVL_SHAREDSTRINGPOOL_HXX +#define INCLUDED_SVL_SHAREDSTRINGPOOL_HXX #include "svl/sharedstring.hxx" diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index f42686e81f9a..1460430787fa 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.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 _SFXSLSTITM_HXX -#define _SFXSLSTITM_HXX +#ifndef INCLUDED_SVL_SLSTITM_HXX +#define INCLUDED_SVL_SLSTITM_HXX #include <vector> diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx index 5c74a3dc4f6e..0752bd6cd835 100644 --- a/include/svl/smplhint.hxx +++ b/include/svl/smplhint.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 _SFXSMPLHINT_HXX -#define _SFXSMPLHINT_HXX +#ifndef INCLUDED_SVL_SMPLHINT_HXX +#define INCLUDED_SVL_SMPLHINT_HXX #include "svl/svldllapi.h" #include <svl/hint.hxx> diff --git a/include/svl/srchdefs.hxx b/include/svl/srchdefs.hxx index f339ebff9273..39017f6dfb6a 100644 --- a/include/svl/srchdefs.hxx +++ b/include/svl/srchdefs.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_SRCHDEFS_HXX_ -#define _SFX_SRCHDEFS_HXX_ +#ifndef INCLUDED_SVL_SRCHDEFS_HXX +#define INCLUDED_SVL_SRCHDEFS_HXX #define SEARCH_OPTIONS_SEARCH ((sal_uInt16)0x0001) diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 3fb8949e2f23..cbe5608692fe 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.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 _SFX_SRCHITEM_HXX -#define _SFX_SRCHITEM_HXX +#ifndef INCLUDED_SVL_SRCHITEM_HXX +#define INCLUDED_SVL_SRCHITEM_HXX #include "sal/config.h" #include "svl/svldllapi.h" diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index a4109218c79e..feccd5f36b28 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXSTRITEM_HXX -#define _SFXSTRITEM_HXX +#ifndef INCLUDED_SVL_STRITEM_HXX +#define INCLUDED_SVL_STRITEM_HXX #include "svl/svldllapi.h" #include <svl/custritm.hxx> @@ -43,6 +43,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; }; -#endif // _SFXSTRITEM_HXX +#endif // INCLUDED_SVL_STRITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx index 167d3696d3a2..4645ab2bb128 100644 --- a/include/svl/strmadpt.hxx +++ b/include/svl/strmadpt.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_STRMADPT_HXX -#define SVTOOLS_STRMADPT_HXX +#ifndef INCLUDED_SVL_STRMADPT_HXX +#define INCLUDED_SVL_STRMADPT_HXX #include "svl/svldllapi.h" #include <com/sun/star/io/XInputStream.hpp> @@ -122,6 +122,6 @@ public: com::sun::star::uno::RuntimeException); }; -#endif // SVTOOLS_STRMADPT_HXX +#endif // INCLUDED_SVL_STRMADPT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 9d4b3be2596e..259e3ead1412 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXSTYLE_HXX -#define _SFXSTYLE_HXX +#ifndef INCLUDED_SVL_STYLE_HXX +#define INCLUDED_SVL_STYLE_HXX #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index deaed2591a83..dd330ffbe736 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.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_SVTOOLS_STYLEPOOL_HXX -#define INCLUDED_SVTOOLS_STYLEPOOL_HXX +#ifndef INCLUDED_SVL_STYLEPOOL_HXX +#define INCLUDED_SVL_STYLEPOOL_HXX #include <boost/shared_ptr.hpp> #include <rtl/ustring.hxx> diff --git a/include/svl/stylesheetuser.hxx b/include/svl/stylesheetuser.hxx index 787263ff4a8e..0f0be440b93e 100644 --- a/include/svl/stylesheetuser.hxx +++ b/include/svl/stylesheetuser.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SVL_STYLESHEETUSER_HXX_INCLUDED -#define SVL_STYLESHEETUSER_HXX_INCLUDED +#ifndef INCLUDED_SVL_STYLESHEETUSER_HXX +#define INCLUDED_SVL_STYLESHEETUSER_HXX namespace svl { diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 7f5e7135f11d..60b69d3c2b2c 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVDDE_HXX -#define _SVDDE_HXX +#ifndef INCLUDED_SVL_SVDDE_HXX +#define INCLUDED_SVL_SVDDE_HXX #include "svl/svldllapi.h" #include <sot/exchange.hxx> @@ -411,6 +411,6 @@ inline long DdeTransaction::GetError() { return rDde.GetError(); } -#endif // _SVDDE_HXX +#endif // INCLUDED_SVL_SVDDE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 1a576eced6fd..4f79db3c32ca 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.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 _SFXSZITEM_HXX -#define _SFXSZITEM_HXX +#ifndef INCLUDED_SVL_SZITEM_HXX +#define INCLUDED_SVL_SZITEM_HXX #include <tools/gen.hxx> diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 80820c51ee57..00522c67451c 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.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 _UNDO_HXX -#define _UNDO_HXX +#ifndef INCLUDED_SVL_UNDO_HXX +#define INCLUDED_SVL_UNDO_HXX #include <svl/svldllapi.h> #include <rtl/ustring.hxx> diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx index 321d9cd2ae0b..7dd79d2f3cc1 100644 --- a/include/svl/urihelper.hxx +++ b/include/svl/urihelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_URIHELPER_HXX -#define SVTOOLS_URIHELPER_HXX +#ifndef INCLUDED_SVL_URIHELPER_HXX +#define INCLUDED_SVL_URIHELPER_HXX #include "svl/svldllapi.h" #include "com/sun/star/uno/Reference.hxx" @@ -160,6 +160,6 @@ SVL_DLLPUBLIC OUString removePassword(OUString const & rURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); } -#endif // SVTOOLS_URIHELPER_HXX +#endif // INCLUDED_SVL_URIHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx index 89d02cb70a29..24c0f38d0fc5 100644 --- a/include/svl/urlbmk.hxx +++ b/include/svl/urlbmk.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _URLBMK_HXX -#define _URLBMK_HXX +#ifndef INCLUDED_SVL_URLBMK_HXX +#define INCLUDED_SVL_URLBMK_HXX #include <rtl/ustring.hxx> diff --git a/include/svl/urlfilter.hxx b/include/svl/urlfilter.hxx index d685015a2e36..e8065fa8fae1 100644 --- a/include/svl/urlfilter.hxx +++ b/include/svl/urlfilter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_URL_FILTER_HXX -#define SVTOOLS_URL_FILTER_HXX +#ifndef INCLUDED_SVL_URLFILTER_HXX +#define INCLUDED_SVL_URLFILTER_HXX #include <tools/wldcrd.hxx> #include <functional> @@ -39,6 +39,6 @@ public: static void createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters); }; -#endif // SVTOOLS_URL_FILTER_HXX +#endif // INCLUDED_SVL_URLFILTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index adb72d0578e7..2d082d56e431 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFXVISIBILITYITEM_HXX -#define _SFXVISIBILITYITEM_HXX +#ifndef INCLUDED_SVL_VISITEM_HXX +#define INCLUDED_SVL_VISITEM_HXX #include "svl/svldllapi.h" #include <tools/debug.hxx> @@ -82,6 +82,6 @@ public: void SetValue(sal_Bool bVisible) { m_nValue.bVisible = bVisible; } }; -#endif // _SFXVISIBILITYITEM_HXX +#endif // INCLUDED_SVL_VISITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/whiter.hxx b/include/svl/whiter.hxx index e92383624743..fbf14c734141 100644 --- a/include/svl/whiter.hxx +++ b/include/svl/whiter.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 _SFX_WHITER_HXX -#define _SFX_WHITER_HXX +#ifndef INCLUDED_SVL_WHITER_HXX +#define INCLUDED_SVL_WHITER_HXX #include "svl/svldllapi.h" diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 34521c8df80d..cfe6dad648cd 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.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 _ZFORLIST_HXX -#define _ZFORLIST_HXX +#ifndef INCLUDED_SVL_ZFORLIST_HXX +#define INCLUDED_SVL_ZFORLIST_HXX #include "svl/svldllapi.h" #include <rtl/ustrbuf.hxx> @@ -1019,6 +1019,6 @@ inline sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear, sal_u return nYear; } -#endif // _ZFORLIST_HXX +#endif // INCLUDED_SVL_ZFORLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 7b7eca08e73e..dff3d0e2c1e4 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.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 _ZFORMAT_HXX -#define _ZFORMAT_HXX +#ifndef INCLUDED_SVL_ZFORMAT_HXX +#define INCLUDED_SVL_ZFORMAT_HXX #include "svl/svldllapi.h" #include <i18nlangtag/mslangid.hxx> @@ -696,6 +696,6 @@ private: } }; -#endif // _ZFORMAT_HXX +#endif // INCLUDED_SVL_ZFORMAT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx index 6334cb82aac1..72132edc3abf 100644 --- a/include/svtools/AccessibleBrowseBoxObjType.hxx +++ b/include/svtools/AccessibleBrowseBoxObjType.hxx @@ -18,8 +18,8 @@ */ -#ifndef _SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX -#define _SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX +#ifndef INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX +#define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX // ============================================================================ diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index 167de92636de..76c069b4ef81 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX -#define SVTOOLS_DOCUMENTINFOPREVIEW_HXX +#ifndef INCLUDED_SVTOOLS_DOCUMENTINFOPREVIEW_HXX +#define INCLUDED_SVTOOLS_DOCUMENTINFOPREVIEW_HXX #include "sal/config.h" @@ -68,6 +68,6 @@ private: } -#endif // SVTOOLS_DOCUMENTINFOPREVIEW_HXX +#endif // INCLUDED_SVTOOLS_DOCUMENTINFOPREVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx index 2120ea43b7cd..3b5d7d1db5e9 100644 --- a/include/svtools/DocumentToGraphicRenderer.hxx +++ b/include/svtools/DocumentToGraphicRenderer.hxx @@ -18,8 +18,8 @@ */ -#ifndef _DOCUMENTTOGRAPHICRENDERER_HXX_ -#define _DOCUMENTTOGRAPHICRENDERER_HXX_ +#ifndef INCLUDED_SVTOOLS_DOCUMENTTOGRAPHICRENDERER_HXX +#define INCLUDED_SVTOOLS_DOCUMENTTOGRAPHICRENDERER_HXX #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 9f3784f912be..723cb50cc82e 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _GRAPHICEXPORTOPTIONSDIALOG_HXX_ -#define _GRAPHICEXPORTOPTIONSDIALOG_HXX_ +#ifndef INCLUDED_SVTOOLS_GRAPHICEXPORTOPTIONSDIALOG_HXX +#define INCLUDED_SVTOOLS_GRAPHICEXPORTOPTIONSDIALOG_HXX #include <vcl/fltcall.hxx> #include <vcl/dialog.hxx> diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 87d940e36453..6b9e4b16c9db 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _PLACEEDITDIALOG_HXX -#define _PLACEEDITDIALOG_HXX +#ifndef INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX +#define INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX #include "ServerDetailsControls.hxx" @@ -70,5 +70,5 @@ private: }; -#endif //_PLACEEDITDIALOG_HXX +#endif // INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/QueryFolderName.hxx b/include/svtools/QueryFolderName.hxx index cecfbf414e9c..ad9b7c0835ee 100644 --- a/include/svtools/QueryFolderName.hxx +++ b/include/svtools/QueryFolderName.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 SVT_QUERYFOLDER_HXX -#define SVT_QUERYFOLDER_HXX +#ifndef INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX +#define INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -52,6 +52,6 @@ public: }; } -#endif // SVT_QUERYFOLDER_HXX +#endif // INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 9447230a8fed..02c2673e331e 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.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 _SERVERDETAILSCONTROLS_HXX -#define _SERVERDETAILSCONTROLS_HXX +#ifndef INCLUDED_SVTOOLS_SERVERDETAILSCONTROLS_HXX +#define INCLUDED_SVTOOLS_SERVERDETAILSCONTROLS_HXX #include <map> diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index d30af055c91d..0b96914a8937 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_ACCESSIBLE_FACTORY_HXX -#define SVTOOLS_ACCESSIBLE_FACTORY_HXX +#ifndef INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX +#define INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX #include "AccessibleBrowseBoxObjType.hxx" #include "accessibletableprovider.hxx" @@ -179,6 +179,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVTOOLS_ACCESSIBLE_FACTORY_HXX +#endif // INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index 7b314df4f4bf..285ab8413f63 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_ACCESSIBLETABLE_HXX -#define _SVTOOLS_ACCESSIBLETABLE_HXX +#ifndef INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX +#define INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX #include <vcl/window.hxx> #include <unotools/accessiblestatesethelper.hxx> @@ -198,6 +198,6 @@ protected: } // namespace table } // namespace svt -#endif // _SVTOOLS_ACCESSIBLETABLE_HXX +#endif // INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index 292cb761bb92..e5a83b4db5bc 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX -#define _SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX +#ifndef INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX +#define INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX #include <vcl/window.hxx> #include <unotools/accessiblestatesethelper.hxx> @@ -236,6 +236,6 @@ protected: } // namespace svt -#endif // _SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX +#endif // INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 61497a18ec07..4fea2ee27529 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_ADDRESSTEMPLATE_HXX_ -#define _SVT_ADDRESSTEMPLATE_HXX_ +#ifndef INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX +#define INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX #include "svtools/svtdllapi.h" #include <vcl/dialog.hxx> @@ -139,6 +139,6 @@ namespace svt } // namespace svt // ....................................................................... -#endif // _SVT_ADDRESSTEMPLATE_HXX_ +#endif // INCLUDED_SVTOOLS_ADDRESSTEMPLATE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index fdfb4ef0f671..94b748750bd3 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.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 _SVT_APEARCFG_HXX -#define _SVT_APEARCFG_HXX +#ifndef INCLUDED_SVTOOLS_APEARCFG_HXX +#define INCLUDED_SVTOOLS_APEARCFG_HXX #include "svtools/svtdllapi.h" #include "tools/solar.h" diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index 9551c1478f6b..89bd9e6e1173 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_ASYNCLINK_HXX -#define SVTOOLS_ASYNCLINK_HXX +#ifndef INCLUDED_SVTOOLS_ASYNCLINK_HXX +#define INCLUDED_SVTOOLS_ASYNCLINK_HXX #include "svtools/svtdllapi.h" #include <tools/solar.h> diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 0fdea457d5f5..036dbfd4050d 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_BINDABLECONTROL_HXX -#define SVTOOLS_INC_BINDABLECONTROL_HXX +#ifndef INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX +#define INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX #include "svtools/svtdllapi.h" @@ -47,6 +47,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVTOOLS_INC_BINDABLECONTROL_HXX +#endif // INCLUDED_SVTOOLS_BINDABLECONTROLHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/borderhelper.hxx b/include/svtools/borderhelper.hxx index 77884bf2620a..26aaac783fd3 100644 --- a/include/svtools/borderhelper.hxx +++ b/include/svtools/borderhelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _BORDERHELPER_HXX -#define _BORDERHELPER_HXX +#ifndef INCLUDED_SVTOOLS_BORDERHELPER_HXX +#define INCLUDED_SVTOOLS_BORDERHELPER_HXX #include "svtools/svtdllapi.h" diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 42c514b35bff..538a7a8aaeca 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.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 _SVX_BRWBOX_HXX -#define _SVX_BRWBOX_HXX +#ifndef INCLUDED_SVTOOLS_BRWBOX_HXX +#define INCLUDED_SVTOOLS_BRWBOX_HXX #include "svtools/svtdllapi.h" #include <vcl/scrbar.hxx> diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 6eaa06a5f62b..fbc8216ef0d1 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _BRWHEAD_HXX -#define _BRWHEAD_HXX +#ifndef INCLUDED_SVTOOLS_BRWHEAD_HXX +#define INCLUDED_SVTOOLS_BRWHEAD_HXX #include "svtools/svtdllapi.h" #include <svtools/headbar.hxx> diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 3c0530029230..9062efbddeef 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CALENDAR_HXX -#define _CALENDAR_HXX +#ifndef INCLUDED_SVTOOLS_CALENDAR_HXX +#define INCLUDED_SVTOOLS_CALENDAR_HXX #include "svtools/svtdllapi.h" #include <unotools/calendarwrapper.hxx> @@ -442,6 +442,6 @@ protected: virtual void StateChanged( StateChangedType nStateChange ); }; -#endif // _CALENDAR_HXX +#endif // INCLUDED_SVTOOLS_CALENDAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 47ff64403dc6..be0b0f2b976e 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CLIPLISTENER_HXX -#define _CLIPLISTENER_HXX +#ifndef INCLUDED_SVTOOLS_CLIPLISTENER_HXX +#define INCLUDED_SVTOOLS_CLIPLISTENER_HXX #include "svtools/svtdllapi.h" #include <tools/link.hxx> diff --git a/include/svtools/collatorres.hxx b/include/svtools/collatorres.hxx index d8abf68ccf82..944d9ec93ce2 100644 --- a/include/svtools/collatorres.hxx +++ b/include/svtools/collatorres.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_COLLATORRESOURCE_HXX -#define SVTOOLS_COLLATORRESOURCE_HXX +#ifndef INCLUDED_SVTOOLS_COLLATORRES_HXX +#define INCLUDED_SVTOOLS_COLLATORRES_HXX #include "svtools/svtdllapi.h" #include <rtl/ustring.hxx> @@ -37,6 +37,6 @@ class SVT_DLLPUBLIC CollatorResource const OUString& GetTranslation (const OUString& r_Algorithm); }; -#endif /* SVTOOLS_COLLATORRESOURCE_HXX */ +#endif // INCLUDED_SVTOOLS_COLLATORRES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index ce155302865b..59034b23ad89 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_COLRDLG_HXX -#define _SV_COLRDLG_HXX +#ifndef INCLUDED_SVTOOLS_COLRDLG_HXX +#define INCLUDED_SVTOOLS_COLRDLG_HXX #include "svtools/svtdllapi.h" @@ -55,6 +55,6 @@ private: sal_Int16 meMode; }; -#endif // _SV_COLRDLG_HXX +#endif // INCLUDED_SVTOOLS_COLRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index afaad3854827..e69563840a16 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_DIALOGCLOSEDLISTENER_HXX -#define _SVTOOLS_DIALOGCLOSEDLISTENER_HXX +#ifndef INCLUDED_SVTOOLS_DIALOGCLOSEDLISTENER_HXX +#define INCLUDED_SVTOOLS_DIALOGCLOSEDLISTENER_HXX #include "svtools/svtdllapi.h" #include <cppuhelper/implbase1.hxx> diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 95153eaa4cdf..269c8f6bdab6 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_DIALOGCONTROLLING_HXX -#define SVTOOLS_DIALOGCONTROLLING_HXX +#ifndef INCLUDED_SVTOOLS_DIALOGCONTROLLING_HXX +#define INCLUDED_SVTOOLS_DIALOGCONTROLLING_HXX #include <svtools/svtdllapi.h> @@ -289,6 +289,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVTOOLS_DIALOGCONTROLLING_HXX +#endif // INCLUDED_SVTOOLS_DIALOGCONTROLLING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index c968477ee15a..fc218da4ab72 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ -#define _SVTOOLS_EDITBROWSEBOX_HXX_ +#ifndef INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX +#define INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX #define SVTOOLS_IN_EDITBROWSEBOX_HXX #include "svtools/svtdllapi.h" @@ -680,6 +680,6 @@ namespace svt // ....................................................................... #undef SVTOOLS_IN_EDITBROWSEBOX_HXX -#endif // _SVTOOLS_EDITBROWSEBOX_HXX_ +#endif // INCLUDED_SVTOOLS_EDITBROWSEBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 6f1adba5ab81..6f1444c93a74 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EDITSYNTAXHIGHLIGHTER_HXX -#define _EDITSYNTAXHIGHLIGHTER_HXX +#ifndef INCLUDED_SVTOOLS_EDITSYNTAXHIGHLIGHTER_HXX +#define INCLUDED_SVTOOLS_EDITSYNTAXHIGHLIGHTER_HXX #include <comphelper/syntaxhighlight.hxx> #include <svtools/svmedit.hxx> diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index ab54d55a0256..216bc20e6ec1 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EHDL_HXX -#define _EHDL_HXX +#ifndef INCLUDED_SVTOOLS_EHDL_HXX +#define INCLUDED_SVTOOLS_EHDL_HXX #ifndef __RSC diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index ba948376af9b..3e0ef24ea694 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_EMBEDHLP_HXX -#define _SVTOOLS_EMBEDHLP_HXX +#ifndef INCLUDED_SVTOOLS_EMBEDHLP_HXX +#define INCLUDED_SVTOOLS_EMBEDHLP_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/uno/Reference.hxx> diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index 9da80b87f37a..ab28125baf8a 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EMBEDTRANSFER_HXX -#define _EMBEDTRANSFER_HXX +#ifndef INCLUDED_SVTOOLS_EMBEDTRANSFER_HXX +#define INCLUDED_SVTOOLS_EMBEDTRANSFER_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index 62f5c383579a..a0421ce2cb7e 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_EXTENSIONLISTBOX_HXX -#define _SVTOOLS_EXTENSIONLISTBOX_HXX +#ifndef INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX +#define INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX #include <vcl/ctrl.hxx> #include <rtl/ustring.hxx> @@ -93,6 +93,6 @@ public: // ============================================================================ -#endif // _SVTOOLS_EXTENSIONLISTBOX_HXX +#endif // INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index 08473d44a3e9..2d537a6237b9 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SVTOOLS_INCLUDED_FILECHANGEDCHECKER_HXX -#define SVTOOLS_INCLUDED_FILECHANGEDCHECKER_HXX +#ifndef INCLUDED_SVTOOLS_FILECHANGEDCHECKER_HXX +#define INCLUDED_SVTOOLS_FILECHANGEDCHECKER_HXX #include "svtools/svtdllapi.h" #include <boost/function.hpp> diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 838bcf807753..06bbcff4c4d2 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_FILECTRL_HXX -#define _SV_FILECTRL_HXX +#ifndef INCLUDED_SVTOOLS_FILECTRL_HXX +#define INCLUDED_SVTOOLS_FILECTRL_HXX #include "svtools/svtdllapi.h" #include <vcl/window.hxx> diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 4dcb037c8ef2..ff18f3eaa740 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_FILEURLBOX_HXX -#define SVTOOLS_FILEURLBOX_HXX +#ifndef INCLUDED_SVTOOLS_FILEURLBOX_HXX +#define INCLUDED_SVTOOLS_FILEURLBOX_HXX #include "svtools/svtdllapi.h" #include <svtools/inettbc.hxx> @@ -63,6 +63,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // SVTOOLS_FILEURLBOX_HXX +#endif // INCLUDED_SVTOOLS_FILEURLBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 57f027cdef1d..141b4567a4cb 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.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 _SVT_FILEVIEW_HXX -#define _SVT_FILEVIEW_HXX +#ifndef INCLUDED_SVTOOLS_FILEVIEW_HXX +#define INCLUDED_SVTOOLS_FILEVIEW_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/uno/Sequence.h> @@ -250,6 +250,6 @@ public: } -#endif // _SVT_FILEVIEW_HXX +#endif // INCLUDED_SVTOOLS_FILEVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 927d3a5e75a7..90ccf3317427 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FMTFIELD_HXX_ -#define _FMTFIELD_HXX_ +#ifndef INCLUDED_SVTOOLS_FMTFIELD_HXX +#define INCLUDED_SVTOOLS_FMTFIELD_HXX #include "svtools/svtdllapi.h" #include <vcl/spinfld.hxx> @@ -315,6 +315,6 @@ protected: void UpdateCurrencyFormat(); }; -#endif // _FMTFIELD_HXX_ +#endif // INCLUDED_SVTOOLS_FMTFIELD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 5221e29aa585..bae442cc5c2c 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.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 _SVT_FONTSUBSTCONFIG_HXX -#define _SVT_FONTSUBSTCONFIG_HXX +#ifndef INCLUDED_SVTOOLS_FONTSUBSTCONFIG_HXX +#define INCLUDED_SVTOOLS_FONTSUBSTCONFIG_HXX #include "svtools/svtdllapi.h" #include <unotools/configitem.hxx> diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index 7543788f5afc..d277df57a9a6 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_FRAMESTATUSLISTENER_HXX -#define _SVTOOLS_FRAMESTATUSLISTENER_HXX +#ifndef INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX +#define INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/uno/XComponentContext.hpp> @@ -96,6 +96,6 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu } -#endif // _SVTOOLS_FRAMESTATUSLISTENER_HXX +#endif // INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index f01d5428a44f..be9ddab3eb04 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX_ -#define __SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX_ +#ifndef INCLUDED_SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX +#define INCLUDED_SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX #include "svtools/svtdllapi.h" #include <svtools/toolboxcontroller.hxx> @@ -56,6 +56,6 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController } -#endif // __SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX_ +#endif // INCLUDED_SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index f1e26e34f58c..3c4c63705d78 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_GENERICUNODIALOG_HXX_ -#define _SVT_GENERICUNODIALOG_HXX_ +#ifndef INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX +#define INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX #include "svtools/svtdllapi.h" @@ -180,6 +180,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // _SVT_GENERICUNODIALOG_HXX_ +#endif // INCLUDED_SVTOOLS_GENERICUNODIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 23918952dbf5..a6751622cafd 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _GRFMGR_HXX -#define _GRFMGR_HXX +#ifndef INCLUDED_SVTOOLS_GRFMGR_HXX +#define INCLUDED_SVTOOLS_GRFMGR_HXX #include <vcl/graph.hxx> #include <svtools/svtdllapi.h> @@ -630,6 +630,6 @@ public: ); }; -#endif // _GRFMGR_HXX +#endif // INCLUDED_SVTOOLS_GRFMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 1ff3d91d98ea..efce2e35ff2b 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _HEADBAR_HXX -#define _HEADBAR_HXX +#ifndef INCLUDED_SVTOOLS_HEADBAR_HXX +#define INCLUDED_SVTOOLS_HEADBAR_HXX #include "svtools/svtdllapi.h" #include <tools/link.hxx> @@ -370,6 +370,6 @@ public: void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); }; -#endif // _HEADBAR_HXX +#endif // INCLUDED_SVTOOLS_HEADBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 62640e2bffe6..42ac7c2b0e64 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.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 _SVX_HTMLCFG_HXX -#define _SVX_HTMLCFG_HXX +#ifndef INCLUDED_SVTOOLS_HTMLCFG_HXX +#define INCLUDED_SVTOOLS_HTMLCFG_HXX // ----------------------------------------------------------------------- diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx index b6ce25a0e9b3..04b40c942855 100644 --- a/include/svtools/htmlkywd.hxx +++ b/include/svtools/htmlkywd.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _HTMLKYWD_HXX -#define _HTMLKYWD_HXX +#ifndef INCLUDED_SVTOOLS_HTMLKYWD_HXX +#define INCLUDED_SVTOOLS_HTMLKYWD_HXX #include "sal/config.h" diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index cdb1c935f8be..5e23883ea5e9 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _HTMLOUT_HXX -#define _HTMLOUT_HXX +#ifndef INCLUDED_SVTOOLS_HTMLOUT_HXX +#define INCLUDED_SVTOOLS_HTMLOUT_HXX #include "svtools/svtdllapi.h" #include <tools/solar.h> diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h index a7c1aaffa54b..8f91be906a8a 100644 --- a/include/svtools/htmltokn.h +++ b/include/svtools/htmltokn.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _HTMLTOKN_H -#define _HTMLTOKN_H +#ifndef INCLUDED_SVTOOLS_HTMLTOKN_H +#define INCLUDED_SVTOOLS_HTMLTOKN_H #include "svtools/svtdllapi.h" #include <sal/types.h> @@ -459,6 +459,6 @@ HTML_O_UNKNOWN = HTML_OPTION_CONTEXT_END, HTML_OPTION_END }; -#endif // _HTMLTOKN_H +#endif // INCLUDED_SVTOOLS_HTMLTOKN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 745c50798f1d..bc60e4a005b1 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.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 SVTOOLS_HYPERLABEL_HXX -#define SVTOOLS_HYPERLABEL_HXX +#ifndef INCLUDED_SVTOOLS_HYPERLABEL_HXX +#define INCLUDED_SVTOOLS_HYPERLABEL_HXX #include <vcl/event.hxx> diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index a46fbae58153..b007c524cc06 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_IMAGEMGR_HXX -#define _SVTOOLS_IMAGEMGR_HXX +#ifndef INCLUDED_SVTOOLS_IMAGEMGR_HXX +#define INCLUDED_SVTOOLS_IMAGEMGR_HXX #include "svtools/svtdllapi.h" #include "sal/types.h" diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index 43873020ab00..a291f96bd7d3 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_IMAGERESOURCEACCESS_HXX -#define SVTOOLS_INC_IMAGERESOURCEACCESS_HXX +#ifndef INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX +#define INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX #include "svtools/svtdllapi.h" @@ -76,6 +76,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX +#endif // DBA14_ INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index f5fba8483271..bae1106dca0a 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _IMAP_HXX -#define _IMAP_HXX +#ifndef INCLUDED_SVTOOLS_IMAP_HXX +#define INCLUDED_SVTOOLS_IMAP_HXX #include "svtools/svtdllapi.h" #include <tools/stream.hxx> @@ -145,6 +145,6 @@ public: ~IMapCompat(); }; -#endif // _IMAP_HXX +#endif // INCLUDED_SVTOOLS_IMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index 9ba93d4f5dfa..77bc095dcbf2 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.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 _GOODIES_IMAPCIRC_HXX -#define _GOODIES_IMAPCIRC_HXX +#ifndef INCLUDED_SVTOOLS_IMAPCIRC_HXX +#define INCLUDED_SVTOOLS_IMAPCIRC_HXX #include "svtools/svtdllapi.h" #include <tools/gen.hxx> diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index f77aec7fe29e..4de9709ce580 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _GOODIES_IMAPOBJ_HXX -#define _GOODIES_IMAPOBJ_HXX +#ifndef INCLUDED_SVTOOLS_IMAPOBJ_HXX +#define INCLUDED_SVTOOLS_IMAPOBJ_HXX #include "svtools/svtdllapi.h" #include <svl/macitem.hxx> diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index 172c163b6e64..4ae49dc99a48 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _GOODIES_IMAPPOLY_HXX -#define _GOODIES_IMAPPOLY_HXX +#ifndef INCLUDED_SVTOOLS_IMAPPOLY_HXX +#define INCLUDED_SVTOOLS_IMAPPOLY_HXX #include "svtools/svtdllapi.h" #include <svtools/imapobj.hxx> diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index d2a257c758e2..f113d047fe16 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.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 _GOODIES_IMAPRECT_HXX -#define _GOODIES_IMAPRECT_HXX +#ifndef INCLUDED_SVTOOLS_IMAPRECT_HXX +#define INCLUDED_SVTOOLS_IMAPRECT_HXX #include "svtools/svtdllapi.h" #include <svtools/imapobj.hxx> diff --git a/include/svtools/imgdef.hxx b/include/svtools/imgdef.hxx index e243d9fd4231..85ab2d2d0104 100644 --- a/include/svtools/imgdef.hxx +++ b/include/svtools/imgdef.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_IMGDEF_HXX -#define _SVTOOLS_IMGDEF_HXX +#ifndef INCLUDED_SVTOOLS_IMGDEF_HXX +#define INCLUDED_SVTOOLS_IMGDEF_HXX enum SfxSymbolsSize { @@ -31,6 +31,6 @@ enum SfxSymbolsSize #define SFX_TOOLBOX_CHANGEOUTSTYLE 0x0002 #define SFX_TOOLBOX_CHANGEBUTTONTYPE 0x0004 -#endif // _SVTOOLS_IMGDEF_HXX +#endif // INCLUDED_SVTOOLS_IMGDEF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/indexentryres.hxx b/include/svtools/indexentryres.hxx index 9e2a54a8ef0b..e2b07e53c626 100644 --- a/include/svtools/indexentryres.hxx +++ b/include/svtools/indexentryres.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INDEXENTRYRESOURCE_HXX -#define SVTOOLS_INDEXENTRYRESOURCE_HXX +#ifndef INCLUDED_SVTOOLS_INDEXENTRYRES_HXX +#define INCLUDED_SVTOOLS_INDEXENTRYRES_HXX #include "svtools/svtdllapi.h" #include <rtl/ustring.hxx> @@ -36,7 +36,7 @@ class SVT_DLLPUBLIC IndexEntryResource const OUString& GetTranslation (const OUString& r_Algorithm); }; -#endif /* SVTOOLS_INDEXENTRYRESOURCE_HXX */ +#endif // INCLUDED_SVTOOLS_INDEXENTRYRES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index 71d8daafa79a..5c19d429d6a5 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.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 _INETIMG_HXX -#define _INETIMG_HXX +#ifndef INCLUDED_SVTOOLS_INETIMG_HXX +#define INCLUDED_SVTOOLS_INETIMG_HXX #include <tools/gen.hxx> @@ -71,7 +71,7 @@ public: sal_Bool Read( SvStream& rIStm, sal_uLong nFormat ); }; -#endif // #ifndef _INETIMG_HXX +#endif // INCLUDED_SVTOOLS_INETIMG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 3c8fe00e2b0c..1c9c24dd023b 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_INETTBC_HXX -#define _SVTOOLS_INETTBC_HXX +#ifndef INCLUDED_SVTOOLS_INETTBC_HXX +#define INCLUDED_SVTOOLS_INETTBC_HXX #include "rtl/ref.hxx" #include "svtools/svtdllapi.h" diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx index 419bde308e09..a03eaad2dcfe 100644 --- a/include/svtools/insdlg.hxx +++ b/include/svtools/insdlg.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 _SVTOOLS_INSDLG_HXX -#define _SVTOOLS_INSDLG_HXX +#ifndef INCLUDED_SVTOOLS_INSDLG_HXX +#define INCLUDED_SVTOOLS_INSDLG_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/uno/Reference.h> @@ -74,6 +74,6 @@ public: static sal_Bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat); }; -#endif // _SVTOOLS_INSDLG_HXX +#endif // INCLUDED_SVTOOLS_INSDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/itemdel.hxx b/include/svtools/itemdel.hxx index acb2637e04cb..5412cdd4b1c7 100644 --- a/include/svtools/itemdel.hxx +++ b/include/svtools/itemdel.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 _SVTOOLS_ITEMDEL_HXX -#define _SVTOOLS_ITEMDEL_HXX +#ifndef INCLUDED_SVTOOLS_ITEMDEL_HXX +#define INCLUDED_SVTOOLS_ITEMDEL_HXX #include "svtools/svtdllapi.h" diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index d8aecb48ade6..f89245a3d5bd 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _ICNVW_HXX -#define _ICNVW_HXX +#ifndef INCLUDED_SVTOOLS_IVCTRL_HXX +#define INCLUDED_SVTOOLS_IVCTRL_HXX #include "svtools/svtdllapi.h" #include <vcl/ctrl.hxx> @@ -347,6 +347,6 @@ public: ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -#endif // _ICNVW_HXX +#endif // INCLUDED_SVTOOLS_IVCTRL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 2c81cbf43d42..727bc10ec57a 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_JAVACONTEXT_HXX_ -#define _SVTOOLS_JAVACONTEXT_HXX_ +#ifndef INCLUDED_SVTOOLS_JAVACONTEXT_HXX +#define INCLUDED_SVTOOLS_JAVACONTEXT_HXX #include "svtools/svtdllapi.h" #include <osl/mutex.hxx> diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index fed409f41ec5..e081a6de29be 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_JAVAINTERACTION_HXX_ -#define _SVTOOLS_JAVAINTERACTION_HXX_ +#ifndef INCLUDED_SVTOOLS_JAVAINTERACTIONHANDLER_HXX +#define INCLUDED_SVTOOLS_JAVAINTERACTIONHANDLER_HXX #include "svtools/svtdllapi.h" #include <osl/mutex.hxx> diff --git a/include/svtools/langhelp.hxx b/include/svtools/langhelp.hxx index 18c08b15b78a..a3a84df0477f 100644 --- a/include/svtools/langhelp.hxx +++ b/include/svtools/langhelp.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _SVTOOLS_LANGHELP_HXX_ -#define _SVTOOLS_LANGHELP_HXX_ +#ifndef INCLUDED_SVTOOLS_LANGHELP_HXX +#define INCLUDED_SVTOOLS_LANGHELP_HXX #include <svtools/svtdllapi.h> diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 924235413a23..8c3163f6030f 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.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 _SVTOOLS_LANGTAB_HXX_ -#define _SVTOOLS_LANGTAB_HXX_ +#ifndef INCLUDED_SVTOOLS_LANGTAB_HXX +#define INCLUDED_SVTOOLS_LANGTAB_HXX #include <tools/resary.hxx> diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx index 8e80f9462cf2..59d65446be7a 100644 --- a/include/svtools/localresaccess.hxx +++ b/include/svtools/localresaccess.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ -#define _SVTOOLS_LOCALRESACCESS_HXX_ +#ifndef INCLUDED_SVTOOLS_LOCALRESACCESS_HXX +#define INCLUDED_SVTOOLS_LOCALRESACCESS_HXX #include <tools/rc.hxx> #include <tools/rcid.h> @@ -70,6 +70,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // _SVTOOLS_LOCALRESACCESS_HXX_ +#endif // INCLUDED_SVTOOLS_LOCALRESACCESS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 32d87b4e60bb..38fa060204d6 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_DROPTARGETLISTENER_HXX -#define SVTOOLS_DROPTARGETLISTENER_HXX +#ifndef INCLUDED_SVTOOLS_OPENFILEDROPTARGETLISTENER_HXX +#define INCLUDED_SVTOOLS_OPENFILEDROPTARGETLISTENER_HXX #include <svtools/svtdllapi.h> @@ -66,6 +66,6 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< void implts_OpenFile( const OUString& rFilePath ); }; -#endif // SVTOOLS_DROPTARGETLISTENER_HXX +#endif // INCLUDED_SVTOOLS_OPENFILEDROPTARGETLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 19eca16b6a66..87abdeb4dd44 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PARHTML_HXX -#define _PARHTML_HXX +#ifndef INCLUDED_SVTOOLS_PARHTML_HXX +#define INCLUDED_SVTOOLS_PARHTML_HXX #include "svtools/svtdllapi.h" #include <tools/solar.h> diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 73e1bdd42c6a..97887a2b24bb 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PARRTF_HXX -#define _PARRTF_HXX +#ifndef INCLUDED_SVTOOLS_PARRTF_HXX +#define INCLUDED_SVTOOLS_PARRTF_HXX #include "svtools/svtdllapi.h" #include <svtools/svparser.hxx> @@ -80,6 +80,6 @@ public: virtual void Continue( int nToken ); }; -#endif //_PARRTF_HXX +#endif // INCLUDED_SVTOOLS_PARRTF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx index f6ca8cd7f7b0..406d75c6c2e6 100644 --- a/include/svtools/place.hxx +++ b/include/svtools/place.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SVTOOLS_PLACE_HXX__ -#define __SVTOOLS_PLACE_HXX__ +#ifndef INCLUDED_SVTOOLS_PLACE_HXX +#define INCLUDED_SVTOOLS_PLACE_HXX #include <tools/urlobj.hxx> @@ -37,6 +37,6 @@ public: bool IsEditable( ) { return mbEditable; } }; -#endif // __SVTOOLS_PLACE_HXX__ +#endif // INCLUDED_SVTOOLS_PLACE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index e3f7020001c5..27e8fe1efcfd 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SVTOOLS_POPUPMENUCONTROLLERBASE_HXX_ -#define __SVTOOLS_POPUPMENUCONTROLLERBASE_HXX_ +#ifndef INCLUDED_SVTOOLS_POPUPMENUCONTROLLERBASE_HXX +#define INCLUDED_SVTOOLS_POPUPMENUCONTROLLERBASE_HXX #include "svtools/svtdllapi.h" @@ -126,6 +126,6 @@ namespace svt }; } -#endif // __SVTOOLS_POPUPMENUCONTROLLERBASE_HXX_ +#endif // INCLUDED_SVTOOLS_POPUPMENUCONTROLLERBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index ec2719cebd5c..e4d3a40a2148 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SVTOOLS_POPUPWINDOWCONTROLLER_HXX_ -#define __SVTOOLS_POPUPWINDOWCONTROLLER_HXX_ +#ifndef INCLUDED_SVTOOLS_POPUPWINDOWCONTROLLER_HXX +#define INCLUDED_SVTOOLS_POPUPWINDOWCONTROLLER_HXX #include "svtools/svtdllapi.h" @@ -74,6 +74,6 @@ private: } // namespace svt -#endif // __SVTOOLS_POPUPWINDOWCONTROLLER_HXX_ +#endif // INCLUDED_SVTOOLS_POPUPWINDOWCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index d9150cb395d7..252610c2cc57 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_PRNSETUP_HXX_ -#define _SV_PRNSETUP_HXX_ +#ifndef INCLUDED_SVTOOLS_PRNSETUP_HXX +#define INCLUDED_SVTOOLS_PRNSETUP_HXX #include "svtools/svtdllapi.h" @@ -88,6 +88,6 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ); void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ); OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ); -#endif // _SV_PRNSETUP_HXX_ +#endif // INCLUDED_SVTOOLS_PRNSETUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx index d36a1a3165bb..4ecaea464120 100644 --- a/include/svtools/roadmap.hxx +++ b/include/svtools/roadmap.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 _SVTOOLS_ROADMAP_HXX -#define _SVTOOLS_ROADMAP_HXX +#ifndef INCLUDED_SVTOOLS_ROADMAP_HXX +#define INCLUDED_SVTOOLS_ROADMAP_HXX #include "svtools/svtdllapi.h" #include <vcl/ctrl.hxx> diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index d93cb742b949..c8ab9c3a1061 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX -#define SVTOOLS_INC_ROADMAPWIZARD_HXX +#ifndef INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX +#define INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX #include "svtools/svtdllapi.h" #include <svtools/wizardmachine.hxx> @@ -241,6 +241,6 @@ protected: } // namespace svt //........................................................................ -#endif // OOO_SVTOOLS_INC_ROADMAPWIZARD_HXX +#endif // OOO_ INCLUDED_SVTOOLS_ROADMAPWIZARD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx index 437329af7ecf..278f8c1dd060 100644 --- a/include/svtools/rtfkeywd.hxx +++ b/include/svtools/rtfkeywd.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTFKEYWD_HXX -#define _RTFKEYWD_HXX +#ifndef INCLUDED_SVTOOLS_RTFKEYWD_HXX +#define INCLUDED_SVTOOLS_RTFKEYWD_HXX #include "sal/config.h" @@ -1205,6 +1205,6 @@ #define LO_STRING_SVTOOLS_RTF_LEVELPICTURE "\\levelpicture" #define LO_STRING_SVTOOLS_RTF_BRDRSH "\\brdrsh" -#endif // _RTFKEYWD_HXX +#endif // INCLUDED_SVTOOLS_RTFKEYWD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx index 6055e5cb6647..d0fa6acbfd53 100644 --- a/include/svtools/rtfout.hxx +++ b/include/svtools/rtfout.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTFOUT_HXX -#define _RTFOUT_HXX +#ifndef INCLUDED_SVTOOLS_RTFOUT_HXX +#define INCLUDED_SVTOOLS_RTFOUT_HXX #include "svtools/svtdllapi.h" #include <tools/solar.h> diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h index e2909357686a..b799526e6d31 100644 --- a/include/svtools/rtftoken.h +++ b/include/svtools/rtftoken.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RTFTOKEN_H -#define _RTFTOKEN_H +#ifndef INCLUDED_SVTOOLS_RTFTOKEN_H +#define INCLUDED_SVTOOLS_RTFTOKEN_H namespace rtl { class OUString; @@ -1262,6 +1262,6 @@ enum RTF_TOKEN_IDS { }; -#endif // _RTFTOKEN_H +#endif // INCLUDED_SVTOOLS_RTFTOKEN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 7e3928640dfe..cb8c6aa24abc 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_SCRIPTEDTEXT_HXX -#define _SVTOOLS_SCRIPTEDTEXT_HXX +#ifndef INCLUDED_SVTOOLS_SCRIPTEDTEXT_HXX +#define INCLUDED_SVTOOLS_SCRIPTEDTEXT_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/i18n/XBreakIterator.hpp> diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx index e5b4026a0ec0..5246f5a6dd23 100644 --- a/include/svtools/sfxecode.hxx +++ b/include/svtools/sfxecode.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 _SFXECODE_HXX -#define _SFXECODE_HXX +#ifndef INCLUDED_SVTOOLS_SFXECODE_HXX +#define INCLUDED_SVTOOLS_SFXECODE_HXX #include <tools/errcode.hxx> @@ -107,7 +107,7 @@ //Addressbook contexts #define ERRCTX_SFX_SEARCHADDRESS 90 -#endif // #ifndef _SFXECODE_HXX +#endif // INCLUDED_SVTOOLS_SFXECODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index e3d94e3e972d..b105fbebdd1d 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SIMPTABL_HXX -#define _SV_SIMPTABL_HXX +#ifndef INCLUDED_SVTOOLS_SIMPTABL_HXX +#define INCLUDED_SVTOOLS_SIMPTABL_HXX #include <svtools/svtdllapi.h> #include <svtools/headbar.hxx> @@ -146,6 +146,6 @@ public: }; -#endif // _SV_SIMPTABL_HXX +#endif // INCLUDED_SVTOOLS_SIMPTABL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index e6d366327744..bba9f6e7f0fa 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.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 _SOERR_HXX -#define _SOERR_HXX +#ifndef INCLUDED_SVTOOLS_SOERR_HXX +#define INCLUDED_SVTOOLS_SOERR_HXX #include <tools/errcode.hxx> diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index c794bc0a922e..e96cabe96b3e 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX -#define _SVTOOLS_STATUSBARCONTROLLER_HXX +#ifndef INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX +#define INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/frame/XFrame.hpp> @@ -132,6 +132,6 @@ class SVT_DLLPUBLIC StatusbarController : } -#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX +#endif // INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx index 77ca119ab363..b0a47d3fa88d 100644 --- a/include/svtools/stdctrl.hxx +++ b/include/svtools/stdctrl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _STDCTRL_HXX -#define _STDCTRL_HXX +#ifndef INCLUDED_SVTOOLS_STDCTRL_HXX +#define INCLUDED_SVTOOLS_STDCTRL_HXX #include "svtools/svtdllapi.h" @@ -36,6 +36,6 @@ public: FixedInfo( Window* pParent, const ResId& rResId ); }; -#endif // _STDCTRL_HXX +#endif // INCLUDED_SVTOOLS_STDCTRL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index c496b34b1361..0762e33bb64f 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_STRINGTRANSFER_HXX_ -#define _SVTOOLS_STRINGTRANSFER_HXX_ +#ifndef INCLUDED_SVTOOLS_STRINGTRANSFER_HXX +#define INCLUDED_SVTOOLS_STRINGTRANSFER_HXX #include "svtools/svtdllapi.h" #include <svtools/transfer.hxx> @@ -71,6 +71,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // _SVTOOLS_STRINGTRANSFER_HXX_ +#endif // INCLUDED_SVTOOLS_STRINGTRANSFER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 78a1da0bb4a6..5e8abedf8a13 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -18,8 +18,8 @@ */ -#ifndef _SVLBOXITM_HXX -#define _SVLBOXITM_HXX +#ifndef INCLUDED_SVTOOLS_SVLBITM_HXX +#define INCLUDED_SVTOOLS_SVLBITM_HXX #include "svtools/svtdllapi.h" diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index c0672a520824..6999db8d5b51 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVEDIT_HXX -#define _SVEDIT_HXX +#ifndef INCLUDED_SVTOOLS_SVMEDIT_HXX +#define INCLUDED_SVTOOLS_SVMEDIT_HXX #include <vcl/svapp.hxx> #include <vcl/vclmedit.hxx> @@ -40,6 +40,6 @@ public: }; -#endif //_SVEDIT_HXX +#endif // INCLUDED_SVTOOLS_SVMEDIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx index 6721dbc4f0af..668a1314efb6 100644 --- a/include/svtools/svmedit2.hxx +++ b/include/svtools/svmedit2.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 _SVTOOLS_SVMEDIT2_HXX -#define _SVTOOLS_SVMEDIT2_HXX +#ifndef INCLUDED_SVTOOLS_SVMEDIT2_HXX +#define INCLUDED_SVTOOLS_SVMEDIT2_HXX #include "svtools/svtdllapi.h" #include <svtools/svmedit.hxx> diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 7d159af51f2c..94c50759da98 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVPARSER_HXX -#define _SVPARSER_HXX +#ifndef INCLUDED_SVTOOLS_SVPARSER_HXX +#define INCLUDED_SVTOOLS_SVPARSER_HXX #include "svtools/svtdllapi.h" #include <tools/link.hxx> @@ -273,6 +273,6 @@ public: SV_IMPL_REF(SvKeyValueIterator); -#endif //_SVPARSER_HXX +#endif // INCLUDED_SVTOOLS_SVPARSER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 0e0ad5f9e1fa..a0fe75db477a 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.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 _SVTABBX_HXX -#define _SVTABBX_HXX +#ifndef INCLUDED_SVTOOLS_SVTABBX_HXX +#define INCLUDED_SVTOOLS_SVTABBX_HXX #include "svtools/svtdllapi.h" #include <svtools/treelistbox.hxx> @@ -249,7 +249,7 @@ public: virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); }; -#endif // #ifndef _SVTABBX_HXX +#endif // INCLUDED_SVTOOLS_SVTABBX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtdllapi.h b/include/svtools/svtdllapi.h index d8c01a464f45..d5607232fdd9 100644 --- a/include/svtools/svtdllapi.h +++ b/include/svtools/svtdllapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTDLLAPI_H -#define INCLUDED_SVTDLLAPI_H +#ifndef INCLUDED_SVTOOLS_SVTDLLAPI_H +#define INCLUDED_SVTOOLS_SVTDLLAPI_H #include "sal/types.h" @@ -29,6 +29,6 @@ #endif #define SVT_DLLPRIVATE SAL_DLLPRIVATE -#endif /* INCLUDED_SVTDLLAPI_H */ +#endif // INCLUDED_SVTOOLS_SVTDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx index 0340a1bd7c5d..7a5cf391a13d 100644 --- a/include/svtools/svtresid.hxx +++ b/include/svtools/svtresid.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_SVTRESID_HXX -#define _SVTOOLS_SVTRESID_HXX +#ifndef INCLUDED_SVTOOLS_SVTRESID_HXX +#define INCLUDED_SVTOOLS_SVTRESID_HXX #include "svtools/svtdllapi.h" #include <tools/resid.hxx> @@ -33,6 +33,6 @@ public: #define SVT_RESSTR(i) SvtResId(i).toString() -#endif // _SVTOOLS_SVTRESID_HXX +#endif // INCLUDED_SVTOOLS_SVTRESID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 44bcc488e39c..aa7a1c941feb 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _TABBAR_HXX -#define _TABBAR_HXX +#ifndef INCLUDED_SVTOOLS_TABBAR_HXX +#define INCLUDED_SVTOOLS_TABBAR_HXX #include "svtools/svtdllapi.h" #include <tools/link.hxx> @@ -558,6 +558,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -#endif // _TABBAR_HXX +#endif // INCLUDED_SVTOOLS_TABBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx index 021b523f1bda..72c6f52f5e04 100644 --- a/include/svtools/table/defaultinputhandler.hxx +++ b/include/svtools/table/defaultinputhandler.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX -#define SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX +#define INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX #include "svtools/table/tableinputhandler.hxx" #include "svtools/table/tabletypes.hxx" @@ -60,6 +60,6 @@ namespace svt { namespace table } } // namespace svt::table //...................................................................................................................... -#endif // SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX +#endif // INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx index 21a096268fe1..dda6b6ff3982 100644 --- a/include/svtools/table/gridtablerenderer.hxx +++ b/include/svtools/table/gridtablerenderer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX -#define SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX +#define INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX #include <svtools/table/tablemodel.hxx> @@ -116,6 +116,6 @@ namespace svt { namespace table } } // namespace svt::table //........................................................................ -#endif // SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX +#endif // INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx index a170a38a4648..0f8ad808b608 100644 --- a/include/svtools/table/tablecontrol.hxx +++ b/include/svtools/table/tablecontrol.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_TABLECONTROL_HXX -#define SVTOOLS_INC_TABLE_TABLECONTROL_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX #include "svtools/svtdllapi.h" #include "svtools/table/tablemodel.hxx" @@ -213,6 +213,6 @@ namespace svt { namespace table } } // namespace svt::table //........................................................................ -#endif // SVTOOLS_INC_TABLE_TABLECONTROL_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablecontrolinterface.hxx b/include/svtools/table/tablecontrolinterface.hxx index a95cc282985c..ba319dbbd6f7 100644 --- a/include/svtools/table/tablecontrolinterface.hxx +++ b/include/svtools/table/tablecontrolinterface.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX -#define SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX #include <sal/types.h> #include <vcl/event.hxx> @@ -252,6 +252,6 @@ namespace svt { namespace table } } // namespace svt::table //...................................................................................................................... -#endif // SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx index 2158d573bb2d..1806dfd6b866 100644 --- a/include/svtools/table/tableinputhandler.hxx +++ b/include/svtools/table/tableinputhandler.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_TABLEINPUTHANDLER_HXX -#define SVTOOLS_INC_TABLE_TABLEINPUTHANDLER_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX #include <boost/shared_ptr.hpp> @@ -68,6 +68,6 @@ namespace svt { namespace table } } // namespace svt::table //........................................................................ -#endif // SVTOOLS_INC_TABLE_TABLEINPUTHANDLER_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx index 5250bf23f8d8..cf9f2b32cee0 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/include/svtools/table/tablemodel.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_TABLEMODEL_HXX -#define SVTOOLS_INC_TABLE_TABLEMODEL_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX #include "svtools/svtdllapi.h" #include "svtools/table/tabletypes.hxx" @@ -534,6 +534,6 @@ namespace svt { namespace table } } // namespace svt::table //........................................................................ -#endif // SVTOOLS_INC_TABLE_TABLEMODEL_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index 05ee87571c4c..5b4428cea979 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_TABLERENDERER_HXX -#define SVTOOLS_INC_TABLE_TABLERENDERER_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX #include <svtools/table/tabletypes.hxx> @@ -280,6 +280,6 @@ namespace svt { namespace table } } // namespace svt::table //........................................................................ -#endif // SVTOOLS_INC_TABLE_TABLERENDERER_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx index 072e088cb3ee..98348da6590e 100644 --- a/include/svtools/table/tablesort.hxx +++ b/include/svtools/table/tablesort.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_TABLESORT_HXX -#define SVTOOLS_TABLESORT_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX #include "svtools/table/tabletypes.hxx" @@ -84,6 +84,6 @@ namespace svt { namespace table } } // namespace svt::table //...................................................................................................................... -#endif // SVTOOLS_TABLESORT_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx index f0333a9a49d7..8e3ba7d9ae82 100644 --- a/include/svtools/table/tabletypes.hxx +++ b/include/svtools/table/tabletypes.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_INC_TABLE_TABLETYPES_HXX -#define SVTOOLS_INC_TABLE_TABLETYPES_HXX +#ifndef INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX +#define INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX #include <sal/types.h> @@ -59,6 +59,6 @@ namespace svt { namespace table } } // namespace svt::table //........................................................................ -#endif // SVTOOLS_INC_TABLE_TABLETYPES_HXX +#endif // INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index 9000c3e8d7db..28eed559b1f3 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SFX2_TEMPLATEFOLDERCACHE_HXX -#define SFX2_TEMPLATEFOLDERCACHE_HXX +#ifndef INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX +#define INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX #include "svtools/svtdllapi.h" #include <sal/types.h> @@ -97,6 +97,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // SFX2_TEMPLATEFOLDERCACHE_HXX +#endif // INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/templdlg.hxx b/include/svtools/templdlg.hxx index d8eeaa884845..2cb00b4cc194 100644 --- a/include/svtools/templdlg.hxx +++ b/include/svtools/templdlg.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 _SVTOOLS_TEMPLDLG_HXX -#define _SVTOOLS_TEMPLDLG_HXX +#ifndef INCLUDED_SVTOOLS_TEMPLDLG_HXX +#define INCLUDED_SVTOOLS_TEMPLDLG_HXX #include "svtools/svtdllapi.h" @@ -76,6 +76,6 @@ private: SVT_DLLPRIVATE sal_Bool CanEnableEditBtn() const; }; -#endif // _SVTOOLS_TEMPLDLG_HXX +#endif // INCLUDED_SVTOOLS_TEMPLDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 2b9a5575c523..31ea34740c64 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_TOOLBARMENU_HXX_ -#define _SVTOOLS_TOOLBARMENU_HXX_ +#ifndef INCLUDED_SVTOOLS_TOOLBARMENU_HXX +#define INCLUDED_SVTOOLS_TOOLBARMENU_HXX #include "svtools/svtdllapi.h" diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 529313053066..baf643b58b81 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_TOOLBOXCONTROLLER_HXX -#define _SVTOOLS_TOOLBOXCONTROLLER_HXX +#ifndef INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX +#define INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/frame/XFrame.hpp> @@ -179,6 +179,6 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL } -#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX +#endif // INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx index 08022018ed38..9b593d434836 100644 --- a/include/svtools/toolpanel/decklayouter.hxx +++ b/include/svtools/toolpanel/decklayouter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_DECKLAYOUTER_HXX -#define SVT_DECKLAYOUTER_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_DECKLAYOUTER_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_DECKLAYOUTER_HXX #include <com/sun/star/uno/Reference.hxx> @@ -94,6 +94,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_DECKLAYOUTER_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_DECKLAYOUTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index 0ee0560a8873..f28ebd5ff89f 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_DRAWERLAYOUTER_HXX -#define SVT_DRAWERLAYOUTER_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_DRAWERLAYOUTER_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_DRAWERLAYOUTER_HXX #include "svtools/svtdllapi.h" #include "svtools/toolpanel/refbase.hxx" @@ -92,6 +92,6 @@ private: } // namespace svt //...................................................................................................................... -#endif // SVT_DRAWERLAYOUTER_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_DRAWERLAYOUTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 0b534f88ed9b..953d71aefb33 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_PANELTABBAR_HXX -#define SVT_PANELTABBAR_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_PANELTABBAR_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_PANELTABBAR_HXX #include "svtools/svtdllapi.h" #include "svtools/toolpanel/tabalignment.hxx" @@ -91,6 +91,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_PANELTABBAR_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_PANELTABBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx index 18f86edbfbab..d96d5cef4c90 100644 --- a/include/svtools/toolpanel/refbase.hxx +++ b/include/svtools/toolpanel/refbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_REFBASE_HXX -#define SVT_REFBASE_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_REFBASE_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_REFBASE_HXX #include "svtools/svtdllapi.h" @@ -70,6 +70,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_REFBASE_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_REFBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/tabalignment.hxx b/include/svtools/toolpanel/tabalignment.hxx index e626d03dc267..6dae547b758b 100644 --- a/include/svtools/toolpanel/tabalignment.hxx +++ b/include/svtools/toolpanel/tabalignment.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_TABALIGNMENT_HXX -#define SVT_TABALIGNMENT_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX //........................................................................ namespace svt @@ -37,6 +37,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_TABALIGNMENT_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_TABALIGNMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/tabitemcontent.hxx b/include/svtools/toolpanel/tabitemcontent.hxx index 07c7eeedc9fd..22e33f7898a8 100644 --- a/include/svtools/toolpanel/tabitemcontent.hxx +++ b/include/svtools/toolpanel/tabitemcontent.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_TABITEMCONTENT_HXX -#define SVT_TABITEMCONTENT_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX //........................................................................ namespace svt @@ -38,6 +38,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_TABITEMCONTENT_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_TABITEMCONTENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index cf76879a4566..4a3fa2e2380d 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_TABLAYOUTER_HXX -#define SVT_TABLAYOUTER_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_TABLAYOUTER_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_TABLAYOUTER_HXX #include "svtools/svtdllapi.h" #include "svtools/toolpanel/decklayouter.hxx" @@ -94,6 +94,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_TABLAYOUTER_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_TABLAYOUTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx index 4c2d0f736ba0..41d24efab847 100644 --- a/include/svtools/toolpanel/toolpanel.hxx +++ b/include/svtools/toolpanel/toolpanel.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_TOOLPANEL_HXX -#define SVT_TOOLPANEL_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANEL_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANEL_HXX #include "svtools/svtdllapi.h" #include "svtools/toolpanel/refbase.hxx" @@ -133,6 +133,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_TOOLPANEL_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index d293aca8d017..5265cf4e702d 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVT_TOOLPANELDECK_HXX -#define SVT_TOOLPANELDECK_HXX +#ifndef INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANELDECK_HXX +#define INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANELDECK_HXX #include "svtools/svtdllapi.h" #include "svtools/toolpanel/toolpanel.hxx" @@ -189,6 +189,6 @@ namespace svt } // namespace svt //........................................................................ -#endif // SVT_TOOLPANELDECK_HXX +#endif // INCLUDED_SVTOOLS_TOOLPANEL_TOOLPANELDECK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 6354a0a416bd..0b0a4d56dfa2 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _TRANSFER_HXX -#define _TRANSFER_HXX +#ifndef INCLUDED_SVTOOLS_TRANSFER_HXX +#define INCLUDED_SVTOOLS_TRANSFER_HXX #include "svtools/svtdllapi.h" #include <tools/globname.hxx> diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 96e50ec3f848..8a5bb07a44d5 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTREELIST_HXX -#define _SVTREELIST_HXX +#ifndef INCLUDED_SVTOOLS_TREELIST_HXX +#define INCLUDED_SVTOOLS_TREELIST_HXX #include "svtools/svtdllapi.h" #include "svtools/treelistentries.hxx" diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 2fb4dcdcb5e4..1c7d8a21eebb 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SVTOOLS_TREELISTBOX_HXX__ -#define __SVTOOLS_TREELISTBOX_HXX__ +#ifndef INCLUDED_SVTOOLS_TREELISTBOX_HXX +#define INCLUDED_SVTOOLS_TREELISTBOX_HXX #include "svtools/svtdllapi.h" diff --git a/include/svtools/treelistentries.hxx b/include/svtools/treelistentries.hxx index d52d09aac107..051be7658c61 100644 --- a/include/svtools/treelistentries.hxx +++ b/include/svtools/treelistentries.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SVTOOLS_TREELISTENTRIES_HXX__ -#define __SVTOOLS_TREELISTENTRIES_HXX__ +#ifndef INCLUDED_SVTOOLS_TREELISTENTRIES_HXX +#define INCLUDED_SVTOOLS_TREELISTENTRIES_HXX #include <boost/ptr_container/ptr_vector.hpp> diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx index dfea2651eb0e..2f7be5ec020e 100644 --- a/include/svtools/treelistentry.hxx +++ b/include/svtools/treelistentry.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SVTOOLS_TREELISTENTRY_HXX__ -#define __SVTOOLS_TREELISTENTRY_HXX__ +#ifndef INCLUDED_SVTOOLS_TREELISTENTRY_HXX +#define INCLUDED_SVTOOLS_TREELISTENTRY_HXX #include "svtdllapi.h" #include "tools/solar.h" diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx index 2798e5dbc93a..5f99d4662bdf 100644 --- a/include/svtools/unitconv.hxx +++ b/include/svtools/unitconv.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 _SVT_UNITCONV_HXX -#define _SVT_UNITCONV_HXX +#ifndef INCLUDED_SVTOOLS_UNITCONV_HXX +#define INCLUDED_SVTOOLS_UNITCONV_HXX #include <vcl/field.hxx> #include "svtools/svtdllapi.h" diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 581df582a64e..812bee6bdb9b 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.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 _SVTOOLS_UNOEVENT_HXX_ -#define _SVTOOLS_UNOEVENT_HXX_ +#ifndef INCLUDED_SVTOOLS_UNOEVENT_HXX +#define INCLUDED_SVTOOLS_UNOEVENT_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/container/XNameReplace.hpp> diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx index 03fd3ea3e84b..236ccb2b2ce9 100644 --- a/include/svtools/unoimap.hxx +++ b/include/svtools/unoimap.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVTOOLS_UNOIMAP_HXX -#define _SVTOOLS_UNOIMAP_HXX +#ifndef INCLUDED_SVTOOLS_UNOIMAP_HXX +#define INCLUDED_SVTOOLS_UNOIMAP_HXX #include "svtools/svtdllapi.h" #include <com/sun/star/uno/XInterface.hpp> diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index f65c8ccd7c1d..457bc28b9201 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVTOOLS_URLCONTROL_HXX -#define SVTOOLS_URLCONTROL_HXX +#ifndef INCLUDED_SVTOOLS_URLCONTROL_HXX +#define INCLUDED_SVTOOLS_URLCONTROL_HXX #include "svtools/svtdllapi.h" #include <svtools/inettbc.hxx> @@ -48,6 +48,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // SVTOOLS_URLCONTROL_HXX +#endif // INCLUDED_SVTOOLS_URLCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/viewdataentry.hxx b/include/svtools/viewdataentry.hxx index 3800b293fd2b..c098bc5b1d0f 100644 --- a/include/svtools/viewdataentry.hxx +++ b/include/svtools/viewdataentry.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SVTOOLS_VIEWDATAENTRY_HXX__ -#define __SVTOOLS_VIEWDATAENTRY_HXX__ +#ifndef INCLUDED_SVTOOLS_VIEWDATAENTRY_HXX +#define INCLUDED_SVTOOLS_VIEWDATAENTRY_HXX #include "svtdllapi.h" #include "tools/solar.h" diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 5275f999f985..65abaf89593a 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.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 _SVTOOLS_WIZARDMACHINE_HXX_ -#define _SVTOOLS_WIZARDMACHINE_HXX_ +#ifndef INCLUDED_SVTOOLS_WIZARDMACHINE_HXX +#define INCLUDED_SVTOOLS_WIZARDMACHINE_HXX #include "svtools/svtdllapi.h" #include <svtools/wizdlg.hxx> @@ -381,6 +381,6 @@ namespace svt } // namespace svt //......................................................................... -#endif // _SVTOOLS_WIZARDMACHINE_HXX_ +#endif // INCLUDED_SVTOOLS_WIZARDMACHINE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 6702c65ffc89..1e311504d0f1 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVT_WIZDLG_HXX -#define _SVT_WIZDLG_HXX +#ifndef INCLUDED_SVTOOLS_WIZDLG_HXX +#define INCLUDED_SVTOOLS_WIZDLG_HXX #include "svtools/svtdllapi.h" @@ -300,6 +300,6 @@ public: const Link& GetDeactivatePageHdl() const { return maDeactivateHdl; } }; -#endif // _SVT_WIZDLG_HXX +#endif // INCLUDED_SVTOOLS_WIZDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index fd7a8cd40ff9..bd9ee707fd56 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.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 _XWINDOWITEM_HXX_ -#define _XWINDOWITEM_HXX_ +#ifndef INCLUDED_SVTOOLS_XWINDOWITEM_HXX +#define INCLUDED_SVTOOLS_XWINDOWITEM_HXX #include "svtools/svtdllapi.h" diff --git a/include/systools/win32/qswin32.h b/include/systools/win32/qswin32.h index ed268d26affd..f32b69e6df42 100644 --- a/include/systools/win32/qswin32.h +++ b/include/systools/win32/qswin32.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _QSWIN32_H -#define _QSWIN32_H +#ifndef INCLUDED_SYSTOOLS_WIN32_QSWIN32_H +#define INCLUDED_SYSTOOLS_WIN32_QSWIN32_H #define QUICKSTART_CLASSNAMEA "LO Listener Class" #define QUICKSTART_WINDOWNAMEA "LO Listener Window" @@ -38,6 +38,6 @@ # define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA #endif -#endif /* _QSWIN32_H */ +#endif // INCLUDED_SYSTOOLS_WIN32_QSWIN32_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |