5 files changed, 2 insertions, 32 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 61a6f1741257..2d6ad039369a 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -35,8 +35,6 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
 
-#define ITEMID_COLOR
-#define ITEMID_BRUSH
 #include <svx/tbcontrl.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 6a3bdca05eee..e1d18fd0af77 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -76,10 +76,6 @@
 #include "metadata.hxx"
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-
-#define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
-#define ITEMID_DASH_LIST        SID_DASH_LIST
-#define ITEMID_LINEEND_LIST     SID_LINEEND_LIST
 #include <svx/xdef.hxx>
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
@@ -95,12 +91,7 @@
 #include <svx/xlndsit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/svxids.hrc>
-
-#define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
-#define ITEMID_DASH_LIST        SID_DASH_LIST
-#define ITEMID_LINEEND_LIST     SID_LINEEND_LIST
 #include <svx/drawitem.hxx>
-#define ITEMID_BRUSH            SID_ATTR_BRUSH
 #include <editeng/brushitem.hxx>
 #include <sfx2/docfilt.hxx>
 
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 783cdb04c665..d9f12f309b65 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -88,15 +88,6 @@ namespace rptui
 #define DEF_INFO_2( ident, uinameres, helpid, flag1, flag2 ) \
     DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 )
 
-#define DEF_INFO_3( ident, uinameres, helpid, flag1, flag2, flag3 ) \
-    DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 )
-
-#define DEF_INFO_4( ident, uinameres, helpid, flag1, flag2, flag3, flag4 ) \
-    DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
-
-#define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \
-    DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 )
-
     sal_uInt16              OPropertyInfoService::s_nCount = 0;
     OPropertyInfoImpl*      OPropertyInfoService::s_pPropertyInfos = NULL;
     //------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 36b143b0182b..598d0db94ba3 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -34,10 +34,7 @@
 #include <svtools/menuoptions.hxx>
 #include <osl/mutex.hxx>
 #include <svx/svxids.hrc>
-#define ITEMID_COLOR        1
-#define ITEMID_BRUSH        2
 #define ITEMID_FONT         3
-#define ITEMID_FONTHEIGHT   4
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svx/tbcontrl.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 3f6f77262ca4..360967886093 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -27,13 +27,6 @@
 #define RPTUI_ID_BRUSH      8
 #define RPTUI_ID_METRIC     9
 
-#define ITEMID_LRSPACE      RPTUI_ID_LRSPACE
-#define ITEMID_ULSPACE      RPTUI_ID_ULSPACE
-#define ITEMID_SIZE         RPTUI_ID_SIZE
-#define ITEMID_PAGE         RPTUI_ID_PAGE
-#define ITEMID_BRUSH        RPTUI_ID_BRUSH
-
-
 #include "ReportController.hxx"
 #include "ReportDefinition.hxx"
 #include "CondFormat.hxx"
@@ -2402,7 +2395,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
         new SfxAllEnumItem(RPTUI_ID_PAGE_MODE,SVX_PAGE_MODE_STANDARD),
         new SfxAllEnumItem(RPTUI_ID_START,PAPER_A4),
         new SfxAllEnumItem(RPTUI_ID_END,PAPER_E),
-        new SvxBrushItem(ITEMID_BRUSH),
+        new SvxBrushItem(RPTUI_ID_BRUSH),
         new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<sal_uInt16>(eUserMetric))
     };
 
@@ -2423,7 +2416,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
         SAL_WNODEPRECATED_DECLARATIONS_POP
         // fill it
         if ( _xSection.is() )
-            pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),ITEMID_BRUSH));
+            pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),RPTUI_ID_BRUSH));
         else
         {
             pDescriptor->Put(SvxSizeItem(RPTUI_ID_SIZE,VCLSize(getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE))));