fixincludeguards.sh: reportdesign

author: Thomas Arnhold <thomas@arnhold.org> 2014-04-18 18:54:04 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2014-04-19 11:10:09 +0200
commit: 436f9d16c4b2535ebf927e4fb56c3b7bfee9e509 (patch)
tree: 9e3f08f270bca9540c78063e8fd28a98910c56b9 /reportdesign
parent: 55c70634b891c7da7a0e1606cc0b498b7cbc9d71 (diff)
109 files changed, 315 insertions, 315 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index 91242cb48f09..e1fb2f7bf0a5 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RPTUI_MODULE_HELPER_RPT_HXX_
-#define _RPTUI_MODULE_HELPER_RPT_HXX_
+#ifndef INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX
+#define INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX
 
 #include "dllapi.h"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -86,7 +86,7 @@ namespace rptui
 }   // namespace rptui
 
 
-#endif // _RPTUI_MODULE_HELPER_RPT_HXX_
+#endif // INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index e0bd925ddfc6..6ff443b74bc3 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_PROPERTYSETFORWARD_HXX
-#define RPTUI_PROPERTYSETFORWARD_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_PROPERTYFORWARD_HXX
+#define INCLUDED_REPORTDESIGN_INC_PROPERTYFORWARD_HXX
 
 #include "dllapi.h"
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -80,6 +80,6 @@ namespace rptui
 
 }   // namespace rptui
 
-#endif // RPTUI_PROPERTYSETFORWARD_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_PROPERTYFORWARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index f88440b5f168..236d5c91457f 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REPORTDESIGN_API_REPORTDEFINITION_HXX
-#define REPORTDESIGN_API_REPORTDEFINITION_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_REPORTDEFINITION_HXX
+#define INCLUDED_REPORTDESIGN_INC_REPORTDEFINITION_HXX
 
 #include "dllapi.h"
 
@@ -402,6 +402,6 @@ namespace reportdesign
 
 } // namespace reportdesign
 
-#endif // REPORTDESIGN_API_REPORTDEFINITION_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_REPORTDEFINITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx
index 30ded582e982..7a1d47199c0c 100644
--- a/reportdesign/inc/ReportHelperDefines.hxx
+++ b/reportdesign/inc/ReportHelperDefines.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_REPORTHELPERDEFINES_HXX
-#define INCLUDED_REPORTHELPERDEFINES_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX
+#define INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX
 
 #define REPORTCONTROLMODEL_HEADER()  \
     virtual OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; \
@@ -183,6 +183,6 @@
 
 
 
-#endif // INCLUDED_REPORTHELPERDEFINES_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx
index 4383116c0e74..117eff296dc3 100644
--- a/reportdesign/inc/ReportVisitor.hxx
+++ b/reportdesign/inc/ReportVisitor.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_REPORT_VISTITOR_HXX
-#define INCLUDED_REPORT_VISTITOR_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_REPORTVISITOR_HXX
+#define INCLUDED_REPORTDESIGN_INC_REPORTVISITOR_HXX
 
 #include "dllapi.h"
 #include <com/sun/star/report/XReportDefinition.hpp>
@@ -58,6 +58,6 @@ namespace reportdesign
 
 } // namespace reportdesign
 
-#endif // INCLUDED_REPORT_VISTITOR_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_REPORTVISITOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 918412f9770b..900111105f8f 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_RPTUIDEF_HXX
-#define _REPORT_RPTUIDEF_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
+#define INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
 
 #include <sal/config.h>
 
@@ -117,6 +117,6 @@ template<typename T> void setStyleProperty(const ::com::sun::star::uno::Referenc
 }
 }
 
-#endif // _REPORT_RPTUIDEF_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 964867d92310..40c48c06de9b 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REPORT_RPTMODEL_HXX
-#define REPORT_RPTMODEL_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTMODEL_HXX
+#define INCLUDED_REPORTDESIGN_INC_RPTMODEL_HXX
 
 #include "dllapi.h"
 #include <svx/svdmodel.hxx>
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 8223041b280f..057dfb76d102 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _REPORT_RPTUIOBJ_HXX
-#define _REPORT_RPTUIOBJ_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTOBJECT_HXX
+#define INCLUDED_REPORTDESIGN_INC_RPTOBJECT_HXX
 
 #include "dllapi.h"
 #include <svx/svdoole2.hxx>
@@ -283,6 +283,6 @@ private:
 
 } // rptui
 
-#endif // _REPORT_RPTUIOBJ_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_RPTOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 5c1f22cd0223..466b1ef06d8e 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _REPORT_RPTUIPAGE_HXX
-#define _REPORT_RPTUIPAGE_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
+#define INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
 
 #include "dllapi.h"
 #include "svx/svdpage.hxx"
@@ -86,6 +86,6 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const;
 };
 }
-#endif //_REPORT_RPTUIPAGE_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index d4810cb1250f..a2cf40252017 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_UNDOACTIONS_HXX
-#define RPTUI_UNDOACTIONS_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_UNDOACTIONS_HXX
+#define INCLUDED_REPORTDESIGN_INC_UNDOACTIONS_HXX
 
 #include "dllapi.h"
 
@@ -307,6 +307,6 @@ namespace rptui
     };
 
 }
-#endif //RPTUI_UNDOACTIONS_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_UNDOACTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index caa2fdc5e50a..d087b303899f 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_UNDOENV_HXX
-#define INCLUDED_UNDOENV_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_UNDOENV_HXX
+#define INCLUDED_REPORTDESIGN_INC_UNDOENV_HXX
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index 765ba84846d1..ae65306d68b7 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONDITIONALEXPRESSION_HXX
-#define CONDITIONALEXPRESSION_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_CONDITIONALEXPRESSION_HXX
+#define INCLUDED_REPORTDESIGN_INC_CONDITIONALEXPRESSION_HXX
 
 #include "dllapi.h"
 
@@ -108,6 +108,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // CONDITIONALEXPRESSION_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_CONDITIONALEXPRESSION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/dllapi.h b/reportdesign/inc/dllapi.h
index ae1b5020f318..ce41a483e0fa 100644
--- a/reportdesign/inc/dllapi.h
+++ b/reportdesign/inc/dllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REPORTDESIGNDLLAPI_H
-#define INCLUDED_REPORTDESIGNDLLAPI_H
+#ifndef INCLUDED_REPORTDESIGN_INC_DLLAPI_H
+#define INCLUDED_REPORTDESIGN_INC_DLLAPI_H
 
 #include "sal/types.h"
 
@@ -28,6 +28,6 @@
 #define REPORTDESIGN_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif /* INCLUDED_REPORTDESIGNDLLAPI_H */
+#endif // INCLUDED_REPORTDESIGN_INC_DLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 44dfed532018..6550b0c50600 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REPORTFORMULA_HXX
-#define REPORTFORMULA_HXX
+#ifndef INCLUDED_REPORTDESIGN_INC_REPORTFORMULA_HXX
+#define INCLUDED_REPORTDESIGN_INC_REPORTFORMULA_HXX
 
 #include "dllapi.h"
 
@@ -121,6 +121,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // REPORTFORMULA_HXX
+#endif // INCLUDED_REPORTDESIGN_INC_REPORTFORMULA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index 02244c588467..53f46e3e391b 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_FIXEDLINE_HXX
-#define RPT_FIXEDLINE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDLINE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDLINE_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFixedLine.hpp>
@@ -163,6 +163,6 @@ namespace reportdesign
         virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 }
-#endif //RPT_FIXEDLINE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index c91a31a9327b..66aec839ff7b 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_FIXEDTEXT_HXX
-#define RPT_FIXEDTEXT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDTEXT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDTEXT_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFixedText.hpp>
@@ -148,6 +148,6 @@ namespace reportdesign
         virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 }
-#endif //RPT_FIXEDTEXT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index 3ef9e1c4cc91..fcc9674d076b 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_FORMATCONDITION_HXX
-#define RPT_FORMATCONDITION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATCONDITION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATCONDITION_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFormatCondition.hpp>
@@ -105,6 +105,6 @@ namespace reportdesign
         }
     };
 }
-#endif //RPT_FORMATCONDITION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATCONDITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 488ac8c78c4b..0d9541332e32 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_FORMATTEDFIELD_HXX
-#define RPT_FORMATTEDFIELD_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATTEDFIELD_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATTEDFIELD_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFormattedField.hpp>
@@ -155,6 +155,6 @@ namespace reportdesign
         virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 }
-#endif //RPT_FORMATTEDFIELD_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATTEDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index e4c46487d925..d48c35cb7a1c 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_FUNCTION_HXX
-#define RPT_FUNCTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFunction.hpp>
@@ -115,6 +115,6 @@ namespace reportdesign
         virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 }
-#endif //RPT_FUNCTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx
index 201ba38fd918..2f6f49502b40 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_API_FUNCTIONS_HXX
-#define REPORTDESIGN_API_FUNCTIONS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTIONS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTIONS_HXX
 
 #include <com/sun/star/report/XFunctions.hpp>
 #include <com/sun/star/report/XFunctionsSupplier.hpp>
@@ -93,6 +93,6 @@ namespace reportdesign
         }
     };
 }
-#endif // REPORTDESIGN_API_FUNCTIONS_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 23b434e9797d..5cf5f28458df 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_API_GROUP_HXX
-#define REPORTDESIGN_API_GROUP_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUP_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUP_HXX
 
 #include <com/sun/star/report/XGroup.hpp>
 #include <cppuhelper/compbase2.hxx>
diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx
index 973d92d871c2..4c236285c9e5 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_API_GROUPS_HXX
-#define REPORTDESIGN_API_GROUPS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUPS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUPS_HXX
 
 #include <com/sun/star/report/XGroups.hpp>
 #include <cppuhelper/compbase1.hxx>
@@ -96,6 +96,6 @@ namespace reportdesign
         }
     };
 }
-#endif // REPORTDESIGN_API_GROUPS_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_GROUPS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index 7ee9bc9c2c81..599905a981aa 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_IMAGECONTROL_HXX
-#define RPT_IMAGECONTROL_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XImageControl.hpp>
@@ -152,6 +152,6 @@ namespace reportdesign
         virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 }
-#endif //RPT_IMAGECONTROL_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx
index 11c12d3df665..0c7f96142afd 100644
--- a/reportdesign/source/core/inc/ReportComponent.hxx
+++ b/reportdesign/source/core/inc/ReportComponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_REPORTCOMPONENT_HXX
-#define RPT_REPORTCOMPONENT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCOMPONENT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCOMPONENT_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/container/XChild.hpp>
@@ -76,6 +76,6 @@ namespace reportdesign
                     ,oslInterlockedCount& _rRefCount);
     };
 }
-#endif // RPT_REPORTCOMPONENT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index 7d361dce0e27..a15d0a7164e1 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_REPORTCONTROLMODEL_HXX
-#define RPT_REPORTCONTROLMODEL_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCONTROLMODEL_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCONTROLMODEL_HXX
 
 #include "ReportComponent.hxx"
 #include "com/sun/star/style/VerticalAlignment.hpp"
@@ -124,6 +124,6 @@ namespace reportdesign
         static bool isInterfaceForbidden(const ::com::sun::star::uno::Type& _rType);
     };
 }
-#endif // RPT_REPORTCONTROLMODEL_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCONTROLMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index 530c433d71fd..11c25e94b5b0 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REPORTDRAWPAGE_HXX_INCLUDED
-#define REPORTDRAWPAGE_HXX_INCLUDED
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTDRAWPAGE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTDRAWPAGE_HXX
 
 #include <svx/unopage.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -38,6 +38,6 @@ namespace reportdesign
         virtual ~OReportDrawPage() throw(){}
     };
 }
-#endif //REPORTDRAWPAGE_HXX_INCLUDED
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTDRAWPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 04d2fcaf4dbe..3beeb25e19dd 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_API_REPORTENGINEJFREE_HXX
-#define REPORTDESIGN_API_REPORTENGINEJFREE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTENGINEJFREE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTENGINEJFREE_HXX
 
 #include <sal/config.h>
 
@@ -131,6 +131,6 @@ namespace reportdesign
         }
     };
 }
-#endif //REPORTDESIGN_API_REPORTENGINEJFREE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTENGINEJFREE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx
index 7ae35eec0c8b..a8b173efa24e 100644
--- a/reportdesign/source/core/inc/ReportHelperImpl.hxx
+++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_REPORTHELPERIMPL_HXX
-#define INCLUDED_REPORTHELPERIMPL_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTHELPERIMPL_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTHELPERIMPL_HXX
 // ::com::sun::star::report::XReportComponent:
 #define REPORTCOMPONENT_IMPL3(clazz,arg) \
 OUString SAL_CALL clazz::getName() throw (uno::RuntimeException, std::exception) \
@@ -1279,6 +1279,6 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be
         REPORTCONTROLFORMAT_IMPL2(clazz,varName)
 
 
-#endif //INCLUDED_REPORTHELPERIMPL_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTHELPERIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index f44ccea81b81..1ddffcbb2d7d 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORT_UNDOFACTORY_HXX_INCLUDED
-#define REPORT_UNDOFACTORY_HXX_INCLUDED
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTUNDOFACTORY_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTUNDOFACTORY_HXX
 
 #include <svx/svdundo.hxx>
 #include <memory>
@@ -73,6 +73,6 @@ namespace rptui
 } // rptui
 
 
-#endif // REPORT_UNDOFACTORY_HXX_INCLUDED
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTUNDOFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index 810fd313e208..7fad4b4babdd 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_RPTUILIST_HXX
-#define _REPORT_RPTUILIST_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -52,6 +52,6 @@ public:
     virtual void SAL_CALL propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 }
-#endif // _REPORT_RPTUILIST_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index f18d8d7f54fa..4ca71770ba5b 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_API_SECTION_HXX
-#define REPORTDESIGN_API_SECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SECTION_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include <cppuhelper/compbase6.hxx>
@@ -224,6 +224,6 @@ namespace reportdesign
         void notifyElementRemoved(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape);
     };
 }
-#endif //REPORTDESIGN_API_SECTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index b544783c52cd..7bcea42ae494 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_SHAPE_HXX
-#define RPT_SHAPE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SHAPE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SHAPE_HXX
 
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XShape.hpp>
@@ -170,6 +170,6 @@ namespace reportdesign
         virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 }
-#endif //RPT_SHAPE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index c52cd9fd46be..83dba680e5c7 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_TOOLS_HXX
-#define REPORTDESIGN_TOOLS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_TOOLS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_TOOLS_HXX
 
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XSection.hpp>
@@ -169,6 +169,6 @@ namespace reportdesign
 
 } // namespace reportdesign
 
-#endif // REPORTDESIGN_TOOLS_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_TOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx
index 668e6d3ce173..cbd23f68d8c6 100644
--- a/reportdesign/source/core/inc/conditionupdater.hxx
+++ b/reportdesign/source/core/inc/conditionupdater.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONDITIONUPDATER_HXX
-#define CONDITIONUPDATER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CONDITIONUPDATER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CONDITIONUPDATER_HXX
 
 #include "conditionalexpression.hxx"
 
@@ -62,6 +62,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // CONDITIONUPDATER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CONDITIONUPDATER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx
index 1ac93ca206c0..fe192bd338db 100644
--- a/reportdesign/source/core/inc/core_resource.hxx
+++ b/reportdesign/source/core/inc/core_resource.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORTDESIGN_CORE_RESOURCE_HXX_
-#define REPORTDESIGN_CORE_RESOURCE_HXX_
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 
 #include <rtl/ustring.hxx>
@@ -66,6 +66,6 @@ namespace reportdesign
 }
 
 
-#endif // REPORTDESIGN_CORE_RESOURCE_HXX_
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index d858e78133f8..8aed52415420 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef REPORTDESIGN_FORMATNORMALIZER_HXX
-#define REPORTDESIGN_FORMATNORMALIZER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_SDR_FORMATNORMALIZER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_SDR_FORMATNORMALIZER_HXX
 
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
@@ -81,6 +81,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // REPORTDESIGN_FORMATNORMALIZER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_SDR_FORMATNORMALIZER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 48d7a50749d2..856ec7efcd6c 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTXML_DBLOADER2_HXX
-#define RPTXML_DBLOADER2_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_DBLOADER2_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_DBLOADER2_HXX
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
index 1d771ddc66ee..a8241fde8aea 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLAUTOSTYLE_HXX
-#define RPT_XMLAUTOSTYLE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX
 
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlaustp.hxx>
@@ -49,6 +49,6 @@ namespace rptxml
 
 } // rptxml
 
-#endif // RPT_XMLAUTOSTYLE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index 22153c3d0657..66692ba120c3 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLCELL_HXX
-#define RPT_XMLCELL_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCELL_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCELL_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XReportComponent.hpp>
@@ -63,6 +63,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLCELL_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx
index aa439f69e1e6..2cd626ee4c5a 100644
--- a/reportdesign/source/filter/xml/xmlColumn.hxx
+++ b/reportdesign/source/filter/xml/xmlColumn.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLCOLUMN_HXX
-#define RPT_XMLCOLUMN_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOLUMN_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOLUMN_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
@@ -53,6 +53,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLCOLUMN_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx
index 21bc384237bc..08ece11a572e 100644
--- a/reportdesign/source/filter/xml/xmlComponent.hxx
+++ b/reportdesign/source/filter/xml/xmlComponent.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLCOMPONENT_HXX
-#define RPT_XMLCOMPONENT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -49,6 +49,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLCOMPONENT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
index aa0ade4af677..dce2020f56d4 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLCONDPRTEXPR_HXX
-#define RPT_XMLCONDPRTEXPR_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCONDPRTEXPR_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCONDPRTEXPR_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -47,6 +47,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLCONDPRTEXPR_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCONDPRTEXPR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index a8e5b06c1c02..a280923c036a 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLCONTROLPROPERTY_HXX
-#define RPT_XMLCONTROLPROPERTY_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCONTROLPROPERTY_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCONTROLPROPERTY_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -75,6 +75,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLCONTROLPROPERTY_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCONTROLPROPERTY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx
index cf67fe3fa4b4..8e91f33c90b1 100644
--- a/reportdesign/source/filter/xml/xmlEnums.hxx
+++ b/reportdesign/source/filter/xml/xmlEnums.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLENUMS_HXX
-#define RPT_XMLENUMS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLENUMS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLENUMS_HXX
 
 #define PROGRESS_BAR_STEP 20
 
@@ -169,6 +169,6 @@ namespace rptxml
 
 } // namespace rptxml
 
-#endif // RPT_XMLENUMS_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLENUMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index ae8f1461a17d..2c981ad0125d 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_XMLEXPORT_HXX
-#define RPT_XMLEXPORT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLEXPORT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLEXPORT_HXX
 
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/document/XFilter.hpp>
@@ -265,6 +265,6 @@ public:
 
 } // rptxml
 
-#endif // RPT_XMLEXPORT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index 322af3195fc7..00e5c81555fd 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED
-#define RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLEXPORTDOCUMENTHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLEXPORTDOCUMENTHANDLER_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -94,6 +94,6 @@ private:
 
 } // namespace rptxml
 
-#endif // RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLEXPORTDOCUMENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index ec127a479757..bfcbdcb64d48 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLFIXEDCONTENT_HXX
-#define RPT_XMLFIXEDCONTENT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFIXEDCONTENT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFIXEDCONTENT_HXX
 
 #include "xmlReportElementBase.hxx"
 #include <com/sun/star/drawing/XShapes.hpp>
@@ -61,6 +61,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLFIXEDCONTENT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFIXEDCONTENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
index 081a1fd270a5..78759cf1d25f 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLFORMATCONDITION_HXX
-#define RPT_XMLFORMATCONDITION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFORMATCONDITION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFORMATCONDITION_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XFormatCondition.hpp>
@@ -46,6 +46,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLFORMATTEDFIELD_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFORMATCONDITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx
index 9de28ca501c5..7d8cde07730b 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.hxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLFORMATTEDFIELD_HXX
-#define RPT_XMLFORMATTEDFIELD_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFORMATTEDFIELD_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFORMATTEDFIELD_HXX
 
 #include "xmlReportElementBase.hxx"
 #include <com/sun/star/report/XFormattedField.hpp>
@@ -44,6 +44,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLFORMATTEDFIELD_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFORMATTEDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx
index c77b6fced85e..9bd423fd07ec 100644
--- a/reportdesign/source/filter/xml/xmlFunction.hxx
+++ b/reportdesign/source/filter/xml/xmlFunction.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLFUNCTION_HXX
-#define RPT_XMLFUNCTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFUNCTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFUNCTION_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx
index 64a4e7cceb11..b6fa28b7222b 100644
--- a/reportdesign/source/filter/xml/xmlGroup.hxx
+++ b/reportdesign/source/filter/xml/xmlGroup.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLGROUP_HXX
-#define RPT_XMLGROUP_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLGROUP_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLGROUP_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -55,6 +55,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLGROUP_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLGROUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index aaec815c289c..6f05ded3d3c1 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLHELPER_HXX
-#define RPT_XMLHELPER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLHELPER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLHELPER_HXX
 
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/contextid.hxx>
@@ -79,6 +79,6 @@ namespace rptxml
 
 } // rptxml
 
-#endif // RPT_XMLHELPER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx
index 5fcf715acb0a..c7be45fe7fd1 100644
--- a/reportdesign/source/filter/xml/xmlImage.hxx
+++ b/reportdesign/source/filter/xml/xmlImage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLIMAGE_HXX
-#define RPT_XMLIMAGE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLIMAGE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLIMAGE_HXX
 
 #include "xmlReportElementBase.hxx"
 #include <com/sun/star/report/XImageControl.hpp>
@@ -42,6 +42,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLIMAGE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLIMAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 83cda7b4b848..711884769e17 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED
-#define RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLIMPORTDOCUMENTHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLIMPORTDOCUMENTHANDLER_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -96,6 +96,6 @@ private:
 
 } // namespace rptxml
 
-#endif // RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLIMPORTDOCUMENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx
index 7e7f1215fbd0..875c39e0ec90 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.hxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLMASTERFIELDS_HXX
-#define RPT_XMLMASTERFIELDS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLMASTERFIELDS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLMASTERFIELDS_HXX
 
 #include <xmloff/xmlictxt.hxx>
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
index 27b06bcb8d9a..39e5461f44b4 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLPROPHANDLER_HXX
-#define RPT_XMLPROPHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLPROPERTYHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/contextid.hxx>
@@ -37,6 +37,6 @@ namespace rptxml
 
 }// rptxml
 
-#endif //RPT_XMLPROPHANDLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index c2d00ba1e3c3..4fc6177eafa6 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLREPORT_HXX
-#define RPT_XMLREPORT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORT_HXX
 
 #include "xmlReportElementBase.hxx"
 #include <vector>
@@ -59,6 +59,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLREPORT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx
index 81ff309594f2..8e5b25da0b3e 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLREPORTELEMENT_HXX
-#define RPT_XMLREPORTELEMENT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORTELEMENT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORTELEMENT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XReportControlModel.hpp>
@@ -47,6 +47,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLREPORTELEMENT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORTELEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index 75d37b26bede..efbe98db8f03 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLREPORTELEMENTBASE_HXX
-#define RPT_XMLREPORTELEMENTBASE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORTELEMENTBASE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORTELEMENTBASE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XReportComponent.hpp>
@@ -68,6 +68,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLREPORTELEMENTBASE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLREPORTELEMENTBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 17f035cb2dbc..611e1e9075ca 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLSECTION_HXX
-#define RPT_XMLSECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSECTION_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -53,6 +53,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLSECTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index e71d5f226e35..76bc19800e44 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_XMLSTYLEIMPORT_HXX
-#define RPT_XMLSTYLEIMPORT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
 
 #include <rtl/ustring.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -150,6 +150,6 @@ namespace rptxml
 
 } // rptxml
 
-#endif // RPT_XMLSTYLEIMPORT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index 4cde9af7989d..fe93a4b82cce 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLSUBDOCUMENT_HXX
-#define RPT_XMLSUBDOCUMENT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSUBDOCUMENT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSUBDOCUMENT_HXX
 
 #include "xmlReportElementBase.hxx"
 #include <com/sun/star/report/XReportComponent.hpp>
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index d3782eff9893..d8bbb3a9a6ab 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLTABLE_HXX
-#define RPT_XMLTABLE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLTABLE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLTABLE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -88,6 +88,6 @@ namespace rptxml
 } // namespace rptxml
 
 
-#endif // RPT_XMLTABLE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 65f2abb7ea39..f49d66deecb0 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_XMLFILTER_HXX
-#define RPT_XMLFILTER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFILTER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFILTER_HXX
 
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/document/XFilter.hpp>
@@ -234,6 +234,6 @@ public:
 
 } // rptxml
 
-#endif // RPT_XMLFILTER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx
index a0114e179886..d2ec0ac1c78b 100644
--- a/reportdesign/source/inc/GroupProperties.hxx
+++ b/reportdesign/source/inc/GroupProperties.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_SHARED_GROUPS_PROPERTIES_HXX
-#define RPT_SHARED_GROUPS_PROPERTIES_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_INC_GROUPPROPERTIES_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_INC_GROUPPROPERTIES_HXX
 
 namespace rptshared
 {
@@ -43,6 +43,6 @@ namespace rptshared
         {}
     };
 }
-#endif //RPT_SHARED_GROUPS_PROPERTIES_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_INC_GROUPPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index d5d4a244d58e..2e1b66db3e46 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_CONDITION_HXX
-#define RPTUI_CONDITION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_CONDITION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_CONDITION_HXX
 
 #include "conditionalexpression.hxx"
 
@@ -181,6 +181,6 @@ namespace rptui
 
 } // namespace rptui
 
-#endif // RPTUI_CONDITION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_CONDITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx
index 8a0c560ab0ed..57259b504684 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.hxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_GROUP_EXCHANGE_HXX
-#define RPTUI_GROUP_EXCHANGE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -41,6 +41,6 @@ namespace rptui
         virtual void        ObjectReleased() SAL_OVERRIDE;
     };
 }
-#endif // RPTUI_GROUP_EXCHANGE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 5d6bbd1a5631..a73c00934324 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_ADDFIELDWINDOW_HXX
-#define RPTUI_ADDFIELDWINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -125,6 +125,6 @@ private:
 
 } // rptui
 
-#endif // RPTUI_ADDFIELDWINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx
index ab55bc3e0f20..3a4f9b333c9b 100644
--- a/reportdesign/source/ui/inc/ColorChanger.hxx
+++ b/reportdesign/source/ui/inc/ColorChanger.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_COLORCHANGER_HXX
-#define RPTUI_COLORCHANGER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
 
 namespace rptui
 {
@@ -58,6 +58,6 @@ namespace rptui
         }
     };
 }
-#endif //RPTUI_COLORCHANGER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index ed6335bfb4e0..351b702b7b85 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_COLORLISTENER_HXX
-#define RPTUI_COLORLISTENER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORLISTENER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORLISTENER_HXX
 
 #include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
@@ -72,6 +72,6 @@ namespace rptui
         virtual void    setCollapsed(sal_Bool _bCollapsed);
     };
 }
-#endif // RPTUI_COLORLISTENER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx
index 5ecc99e26b8b..ce8728459eea 100644
--- a/reportdesign/source/ui/inc/ColumnInfo.hxx
+++ b/reportdesign/source/ui/inc/ColumnInfo.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_COLUMNINFO_HXX
-#define RPTUI_COLUMNINFO_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLUMNINFO_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLUMNINFO_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -43,6 +43,6 @@ namespace rptui
 
 } // namespace rptui
 
-#endif // RPTUI_COLUMNINFO_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLUMNINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 1719c928d99a..2a177e50d2ef 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_CONDFORMAT_HXX
-#define RPTUI_CONDFORMAT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
 
 #include "ModuleHelper.hxx"
 
@@ -178,6 +178,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPTUI_CONDFORMAT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index b6b453471b7a..d4a78981dac8 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_DATAPROVIDERHANDLER_HXX
-#define RPT_DATAPROVIDERHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATAPROVIDERHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATAPROVIDERHANDLER_HXX
 
 #include "sal/config.h"
 
@@ -120,6 +120,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPT_DATAPROVIDERHANDLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATAPROVIDERHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index 2fdb55654d6a..439fb41e1c6b 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_DATETIME_HXX
-#define RPTUI_DATETIME_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -89,6 +89,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_DATETIME_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 42efb604e88f..21807cf5db8c 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPT_DEFAULTINSPECTION_HXX
-#define RPT_DEFAULTINSPECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DEFAULTINSPECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DEFAULTINSPECTION_HXX
 
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -97,6 +97,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPT_DEFAULTINSPECTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DEFAULTINSPECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 50db08572404..4b2feec22f1c 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_DESIGNVIEW_HXX
-#define RPTUI_DESIGNVIEW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX
 
 #include <dbaccess/dataview.hxx>
 #include <com/sun/star/frame/XController.hpp>
@@ -276,6 +276,6 @@ namespace rptui
 
 }   //rptui
 
-#endif // RPTUI_DESIGNVIEW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx
index 90d13d45040a..e189585c63ad 100644
--- a/reportdesign/source/ui/inc/EndMarker.hxx
+++ b/reportdesign/source/ui/inc/EndMarker.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_ENDMARKER_HXX
-#define RPTUI_ENDMARKER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ENDMARKER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ENDMARKER_HXX
 
 #include "ColorListener.hxx"
 
@@ -41,6 +41,6 @@ namespace rptui
         virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     };
 }
-#endif // RPTUI_ENDMARKER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ENDMARKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index 952517067ec3..052206cbf9ae 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FIXEDTEXTCOLOR_HXX
-#define INCLUDED_FIXEDTEXTCOLOR_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FIXEDTEXTCOLOR_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FIXEDTEXTCOLOR_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
index 8e4358528a50..471afb32397f 100644
--- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
+++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FORMATTEDFIELDBEAUTIFIER_HXX
-#define INCLUDED_FORMATTEDFIELDBEAUTIFIER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMATTEDFIELDBEAUTIFIER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMATTEDFIELDBEAUTIFIER_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index d3b2f1088892..d0643a489bcb 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_FORMULA_HXX
-#define RPTUI_FORMULA_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMULA_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMULA_HXX
 
 #include <formula/formula.hxx>
 #include <formula/IControlReferenceHandler.hxx>
@@ -109,6 +109,6 @@ protected:
 } // rptui
 
 
-#endif // RPTUI_FORMULA_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMULA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index dcbe8ba374b2..bf384f0a0798 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_FUNCTIONHELPER_HXX
-#define RPTUI_FUNCTIONHELPER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FUNCTIONHELPER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FUNCTIONHELPER_HXX
 
 #include <formula/IFunctionDescription.hxx>
 #include <com/sun/star/report/meta/XFunctionManager.hpp>
@@ -99,6 +99,6 @@ public:
 } // rptui
 
 
-#endif //RPTUI_FUNCTIONHELPER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FUNCTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 8357a218beea..b176f1cdcd90 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_GEOMETRYHANDLER_HXX
-#define RPT_GEOMETRYHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GEOMETRYHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GEOMETRYHANDLER_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 3a952f56eb24..66e434ae7984 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_GROUPS_SORTING_HXX
-#define RPTUI_GROUPS_SORTING_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
 
 #include <vcl/floatwin.hxx>
 #include <vcl/fixed.hxx>
@@ -185,6 +185,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_GROUPS_SORTING_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx
index 7fb6d084464f..c5921dfc7afd 100644
--- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BEAUTIFIER_HXX
-#define INCLUDED_BEAUTIFIER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_IREPORTCONTROLLEROBSERVER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_IREPORTCONTROLLEROBSERVER_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 
diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx
index 7fa6c2e6a349..52ee1d3f62e8 100644
--- a/reportdesign/source/ui/inc/MarkedSection.hxx
+++ b/reportdesign/source/ui/inc/MarkedSection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_MARKEDSECTION_HXX
-#define RPTUI_MARKEDSECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 
 #include <boost/shared_ptr.hpp>
 
@@ -52,6 +52,6 @@ namespace rptui
 
 } // rptui
 
-#endif /* RPTUI_MARKEDSECTION_HXX */
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index c67312a10808..42b5fa016cb5 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_RPTUI_NAVIGATOR_HXX
-#define INCLUDED_RPTUI_NAVIGATOR_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 
 #include <vcl/floatwin.hxx>
 #include "ModuleHelper.hxx"
@@ -44,6 +44,6 @@ namespace rptui
 
 } // namespace rptui
 
-#endif // INCLUDED_RPTUI_NAVIGATOR_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx
index 4298af5ca28a..19a1b6c65126 100644
--- a/reportdesign/source/ui/inc/PageNumber.hxx
+++ b/reportdesign/source/ui/inc/PageNumber.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_PAGENUMBER_HXX
-#define RPTUI_PAGENUMBER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -65,6 +65,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_PAGENUMBER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index c41699f90bca..b6ff75a8d2d5 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_REPORTCOMPONENTHANDLER_HXX
-#define RPT_REPORTCOMPONENTHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCOMPONENTHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCOMPONENTHANDLER_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -106,6 +106,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPT_REPORTCOMPONENTHANDLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCOMPONENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 89b334ddd188..95e5eff51cce 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_REPORTCONTROLLER_HXX
-#define RPTUI_REPORTCONTROLLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
 
 #include "DesignView.hxx"
 #include "ModuleHelper.hxx"
@@ -469,6 +469,6 @@ namespace rptui
         void            addUndoAction( SfxUndoAction* i_pAction );
     };
 }
-#endif // RPTUI_REPORTCONTROLLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 947d10d0ef97..125f4fabb60d 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_REPORTCONTROLLEROBSERVER_HXX
-#define INCLUDED_REPORTCONTROLLEROBSERVER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLEROBSERVER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLEROBSERVER_HXX
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
@@ -112,7 +112,7 @@ namespace rptui
 
 } // namespace rptui
 
-#endif /* INCLUDED_REPORTCONTROLLEROBSERVER_HXX */
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLEROBSERVER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportDefines.hxx b/reportdesign/source/ui/inc/ReportDefines.hxx
index 9f9007d0ad4b..0cca0d817f5b 100644
--- a/reportdesign/source/ui/inc/ReportDefines.hxx
+++ b/reportdesign/source/ui/inc/ReportDefines.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_REPORT_DEFINES_HXX
-#define RPTUI_REPORT_DEFINES_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTDEFINES_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTDEFINES_HXX
 
 namespace rptui
 {
@@ -28,6 +28,6 @@ namespace rptui
 #define REPORT_EXTRA_SPACE           10
 
 }
-#endif //RPTUI_REPORT_DEFINES_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTDEFINES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx
index c289dd1383da..75519ca181db 100644
--- a/reportdesign/source/ui/inc/ReportRuler.hxx
+++ b/reportdesign/source/ui/inc/ReportRuler.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_RULER_HXX
-#define RPTUI_RULER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTRULER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTRULER_HXX
 
 #include <vcl/window.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -52,6 +52,6 @@ namespace rptui
 
 } // rptui
 
-#endif // RPTUI_RULER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTRULER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index 59711714891f..e282695c9734 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef REPORT_REPORTSECTION_HXX
-#define REPORT_REPORTSECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTSECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTSECTION_HXX
 
 #include <vcl/window.hxx>
 #include "RptPage.hxx"
@@ -165,6 +165,6 @@ namespace rptui
 
 }   //rptui
 
-#endif // REPORT_REPORTSECTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index bf48dcf23c18..7dcb6453c80a 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_REPORT_WINDOW_HXX
-#define RPTUI_REPORT_WINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTWINDOW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTWINDOW_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include "ReportDefines.hxx"
@@ -226,6 +226,6 @@ namespace rptui
 
 }   //rptui
 
-#endif // RPTUI_REPORT_WINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index ec1d37ad31e6..1fd0ea9aa58d 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_UNDO_HXX
-#define RPTUI_UNDO_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
 
 #include "UndoActions.hxx"
 #include <functional>
@@ -138,6 +138,6 @@ namespace rptui
         virtual void        Redo() SAL_OVERRIDE;
     };
 }
-#endif // RPTUI_UNDO_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 0ca6ba62c153..374370d9474f 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_SCROLLHELPER_HXX
-#define RPTUI_SCROLLHELPER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SCROLLHELPER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SCROLLHELPER_HXX
 
 #include <vcl/scrbar.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -215,6 +215,6 @@ namespace rptui
         sal_uInt16 getZoomFactor(SvxZoomType _eType) const;
     };
 }
-#endif // RPTUI_SCROLLHELPER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SCROLLHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx
index 3e86257835b2..0cfc1ed3a714 100644
--- a/reportdesign/source/ui/inc/SectionView.hxx
+++ b/reportdesign/source/ui/inc/SectionView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_SECTIONVIEW_HXX
-#define _REPORT_SECTIONVIEW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONVIEW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONVIEW_HXX
 
 
 #include <svx/svdview.hxx>
@@ -66,6 +66,6 @@ public:
     bool IsDragResize() const;
 };
 }
-#endif //_REPORT_SECTIONVIEW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 1741d7f223c3..8db95362e304 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_SECTIONWINDOW_HXX
-#define RPTUI_SECTIONWINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONWINDOW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONWINDOW_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include <vcl/window.hxx>
@@ -126,6 +126,6 @@ namespace rptui
 
 } // rptui
 
-#endif // RPTUI_SECTIONWINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 7851b6dad4bd..2ae119348a87 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_STARTMARKER_HXX
-#define RPTUI_STARTMARKER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
 
 #include <osl/interlck.h>
 #include <svtools/ruler.hxx>
@@ -74,6 +74,6 @@ namespace rptui
         void            zoom(const Fraction& _aZoom);
     };
 }
-#endif // RPTUI_STARTMARKER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 204b55864527..5f08bb180bee 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_UITOOLS_HXX
-#define RPTUI_UITOOLS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
 
 #include <com/sun/star/report/XGroup.hpp>
 #include <com/sun/star/report/XReportControlFormat.hpp>
@@ -178,6 +178,6 @@ namespace rptui
     */
     void setZoomFactor(const Fraction& _aZoom,Window& _rWindow);
 }
-#endif //RPTUI_UITOOLS_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index a4741d84ea86..e074cadeb146 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_VIEWSWINDOW_HXX
-#define RPTUI_VIEWSWINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_VIEWSWINDOW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_VIEWSWINDOW_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include <vcl/window.hxx>
@@ -343,6 +343,6 @@ namespace rptui
 
 } // rptui
 
-#endif // RPTUI_VIEWSWINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_VIEWSWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx
index ad5657536868..9c448a29fc7b 100644
--- a/reportdesign/source/ui/inc/dlgedclip.hxx
+++ b/reportdesign/source/ui/inc/dlgedclip.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_RPTUICLIP_HXX
-#define _REPORT_RPTUICLIP_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
 
 #include <svtools/transfer.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -75,6 +75,6 @@ private:
     TSectionElements    m_aCopyElements;
 };
 }
-#endif // _REPORT_RPTUICLIP_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx
index bf2ca09c3457..1f3c146856cc 100644
--- a/reportdesign/source/ui/inc/dlgedfac.hxx
+++ b/reportdesign/source/ui/inc/dlgedfac.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_RPTUIFAC_HXX
-#define _REPORT_RPTUIFAC_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
 
 
 #include <svx/svdobj.hxx>
@@ -37,6 +37,6 @@ public:
     DECL_LINK( MakeObject, SdrObjFactory * );
 };
 }
-#endif // _REPORT_RPTUIFAC_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index a975f0a21850..3b22777b5637 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _REPORT_RPTUIFUNC_HXX
-#define _REPORT_RPTUIFUNC_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
 
 #include <vcl/timer.hxx>
 
@@ -149,6 +149,6 @@ public:
 };
 
 }
-#endif //_REPORT_RPTUIFUNC_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx
index f3eb887aeea1..672207469db0 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_DLGPAGE_HXX
-#define RPTUI_DLGPAGE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGPAGE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGPAGE_HXX
 
 #include <sfx2/tabdlg.hxx>
 
@@ -42,6 +42,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_DLGPAGE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 65a9942d479d..79f479cd790b 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_METADATA_HXX_
-#define RPTUI_METADATA_HXX_
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
 
 #include "ModuleHelper.hxx"
 
@@ -148,6 +148,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPTUI_METADATA_HXX_
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index cf22ed751ac3..051fc9a98c3b 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_PROPBRW_HXX
-#define _REPORT_PROPBRW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -106,6 +106,6 @@ private:
 
 } // rptui
 
-#endif // _REPORT_PROPBRW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx
index 0dd86d4d63b1..5be27b9e9ac8 100644
--- a/reportdesign/source/ui/inc/statusbarcontroller.hxx
+++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_STATUSBARCONTROLLER_HXX
-#define RPTUI_STATUSBARCONTROLLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STATUSBARCONTROLLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STATUSBARCONTROLLER_HXX
 
 #include <svtools/statusbarcontroller.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index 39b2dc2604b5..a4a668c1994f 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_TOOLBOXCONTROLLER_HXX
-#define RPTUI_TOOLBOXCONTROLLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 #include <sal/config.h>
 
@@ -82,6 +82,6 @@ namespace rptui
 
 } // rptui
 
-#endif //RPTUI_TOOLBOXCONTROLLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
author	Thomas Arnhold <thomas@arnhold.org>	2014-04-18 18:54:04 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2014-04-19 11:10:09 +0200
commit	436f9d16c4b2535ebf927e4fb56c3b7bfee9e509 (patch)
tree	9e3f08f270bca9540c78063e8fd28a98910c56b9 /reportdesign
parent	55c70634b891c7da7a0e1606cc0b498b7cbc9d71 (diff)