loplugin:includeform: reportdesign

Change-Id: Ie531677be09c264ed1536ad2512e76f29ab46881

41 files changed, 187 insertions, 187 deletions

diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index e9aea2c5a936..e9468e58d5dc 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -16,18 +16,18 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "FixedLine.hxx"
+#include <FixedLine.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "strings.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
+#include <strings.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "Tools.hxx"
-#include "FormatCondition.hxx"
+#include <Tools.hxx>
+#include <FormatCondition.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
-#include "ReportHelperImpl.hxx"
+#include <ReportHelperImpl.hxx>
 
 #define MIN_WIDTH   80
 #define MIN_HEIGHT  20
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 0ebad3934f31..4ab06e2ca3e6 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -16,19 +16,19 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "FixedText.hxx"
+#include <FixedText.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "strings.hxx"
+#include <strings.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include "strings.hrc"
-#include "core_resource.hxx"
-#include "Tools.hxx"
+#include <strings.hrc>
+#include <core_resource.hxx>
+#include <Tools.hxx>
 #include <tools/color.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "FormatCondition.hxx"
+#include <FormatCondition.hxx>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
-#include "ReportHelperImpl.hxx"
+#include <ReportHelperImpl.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index d5ff822d2678..eb1a96406f6c 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -16,16 +16,16 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "FormatCondition.hxx"
+#include <FormatCondition.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "strings.hxx"
+#include <strings.hxx>
 #include <tools/color.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "Tools.hxx"
+#include <Tools.hxx>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
-#include "ReportHelperImpl.hxx"
+#include <ReportHelperImpl.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index b00c5e1d6669..72a300e8876d 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -16,20 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "FormattedField.hxx"
+#include <FormattedField.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include "strings.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
+#include <strings.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
 #include <tools/color.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "Tools.hxx"
-#include "FormatCondition.hxx"
+#include <Tools.hxx>
+#include <FormatCondition.hxx>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
-#include "ReportHelperImpl.hxx"
+#include <ReportHelperImpl.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index e365dc928e70..44782a4cd6ff 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -16,13 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Function.hxx"
+#include <Function.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "strings.hxx"
+#include <strings.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "Tools.hxx"
+#include <Tools.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index d70ca0fcf427..0b30ee4c82fb 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Functions.hxx"
-#include "Function.hxx"
-#include "core_resource.hxx"
-#include "strings.hrc"
+#include <Functions.hxx>
+#include <Function.hxx>
+#include <core_resource.hxx>
+#include <strings.hrc>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <comphelper/property.hxx>
 #include <algorithm>
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 6bcba7b6dbc6..bdb275d3bb63 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -16,19 +16,19 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Group.hxx"
-#include "Section.hxx"
+#include <Group.hxx>
+#include <Section.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/report/GroupOn.hpp>
 #include <com/sun/star/report/KeepTogether.hpp>
-#include "strings.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
-#include "Tools.hxx"
+#include <strings.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
+#include <Tools.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "Functions.hxx"
+#include <Functions.hxx>
 
 
 namespace reportdesign
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index 3a4ae59b9872..96270e5d3f19 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Groups.hxx"
-#include "Group.hxx"
+#include <Groups.hxx>
+#include <Group.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include "core_resource.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <strings.hrc>
 #include <algorithm>
 
 namespace reportdesign
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index f0d48b45976a..94a919465ae5 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -16,20 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ImageControl.hxx"
+#include <ImageControl.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include "strings.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
-#include "Tools.hxx"
+#include <strings.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
+#include <Tools.hxx>
 #include <tools/color.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "FormatCondition.hxx"
+#include <FormatCondition.hxx>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
-#include "ReportHelperImpl.hxx"
+#include <ReportHelperImpl.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 5504abb4a4de..b0e8bea140cb 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -16,9 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ReportComponent.hxx"
+#include <ReportComponent.hxx>
 
-#include "strings.hxx"
+#include <strings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
@@ -26,7 +26,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontWidth.hpp>
-#include "ReportControlModel.hxx"
+#include <ReportControlModel.hxx>
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index 46cef2f88ed4..0b50c4025bd0 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ReportControlModel.hxx"
+#include <ReportControlModel.hxx>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 namespace reportdesign
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index d5be7e28e698..576cfcd7d115 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -21,25 +21,25 @@
 
 #include <vector>
 
-#include "ReportDefinition.hxx"
-
-#include "FixedLine.hxx"
-#include "FixedText.hxx"
-#include "FormattedField.hxx"
-#include "Functions.hxx"
-#include "Groups.hxx"
-#include "ImageControl.hxx"
-#include "ReportComponent.hxx"
-#include "ReportHelperImpl.hxx"
-#include "RptDef.hxx"
-#include "RptModel.hxx"
-#include "Section.hxx"
-#include "Shape.hxx"
-#include "Tools.hxx"
-#include "UndoEnv.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
-#include "strings.hxx"
+#include <ReportDefinition.hxx>
+
+#include <FixedLine.hxx>
+#include <FixedText.hxx>
+#include <FormattedField.hxx>
+#include <Functions.hxx>
+#include <Groups.hxx>
+#include <ImageControl.hxx>
+#include <ReportComponent.hxx>
+#include <ReportHelperImpl.hxx>
+#include <RptDef.hxx>
+#include <RptModel.hxx>
+#include <Section.hxx>
+#include <Shape.hxx>
+#include <Tools.hxx>
+#include <UndoEnv.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
+#include <strings.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 0685a3da7a30..27820b907cab 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "ReportEngineJFree.hxx"
+#include <ReportEngineJFree.hxx>
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -44,10 +44,10 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
-#include "Tools.hxx"
-#include "strings.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
+#include <Tools.hxx>
+#include <strings.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
 
 #include <connectivity/CommonTools.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx
index 28906d82f19b..0ef59043d132 100644
--- a/reportdesign/source/core/api/ReportVisitor.cxx
+++ b/reportdesign/source/core/api/ReportVisitor.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ReportVisitor.hxx"
+#include <ReportVisitor.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index c712046276d3..62b1892f16ca 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Section.hxx"
+#include <Section.hxx>
 #include <comphelper/enumhelper.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -25,18 +25,18 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "strings.hxx"
-#include "core_resource.hxx"
-#include "strings.hrc"
-#include "Tools.hxx"
-#include "RptModel.hxx"
-#include "RptPage.hxx"
-#include "ReportDefinition.hxx"
-#include "Shape.hxx"
+#include <strings.hxx>
+#include <core_resource.hxx>
+#include <strings.hrc>
+#include <Tools.hxx>
+#include <RptModel.hxx>
+#include <RptPage.hxx>
+#include <ReportDefinition.hxx>
+#include <Shape.hxx>
 #include <svx/unoshape.hxx>
 #include <vcl/svapp.hxx>
-#include "RptObject.hxx"
-#include "ReportDrawPage.hxx"
+#include <RptObject.hxx>
+#include <ReportDrawPage.hxx>
 #include <comphelper/property.hxx>
 
 namespace reportdesign
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 3ed54547b154..c6cfed2460ab 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Shape.hxx"
+#include <Shape.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -28,13 +28,13 @@
 #include <tools/diagnose_ex.h>
 #include <svx/unoshape.hxx>
 
-#include "strings.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
-#include "Tools.hxx"
-#include "RptObject.hxx"
-#include "FormatCondition.hxx"
-#include "ReportHelperImpl.hxx"
+#include <strings.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
+#include <Tools.hxx>
+#include <RptObject.hxx>
+#include <FormatCondition.hxx>
+#include <ReportHelperImpl.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index 886e7fe16675..070ece65f51b 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -16,9 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "Tools.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
+#include <Tools.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
 #include <comphelper/property.hxx>
 
 
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
index ba2ce3d55077..9b95f74627ad 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/reportdesign/source/core/api/services.cxx
@@ -19,15 +19,15 @@
 #include <sal/types.h>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include "ReportDefinition.hxx"
-#include "FormattedField.hxx"
-#include "FixedText.hxx"
-#include "ImageControl.hxx"
-#include "FormatCondition.hxx"
-#include "ReportEngineJFree.hxx"
-#include "Function.hxx"
-#include "Shape.hxx"
-#include "FixedLine.hxx"
+#include <ReportDefinition.hxx>
+#include <FormattedField.hxx>
+#include <FixedText.hxx>
+#include <ImageControl.hxx>
+#include <FormatCondition.hxx>
+#include <ReportEngineJFree.hxx>
+#include <Function.hxx>
+#include <Shape.hxx>
+#include <FixedLine.hxx>
 
 /********************************************************************************************/
 
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index 2315c6443f3f..90a30284f8b9 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "ReportHelperDefines.hxx"
+#include <ReportHelperDefines.hxx>
 
 
 namespace reportdesign
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index 1c46659cb032..ff95757fcee9 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "ReportHelperDefines.hxx"
+#include <ReportHelperDefines.hxx>
 
 
 namespace reportdesign
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index 3227f48fc938..ab460f030d88 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "ReportHelperDefines.hxx"
+#include <ReportHelperDefines.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 7ca13dabd009..6ffe6f7a2e2c 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "ReportHelperDefines.hxx"
+#include <ReportHelperDefines.hxx>
 
 
 namespace reportdesign
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 7f49e80a52a8..1944eeb55238 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -25,7 +25,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include "GroupProperties.hxx"
+#include <GroupProperties.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index 7152df9cda23..400161891bab 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "ReportHelperDefines.hxx"
+#include <ReportHelperDefines.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 327e30f6f118..ae28b48d2060 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "ReportHelperDefines.hxx"
+#include <ReportHelperDefines.hxx>
 #include <comphelper/propagg.hxx>
 #include <memory>
 
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 64ad3ab96f78..80146d796635 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -28,7 +28,7 @@
 
 
 #include "Section.hxx"
-#include "strings.hxx"
+#include <strings.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx
index 060bcff58aa1..fd626a9d5a32 100644
--- a/reportdesign/source/core/inc/conditionupdater.hxx
+++ b/reportdesign/source/core/inc/conditionupdater.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CONDITIONUPDATER_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CONDITIONUPDATER_HXX
 
-#include "conditionalexpression.hxx"
+#include <conditionalexpression.hxx>
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/report/XReportControlModel.hpp>
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index c9b2f2dae29b..dc25d4b50bfc 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "conditionalexpression.hxx"
+#include <conditionalexpression.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index cb3317bdc799..66afe169c2f0 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "conditionupdater.hxx"
-#include "reportformula.hxx"
+#include <conditionupdater.hxx>
+#include <reportformula.hxx>
 
 #include <com/sun/star/report/XFormatCondition.hpp>
 
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index cbea9f8ad459..c5026a545e94 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "reportformula.hxx"
+#include <reportformula.hxx>
 
 #include <rtl/ustrbuf.hxx>
 
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 8f1a10f7bbeb..dc74fcae2380 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 #include <unotools/resmgr.hxx>
 
 // ---- needed as long as we have no contexts for components ---
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 0b06d5946698..48ad24533135 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -16,14 +16,14 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "PropertyForward.hxx"
+#include <PropertyForward.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/property.hxx>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "strings.hxx"
+#include <strings.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 56573be9421a..619c699ad57b 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ReportDrawPage.hxx"
-#include "RptObject.hxx"
-#include "RptModel.hxx"
-#include "RptDef.hxx"
-#include "strings.hxx"
+#include <ReportDrawPage.hxx>
+#include <RptObject.hxx>
+#include <RptModel.hxx>
+#include <RptDef.hxx>
+#include <strings.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 712eb12e8727..e40411c3b2ec 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ReportUndoFactory.hxx"
-#include "RptObject.hxx"
-#include "UndoActions.hxx"
-#include "strings.hrc"
+#include <ReportUndoFactory.hxx>
+#include <RptObject.hxx>
+#include <UndoActions.hxx>
+#include <strings.hrc>
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 6e9371015c5f..857e0823ab21 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -17,27 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "RptModel.hxx"
-#include "RptPage.hxx"
+#include <RptModel.hxx>
+#include <RptPage.hxx>
 #include <dbaccess/dbsubcomponentcontroller.hxx>
 #include <unotools/resmgr.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 
-#include "UndoActions.hxx"
-#include "UndoEnv.hxx"
-#include "ReportUndoFactory.hxx"
-#include "ReportDefinition.hxx"
+#include <UndoActions.hxx>
+#include <UndoEnv.hxx>
+#include <ReportUndoFactory.hxx>
+#include <ReportDefinition.hxx>
 
 #include <svx/tbcontrl.hxx>
-#include "rptui_slotid.hrc"
-#include "RptDef.hxx"
-#include "strings.hxx"
-#include "FixedLine.hxx"
-#include "FormattedField.hxx"
-#include "FixedText.hxx"
-#include "ImageControl.hxx"
-#include "Shape.hxx"
+#include <rptui_slotid.hrc>
+#include <RptDef.hxx>
+#include <strings.hxx>
+#include <FixedLine.hxx>
+#include <FormattedField.hxx>
+#include <FixedText.hxx>
+#include <ImageControl.hxx>
+#include <Shape.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index eb8a591e6638..a7cadc93e281 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -16,21 +16,21 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "RptObject.hxx"
+#include <RptObject.hxx>
 #include <vector>
 #include <algorithm>
 
 #include <RptDef.hxx>
 #include <svx/unoshape.hxx>
-#include "RptModel.hxx"
-#include "RptObjectListener.hxx"
+#include <RptModel.hxx>
+#include <RptObjectListener.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
-#include "RptPage.hxx"
+#include <RptPage.hxx>
 #include <dbaccess/dbsubcomponentcontroller.hxx>
 
 #include <strings.hrc>
-#include "strings.hxx"
+#include <strings.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlndsit.hxx>
@@ -63,11 +63,11 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <tools/diagnose_ex.h>
-#include "PropertyForward.hxx"
+#include <PropertyForward.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
-#include "UndoActions.hxx"
-#include "UndoEnv.hxx"
+#include <UndoActions.hxx>
+#include <UndoEnv.hxx>
 #include <functional>
 
 namespace rptui
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index 32a742b281e8..1db0df93a0d4 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -16,9 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "RptObjectListener.hxx"
-#include "RptObject.hxx"
-#include "RptDef.hxx"
+#include <RptObjectListener.hxx>
+#include <RptObject.hxx>
+#include <RptDef.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index f64808bb1ad6..0d3465e93b30 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -16,13 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "RptPage.hxx"
-#include "RptModel.hxx"
-#include "Section.hxx"
-#include "RptObject.hxx"
+#include <RptPage.hxx>
+#include <RptModel.hxx>
+#include <Section.hxx>
+#include <RptObject.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unoshape.hxx>
-#include "ReportDrawPage.hxx"
+#include <ReportDrawPage.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 68a6023f1a71..df9bd7fafc77 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "UndoActions.hxx"
-#include "UndoEnv.hxx"
+#include <UndoActions.hxx>
+#include <UndoEnv.hxx>
 #include "formatnormalizer.hxx"
-#include "conditionupdater.hxx"
-#include "strings.hxx"
-#include "rptui_slotid.hrc"
-#include "RptDef.hxx"
-#include "core_resource.hxx"
-#include "RptObject.hxx"
-#include "RptPage.hxx"
-#include "strings.hrc"
-#include "RptModel.hxx"
+#include <conditionupdater.hxx>
+#include <strings.hxx>
+#include <rptui_slotid.hrc>
+#include <RptDef.hxx>
+#include <core_resource.hxx>
+#include <RptObject.hxx>
+#include <RptPage.hxx>
+#include <strings.hrc>
+#include <RptModel.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 32db314522a6..8511c6e65167 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -16,17 +16,17 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "UndoActions.hxx"
-#include "UndoEnv.hxx"
+#include <UndoActions.hxx>
+#include <UndoEnv.hxx>
 #include "formatnormalizer.hxx"
-#include "conditionupdater.hxx"
-#include "strings.hxx"
-#include "rptui_slotid.hrc"
-#include "RptDef.hxx"
-#include "RptObject.hxx"
-#include "RptPage.hxx"
-#include "strings.hrc"
-#include "RptModel.hxx"
+#include <conditionupdater.hxx>
+#include <strings.hxx>
+#include <rptui_slotid.hrc>
+#include <RptDef.hxx>
+#include <RptObject.hxx>
+#include <RptPage.hxx>
+#include <strings.hrc>
+#include <RptModel.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 50c13092df54..092c289160a1 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "formatnormalizer.hxx"
-#include "RptModel.hxx"
+#include <RptModel.hxx>
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/XParametersSupplier.hpp>