[Libreoffice-commits] core.git: accessibility/inc connectivity/source embeddedobj/source embeddedobj/test embedserv/source framework/inc include/editeng include/sfx2 lingucomponent/source linguistic/workben package/source sc/source sd/inc sfx2/source starmath/inc svl/source sw/inc sw/source writerfilter/source xmlhelp/source xmloff/source
Thomas Arnhold
thomas at arnhold.org
Wed Oct 23 03:28:34 PDT 2013
accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx | 6 +++---
accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx | 6 +++---
connectivity/source/inc/file/FDateFunctions.hxx | 6 +++---
connectivity/source/inc/file/FStringFunctions.hxx | 6 +++---
embeddedobj/source/commonembedding/xfactory.hxx | 4 ++--
embeddedobj/source/inc/docholder.hxx | 4 ++--
embeddedobj/source/inc/intercept.hxx | 4 ++--
embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 4 ++--
embedserv/source/inc/docholder.hxx | 4 ++--
embedserv/source/inc/intercept.hxx | 4 ++--
framework/inc/helper/uiconfigelementwrapperbase.hxx | 6 +++---
framework/inc/services/license.hxx | 6 +++---
framework/inc/uiconfiguration/moduleimagemanager.hxx | 6 +++---
include/editeng/Node.hxx | 6 +++---
include/sfx2/sidebar/SidebarToolBox.hxx | 4 ++--
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 4 ++--
linguistic/workben/sspellimp.hxx | 4 ++--
package/source/xstor/xfactory.hxx | 4 ++--
package/source/xstor/xstorage.hxx | 4 ++--
sc/source/ui/inc/optload.hxx | 4 ++--
sd/inc/drawdoc.hxx | 6 +++---
sd/inc/misc/scopelock.hxx | 6 +++---
sd/inc/undo/undofactory.hxx | 6 +++---
sfx2/source/appl/xpackcreator.hxx | 4 ++--
sfx2/source/sidebar/ToolBox.hxx | 4 ++--
starmath/inc/node.hxx | 4 ++--
starmath/inc/smmod.hxx | 6 +++---
svl/source/fsstor/fsstorage.hxx | 4 ++--
sw/inc/IDocumentFieldsAccess.hxx | 6 +++---
sw/inc/drawdoc.hxx | 4 ++--
sw/source/ui/inc/concustomshape.hxx | 8 +++-----
sw/source/ui/inc/content.hxx | 4 ++--
sw/source/ui/inc/optload.hxx | 4 ++--
sw/source/ui/vba/vbarevisions.hxx | 6 +++---
writerfilter/source/rtftok/rtflookahead.hxx | 6 +++---
xmlhelp/source/cxxhelp/provider/content.hxx | 4 ++--
xmloff/source/draw/layerimp.hxx | 6 +++---
37 files changed, 91 insertions(+), 93 deletions(-)
New commits:
commit f852bda5ecf68c9450925bc95138509ffadb4a43
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Oct 22 17:03:24 2013 +0200
clean up some include guards
Conflicts:
sw/source/ui/inc/content.hxx
Change-Id: I58d81881271fc6e3320bf3b5f1321594b28614a6
Reviewed-on: https://gerrit.libreoffice.org/6388
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index 0a3d084..b0108d5 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_
-#define ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_
+#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
+#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
#include <deque>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -183,6 +183,6 @@ namespace accessibility
}// namespace accessibility
//........................................................................
-#endif // ACCESSIBILITY_EXT_ACCESSIBLELISTBOXENTRY_HXX_
+#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
index c407a47..7b84cea 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX
-#define ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX
+#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
+#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
#include "AccessibleBrowseBoxTable.hxx"
#include <comphelper/uno3.hxx>
@@ -110,6 +110,6 @@ public:
// ============================================================================
-#endif // ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX
+#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index 6d388f9..789e435 100644
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONNECTIVITY_FILE_FDATEFUNCTIONS_HXX_
-#define _CONNECTIVITY_FILE_FDATEFUNCTIONS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATEFUNCTIONS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATEFUNCTIONS_HXX
#include "file/fcode.hxx"
#include "file/filedllapi.hxx"
@@ -229,6 +229,6 @@ namespace connectivity
}
}
-#endif // _CONNECTIVITY_FILE_FCODE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATEFUNCTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index 1c3b5d9..c7e6c00 100644
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONNECTIVITY_FILE_FSTRINGFUNCTIONS_HXX_
-#define _CONNECTIVITY_FILE_FSTRINGFUNCTIONS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTRINGFUNCTIONS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTRINGFUNCTIONS_HXX
#include "file/fcode.hxx"
#include "file/filedllapi.hxx"
@@ -270,6 +270,6 @@ namespace connectivity
}
}
-#endif // _CONNECTIVITY_FILE_FCODE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTRINGFUNCTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index a13b2aa..cda7cdd 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XFACTORY_HXX_
-#define __XFACTORY_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_XFACTORY_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_XFACTORY_HXX
#include <com/sun/star/embed/XEmbeddedObjectCreator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 111f9e9..709c5e4 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCHOLDER_HXX_
-#define _DOCHOLDER_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_DOCHOLDER_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_DOCHOLDER_HXX
#include <com/sun/star/util/XCloseListener.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index d4e878f..3821a10 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INTERCEPT_HXX_
-#define _INTERCEPT_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_INTERCEPT_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_INTERCEPT_HXX
#include <osl/mutex.hxx>
#include <cppuhelper/implbase3.hxx>
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index 7e2b29a..12a140d 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XFACTORY_HXX_
-#define __XFACTORY_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_TEST_MAINTHREADEXECUTOR_XEXECUTOR_HXX
+#define INCLUDED_EMBEDDEDOBJ_TEST_MAINTHREADEXECUTOR_XEXECUTOR_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/task/XJob.hpp>
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index e4f72ee..3e3928b 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCHOLDER_HXX_
-#define _DOCHOLDER_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_DOCHOLDER_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_DOCHOLDER_HXX
#include "common.h"
#include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx
index 4ba43d1..83454f0 100644
--- a/embedserv/source/inc/intercept.hxx
+++ b/embedserv/source/inc/intercept.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INTERCEPT_HXX_
-#define _INTERCEPT_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_INTERCEPT_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_INTERCEPT_HXX
#include <osl/mutex.hxx>
#include <cppuhelper/implbase3.hxx>
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index c5910ad..1c13f14 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_
-#define __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
#include <threadhelp/threadhelpbase.hxx>
#include <macros/generic.hxx>
@@ -142,6 +142,6 @@ class UIConfigElementWrapperBase : protected ThreadHelpBase
} // namespace framework
-#endif // __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index 1095101..5652e30 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_SERVICES_LICENSE_HXX_
-#define __FRAMEWORK_SERVICES_LICENSE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LICENSE_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_LICENSE_HXX
/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
with solaris headers ...
@@ -78,6 +78,6 @@ namespace framework
} // namespace framework
-#endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_LICENSE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 5692421..59ab583 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_UICONFIGURATION_MODULEIMAGEMANAGER_HXX_
-#define __FRAMEWORK_UICONFIGURATION_MODULEIMAGEMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
@@ -101,6 +101,6 @@ namespace framework
};
}
-#endif // __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/Node.hxx b/include/editeng/Node.hxx
index 3159e48..62e775d 100644
--- a/include/editeng/Node.hxx
+++ b/include/editeng/Node.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef NODE_HXX
-#define NODE_HXX
+#ifndef INCLUDED_EDITENG_NODE_HXX
+#define INCLUDED_EDITENG_NODE_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -97,6 +97,6 @@ public:
static Node* our_pNodeNullPointer;
};
-#endif // NODE_HXX
+#endif // INCLUDED_EDITENG_NODE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 74e4e87..4dcdd60 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.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_TOOLBOX_HXX
-#define SFX_SIDEBAR_TOOLBOX_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX
+#define INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX
#include "sfx2/dllapi.h"
#include "vcl/toolbox.hxx"
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 9c9398e..89ac20e 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _LINGU2_SPELLIMP_HXX_
-#define _LINGU2_SPELLIMP_HXX_
+#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
+#define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
#include <uno/lbnames.h>
#include <cppuhelper/implbase1.hxx>
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index f9fc388..f53cb46 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _LINGU2_SPELLIMP_HXX_
-#define _LINGU2_SPELLIMP_HXX_
+#ifndef INCLUDED_LINGUISTIC_WORKBEN_SSPELLIMP_HXX
+#define INCLUDED_LINGUISTIC_WORKBEN_SSPELLIMP_HXX
#include <uno/lbnames.h>
#include <cppuhelper/implbase1.hxx>
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index bf23bf1..4a56ccd 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XFACTORY_HXX_
-#define __XFACTORY_HXX_
+#ifndef INCLUDED_PACKAGE_SOURCE_XSTOR_XFACTORY_HXX
+#define INCLUDED_PACKAGE_SOURCE_XSTOR_XFACTORY_HXX
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index b0f4e47..039dd22 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XSTORAGE_HXX_
-#define __XSTORAGE_HXX_
+#ifndef INCLUDED_PACKAGE_SOURCE_XSTOR_XSTORAGE_HXX
+#define INCLUDED_PACKAGE_SOURCE_XSTOR_XSTORAGE_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/embed/XStorage2.hpp>
diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx
index cec6df7..fd02f59 100644
--- a/sc/source/ui/inc/optload.hxx
+++ b/sc/source/ui/inc/optload.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OPTLOAD_HXX
-#define _OPTLOAD_HXX
+#ifndef INCLUDED_SC_SOURCE_UI_INC_OPTLOAD_HXX
+#define INCLUDED_SC_SOURCE_UI_INC_OPTLOAD_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 47be488..9040534 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DRAWDOC_HXX
-#define _DRAWDOC_HXX
+#ifndef INCLUDED_SD_INC_DRAWDOC_HXX
+#define INCLUDED_SD_INC_DRAWDOC_HXX
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/text/WritingMode.hpp>
@@ -678,6 +678,6 @@ private:
}
-#endif // _DRAWDOC_HXX
+#endif // INCLUDED_SD_INC_DRAWDOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx
index 46184da..5b25ff0 100644
--- a/sd/inc/misc/scopelock.hxx
+++ b/sd/inc/misc/scopelock.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SCOPELOCK_HXX
-#define _SD_SCOPELOCK_HXX
+#ifndef INCLUDED_SD_INC_MISC_SCOPELOCK_HXX
+#define INCLUDED_SD_INC_MISC_SCOPELOCK_HXX
#include <sal/types.h>
@@ -49,6 +49,6 @@ private:
} // namespace sd
-#endif // _SD_UNDOMANAGER_HXX
+#endif // INCLUDED_SD_INC_MISC_SCOPELOCK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx
index bdc618b..0c2390d 100644
--- a/sd/inc/undo/undofactory.hxx
+++ b/sd/inc/undo/undofactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_UNDOFACTORY_HXX
-#define _SD_UNDOFACTORY_HXX
+#ifndef INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX
+#define INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX
#include <svx/svdundo.hxx>
@@ -39,6 +39,6 @@ public:
}
-#endif // _SD_UNDOMANAGER_HXX
+#endif // INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx
index 3691d12..ca90b0c 100644
--- a/sfx2/source/appl/xpackcreator.hxx
+++ b/sfx2/source/appl/xpackcreator.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XFACTORY_HXX_
-#define __XFACTORY_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_APPL_XPACKCREATOR_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_XPACKCREATOR_HXX
#include <com/sun/star/embed/XPackageStructureCreator.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx
index f62fe1a..23f3246 100644
--- a/sfx2/source/sidebar/ToolBox.hxx
+++ b/sfx2/source/sidebar/ToolBox.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_TOOLBOX_HXX
-#define SFX_SIDEBAR_TOOLBOX_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TOOLBOX_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_TOOLBOX_HXX
#include "vcl/toolbox.hxx"
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 38243dd..bce53f2 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef NODE_HXX
-#define NODE_HXX
+#ifndef INCLUDED_STARMATH_INC_NODE_HXX
+#define INCLUDED_STARMATH_INC_NODE_HXX
#include <vector>
#include <ostream>
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 33af82d..18021e0 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SMMOD_HXX
-#define _SMMOD_HXX
+#ifndef INCLUDED_STARMATH_INC_SMMOD_HXX
+#define INCLUDED_STARMATH_INC_SMMOD_HXX
#include <tools/resary.hxx>
#include <svl/lstner.hxx>
@@ -138,6 +138,6 @@ public:
#define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) )
-#endif // _SDMOD_HXX
+#endif // INCLUDED_STARMATH_INC_SMMOD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index efafe8f..eb7bd3d 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XSTORAGE_HXX_
-#define __XSTORAGE_HXX_
+#ifndef INCLUDED_SVL_SOURCE_FSSTOR_FSSTORAGE_HXX
+#define INCLUDED_SVL_SOURCE_FSSTOR_FSSTORAGE_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/embed/XStorage.hpp>
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index ff92fba..7d263ef 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTFIELDSACCESS_HXX_INCLUDED
-#define IDOCUMENTFIELDSACCESS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
#include <sal/types.h>
#include <tools/solar.h>
@@ -133,6 +133,6 @@ protected:
virtual ~IDocumentFieldsAccess() {};
};
- #endif // IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index a49eb20..3cc5d3c 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.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 _DRAWDOC_HXX
-#define _DRAWDOC_HXX
+#ifndef INCLUDED_SW_INC_DRAWDOC_HXX
+#define INCLUDED_SW_INC_DRAWDOC_HXX
#include <svx/fmmodel.hxx>
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx
index 39a712e..96d6707 100644
--- a/sw/source/ui/inc/concustomshape.hxx
+++ b/sw/source/ui/inc/concustomshape.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_CONCUSTOMSHAPE_HXX
-#define _SW_CONCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
#include <rtl/ustring.hxx>
#include "drawbase.hxx"
@@ -58,8 +58,6 @@ class ConstCustomShape : public SwDrawBase
virtual bool doConstructOrthogonal() const;
};
-
-
-#endif // _SW_CONRECT_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 3ae614e..b812d05c 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONTENT_HXX
-#define _CONTENT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX
#include <limits.h>
#include "swcont.hxx"
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 3bf231e..7825ab5 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OPTLOAD_HXX
-#define _OPTLOAD_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx
index acf0dc4..693bbd2 100644
--- a/sw/source/ui/vba/vbarevisions.hxx
+++ b/sw/source/ui/vba/vbarevisions.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_VBA_PANES_HXX
-#define SW_VBA_PANES_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX
+#define INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX
#include <vbahelper/vbacollectionimpl.hxx>
#include <ooo/vba/word/XRevisions.hpp>
@@ -52,6 +52,6 @@ public:
virtual css::uno::Sequence<OUString> getServiceNames();
};
-#endif /* SW_VBA_PANES_HXX */
+#endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index 958700e..64ccfba 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _RTFLOOKAHEAD_HXX_
-#define _RTFLOOKAHEAD_HXX_
+#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
#include <rtflistener.hxx>
#include <rtftokenizer.hxx>
@@ -51,6 +51,6 @@ namespace writerfilter {
} // namespace rtftok
} // namespace writerfilter
-#endif // _RTFDOCUMENTIMPL_HXX_
+#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index f39b5c8..13f0515 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONTENT_HXX
-#define _CONTENT_HXX
+#ifndef INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_CONTENT_HXX
+#define INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_CONTENT_HXX
#include <ucbhelper/contenthelper.hxx>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index c314bb8..ac40d09 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLOFF_LAYERIMP_HXX
-#define _XMLOFF_LAYERIMP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_LAYERIMP_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_LAYERIMP_HXX
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -43,6 +43,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
};
-#endif // _XMLOFF_ANIMIMP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_LAYERIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list