[Libreoffice-commits] .: 3 commits - accessibility/inc accessibility/source basctl/source basic/source bridges/source chart2/source cli_ure/source comphelper/inc connectivity/source cppuhelper/inc cppuhelper/unotypes cppu/inc cui/source dbaccess/source desktop/inc desktop/source extensions/source forms/source framework/source jvmaccess/inc jvmfwk/inc jvmfwk/plugins jvmfwk/source odk/examples offapi/com reportdesign/inc reportdesign/source sal/inc sd/source sfx2/inc sfx2/source slideshow/source stoc/source svl/source svtools/inc svtools/source svx/inc svx/source sw/source toolkit/source uui/source vcl/inc xmlscript/source xmlsecurity/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Fri Jul 13 20:45:21 PDT 2012
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 2 -
accessibility/source/helper/accessiblestrings.src | 2 -
basctl/source/basicide/basidesh.src | 2 -
basic/source/classes/sb.src | 2 -
bridges/source/jni_uno/jni_base.h | 2 -
bridges/source/jni_uno/jni_bridge.h | 2 -
bridges/source/jni_uno/jni_helper.h | 2 -
bridges/source/jni_uno/jni_info.h | 2 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx | 2 -
chart2/source/controller/dialogs/dlg_InsertLegend.src | 3 --
chart2/source/controller/dialogs/tp_3D_SceneGeometry.src | 3 --
chart2/source/controller/dialogs/tp_ChartType.src | 3 --
chart2/source/controller/dialogs/tp_RangeChooser.src | 3 --
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src | 3 --
chart2/source/model/main/ChartModel.hxx | 2 -
cli_ure/source/uno_bridge/cli_base.h | 2 -
cli_ure/source/uno_bridge/cli_bridge.h | 2 -
cli_ure/source/uno_bridge/cli_environment.h | 2 -
comphelper/inc/comphelper/anytostring.hxx | 2 -
comphelper/inc/comphelper/implbase_var.hxx | 12 ++------
comphelper/inc/comphelper/make_shared_from_uno.hxx | 2 -
comphelper/inc/comphelper/makesequence.hxx | 4 +-
comphelper/inc/comphelper/optional.hxx | 4 --
comphelper/inc/comphelper/scopeguard.hxx | 4 --
comphelper/inc/comphelper/servicedecl.hxx | 4 +-
comphelper/inc/comphelper/unwrapargs.hxx | 8 +----
connectivity/source/drivers/hsqldb/hsqlui.src | 2 -
cppu/inc/uno/dispatcher.hxx | 2 -
cppuhelper/inc/cppuhelper/unourl.hxx | 2 -
cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl | 2 -
cui/source/dialogs/hangulhanjadlg.src | 2 -
cui/source/options/doclinkdialog.src | 2 -
cui/source/options/optpath.src | 3 --
dbaccess/source/core/dataaccess/connection.hxx | 2 -
dbaccess/source/core/dataaccess/databasedocument.hxx | 2 -
dbaccess/source/sdbtools/resource/sdbt_strings.src | 2 -
dbaccess/source/ui/app/app.src | 12 --------
dbaccess/source/ui/app/dbu_app.hrc | 3 --
dbaccess/source/ui/browser/sbabrw.src | 8 -----
dbaccess/source/ui/browser/sbagrid.src | 11 -------
dbaccess/source/ui/control/TableGrantCtrl.src | 2 -
dbaccess/source/ui/control/tabletree.src | 4 --
dbaccess/source/ui/control/undosqledit.src | 2 -
dbaccess/source/ui/dlg/AutoControls.src | 2 -
dbaccess/source/ui/dlg/CollectionView.src | 2 -
dbaccess/source/ui/dlg/ConnectionPage.src | 9 ------
dbaccess/source/ui/dlg/RelationDlg.src | 4 --
dbaccess/source/ui/dlg/UserAdmin.src | 6 ----
dbaccess/source/ui/dlg/UserAdminDlg.src | 6 ----
dbaccess/source/ui/dlg/adtabdlg.src | 5 ---
dbaccess/source/ui/dlg/dbadmin.src | 10 -------
dbaccess/source/ui/dlg/dbadmin2.src | 13 ---------
dbaccess/source/ui/dlg/dbadminsetup.src | 6 ----
dbaccess/source/ui/dlg/dbfindex.src | 4 --
dbaccess/source/ui/dlg/directsql.src | 4 --
dbaccess/source/ui/dlg/dlgattr.src | 8 -----
dbaccess/source/ui/dlg/dlgsave.src | 6 ----
dbaccess/source/ui/dlg/dlgsize.src | 6 ----
dbaccess/source/ui/dlg/dsselect.src | 5 ---
dbaccess/source/ui/dlg/indexdialog.src | 8 -----
dbaccess/source/ui/dlg/paramdialog.src | 4 --
dbaccess/source/ui/dlg/queryfilter.src | 2 -
dbaccess/source/ui/dlg/queryorder.src | 2 -
dbaccess/source/ui/dlg/sqlmessage.src | 6 ----
dbaccess/source/ui/imagelists/dbimagelists.src | 4 --
dbaccess/source/ui/misc/WizardPages.src | 7 -----
dbaccess/source/ui/misc/dbumiscres.src | 2 -
dbaccess/source/ui/querydesign/query.src | 14 ----------
dbaccess/source/ui/querydesign/querydlg.src | 4 --
dbaccess/source/ui/relationdesign/relation.src | 10 -------
dbaccess/source/ui/tabledesign/table.src | 12 --------
dbaccess/source/ui/uno/dbinteraction.src | 2 -
desktop/inc/deployment.hrc | 2 -
desktop/source/deployment/gui/dp_gui.h | 2 -
desktop/source/deployment/gui/dp_gui.hrc | 2 -
desktop/source/deployment/gui/dp_gui_shared.hxx | 2 -
desktop/source/deployment/gui/dp_gui_updatedata.hxx | 2 -
desktop/source/deployment/inc/dp_interact.h | 2 -
desktop/source/deployment/inc/dp_misc.h | 2 -
desktop/source/deployment/inc/dp_persmap.h | 2 -
desktop/source/deployment/inc/dp_platform.hxx | 2 -
desktop/source/deployment/inc/dp_resource.h | 2 -
desktop/source/deployment/inc/dp_ucb.h | 2 -
desktop/source/deployment/inc/dp_update.hxx | 2 -
desktop/source/deployment/inc/dp_xml.h | 2 -
desktop/source/deployment/manager/dp_commandenvironments.hxx | 2 -
desktop/source/deployment/manager/dp_extensionmanager.hxx | 2 -
desktop/source/deployment/manager/dp_manager.h | 2 -
desktop/source/deployment/manager/dp_manager.hrc | 2 -
desktop/source/deployment/manager/dp_properties.hxx | 2 -
desktop/source/deployment/registry/component/dp_compbackenddb.hxx | 2 -
desktop/source/deployment/registry/component/dp_component.hrc | 2 -
desktop/source/deployment/registry/configuration/dp_configuration.hrc | 2 -
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 2 -
desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx | 2 -
desktop/source/deployment/registry/help/dp_help.hrc | 2 -
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 2 -
desktop/source/deployment/registry/inc/dp_backend.h | 2 -
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 2 -
desktop/source/deployment/registry/inc/dp_registry.hrc | 2 -
desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 2 -
desktop/source/deployment/registry/package/dp_package.hrc | 2 -
desktop/source/deployment/registry/script/dp_lib_container.h | 2 -
desktop/source/deployment/registry/script/dp_script.hrc | 2 -
desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx | 2 -
desktop/source/deployment/registry/sfwk/dp_sfwk.hrc | 2 -
desktop/source/inc/helpid.hrc | 2 -
extensions/source/abpilot/abspilot.src | 2 -
extensions/source/activex/SOActionsApproval.h | 2 -
extensions/source/activex/SOComWindowPeer.h | 2 -
extensions/source/activex/SODispatchInterceptor.h | 2 -
extensions/source/dbpilots/commonpagesdbp.src | 2 -
extensions/source/dbpilots/dbpilots.src | 2 -
extensions/source/dbpilots/gridpages.src | 2 -
extensions/source/dbpilots/groupboxpages.src | 2 -
extensions/source/dbpilots/listcombopages.src | 2 -
extensions/source/propctrlr/fontdialog.src | 4 --
extensions/source/propctrlr/formlinkdialog.src | 4 --
extensions/source/propctrlr/formres.src | 4 --
extensions/source/propctrlr/listselectiondlg.src | 4 --
extensions/source/propctrlr/newdatatype.src | 4 --
extensions/source/propctrlr/pcrmiscres.src | 4 --
extensions/source/propctrlr/propres.src | 2 -
extensions/source/propctrlr/selectlabeldialog.src | 2 -
extensions/source/propctrlr/taborder.src | 4 --
forms/source/resource/strings.src | 2 -
forms/source/resource/xforms.src | 2 -
framework/source/classes/resource.src | 3 --
jvmaccess/inc/jvmaccess/virtualmachine.hxx | 2 -
jvmfwk/inc/jvmfwk/framework.h | 2 -
jvmfwk/inc/jvmfwk/vendorplugin.h | 2 -
jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx | 4 +-
jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx | 4 +-
jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx | 4 +-
jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 2 -
jvmfwk/plugins/sunmajor/pluginlib/util.hxx | 2 -
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 2 -
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx | 2 -
jvmfwk/source/elements.hxx | 2 -
jvmfwk/source/framework.hxx | 3 +-
jvmfwk/source/fwkbase.hxx | 4 ++
jvmfwk/source/fwkutil.hxx | 2 -
jvmfwk/source/libxmlutil.hxx | 4 +-
odk/examples/OLE/activex/SOComWindowPeer.h | 2 -
offapi/com/sun/star/deployment/DeploymentException.idl | 2 -
offapi/com/sun/star/deployment/ExtensionManager.idl | 2 -
offapi/com/sun/star/deployment/LicenseException.idl | 2 -
offapi/com/sun/star/deployment/PackageRegistryBackend.idl | 2 -
offapi/com/sun/star/deployment/PlatformException.idl | 2 -
offapi/com/sun/star/deployment/XExtensionManager.idl | 2 -
offapi/com/sun/star/deployment/XPackage.idl | 2 -
offapi/com/sun/star/deployment/XPackageManager.idl | 2 -
offapi/com/sun/star/deployment/XPackageManagerFactory.idl | 2 -
offapi/com/sun/star/deployment/XPackageRegistry.idl | 2 -
offapi/com/sun/star/deployment/XPackageTypeInfo.idl | 2 -
offapi/com/sun/star/deployment/thePackageManagerFactory.idl | 2 -
offapi/com/sun/star/deployment/ui/LicenseDialog.idl | 2 -
offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl | 2 -
offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl | 2 -
offapi/com/sun/star/rendering/CanvasFactory.idl | 2 -
offapi/com/sun/star/security/CertificateContainer.idl | 2 -
offapi/com/sun/star/security/XCertificateContainer.idl | 2 -
offapi/com/sun/star/task/XAbortChannel.idl | 2 -
offapi/com/sun/star/ucb/ExpandContentProvider.idl | 2 -
offapi/com/sun/star/xml/input/SaxDocumentHandler.idl | 2 -
offapi/com/sun/star/xml/input/XAttributes.idl | 2 -
offapi/com/sun/star/xml/input/XElement.idl | 2 -
offapi/com/sun/star/xml/input/XNamespaceMapping.idl | 2 -
offapi/com/sun/star/xml/input/XRoot.idl | 2 -
reportdesign/inc/ReportDefinition.hxx | 2 -
reportdesign/source/ui/dlg/CondFormat.src | 2 -
reportdesign/source/ui/dlg/DateTime.src | 4 --
reportdesign/source/ui/dlg/GroupsSorting.src | 4 --
reportdesign/source/ui/dlg/Navigator.src | 4 --
reportdesign/source/ui/dlg/PageNumber.src | 4 --
reportdesign/source/ui/inspection/inspection.src | 4 --
reportdesign/source/ui/report/report.src | 4 --
sal/inc/osl/doublecheckedlocking.h | 2 -
sal/inc/osl/getglobalmutex.hxx | 2 -
sal/inc/rtl/allocator.hxx | 7 -----
sal/inc/rtl/instance.hxx | 2 -
sal/inc/rtl/math.h | 2 -
sal/inc/rtl/math.hxx | 2 -
sal/inc/sal/mathconf.h | 2 -
sd/source/ui/animations/SlideTransitionPane.src | 3 --
sd/source/ui/app/menuids3_tmpl.src | 3 --
sd/source/ui/app/popup.src | 2 -
sfx2/inc/sfx2/sfxbasemodel.hxx | 2 -
sfx2/source/appl/imestatuswindow.hxx | 2 -
sfx2/source/dialog/srchdlg.src | 6 ----
slideshow/source/engine/transitions/barndoorwipe.hxx | 2 -
slideshow/source/engine/transitions/barwipepolypolygon.hxx | 2 -
slideshow/source/engine/transitions/boxwipe.hxx | 2 -
slideshow/source/engine/transitions/checkerboardwipe.hxx | 2 -
slideshow/source/engine/transitions/clippingfunctor.hxx | 2 -
slideshow/source/engine/transitions/clockwipe.hxx | 2 -
slideshow/source/engine/transitions/doublediamondwipe.hxx | 2 -
slideshow/source/engine/transitions/ellipsewipe.hxx | 2 -
slideshow/source/engine/transitions/fanwipe.hxx | 2 -
slideshow/source/engine/transitions/figurewipe.hxx | 2 -
slideshow/source/engine/transitions/fourboxwipe.hxx | 2 -
slideshow/source/engine/transitions/iriswipe.hxx | 2 -
slideshow/source/engine/transitions/pinwheelwipe.hxx | 2 -
slideshow/source/engine/transitions/randomwipe.hxx | 2 -
slideshow/source/engine/transitions/snakewipe.hxx | 2 -
slideshow/source/engine/transitions/spiralwipe.hxx | 2 -
slideshow/source/engine/transitions/sweepwipe.hxx | 2 -
slideshow/source/engine/transitions/veewipe.hxx | 2 -
slideshow/source/engine/transitions/waterfallwipe.hxx | 2 -
slideshow/source/engine/transitions/zigzagwipe.hxx | 2 -
slideshow/source/engine/waitsymbol.hxx | 2 -
slideshow/source/inc/transitioninfo.hxx | 2 -
stoc/source/javavm/interact.hxx | 2 -
stoc/source/javavm/javavm.hxx | 2 -
svl/source/misc/mediatyp.src | 2 -
svtools/inc/svtools/textwindowpeer.hxx | 2 -
svtools/source/brwbox/editbrowsebox.src | 5 ---
svtools/source/misc/helpagent.src | 2 -
svx/inc/svx/fmgridif.hxx | 2 -
svx/source/dialog/frmsel.src | 4 --
svx/source/inc/formcontroller.hxx | 2 -
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src | 2 -
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src | 2 -
sw/source/ui/config/optdlg.src | 4 --
sw/source/ui/config/redlopt.src | 4 --
sw/source/ui/fmtui/tmpdlg.src | 2 -
sw/source/ui/misc/linenum.src | 4 --
sw/source/ui/ribbar/workctrl.src | 4 --
toolkit/source/awt/xthrobber.src | 2 -
uui/source/alreadyopen.src | 2 -
uui/source/filechanged.src | 2 -
uui/source/fltdlg.src | 5 ---
uui/source/ids.src | 2 -
uui/source/lockfailed.src | 2 -
uui/source/logindlg.src | 5 ---
uui/source/masterpasscrtdlg.src | 4 --
uui/source/masterpassworddlg.src | 4 --
uui/source/nameclashdlg.src | 5 ---
uui/source/openlocked.src | 2 -
uui/source/passworddlg.src | 4 --
uui/source/passworderrs.src | 2 -
uui/source/sslwarndlg.src | 5 ---
uui/source/trylater.src | 2 -
uui/source/unknownauthdlg.src | 4 --
vcl/inc/vcl/threadex.hxx | 2 -
xmlscript/source/inc/misc.hxx | 2 -
xmlscript/source/inc/xml_import.hxx | 2 -
xmlscript/source/xmldlg_imexp/common.hxx | 2 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc | 2 -
249 files changed, 157 insertions(+), 596 deletions(-)
New commits:
commit 1340890ccdff010c827a8e98eb2eaf1a2ec49a2d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jul 14 05:37:24 2012 +0200
simplify include guards
Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 6fc675b..f1557e1 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
+#ifndef INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
#define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index e9345a3..cb88d62 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_JNI_BASE_H
+#ifndef INCLUDED_JNI_BASE_H
#define INCLUDED_JNI_BASE_H
#if defined (__SUNPRO_CC) || defined (__SUNPRO_C)
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index a38c586..4ab4d96 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_JNI_BRIDGE_H
+#ifndef INCLUDED_JNI_BRIDGE_H
#define INCLUDED_JNI_BRIDGE_H
#include "jni_base.h"
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index f124dd3..9110c20 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_JNI_HELPER_H
+#ifndef INCLUDED_JNI_HELPER_H
#define INCLUDED_JNI_HELPER_H
#include "jni_base.h"
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index f890e49..c4c1542 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_JNI_INFO_H
+#ifndef INCLUDED_JNI_INFO_H
#define INCLUDED_JNI_INFO_H
#include <boost/unordered_map.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 1c34336..ee3a690 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -23,7 +23,7 @@
#include "ServiceMacros.hxx"
#include "DiagramHelper.hxx"
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 13
#include "comphelper/implbase_var.hxx"
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 2febb5b..30d0c31 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -65,7 +65,7 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 22
#include "comphelper/implbase_var.hxx"
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index f734f2e..e678f8e 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_CLI_BASE_H
+#ifndef INCLUDED_CLI_BASE_H
#define INCLUDED_CLI_BASE_H
#pragma unmanaged
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index e8f78c8..7c45169 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_CLI_BRIDGE_H
+#ifndef INCLUDED_CLI_BRIDGE_H
#define INCLUDED_CLI_BRIDGE_H
#include <vcclr.h>
#include "osl/interlck.h"
diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h
index e6601f5..683ad84 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_CLI_ENVIRONMENT_H
+#ifndef INCLUDED_CLI_ENVIRONMENT_H
#define INCLUDED_CLI_ENVIRONMENT_H
#include "cli_base.h"
diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx
index 0fdedad..ff34c02 100644
--- a/comphelper/inc/comphelper/anytostring.hxx
+++ b/comphelper/inc/comphelper/anytostring.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(INCLUDED_COMPHELPER_ANYTOSTRING_HXX)
+#ifndef INCLUDED_COMPHELPER_ANYTOSTRING_HXX
#define INCLUDED_COMPHELPER_ANYTOSTRING_HXX
#include "rtl/ustring.hxx"
diff --git a/comphelper/inc/comphelper/implbase_var.hxx b/comphelper/inc/comphelper/implbase_var.hxx
index 97e330b..fee9eb6 100644
--- a/comphelper/inc/comphelper/implbase_var.hxx
+++ b/comphelper/inc/comphelper/implbase_var.hxx
@@ -38,7 +38,7 @@
include guards. Please use the following external include guard rule
where <N> is the number of interface types:
- #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>)
+ #ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER <N>
#include "comphelper/implbase_var.hxx"
@@ -53,7 +53,7 @@
The default is a maximum of 6 arguments.
*/
-#if ! defined(COMPHELPER_IMPLBASE_INTERFACE_NUMBER)
+#ifndef COMPHELPER_IMPLBASE_INTERFACE_NUMBER
#error "you have to define COMPHELPER_IMPLBASE_INTERFACE_NUMBER prior to including comphelper/implbase_var.hxx!"
#endif // ! defined(COMPHELPER_IMPLBASE_INTERFACE_NUMBER)
@@ -61,19 +61,13 @@
#error "include proper header file: cppuhelper/implbase<N>.hxx or cppuhelper/compbase<N>.hxx!"
#endif
-#if ! defined(COMPHELPER_IMPLBASE_MAX_CTOR_ARGS)
+#ifndef COMPHELPER_IMPLBASE_MAX_CTOR_ARGS
#define COMPHELPER_IMPLBASE_MAX_CTOR_ARGS 6 // default
#endif
-#if ! defined(_CPPUHELPER_IMPLBASE_EX_HXX_)
#include "cppuhelper/implbase_ex.hxx"
-#endif
-#if ! defined(INCLUDED_RTL_INSTANCE_HXX)
#include "rtl/instance.hxx"
-#endif
-#if ! defined(_CPPUHELPER_COMPBASE_EX_HXX_)
#include "cppuhelper/compbase_ex.hxx"
-#endif
#include "boost/preprocessor/cat.hpp"
#include "boost/preprocessor/repetition.hpp"
diff --git a/comphelper/inc/comphelper/make_shared_from_uno.hxx b/comphelper/inc/comphelper/make_shared_from_uno.hxx
index 290665f..2a70094 100644
--- a/comphelper/inc/comphelper/make_shared_from_uno.hxx
+++ b/comphelper/inc/comphelper/make_shared_from_uno.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX)
+#ifndef INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
#define INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
#include "boost/shared_ptr.hpp"
diff --git a/comphelper/inc/comphelper/makesequence.hxx b/comphelper/inc/comphelper/makesequence.hxx
index 36a1acf..bc35657 100644
--- a/comphelper/inc/comphelper/makesequence.hxx
+++ b/comphelper/inc/comphelper/makesequence.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(COMPHELPER_MAKESEQUENCE_HXX_INCLUDED)
+#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
#define COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
#include "com/sun/star/uno/Sequence.hxx"
@@ -62,7 +62,7 @@ inline ::com::sun::star::uno::Sequence<T> makeSequence( \
return seq; \
}
-#if ! defined(COMPHELPER_MAKESEQUENCE_MAX_ARGS)
+#ifndef COMPHELPER_MAKESEQUENCE_MAX_ARGS
#define COMPHELPER_MAKESEQUENCE_MAX_ARGS 12
#endif
diff --git a/comphelper/inc/comphelper/optional.hxx b/comphelper/inc/comphelper/optional.hxx
index 197826d..031a303 100644
--- a/comphelper/inc/comphelper/optional.hxx
+++ b/comphelper/inc/comphelper/optional.hxx
@@ -16,12 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(INCLUDED_COMPHELPER_OPTIONAL_HXX)
+#ifndef INCLUDED_COMPHELPER_OPTIONAL_HXX
#define INCLUDED_COMPHELPER_OPTIONAL_HXX
-#if ! defined(_COM_SUN_STAR_BEANS_OPTIONAL_HPP_)
#include "com/sun/star/beans/Optional.hpp"
-#endif
#include "boost/optional.hpp"
namespace comphelper {
diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx
index dd77700..5bc2aaf 100644
--- a/comphelper/inc/comphelper/scopeguard.hxx
+++ b/comphelper/inc/comphelper/scopeguard.hxx
@@ -17,12 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(INCLUDED_COMPHELPER_SCOPEGUARD_HXX)
+#ifndef INCLUDED_COMPHELPER_SCOPEGUARD_HXX
#define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
-#if ! defined(INCLUDED_COMPHELPERDLLAPI_H)
#include "comphelper/comphelperdllapi.h"
-#endif
#include "boost/function.hpp"
#include "boost/noncopyable.hpp"
#include "boost/bind.hpp"
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index ff2aaae..442bf9f 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
+#ifndef COMPHELPER_SERVICEDECL_HXX_INCLUDED
#define COMPHELPER_SERVICEDECL_HXX_INCLUDED
#include <comphelper/comphelperdllapi.h>
@@ -335,7 +335,7 @@ inline void * component_getFactoryHelper( \
return pRet; \
}
-#if ! defined(COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS)
+#ifndef COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS
#define COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS 8
#endif
diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx
index 30db738..bdd8d76 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/comphelper/inc/comphelper/unwrapargs.hxx
@@ -17,16 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(COMPHELPER_UNWRAPARGS_HXX_INCLUDED)
+#ifndef COMPHELPER_UNWRAPARGS_HXX_INCLUDED
#define COMPHELPER_UNWRAPARGS_HXX_INCLUDED
-#if ! defined(_RTL_USTRBUF_HXX_)
#include "rtl/ustrbuf.hxx"
-#endif
#include "com/sun/star/uno/Sequence.hxx"
-#if ! defined(_COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_)
#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#endif
#include "boost/optional.hpp"
#include "boost/preprocessor/cat.hpp"
#include "boost/preprocessor/repetition.hpp"
@@ -125,7 +121,7 @@ inline void unwrapArgs( \
BOOST_PP_REPEAT(BOOST_PP_ADD(n_, 1), COMPHELPER_UNWRAPARGS_extract, ~) \
}
-#if ! defined(COMPHELPER_UNWRAPARGS_MAX_ARGS)
+#ifndef COMPHELPER_UNWRAPARGS_MAX_ARGS
#define COMPHELPER_UNWRAPARGS_MAX_ARGS 12
#endif
diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx
index df5504f..4fb7cce 100644
--- a/cppu/inc/uno/dispatcher.hxx
+++ b/cppu/inc/uno/dispatcher.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_UNO_DISPATCHER_HXX
+#ifndef INCLUDED_UNO_DISPATCHER_HXX
#define INCLUDED_UNO_DISPATCHER_HXX
#include "uno/dispatcher.h"
diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx
index 3e3a615..6a9ccec 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_CPPUHELPER_UNOURL_HXX
+#ifndef INCLUDED_CPPUHELPER_UNOURL_HXX
#define INCLUDED_CPPUHELPER_UNOURL_HXX
#include <memory>
diff --git a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
index 677de2d..9238bc6 100644
--- a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
+++ b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_cppuhelper_detail_XExceptionThrower_idl
+#ifndef INCLUDED_cppuhelper_detail_XExceptionThrower_idl
#define INCLUDED_cppuhelper_detail_XExceptionThrower_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 90e17b2..8a2efc5 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -38,7 +38,7 @@
#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 14
#include <comphelper/implbase_var.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 552d348..5ffbb18 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -50,7 +50,7 @@
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/document/XDocumentRecovery.hpp>
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 17
#include <comphelper/implbase_var.hxx>
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index b8a232f..787c705 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -25,7 +25,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DEPLOYMENT_HRC
+#ifndef INCLUDED_DEPLOYMENT_HRC
#define INCLUDED_DEPLOYMENT_HRC
#define MASKCOLOR MaskColor = \
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 277829d..ff4187f 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_GUI_H
+#ifndef INCLUDED_DP_GUI_H
#define INCLUDED_DP_GUI_H
#include "dp_gui_updatedata.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 843b41c..08c557e 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_GUI_HRC
+#ifndef INCLUDED_DP_GUI_HRC
#define INCLUDED_DP_GUI_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index b8faa7f..3ba7b9d 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_DP_GUI_SHARED_HXX
+#ifndef INCLUDED_DP_GUI_SHARED_HXX
#define INCLUDED_DP_GUI_SHARED_HXX
#include "rtl/instance.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 25826bd..870227e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_GUI_UPDATEDATA_HXX
+#ifndef INCLUDED_DP_GUI_UPDATEDATA_HXX
#define INCLUDED_DP_GUI_UPDATEDATA_HXX
#include "sal/config.h"
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 1ebaf58..9f803c7 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_INTERACT_H
+#ifndef INCLUDED_DP_INTERACT_H
#define INCLUDED_DP_INTERACT_H
#include "rtl/ref.hxx"
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index e9ad4a2..df358d7 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_MISC_H
+#ifndef INCLUDED_DP_MISC_H
#define INCLUDED_DP_MISC_H
#include "rtl/ustrbuf.hxx"
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index a81cef5..8ce15b1 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_PERSMAP_H
+#ifndef INCLUDED_DP_PERSMAP_H
#define INCLUDED_DP_PERSMAP_H
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 4d551e9..044762e 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_PLATFORM_HXX
+#ifndef INCLUDED_DP_PLATFORM_HXX
#define INCLUDED_DP_PLATFORM_HXX
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index d39aa24..d71e025 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_RESOURCE_H
+#ifndef INCLUDED_DP_RESOURCE_H
#define INCLUDED_DP_RESOURCE_H
#include "tools/string.hxx"
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index befd539..cbd77b4 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_UCB_H
+#ifndef INCLUDED_DP_UCB_H
#define INCLUDED_DP_UCB_H
#include <list>
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 9559532..cbad0ba 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_UPDATE_HXX
+#ifndef INCLUDED_DP_UPDATE_HXX
#define INCLUDED_DP_UPDATE_HXX
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index df41652..d5fbb52 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_XML_H
+#ifndef INCLUDED_DP_XML_H
#define INCLUDED_DP_XML_H
#include "rtl/ref.hxx"
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 59349c4..1f7408d 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_COMMANDENVIRONMENTS_HXX
+#ifndef INCLUDED_DP_COMMANDENVIRONMENTS_HXX
#define INCLUDED_DP_COMMANDENVIRONMENTS_HXX
#include "cppuhelper/compbase3.hxx"
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index f1a99db..800d91f 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_EXTENSIONMANAGER_H
+#ifndef INCLUDED_DP_EXTENSIONMANAGER_H
#define INCLUDED_DP_EXTENSIONMANAGER_H
#include "dp_manager.hrc"
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 828d808..b88b511 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_MANAGER_H
+#ifndef INCLUDED_DP_MANAGER_H
#define INCLUDED_DP_MANAGER_H
#include "dp_manager.hrc"
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index fea0138..b4610aa 100644
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_MANAGER_HRC
+#ifndef INCLUDED_DP_MANAGER_HRC
#define INCLUDED_DP_MANAGER_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index b54412d..3e85adf 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_PROPERTIES_HXX
+#ifndef INCLUDED_DP_PROPERTIES_HXX
#define INCLUDED_DP_PROPERTIES_HXX
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 8acc9f1..24a08e8 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_COMPBACKENDDB_HXX
+#ifndef INCLUDED_DP_COMPBACKENDDB_HXX
#define INCLUDED_DP_COMPBACKENDDB_HXX
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index eac407f..f8073c7 100644
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_COMPONENT_HRC
+#ifndef INCLUDED_DP_COMPONENT_HRC
#define INCLUDED_DP_COMPONENT_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
index 5999ca5..e2d325c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_CONFIGURATION_HRC
+#ifndef INCLUDED_DP_CONFIGURATION_HRC
#define INCLUDED_DP_CONFIGURATION_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 00a5515..451879c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
+#ifndef INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
#define INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 8ba5940..4113d07 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
+#ifndef INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
#define INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc
index 6cbf988..45b9a60 100644
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/desktop/source/deployment/registry/help/dp_help.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_HELP_HRC
+#ifndef INCLUDED_DP_HELP_HRC
#define INCLUDED_DP_HELP_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 18ee8c4..9a38d0e 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_HELPBACKENDDB_HXX
+#ifndef INCLUDED_DP_HELPBACKENDDB_HXX
#define INCLUDED_DP_HELPBACKENDDB_HXX
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 9fb0595..b4dff98 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_REGISTRY_H
+#ifndef INCLUDED_DP_REGISTRY_H
#define INCLUDED_DP_REGISTRY_H
#include "dp_misc.h"
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index e65e5cb..bb47e3c 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_BACKENDDB_HXX
+#ifndef INCLUDED_DP_BACKENDDB_HXX
#define INCLUDED_DP_BACKENDDB_HXX
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
index dc5cf28..8bda16e 100644
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ b/desktop/source/deployment/registry/inc/dp_registry.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_REGISTRY_HRC
+#ifndef INCLUDED_DP_REGISTRY_HRC
#define INCLUDED_DP_REGISTRY_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 8825fbd..59ffacf 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_EXTBACKENDDB_HXX
+#ifndef INCLUDED_DP_EXTBACKENDDB_HXX
#define INCLUDED_DP_EXTBACKENDDB_HXX
#include <utility>
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
index 2c3c5ca..ac9bef8 100644
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ b/desktop/source/deployment/registry/package/dp_package.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_PACKAGE_HRC
+#ifndef INCLUDED_DP_PACKAGE_HRC
#define INCLUDED_DP_PACKAGE_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 0cd5cb2..c25b970 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_DP_LIB_CONTAINER_H
+#ifndef INCLUDED_DP_LIB_CONTAINER_H
#define INCLUDED_DP_LIB_CONTAINER_H
#include <com/sun/star/uno/Reference.hxx>
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index d59cf6d..ac7e7aa 100644
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_SCRIPT_HRC
+#ifndef INCLUDED_DP_SCRIPT_HRC
#define INCLUDED_DP_SCRIPT_HRC
#include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index 30f4c74..cd7a6d7 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_SCRIPTBACKENDDB_HXX
+#ifndef INCLUDED_DP_SCRIPTBACKENDDB_HXX
#define INCLUDED_DP_SCRIPTBACKENDDB_HXX
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
index 57f65d0..0fdfc9e 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DP_SFWK_HRC
+#ifndef INCLUDED_DP_SFWK_HRC
#define INCLUDED_DP_SFWK_HRC
#include "deployment.hrc"
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index fda5a2f..0054581 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DESKTOP_HELPID_HRC
+#ifndef INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
#define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER"
diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index a557031..ab756e5 100644
--- a/extensions/source/activex/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
@@ -3,7 +3,7 @@
//
//////////////////////////////////////////////////////////////////////
-#if !defined __SODOCUMENTEVENTLISTENER_H_
+#ifndef __SODOCUMENTEVENTLISTENER_H_
#define __SODOCUMENTEVENTLISTENER_H_
#if _MSC_VER > 1000
diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index c819e17..c67e281 100644
--- a/extensions/source/activex/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
@@ -3,7 +3,7 @@
//
//////////////////////////////////////////////////////////////////////
-#if !defined __SOCOMWINDOWPEER_H_
+#ifndef __SOCOMWINDOWPEER_H_
#define __SOCOMWINDOWPEER_H_
#if _MSC_VER > 1000
diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index 538b12f..0a6cbd7 100644
--- a/extensions/source/activex/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
@@ -3,7 +3,7 @@
//
//////////////////////////////////////////////////////////////////////
-#if !defined __SODISPATCHINTERCEPTOR_H_
+#ifndef __SODISPATCHINTERCEPTOR_H_
#define __SODISPATCHINTERCEPTOR_H_
#if _MSC_VER > 1000
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index 4289124..f425dae 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
+#ifndef INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
#define INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
#include "jvmaccessdllapi.h"
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 26f4f39..17e4766 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -19,7 +19,7 @@
/** @HTML */
-#if !defined INCLUDED_JVMFWK_FRAMEWORK_H
+#ifndef INCLUDED_JVMFWK_FRAMEWORK_H
#define INCLUDED_JVMFWK_FRAMEWORK_H
#include "jvmfwkdllapi.h"
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index b0017c9..11fc6aa 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -18,7 +18,7 @@
*/
/** @HTML */
-#if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
+#ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
#define INCLUDED_JVMFWK_VENDORPLUGIN_H
#include "jvmfwkplugindllapi.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 11174b8..950021e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JFW_PLUGIN_GNUJRE_HXX
-#define INCLUDED_JFW_PLUGIN_GNUJRE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_GNUJRE_HXX
+#define INCLUDED_JFW_PLUGIN_GNUJRE_HXX
#include "vendorbase.hxx"
#include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 0681652..88ae1d9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
-#define INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
+#define INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
#include "vendorbase.hxx"
#include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 9532e2e..21ce389 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JFW_PLUGIN_SUNJRE_HXX
-#define INCLUDED_JFW_PLUGIN_SUNJRE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_SUNJRE_HXX
+#define INCLUDED_JFW_PLUGIN_SUNJRE_HXX
#include "vendorbase.hxx"
#include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 8d06f3a..e67d8e5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMACCESS_SUNVERSION_HXX
+#ifndef INCLUDED_JVMACCESS_SUNVERSION_HXX
#define INCLUDED_JVMACCESS_SUNVERSION_HXX
#include "rtl/ustring.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 965b1c9..5bd22fd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JFW_PLUGIN_UTIL_HXX
+#ifndef INCLUDED_JFW_PLUGIN_UTIL_HXX
#define INCLUDED_JFW_PLUGIN_UTIL_HXX
#include "rtl/ustring.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index 51d4b71..f9f4a96 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
#define INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
#include "rtl/ustring.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 3a66dc3..d91a9a1 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
+#ifndef INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
#define INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
#include "rtl/ref.hxx"
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 542eace..c35d624 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMFWK_ELEMENTS_HXX
+#ifndef INCLUDED_JVMFWK_ELEMENTS_HXX
#define INCLUDED_JVMFWK_ELEMENTS_HXX
#include <vector>
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 3f8891b..4ac6c63 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -16,8 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+#ifndef INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
#define INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+
#include "rtl/ustring.hxx"
#include "rtl/byteseq.hxx"
#include "jvmfwk/framework.h"
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index c4b1464..51bd4bb 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -16,10 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMFWK_FWKBASE_HXX
+#ifndef INCLUDED_JVMFWK_FWKBASE_HXX
#define INCLUDED_JVMFWK_FWKBASE_HXX
+
#include "rtl/ustring.hxx"
#include "libxmlutil.hxx"
+
namespace jfw
{
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 26be25e..1509fb7 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMFWK_FWKUTIL_HXX
+#ifndef INCLUDED_JVMFWK_FWKUTIL_HXX
#define INCLUDED_JVMFWK_FWKUTIL_HXX
#include "sal/config.h"
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index c27f8d0..7035f2e 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -16,13 +16,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX
+#ifndef INCLUDED_JVMFWK_LIBXMLUTIL_HXX
#define INCLUDED_JVMFWK_LIBXMLUTIL_HXX
-
#include "libxml/parser.h"
#include "libxml/xpath.h"
#include "rtl/ustring.hxx"
+
namespace jfw
{
class CXPathObjectPtr
diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h b/odk/examples/OLE/activex/SOComWindowPeer.h
index dfd39b5..55c9dd3 100644
--- a/odk/examples/OLE/activex/SOComWindowPeer.h
+++ b/odk/examples/OLE/activex/SOComWindowPeer.h
@@ -37,7 +37,7 @@
//
//////////////////////////////////////////////////////////////////////
-#if !defined __SOCOMWINDOWPEER_H_
+#ifndef __SOCOMWINDOWPEER_H_
#define __SOCOMWINDOWPEER_H_
#if _MSC_VER > 1000
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index b585362..efdb7fc 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_deployment_DeploymentException_idl
+#ifndef INCLUDED_com_sun_star_deployment_DeploymentException_idl
#define INCLUDED_com_sun_star_deployment_DeploymentException_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl
index ff1e7b8..b709de9 100644
--- a/offapi/com/sun/star/deployment/ExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/ExtensionManager.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
+#ifndef INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
#define INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
#include <com/sun/star/deployment/XExtensionManager.idl>
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index 34aaae7..a12fd10 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_LicenseException_idl
+#ifndef INCLUDED_com_sun_star_deployment_LicenseException_idl
#define INCLUDED_com_sun_star_deployment_LicenseException_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
index 329d8a2..176ece7 100644
--- a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
+++ b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
+#ifndef INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
#define INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
#include <com/sun/star/deployment/XPackageRegistry.idl>
diff --git a/offapi/com/sun/star/deployment/PlatformException.idl b/offapi/com/sun/star/deployment/PlatformException.idl
index 5aa1684..56d7c17 100644
--- a/offapi/com/sun/star/deployment/PlatformException.idl
+++ b/offapi/com/sun/star/deployment/PlatformException.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_PlatformException_idl
+#ifndef INCLUDED_com_sun_star_deployment_PlatformException_idl
#define INCLUDED_com_sun_star_deployment_PlatformException_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index b4e41c0..7744ea6 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_deployment_XExtensionManager_idl
+#ifndef INCLUDED_com_sun_star_deployment_XExtensionManager_idl
#define INCLUDED_com_sun_star_deployment_XExtensionManager_idl
#include <com/sun/star/lang/XComponent.idl>
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 2489ad0..46bccc6 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_deployment_XPackage_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackage_idl
#define INCLUDED_com_sun_star_deployment_XPackage_idl
#include <com/sun/star/beans/Optional.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index 12e7e0e..65cb24a 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageManager_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageManager_idl
#define INCLUDED_com_sun_star_deployment_XPackageManager_idl
#include <com/sun/star/lang/XComponent.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index cafbcb1..358c1d4 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
#define INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
#include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index ca5926b..5d11379 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
#define INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
#include <com/sun/star/deployment/XPackage.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
index ade6626..218da41 100644
--- a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
+++ b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
#define INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
index f66a174..6df88db 100644
--- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
+#ifndef INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
#define INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
#include <com/sun/star/deployment/XPackageManagerFactory.idl>
diff --git a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
index a7757f6..347f1f4 100644
--- a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
+#ifndef INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
#define INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
index c09d9b5..94e944d 100644
--- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
+#ifndef INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
#define INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl>
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
index 286f41d..526860a 100644
--- a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#ifndef INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
#define INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
diff --git a/offapi/com/sun/star/rendering/CanvasFactory.idl b/offapi/com/sun/star/rendering/CanvasFactory.idl
index 15e4975..742a517 100644
--- a/offapi/com/sun/star/rendering/CanvasFactory.idl
+++ b/offapi/com/sun/star/rendering/CanvasFactory.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_rendering_CanvasFactory_idl
+#ifndef INCLUDED_com_sun_star_rendering_CanvasFactory_idl
#define INCLUDED_com_sun_star_rendering_CanvasFactory_idl
#include <com/sun/star/lang/XMultiComponentFactory.idl>
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index a252acf..6fede99 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_security_CertificateContainer_idl
+#ifndef INCLUDED_com_sun_star_security_CertificateContainer_idl
#define INCLUDED_com_sun_star_security_CertificateContainer_idl
#include <com/sun/star/security/XCertificateContainer.idl>
diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl
index c05c01a..ca9a104 100644
--- a/offapi/com/sun/star/security/XCertificateContainer.idl
+++ b/offapi/com/sun/star/security/XCertificateContainer.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_security_XCertificateContainer_idl
+#ifndef INCLUDED_com_sun_star_security_XCertificateContainer_idl
#define INCLUDED_com_sun_star_security_XCertificateContainer_idl
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/task/XAbortChannel.idl b/offapi/com/sun/star/task/XAbortChannel.idl
index 2fdb7ca..921ae63 100644
--- a/offapi/com/sun/star/task/XAbortChannel.idl
+++ b/offapi/com/sun/star/task/XAbortChannel.idl
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_task_XAbortChannel_idl
+#ifndef INCLUDED_com_sun_star_task_XAbortChannel_idl
#define INCLUDED_com_sun_star_task_XAbortChannel_idl
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/ucb/ExpandContentProvider.idl b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
index 24da146..9b88136 100644
--- a/offapi/com/sun/star/ucb/ExpandContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#if ! defined INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
+#ifndef INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
#define INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
#include <com/sun/star/ucb/ContentProvider.idl>
diff --git a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
index 7f368fb..a39c970 100644
--- a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
#define INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
#include <com/sun/star/xml/input/XRoot.idl>
diff --git a/offapi/com/sun/star/xml/input/XAttributes.idl b/offapi/com/sun/star/xml/input/XAttributes.idl
index 96900e8..b5c78cb 100644
--- a/offapi/com/sun/star/xml/input/XAttributes.idl
+++ b/offapi/com/sun/star/xml/input/XAttributes.idl
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED__com_sun_star_xml_input_XAttributes_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_XAttributes_idl__
#define INCLUDED__com_sun_star_xml_input_XAttributes_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/xml/input/XElement.idl b/offapi/com/sun/star/xml/input/XElement.idl
index 9296653..f7f1517 100644
--- a/offapi/com/sun/star/xml/input/XElement.idl
+++ b/offapi/com/sun/star/xml/input/XElement.idl
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED__com_sun_star_xml_input_XElement_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_XElement_idl__
#define INCLUDED__com_sun_star_xml_input_XElement_idl__
#include <com/sun/star/xml/input/XAttributes.idl>
diff --git a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
index a23ee29..ad15ac4 100644
--- a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
+++ b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_com_sun_star_sax_input_XUidMapping_idl
+#ifndef INCLUDED_com_sun_star_sax_input_XUidMapping_idl
#define INCLUDED_com_sun_star_sax_input_XUidMapping_idl
#include <com/sun/star/container/NoSuchElementException.idl>
diff --git a/offapi/com/sun/star/xml/input/XRoot.idl b/offapi/com/sun/star/xml/input/XRoot.idl
index 3b4a814..cbda471 100644
--- a/offapi/com/sun/star/xml/input/XRoot.idl
+++ b/offapi/com/sun/star/xml/input/XRoot.idl
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED__com_sun_star_xml_input_XRoot_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_XRoot_idl__
#define INCLUDED__com_sun_star_xml_input_XRoot_idl__
#include <com/sun/star/xml/input/XNamespaceMapping.idl>
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index deedb7d..3d51264 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -52,7 +52,7 @@
#include <cppuhelper/propertysetmixin.hxx>
#include <svx/unomod.hxx>
-#if !defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 13
#include <comphelper/implbase_var.hxx>
diff --git a/sal/inc/osl/doublecheckedlocking.h b/sal/inc/osl/doublecheckedlocking.h
index 7dbabf7..64b07d4 100644
--- a/sal/inc/osl/doublecheckedlocking.h
+++ b/sal/inc/osl/doublecheckedlocking.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
+#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
#define INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
#if defined __cplusplus
diff --git a/sal/inc/osl/getglobalmutex.hxx b/sal/inc/osl/getglobalmutex.hxx
index 0dcedec..4fbd32a 100644
--- a/sal/inc/osl/getglobalmutex.hxx
+++ b/sal/inc/osl/getglobalmutex.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_OSL_GETGLOBALMUTEX_HXX
+#ifndef INCLUDED_OSL_GETGLOBALMUTEX_HXX
#define INCLUDED_OSL_GETGLOBALMUTEX_HXX
#include "osl/mutex.hxx"
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 36bbd00..2aa9e2a 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -25,16 +25,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#if !defined INCLUDED_RTL_ALLOCATOR_HXX
+#ifndef INCLUDED_RTL_ALLOCATOR_HXX
#define INCLUDED_RTL_ALLOCATOR_HXX
-#if ! defined(_SAL_TYPES_H_)
#include "sal/types.h"
-#endif
-#if ! defined(_RTL_ALLOC_H_)
#include "rtl/alloc.h"
-#endif
-
#include <cstddef>
/// @cond INTERNAL
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 9520dac..85d7306 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_RTL_INSTANCE_HXX
+#ifndef INCLUDED_RTL_INSTANCE_HXX
#define INCLUDED_RTL_INSTANCE_HXX
#include "osl/doublecheckedlocking.h"
diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h
index 77f29b1..4b34b13 100644
--- a/sal/inc/rtl/math.h
+++ b/sal/inc/rtl/math.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_RTL_MATH_H
+#ifndef INCLUDED_RTL_MATH_H
#define INCLUDED_RTL_MATH_H
#include "rtl/ustring.h"
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 40eba50..47814bf 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_RTL_MATH_HXX
+#ifndef INCLUDED_RTL_MATH_HXX
#define INCLUDED_RTL_MATH_HXX
#include "rtl/math.h"
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 35d7bff..9a046c5 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -26,7 +26,7 @@
*
************************************************************************/
-#if !defined INCLUDED_SAL_MATHCONF_H
+#ifndef INCLUDED_SAL_MATHCONF_H
#define INCLUDED_SAL_MATHCONF_H
#include "osl/endian.h"
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 0120b13..bdb5d6a 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -87,7 +87,7 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
//________________________________________________________________________________________________________
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
#include <comphelper/implbase_var.hxx>
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index bae70af..5aee577 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
+#ifndef INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
#define INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
#include "com/sun/star/beans/XPropertyChangeListener.hpp"
diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx
index 8ec1fa8..95f4fda 100644
--- a/slideshow/source/engine/transitions/barndoorwipe.hxx
+++ b/slideshow/source/engine/transitions/barndoorwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX
#define INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx
index ad55485..450885b 100644
--- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx
+++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX
+#ifndef INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX
#define INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx
index 4f1e8b3..bbc37ed 100644
--- a/slideshow/source/engine/transitions/boxwipe.hxx
+++ b/slideshow/source/engine/transitions/boxwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_BOXWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_BOXWIPE_HXX
#define INCLUDED_SLIDESHOW_BOXWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx
index f442622..b2e0108 100644
--- a/slideshow/source/engine/transitions/checkerboardwipe.hxx
+++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX
#define INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX
#include <osl/diagnose.h>
diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx
index abfdf9a..ceba88a 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.hxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_CLIPPINGFUNCTOR_HXX
+#ifndef INCLUDED_SLIDESHOW_CLIPPINGFUNCTOR_HXX
#define INCLUDED_SLIDESHOW_CLIPPINGFUNCTOR_HXX
#include <basegfx/numeric/ftools.hxx>
diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx
index 717ffab..5ca00f8 100644
--- a/slideshow/source/engine/transitions/clockwipe.hxx
+++ b/slideshow/source/engine/transitions/clockwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_CLOCKWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_CLOCKWIPE_HXX
#define INCLUDED_SLIDESHOW_CLOCKWIPE_HXX
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx
index 151a4b1..50b551f 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.hxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX
#define INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX
#include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx
index b649691..de84696 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX
#define INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx
index 49f9381..8809001 100644
--- a/slideshow/source/engine/transitions/fanwipe.hxx
+++ b/slideshow/source/engine/transitions/fanwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_FANWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_FANWIPE_HXX
#define INCLUDED_SLIDESHOW_FANWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx
index f24e10f..7d68102 100644
--- a/slideshow/source/engine/transitions/figurewipe.hxx
+++ b/slideshow/source/engine/transitions/figurewipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_FIGUREWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_FIGUREWIPE_HXX
#define INCLUDED_SLIDESHOW_FIGUREWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx
index 4c8bff4..10bbdb5 100644
--- a/slideshow/source/engine/transitions/fourboxwipe.hxx
+++ b/slideshow/source/engine/transitions/fourboxwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX
#define INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx
index 932c48c..6dbdd32 100644
--- a/slideshow/source/engine/transitions/iriswipe.hxx
+++ b/slideshow/source/engine/transitions/iriswipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_IRISWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_IRISWIPE_HXX
#define INCLUDED_SLIDESHOW_IRISWIPE_HXX
#include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx
index 4aad8ad..bc7784a 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.hxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX
#define INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx
index 54e4e20..f4b7d30 100644
--- a/slideshow/source/engine/transitions/randomwipe.hxx
+++ b/slideshow/source/engine/transitions/randomwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_RANDOMWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_RANDOMWIPE_HXX
#define INCLUDED_SLIDESHOW_RANDOMWIPE_HXX
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx
index 6d39d98..56e3540 100644
--- a/slideshow/source/engine/transitions/snakewipe.hxx
+++ b/slideshow/source/engine/transitions/snakewipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_SNAKEWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_SNAKEWIPE_HXX
#define INCLUDED_SLIDESHOW_SNAKEWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx
index 5ca67b3..9263b4b 100644
--- a/slideshow/source/engine/transitions/spiralwipe.hxx
+++ b/slideshow/source/engine/transitions/spiralwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_SPIRALWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_SPIRALWIPE_HXX
#define INCLUDED_SLIDESHOW_SPIRALWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx
index e182014..90990ce 100644
--- a/slideshow/source/engine/transitions/sweepwipe.hxx
+++ b/slideshow/source/engine/transitions/sweepwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_SWEEPWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_SWEEPWIPE_HXX
#define INCLUDED_SLIDESHOW_SWEEPWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx
index ad09cc3..62fc7ab 100644
--- a/slideshow/source/engine/transitions/veewipe.hxx
+++ b/slideshow/source/engine/transitions/veewipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_VEEWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_VEEWIPE_HXX
#define INCLUDED_SLIDESHOW_VEEWIPE_HXX
#include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx
index 10077d0..ae1fbbe 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.hxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX
#define INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx
index 15e2efe..b051d6d 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.hxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX
+#ifndef INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX
#define INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX
#include "parametricpolypolygon.hxx"
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index 636ead6..d1d4778 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined(WAITSYMBOL_HXX_INCLUDED)
+#ifndef WAITSYMBOL_HXX_INCLUDED
#define WAITSYMBOL_HXX_INCLUDED
#include <com/sun/star/rendering/XBitmap.hpp>
diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx
index 54965c8..486462f 100644
--- a/slideshow/source/inc/transitioninfo.hxx
+++ b/slideshow/source/inc/transitioninfo.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_SLIDESHOW_TRANSITIONINFO_HXX
+#ifndef INCLUDED_SLIDESHOW_TRANSITIONINFO_HXX
#define INCLUDED_SLIDESHOW_TRANSITIONINFO_HXX
#include <sal/types.h>
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 794d127..ed1f4e3 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_STOC_JAVAVM_INTERACT_HXX
+#ifndef INCLUDED_STOC_JAVAVM_INTERACT_HXX
#define INCLUDED_STOC_JAVAVM_INTERACT_HXX
#include "com/sun/star/task/XInteractionRequest.hpp"
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index 19768bf..913106a 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_STOC_JAVAVM_JAVAVM_HXX
+#ifndef INCLUDED_STOC_JAVAVM_JAVAVM_HXX
#define INCLUDED_STOC_JAVAVM_JAVAVM_HXX
#include "jvmargs.hxx"
diff --git a/svtools/inc/svtools/textwindowpeer.hxx b/svtools/inc/svtools/textwindowpeer.hxx
index 46c08a9..21de95e 100644
--- a/svtools/inc/svtools/textwindowpeer.hxx
+++ b/svtools/inc/svtools/textwindowpeer.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if !defined INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
+#ifndef INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
#define INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
#include "svtools/svtdllapi.h"
diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 1cf98ba..042c16a 100644
--- a/svx/inc/svx/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
@@ -56,7 +56,7 @@
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase10.hxx>
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 19
#include <comphelper/implbase_var.hxx>
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 9d1bef7..8e96357 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -84,7 +84,7 @@
#include <cppuhelper/propshlp.hxx>
#include <vcl/timer.hxx>
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 22
#include <comphelper/implbase_var.hxx>
diff --git a/vcl/inc/vcl/threadex.hxx b/vcl/inc/vcl/threadex.hxx
index c5333d8..7523c6d 100644
--- a/vcl/inc/vcl/threadex.hxx
+++ b/vcl/inc/vcl/threadex.hxx
@@ -31,9 +31,7 @@
#include <tools/link.hxx>
#include <vcl/dllapi.h>
-#if ! defined(_CPPUHELPER_EXC_HLP_HXX_)
#include "cppuhelper/exc_hlp.hxx"
-#endif
#include "boost/optional.hpp"
#include <memory>
diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index 267cec5..6c04f4b 100644
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_XMLSCRIPT_MISC_HXX
+#ifndef INCLUDED_XMLSCRIPT_MISC_HXX
#define INCLUDED_XMLSCRIPT_MISC_HXX
#include "com/sun/star/uno/Any.hxx"
diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx
index 96e7bfc..a0373bc 100644
--- a/xmlscript/source/inc/xml_import.hxx
+++ b/xmlscript/source/inc/xml_import.hxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined _XMLSCRIPT_XML_IMPORT_HXX_
+#ifndef _XMLSCRIPT_XML_IMPORT_HXX_
#define _XMLSCRIPT_XML_IMPORT_HXX_
#include <osl/mutex.hxx>
diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx
index 07de323..2c73caa 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_COMMON_HXX
+#ifndef INCLUDED_COMMON_HXX
#define INCLUDED_COMMON_HXX
#include "sal/types.h"
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
index 32147b1..cafa66e 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if ! defined INCLUDED_DIGITALSIGNATURESDIALOG_HRC
+#ifndef INCLUDED_DIGITALSIGNATURESDIALOG_HRC
#define INCLUDED_DIGITALSIGNATURESDIALOG_HRC
//global.hrc in xmlsecurity/inc starts at 1000
commit 5a7e8389f0720f1872f36af401c6b3af7968b7ea
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jul 14 02:03:56 2012 +0200
hrc cleanup: Remove include guards from src files
Change-Id: I7d52837f4058bab1bb5a0137788521d12834d519
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
index bb611fa..4174855 100644
--- a/accessibility/source/helper/accessiblestrings.src
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
#include <accessibility/helper/accessiblestrings.hrc>
-#endif
String RID_STR_ACC_ACTION_CLICK
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 44eee67..22f1d8c 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -18,9 +18,7 @@
#include <baside2.hrc>
#include <helpid.hrc>
-#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
-#endif
#include "dlgresid.hrc"
#include <sfx2/sfxcommands.h>
#include <svx/svxcommands.h>
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 3deecde..19fa675 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -25,9 +25,7 @@
*
************************************************************************/
#define __RSC
-#ifndef _ERRCODE_HXX //autogen
#include <tools/errcode.hxx>
-#endif
#include "sb.hrc"
#include <basic/sberrors.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src
index 04d0b1a..3cf5891 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.src
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src
@@ -19,10 +19,7 @@
#include "dlg_InsertLegend.hrc"
#include "CommonResources.hrc"
#include "res_LegendPosition.hrc"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
-#endif
ModalDialog DLG_LEGEND
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
index da9f9be..3ad6ce4 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
@@ -19,10 +19,7 @@
#include "tp_3D_SceneGeometry.hrc"
#include "dlg_View3D.hrc"
#include "HelpIds.hrc"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
-#endif
#define WIDTH_FL 108
#define WIDTH_MF 57
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index cd3791d..387ff3b 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.src
+++ b/chart2/source/controller/dialogs/tp_ChartType.src
@@ -28,10 +28,7 @@
#include "tp_ChartType.hrc"
#include "dlg_CreationWizard.hrc"
#include "CommonResources.hrc"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
-#endif
#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; }
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src
index 86dc9a4..243cb9b 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.src
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.src
@@ -18,10 +18,7 @@
#include "HelpIds.hrc"
#include "tp_RangeChooser.hrc"
#include "dlg_CreationWizard.hrc"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
-#endif
#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; }
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
index c323497..9f6111c 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
@@ -21,10 +21,7 @@
#include "res_SecondaryAxisCheckBoxes.hrc"
#include "dlg_CreationWizard.hrc"
#include "res_LegendPosition.hrc"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
-#endif
#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; }
#define WIZ_TITLES_WIDTH 130
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 0f23d60..fa4496e 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CONNECTIVITY_HSQLUI_HRC
#include "hsqlui.hrc"
-#endif
/* Note:
The resource file built here (hsqldb.res, finally) is *not* included
diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 3b86d6b..06a0690 100644
--- a/cui/source/dialogs/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -18,9 +18,7 @@
#include <cuires.hrc>
#include "helpid.hrc"
-#ifndef SVX_HANGUL_HANJA_DLG_HRC
#include "hangulhanjadlg.hrc"
-#endif
ModalDialog RID_SVX_MDLG_HANGULHANJA
{
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index 45fcc3b..7fc25c2 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -17,9 +17,7 @@
*/
#include <cuires.hrc>
-#ifndef _SVX_DOCLINKDIALOG_HRC_
#include "doclinkdialog.hrc"
-#endif
#define DIALOG_SIZE_X 200
#define DIALOG_SIZE_Y 94
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index f0c7f5e..f2f7175 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -24,12 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include --------------------------------------------------------------
#include "optpath.hrc"
#include <cuires.hrc>
-#ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
-#endif
#include "helpid.hrc"
// RID_SFXPAGE_PATH -----------------------------------------------------
diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src
index d5a8dc3..2ad7244 100644
--- a/dbaccess/source/sdbtools/resource/sdbt_strings.src
+++ b/dbaccess/source/sdbtools/resource/sdbt_strings.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBACCESS_SDBT_RESOURCE_HRC
#include "sdbt_resource.hrc"
-#endif
String STR_QUERY_AND_TABLE_DISTINCT_NAMES
{
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index d310ec2..344fa3e 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -15,24 +15,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
-#endif
-#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
-#endif
-#ifndef _CNTIDS_HRC
#include <sfx2/cntids.hrc>
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef DBAUI_TOOLBOX_HXX
#include "toolbox.hrc"
-#endif
#define MN_PROPS 25
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index ded9caa..b908b54 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -15,18 +15,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_BRW_HRC_
#include "dbu_brw.hrc"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
-#endif
#include "toolbox.hrc"
QueryBox QUERY_BRW_SAVEMODIFIED
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index f7d2e4a..9cac876 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -15,22 +15,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_BRW_HRC_
#include "dbu_brw.hrc"
-#endif
-
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef DBAUI_TOOLBOX_HXX
#include "toolbox.hrc"
-#endif
-#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
-#endif
Menu RID_SBA_GRID_COLCTXMENU
{
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
index 7d7cc7b..81d6432 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ b/dbaccess/source/ui/control/TableGrantCtrl.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
-#endif
String STR_TABLE_PRIV_NAME
{
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
index e40a84b..e8727a7 100644
--- a/dbaccess/source/ui/control/tabletree.src
+++ b/dbaccess/source/ui/control/tabletree.src
@@ -16,12 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
-#endif
-#ifndef _DBAUI_TABLETREE_HRC_
#include "tabletree.hrc"
-#endif
#include "browserids.hxx"
Menu MENU_TABLETREE_POPUP
diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
index 3be4749..4899e5c 100644
--- a/dbaccess/source/ui/control/undosqledit.src
+++ b/dbaccess/source/ui/control/undosqledit.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
-#endif
String STR_QUERY_UNDO_MODIFYSQLEDIT
{
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
index ecac9d6..8b11c12 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
#include "AutoControls.hrc"
-#endif
String STR_DBASE_PATH_OR_FILE
{
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index a8a71bb..f3d643a 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
#include "dbaccess_helpid.hrc"
#include "CollectionView.hrc"
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 42ec010..76951e5 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -16,19 +16,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef DBAUI_CONNECTIONPAGE_HRC
#include "ConnectionPage.hrc"
-#endif
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
#include "AutoControls.hrc"
-#endif
-
//.........................................................................
TabPage PAGE_CONNECTION
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index d68701a..2cd9c93 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -16,12 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBAUI_RELATIONDIALOG_HRC
#include "RelationDlg.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
#include "dbaccess_helpid.hrc"
ModalDialog DLG_REL_PROPERTIES
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 7f762e7..8ecd463 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -16,15 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBAUI_USERADMIN_HRC
#include "UserAdmin.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
#define WINDOW_SIZE_X 260
#define WINDOW_SIZE_Y 185
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index 1ab363b..1641d4f 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -16,15 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef DBAUI_USERADMINDLG_HRC
#include "UserAdminDlg.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
TabDialog DLG_DATABASE_USERADMIN
{
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index 558be98..eb72051 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -17,14 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef DBAUI_ADTABDLG_HRC
#include "adtabdlg.hrc"
-#endif
#include "dbaccess_helpid.hrc"
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
ModelessDialog DLG_JOIN_TABADD
{
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index aaa1d9a..f723c68 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -16,21 +16,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
#include "AutoControls.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBAUI_DBADMIN_HRC_
#include "dbadmin.hrc"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
#include "admincontrols.hrc"
//-------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index fa6e189..1a20fd2 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -16,25 +16,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBAUI_DBADMIN_HRC_
#include "dbadmin.hrc"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef DBAUI_TOOLBOX_HXX
#include "toolbox.hrc"
-#endif
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
#include "AutoControls.hrc"
-#endif
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index e15148b..02cd31e 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -16,14 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBAUI_DBADMINSETUP_HRC_
#include "dbadminsetup.hrc"
-#endif
-
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
#include "AutoControls.hrc"
-#endif
-
#define CHECKBOX_HEIGHT 8
#define FIXEDTEXT_HEIGHT 8
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index cf248bc..38ebda9 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -16,12 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBAUI_DBF_INDEXES_HRC_
#include "dbfindex.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
#define WIN_X 264
#define WIN_Y 149
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index cb7d50f..5ed6be0 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -16,12 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBACCESS_UI_DIRECTSQL_HRC_
#include "directsql.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
#define BUTTON_SIZE_X 50
#define BUTTON_SIZE_Y 14
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index 54c4afb..280c9c9 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -15,18 +15,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVX_DIALOGS_HRC
#include <svx/dialogs.hrc>
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef DBAUI_SBATTRDLG_HRC
#include "dlgattr.hrc"
-#endif
//================================================
// Der Attributdialog:
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index d93ea02..96dc6cf 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -16,15 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBAUI_DLGSAVE_HRC
#include "dlgsave.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
ModalDialog DLG_SAVE_AS
{
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index bbde191..ba301bd 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -16,15 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBAUI_DLGSIZE_HRC
#include "dlgsize.hrc"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
ModalDialog DLG_ROWHEIGHT
{
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 30c6fd5..99cb53f 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -16,13 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBAUI_DSSELECT_HRC_
#include "dsselect.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-
ModalDialog DLG_DATASOURCE_SELECTION
{
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index c163543..d7bdf73 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -16,18 +16,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBAUI_INDEXDIALOG_HRC_
#include "indexdialog.hrc"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
#define DIALOG_SIZE_X 220
#define DIALOG_SIZE_Y 140
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 354305f..914bbbe 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -16,12 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBAUI_PARAMDIALOG_HRC_
#include "paramdialog.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
#define LIST_WIDTH 100
#define LIST_HEIGHT 50
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index bfe20f8..caa57fe 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBAUI_QUERYFILTER_HRC
#include "queryfilter.hrc"
-#endif
#include "dbaccess_helpid.hrc"
ModalDialog DLG_FILTERCRIT
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 1cee19c..13d9f82 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DBAUI_QUERYORDER_HRC
#include "queryorder.hrc"
-#endif
#include "dbaccess_helpid.hrc"
ModalDialog DLG_ORDERCRIT
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index 1ad7c54..9dcc560 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -16,15 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HRC_
#include "sqlmessage.hrc"
-#endif
//-------------------------------------------------------------------------
Image BMP_EXCEPTION_ERROR
diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index 0d3c4d7..c18b161 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -16,12 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBU_DLG_HRC_
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list