summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-23 19:15:52 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-10-23 23:22:29 +0200
commit4e0670b763c19bf369db56d03dc5add669c21ac5 (patch)
treef139219773b6e29d7dccb7df5b21d761d72b9a72 /include
parentdbddac3261b42e8593aa7fae21d1645e57a61cb7 (diff)
fixincludeguards.sh: include/{toolkit,tools}
Change-Id: I5572c320431222be2405f8c2dc8adeafe4f3828b
Diffstat (limited to 'include')
-rw-r--r--include/toolkit/awt/animatedimagespeer.hxx6
-rw-r--r--include/toolkit/awt/scrollabledialog.hxx6
-rw-r--r--include/toolkit/awt/vclxaccessiblecomponent.hxx6
-rw-r--r--include/toolkit/awt/vclxbitmap.hxx6
-rw-r--r--include/toolkit/awt/vclxcontainer.hxx6
-rw-r--r--include/toolkit/awt/vclxdevice.hxx6
-rw-r--r--include/toolkit/awt/vclxfont.hxx6
-rw-r--r--include/toolkit/awt/vclxgraphics.hxx6
-rw-r--r--include/toolkit/awt/vclxmenu.hxx6
-rw-r--r--include/toolkit/awt/vclxpointer.hxx6
-rw-r--r--include/toolkit/awt/vclxprinter.hxx6
-rw-r--r--include/toolkit/awt/vclxregion.hxx6
-rw-r--r--include/toolkit/awt/vclxspinbutton.hxx6
-rw-r--r--include/toolkit/awt/vclxsystemdependentwindow.hxx6
-rw-r--r--include/toolkit/awt/vclxtabpagecontainer.hxx6
-rw-r--r--include/toolkit/awt/vclxtabpagemodel.hxx6
-rw-r--r--include/toolkit/awt/vclxtoolkit.hxx6
-rw-r--r--include/toolkit/awt/vclxtopwindow.hxx6
-rw-r--r--include/toolkit/awt/vclxwindow.hxx6
-rw-r--r--include/toolkit/awt/vclxwindows.hxx6
-rw-r--r--include/toolkit/awt/xsimpleanimation.hxx6
-rw-r--r--include/toolkit/awt/xthrobber.hxx6
-rw-r--r--include/toolkit/controls/accessiblecontrolcontext.hxx6
-rw-r--r--include/toolkit/controls/animatedimages.hxx6
-rw-r--r--include/toolkit/controls/controlmodelcontainerbase.hxx4
-rw-r--r--include/toolkit/controls/dialogcontrol.hxx6
-rw-r--r--include/toolkit/controls/formattedcontrol.hxx6
-rw-r--r--include/toolkit/controls/geometrycontrolmodel.hxx6
-rw-r--r--include/toolkit/controls/roadmapcontrol.hxx6
-rw-r--r--include/toolkit/controls/roadmapentry.hxx4
-rw-r--r--include/toolkit/controls/spinningprogress.hxx6
-rw-r--r--include/toolkit/controls/stdtabcontroller.hxx4
-rw-r--r--include/toolkit/controls/stdtabcontrollermodel.hxx4
-rw-r--r--include/toolkit/controls/tabpagecontainer.hxx6
-rw-r--r--include/toolkit/controls/tabpagemodel.hxx6
-rw-r--r--include/toolkit/controls/tkscrollbar.hxx6
-rw-r--r--include/toolkit/controls/tksimpleanimation.hxx6
-rw-r--r--include/toolkit/controls/tkspinbutton.hxx6
-rw-r--r--include/toolkit/controls/tkthrobber.hxx6
-rw-r--r--include/toolkit/controls/unocontrol.hxx6
-rw-r--r--include/toolkit/controls/unocontrolbase.hxx6
-rw-r--r--include/toolkit/controls/unocontrolcontainer.hxx6
-rw-r--r--include/toolkit/controls/unocontrolcontainermodel.hxx6
-rw-r--r--include/toolkit/controls/unocontrolmodel.hxx6
-rw-r--r--include/toolkit/controls/unocontrols.hxx6
-rw-r--r--include/toolkit/dllapi.h4
-rw-r--r--include/toolkit/helper/accessibilityclient.hxx6
-rw-r--r--include/toolkit/helper/accessiblefactory.hxx6
-rw-r--r--include/toolkit/helper/convert.hxx6
-rw-r--r--include/toolkit/helper/emptyfontdescriptor.hxx6
-rw-r--r--include/toolkit/helper/externallock.hxx6
-rw-r--r--include/toolkit/helper/formpdfexport.hxx6
-rw-r--r--include/toolkit/helper/imagealign.hxx6
-rw-r--r--include/toolkit/helper/listenermultiplexer.hxx6
-rw-r--r--include/toolkit/helper/macros.hxx6
-rw-r--r--include/toolkit/helper/mutexandbroadcasthelper.hxx4
-rw-r--r--include/toolkit/helper/mutexhelper.hxx6
-rw-r--r--include/toolkit/helper/property.hxx6
-rw-r--r--include/toolkit/helper/servicenames.hxx6
-rw-r--r--include/toolkit/helper/tkresmgr.hxx6
-rw-r--r--include/toolkit/helper/unopropertyarrayhelper.hxx6
-rw-r--r--include/toolkit/helper/unowrapper.hxx6
-rw-r--r--include/toolkit/helper/vclunohelper.hxx6
-rw-r--r--include/tools/StringListResource.hxx4
-rw-r--r--include/tools/b3dtrans.hxx4
-rw-r--r--include/tools/bigint.hxx4
-rw-r--r--include/tools/color.hxx4
-rw-r--r--include/tools/contnr.hxx4
-rw-r--r--include/tools/date.hxx4
-rw-r--r--include/tools/datetime.hxx4
-rw-r--r--include/tools/diagnose_ex.h4
-rw-r--r--include/tools/errcode.hxx4
-rw-r--r--include/tools/errinf.hxx4
-rw-r--r--include/tools/fldunit.hxx4
-rw-r--r--include/tools/fontenum.hxx4
-rw-r--r--include/tools/fract.hxx4
-rw-r--r--include/tools/gen.hxx4
-rw-r--r--include/tools/globname.hxx4
-rw-r--r--include/tools/helpers.hxx4
-rw-r--r--include/tools/inetmime.hxx4
-rw-r--r--include/tools/inetmsg.hxx4
-rw-r--r--include/tools/inetstrm.hxx4
-rw-r--r--include/tools/line.hxx4
-rw-r--r--include/tools/lineend.hxx4
-rw-r--r--include/tools/link.hxx4
-rw-r--r--include/tools/mapunit.hxx4
-rw-r--r--include/tools/mempool.hxx4
-rw-r--r--include/tools/multisel.hxx4
-rw-r--r--include/tools/poly.hxx4
-rw-r--r--include/tools/pstm.hxx4
-rw-r--r--include/tools/rc.h4
-rw-r--r--include/tools/rc.hxx4
-rw-r--r--include/tools/rcid.h4
-rw-r--r--include/tools/ref.hxx4
-rw-r--r--include/tools/resary.hxx4
-rw-r--r--include/tools/resid.hxx4
-rw-r--r--include/tools/resmgr.hxx4
-rw-r--r--include/tools/rtti.hxx4
-rw-r--r--include/tools/shl.hxx4
-rw-r--r--include/tools/simplerm.hxx4
-rw-r--r--include/tools/solarmutex.hxx4
-rw-r--r--include/tools/stream.hxx4
-rw-r--r--include/tools/svborder.hxx4
-rw-r--r--include/tools/tenccvt.hxx4
-rw-r--r--include/tools/time.hxx4
-rw-r--r--include/tools/tools.h4
-rw-r--r--include/tools/toolsdllapi.h4
-rw-r--r--include/tools/unqidx.hxx4
-rw-r--r--include/tools/urlobj.hxx4
-rw-r--r--include/tools/vcompat.hxx4
-rw-r--r--include/tools/vector2d.hxx4
-rw-r--r--include/tools/weakbase.h4
-rw-r--r--include/tools/weakbase.hxx4
-rw-r--r--include/tools/wintypes.hxx4
-rw-r--r--include/tools/wldcrd.hxx4
-rw-r--r--include/tools/zcodec.hxx4
116 files changed, 289 insertions, 289 deletions
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index 9e22d41a948b..9ba8608e3e61 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_ANIMATEDIMAGEPEER_HXX
-#define TOOLKIT_ANIMATEDIMAGEPEER_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
+#define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
#include "toolkit/awt/vclxwindow.hxx"
@@ -94,6 +94,6 @@ namespace toolkit
} // namespace toolkit
//......................................................................................................................
-#endif // TOOLKIT_ANIMATEDIMAGEPEER_HXX
+#endif // INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 29651938806f..b340efd49e1e 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
-#define TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
+#define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
#include <vcl/dialog.hxx>
#include <vcl/scrbar.hxx>
@@ -78,6 +78,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
+#endif // INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 379dbb5b7c8a..e1b7ff0198b4 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
-#define _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -150,6 +150,6 @@ private:
---------------------------------------------------------- */
-#endif // _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx
index bec83977b21b..6509e75ac512 100644
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXBITMAP_HXX_
-#define _TOOLKIT_AWT_VCLXBITMAP_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/awt/XDisplayBitmap.hpp>
@@ -75,6 +75,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXBITMAP_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 0b4b0be97127..3f72f81cd1a8 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXCONTAINER_HXX_
-#define _TOOLKIT_AWT_VCLXCONTAINER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX
#include <com/sun/star/awt/XVclContainer.hpp>
@@ -71,6 +71,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXCONTAINER_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 5e3167ca42f1..7945c6777ccd 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXDEVICE_HXX_
-#define _TOOLKIT_AWT_VCLXDEVICE_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XDevice.hpp>
@@ -113,6 +113,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXDEVICE_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 71591113857c..679c61f3bc65 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXFONT_HXX_
-#define _TOOLKIT_AWT_VCLXFONT_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XFont2.hpp>
@@ -84,6 +84,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXFONT_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 979ed88f8c44..9a1636fe10e9 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXGRAPHICS_HXX_
-#define _TOOLKIT_AWT_VCLXGRAPHICS_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
#include <com/sun/star/awt/XGraphics2.hpp>
@@ -135,6 +135,6 @@ public:
virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& aGraphic ) throw (::com::sun::star::uno::RuntimeException);
};
-#endif // _TOOLKIT_AWT_VCLXGRAPHICS_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 77b0cfef221b..fa9d012a3245 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXMENU_HXX_
-#define _TOOLKIT_AWT_VCLXMENU_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
#include <toolkit/dllapi.h>
#include <toolkit/helper/listenermultiplexer.hxx>
@@ -157,6 +157,6 @@ public:
VCLXPopupMenu( PopupMenu* pPopMenu );
};
-#endif // _TOOLKIT_AWT_VCLXMENU_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
index a608e430817f..55ea37760f4f 100644
--- a/include/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXPOINTER_HXX_
-#define _TOOLKIT_AWT_VCLXPOINTER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
#include <com/sun/star/awt/XPointer.hpp>
@@ -73,6 +73,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXPOINTER_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 1d7aa05b0a1a..70b01b2b4b30 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXPRINTER_HXX_
-#define _TOOLKIT_AWT_VCLXPRINTER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
#include <com/sun/star/awt/XPrinterPropertySet.hpp>
@@ -185,6 +185,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException);
};
-#endif // _TOOLKIT_AWT_VCLXPRINTER_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
index 806396e0c51b..eeaa93ce20d0 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXREGION_HXX_
-#define _TOOLKIT_AWT_VCLXREGION_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
#include <com/sun/star/awt/XRegion.hpp>
@@ -84,6 +84,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXREGION_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index f1abf21f77f2..59e7a872d465 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.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 TOOLKIT_AWT_VCLXSPINBUTTON_HXX
-#define TOOLKIT_AWT_VCLXSPINBUTTON_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
@@ -88,6 +88,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_INC_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
+#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index ebb4d2408942..a7726df3f560 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX_
-#define _TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
@@ -55,6 +55,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index af55ed3d6ab4..142d728d9c36 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX_
-#define _TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/beans/PropertyValues.hpp>
@@ -76,6 +76,6 @@ private:
TabPageListenerMultiplexer m_aTabPageListeners;
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > > m_aTabPages;
};
-#endif // _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtabpagemodel.hxx b/include/toolkit/awt/vclxtabpagemodel.hxx
index 091c5592a765..f65688f00d41 100644
--- a/include/toolkit/awt/vclxtabpagemodel.hxx
+++ b/include/toolkit/awt/vclxtabpagemodel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
-#define _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/beans/PropertyValues.hpp>
@@ -68,6 +68,6 @@ public:
protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
};
-#endif // _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtoolkit.hxx b/include/toolkit/awt/vclxtoolkit.hxx
index 9393f10a010a..cea90cfea9d6 100644
--- a/include/toolkit/awt/vclxtoolkit.hxx
+++ b/include/toolkit/awt/vclxtoolkit.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
-#define _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTOOLKIT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTOOLKIT_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/XToolkitExperimental.hpp>
@@ -201,6 +201,6 @@ public:
};
-#endif // _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTOOLKIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 95a742572b94..2bd608010077 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_
-#define _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX
#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
#include <com/sun/star/awt/XTopWindow2.hpp>
@@ -109,6 +109,6 @@ public:
-#endif // _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 620fd8c82c6d..21cf84212150 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
-#define _TOOLKIT_AWT_VCLXWINDOW_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
#include <toolkit/dllapi.h>
#include <toolkit/awt/vclxdevice.hxx>
@@ -230,6 +230,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException);
};
-#endif // _TOOLKIT_AWT_VCLXWINDOW_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index f774e64fb3ef..8dc573496abd 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_VCLXWINDOWS_HXX_
-#define _TOOLKIT_AWT_VCLXWINDOWS_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
#include <toolkit/dllapi.h>
@@ -1239,6 +1239,6 @@ public:
~VCLXToolBox();
};
-#endif // _TOOLKIT_AWT_VCLXWINDOWS_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/xsimpleanimation.hxx b/include/toolkit/awt/xsimpleanimation.hxx
index 3ab8499d63fc..786b4fa6e902 100644
--- a/include/toolkit/awt/xsimpleanimation.hxx
+++ b/include/toolkit/awt/xsimpleanimation.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 TOOLKIT_AWT_XSIMPLEANIMATION_HXX
-#define TOOLKIT_AWT_XSIMPLEANIMATION_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
+#define INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
@@ -65,6 +65,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_INC_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
+#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/xthrobber.hxx b/include/toolkit/awt/xthrobber.hxx
index 2c8ad5d0817e..e1b19c7b2b3f 100644
--- a/include/toolkit/awt/xthrobber.hxx
+++ b/include/toolkit/awt/xthrobber.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 TOOLKIT_AWT_XTHROBBER_HXX
-#define TOOLKIT_AWT_XTHROBBER_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
+#define INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
@@ -68,6 +68,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_AWT_XTHROBBER_HXX
+#endif // INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index dedc5bcd842d..e9184e65ef34 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
-#define TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX
#include <comphelper/accessiblecomponenthelper.hxx>
#include <comphelper/accimplaccess.hxx>
@@ -124,6 +124,6 @@ namespace toolkit
} // namespace toolkit
//........................................................................
-#endif // TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index dd0757a3e5a1..d85ca32fc595 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_ANIMATEDIMAGES_HXX
-#define TOOLKIT_ANIMATEDIMAGES_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
#include "toolkit/controls/unocontrolbase.hxx"
#include "toolkit/controls/unocontrolmodel.hxx"
@@ -133,6 +133,6 @@ namespace toolkit
} // namespace toolkit
//......................................................................................................................
-#endif // TOOLKIT_ANIMATEDIMAGES_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index e84ddd1f0380..ce9949a0b7b8 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_CONTROL_MODEL_CONTAINERBASE_HXX
-#define TOOLKIT_CONTROL_MODEL_CONTAINERBASE_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_CONTROLMODELCONTAINERBASE_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_CONTROLMODELCONTAINERBASE_HXX
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XContainer.hpp>
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index cb044cf7068c..fdf2ce08b73b 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_DIALOG_CONTROL_HXX
-#define TOOLKIT_DIALOG_CONTROL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
#include <toolkit/controls/controlmodelcontainerbase.hxx>
#include <com/sun/star/awt/UnoControlDialog.hpp>
@@ -331,6 +331,6 @@ public:
DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, szServiceName_UnoPageControl )
};
-#endif // TOOLKIT_DIALOG_CONTROL_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index ff5c5de51618..94b60aecf137 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_FORMATTED_CONTROL_HXX
-#define TOOLKIT_FORMATTED_CONTROL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX
#include <toolkit/controls/unocontrols.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
@@ -119,6 +119,6 @@ namespace toolkit
} // namespace toolkit
//........................................................................
-#endif // TOOLKIT_FORMATTED_CONTROL_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 03898a1a2e0b..861c98fae82d 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
-#define _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
@@ -257,6 +257,6 @@ namespace com { namespace sun { namespace star {
// } // namespace toolkit
//........................................................................
-#endif // _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index bb7d39a6ea0d..20be6e9a0af7 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_ROADMAP_CONTROL_HXX
-#define TOOLKIT_ROADMAP_CONTROL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX
#include <toolkit/controls/unocontrols.hxx>
@@ -188,6 +188,6 @@ namespace toolkit
-#endif // _TOOLKIT_ROADMAP_CONTROL_HXX
+#endif // _ INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx
index d6a7a25be877..da66948d11e6 100644
--- a/include/toolkit/controls/roadmapentry.hxx
+++ b/include/toolkit/controls/roadmapentry.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 _TOOLKIT_ROADMAPENTRY_HXX_
-#define _TOOLKIT_ROADMAPENTRY_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
diff --git a/include/toolkit/controls/spinningprogress.hxx b/include/toolkit/controls/spinningprogress.hxx
index 819749e0f28e..bfa2f43fdd1f 100644
--- a/include/toolkit/controls/spinningprogress.hxx
+++ b/include/toolkit/controls/spinningprogress.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_SPINNINGPROGRESS_HXX
-#define TOOLKIT_SPINNINGPROGRESS_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_SPINNINGPROGRESS_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_SPINNINGPROGRESS_HXX
#include "toolkit/controls/animatedimages.hxx"
@@ -57,6 +57,6 @@ namespace toolkit
} // namespace toolkit
//......................................................................................................................
-#endif // TOOLKIT_SPINNINGPROGRESS_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_SPINNINGPROGRESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index dd54c9521b47..9c790c9d5af2 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX_
-#define _TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index 06134170e556..dc34e43dedbb 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX_
-#define _TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index 1e384524e2dd..502ff9f97a19 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_TABPAGE_CONTAINER_HXX
-#define TOOLKIT_TABPAGE_CONTAINER_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX
#include <com/sun/star/awt/tab/XTabPageContainer.hpp>
#include <com/sun/star/awt/tab/XTabPageContainerModel.hpp>
@@ -129,6 +129,6 @@ private:
TabPageListenerMultiplexer m_aTabPageListeners;
};
-#endif // _TOOLKIT_TABPAGE_CONTAINER_HXX
+#endif // _ INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 63684751fe4d..6457ca31bed4 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_TABPAGE_MODEL_HXX
-#define TOOLKIT_TABPAGE_MODEL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
#include <toolkit/controls/controlmodelcontainerbase.hxx>
#include <com/sun/star/awt/tab/XTabPageModel.hpp>
@@ -84,6 +84,6 @@ public:
DECLIMPL_SERVICEINFO( UnoControlTabPage, szServiceName_UnoControlTabPage)
};
-#endif // TOOLKIT_TABPAGE_MODEL_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index b6e59119b2f1..a91f1d7a65a8 100644
--- a/include/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.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 TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
-#define TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
@@ -113,6 +113,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tksimpleanimation.hxx b/include/toolkit/controls/tksimpleanimation.hxx
index 8604097567c3..1936e6622251 100644
--- a/include/toolkit/controls/tksimpleanimation.hxx
+++ b/include/toolkit/controls/tksimpleanimation.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 TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
-#define TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
@@ -90,6 +90,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tkspinbutton.hxx b/include/toolkit/controls/tkspinbutton.hxx
index ff134d292a98..cc39df9be606 100644
--- a/include/toolkit/controls/tkspinbutton.hxx
+++ b/include/toolkit/controls/tkspinbutton.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 TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
-#define TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
@@ -116,6 +116,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx
index 24868600aaaf..b32246a27857 100644
--- a/include/toolkit/controls/tkthrobber.hxx
+++ b/include/toolkit/controls/tkthrobber.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 TOOLKIT_CONTROLS_TKTHROBBER_HXX
-#define TOOLKIT_CONTROLS_TKTHROBBER_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
@@ -98,6 +98,6 @@ namespace toolkit
} // namespacetoolkit
//........................................................................
-#endif // TOOLKIT_CONTROLS_TKTHROBBER_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index 15aa918abb45..d32ba99362b5 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
-#define _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XControl.hpp>
@@ -232,6 +232,6 @@ private:
-#endif // _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index 9319040d59be..c097ffc26f1c 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_UNOCONTROLBASE_HXX_
-#define _TOOLKIT_AWT_UNOCONTROLBASE_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/util/Date.hpp>
@@ -63,6 +63,6 @@ protected:
-#endif // _TOOLKIT_AWT_UNOCONTROLBASE_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index d4595459dfaf..9d1327fc6334 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_
-#define _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX
#include <com/sun/star/awt/XControlContainer.hpp>
@@ -155,6 +155,6 @@ private:
-#endif // _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index bd5802c3993b..609d9bd1a74a 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_
-#define _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
@@ -54,6 +54,6 @@ public:
-#endif // _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 63e052604ea8..e7cf04405635 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_
-#define _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -181,6 +181,6 @@ public:
ImplRegisterProperties( aIds ); \
} while (0)
-#endif // _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 1397cad19758..71f3e76f8e80 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_UNOCONTROLS_HXX_
-#define _TOOLKIT_HELPER_UNOCONTROLS_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XTextComponent.hpp>
@@ -1512,6 +1512,6 @@ public:
-#endif // _TOOLKIT_HELPER_UNOCONTROLS_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/dllapi.h b/include/toolkit/dllapi.h
index bf5615cb3547..4309dcbb2fa3 100644
--- a/include/toolkit/dllapi.h
+++ b/include/toolkit/dllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_DLLAPI_H
-#define TOOLKIT_DLLAPI_H
+#ifndef INCLUDED_TOOLKIT_DLLAPI_H
+#define INCLUDED_TOOLKIT_DLLAPI_H
#include "sal/config.h"
#include "sal/types.h"
diff --git a/include/toolkit/helper/accessibilityclient.hxx b/include/toolkit/helper/accessibilityclient.hxx
index 02e44e6c47e8..73572154f579 100644
--- a/include/toolkit/helper/accessibilityclient.hxx
+++ b/include/toolkit/helper/accessibilityclient.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_HELPER_ACCESSIBILITY_CLIENT_HXX
-#define TOOLKIT_HELPER_ACCESSIBILITY_CLIENT_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
+#define INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
#include <toolkit/helper/accessiblefactory.hxx>
@@ -61,6 +61,6 @@ namespace toolkit
} // namespace toolkit
//........................................................................
-#endif // TOOLKIT_HELPER_ACCESSIBILITY_CLIENT_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 66117a6bdbba..0c90cd82be20 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
-#define TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
+#define INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
#include <com/sun/star/uno/Reference.hxx>
@@ -129,6 +129,6 @@ namespace toolkit
} // namespace toolkit
//........................................................................
-#endif // TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx
index 27ad9aa17a0e..8040c8d0e91d 100644
--- a/include/toolkit/helper/convert.hxx
+++ b/include/toolkit/helper/convert.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_CONVERT_HXX_
-#define _TOOLKIT_HELPER_CONVERT_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_CONVERT_HXX
+#define INCLUDED_TOOLKIT_HELPER_CONVERT_HXX
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
@@ -56,6 +56,6 @@ inline ::Rectangle VCLRectangle( const ::com::sun::star::awt::Rectangle& rAWTRec
return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) );
}
-#endif // _TOOLKIT_HELPER_CONVERT_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_CONVERT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx
index 3110d8195f5a..d075b3910fff 100644
--- a/include/toolkit/helper/emptyfontdescriptor.hxx
+++ b/include/toolkit/helper/emptyfontdescriptor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX_
-#define _TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX
+#define INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
@@ -44,6 +44,6 @@ public:
-#endif // _TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx
index 5b0421d558e2..f00f1edbbbf8 100644
--- a/include/toolkit/helper/externallock.hxx
+++ b/include/toolkit/helper/externallock.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 _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
-#define _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
+#define INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
#include <toolkit/dllapi.h>
#include <comphelper/accessiblecontexthelper.hxx>
@@ -33,6 +33,6 @@ public:
virtual void release();
};
-#endif // _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index 9e88d71f5b3f..eff8dfc92aa3 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
-#define _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX
+#define INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX
#include <toolkit/dllapi.h>
@@ -50,6 +50,6 @@ namespace toolkitform
} // namespace toolkitform
//........................................................................
-#endif // _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/imagealign.hxx b/include/toolkit/helper/imagealign.hxx
index f6f2ac5e3860..ad4ba0134d49 100644
--- a/include/toolkit/helper/imagealign.hxx
+++ b/include/toolkit/helper/imagealign.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
-#define TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#define INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
#include <sal/types.h>
#include <vcl/button.hxx>
@@ -48,6 +48,6 @@ namespace toolkit
} // namespace toolkit
//........................................................................
-#endif // TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx
index 538abc95783c..d3586460c817 100644
--- a/include/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
-#define _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
+#define INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/lang/XEventListener.hpp>
@@ -263,6 +263,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, ::com::sun::s
void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException);
DECL_LISTENERMULTIPLEXER_END
-#endif // _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 435bc0b5f1e1..984e080475fc 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_MACROS_HXX_
-#define _TOOLKIT_HELPER_MACROS_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_MACROS_HXX
+#define INCLUDED_TOOLKIT_HELPER_MACROS_HXX
#include <string.h>
@@ -300,6 +300,6 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
-#endif // _TOOLKIT_HELPER_MACROS_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_MACROS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/mutexandbroadcasthelper.hxx b/include/toolkit/helper/mutexandbroadcasthelper.hxx
index f887e018452d..4cc98e6a9304 100644
--- a/include/toolkit/helper/mutexandbroadcasthelper.hxx
+++ b/include/toolkit/helper/mutexandbroadcasthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX_
-#define _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
#include <cppuhelper/interfacecontainer.h>
diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx
index 85f98635ab73..1f7a107ec4bf 100644
--- a/include/toolkit/helper/mutexhelper.hxx
+++ b/include/toolkit/helper/mutexhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_MUTEXHELPER_HXX_
-#define _TOOLKIT_HELPER_MUTEXHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX
#include <osl/mutex.hxx>
@@ -39,6 +39,6 @@ public:
-#endif // _TOOLKIT_HELPER_MUTEXHELPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx
index 74bdff1ab32c..c9feef42dcb6 100644
--- a/include/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
-#define _TOOLKIT_HELPER_PROPERTY_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
+#define INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
#include <toolkit/dllapi.h>
@@ -248,7 +248,7 @@ sal_Bool CompareProperties( const ::com::sun::star::u
-#endif // _TOOLKIT_HELPER_PROPERTY_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index fffdc16d0a6f..0f2b9e3c56e5 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_SERVICENAMES_HXX_
-#define _TOOLKIT_HELPER_SERVICENAMES_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
+#define INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
#include <sal/types.h>
#include <tools/solar.h>
@@ -109,6 +109,6 @@ extern const sal_Char szServiceName_UnoControlTabPageContainer[];
// ExtUnoWrapper:
extern const char szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
-#endif // _TOOLKIT_HELPER_SERVICENAMES_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/tkresmgr.hxx b/include/toolkit/helper/tkresmgr.hxx
index 8e9c07dc7aa1..6e8a170bf7c9 100644
--- a/include/toolkit/helper/tkresmgr.hxx
+++ b/include/toolkit/helper/tkresmgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_TKRESMGR_HXX_
-#define _TOOLKIT_HELPER_TKRESMGR_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
+#define INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
#include <rtl/ustring.hxx>
#include <vcl/image.hxx>
@@ -63,6 +63,6 @@ public:
};
-#endif // _TOOLKIT_HELPER_TKRESMGR_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx
index b46dcfe9bc99..4a531b72cf17 100644
--- a/include/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/include/toolkit/helper/unopropertyarrayhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
-#define _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
#include <toolkit/dllapi.h>
#include <cppuhelper/propshlp.hxx>
@@ -53,6 +53,6 @@ public:
-#endif // _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx
index a0b82f4c175d..cbae08cb4489 100644
--- a/include/toolkit/helper/unowrapper.hxx
+++ b/include/toolkit/helper/unowrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_UNOWRAPPER_HXX_
-#define _TOOLKIT_HELPER_UNOWRAPPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
#include <com/sun/star/awt/XToolkit.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
@@ -81,6 +81,6 @@ private:
virtual ~UnoWrapper();
};
-#endif // _TOOLKIT_HELPER_UNOWRAPPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index e6155ef66f7e..a6467b84a2bd 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#define _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/uno/Reference.h>
@@ -150,6 +150,6 @@ public:
};
-#endif // _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/StringListResource.hxx b/include/tools/StringListResource.hxx
index dd61dadf02bc..3bd15a0cd213 100644
--- a/include/tools/StringListResource.hxx
+++ b/include/tools/StringListResource.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 TOOLS_STRINGLISTRESOURCE_HXX
-#define TOOLS_STRINGLISTRESOURCE_HXX
+#ifndef INCLUDED_TOOLS_STRINGLISTRESOURCE_HXX
+#define INCLUDED_TOOLS_STRINGLISTRESOURCE_HXX
#include <vector>
#include <tools/resid.hxx>
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index dd21aaede863..db6449cb450f 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _B3D_B3DTRANS_HXX
-#define _B3D_B3DTRANS_HXX
+#ifndef INCLUDED_TOOLS_B3DTRANS_HXX
+#define INCLUDED_TOOLS_B3DTRANS_HXX
#define ZBUFFER_DEPTH_RANGE ((double)(256L * 256L * 256L))
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index 95cd395ae912..019e425f1d91 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.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 _BIGINT_HXX
-#define _BIGINT_HXX
+#ifndef INCLUDED_TOOLS_BIGINT_HXX
+#define INCLUDED_TOOLS_BIGINT_HXX
#include <climits>
#include <rtl/ustring.hxx>
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index f992c32f01d7..db901c843959 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.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 _TOOLS_COLOR_HXX
-#define _TOOLS_COLOR_HXX
+#ifndef INCLUDED_TOOLS_COLOR_HXX
+#define INCLUDED_TOOLS_COLOR_HXX
#include "tools/toolsdllapi.h"
diff --git a/include/tools/contnr.hxx b/include/tools/contnr.hxx
index 5b31f6897d77..ce567171baa2 100644
--- a/include/tools/contnr.hxx
+++ b/include/tools/contnr.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 _CONTNR_HXX
-#define _CONTNR_HXX
+#ifndef INCLUDED_TOOLS_CONTNR_HXX
+#define INCLUDED_TOOLS_CONTNR_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index 7933e7efe9eb..d18791e65a65 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.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 _DATE_HXX
-#define _DATE_HXX
+#ifndef INCLUDED_TOOLS_DATE_HXX
+#define INCLUDED_TOOLS_DATE_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx
index a8d732efc510..69f55d7f187e 100644
--- a/include/tools/datetime.hxx
+++ b/include/tools/datetime.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 _DATETIME_HXX
-#define _DATETIME_HXX
+#ifndef INCLUDED_TOOLS_DATETIME_HXX
+#define INCLUDED_TOOLS_DATETIME_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 445ea7e6120e..90683f00d40a 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.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 TOOLS_DIAGNOSE_EX_H
-#define TOOLS_DIAGNOSE_EX_H
+#ifndef INCLUDED_TOOLS_DIAGNOSE_EX_H
+#define INCLUDED_TOOLS_DIAGNOSE_EX_H
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx
index 884e9f09748e..df86faec68fd 100644
--- a/include/tools/errcode.hxx
+++ b/include/tools/errcode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ERRCODE_HXX
-#define _ERRCODE_HXX
+#ifndef INCLUDED_TOOLS_ERRCODE_HXX
+#define INCLUDED_TOOLS_ERRCODE_HXX
#ifndef __RSC
#include <tools/solar.h>
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 04f03671194b..4dabe6381df1 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -19,8 +19,8 @@
#ifndef __RSC
-#ifndef _EINF_HXX
-#define _EINF_HXX
+#ifndef INCLUDED_TOOLS_ERRINF_HXX
+#define INCLUDED_TOOLS_ERRINF_HXX
#include <limits.h>
#include <rtl/ustring.hxx>
diff --git a/include/tools/fldunit.hxx b/include/tools/fldunit.hxx
index 25c13dbafda1..65beb743a07a 100644
--- a/include/tools/fldunit.hxx
+++ b/include/tools/fldunit.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 _TOOLS_FLDUNIT_HXX
-#define _TOOLS_FLDUNIT_HXX
+#ifndef INCLUDED_TOOLS_FLDUNIT_HXX
+#define INCLUDED_TOOLS_FLDUNIT_HXX
enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx
index 7a53e931cc1c..0d5bddb3289b 100644
--- a/include/tools/fontenum.hxx
+++ b/include/tools/fontenum.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 _TOOLS_FONTENUM_HXX
-#define _TOOLS_FONTENUM_HXX
+#ifndef INCLUDED_TOOLS_FONTENUM_HXX
+#define INCLUDED_TOOLS_FONTENUM_HXX
#include <sal/types.h>
#include <tools/solar.h>
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index 24c6721f0fa3..ca5b9c6626ac 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.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 _FRACT_HXX
-#define _FRACT_HXX
+#ifndef INCLUDED_TOOLS_FRACT_HXX
+#define INCLUDED_TOOLS_FRACT_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index fbfac95ec323..6146cec6e4c8 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.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_GEN_HXX
-#define _SV_GEN_HXX
+#ifndef INCLUDED_TOOLS_GEN_HXX
+#define INCLUDED_TOOLS_GEN_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index eb7b7e91bee2..d2602fc94683 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.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 _GLOBNAME_HXX
-#define _GLOBNAME_HXX
+#ifndef INCLUDED_TOOLS_GLOBNAME_HXX
+#define INCLUDED_TOOLS_GLOBNAME_HXX
#include <vector>
diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index 5a525872ae50..c3cb88f3e348 100644
--- a/include/tools/helpers.hxx
+++ b/include/tools/helpers.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 _TOOLS_HELPERS_HXX
-#define _TOOLS_HELPERS_HXX
+#ifndef INCLUDED_TOOLS_HELPERS_HXX
+#define INCLUDED_TOOLS_HELPERS_HXX
inline long MinMax( long nVal, long nMin, long nMax )
{
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 40b8429a31b0..07785a816c6a 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.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 TOOLS_INETMIME_HXX
-#define TOOLS_INETMIME_HXX
+#ifndef INCLUDED_TOOLS_INETMIME_HXX
+#define INCLUDED_TOOLS_INETMIME_HXX
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index fe05d635f4bc..75b0c63c2321 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.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 _TOOLS_INETMSG_HXX
-#define _TOOLS_INETMSG_HXX
+#ifndef INCLUDED_TOOLS_INETMSG_HXX
+#define INCLUDED_TOOLS_INETMSG_HXX
#include "tools/toolsdllapi.h"
#include <rtl/string.hxx>
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index dcf1ecd9fd97..442f1915b885 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.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 _TOOLS_INETSTRM_HXX
-#define _TOOLS_INETSTRM_HXX
+#ifndef INCLUDED_TOOLS_INETSTRM_HXX
+#define INCLUDED_TOOLS_INETSTRM_HXX
#include "tools/toolsdllapi.h"
#include <sal/types.h>
diff --git a/include/tools/line.hxx b/include/tools/line.hxx
index eb3f3219aa2e..77d284166a90 100644
--- a/include/tools/line.hxx
+++ b/include/tools/line.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 _LINE_HXX
-#define _LINE_HXX
+#ifndef INCLUDED_TOOLS_LINE_HXX
+#define INCLUDED_TOOLS_LINE_HXX
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
diff --git a/include/tools/lineend.hxx b/include/tools/lineend.hxx
index c24e91cf83d8..79896672aa17 100644
--- a/include/tools/lineend.hxx
+++ b/include/tools/lineend.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _LINEEND_HXX
-#define _LINEEND_HXX
+#ifndef INCLUDED_TOOLS_LINEEND_HXX
+#define INCLUDED_TOOLS_LINEEND_HXX
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 279c7b7fed16..45ce2fdcb304 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.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 _LINK_HXX
-#define _LINK_HXX
+#ifndef INCLUDED_TOOLS_LINK_HXX
+#define INCLUDED_TOOLS_LINK_HXX
#include "tools/toolsdllapi.h"
#include "sal/config.h"
diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx
index 55d68911b957..b8440177db66 100644
--- a/include/tools/mapunit.hxx
+++ b/include/tools/mapunit.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLS_MAPUNIT_HXX
-#define _TOOLS_MAPUNIT_HXX
+#ifndef INCLUDED_TOOLS_MAPUNIT_HXX
+#define INCLUDED_TOOLS_MAPUNIT_HXX
enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
diff --git a/include/tools/mempool.hxx b/include/tools/mempool.hxx
index 3fa27ff50773..0551d9435416 100644
--- a/include/tools/mempool.hxx
+++ b/include/tools/mempool.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 _SVMEMPOOL_HXX
-#define _SVMEMPOOL_HXX
+#ifndef INCLUDED_TOOLS_MEMPOOL_HXX
+#define INCLUDED_TOOLS_MEMPOOL_HXX
#include "sal/config.h"
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 7e3d46325629..96e8952777b8 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.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_MULTISEL_HXX
-#define _SV_MULTISEL_HXX
+#ifndef INCLUDED_TOOLS_MULTISEL_HXX
+#define INCLUDED_TOOLS_MULTISEL_HXX
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index b2d9b7112e2d..8fa59a704d5c 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.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 _TL_POLY_HXX
-#define _TL_POLY_HXX
+#ifndef INCLUDED_TOOLS_POLY_HXX
+#define INCLUDED_TOOLS_POLY_HXX
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index bb608a11867b..a363fda5c3dd 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.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 _PSTM_HXX
-#define _PSTM_HXX
+#ifndef INCLUDED_TOOLS_PSTM_HXX
+#define INCLUDED_TOOLS_PSTM_HXX
#include <boost/unordered_map.hpp>
#include "tools/toolsdllapi.h"
diff --git a/include/tools/rc.h b/include/tools/rc.h
index b8e42cbb49d7..022bd143b618 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLS_RC_H
-#define _TOOLS_RC_H
+#ifndef INCLUDED_TOOLS_RC_H
+#define INCLUDED_TOOLS_RC_H
#include <tools/rcid.h>
diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx
index 8243e55f3758..5f1bfac98e50 100644
--- a/include/tools/rc.hxx
+++ b/include/tools/rc.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 _TOOLS_RC_HXX
-#define _TOOLS_RC_HXX
+#ifndef INCLUDED_TOOLS_RC_HXX
+#define INCLUDED_TOOLS_RC_HXX
#include "tools/toolsdllapi.h"
#include <i18nlangtag/lang.h>
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 9c90f91775af..d3f90059a38f 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLS_RCID_H
-#define _TOOLS_RCID_H
+#ifndef INCLUDED_TOOLS_RCID_H
+#define INCLUDED_TOOLS_RCID_H
#include <tools/resid.hxx>
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 3c427cbb6406..cfda1bcba094 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.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 _REF_HXX
-#define _REF_HXX
+#ifndef INCLUDED_TOOLS_REF_HXX
+#define INCLUDED_TOOLS_REF_HXX
#include "tools/toolsdllapi.h"
#include <vector>
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 1d57694282d3..a652cc97b67a 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.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 _TOOLS_RESARY_HXX
-#define _TOOLS_RESARY_HXX
+#ifndef INCLUDED_TOOLS_RESARY_HXX
+#define INCLUDED_TOOLS_RESARY_HXX
#include "boost/noncopyable.hpp"
#include <vector>
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 89606c824658..10964e9cdb28 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLS_RESID_HXX
-#define _TOOLS_RESID_HXX
+#ifndef INCLUDED_TOOLS_RESID_HXX
+#define INCLUDED_TOOLS_RESID_HXX
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 419336bbb401..8bdf0f6a3f44 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.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 _TOOLS_RESMGR_HXX
-#define _TOOLS_RESMGR_HXX
+#ifndef INCLUDED_TOOLS_RESMGR_HXX
+#define INCLUDED_TOOLS_RESMGR_HXX
#include "tools/toolsdllapi.h"
#include <i18nlangtag/languagetag.hxx>
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index a3501b75459b..81cabe5e89bb 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTTI_HXX
-#define _RTTI_HXX
+#ifndef INCLUDED_TOOLS_RTTI_HXX
+#define INCLUDED_TOOLS_RTTI_HXX
#include <string.h>
#include <tools/solar.h>
diff --git a/include/tools/shl.hxx b/include/tools/shl.hxx
index 945921fa114a..0dfff93e4880 100644
--- a/include/tools/shl.hxx
+++ b/include/tools/shl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SHL_HXX
-#define _SHL_HXX
+#ifndef INCLUDED_TOOLS_SHL_HXX
+#define INCLUDED_TOOLS_SHL_HXX
#include <tools/solar.h>
#include "tools/toolsdllapi.h"
diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx
index 37b97782b66c..0f0df7709a72 100644
--- a/include/tools/simplerm.hxx
+++ b/include/tools/simplerm.hxx
@@ -20,8 +20,8 @@
// a simple resource manager : no stacks, no sharing of the impl class, only loading of strings and blobs
// but thread-safety !! :)
-#ifndef _TOOLS_SIMPLERESMGR_HXX_
-#define _TOOLS_SIMPLERESMGR_HXX_
+#ifndef INCLUDED_TOOLS_SIMPLERM_HXX
+#define INCLUDED_TOOLS_SIMPLERM_HXX
#include <osl/mutex.hxx>
#include <tools/resid.hxx>
diff --git a/include/tools/solarmutex.hxx b/include/tools/solarmutex.hxx
index cf4b156a51cf..317e67e0deb4 100644
--- a/include/tools/solarmutex.hxx
+++ b/include/tools/solarmutex.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 _TOOLS_SOLARMUTEX_HXX
-#define _TOOLS_SOLARMUTEX_HXX
+#ifndef INCLUDED_TOOLS_SOLARMUTEX_HXX
+#define INCLUDED_TOOLS_SOLARMUTEX_HXX
#include "tools/toolsdllapi.h"
#include <comphelper/solarmutex.hxx>
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 1bc3f2a238a6..de8dbbd20d5c 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.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 _STREAM_HXX
-#define _STREAM_HXX
+#ifndef INCLUDED_TOOLS_STREAM_HXX
+#define INCLUDED_TOOLS_STREAM_HXX
#include <limits>
#include "tools/toolsdllapi.h"
diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx
index 0fc87a9b7f0f..e5cbdc28c160 100644
--- a/include/tools/svborder.hxx
+++ b/include/tools/svborder.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVBORDER_HXX
-#define _SVBORDER_HXX
+#ifndef INCLUDED_TOOLS_SVBORDER_HXX
+#define INCLUDED_TOOLS_SVBORDER_HXX
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
diff --git a/include/tools/tenccvt.hxx b/include/tools/tenccvt.hxx
index 9cae3a79927f..e47d58840ecd 100644
--- a/include/tools/tenccvt.hxx
+++ b/include/tools/tenccvt.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 _TOOLS_TENCCVT_HXX
-#define _TOOLS_TENCCVT_HXX
+#ifndef INCLUDED_TOOLS_TENCCVT_HXX
+#define INCLUDED_TOOLS_TENCCVT_HXX
#include <rtl/textenc.h>
#include "tools/toolsdllapi.h"
diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index d04652d0a77f..bdfcec536e0c 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.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 _TOOLS_TIME_HXX
-#define _TOOLS_TIME_HXX
+#ifndef INCLUDED_TOOLS_TIME_HXX
+#define INCLUDED_TOOLS_TIME_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/tools.h b/include/tools/tools.h
index c015042d6d42..98495bf13c11 100644
--- a/include/tools/tools.h
+++ b/include/tools/tools.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 _TOOLS_H
-#define _TOOLS_H
+#ifndef INCLUDED_TOOLS_TOOLS_H
+#define INCLUDED_TOOLS_TOOLS_H
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/toolsdllapi.h b/include/tools/toolsdllapi.h
index 6e72930e3bc0..111b73bfe709 100644
--- a/include/tools/toolsdllapi.h
+++ b/include/tools/toolsdllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLSDLLAPI_H
-#define INCLUDED_TOOLSDLLAPI_H
+#ifndef INCLUDED_TOOLS_TOOLSDLLAPI_H
+#define INCLUDED_TOOLS_TOOLSDLLAPI_H
#include "sal/types.h"
diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 3a3ba979d092..79f423a73370 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.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 _UNQIDX_HXX
-#define _UNQIDX_HXX
+#ifndef INCLUDED_TOOLS_UNQIDX_HXX
+#define INCLUDED_TOOLS_UNQIDX_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 6c5f1320ca34..ab2ed5107c98 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.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 _URLOBJ_HXX
-#define _URLOBJ_HXX
+#ifndef INCLUDED_TOOLS_URLOBJ_HXX
+#define INCLUDED_TOOLS_URLOBJ_HXX
#include "tools/toolsdllapi.h"
#include "com/sun/star/uno/Reference.hxx"
diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx
index 0f97b583bb5c..395daa35a348 100644
--- a/include/tools/vcompat.hxx
+++ b/include/tools/vcompat.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 _VCOMPAT_HXX
-#define _VCOMPAT_HXX
+#ifndef INCLUDED_TOOLS_VCOMPAT_HXX
+#define INCLUDED_TOOLS_VCOMPAT_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>
diff --git a/include/tools/vector2d.hxx b/include/tools/vector2d.hxx
index bd4795cb0319..187bdebd8fb7 100644
--- a/include/tools/vector2d.hxx
+++ b/include/tools/vector2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VECTOR2D_HXX
-#define _VECTOR2D_HXX
+#ifndef INCLUDED_TOOLS_VECTOR2D_HXX
+#define INCLUDED_TOOLS_VECTOR2D_HXX
#include <math.h>
#include <tools/gen.hxx>
diff --git a/include/tools/weakbase.h b/include/tools/weakbase.h
index d37a3fd98ce3..78ce0af749f8 100644
--- a/include/tools/weakbase.h
+++ b/include/tools/weakbase.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 _TOOLS_WEAKBASE_H_
-#define _TOOLS_WEAKBASE_H_
+#ifndef INCLUDED_TOOLS_WEAKBASE_H
+#define INCLUDED_TOOLS_WEAKBASE_H
#include <sal/types.h>
#include <osl/diagnose.h>
diff --git a/include/tools/weakbase.hxx b/include/tools/weakbase.hxx
index 05498e50a8fc..652ea45d50d6 100644
--- a/include/tools/weakbase.hxx
+++ b/include/tools/weakbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOOLS_WEAKBASE_HXX_
-#define _TOOLS_WEAKBASE_HXX_
+#ifndef INCLUDED_TOOLS_WEAKBASE_HXX
+#define INCLUDED_TOOLS_WEAKBASE_HXX
#include <tools/weakbase.h>
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index acd1162ac4e3..be55c19029b7 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.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 _TOOLS_WINTYPES_HXX
-#define _TOOLS_WINTYPES_HXX
+#ifndef INCLUDED_TOOLS_WINTYPES_HXX
+#define INCLUDED_TOOLS_WINTYPES_HXX
#include <tools/solar.h>
#include <sal/types.h>
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index 9b143b7ae91b..2dc6d1f30b8b 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.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 _WLDCRD_HXX
-#define _WLDCRD_HXX
+#ifndef INCLUDED_TOOLS_WLDCRD_HXX
+#define INCLUDED_TOOLS_WLDCRD_HXX
#include "tools/toolsdllapi.h"
#include <osl/thread.h>
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index b8b86fea2aa1..524c99189bf5 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ZCODEC_HXX
-#define _ZCODEC_HXX
+#ifndef INCLUDED_TOOLS_ZCODEC_HXX
+#define INCLUDED_TOOLS_ZCODEC_HXX
#include "tools/toolsdllapi.h"
#include <tools/solar.h>