brute-force find-and-remove of unused #define constants.

Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb

68 files changed, 4 insertions, 1315 deletions

diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 3f10ecab01e6..dab0f2a07770 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -188,27 +188,15 @@ typedef sal_uIntPtr SbxError;           // Preserve old type
 #define SbxERR_CONVERSION               ERRCODE_SBX_CONVERSION
 #define SbxERR_BAD_PARAMETER            ERRCODE_SBX_BAD_PARAMETER
 #define SbxERR_PROC_UNDEFINED           ERRCODE_SBX_PROC_UNDEFINED
-#define SbxERR_ERROR                    ERRCODE_SBX_ERROR
 #define SbxERR_NO_OBJECT                ERRCODE_SBX_NO_OBJECT
-#define SbxERR_CANNOT_LOAD              ERRCODE_SBX_CANNOT_LOAD
 #define SbxERR_BAD_INDEX                ERRCODE_SBX_BAD_INDEX
 #define SbxERR_NO_ACTIVE_OBJECT         ERRCODE_SBX_NO_ACTIVE_OBJECT
 #define SbxERR_BAD_PROP_VALUE           ERRCODE_SBX_BAD_PROP_VALUE
 #define SbxERR_PROP_READONLY            ERRCODE_SBX_PROP_READONLY
 #define SbxERR_PROP_WRITEONLY           ERRCODE_SBX_PROP_WRITEONLY
-#define SbxERR_INVALID_OBJECT           ERRCODE_SBX_INVALID_OBJECT
 #define SbxERR_NO_METHOD                ERRCODE_SBX_NO_METHOD
-#define SbxERR_INVALID_USAGE_OBJECT     ERRCODE_SBX_INVALID_USAGE_OBJECT
-#define SbxERR_NO_OLE                   ERRCODE_SBX_NO_OLE
-#define SbxERR_BAD_METHOD               ERRCODE_SBX_BAD_METHOD
-#define SbxERR_OLE_ERROR                ERRCODE_SBX_OLE_ERROR
 #define SbxERR_BAD_ACTION               ERRCODE_SBX_BAD_ACTION
-#define SbxERR_NO_NAMED_ARGS            ERRCODE_SBX_NO_NAMED_ARGS
-#define SbxERR_BAD_LOCALE               ERRCODE_SBX_BAD_LOCALE
-#define SbxERR_NAMED_NOT_FOUND          ERRCODE_SBX_NAMED_NOT_FOUND
-#define SbxERR_NOT_OPTIONAL             ERRCODE_SBX_NOT_OPTIONAL
 #define SbxERR_WRONG_ARGS               ERRCODE_SBX_WRONG_ARGS
-#define SbxERR_NOT_A_COLL               ERRCODE_SBX_NOT_A_COLL
 
 
 // Flag-Bits:
diff --git a/include/clew/clew.h b/include/clew/clew.h
index 9105e7eb8ead..94b6c29d9262 100644
--- a/include/clew/clew.h
+++ b/include/clew/clew.h
@@ -250,29 +250,18 @@ typedef double          cl_double16[16] __attribute__((aligned(128)));
 

 // Macro names and corresponding values defined by OpenCL

 

-#define CL_CHAR_BIT         8

 #define CL_SCHAR_MAX        127

 #define CL_SCHAR_MIN        (-127-1)

-#define CL_CHAR_MAX         CL_SCHAR_MAX

-#define CL_CHAR_MIN         CL_SCHAR_MIN

-#define CL_UCHAR_MAX        255

-#define CL_SHRT_MAX         32767

 #define CL_SHRT_MIN         (-32767-1)

-#define CL_USHRT_MAX        65535

-#define CL_INT_MAX          2147483647

 #define CL_INT_MIN          (-2147483647-1)

-#define CL_UINT_MAX         0xffffffffU

 #define CL_LONG_MAX         ((cl_long) 0x7FFFFFFFFFFFFFFFLL)

 #define CL_LONG_MIN         ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)

 #define CL_ULONG_MAX        ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)

 

-#define CL_FLT_DIG          6

-#define CL_FLT_MANT_DIG     24

 #define CL_FLT_MAX_10_EXP   +38

 #define CL_FLT_MAX_EXP      +128

 #define CL_FLT_MIN_10_EXP   -37

 #define CL_FLT_MIN_EXP      -125

-#define CL_FLT_RADIX        2

 #if defined(_MSC_VER)

 // MSVC doesn't understand hex floats

 #define CL_FLT_MAX          3.402823466e+38F

@@ -284,13 +273,10 @@ typedef double          cl_double16[16] __attribute__((aligned(128)));
 #define CL_FLT_EPSILON      0x1.0p-23f

 #endif

 

-#define CL_DBL_DIG          15

-#define CL_DBL_MANT_DIG     53

 #define CL_DBL_MAX_10_EXP   +308

 #define CL_DBL_MAX_EXP      +1024

 #define CL_DBL_MIN_10_EXP   -307

 #define CL_DBL_MIN_EXP      -1021

-#define CL_DBL_RADIX        2

 #if defined(_MSC_VER)

 // MSVC doesn't understand hex floats

 #define CL_DBL_MAX          1.7976931348623158e+308

@@ -411,11 +397,7 @@ typedef struct _cl_image_format {
 #define CL_INVALID_MIP_LEVEL                        -62

 #define CL_INVALID_GLOBAL_WORK_SIZE                 -63

 

-// OpenCL Version

-#define CL_VERSION_1_0                              1

-

 // cl_bool

-#define CL_FALSE                                    0

 #define CL_TRUE                                     1

 

 // cl_platform_info

@@ -433,53 +415,12 @@ typedef struct _cl_image_format {
 #define CL_DEVICE_TYPE_ALL                          0xFFFFFFFF

 

 // cl_device_info

-#define CL_DEVICE_TYPE                              0x1000

-#define CL_DEVICE_VENDOR_ID                         0x1001

 #define CL_DEVICE_MAX_COMPUTE_UNITS                 0x1002

-#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS          0x1003

-#define CL_DEVICE_MAX_WORK_GROUP_SIZE               0x1004

-#define CL_DEVICE_MAX_WORK_ITEM_SIZES               0x1005

-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR       0x1006

-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT      0x1007

-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT        0x1008

-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG       0x1009

-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT      0x100A

-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE     0x100B

 #define CL_DEVICE_MAX_CLOCK_FREQUENCY               0x100C

-#define CL_DEVICE_ADDRESS_BITS                      0x100D

-#define CL_DEVICE_MAX_READ_IMAGE_ARGS               0x100E

-#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS              0x100F

-#define CL_DEVICE_MAX_MEM_ALLOC_SIZE                0x1010

-#define CL_DEVICE_IMAGE2D_MAX_WIDTH                 0x1011

-#define CL_DEVICE_IMAGE2D_MAX_HEIGHT                0x1012

-#define CL_DEVICE_IMAGE3D_MAX_WIDTH                 0x1013

-#define CL_DEVICE_IMAGE3D_MAX_HEIGHT                0x1014

-#define CL_DEVICE_IMAGE3D_MAX_DEPTH                 0x1015

-#define CL_DEVICE_IMAGE_SUPPORT                     0x1016

-#define CL_DEVICE_MAX_PARAMETER_SIZE                0x1017

-#define CL_DEVICE_MAX_SAMPLERS                      0x1018

-#define CL_DEVICE_MEM_BASE_ADDR_ALIGN               0x1019

-#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE          0x101A

-#define CL_DEVICE_SINGLE_FP_CONFIG                  0x101B

-#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE             0x101C

-#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE         0x101D

-#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE             0x101E

 #define CL_DEVICE_GLOBAL_MEM_SIZE                   0x101F

-#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE          0x1020

-#define CL_DEVICE_MAX_CONSTANT_ARGS                 0x1021

-#define CL_DEVICE_LOCAL_MEM_TYPE                    0x1022

-#define CL_DEVICE_LOCAL_MEM_SIZE                    0x1023

-#define CL_DEVICE_ERROR_CORRECTION_SUPPORT          0x1024

-#define CL_DEVICE_PROFILING_TIMER_RESOLUTION        0x1025

-#define CL_DEVICE_ENDIAN_LITTLE                     0x1026

-#define CL_DEVICE_AVAILABLE                         0x1027

-#define CL_DEVICE_COMPILER_AVAILABLE                0x1028

-#define CL_DEVICE_EXECUTION_CAPABILITIES            0x1029

-#define CL_DEVICE_QUEUE_PROPERTIES                  0x102A

 #define CL_DEVICE_NAME                              0x102B

 #define CL_DEVICE_VENDOR                            0x102C

 #define CL_DRIVER_VERSION                           0x102D

-#define CL_DEVICE_PROFILE                           0x102E

 #define CL_DEVICE_VERSION                           0x102F

 #define CL_DEVICE_EXTENSIONS                        0x1030

 #define CL_DEVICE_PLATFORM                          0x1031

@@ -492,15 +433,6 @@ typedef struct _cl_image_format {
 #define CL_FP_ROUND_TO_INF                          (1 << 4)

 #define CL_FP_FMA                                   (1 << 5)

 

-// cl_device_mem_cache_type

-#define CL_NONE                                     0x0

-#define CL_READ_ONLY_CACHE                          0x1

-#define CL_READ_WRITE_CACHE                         0x2

-

-// cl_device_local_mem_type

-#define CL_LOCAL                                    0x1

-#define CL_GLOBAL                                   0x2

-

 // cl_device_exec_capabilities - bitfield

 #define CL_EXEC_KERNEL                              (1 << 0)

 #define CL_EXEC_NATIVE_KERNEL                       (1 << 1)

@@ -510,19 +442,11 @@ typedef struct _cl_image_format {
 #define CL_QUEUE_PROFILING_ENABLE                   (1 << 1)

 

 // cl_context_info

-#define CL_CONTEXT_REFERENCE_COUNT                  0x1080

 #define CL_CONTEXT_DEVICES                          0x1081

-#define CL_CONTEXT_PROPERTIES                       0x1082

 

 // cl_context_properties

 #define CL_CONTEXT_PLATFORM                         0x1084

 

-// cl_command_queue_info

-#define CL_QUEUE_CONTEXT                            0x1090

-#define CL_QUEUE_DEVICE                             0x1091

-#define CL_QUEUE_REFERENCE_COUNT                    0x1092

-#define CL_QUEUE_PROPERTIES                         0x1093

-

 // cl_mem_flags - bitfield

 #define CL_MEM_READ_WRITE                           (1 << 0)

 #define CL_MEM_WRITE_ONLY                           (1 << 1)

@@ -531,148 +455,25 @@ typedef struct _cl_image_format {
 #define CL_MEM_ALLOC_HOST_PTR                       (1 << 4)

 #define CL_MEM_COPY_HOST_PTR                        (1 << 5)

 

-// cl_channel_order

-#define CL_R                                        0x10B0

-#define CL_A                                        0x10B1

-#define CL_RG                                       0x10B2

-#define CL_RA                                       0x10B3

-#define CL_RGB                                      0x10B4

-#define CL_RGBA                                     0x10B5

-#define CL_BGRA                                     0x10B6

-#define CL_ARGB                                     0x10B7

-#define CL_INTENSITY                                0x10B8

-#define CL_LUMINANCE                                0x10B9

-

-// cl_channel_type

-#define CL_SNORM_INT8                               0x10D0

-#define CL_SNORM_INT16                              0x10D1

-#define CL_UNORM_INT8                               0x10D2

-#define CL_UNORM_INT16                              0x10D3

-#define CL_UNORM_SHORT_565                          0x10D4

-#define CL_UNORM_SHORT_555                          0x10D5

-#define CL_UNORM_INT_101010                         0x10D6

-#define CL_SIGNED_INT8                              0x10D7

-#define CL_SIGNED_INT16                             0x10D8

-#define CL_SIGNED_INT32                             0x10D9

-#define CL_UNSIGNED_INT8                            0x10DA

-#define CL_UNSIGNED_INT16                           0x10DB

-#define CL_UNSIGNED_INT32                           0x10DC

-#define CL_HALF_FLOAT                               0x10DD

-#define CL_FLOAT                                    0x10DE

-

-// cl_mem_object_type

-#define CL_MEM_OBJECT_BUFFER                        0x10F0

-#define CL_MEM_OBJECT_IMAGE2D                       0x10F1

-#define CL_MEM_OBJECT_IMAGE3D                       0x10F2

-

-// cl_mem_info

-#define CL_MEM_TYPE                                 0x1100

-#define CL_MEM_FLAGS                                0x1101

-#define CL_MEM_SIZE                                 0x1102

-#define CL_MEM_HOST_PTR                             0x1103

-#define CL_MEM_MAP_COUNT                            0x1104

-#define CL_MEM_REFERENCE_COUNT                      0x1105

-#define CL_MEM_CONTEXT                              0x1106

-

-// cl_image_info

-#define CL_IMAGE_FORMAT                             0x1110

-#define CL_IMAGE_ELEMENT_SIZE                       0x1111

-#define CL_IMAGE_ROW_PITCH                          0x1112

-#define CL_IMAGE_SLICE_PITCH                        0x1113

-#define CL_IMAGE_WIDTH                              0x1114

-#define CL_IMAGE_HEIGHT                             0x1115

-#define CL_IMAGE_DEPTH                              0x1116

-

-// cl_addressing_mode

-#define CL_ADDRESS_NONE                             0x1130

-#define CL_ADDRESS_CLAMP_TO_EDGE                    0x1131

-#define CL_ADDRESS_CLAMP                            0x1132

-#define CL_ADDRESS_REPEAT                           0x1133

-

-// cl_filter_mode

-#define CL_FILTER_NEAREST                           0x1140

-#define CL_FILTER_LINEAR                            0x1141

-

-// cl_sampler_info

-#define CL_SAMPLER_REFERENCE_COUNT                  0x1150

-#define CL_SAMPLER_CONTEXT                          0x1151

-#define CL_SAMPLER_NORMALIZED_COORDS                0x1152

-#define CL_SAMPLER_ADDRESSING_MODE                  0x1153

-#define CL_SAMPLER_FILTER_MODE                      0x1154

-

 // cl_map_flags - bitfield

 #define CL_MAP_READ                                 (1 << 0)

 #define CL_MAP_WRITE                                (1 << 1)

 

 // cl_program_info

-#define CL_PROGRAM_REFERENCE_COUNT                  0x1160

-#define CL_PROGRAM_CONTEXT                          0x1161

 #define CL_PROGRAM_NUM_DEVICES                      0x1162

 #define CL_PROGRAM_DEVICES                          0x1163

-#define CL_PROGRAM_SOURCE                           0x1164

 #define CL_PROGRAM_BINARY_SIZES                     0x1165

 #define CL_PROGRAM_BINARIES                         0x1166

 

 // cl_program_build_info

 #define CL_PROGRAM_BUILD_STATUS                     0x1181

-#define CL_PROGRAM_BUILD_OPTIONS                    0x1182

 #define CL_PROGRAM_BUILD_LOG                        0x1183

 

 // cl_build_status

-#define CL_BUILD_SUCCESS                            0

 #define CL_BUILD_NONE                               -1

 #define CL_BUILD_ERROR                              -2

 #define CL_BUILD_IN_PROGRESS                        -3

 

-// cl_kernel_info

-#define CL_KERNEL_FUNCTION_NAME                     0x1190

-#define CL_KERNEL_NUM_ARGS                          0x1191

-#define CL_KERNEL_REFERENCE_COUNT                   0x1192

-#define CL_KERNEL_CONTEXT                           0x1193

-#define CL_KERNEL_PROGRAM                           0x1194

-

-// cl_kernel_work_group_info

-#define CL_KERNEL_WORK_GROUP_SIZE                   0x11B0

-#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE           0x11B1

-#define CL_KERNEL_LOCAL_MEM_SIZE                    0x11B2

-

-// cl_event_info

-#define CL_EVENT_COMMAND_QUEUE                      0x11D0

-#define CL_EVENT_COMMAND_TYPE                       0x11D1

-#define CL_EVENT_REFERENCE_COUNT                    0x11D2

-#define CL_EVENT_COMMAND_EXECUTION_STATUS           0x11D3

-

-// cl_command_type

-#define CL_COMMAND_NDRANGE_KERNEL                   0x11F0

-#define CL_COMMAND_TASK                             0x11F1

-#define CL_COMMAND_NATIVE_KERNEL                    0x11F2

-#define CL_COMMAND_READ_BUFFER                      0x11F3

-#define CL_COMMAND_WRITE_BUFFER                     0x11F4

-#define CL_COMMAND_COPY_BUFFER                      0x11F5

-#define CL_COMMAND_READ_IMAGE                       0x11F6

-#define CL_COMMAND_WRITE_IMAGE                      0x11F7

-#define CL_COMMAND_COPY_IMAGE                       0x11F8

-#define CL_COMMAND_COPY_IMAGE_TO_BUFFER             0x11F9

-#define CL_COMMAND_COPY_BUFFER_TO_IMAGE             0x11FA

-#define CL_COMMAND_MAP_BUFFER                       0x11FB

-#define CL_COMMAND_MAP_IMAGE                        0x11FC

-#define CL_COMMAND_UNMAP_MEM_OBJECT                 0x11FD

-#define CL_COMMAND_MARKER                           0x11FE

-#define CL_COMMAND_ACQUIRE_GL_OBJECTS               0x11FF

-#define CL_COMMAND_RELEASE_GL_OBJECTS               0x1200

-

-// command execution status

-#define CL_COMPLETE                                 0x0

-#define CL_RUNNING                                  0x1

-#define CL_SUBMITTED                                0x2

-#define CL_QUEUED                                   0x3

-

-// cl_profiling_info

-#define CL_PROFILING_COMMAND_QUEUED                 0x1280

-#define CL_PROFILING_COMMAND_SUBMIT                 0x1281

-#define CL_PROFILING_COMMAND_START                  0x1282

-#define CL_PROFILING_COMMAND_END                    0x1283

-

 /********************************************************************************************************/

 

 /********************************************************************************************************/

diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 7cc708ffd579..0658f79570bf 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.hxx
@@ -310,7 +310,6 @@
 
 /* aktuell */
 
-#define SO3_SIM_CLASSID  SO3_SIM_CLASSID_50
 
 /***************************************************
 * StarMath
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx
index 7f7b48dbe721..268bf9964a3d 100644
--- a/include/comphelper/documentconstants.hxx
+++ b/include/comphelper/documentconstants.hxx
@@ -32,15 +32,7 @@
 #define MIMETYPE_VND_SUN_XML_MATH_ASCII                 "application/vnd.sun.xml.math"
 #define MIMETYPE_VND_SUN_XML_BASE_ASCII                 "application/vnd.sun.xml.base"
 
-#define MIMETYPE_VND_SUN_XML_WRITER                     OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
-#define MIMETYPE_VND_SUN_XML_WRITER_WEB                 OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )
-#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL              OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )
-#define MIMETYPE_VND_SUN_XML_DRAW                       OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
-#define MIMETYPE_VND_SUN_XML_IMPRESS                    OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
-#define MIMETYPE_VND_SUN_XML_CALC                       OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
 #define MIMETYPE_VND_SUN_XML_CHART                      OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
-#define MIMETYPE_VND_SUN_XML_MATH                       OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII )
-#define MIMETYPE_VND_SUN_XML_BASE                       OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII )
 
 // template formats of SO6/7
 #define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII      "application/vnd.sun.xml.writer.template"
@@ -61,12 +53,7 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII        "application/vnd.sun.xml.report"
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII  "application/vnd.sun.xml.report.chart"
 
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB            OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL         OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING             OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION        OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )
 #define MIMETYPE_OASIS_OPENDOCUMENT_CHART               OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA             OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )
 #define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE            OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART        OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
 
@@ -79,11 +66,6 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII         "application/vnd.oasis.opendocument.chart-template"
 #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII       "application/vnd.oasis.opendocument.formula-template"
 
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE                OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE             OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE         OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE               OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE             OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII )
 
 // ODF versions
 #define ODFVER_010_TEXT "1.0"
@@ -135,11 +117,7 @@
 #define SFX_FILTER_DEFAULT           0x00000100L
 #define SFX_FILTER_EXECUTABLE        0x00000200L
 #define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
-#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
 #define SFX_FILTER_NOTINFILEDLG      0x00001000L
-#define SFX_FILTER_NOTINCHOOSER      0x00002000L
-#define SFX_FILTER_ASYNC             0x00004000L
-#define SFX_FILTER_CREATOR           0x00008000L
 #define SFX_FILTER_OPENREADONLY      0x00010000L
 #define SFX_FILTER_MUSTINSTALL       0x00020000L
 #define SFX_FILTER_CONSULTSERVICE    0x00040000L
@@ -147,7 +125,6 @@
 #define SFX_FILTER_STARONEFILTER     0x00080000L
 #define SFX_FILTER_PACKED            0x00100000L
 
-#define SFX_FILTER_BROWSERPREFERED   0x00400000L
 
 #define SFX_FILTER_ENCRYPTION        0x01000000L
 #define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index 2d82e288cbd6..66fa0744f674 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.hxx
@@ -33,7 +33,6 @@
 
 #define COMPONENT_GETENV            "component_getImplementationEnvironment"
 #define COMPONENT_GETENVEXT         "component_getImplementationEnvironmentExt"
-#define COMPONENT_GETDESCRIPTION    "component_getDescription"
 #define COMPONENT_WRITEINFO         "component_writeInfo"
 #define COMPONENT_GETFACTORY        "component_getFactory"
 
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 343b969e8ceb..1847780973c7 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -56,7 +56,6 @@ EDITENG_DLLPUBLIC extern const size_t EE_APPEND;
 #define EE_READWRITE_WRONGFORMAT     (SVSTREAM_ERRBASE_USER+1)
 #define EE_READWRITE_GENERALERROR    (SVSTREAM_ERRBASE_USER+2)
 
-#define EDITUNDO_START              100
 #define EDITUNDO_REMOVECHARS        100
 #define EDITUNDO_CONNECTPARAS       101
 #define EDITUNDO_REMOVEFEATURE      102
@@ -83,7 +82,6 @@ EDITENG_DLLPUBLIC extern const size_t EE_APPEND;
 #define EDITUNDO_UNINDENTBLOCK      123
 #define EDITUNDO_MARKSELECTION      124
 #define EDITUNDO_TRANSLITERATE      125
-#define EDITUNDO_END                125
 
 #define EDITUNDO_USER               200
 
diff --git a/include/editeng/eeitemid.hxx b/include/editeng/eeitemid.hxx
index c6b55f4f4b28..72e1852864db 100644
--- a/include/editeng/eeitemid.hxx
+++ b/include/editeng/eeitemid.hxx
@@ -84,39 +84,19 @@
 #define ITEMID_CHARSCALE_W      EE_CHAR_FONTWIDTH
 #define ITEMID_COLOR            EE_CHAR_COLOR
 #define ITEMID_WORDLINEMODE     EE_CHAR_WLM
-#define ITEMID_PROPSIZE         0
 #define ITEMID_CHARSETCOLOR     0   // EE_FEATURE_NOTCONV
 #define ITEMID_CASEMAP          EE_CHAR_CASEMAP
 #define ITEMID_LANGUAGE         0
 #define ITEMID_ESCAPEMENT       EE_CHAR_ESCAPEMENT
-#define ITEMID_NOLINEBREAK      0
-#define ITEMID_NOHYPHENHERE     0
 #define ITEMID_AUTOKERN         EE_CHAR_PAIRKERNING
 #define ITEMID_KERNING          EE_CHAR_KERNING
 #define ITEMID_EMPHASISMARK     EE_CHAR_EMPHASISMARK
 #define ITEMID_CHARRELIEF       EE_CHAR_RELIEF
 
 // Paragraph Attributes
-#define ITEMID_SCRIPTSPACE      EE_PARA_ASIANCJKSPACING
 #define ITEMID_ADJUST           EE_PARA_JUST
-#define ITEMID_LINESPACING      EE_PARA_SBL
-#define ITEMID_WIDOWS           0
-#define ITEMID_ORPHANS          0
-#define ITEMID_HYPHENZONE       0
 
-#define ITEMID_TABSTOP          EE_PARA_TABS
 
-#define ITEMID_PAPERBIN         0
-#define ITEMID_LRSPACE          EE_PARA_LRSPACE
-#define ITEMID_ULSPACE          EE_PARA_ULSPACE
-#define ITEMID_FRAMEDIR         EE_PARA_WRITINGDIR
-#define ITEMID_PRINT            0
-#define ITEMID_OPAQUE           0
-#define ITEMID_PROTECT          0
-#define ITEMID_BACKGROUND       0
-#define ITEMID_SHADOW           0
-#define ITEMID_BOX              0
-#define ITEMID_BOXINFO          0
 #define ITEMID_BRUSH            0
 
 #define ITEMID_FIELD            EE_FEATURE_FIELD
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 7e250c4670f1..f27818f9d9d5 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -95,8 +95,6 @@ typedef std::vector<SpellPortion> SpellPortions;
 namespace basegfx { class B2DPolyPolygon; }
 
 // internal use only!
-#define PARAFLAG_DROPTARGET         0x1000
-#define PARAFLAG_DROPTARGET_EMPTY   0x2000
 #define PARAFLAG_HOLDDEPTH          0x4000
 #define PARAFLAG_SETBULLETTEXT      0x8000
 #define PARAFLAG_ISPAGE             0x0100
@@ -110,7 +108,6 @@ namespace basegfx { class B2DPolyPolygon; }
 #define OLUNDO_ATTR             EDITUNDO_USER+5
 #define OLUNDO_INSERT           EDITUNDO_USER+6
 // #define OLUNDO_MOVEPARAGRAPHS    EDITUNDO_USER+7
-#define OLUNDO_CHECKPARA        EDITUNDO_USER+8
 
 class Paragraph : protected ParagraphData
 {
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 0d754ed83142..056628871e87 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_EDITENG_UNOPRNMS_HXX
 #define INCLUDED_EDITENG_UNOPRNMS_HXX
 
-#define UNO_NAME_SHAPE_SIZE                     "Size"
-#define UNO_NAME_SHAPE_POSITION                 "Position"
 
 #define UNO_NAME_CHAR_COLOR                     "CharColor"
-#define UNO_NAME_CHAR_FONT                      "CharFont"
 #define UNO_NAME_CHAR_HEIGHT                    "CharHeight"
 #define UNO_NAME_CHAR_POSTURE                   "CharPosture"
 #define UNO_NAME_CHAR_SHADOWED                  "CharShadowed"
@@ -68,21 +65,7 @@
 #define UNO_NAME_FILLTRANSPARENCEGRADIENTNAME   "FillTransparenceGradientName"
 #define UNO_NAME_FILLBMP_MODE                   "FillBitmapMode"
 
-#define UNO_NAME_FILL_GRADIENT_STYLE            "FillGradientStyle"
-#define UNO_NAME_FILL_GRADIENT_START_COLOR      "FillGradientStartColor"
-#define UNO_NAME_FILL_GRADIENT_END_COLOR        "FillGradientEndColor"
-#define UNO_NAME_FILL_GRADIENT_ANGLE            "FillGradientAngle"
-#define UNO_NAME_FILL_GRADIENT_BORDER           "FillGradientBorder"
-#define UNO_NAME_FILL_GRADIENT_OFFSET_X         "FillGradientOffsetX"
-#define UNO_NAME_FILL_GRADIENT_OFFSET_Y         "FillGradientOffsetY"
-#define UNO_NAME_FILL_GRADIENT_START_INTENSITY  "FillGradientStartIntensity"
-#define UNO_NAME_FILL_GRADIENT_END_INTENSITY    "FillGradientEndIntensity"
-#define UNO_NAME_FILL_GRADIENT_STEPS            "FillGradientSteps"
-
-#define UNO_NAME_FILL_HATCH_STYLE               "FillHatchStyle"
-#define UNO_NAME_FILL_HATCH_COLOR               "FillHatchColor"
-#define UNO_NAME_FILL_HATCH_DISTANCE            "FillHatchDistance"
-#define UNO_NAME_FILL_HATCH_ANGLE               "FillHatchAngle"
+
 
 #define UNO_NAME_LINESTYLE                      "LineStyle"
 #define UNO_NAME_LINEDASH                       "LineDash"
@@ -144,7 +127,6 @@
 #define UNO_NAME_MEASURETEXTUPSIDEDOWN          "MeasureTextUpsideDown"
 #define UNO_NAME_MEASUREOVERHANG                "MeasureOverhang"
 #define UNO_NAME_MEASUREUNIT                    "MeasureUnit"
-#define UNO_NAME_MEASURESCALE                   "MeasureScale"
 #define UNO_NAME_MEASURESHOWUNIT                "MeasureShowUnit"
 #define UNO_NAME_MEASUREFORMATSTRING            "MeasureFormatString"
 #define UNO_NAME_MEASURETEXTAUTOANGLE           "MeasureTextAutoAngle"
@@ -171,8 +153,6 @@
 #define UNO_NAME_MISC_OBJ_NAME                  "Name"
 #define UNO_NAME_MISC_OBJ_ROTATEANGLE           "RotateAngle"
 #define UNO_NAME_MISC_OBJ_SHEARANGLE            "ShearAngle"
-#define UNO_NAME_MISC_OBJ_ROTATION_POINT_X      "RotationPointX"
-#define UNO_NAME_MISC_OBJ_ROTATION_POINT_Y      "RotationPointY"
 #define UNO_NAME_MISC_OBJ_FRAMERECT             "FrameRect"
 #define UNO_NAME_MISC_OBJ_BOUNDRECT             "BoundRect"
 
@@ -278,24 +258,20 @@
 #define UNO_NAME_NRULE_BULLET_COLOR             "BulletColor"
 #define UNO_NAME_NRULE_BULLET_RELSIZE           "BulletRelSize"
 #define UNO_NAME_NRULE_BULLET_FONT              "BulletFont"
-#define UNO_NAME_NRULE_GRAPHICURL               "GraphicURL"
 #define UNO_NAME_NRULE_START_WITH               "StartWith"
 #define UNO_NAME_NRULE_LEFT_MARGIN              "LeftMargin"
 #define UNO_NAME_NRULE_FIRST_LINE_OFFSET        "FirstLineOffset"
 #define UNO_NAME_NRULE_ADJUST                   "Adjust"
 
 #define UNO_NAME_EDIT_FONT_DESCRIPTOR           "FontDescriptor"
-#define UNO_NAME_EDIT_FONT_STYLENAME            "FontStyleName"
 
 #define UNO_NAME_EDIT_PARA_ADJUST               "ParaAdjust"
 #define UNO_NAME_EDIT_PARA_BMARGIN              "ParaBottomMargin"
 #define UNO_NAME_EDIT_PARA_LASTLINEADJ          "ParaLastLineAdjust"
 #define UNO_NAME_EDIT_PARA_LMARGIN              "ParaLeftMargin"
-#define UNO_NAME_EDIT_PARA_LRPARAMARGIN         "ParaLeftRightParaMargin"
 #define UNO_NAME_EDIT_PARA_LINESPACING          "ParaLineSpacing"
 #define UNO_NAME_EDIT_PARA_RMARGIN              "ParaRightMargin"
 #define UNO_NAME_EDIT_PARA_TAPSTOPS             "ParaTabStops"
-#define UNO_NAME_EDIT_PARA_TBMARGIN             "ParaTopBottomMargin"
 #define UNO_NAME_EDIT_PARA_TMARGIN              "ParaTopMargin"
 #define UNO_NAME_EDIT_PARA_IS_HYPHEN            "ParaIsHyphenation"
 #define UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION    "ParaIsHangingPunctuation"
@@ -360,21 +336,6 @@
 
 #define UNO_NAME_CUSTOMSHAPE_ADJUSTMENT         "CustomShapeAdjustment"
 
-// The following properties are obsolete and can eventually be removed
-#define UNO_NAME_EDIT_FONT_COLOR                "FontColor"
-#define UNO_NAME_EDIT_FONT_ESCAPEMENT           "FontEscapement"
-#define UNO_NAME_EDIT_FONT_HEIGHT               "FontHeight"
-#define UNO_NAME_EDIT_FONT_SHADOWED             "FontShadowed"
-#define UNO_NAME_EDIT_FONT_SLANT                "FontSlant"
-#define UNO_NAME_EDIT_FONT_STRIKEOUT            "FontStrikeout"
-#define UNO_NAME_EDIT_FONT_UNDERLINE            "FontUnderline"
-#define UNO_NAME_EDIT_FONT_WEIGHT               "FontWeight"
-#define UNO_NAME_EDIT_CHAR_STYLE                "CharStyle"
-#define UNO_NAME_EDIT_FONT_FAMILY               "FontFamily"
-#define UNO_NAME_EDIT_FONT_NAME                 "FontName"
-#define UNO_NAME_EDIT_FONT_CHARSET              "FontCharset"
-// End of the obsolete properties
-
 #endif
 
 
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 82c84e3fc074..16a5a71a0c7a 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -44,52 +44,32 @@
 // In the Microsoft documentation the naming scheme is msofbt... instead of ESCHER_...
 #define ESCHER_DggContainer     0xF000u /*                           per-document data                                                  X   X   X     */
 #define ESCHER_Dgg              0xF006u /*                           an FDGG and several FIDCLs                                         X   X   X   0 */
-#define ESCHER_CLSID            0xF016u /*                           the CLSID of the application that put the data on the clipboard    C   C   C   0 */
 #define ESCHER_OPT              0xF00Bu /* count of properties       the document-wide default shape properties                         X   X   X   3 */
-#define ESCHER_ColorMRU         0xF11Au /* count of colors           the colors in the MRU swatch                                       X   X   X   0 */
 #define ESCHER_SplitMenuColors  0xF11Eu /* count of colors           the colors in the top-level split menus                            X   X   X   0 */
 #define ESCHER_BstoreContainer  0xF001u /* count of BLIPs            all images in the document (JPEGs, metafiles, etc.)                X   X   X     */
 #define ESCHER_BSE              0xF007u /* BLIP type                 an FBSE (one per BLIP)                                             X   X   X   2 */
 #define ESCHER_BlipFirst        0xF018u /*                           range of fbts reserved for various kinds of BLIPs                  X   X   X     */
-#define ESCHER_BlipLast         0xF117u /*                           range of fbts reserved for various kinds of BLIPs                  X   X   X     */
 
 #define ESCHER_DgContainer      0xF002u /*                           per-sheet/page/slide data                                          X   X   X     */
 #define ESCHER_Dg               0xF008u /* drawing ID                an FDG                                                             X   X   X   0 */
-#define ESCHER_RegroupItems     0xF118u /* count of regroup entries  several FRITs                                                      X   X   X   0 */
-#define ESCHER_ColorScheme      0xF120u /* count of colors           the colors of the source host's color scheme                           C   C   0 */
 #define ESCHER_SpgrContainer    0xF003u /*                           several SpContainers, the first of which is the group shape itself X   X   X     */
 #define ESCHER_SpContainer      0xF004u /*                           a shape                                                            X   X   X     */
 #define ESCHER_Spgr             0xF009u /*                           an FSPGR; only present if the shape is a group shape               X   X   X   1 */
 #define ESCHER_Sp               0xF00Au /* shape type                an FSP                                                             X   X   X   2 */
 //#define     ESCHER_OPT           0xF00Bu /* count of properties       a shape property table                                             X   X   X   3 */
-#define ESCHER_Textbox          0xF00Cu /*                           RTF text                                                           C   C   C   0 */
 #define ESCHER_ClientTextbox    0xF00Du /* host-defined              the text in the textbox, in host-defined format                    X   X   X     */
-#define ESCHER_Anchor           0xF00Eu /*                           a RECT, in 100000ths of an inch                                    C   C   C   0 */
 #define ESCHER_ChildAnchor      0xF00Fu /*                           a RECT, in units relative to the parent group                      X   X   X   0 */
 #define ESCHER_ClientAnchor     0xF010u /* host-defined              the location of the shape, in a host-defined format                X   X   X     */
 #define ESCHER_ClientData       0xF011u /* host-defined              host-specific data                                                 X   X   X     */
-#define ESCHER_OleObject        0xF11Fu /*                           a serialized IStorage for an OLE object                            C   C   C   0 */
-#define ESCHER_DeletedPspl      0xF11Du /*                           an FPSPL; only present in top-level deleted shapes                 X           0 */
 #define ESCHER_SolverContainer  0xF005u /* count of rules            the rules governing shapes                                         X   X   X     */
 #define ESCHER_ConnectorRule    0xF012u /*                           an FConnectorRule                                                      X   X   1 */
-#define ESCHER_AlignRule        0xF013u /*                           an FAlignRule                                                      X   X   X   0 */
-#define ESCHER_ArcRule          0xF014u /*                           an FARCRU                                                          X   X   X   0 */
-#define ESCHER_ClientRule       0xF015u /* host-defined              host-defined                                                                     */
-#define ESCHER_CalloutRule      0xF017u /*                           an FCORU                                                           X   X   X   0 */
-#define ESCHER_Selection        0xF119u /*                           an FDGSL followed by the SPIDs of the shapes in the selection              X   0 */
 #define ESCHER_UDefProp         0xF122u
 
-#define SHAPEFLAG_GROUP         0x001   /* This shape is a group shape */
-#define SHAPEFLAG_CHILD         0x002   /* Not a top-level shape */
-#define SHAPEFLAG_PATRIARCH     0x004   /* This is the topmost group shape. Exactly one of these per drawing. */
-#define SHAPEFLAG_DELETED       0x008   /* The shape has been deleted */
 #define SHAPEFLAG_OLESHAPE      0x010   /* The shape is an OLE object */
-#define SHAPEFLAG_HAVEMASTER    0x020   /* Shape has a hspMaster property */
 #define SHAPEFLAG_FLIPH         0x040   /* Shape is flipped horizontally */
 #define SHAPEFLAG_FLIPV         0x080   /* Shape is flipped vertically */
 #define SHAPEFLAG_CONNECTOR     0x100   /* Connector type of shape */
 #define SHAPEFLAG_HAVEANCHOR    0x200   /* Shape has an anchor of some kind */
-#define SHAPEFLAG_BACKGROUND    0x400   /* Background shape */
 #define SHAPEFLAG_HAVESPT       0x800   /* Shape has a shape type property */
 
 #define ESCHER_ShpInst_Min                          0
@@ -97,203 +77,16 @@
 #define ESCHER_ShpInst_Rectangle                    1
 #define ESCHER_ShpInst_RoundRectangle               2
 #define ESCHER_ShpInst_Ellipse                      3
-#define ESCHER_ShpInst_Diamond                      4
-#define ESCHER_ShpInst_IsocelesTriangle             5
-#define ESCHER_ShpInst_RightTriangle                6
-#define ESCHER_ShpInst_Parallelogram                7
-#define ESCHER_ShpInst_Trapezoid                    8
-#define ESCHER_ShpInst_Hexagon                      9
-#define ESCHER_ShpInst_Octagon                      10
-#define ESCHER_ShpInst_Plus                         11
-#define ESCHER_ShpInst_Star                         12
-#define ESCHER_ShpInst_Arrow                        13
-#define ESCHER_ShpInst_ThickArrow                   14
-#define ESCHER_ShpInst_HomePlate                    15
-#define ESCHER_ShpInst_Cube                         16
-#define ESCHER_ShpInst_Balloon                      17
-#define ESCHER_ShpInst_Seal                         18
 #define ESCHER_ShpInst_Arc                          19
 #define ESCHER_ShpInst_Line                         20
-#define ESCHER_ShpInst_Plaque                       21
-#define ESCHER_ShpInst_Can                          22
-#define ESCHER_ShpInst_Donut                        23
-#define ESCHER_ShpInst_TextSimple                   24
-#define ESCHER_ShpInst_TextOctagon                  25
-#define ESCHER_ShpInst_TextHexagon                  26
-#define ESCHER_ShpInst_TextCurve                    27
-#define ESCHER_ShpInst_TextWave                     28
-#define ESCHER_ShpInst_TextRing                     29
-#define ESCHER_ShpInst_TextOnCurve                  30
-#define ESCHER_ShpInst_TextOnRing                   31
 #define ESCHER_ShpInst_StraightConnector1           32
 #define ESCHER_ShpInst_BentConnector2               33
 #define ESCHER_ShpInst_BentConnector3               34
-#define ESCHER_ShpInst_BentConnector4               35
-#define ESCHER_ShpInst_BentConnector5               36
-#define ESCHER_ShpInst_CurvedConnector2             37
 #define ESCHER_ShpInst_CurvedConnector3             38
-#define ESCHER_ShpInst_CurvedConnector4             39
-#define ESCHER_ShpInst_CurvedConnector5             40
-#define ESCHER_ShpInst_Callout1                     41
-#define ESCHER_ShpInst_Callout2                     42
-#define ESCHER_ShpInst_Callout3                     43
-#define ESCHER_ShpInst_AccentCallout1               44
-#define ESCHER_ShpInst_AccentCallout2               45
-#define ESCHER_ShpInst_AccentCallout3               46
-#define ESCHER_ShpInst_BorderCallout1               47
-#define ESCHER_ShpInst_BorderCallout2               48
-#define ESCHER_ShpInst_BorderCallout3               49
-#define ESCHER_ShpInst_AccentBorderCallout1         50
-#define ESCHER_ShpInst_AccentBorderCallout2         51
-#define ESCHER_ShpInst_AccentBorderCallout3         52
-#define ESCHER_ShpInst_Ribbon                       53
-#define ESCHER_ShpInst_Ribbon2                      54
-#define ESCHER_ShpInst_Chevron                      55
-#define ESCHER_ShpInst_Pentagon                     56
-#define ESCHER_ShpInst_NoSmoking                    57
-#define ESCHER_ShpInst_Seal8                        58
-#define ESCHER_ShpInst_Seal16                       59
-#define ESCHER_ShpInst_Seal32                       60
-#define ESCHER_ShpInst_WedgeRectCallout             61
-#define ESCHER_ShpInst_WedgeRRectCallout            62
-#define ESCHER_ShpInst_WedgeEllipseCallout          63
-#define ESCHER_ShpInst_Wave                         64
-#define ESCHER_ShpInst_FoldedCorner                 65
-#define ESCHER_ShpInst_LeftArrow                    66
-#define ESCHER_ShpInst_DownArrow                    67
-#define ESCHER_ShpInst_UpArrow                      68
-#define ESCHER_ShpInst_LeftRightArrow               69
-#define ESCHER_ShpInst_UpDownArrow                  70
-#define ESCHER_ShpInst_IrregularSeal1               71
-#define ESCHER_ShpInst_IrregularSeal2               72
-#define ESCHER_ShpInst_LightningBolt                73
-#define ESCHER_ShpInst_Heart                        74
 #define ESCHER_ShpInst_PictureFrame                 75
-#define ESCHER_ShpInst_QuadArrow                    76
-#define ESCHER_ShpInst_LeftArrowCallout             77
-#define ESCHER_ShpInst_RightArrowCallout            78
-#define ESCHER_ShpInst_UpArrowCallout               79
-#define ESCHER_ShpInst_DownArrowCallout             80
-#define ESCHER_ShpInst_LeftRightArrowCallout        81
-#define ESCHER_ShpInst_UpDownArrowCallout           82
-#define ESCHER_ShpInst_QuadArrowCallout             83
-#define ESCHER_ShpInst_Bevel                        84
-#define ESCHER_ShpInst_LeftBracket                  85
-#define ESCHER_ShpInst_RightBracket                 86
-#define ESCHER_ShpInst_LeftBrace                    87
-#define ESCHER_ShpInst_RightBrace                   88
-#define ESCHER_ShpInst_LeftUpArrow                  89
-#define ESCHER_ShpInst_BentUpArrow                  90
-#define ESCHER_ShpInst_BentArrow                    91
-#define ESCHER_ShpInst_Seal24                       92
-#define ESCHER_ShpInst_StripedRightArrow            93
-#define ESCHER_ShpInst_NotchedRightArrow            94
-#define ESCHER_ShpInst_BlockArc                     95
-#define ESCHER_ShpInst_SmileyFace                   96
-#define ESCHER_ShpInst_VerticalScroll               97
-#define ESCHER_ShpInst_HorizontalScroll             98
-#define ESCHER_ShpInst_CircularArrow                99
-#define ESCHER_ShpInst_NotchedCircularArrow         100
-#define ESCHER_ShpInst_UturnArrow                   101
-#define ESCHER_ShpInst_CurvedRightArrow             102
-#define ESCHER_ShpInst_CurvedLeftArrow              103
-#define ESCHER_ShpInst_CurvedUpArrow                104
-#define ESCHER_ShpInst_CurvedDownArrow              105
-#define ESCHER_ShpInst_CloudCallout                 106
-#define ESCHER_ShpInst_EllipseRibbon                107
-#define ESCHER_ShpInst_EllipseRibbon2               108
-#define ESCHER_ShpInst_FlowChartProcess             109
-#define ESCHER_ShpInst_FlowChartDecision            110
-#define ESCHER_ShpInst_FlowChartInputOutput         111
-#define ESCHER_ShpInst_FlowChartPredefinedProcess   112
-#define ESCHER_ShpInst_FlowChartInternalStorage     113
-#define ESCHER_ShpInst_FlowChartDocument            114
-#define ESCHER_ShpInst_FlowChartMultidocument       115
-#define ESCHER_ShpInst_FlowChartTerminator          116
-#define ESCHER_ShpInst_FlowChartPreparation         117
-#define ESCHER_ShpInst_FlowChartManualInput         118
-#define ESCHER_ShpInst_FlowChartManualOperation     119
-#define ESCHER_ShpInst_FlowChartConnector           120
-#define ESCHER_ShpInst_FlowChartPunchedCard         121
-#define ESCHER_ShpInst_FlowChartPunchedTape         122
-#define ESCHER_ShpInst_FlowChartSummingJunction     123
-#define ESCHER_ShpInst_FlowChartOr                  124
-#define ESCHER_ShpInst_FlowChartCollate             125
-#define ESCHER_ShpInst_FlowChartSort                126
-#define ESCHER_ShpInst_FlowChartExtract             127
-#define ESCHER_ShpInst_FlowChartMerge               128
-#define ESCHER_ShpInst_FlowChartOfflineStorage      129
-#define ESCHER_ShpInst_FlowChartOnlineStorage       130
-#define ESCHER_ShpInst_FlowChartMagneticTape        131
-#define ESCHER_ShpInst_FlowChartMagneticDisk        132
-#define ESCHER_ShpInst_FlowChartMagneticDrum        133
-#define ESCHER_ShpInst_FlowChartDisplay             134
-#define ESCHER_ShpInst_FlowChartDelay               135
 #define ESCHER_ShpInst_TextPlainText                136
-#define ESCHER_ShpInst_TextStop                     137
-#define ESCHER_ShpInst_TextTriangle                 138
-#define ESCHER_ShpInst_TextTriangleInverted         139
-#define ESCHER_ShpInst_TextChevron                  140
-#define ESCHER_ShpInst_TextChevronInverted          141
-#define ESCHER_ShpInst_TextRingInside               142
-#define ESCHER_ShpInst_TextRingOutside              143
-#define ESCHER_ShpInst_TextArchUpCurve              144
-#define ESCHER_ShpInst_TextArchDownCurve            145
-#define ESCHER_ShpInst_TextCircleCurve              146
-#define ESCHER_ShpInst_TextButtonCurve              147
-#define ESCHER_ShpInst_TextArchUpPour               148
-#define ESCHER_ShpInst_TextArchDownPour             149
-#define ESCHER_ShpInst_TextCirclePour               150
-#define ESCHER_ShpInst_TextButtonPour               151
-#define ESCHER_ShpInst_TextCurveUp                  152
-#define ESCHER_ShpInst_TextCurveDown                153
-#define ESCHER_ShpInst_TextCascadeUp                154
-#define ESCHER_ShpInst_TextCascadeDown              155
-#define ESCHER_ShpInst_TextWave1                    156
-#define ESCHER_ShpInst_TextWave2                    157
-#define ESCHER_ShpInst_TextWave3                    158
-#define ESCHER_ShpInst_TextWave4                    159
-#define ESCHER_ShpInst_TextInflate                  160
-#define ESCHER_ShpInst_TextDeflate                  161
-#define ESCHER_ShpInst_TextInflateBottom            162
-#define ESCHER_ShpInst_TextDeflateBottom            163
-#define ESCHER_ShpInst_TextInflateTop               164
-#define ESCHER_ShpInst_TextDeflateTop               165
-#define ESCHER_ShpInst_TextDeflateInflate           166
 #define ESCHER_ShpInst_TextDeflateInflateDeflate    167
-#define ESCHER_ShpInst_TextFadeRight                168
-#define ESCHER_ShpInst_TextFadeLeft                 169
-#define ESCHER_ShpInst_TextFadeUp                   170
-#define ESCHER_ShpInst_TextFadeDown                 171
 #define ESCHER_ShpInst_TextSlantUp                  172
-#define ESCHER_ShpInst_TextSlantDown                173
-#define ESCHER_ShpInst_TextCanUp                    174
-#define ESCHER_ShpInst_TextCanDown                  175
-#define ESCHER_ShpInst_FlowChartAlternateProcess    176
-#define ESCHER_ShpInst_FlowChartOffpageConnector    177
-#define ESCHER_ShpInst_Callout90                    178
-#define ESCHER_ShpInst_AccentCallout90              179
-#define ESCHER_ShpInst_BorderCallout90              180
-#define ESCHER_ShpInst_AccentBorderCallout90        181
-#define ESCHER_ShpInst_LeftRightUpArrow             182
-#define ESCHER_ShpInst_Sun                          183
-#define ESCHER_ShpInst_Moon                         184
-#define ESCHER_ShpInst_BracketPair                  185
-#define ESCHER_ShpInst_BracePair                    186
-#define ESCHER_ShpInst_Seal4                        187
-#define ESCHER_ShpInst_DoubleWave                   188
-#define ESCHER_ShpInst_ActionButtonBlank            189
-#define ESCHER_ShpInst_ActionButtonHome             190
-#define ESCHER_ShpInst_ActionButtonHelp             191
-#define ESCHER_ShpInst_ActionButtonInformation      192
-#define ESCHER_ShpInst_ActionButtonForwardNext      193
-#define ESCHER_ShpInst_ActionButtonBackPrevious     194
-#define ESCHER_ShpInst_ActionButtonEnd              195
-#define ESCHER_ShpInst_ActionButtonBeginning        196
-#define ESCHER_ShpInst_ActionButtonReturn           197
-#define ESCHER_ShpInst_ActionButtonDocument         198
-#define ESCHER_ShpInst_ActionButtonSound            199
-#define ESCHER_ShpInst_ActionButtonMovie            200
 #define ESCHER_ShpInst_HostControl                  201
 #define ESCHER_ShpInst_TextBox                      202
 #define ESCHER_ShpInst_COUNT                        203
@@ -642,14 +435,6 @@ enum ESCHER_LineCap
 // Transform
 #define ESCHER_Prop_Rotation                      4  /*  Fixed Point 16.16 degrees                  */
 // Protection
-#define ESCHER_Prop_LockRotation                119  /*  bool              No rotation                         */
-#define ESCHER_Prop_LockAspectRatio             120  /*  bool              Don't allow changes in aspect ratio */
-#define ESCHER_Prop_LockPosition                121  /*  bool              Don't allow the shape to be moved   */
-#define ESCHER_Prop_LockAgainstSelect           122  /*  bool              Shape may not be selected           */
-#define ESCHER_Prop_LockCropping                123  /*  bool              No cropping this shape              */
-#define ESCHER_Prop_LockVertices                124  /*  bool              Edit Points not allowed             */
-#define ESCHER_Prop_LockText                    125  /*  bool              Do not edit text                    */
-#define ESCHER_Prop_LockAdjustHandles           126  /*  bool              Do not adjust                       */
 #define ESCHER_Prop_LockAgainstGrouping         127  /*  bool              Do not group this shape             */
 // Text
 #define ESCHER_Prop_lTxid                       128  /*  LONG              id for the text, value determined by the host            */
@@ -658,40 +443,14 @@ enum ESCHER_LineCap
 #define ESCHER_Prop_dxTextRight                 131  /*  LONG                                                                       */
 #define ESCHER_Prop_dyTextBottom                132  /*  LONG                                                                       */
 #define ESCHER_Prop_WrapText                    133  /*  MSOWRAPMODE       Wrap text at shape margins                               */
-#define ESCHER_Prop_scaleText                   134  /*  LONG              Text zoom/scale (used if fFitTextToShape)                */
 #define ESCHER_Prop_AnchorText                  135  /*  ESCHER_AnchorText How to anchor the text                                   */
 #define ESCHER_Prop_txflTextFlow                136  /*  MSOTXFL           Text flow                                                */
-#define ESCHER_Prop_cdirFont                    137  /*  MSOCDIR           Font rotation                                            */
 #define ESCHER_Prop_hspNext                     138  /*  MSOHSP            ID of the next shape (used by Word for linked textboxes) */
-#define ESCHER_Prop_txdir                       139  /*  MSOTXDIR          Bi-Di Text direction                                     */
-#define ESCHER_Prop_SelectText                  187  /*  bool              sal_True if single click selects text, sal_False if two clicks   */
-#define ESCHER_Prop_AutoTextMargin              188  /*  bool              use host's margin calculations                           */
-#define ESCHER_Prop_RotateText                  189  /*  bool              Rotate text with shape                                   */
-#define ESCHER_Prop_FitShapeToText              190  /*  bool              Size shape to fit text size                              */
 #define ESCHER_Prop_FitTextToShape              191  /*  bool              Size text to fit shape size                              */
 // GeoText
 #define ESCHER_Prop_gtextUNICODE                192  /*  WCHAR*            UNICODE text string       */
-#define ESCHER_Prop_gtextRTF                    193  /*  char*             RTF text string           */
-#define ESCHER_Prop_gtextAlign                  194  /*  MSOGEOTEXTALIGN   alignment on curve        */
 #define ESCHER_Prop_gtextSize                   195  /*  LONG              default point size        */
-#define ESCHER_Prop_gtextSpacing                196  /*  LONG              fixed point 16.16         */
 #define ESCHER_Prop_gtextFont                   197  /*  WCHAR*            font family name          */
-#define ESCHER_Prop_gtextFReverseRows           240  /*  bool              Reverse row order         */
-#define ESCHER_Prop_fGtext                      241  /*  bool              Has text effect           */
-#define ESCHER_Prop_gtextFVertical              242  /*  bool              Rotate characters         */
-#define ESCHER_Prop_gtextFKern                  243  /*  bool              Kern characters           */
-#define ESCHER_Prop_gtextFTight                 244  /*  bool              Tightening or tracking    */
-#define ESCHER_Prop_gtextFStretch               245  /*  bool              Stretch to fit shape      */
-#define ESCHER_Prop_gtextFShrinkFit             246  /*  bool              Char bounding box         */
-#define ESCHER_Prop_gtextFBestFit               247  /*  bool              Scale text-on-path        */
-#define ESCHER_Prop_gtextFNormalize             248  /*  bool              Stretch char height       */
-#define ESCHER_Prop_gtextFDxMeasure             249  /*  bool              Do not measure along path */
-#define ESCHER_Prop_gtextFBold                  250  /*  bool              Bold font                 */
-#define ESCHER_Prop_gtextFItalic                251  /*  bool              Italic font               */
-#define ESCHER_Prop_gtextFUnderline             252  /*  bool              Underline font            */
-#define ESCHER_Prop_gtextFShadow                253  /*  bool              Shadow font               */
-#define ESCHER_Prop_gtextFSmallcaps             254  /*  bool              Small caps font           */
-#define ESCHER_Prop_gtextFStrikethrough         255  /*  bool              Strike through font       */
 // Blip
 #define ESCHER_Prop_cropFromTop                 256  /*  LONG              16.16 fraction times total                          */
 #define ESCHER_Prop_cropFromBottom              257  /*  LONG                image width or height,                            */
@@ -700,20 +459,9 @@ enum ESCHER_LineCap
 #define ESCHER_Prop_pib                         260  /*  IMsoBlip*         Blip to display                                     */
 #define ESCHER_Prop_pibName                     261  /*  WCHAR*            Blip file name                                      */
 #define ESCHER_Prop_pibFlags                    262  /*  MSOBLIPFLAGS      Blip flags                                          */
-#define ESCHER_Prop_pictureTransparent          263  /*  LONG              transparent color (none if ~0UL)                    */
 #define ESCHER_Prop_pictureContrast             264  /*  LONG              contrast setting                                    */
 #define ESCHER_Prop_pictureBrightness           265  /*  LONG              brightness setting                                  */
-#define ESCHER_Prop_pictureGamma                266  /*  LONG              16.16 gamma                                         */
 #define ESCHER_Prop_pictureId                   267  /*  LONG              Host-defined ID for OLE objects (usually a pointer) */
-#define ESCHER_Prop_pictureDblCrMod             268  /*  MSOCLR            Modification used if shape has double shadow        */
-#define ESCHER_Prop_pictureFillCrMod            269  /*  MSOCLR                                                                */
-#define ESCHER_Prop_pictureLineCrMod            270  /*  MSOCLR                                                                */
-#define ESCHER_Prop_pibPrint                    271  /*  IMsoBlip*         Blip to display when printing                       */
-#define ESCHER_Prop_pibPrintName                272  /*  WCHAR*            Blip file name                                      */
-#define ESCHER_Prop_pibPrintFlags               273  /*  MSOBLIPFLAGS      Blip flags                                          */
-#define ESCHER_Prop_fNoHitTestPicture           316  /*  bool              Do not hit test the picture                         */
-#define ESCHER_Prop_pictureGray                 317  /*  bool              grayscale display                                   */
-#define ESCHER_Prop_pictureBiLevel              318  /*  bool              bi-level display                                    */
 #define ESCHER_Prop_pictureActive               319  /*  bool              Server is active (OLE objects only)                 */
 // Geometry
 #define ESCHER_Prop_geoLeft                     320  /*  LONG              Defines the G (geometry) coordinate space.  */
@@ -725,19 +473,6 @@ enum ESCHER_LineCap
 #define ESCHER_Prop_pSegmentInfo                326  /*  IMsoArray                                                     */
 #define ESCHER_Prop_adjustValue                 327  /*  LONG              Adjustment values corresponding to          */
 #define ESCHER_Prop_adjust2Value                328  /*  LONG                the positions of the adjust handles       */
-#define ESCHER_Prop_adjust3Value                329  /*  LONG                of the shape. The number of values        */
-#define ESCHER_Prop_adjust4Value                330  /*  LONG                used and their allowable ranges vary      */
-#define ESCHER_Prop_adjust5Value                331  /*  LONG                from shape type to shape type.            */
-#define ESCHER_Prop_adjust6Value                332  /*  LONG                                                          */
-#define ESCHER_Prop_adjust7Value                333  /*  LONG                                                          */
-#define ESCHER_Prop_adjust8Value                334  /*  LONG                                                          */
-#define ESCHER_Prop_adjust9Value                335  /*  LONG                                                          */
-#define ESCHER_Prop_adjust10Value               336  /*  LONG                                                          */
-#define ESCHER_Prop_fShadowOK                   378  /*  bool              Shadow may be set                           */
-#define ESCHER_Prop_f3DOK                       379  /*  bool              3D may be set                               */
-#define ESCHER_Prop_fLineOK                     380  /*  bool              Line style may be set                       */
-#define ESCHER_Prop_fGtextOK                    381  /*  bool              Text effect (FontWork) supported             */
-#define ESCHER_Prop_fFillShadeShapeOK           382  /*  bool                                                          */
 #define ESCHER_Prop_fFillOK                     383  /*  bool              OK to fill the shape through the UI or VBA? */
 // FillStyle
 #define ESCHER_Prop_fillType                    384  /*  ESCHER_FillStyle  Type of fill                                  */
@@ -745,52 +480,23 @@ enum ESCHER_LineCap
 #define ESCHER_Prop_fillOpacity                 386  /*  LONG              Fixed 16.16                                   */
 #define ESCHER_Prop_fillBackColor               387  /*  MSOCLR            Background color                              */
 #define ESCHER_Prop_fillBackOpacity             388  /*  LONG              Shades only                                   */
-#define ESCHER_Prop_fillCrMod                   389  /*  MSOCLR            Modification for BW views                     */
 #define ESCHER_Prop_fillBlip                    390  /*  IMsoBlip*         Pattern/texture                               */
-#define ESCHER_Prop_fillBlipName                391  /*  WCHAR*            Blip file name                                */
-#define ESCHER_Prop_fillBlipFlags               392  /*  MSOBLIPFLAGS      Blip flags                                    */
-#define ESCHER_Prop_fillWidth                   393  /*  LONG              How big (A units) to make a metafile texture. */
-#define ESCHER_Prop_fillHeight                  394  /*  LONG                                                            */
 #define ESCHER_Prop_fillAngle                   395  /*  LONG              Fade angle - degrees in 16.16                 */
 #define ESCHER_Prop_fillFocus                   396  /*  LONG              Linear shaded fill focus percent              */
 #define ESCHER_Prop_fillToLeft                  397  /*  LONG              Fraction 16.16                                */
 #define ESCHER_Prop_fillToTop                   398  /*  LONG              Fraction 16.16                                */
 #define ESCHER_Prop_fillToRight                 399  /*  LONG              Fraction 16.16                                */
 #define ESCHER_Prop_fillToBottom                400  /*  LONG              Fraction 16.16                                */
-#define ESCHER_Prop_fillRectLeft                401  /*  LONG              For shaded fills, use the specified rectangle */
-#define ESCHER_Prop_fillRectTop                 402  /*  LONG                instead of the shape's bounding rect to     */
 #define ESCHER_Prop_fillRectRight               403  /*  LONG                define how large the fade is going to be.   */
 #define ESCHER_Prop_fillRectBottom              404  /*  LONG                                                            */
-#define ESCHER_Prop_fillDztype                  405  /*  MSODZTYPE                                                       */
-#define ESCHER_Prop_fillShadePreset             406  /*  LONG              Special shades                                */
-#define ESCHER_Prop_fillShadeColors             407  /*  IMsoArray         a preset array of colors                      */
-#define ESCHER_Prop_fillOriginX                 408  /*  LONG                                                            */
-#define ESCHER_Prop_fillOriginY                 409  /*  LONG                                                            */
-#define ESCHER_Prop_fillShapeOriginX            410  /*  LONG                                                            */
-#define ESCHER_Prop_fillShapeOriginY            411  /*  LONG                                                            */
-#define ESCHER_Prop_fillShadeType               412  /*  MSOSHADETYPE      Type of shading, if a shaded (gradient) fill. */
-#define ESCHER_Prop_fFilled                     443  /*  bool              Is shape filled?                              */
-#define ESCHER_Prop_fHitTestFill                444  /*  bool              Should we hit test fill?                      */
-#define ESCHER_Prop_fillShape                   445  /*  bool              Register pattern on shape                     */
-#define ESCHER_Prop_fillUseRect                 446  /*  bool              Use the large rect?                           */
 #define ESCHER_Prop_fNoFillHitTest              447  /*  bool              Hit test a shape as though filled             */
 // LineStyle
 #define ESCHER_Prop_lineColor                   448  /*  MSOCLR            Color of line                              */
 #define ESCHER_Prop_lineOpacity                 449  /*  LONG              Not implemented                            */
 #define ESCHER_Prop_lineBackColor               450  /*  MSOCLR            Background color                           */
-#define ESCHER_Prop_lineCrMod                   451  /*  MSOCLR            Modification for BW views                  */
-#define ESCHER_Prop_lineType                    452  /*  MSOLINETYPE       Type of line                               */
-#define ESCHER_Prop_lineFillBlip                453  /*  IMsoBlip*         Pattern/texture                            */
-#define ESCHER_Prop_lineFillBlipName            454  /*  WCHAR*            Blip file name                             */
-#define ESCHER_Prop_lineFillBlipFlags           455  /*  MSOBLIPFLAGS      Blip flags                                 */
-#define ESCHER_Prop_lineFillWidth               456  /*  LONG              How big (A units) to make                  */
-#define ESCHER_Prop_lineFillHeight              457  /*  LONG                a metafile texture.                      */
-#define ESCHER_Prop_lineFillDztype              458  /*  MSODZTYPE         How to interpret fillWidth/Height numbers. */
 #define ESCHER_Prop_lineWidth                   459  /*  LONG              A units; 1pt == 12700 EMUs                 */
-#define ESCHER_Prop_lineMiterLimit              460  /*  LONG              ratio (16.16) of width                     */
 #define ESCHER_Prop_lineStyle                   461  /*  MSOLINESTYLE      Draw parallel lines?                       */
 #define ESCHER_Prop_lineDashing                 462  /*  MSOLINEDASHING    Can be overridden by:                      */
-#define ESCHER_Prop_lineDashStyle               463  /*  IMsoArray         As Win32 ExtCreatePen                      */
 #define ESCHER_Prop_lineStartArrowhead          464  /*  MSOLINEEND        Arrow at start                             */
 #define ESCHER_Prop_lineEndArrowhead            465  /*  MSOLINEEND        Arrow at end                               */
 #define ESCHER_Prop_lineStartArrowWidth         466  /*  MSOLINEENDWIDTH   Arrow at start                             */
@@ -799,139 +505,36 @@ enum ESCHER_LineCap
 #define ESCHER_Prop_lineEndArrowLength          469  /*  MSOLINEENDLENGTH  Arrow at end                               */
 #define ESCHER_Prop_lineJoinStyle               470  /*  MSOLINEJOIN       How to join lines                          */
 #define ESCHER_Prop_lineEndCapStyle             471  /*  MSOLINECAP        How to end lines                           */
-#define ESCHER_Prop_fArrowheadsOK               507  /*  bool              Allow arrowheads if prop. is set           */
-#define ESCHER_Prop_fLine                       508  /*  bool              Any line?                                  */
-#define ESCHER_Prop_fHitTestLine                509  /*  bool              Should we hit test lines?                  */
-#define ESCHER_Prop_lineFillShape               510  /*  bool              Register pattern on shape                  */
 #define ESCHER_Prop_fNoLineDrawDash             511  /*  bool              Draw a dashed line if no line              */
 // ShadowStyle
-#define ESCHER_Prop_shadowType                  512  /*  MSOSHADOWTYPE     Type of effect            */
 #define ESCHER_Prop_shadowColor                 513  /*  MSOCLR            Foreground color          */
-#define ESCHER_Prop_shadowHighlight             514  /*  MSOCLR            Embossed color            */
-#define ESCHER_Prop_shadowCrMod                 515  /*  MSOCLR            Modification for BW views */
 #define ESCHER_Prop_shadowOpacity               516  /*  LONG              Fixed 16.16               */
 #define ESCHER_Prop_shadowOffsetX               517  /*  LONG              Offset shadow             */
 #define ESCHER_Prop_shadowOffsetY               518  /*  LONG              Offset shadow             */
-#define ESCHER_Prop_shadowSecondOffsetX         519  /*  LONG              Double offset shadow      */
-#define ESCHER_Prop_shadowSecondOffsetY         520  /*  LONG              Double offset shadow      */
-#define ESCHER_Prop_shadowScaleXToX             521  /*  LONG              16.16                     */
-#define ESCHER_Prop_shadowScaleYToX             522  /*  LONG              16.16                     */
-#define ESCHER_Prop_shadowScaleXToY             523  /*  LONG              16.16                     */
-#define ESCHER_Prop_shadowScaleYToY             524  /*  LONG              16.16                     */
-#define ESCHER_Prop_shadowPerspectiveX          525  /*  LONG              16.16 / weight            */
-#define ESCHER_Prop_shadowPerspectiveY          526  /*  LONG              16.16 / weight            */
-#define ESCHER_Prop_shadowWeight                527  /*  LONG              scaling factor            */
-#define ESCHER_Prop_shadowOriginX               528  /*  LONG                                        */
-#define ESCHER_Prop_shadowOriginY               529  /*  LONG                                        */
-#define ESCHER_Prop_fShadow                     574  /*  bool              Any shadow?               */
 #define ESCHER_Prop_fshadowObscured             575  /*  bool              Excel5-style shadow       */
 // PerspectiveStyle
-#define ESCHER_Prop_perspectiveType             576  /*  MSOXFORMTYPE      Where transform applies        */
-#define ESCHER_Prop_perspectiveOffsetX          577  /*  LONG              The LONG values define a       */
-#define ESCHER_Prop_perspectiveOffsetY          578  /*  LONG                transformation matrix,       */
-#define ESCHER_Prop_perspectiveScaleXToX        579  /*  LONG                effectively, each value      */
-#define ESCHER_Prop_perspectiveScaleYToX        580  /*  LONG                is scaled by the             */
-#define ESCHER_Prop_perspectiveScaleXToY        581  /*  LONG                perspectiveWeight parameter. */
-#define ESCHER_Prop_perspectiveScaleYToY        582  /*  LONG                                             */
-#define ESCHER_Prop_perspectivePerspectiveX     583  /*  LONG                                             */
-#define ESCHER_Prop_perspectivePerspectiveY     584  /*  LONG                                             */
-#define ESCHER_Prop_perspectiveWeight           585  /*  LONG              Scaling factor                 */
-#define ESCHER_Prop_perspectiveOriginX          586  /*  LONG                                             */
-#define ESCHER_Prop_perspectiveOriginY          587  /*  LONG                                             */
-#define ESCHER_Prop_fPerspective                639  /*  bool              On/off                         */
 // 3D Object
-#define ESCHER_Prop_c3DSpecularAmt              640  /*  LONG         Fixed-point 16.16                                                                                                   */
-#define ESCHER_Prop_c3DDiffuseAmt               641  /*  LONG         Fixed-point 16.16                                                                                                   */
-#define ESCHER_Prop_c3DShininess                642  /*  LONG         Default gives OK results                                                                                            */
-#define ESCHER_Prop_c3DEdgeThickness            643  /*  LONG         Specular edge thickness                                                                                             */
-#define ESCHER_Prop_c3DExtrudeForward           644  /*  LONG         Distance of extrusion in EMUs                                                                                       */
-#define ESCHER_Prop_c3DExtrudeBackward          645  /*  LONG                                                                                                                             */
-#define ESCHER_Prop_c3DExtrudePlane             646  /*  LONG         Extrusion direction                                                                                                 */
-#define ESCHER_Prop_c3DExtrusionColor           647  /*  MSOCLR       Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. */
-#define ESCHER_Prop_c3DCrMod                    648  /*  MSOCLR       Modification for BW views                                                                                           */
-#define ESCHER_Prop_f3D                         700  /*  bool         Does this shape have a 3D effect?                                                                                   */
-#define ESCHER_Prop_fc3DMetallic                701  /*  bool         Use metallic specularity?                                                                                           */
-#define ESCHER_Prop_fc3DUseExtrusionColor       702  /*  bool                                                                                                                             */
 #define ESCHER_Prop_fc3DLightFace               703  /*  bool                                                                                                                             */
 // 3D Style
-#define ESCHER_Prop_c3DYRotationAngle           704  /*  LONG            degrees (16.16) about y axis         */
-#define ESCHER_Prop_c3DXRotationAngle           705  /*  LONG            degrees (16.16) about x axis         */
-#define ESCHER_Prop_c3DRotationAxisX            706  /*  LONG            These specify the rotation axis;     */
-#define ESCHER_Prop_c3DRotationAxisY            707  /*  LONG              only their relative magnitudes     */
-#define ESCHER_Prop_c3DRotationAxisZ            708  /*  LONG              matter.                            */
-#define ESCHER_Prop_c3DRotationAngle            709  /*  LONG            degrees (16.16) about axis           */
-#define ESCHER_Prop_c3DRotationCenterX          710  /*  LONG            rotation center x (16.16 or g-units) */
-#define ESCHER_Prop_c3DRotationCenterY          711  /*  LONG            rotation center y (16.16 or g-units) */
-#define ESCHER_Prop_c3DRotationCenterZ          712  /*  LONG            rotation center z (absolute (emus))  */
-#define ESCHER_Prop_c3DRenderMode               713  /*  MSO3DRENDERMODE Full,wireframe, or bcube             */
-#define ESCHER_Prop_c3DTolerance                714  /*  LONG            pixels (16.16)                       */
-#define ESCHER_Prop_c3DXViewpoint               715  /*  LONG            X view point (emus)                  */
-#define ESCHER_Prop_c3DYViewpoint               716  /*  LONG            Y view point (emus)                  */
-#define ESCHER_Prop_c3DZViewpoint               717  /*  LONG            Z view distance (emus)               */
-#define ESCHER_Prop_c3DOriginX                  718  /*  LONG                                                 */
-#define ESCHER_Prop_c3DOriginY                  719  /*  LONG                                                 */
-#define ESCHER_Prop_c3DSkewAngle                720  /*  LONG            degree (16.16) skew angle            */
-#define ESCHER_Prop_c3DSkewAmount               721  /*  LONG            Percentage skew amount               */
-#define ESCHER_Prop_c3DAmbientIntensity         722  /*  LONG            Fixed point intensity                */
-#define ESCHER_Prop_c3DKeyX                     723  /*  LONG            Key light source direc-              */
-#define ESCHER_Prop_c3DKeyY                     724  /*  LONG            tion; only their relative            */
-#define ESCHER_Prop_c3DKeyZ                     725  /*  LONG            magnitudes matter                    */
-#define ESCHER_Prop_c3DKeyIntensity             726  /*  LONG            Fixed point intensity                */
-#define ESCHER_Prop_c3DFillX                    727  /*  LONG            Fill light source direc-             */
-#define ESCHER_Prop_c3DFillY                    728  /*  LONG            tion; only their relative            */
-#define ESCHER_Prop_c3DFillZ                    729  /*  LONG            magnitudes matter                    */
-#define ESCHER_Prop_c3DFillIntensity            730  /*  LONG            Fixed point intensity                */
-#define ESCHER_Prop_fc3DConstrainRotation       763  /*  bool                                                 */
-#define ESCHER_Prop_fc3DRotationCenterAuto      764  /*  bool                                                 */
-#define ESCHER_Prop_fc3DParallel                765  /*  bool            Parallel projection?                 */
-#define ESCHER_Prop_fc3DKeyHarsh                766  /*  bool            Is key lighting harsh?               */
-#define ESCHER_Prop_fc3DFillHarsh               767  /*  bool            Is fill lighting harsh?              */
 // Shape
 #define ESCHER_Prop_hspMaster                   769  /*  MSOHSP          master shape                                        */
 #define ESCHER_Prop_cxstyle                     771  /*  MSOCXSTYLE      Type of connector                                   */
 #define ESCHER_Prop_bWMode                      772  /*  ESCHERwMode     Settings for modifications to                       */
-#define ESCHER_Prop_bWModePureBW                773  /*  ESCHERwMode     be made when in different                         */
-#define ESCHER_Prop_bWModeBW                    774  /*  ESCHERwMode     forms of black-and-white mode.                    */
-#define ESCHER_Prop_fOleIcon                    826  /*  bool            For OLE objects, whether the object is in icon form */
-#define ESCHER_Prop_fPreferRelativeResize       827  /*  bool            For UI only. Prefer relative resizing.              */
-#define ESCHER_Prop_fLockShapeType              828  /*  bool            Lock the shape type (don't allow Change Shape)      */
-#define ESCHER_Prop_fDeleteAttachedObject       830  /*  bool                                                                */
 #define ESCHER_Prop_fBackground                 831  /*  bool            If sal_True, this is the background shape.              */
 // Callout
-#define ESCHER_Prop_spcot                       832  /*  MSOSPCOT        Callout type                                           */
-#define ESCHER_Prop_dxyCalloutGap               833  /*  LONG            Distance from box to first point.(EMUs)                */
-#define ESCHER_Prop_spcoa                       834  /*  MSOSPCOA        Callout angle                                          */
-#define ESCHER_Prop_spcod                       835  /*  MSOSPCOD        Callout drop type                                      */
-#define ESCHER_Prop_dxyCalloutDropSpecified     836  /*  LONG            if msospcodSpecified, the actual drop distance         */
-#define ESCHER_Prop_dxyCalloutLengthSpecified   837  /*  LONG            if fCalloutLengthSpecified, the actual distance        */
-#define ESCHER_Prop_fCallout                    889  /*  bool            Is the shape a callout?                                */
-#define ESCHER_Prop_fCalloutAccentBar           890  /*  bool            does callout have accent bar                           */
-#define ESCHER_Prop_fCalloutTextBorder          891  /*  bool            does callout have a text border                        */
-#define ESCHER_Prop_fCalloutMinusX              892  /*  bool                                                                   */
-#define ESCHER_Prop_fCalloutMinusY              893  /*  bool                                                                   */
-#define ESCHER_Prop_fCalloutDropAuto            894  /*  bool            If true, then we occasionally invert the drop distance */
-#define ESCHER_Prop_fCalloutLengthSpecified     895  /*  bool            if true, we look at dxyCalloutLengthSpecified          */
 // GroupShape
 #define ESCHER_Prop_wzName                      896  /*  WCHAR*          Shape Name (present only if explicitly set)                                                            */
 #define ESCHER_Prop_wzDescription               897  /*  WCHAR*          alternate text                                                                                         */
 #define ESCHER_Prop_pihlShape                   898  /*  IHlink*         The hyperlink in the shape.                                                                            */
-#define ESCHER_Prop_pWrapPolygonVertices        899  /*  IMsoArray       The polygon that text will be wrapped around (Word)                                                    */
 #define ESCHER_Prop_dxWrapDistLeft              900  /*  LONG            Left wrapping distance from text (Word)                                                                */
 #define ESCHER_Prop_dyWrapDistTop               901  /*  LONG            Top wrapping distance from text (Word)                                                                 */
 #define ESCHER_Prop_dxWrapDistRight             902  /*  LONG            Right wrapping distance from text (Word)                                                               */
 #define ESCHER_Prop_dyWrapDistBottom            903  /*  LONG            Bottom wrapping distance from text (Word)                                                              */
-#define ESCHER_Prop_lidRegroup                  904  /*  LONG            Regroup ID                                                                                             */
 #define ESCHER_Prop_tableProperties             927
 #define ESCHER_Prop_tableRowProperties          928
-#define ESCHER_Prop_fEditedWrap                 953  /*  bool            Has the wrap polygon been edited?                                                                      */
-#define ESCHER_Prop_fBehindDocument             954  /*  bool            Word-only (shape is behind text)                                                                       */
-#define ESCHER_Prop_fOnDblClickNotify           955  /*  bool            Notify client on a double click                                                                        */
-#define ESCHER_Prop_fIsButton                   956  /*  bool            A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. */
-#define ESCHER_Prop_fOneD                       957  /*  bool            1D adjustment                                                                                          */
 #define ESCHER_Prop_fHidden                     958  /*  bool            Do not display                                                                                         */
 #define ESCHER_Prop_fPrint                      959  /*  bool            Print this shape                                                                                       */
 
-#define ESCHER_PERSISTENTRY_PREALLOCATE     64
 
 #define ESCHER_Persist_PrivateEntry         0x80000000
 #define ESCHER_Persist_Dgg                  0x00010000
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index f129ec80f68a..71424e21d016 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -135,18 +135,13 @@ typedef ::std::multiset< ::boost::shared_ptr<SvxMSDffShapeInfo>,
 #define SVXMSDFF_SETTINGS_IMPORT_EXCEL      4
 
 #define SP_FGROUP       0x001   ///< This shape is a group shape
-#define SP_FCHILD       0x002   ///< Not a top-level shape
 #define SP_FPATRIARCH   0x004   ///< This is the topmost group shape.
                                 ///< Exactly one of these per drawing.
-#define SP_FDELETED     0x008   ///< The shape has been deleted
 #define SP_FOLESHAPE    0x010   ///< The shape is an OLE object
 #define SP_FHAVEMASTER  0x020   ///< Shape has a hspMaster property
 #define SP_FFLIPH       0x040   ///< Shape is flipped horizontally
 #define SP_FFLIPV       0x080   ///< Shape is flipped vertically
-#define SP_FCONNECTOR   0x100   ///< Connector type of shape
-#define SP_FHAVEANCHOR  0x200   ///< Shape has an anchor of some kind
 #define SP_FBACKGROUND  0x400   ///< Background shape
-#define SP_FHAVESPT     0x800   ///< Shape has a shape type property
 
 // for the CreateSdrOLEFromStorage we need the information, how we handle
 // convert able OLE-Objects - this ist stored in
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 5718ce9ac468..9d72a6ea011e 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -467,12 +467,6 @@ public:
 
 
 
-#define SD_HEADERFOOTER_DATE        1
-#define SD_HEADERFOOTER_TODAYDATE   2
-#define SD_HEADERFOOTER_USERDATE    4
-#define SD_HEADERFOOTER_SLIDENUMBER 8
-#define SD_HEADERFOOTER_HEADER      16
-#define SD_HEADERFOOTER_FOOTER      32
 
 class SvxFieldItem;
 struct MSFILTER_DLLPUBLIC PPTFieldEntry
@@ -1049,7 +1043,6 @@ struct PPTTextRulerInterpreter
 
 #define PPT_SPEC_NEWLINE            0x10000
 #define PPT_SPEC_SYMBOL             0x20000
-#define PPT_SPEC_USE_STARBATS       0x40000
 
 struct StyleTextProp9
 {
@@ -1340,49 +1333,17 @@ public :
 };
 
 // PowerPoint record types
-#define PPT_PST_Unknown                         0
-#define PPT_PST_SubContainerCompleted           1
-#define PPT_PST_IRRAtom                         2
-#define PPT_PST_PSS                             3
-#define PPT_PST_SubContainerException           4
-#define PPT_PST_ClientSignal1                   6
-#define PPT_PST_ClientSignal2                   7
-#define PPT_PST_PowerPointStateInfoAtom         10
 #define PPT_PST_Document                        1000
 #define PPT_PST_DocumentAtom                    1001
-#define PPT_PST_EndDocument                     1002
-#define PPT_PST_SlidePersist                    1003
-#define PPT_PST_SlideBase                       1004
-#define PPT_PST_SlideBaseAtom                   1005
-#define PPT_PST_Slide                           1006
 #define PPT_PST_SlideAtom                       1007
-#define PPT_PST_Notes                           1008
 #define PPT_PST_NotesAtom                       1009
 #define PPT_PST_Environment                     1010
 #define PPT_PST_SlidePersistAtom                1011
-#define PPT_PST_Scheme                          1012
-#define PPT_PST_SchemeAtom                      1013
-#define PPT_PST_DocViewInfo                     1014
-#define PPT_PST_SslideLayoutAtom                1015
-#define PPT_PST_MainMaster                      1016
 #define PPT_PST_SSSlideInfoAtom                 1017
-#define PPT_PST_SlideViewInfo                   1018
-#define PPT_PST_GuideAtom                       1019
-#define PPT_PST_ViewInfo                        1020
-#define PPT_PST_ViewInfoAtom                    1021
-#define PPT_PST_SlideViewInfoAtom               1022
 #define PPT_PST_VBAInfo                         1023
 #define PPT_PST_VBAInfoAtom                     1024
 #define PPT_PST_SSDocInfoAtom                   1025
-#define PPT_PST_Summary                         1026
-#define PPT_PST_Texture                         1027
-#define PPT_PST_VBASlideInfo                    1028
-#define PPT_PST_VBASlideInfoAtom                1029
-#define PPT_PST_DocRoutingSlip                  1030
-#define PPT_PST_OutlineViewInfo                 1031
-#define PPT_PST_SorterViewInfo                  1032
 #define PPT_PST_ExObjList                       1033
-#define PPT_PST_ExObjListAtom                   1034
 #define PPT_PST_PPDrawingGroup                  1035
 #define PPT_PST_PPDrawing                       1036
 #define PPT_PST_GridSpacing10Atom               1037
@@ -1391,47 +1352,27 @@ public :
 #define PPT_PST_NamedShowSlides                 1042
 #define PPT_PST_List                            2000
 #define PPT_PST_FontCollection                  2005
-#define PPT_PST_ListPlaceholder                 2017
-#define PPT_PST_BookmarkCollection              2019
 #define PPT_PST_SoundCollection                 2020
-#define PPT_PST_SoundCollAtom                   2021
 #define PPT_PST_Sound                           2022
 #define PPT_PST_SoundData                       2023
-#define PPT_PST_BookmarkSeedAtom                2025
-#define PPT_PST_GuideList                       2026
-#define PPT_PST_RunArray                        2028
-#define PPT_PST_RunArrayAtom                    2029
-#define PPT_PST_ArrayElementAtom                2030
-#define PPT_PST_Int4ArrayAtom                   2031
 #define PPT_PST_ColorSchemeAtom                 2032
 
 // these atoms first was seen in ppt2000 in a private Tag atom
 #define PPT_PST_ExtendedBuGraContainer          2040    // consist of 4041
 #define PPT_PST_ExtendedBuGraAtom               2041    // the instance of this atom indices the current graphic
 
-#define PPT_PST_OEShape                         3008
 #define PPT_PST_ExObjRefAtom                    3009
 #define PPT_PST_OEPlaceholderAtom               3011
-#define PPT_PST_GrColor                         3020
-#define PPT_PST_GrectAtom                       3025
-#define PPT_PST_GratioAtom                      3031
-#define PPT_PST_Gscaling                        3032
-#define PPT_PST_GpointAtom                      3034
-#define PPT_PST_OEShapeAtom                     3035
 #define PPT_PST_OutlineTextRefAtom              3998
 #define PPT_PST_TextHeaderAtom                  3999
 #define PPT_PST_TextCharsAtom                   4000
 #define PPT_PST_StyleTextPropAtom               4001
-#define PPT_PST_BaseTextPropAtom                4002
 #define PPT_PST_TxMasterStyleAtom               4003
-#define PPT_PST_TxCFStyleAtom                   4004
 #define PPT_PST_TxPFStyleAtom                   4005
 #define PPT_PST_TextRulerAtom                   4006
-#define PPT_PST_TextBookmarkAtom                4007
 #define PPT_PST_TextBytesAtom                   4008
 #define PPT_PST_TxSIStyleAtom                   4009
 #define PPT_PST_TextSpecInfoAtom                4010
-#define PPT_PST_DefaultRulerAtom                4011
 
 // these atoms first was seen in ppt2000 in a private Tag atom
 #define PPT_PST_ExtendedParagraphAtom           4012
@@ -1442,52 +1383,23 @@ public :
 #define PPT_PST_TextDefaults9Atom               4016
 
 #define PPT_PST_FontEntityAtom                  4023
-#define PPT_PST_FontEmbedData                   4024
-#define PPT_PST_TypeFace                        4025
 #define PPT_PST_CString                         4026
-#define PPT_PST_ExternalObject                  4027
-#define PPT_PST_MetaFile                        4033
-#define PPT_PST_ExOleObj                        4034
 #define PPT_PST_ExOleObjAtom                    4035
-#define PPT_PST_ExPlainLinkAtom                 4036
-#define PPT_PST_CorePict                        4037
-#define PPT_PST_CorePictAtom                    4038
-#define PPT_PST_ExPlainAtom                     4039
 #define PPT_PST_SrKinsoku                       4040
-#define PPT_PST_Handout                         4041
 #define PPT_PST_ExEmbed                         4044
-#define PPT_PST_ExEmbedAtom                     4045
-#define PPT_PST_ExLink                          4046
-#define PPT_PST_ExLinkAtom_old                  4047
-#define PPT_PST_BookmarkEntityAtom              4048
-#define PPT_PST_ExLinkAtom                      4049
-#define PPT_PST_SrKinsokuAtom                   4050
 #define PPT_PST_ExHyperlinkAtom                 4051
-#define PPT_PST_ExPlain                         4053
-#define PPT_PST_ExPlainLink                     4054
 #define PPT_PST_ExHyperlink                     4055
 #define PPT_PST_SlideNumberMCAtom               4056
 #define PPT_PST_HeadersFooters                  4057
 #define PPT_PST_HeadersFootersAtom              4058
-#define PPT_PST_RecolorEntryAtom                4062
 #define PPT_PST_TxInteractiveInfoAtom           4063
-#define PPT_PST_EmFormatAtom                    4065
-#define PPT_PST_CharFormatAtom                  4066
-#define PPT_PST_ParaFormatAtom                  4067
 #define PPT_PST_MasterText                      4068
 #define PPT_PST_RecolorInfoAtom                 4071
-#define PPT_PST_ExQuickTime                     4073
-#define PPT_PST_ExQuickTimeMovie                4074
-#define PPT_PST_ExQuickTimeMovieData            4075
-#define PPT_PST_ExSubscription                  4076
-#define PPT_PST_ExSubscriptionSection           4077
 #define PPT_PST_ExControl                       4078
-#define PPT_PST_ExControlAtom                   4091
 #define PPT_PST_SlideListWithText               4080
 #define PPT_PST_AnimationInfoAtom               4081
 #define PPT_PST_InteractiveInfo                 4082
 #define PPT_PST_InteractiveInfoAtom             4083
-#define PPT_PST_SlideList                       4084
 #define PPT_PST_UserEditAtom                    4085
 #define PPT_PST_CurrentUserAtom                 4086
 #define PPT_PST_DateTimeMCAtom                  4087
@@ -1498,32 +1410,17 @@ public :
 #define PPT_PST_ExVideo                         4101
 #define PPT_PST_ExAviMovie                      4102
 #define PPT_PST_ExMCIMovie                      4103
-#define PPT_PST_ExMIDIAudio                     4109
-#define PPT_PST_ExCDAudio                       4110
-#define PPT_PST_ExWAVAudioEmbedded              4111
-#define PPT_PST_ExWAVAudioLink                  4112
-#define PPT_PST_ExOleObjStg                     4113
-#define PPT_PST_ExCDAudioAtom                   4114
-#define PPT_PST_ExWAVAudioEmbeddedAtom          4115
 #define PPT_PST_AnimationInfo                   4116
 #define PPT_PST_RTFDateTimeMCAtom               4117
 #define PPT_PST_ProgTags                        5000
-#define PPT_PST_ProgStringTag                   5001
 #define PPT_PST_ProgBinaryTag                   5002
 #define PPT_PST_BinaryTagData                   5003
-#define PPT_PST_PrintOptions                    6000
-#define PPT_PST_PersistPtrFullBlock             6001
 #define PPT_PST_PersistPtrIncrementalBlock      6002
 
 // these atoms first was seen in ppt2000 in a private Tag atom
 #define PPT_PST_PresentationAdvisorFlags9Atom   6010
 #define PPT_PST_HtmlDocInfo9Atom                6011
 
-#define PPT_PST_RulerIndentAtom                 10000
-#define PPT_PST_GscalingAtom                    10001
-#define PPT_PST_GrColorAtom                     10002
-#define PPT_PST_GLPointAtom                     10003
-#define PPT_PST_GlineAtom                       10004
 
 #define PPT_PST_HashCodeAtom                    11008
 #define PPT_PST_BuildList                       11010
@@ -1543,9 +1440,6 @@ public :
 #define PPT_ParaAttr_BulletColor    5   //00000020
 #define PPT_ParaAttr_BulletHeight   6   //00000040
 #define PPT_ParaAttr_BulletChar     7   //00000080
-#define PPT_ParaAttr_DontKnow1      8   //00000100
-#define PPT_ParaAttr_DontKnow2      9   //00000200
-#define PPT_ParaAttr_DontKnow3      10  //00000400
 #define PPT_ParaAttr_Adjust         11  //00000800 0000=Left, 0001=Center, 0002=Right, 0003=Block
 #define PPT_ParaAttr_LineFeed       12  //00001000
 #define PPT_ParaAttr_UpperDist      13  //00002000 is set to 0032 for TextFrames by default
@@ -1564,9 +1458,6 @@ public :
 #define PPT_CharAttr_Shadow             4   //00000010
 #define PPT_CharAttr_Strikeout          8   //00000100
 #define PPT_CharAttr_Embossed           9   //00000200
-#define PPT_CharAttr_ResetNumbering     10  //00000400
-#define PPT_CharAttr_EnableNumbering1   11  //00000800
-#define PPT_CharAttr_EnableNumbering2   12  //00001000
 #define PPT_CharAttr_Font               16  //00010000
 #define PPT_CharAttr_AsianOrComplexFont 21  //00200000
 #define PPT_CharAttr_ANSITypeface       22  //00400000
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 8c7378de3523..937ae019d86d 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -59,7 +59,6 @@ namespace ole {
 
 #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}"
 #define OLE_GUID_STDPIC  "{0BE35204-8F91-11CE-9DE3-00AA004BB851}"
-#define OLE_GUID_STDHLINK "{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}"
 
 
 
diff --git a/include/osl/detail/component-defines.h b/include/osl/detail/component-defines.h
index 9a31cee93975..bb51035ebad9 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -17,31 +17,6 @@
 
 #define LO_URE_CURRENT_ENV 1 /*TODO*/
 
-// sax/source/expatwrap/expwrap.component
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 1 /*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 1 /*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation
-// sfx2/util/sfx.component
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_document_dot_DocumentProperties 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_document_dot_DocumentProperties SfxDocumentMetaData_get_implementation
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_OfficeFrameLoader 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_OfficeFrameLoader com_sun_star_comp_office_FrameLoader_get_implementation
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_SynchronousFrameLoader 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_SynchronousFrameLoader  com_sun_star_comp_office_FrameLoader_get_implementation
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_DocumentTemplates 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_DocumentTemplates com_sun_star_comp_sfx2_DocumentTemplates_get_implementation
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_GlobalEventBroadcaster 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_GlobalEventBroadcaster com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_theGlobalEventBroadcaster 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_theGlobalEventBroadcaster com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation
-// svtools/util/svt_dot_component
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_graphic_dot_GraphicProvider 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_graphic_dot_GraphicProvider com_sun_star_comp_graphic_GraphicProvider_get_implementation
-// svx/util/svx_dot_component
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_drawing_dot_CustomShapeEngine 1
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_drawing_dot_CustomShapeEngine com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/process.h b/include/osl/process.h
index 712bb0bd2f82..4f334b0d5995 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -78,8 +78,6 @@ typedef enum {
 } oslDescriptorType;
 
 typedef sal_Int32 oslDescriptorFlag;
-#define osl_Process_DFNONE       0x0000
-#define osl_Process_DFWAIT       0x0001
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 54840fafee6d..6ee3b9b2bb68 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -33,7 +33,6 @@ extern "C" {
 /* error returns */
 #define OSL_INADDR_NONE             0xffffffff
 #define OSL_INVALID_PORT (-1)
-#define OSL_INVALID_IPX_SOCKET_NO   0xffffffff
 
 /**
     Opaque datatype SocketAddr.
diff --git a/include/postwin.h b/include/postwin.h
index d22052017c19..6fa0c364bf7a 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -31,10 +31,7 @@
 #undef TRANSPARENT
 #undef OPAQUE
 #define WIN32_TRANSPARENT 1
-#define WIN32_OPAQUE 2
 
-#define WIN_WB_LEFT               0
-#define WIN_WB_RIGHT              1
 #undef WB_LEFT
 #undef WB_RIGHT
 
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 592ab9a8740b..85506bdbffe9 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -36,9 +36,7 @@ class SfxChildWindow;
 class SfxChildWindowContext;
 
 #define SFX_CHILDWIN_ZOOMIN          0x01  // Fully retracted Float
-#define SFX_CHILDWIN_SMALL           0x02  // Half retracted Float
 #define SFX_CHILDWIN_FORCEDOCK       0x04  // Float forbidden
-#define SFX_CHILDWIN_AUTOHIDE        0x08  // DockingWindow in AutoHide mode
 #define SFX_CHILDWIN_TASK            0x10  // ChildWindow inside the Task
 #define SFX_CHILDWIN_CANTGETFOCUS    0x20  // ChildWindow can not get focus
 #define SFX_CHILDWIN_ALWAYSAVAILABLE 0x40   // ChildWindow is never disabled
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 40dc08b3b59d..e31690779926 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -40,18 +40,6 @@ class SfxBindings;
 
 typedef void (*SfxVoidFunc)();
 
-#define SDT_SDT_DOCFACTPRIO     10      // Explorer
-#define SDT_SW_DOCFACTPRIO      20      // Text Document
-#define SDT_SWW_DOCFACTPRIO     21      // Web Document
-#define SDT_SC_DOCFACTPRIO      30      // Table Document
-#define SDT_SI_DOCFACTPRIO      40      // Impress Document
-#define SDT_SD_DOCFACTPRIO      41      // Draw Document
-#define SDT_SCH_DOCFACTPRIO     50      // Chart Document
-#define SDT_SMA_DOCFACTPRIO     60      // Math Document
-#define SDT_SIM_DOCFACTPRIO     70      // Image Document
-#define SDT_FRM_DOCFACTPRIO    100      // Frame Document
-#define SDT_MSG_DOCFACTPRIO    110      // Message Document
-#define SDT_SDB_DOCFACTPRIO    200      // Database Document
 
 class SFX2_DLLPUBLIC SfxObjectFactory
 {
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index fe79550d1ec7..ca5a5ac9a78a 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -38,7 +38,6 @@
 #define SFX_SLOT_ASYNCHRON     0x0020L // via Post-Message, exclusiv
                                        // to SYNCHRON
 
-#define SFX_SLOT_HASCOREID     0x0040L // Slot-ID/Which-ID execute mapping
 #define SFX_SLOT_HASDIALOG     0x0080L // Coordinates for dialogue after recofig
 
 #define SFX_SLOT_NORECORD      0x0100L // no recording
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index d9d4e956e5cd..d1cd9f4138c2 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -108,7 +108,6 @@ namespace com { namespace sun { namespace star {
 
 typedef sal_uInt32 SfxObjectShellFlags;
 #define SFXOBJECTSHELL_HASOPENDOC      0x01L
-#define SFXOBJECTSHELL_DONTREPLACE     0x02L
 #define SFXOBJECTSHELL_HASMENU         0x04L
 #define SFXOBJECTSHELL_DONTLOADFILTERS 0x08L
 #define SFXOBJECTSHELL_DONTCLOSE       0x10L
@@ -486,7 +485,6 @@ public:
 #define CONTENT_STYLE 0
 #define CONTENT_CONFIG 1
 #define CONTENT_MACRO 2
-#define DEF_CONTENT_COUNT 1
 
 
     virtual std::vector<Color> GetDocColors();
diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
index e9b1b11eafc4..a5ac9fcea749 100644
--- a/include/sfx2/sfxcommands.h
+++ b/include/sfx2/sfxcommands.h
@@ -32,7 +32,6 @@
 #define CMD_SID_WIN_FULLSCREEN                      ".uno:FullScreen"
 #define CMD_SID_BASICIDE_HIDECURPAGE                ".uno:HideCurPage"
 #define CMD_SID_BASICIDE_MODULEDLG                  ".uno:ModuleDialog"
-#define CMD_SID_NAVIGATOR                           ".uno:Navigator"
 #define CMD_SID_BASICIDE_NEWDIALOG                  ".uno:NewDialog"
 #define CMD_SID_BASICIDE_NEWMODULE                  ".uno:NewModule"
 #define CMD_SID_OPENDOC                             ".uno:Open"
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 2baa19f13a44..69d8e750442b 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -614,7 +614,6 @@ SFX_TMPL_INTERFACE(Class,SuperClass,true)                                   \
 #define SFX_VISIBILITY_FULLSCREEN       0x2000
 #define SFX_VISIBILITY_CLIENT           0x4000
 #define SFX_VISIBILITY_SERVER           0x8000
-#define SFX_VISIBILITY_NOCONTEXT        0xFFFF  // Always visible
 
 #endif
 
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
index 47f97c52f98f..b181c7c18e4f 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -31,9 +31,6 @@
 //panel common
 #define PROPERTYPAGE_WIDTH      109
 
-//about titlebar
-#define STR_MOREPROPERTY_QUICKHELP  3
-
 //about section page
 #define CONTROL_SPACING_VERTICAL        5
 #define CONTROL_SPACING_HORIZONTAL      3
@@ -43,12 +40,6 @@
 #define CBOX_HEIGHT         12
 #define MBOX_HEIGHT         12
 
-#define TBX_OUT_BORDER_OFFSET_X     2
-#define TBX_OUT_BORDER_OFFSET_Y     1
-
-//for 16*16 pixel bmp
-#define TOOLBOX_ITEM_HEIGHT         15
-#define TOOLBOX_ITEM_WIDTH          13
 
 //about popup panel
 #define POPUPPANEL_MARGIN_VERTICAL      7
@@ -59,11 +50,11 @@
 #define OFFSET_X        1
 #define OFFSET_Y        1
 
-#define POPUP_COLOR_PICKER_WIDTH    97
-#define POPUP_COLOR_PICKER_HEIGHT   114
 //new
 #define POPUPPANEL_MARGIN_SMALL     2
 #define POPUPPANEL_MARGIN_LARGE     5
-#endif
+
+
+#endif /* _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index f91e01132fb0..252d728a79b5 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -43,7 +43,6 @@ struct TabPageImpl;
 
 struct TabDlg_Impl;
 
-#define ID_TABCONTROL   1
 #define RET_USER        100
 #define RET_USER_CANCEL 101
 
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 2894122b07c6..8919d8fc0a58 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -67,10 +67,7 @@ class SfxInPlaceClient;
 #define SFX_PRINTER_CHG_SIZE        16
 #define SFX_PRINTER_ALL             31
 
-#define SFX_PRINTER_CHG_ORIENTATION_FLAG  3
-#define SFX_PRINTER_CHG_SIZE_FLAG         4
 
-#define SFX_PRINTERROR_NONE          0
 #define SFX_PRINTERROR_BUSY          1
 
 // "Verified" using www.apple.com and Netscape 3.01
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2104e70f968c..b7adb8e32b5d 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -32,12 +32,7 @@
 #include <sot/storinfo.hxx>
 #include <sot/sotdllapi.h>
 
-#define STORAGE_FAILIFTHERE     0x02
 #define STORAGE_TRANSACTED      0x04
-#define STORAGE_PRIORITY        0x08
-#define STORAGE_DELETEONRELEASE 0x10
-#define STORAGE_CONVERT         0x20
-#define STORAGE_UNPACKED_MODE   0x40
 #define STORAGE_DISKSPANNED_MODE   0x80
 #define STORAGE_CREATE_UNPACKED 0x44
 typedef short StorageMode;
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 9bc29225996c..92f1a403389b 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -30,18 +30,12 @@
 #define SFX_REC_PRETAG_EXT              sal_uInt8(0x00) // Pre-Tag for Extended-Records
 #define SFX_REC_PRETAG_EOR              sal_uInt8(0xFF) // Pre-Tag for End-Of-Records
 
-#define SFX_REC_TYPE_NONE               sal_uInt8(0x00) // unknown Record type
-#define SFX_REC_TYPE_FIRST              sal_uInt8(0x01)
 #define SFX_REC_TYPE_SINGLE             sal_uInt8(0x01) // Single-Content-Record
 #define SFX_REC_TYPE_FIXSIZE            sal_uInt8(0x02) // Fix-Size-Multi-Content-Record
 #define SFX_REC_TYPE_VARSIZE_RELOC      sal_uInt8(0x03) // variable Rec-Size
 #define SFX_REC_TYPE_VARSIZE            sal_uInt8(0x04) // old (not movable)
 #define SFX_REC_TYPE_MIXTAGS_RELOC      sal_uInt8(0x07) // Mixed Tag Content-Record
 #define SFX_REC_TYPE_MIXTAGS            sal_uInt8(0x08) // old (not movable)
-#define SFX_REC_TYPE_LAST               sal_uInt8(0x08)
-#define SFX_REC_TYPE_MINI                   0x100   // Mini-Record
-#define SFX_REC_TYPE_DRAWENG                0x400   // Drawing-Engine-Record
-#define SFX_REC_TYPE_EOR                    0xF00   // End-Of-Records
 
 #define SFX_REC_HEADERSIZE_MINI     4   // size of the Mini-Record-Header
 #define SFX_REC_HEADERSIZE_SINGLE   4   // additional HEADERSIZE_MINI => 8
diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx
index fdef63e45202..5c0c7ed97aee 100644
--- a/include/svl/smplhint.hxx
+++ b/include/svl/smplhint.hxx
@@ -45,17 +45,6 @@
 #define SFX_HINT_USER03             0x00080000
 #define SFX_HINT_USER04             0x00100000
 #define SFX_HINT_USER05             0x00200000
-#define SFX_HINT_USER06             0x00400000
-#define SFX_HINT_USER07             0x00800000
-#define SFX_HINT_USER08             0x01000000
-#define SFX_HINT_USER09             0x02000000
-#define SFX_HINT_USER10             0x04000000
-#define SFX_HINT_USER11             0x08000000
-#define SFX_HINT_USER12             0x10000000
-#define SFX_HINT_USER13             0x20000000
-#define SFX_HINT_UNDO_OPTIONS_CHANGED 0x40000000
-#define SFX_HINT_USER_OPTIONS_CHANGED 0x80000000
-#define SFX_HINT_ALL                0xFFFFFFFF
 
 class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint
 {
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 234ec9a844e0..88e6b452f33c 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -23,7 +23,6 @@
 #include <vcl/graph.hxx>
 #include <svtools/svtdllapi.h>
 
-#define GRFMGR_DRAW_NOTCACHED               0x00000000UL
 #define GRFMGR_DRAW_CACHED                  0x00000001UL
 #define GRFMGR_DRAW_SMOOTHSCALE             0x00000002UL
 #define GRFMGR_DRAW_USE_DRAWMODE_SETTINGS   0x00000004UL
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index d114da8985c4..4d52d0279687 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -281,7 +281,6 @@
 #define OOO_STRING_SVTOOLS_HTML_S_eta "eta"
 #define OOO_STRING_SVTOOLS_HTML_S_euro "euro"
 #define OOO_STRING_SVTOOLS_HTML_S_exist "exist"
-#define OOO_STRING_SVTOOLS_HTML_S_notexist "not exist"
 #define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof"
 #define OOO_STRING_SVTOOLS_HTML_S_forall "forall"
 #define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl"
@@ -553,7 +552,6 @@
 #define OOO_STRING_SVTOOLS_HTML_O_rows "rows"
 #define OOO_STRING_SVTOOLS_HTML_O_start "start"
 #define OOO_STRING_SVTOOLS_HTML_O_size "size"
-#define OOO_STRING_SVTOOLS_HTML_O_units "units"
 
 // values of <INPUT TYPE=...>
 #define OOO_STRING_SVTOOLS_HTML_IT_text "text"
@@ -595,7 +593,6 @@
 #define OOO_STRING_SVTOOLS_HTML_AL_justify "justify"
 #define OOO_STRING_SVTOOLS_HTML_AL_char "char"
 #define OOO_STRING_SVTOOLS_HTML_AL_all "all"
-#define OOO_STRING_SVTOOLS_HTML_AL_none "none"
 
 // values of <TR VALIGN=...>, <IMG ALIGN=...>
 #define OOO_STRING_SVTOOLS_HTML_VA_top "top"
@@ -613,7 +610,6 @@
 #define OOO_STRING_SVTOOLS_HTML_SH_circle "circle"
 #define OOO_STRING_SVTOOLS_HTML_SH_poly "poly"
 #define OOO_STRING_SVTOOLS_HTML_SH_polygon "polygon"
-#define OOO_STRING_SVTOOLS_HTML_SH_default "default"
 
 #define OOO_STRING_SVTOOLS_HTML_LG_starbasic "starbasic"
 #define OOO_STRING_SVTOOLS_HTML_LG_javascript "javascript"
@@ -648,16 +644,6 @@
 #define OOO_STRING_SVTOOLS_HTML_ULTYPE_square "square"
 #define OOO_STRING_SVTOOLS_HTML_ULTYPE_circle "circle"
 
-// values of <FRAMESET SCROLLING=...>
-#define OOO_STRING_SVTOOLS_HTML_SCROLL_yes "yes"
-#define OOO_STRING_SVTOOLS_HTML_SCROLL_no "no"
-#define OOO_STRING_SVTOOLS_HTML_SCROLL_auto "auto"
-
-// values of <MULTICOL TYPE=...>
-#define OOO_STRING_SVTOOLS_HTML_MCTYPE_horizontal "horizontal"
-#define OOO_STRING_SVTOOLS_HTML_MCTYPE_vertical "vertical"
-#define OOO_STRING_SVTOOLS_HTML_MCTYPE_box "box"
-
 // values of <MARQUEE BEHAVIOUR=...>
 #define OOO_STRING_SVTOOLS_HTML_BEHAV_scroll "scroll"
 #define OOO_STRING_SVTOOLS_HTML_BEHAV_slide "slide"
diff --git a/include/svtools/imgdef.hxx b/include/svtools/imgdef.hxx
index 85ab2d2d0104..0b27801c89c0 100644
--- a/include/svtools/imgdef.hxx
+++ b/include/svtools/imgdef.hxx
@@ -29,7 +29,6 @@ enum SfxSymbolsSize
 
 #define SFX_TOOLBOX_CHANGESYMBOLSET     0x0001
 #define SFX_TOOLBOX_CHANGEOUTSTYLE      0x0002
-#define SFX_TOOLBOX_CHANGEBUTTONTYPE    0x0004
 
 #endif // INCLUDED_SVTOOLS_IMGDEF_HXX
 
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 5edd15f29039..f23436962193 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -40,8 +40,6 @@ class Image;
 #define ICNVIEW_FLAG_POS_MOVED      0x0020 // Moved by Drag and Drop, but not logged
 #define ICNVIEW_FLAG_DROP_TARGET    0x0040 // Set in QueryDrop
 #define ICNVIEW_FLAG_BLOCK_EMPHASIS 0x0080 // Do not paint Emphasis
-#define ICNVIEW_FLAG_USER1          0x0100
-#define ICNVIEW_FLAG_USER2          0x0200
 #define ICNVIEW_FLAG_PRED_SET       0x0400 // Predecessor moved
 
 enum SvxIconChoiceCtrlTextMode
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 94ad1d7fde61..f4fba4daa1fc 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -75,9 +75,6 @@ enum SvButtonState { SV_BUTTON_UNCHECKED, SV_BUTTON_CHECKED, SV_BUTTON_TRISTATE
 #define SV_LBOXTAB_ADJUST_CENTER    0x0008 // Center the item at the tabulator
 #define SV_LBOXTAB_ADJUST_NUMERIC   0x0010 // Decimal point at the tabulator (strings)
 
-// Is not supported anymore! The focus is now controlled by selection!
-#define SV_LBOXTAB_SHOW_FOCUS       0x0020 // Visualize focus
-
 #define SV_LBOXTAB_SHOW_SELECTION   0x0040 // Visualize selection state
                                            // Item needs to be able to return the surrounding polygon (D'n'D cursor)
 #define SV_LBOXTAB_EDITABLE         0x0100 // Item editable at the tabulator
@@ -97,7 +94,6 @@ enum SvButtonState { SV_BUTTON_UNCHECKED, SV_BUTTON_CHECKED, SV_BUTTON_TRISTATE
 #define TREEFLAG_MANINS         0x0004
 #define TREEFLAG_RECALCTABS     0x0008
 
-#define TREEBOX_ALLITEM_ACCROLE_TYPE_NOTSET 0x00
 #define TREEBOX_ALLITEM_ACCROLE_TYPE_LIST   0x01
 #define TREEBOX_ALLITEM_ACCROLE_TYPE_TREE   0x02
 
@@ -189,7 +185,6 @@ inline void delete_clone(const SvLBoxItem* p)
 // The DropTarget is 0 in that case
 #define SV_DRAGDROP_ENABLE_TOP      (DragDropMode)0x0020
 
-#define SVLISTBOX_ID_LBOX 0   // for SvTreeListBox::GetType()
 
 #define SVLBOX_IN_EDT           0x0001
 #define SVLBOX_EDT_ENABLED      0x0002
diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx
index 0612893a85b8..f7e633f9bfc9 100644
--- a/include/svtools/treelistentry.hxx
+++ b/include/svtools/treelistentry.hxx
@@ -36,7 +36,6 @@
 // entry had or has children
 #define SV_ENTRYFLAG_HAD_CHILDREN       0x0010
 
-#define SV_ENTRYFLAG_USER_FLAGS         0xF000
 #define SV_ENTRYFLAG_SEMITRANSPARENT    0x8000      // draw semi-transparent entry bitmaps
 
 
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 8ab32cf2c55e..871776e1417d 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -53,7 +53,6 @@ struct SvxMSDffTextRectangles;
 #define HANDLE_FLAGS_MIRRORED_Y             0x0002
 #define HANDLE_FLAGS_SWITCHED               0x0004
 #define HANDLE_FLAGS_POLAR                  0x0008
-#define HANDLE_FLAGS_MAP                    0x0010
 #define HANDLE_FLAGS_RANGE_X_MINIMUM        0x0020
 #define HANDLE_FLAGS_RANGE_X_MAXIMUM        0x0040
 #define HANDLE_FLAGS_RANGE_Y_MINIMUM        0x0080
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index 95d48d01ab5d..c0dfb00446c6 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -29,7 +29,6 @@
 #define GALLERY_THEME_3D                1
 #define GALLERY_THEME_BULLETS       3
 #define GALLERY_THEME_HOMEPAGE      10
-#define GALLERY_THEME_HTMLBUTTONS   15
 #define GALLERY_THEME_POWERPOINT    16
 #define GALLERY_THEME_SOUNDS        18
 #define GALLERY_THEME_USERSOUNDS    21
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 5336de75ebb2..8d58cd4ef5fa 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -187,7 +187,6 @@ protected:
                                                sal_Int32 nDragImage = DND_IMAGE_NONE );
 };
 
-#define GALLERY_HINT_NONE               0x00000000
 #define GALLERY_HINT_CLOSE_THEME        0x00000001
 #define GALLERY_HINT_THEME_REMOVED      0x00000002
 #define GALLERY_HINT_THEME_RENAMED      0x00000004
diff --git a/include/svx/ifaceids.hxx b/include/svx/ifaceids.hxx
index 04a9bbe4b546..61aafef39e07 100644
--- a/include/svx/ifaceids.hxx
+++ b/include/svx/ifaceids.hxx
@@ -28,7 +28,6 @@
 #define SVX_INTERFACE_EXTRUSION_BAR     (SFX_INTERFACE_IDE_START+ 2)
 #define SVX_INTERFACE_FONTWORK_BAR      (SFX_INTERFACE_IDE_START+ 3)
 
-#define HID_INTERFACE_BASIDE_VIEWSH     SVX_INTERFACE_BASIDE_VIEWSH
 
 #define SVX_INTERFACE_FORM_SH           (SFX_INTERFACE_IDE_END+ 1)
 
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index eeeec5a6936d..60f9fab57a0e 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -34,170 +34,10 @@ const sal_uInt32 nMaxLegalDffRecordLength = \
                                           //  record header marks the start of
                                           //  a container.
 
-#define DFF_PST_Unknown                        0
-#define DFF_PST_SubContainerCompleted          1
-#define DFF_PST_IRRAtom                        2
-#define DFF_PST_PSS                            3
-#define DFF_PST_SubContainerException          4
-#define DFF_PST_ClientSignal1                  6
-#define DFF_PST_ClientSignal2                  7
-#define DFF_PST_PowerPointStateInfoAtom       10
-#define DFF_PST_Document                    1000
-#define DFF_PST_DocumentAtom                1001
-#define DFF_PST_EndDocument                 1002
-#define DFF_PST_SlidePersist                1003
-#define DFF_PST_SlideBase                   1004
-#define DFF_PST_SlideBaseAtom               1005
-#define DFF_PST_Slide                       1006
-#define DFF_PST_SlideAtom                   1007
-#define DFF_PST_Notes                       1008
-#define DFF_PST_NotesAtom                   1009
-#define DFF_PST_Environment                 1010
-#define DFF_PST_SlidePersistAtom            1011
-#define DFF_PST_Scheme                      1012
-#define DFF_PST_SchemeAtom                  1013
-#define DFF_PST_DocViewInfo                 1014
-#define DFF_PST_SslideLayoutAtom            1015
-#define DFF_PST_MainMaster                  1016
-#define DFF_PST_SSSlideInfoAtom             1017
-#define DFF_PST_SlideViewInfo               1018
-#define DFF_PST_GuideAtom                   1019
-#define DFF_PST_ViewInfo                    1020
-#define DFF_PST_ViewInfoAtom                1021
-#define DFF_PST_SlideViewInfoAtom           1022
-#define DFF_PST_VBAInfo                     1023
-#define DFF_PST_VBAInfoAtom                 1024
-#define DFF_PST_SSDocInfoAtom               1025
-#define DFF_PST_Summary                     1026
-#define DFF_PST_Texture                     1027
-#define DFF_PST_VBASlideInfo                1028
-#define DFF_PST_VBASlideInfoAtom            1029
-#define DFF_PST_DocRoutingSlip              1030
-#define DFF_PST_OutlineViewInfo             1031
-#define DFF_PST_SorterViewInfo              1032
-#define DFF_PST_ExObjList                   1033
-#define DFF_PST_ExObjListAtom               1034
-#define DFF_PST_PPDrawingGroup              1035
-#define DFF_PST_PPDrawing                   1036
-#define DFF_PST_NamedShows                  1040
-#define DFF_PST_NamedShow                   1041
-#define DFF_PST_NamedShowSlides             1042
-#define DFF_PST_List                        2000
-#define DFF_PST_FontCollection              2005
-#define DFF_PST_ListPlaceholder             2017
-#define DFF_PST_BookmarkCollection          2019
-#define DFF_PST_SoundCollection             2020
-#define DFF_PST_SoundCollAtom               2021
-#define DFF_PST_Sound                       2022
-#define DFF_PST_SoundData                   2023
-#define DFF_PST_BookmarkSeedAtom            2025
-#define DFF_PST_GuideList                   2026
-#define DFF_PST_RunArray                    2028
-#define DFF_PST_RunArrayAtom                2029
-#define DFF_PST_ArrayElementAtom            2030
-#define DFF_PST_Int4ArrayAtom               2031
-#define DFF_PST_ColorSchemeAtom             2032
-#define DFF_PST_OEShape                     3008
-#define DFF_PST_ExObjRefAtom                3009
-#define DFF_PST_OEPlaceholderAtom           3011
-#define DFF_PST_GrColor                     3020
-#define DFF_PST_GrectAtom                   3025
-#define DFF_PST_GratioAtom                  3031
-#define DFF_PST_Gscaling                    3032
-#define DFF_PST_GpointAtom                  3034
-#define DFF_PST_OEShapeAtom                 3035
-#define DFF_PST_OutlineTextRefAtom          3998
 #define DFF_PST_TextHeaderAtom              3999
 #define DFF_PST_TextCharsAtom               4000
-#define DFF_PST_StyleTextPropAtom           4001
-#define DFF_PST_BaseTextPropAtom            4002
-#define DFF_PST_TxMasterStyleAtom           4003
-#define DFF_PST_TxCFStyleAtom               4004
-#define DFF_PST_TxPFStyleAtom               4005
-#define DFF_PST_TextRulerAtom               4006
-#define DFF_PST_TextBookmarkAtom            4007
 #define DFF_PST_TextBytesAtom               4008
-#define DFF_PST_TxSIStyleAtom               4009
-#define DFF_PST_TextSpecInfoAtom            4010
-#define DFF_PST_DefaultRulerAtom            4011
-#define DFF_PST_FontEntityAtom              4023
-#define DFF_PST_FontEmbedData               4024
-#define DFF_PST_TypeFace                    4025
-#define DFF_PST_CString                     4026
-#define DFF_PST_ExternalObject              4027
-#define DFF_PST_MetaFile                    4033
-#define DFF_PST_ExOleObj                    4034
-#define DFF_PST_ExOleObjAtom                4035
-#define DFF_PST_ExPlainLinkAtom             4036
-#define DFF_PST_CorePict                    4037
-#define DFF_PST_CorePictAtom                4038
-#define DFF_PST_ExPlainAtom                 4039
-#define DFF_PST_SrKinsoku                   4040
-#define DFF_PST_Handout                     4041
-#define DFF_PST_ExEmbed                     4044
-#define DFF_PST_ExEmbedAtom                 4045
-#define DFF_PST_ExLink                      4046
-#define DFF_PST_ExLinkAtom_old              4047
-#define DFF_PST_BookmarkEntityAtom          4048
-#define DFF_PST_ExLinkAtom                  4049
-#define DFF_PST_SrKinsokuAtom               4050
-#define DFF_PST_ExHyperlinkAtom             4051
-#define DFF_PST_ExPlain                     4053
-#define DFF_PST_ExPlainLink                 4054
-#define DFF_PST_ExHyperlink                 4055
-#define DFF_PST_SlideNumberMCAtom           4056
-#define DFF_PST_HeadersFooters              4057
-#define DFF_PST_HeadersFootersAtom          4058
-#define DFF_PST_RecolorEntryAtom            4062
-#define DFF_PST_TxInteractiveInfoAtom       4063
-#define DFF_PST_EmFormatAtom                4065
-#define DFF_PST_CharFormatAtom              4066
-#define DFF_PST_ParaFormatAtom              4067
-#define DFF_PST_MasterText                  4068
-#define DFF_PST_RecolorInfoAtom             4071
-#define DFF_PST_ExQuickTime                 4073
-#define DFF_PST_ExQuickTimeMovie            4074
-#define DFF_PST_ExQuickTimeMovieData        4075
-#define DFF_PST_ExSubscription              4076
-#define DFF_PST_ExSubscriptionSection       4077
-#define DFF_PST_ExControl                   4078
-#define DFF_PST_ExControlAtom               4091
-#define DFF_PST_SlideListWithText           4080
-#define DFF_PST_AnimationInfoAtom           4081
-#define DFF_PST_InteractiveInfo             4082
-#define DFF_PST_InteractiveInfoAtom         4083
-#define DFF_PST_SlideList                   4084
-#define DFF_PST_UserEditAtom                4085
-#define DFF_PST_CurrentUserAtom             4086
-#define DFF_PST_DateTimeMCAtom              4087
-#define DFF_PST_GenericDateMCAtom           4088
-#define DFF_PST_HeaderMCAtom                4089
-#define DFF_PST_FooterMCAtom                4090
-#define DFF_PST_ExMediaAtom                 4100
-#define DFF_PST_ExVideo                     4101
-#define DFF_PST_ExAviMovie                  4102
-#define DFF_PST_ExMCIMovie                  4103
-#define DFF_PST_ExMIDIAudio                 4109
-#define DFF_PST_ExCDAudio                   4110
-#define DFF_PST_ExWAVAudioEmbedded          4111
-#define DFF_PST_ExWAVAudioLink              4112
 #define DFF_PST_ExOleObjStg                 4113
-#define DFF_PST_ExCDAudioAtom               4114
-#define DFF_PST_ExWAVAudioEmbeddedAtom      4115
-#define DFF_PST_AnimationInfo               4116
-#define DFF_PST_RTFDateTimeMCAtom           4117
-#define DFF_PST_ProgTags                    5000
-#define DFF_PST_ProgStringTag               5001
-#define DFF_PST_ProgBinaryTag               5002
-#define DFF_PST_BinaryTagData               5003
-#define DFF_PST_PrintOptions                6000
-#define DFF_PST_PersistPtrFullBlock         6001
-#define DFF_PST_PersistPtrIncrementalBlock  6002
-#define DFF_PST_RulerIndentAtom            10000
-#define DFF_PST_GscalingAtom               10001
-#define DFF_PST_GrColorAtom                10002
-#define DFF_PST_GLPointAtom                10003
-#define DFF_PST_GlineAtom                  10004
 
 //      Record Name                 FBT-Value Instance                  Contents                                                          Wrd Exl Ppt Ver
 
@@ -236,7 +76,6 @@ const sal_uInt32 nMaxLegalDffRecordLength = \
 #define     DFF_msofbtClientRule    0xF015 // host-defined              host-defined
 #define     DFF_msofbtCalloutRule   0xF017 //                           an FCORU                                                           X   X   X   0
 
-#define DFF_msofbtSelection         0xF119 //                           an FDGSL followed by the SPIDs of the shapes in the selection              X   0
 
 // Values for the ULONG in DFF_PST_TextHeaderAtom
 enum DFF_TextHeader {
@@ -262,14 +101,6 @@ enum DFF_TextHeader {
 // Transform
 #define DFF_Prop_Rotation                      4  //  Fixed Point 16.16 degrees
 // Protection
-#define DFF_Prop_LockRotation                119  //  sal_Bool              No rotation
-#define DFF_Prop_LockAspectRatio             120  //  sal_Bool              Don't allow changes in aspect ratio
-#define DFF_Prop_LockPosition                121  //  sal_Bool              Don't allow the shape to be moved
-#define DFF_Prop_LockAgainstSelect           122  //  sal_Bool              Shape may not be selected
-#define DFF_Prop_LockCropping                123  //  sal_Bool              No cropping this shape
-#define DFF_Prop_LockVertices                124  //  sal_Bool              Edit Points not allowed
-#define DFF_Prop_LockText                    125  //  sal_Bool              Do not edit text
-#define DFF_Prop_LockAdjustHandles           126  //  sal_Bool              Do not adjust
 #define DFF_Prop_LockAgainstGrouping         127  //  sal_Bool              Do not group this shape
 // Text
 #define DFF_Prop_lTxid                       128  //  LONG              id for the text, value determined by the host
@@ -278,39 +109,22 @@ enum DFF_TextHeader {
 #define DFF_Prop_dxTextRight                 131  //  LONG
 #define DFF_Prop_dyTextBottom                132  //  LONG
 #define DFF_Prop_WrapText                    133  //  MSO_WRAPMODE       Wrap text at shape margins
-#define DFF_Prop_scaleText                   134  //  LONG              Text zoom/scale (used if fFitTextToShape)
 #define DFF_Prop_anchorText                  135  //  MSO_ANCHOR         How to anchor the text
 #define DFF_Prop_txflTextFlow                136  //  MSO_TXFL           Text flow
 #define DFF_Prop_cdirFont                    137  //  MSO_CDIR           Font rotation
 #define DFF_Prop_hspNext                     138  //  MSO_HSP            ID of the next shape (used by Word for linked textboxes)
-#define DFF_Prop_txdir                       139  //  MSO_TXDIR          Bi-Di Text direction
-#define DFF_Prop_SelectText                  187  //  sal_Bool              sal_True if single click selects text, sal_False if two clicks
 #define DFF_Prop_AutoTextMargin              188  //  sal_Bool              use host's margin calculations
 #define DFF_Prop_RotateText                  189  //  sal_Bool              Rotate text with shape
-#define DFF_Prop_FitShapeToText              190  //  sal_Bool              Size shape to fit text size
 #define DFF_Prop_FitTextToShape              191  //  sal_Bool              Size text to fit shape size
 // GeoText
 #define DFF_Prop_gtextUNICODE                192  //  WCHAR*            UNICODE text string
-#define DFF_Prop_gtextRTF                    193  //  char*             RTF text string
 #define DFF_Prop_gtextAlign                  194  //  MSO_GEOTEXTALIGN   alignment on curve
 #define DFF_Prop_gtextSize                   195  //  LONG              default point size
 #define DFF_Prop_gtextSpacing                196  //  LONG              fixed point 16.16
 #define DFF_Prop_gtextFont                   197  //  WCHAR*            font family name
-#define DFF_Prop_gtextFReverseRows           240  //  sal_Bool  8000        Reverse row order
-#define DFF_Prop_fGtext                      241  //  sal_Bool  4000        Has text effect
-#define DFF_Prop_gtextFVertical              242  //  sal_Bool  2000        Rotate characters
-#define DFF_Prop_gtextFKern                  243  //  sal_Bool  1000        Kern characters
-#define DFF_Prop_gtextFTight                 244  //  sal_Bool   800        Tightening or tracking
 #define DFF_Prop_gtextFStretch               245  //  sal_Bool   400        Stretch to fit shape
-#define DFF_Prop_gtextFShrinkFit             246  //  sal_Bool   200        Char bounding box
-#define DFF_Prop_gtextFBestFit               247  //  sal_Bool   100        Scale text-on-path
-#define DFF_Prop_gtextFNormalize             248  //  sal_Bool    80        Stretch char height
-#define DFF_Prop_gtextFDxMeasure             249  //  sal_Bool    40        Do not measure along path
 #define DFF_Prop_gtextFBold                  250  //  sal_Bool    20        Bold font
 #define DFF_Prop_gtextFItalic                251  //  sal_Bool    10        Italic font
-#define DFF_Prop_gtextFUnderline             252  //  sal_Bool     8        Underline font
-#define DFF_Prop_gtextFShadow                253  //  sal_Bool     4        Shadow font
-#define DFF_Prop_gtextFSmallcaps             254  //  sal_Bool     2        Small caps font
 #define DFF_Prop_gtextFStrikethrough         255  //  sal_Bool     1        Strike through font
 // Blip
 #define DFF_Prop_cropFromTop                 256  //  LONG              16.16 fraction times total image width or height, as appropriate.
@@ -325,22 +139,12 @@ enum DFF_TextHeader {
 #define DFF_Prop_pictureBrightness           265  //  LONG              brightness setting
 #define DFF_Prop_pictureGamma                266  //  LONG              16.16 gamma
 #define DFF_Prop_pictureId                   267  //  LONG              Host-defined ID for OLE objects (usually a pointer)
-#define DFF_Prop_pictureDblCrMod             268  //  MSO_CLR            Modification used if shape has double shadow
-#define DFF_Prop_pictureFillCrMod            269  //  MSO_CLR
-#define DFF_Prop_pictureLineCrMod            270  //  MSO_CLR
-#define DFF_Prop_pibPrint                    271  //  IMsoBlip*         Blip to display when printing
-#define DFF_Prop_pibPrintName                272  //  WCHAR*            Blip file name
-#define DFF_Prop_pibPrintFlags               273  //  MSO_BLIPFLAGS      Blip flags
-#define DFF_Prop_fNoHitTestPicture           316  //  sal_Bool              Do not hit test the picture
-#define DFF_Prop_pictureGray                 317  //  sal_Bool              grayscale display
-#define DFF_Prop_pictureBiLevel              318  //  sal_Bool              bi-level display
 #define DFF_Prop_pictureActive               319  //  sal_Bool              Server is active (OLE objects only)
 // Geometry
 #define DFF_Prop_geoLeft                     320  //  LONG              Defines the G (geometry) coordinate space.
 #define DFF_Prop_geoTop                      321  //  LONG
 #define DFF_Prop_geoRight                    322  //  LONG
 #define DFF_Prop_geoBottom                   323  //  LONG
-#define DFF_Prop_shapePath                   324  //  MSO_SHAPEPATH
 #define DFF_Prop_pVertices                   325  //  IMsoArray         An array of points, in G units.
 #define DFF_Prop_pSegmentInfo                326  //  IMsoArray
 #define DFF_Prop_adjustValue                 327  //  LONG              Adjustment values corresponding to the positions of the
@@ -360,9 +164,7 @@ enum DFF_TextHeader {
 #define DFF_Prop_pFormulas                   342  //  LONG
 #define DFF_Prop_textRectangles              343  //  LONG
 #define DFF_Prop_connectorType               344  //  LONG              ->0=none, 1=segments, 2=custom, 3=rect
-#define DFF_Prop_fShadowOK                   378  //  sal_Bool              Shadow may be set
 #define DFF_Prop_f3DOK                       379  //  sal_Bool              3D may be set
-#define DFF_Prop_fLineOK                     380  //  sal_Bool              Line style may be set
 #define DFF_Prop_fGtextOK                    381  //  sal_Bool              Text effect (FontWork) supported
 #define DFF_Prop_fFillShadeShapeOK           382  //  BOOL
 #define DFF_Prop_fFillOK                     383  //  sal_Bool              OK to fill the shape through the UI or VBA?
@@ -372,49 +174,21 @@ enum DFF_TextHeader {
 #define DFF_Prop_fillOpacity                 386  //  LONG              Fixed 16.16
 #define DFF_Prop_fillBackColor               387  //  MSO_CLR            Background color
 #define DFF_Prop_fillBackOpacity             388  //  LONG              Shades only
-#define DFF_Prop_fillCrMod                   389  //  MSO_CLR            Modification for BW views
 #define DFF_Prop_fillBlip                    390  //  IMsoBlip*         Pattern/texture
-#define DFF_Prop_fillBlipName                391  //  WCHAR*            Blip file name
-#define DFF_Prop_fillBlipFlags               392  //  MSO_BLIPFLAGS      Blip flags
 #define DFF_Prop_fillWidth                   393  //  LONG              How big (A units) to make a metafile texture.
 #define DFF_Prop_fillHeight                  394  //  LONG
 #define DFF_Prop_fillAngle                   395  //  LONG              Fade angle - degrees in 16.16
 #define DFF_Prop_fillFocus                   396  //  LONG              Linear shaded fill focus percent
-#define DFF_Prop_fillToLeft                  397  //  LONG              Fraction 16.16
-#define DFF_Prop_fillToTop                   398  //  LONG              Fraction 16.16
 #define DFF_Prop_fillToRight                 399  //  LONG              Fraction 16.16
 #define DFF_Prop_fillToBottom                400  //  LONG              Fraction 16.16
-#define DFF_Prop_fillRectLeft                401  //  LONG              For shaded fills, use the specified rectangle instead of the shape's bounding rect to define how large the fade is going to be.
-#define DFF_Prop_fillRectTop                 402  //  LONG
-#define DFF_Prop_fillRectRight               403  //  LONG
-#define DFF_Prop_fillRectBottom              404  //  LONG
-#define DFF_Prop_fillDztype                  405  //  MSO_DZTYPE
-#define DFF_Prop_fillShadePreset             406  //  LONG              Special shades
 #define DFF_Prop_fillShadeColors             407  //  IMsoArray         a preset array of colors
-#define DFF_Prop_fillOriginX                 408  //  LONG
-#define DFF_Prop_fillOriginY                 409  //  LONG
-#define DFF_Prop_fillShapeOriginX            410  //  LONG
-#define DFF_Prop_fillShapeOriginY            411  //  LONG
-#define DFF_Prop_fillShadeType               412  //  MSO_SHADETYPE      Type of shading, if a shaded (gradient) fill.
 #define DFF_Prop_fFilled                     443  //  sal_Bool              Is shape filled?
-#define DFF_Prop_fHitTestFill                444  //  sal_Bool              Should we hit test fill?
-#define DFF_Prop_fillShape                   445  //  sal_Bool              Register pattern on shape
-#define DFF_Prop_fillUseRect                 446  //  sal_Bool              Use the large rect?
 #define DFF_Prop_fNoFillHitTest              447  //  sal_Bool              Hit test a shape as though filled
 // LineStyle
 #define DFF_Prop_lineColor                   448  //  MSO_CLR            Color of line
 #define DFF_Prop_lineOpacity                 449  //  LONG              Not implemented
 #define DFF_Prop_lineBackColor               450  //  MSO_CLR            Background color
-#define DFF_Prop_lineCrMod                   451  //  MSO_CLR            Modification for BW views
-#define DFF_Prop_lineType                    452  //  MSO_LINETYPE       Type of line
-#define DFF_Prop_lineFillBlip                453  //  IMsoBlip*         Pattern/texture
-#define DFF_Prop_lineFillBlipName            454  //  WCHAR*            Blip file name
-#define DFF_Prop_lineFillBlipFlags           455  //  MSO_BLIPFLAGS      Blip flags
-#define DFF_Prop_lineFillWidth               456  //  LONG              How big (A units) to make a metafile texture.
-#define DFF_Prop_lineFillHeight              457  //  LONG
-#define DFF_Prop_lineFillDztype              458  //  MSO_DZTYPE         How to interpret fillWidth/Height numbers.
 #define DFF_Prop_lineWidth                   459  //  LONG              A units; 1pt == 12700 EMUs
-#define DFF_Prop_lineMiterLimit              460  //  LONG              ratio (16.16) of width
 #define DFF_Prop_lineStyle                   461  //  MSO_LINESTYLE      Draw parallel lines?
 #define DFF_Prop_lineDashing                 462  //  MSO_LINEDASHING    Can be overridden by:
 #define DFF_Prop_lineDashStyle               463  //  IMsoArray         As Win32 ExtCreatePen
@@ -426,67 +200,28 @@ enum DFF_TextHeader {
 #define DFF_Prop_lineEndArrowLength          469  //  MSO_LINEENDLENGTH  Arrow at end
 #define DFF_Prop_lineJoinStyle               470  //  MSO_LINEJOIN       How to join lines
 #define DFF_Prop_lineEndCapStyle             471  //  MSO_LINECAP        How to end lines
-#define DFF_Prop_fArrowheadsOK               507  //  sal_Bool              Allow arrowheads if prop. is set
 #define DFF_Prop_fLine                       508  //  sal_Bool              Any line?
-#define DFF_Prop_fHitTestLine                509  //  sal_Bool              Should we hit test lines?
-#define DFF_Prop_lineFillShape               510  //  sal_Bool              Register pattern on shape
 #define DFF_Prop_fNoLineDrawDash             511  //  sal_Bool              Draw a dashed line if no line
 // ShadowStyle
 #define DFF_Prop_shadowType                  512  //  MSO_SHADOWTYPE     Type of effect
 #define DFF_Prop_shadowColor                 513  //  MSO_CLR            Foreground color
-#define DFF_Prop_shadowHighlight             514  //  MSO_CLR            Embossed color
-#define DFF_Prop_shadowCrMod                 515  //  MSO_CLR            Modification for BW views
 #define DFF_Prop_shadowOpacity               516  //  LONG              Fixed 16.16
 #define DFF_Prop_shadowOffsetX               517  //  LONG              Offset shadow
 #define DFF_Prop_shadowOffsetY               518  //  LONG              Offset shadow
-#define DFF_Prop_shadowSecondOffsetX         519  //  LONG              Double offset shadow
-#define DFF_Prop_shadowSecondOffsetY         520  //  LONG              Double offset shadow
-#define DFF_Prop_shadowScaleXToX             521  //  LONG              16.16
-#define DFF_Prop_shadowScaleYToX             522  //  LONG              16.16
-#define DFF_Prop_shadowScaleXToY             523  //  LONG              16.16
-#define DFF_Prop_shadowScaleYToY             524  //  LONG              16.16
-#define DFF_Prop_shadowPerspectiveX          525  //  LONG              16.16 / weight
-#define DFF_Prop_shadowPerspectiveY          526  //  LONG              16.16 / weight
-#define DFF_Prop_shadowWeight                527  //  LONG              scaling factor
-#define DFF_Prop_shadowOriginX               528  //  LONG
-#define DFF_Prop_shadowOriginY               529  //  LONG
-#define DFF_Prop_fShadow                     574  //  sal_Bool              Any shadow?
 #define DFF_Prop_fshadowObscured             575  //  sal_Bool              Excel5-style shadow
 // PerspectiveStyle
-#define DFF_Prop_perspectiveType             576  //  MSO_XFORMTYPE      Where transform applies
-#define DFF_Prop_perspectiveOffsetX          577  //  LONG              The LONG values define a transformation matrix, effectively, each value is scaled by the perspectiveWeight parameter.
-#define DFF_Prop_perspectiveOffsetY          578  //  LONG
-#define DFF_Prop_perspectiveScaleXToX        579  //  LONG
-#define DFF_Prop_perspectiveScaleYToX        580  //  LONG
-#define DFF_Prop_perspectiveScaleXToY        581  //  LONG
-#define DFF_Prop_perspectiveScaleYToY        582  //  LONG
-#define DFF_Prop_perspectivePerspectiveX     583  //  LONG
-#define DFF_Prop_perspectivePerspectiveY     584  //  LONG
-#define DFF_Prop_perspectiveWeight           585  //  LONG              Scaling factor
-#define DFF_Prop_perspectiveOriginX          586  //  LONG
-#define DFF_Prop_perspectiveOriginY          587  //  LONG
 #define DFF_Prop_fPerspective                639  //  sal_Bool              On/off
 // 3D Object
 #define DFF_Prop_c3DSpecularAmt              640  //  LONG         Fixed-point 16.16
 #define DFF_Prop_c3DDiffuseAmt               641  //  LONG         Fixed-point 16.16
 #define DFF_Prop_c3DShininess                642  //  LONG         Default gives OK results
-#define DFF_Prop_c3DEdgeThickness            643  //  LONG         Specular edge thickness
 #define DFF_Prop_c3DExtrudeForward           644  //  LONG         Distance of extrusion in EMUs
 #define DFF_Prop_c3DExtrudeBackward          645  //  LONG
-#define DFF_Prop_c3DExtrudePlane             646  //  LONG         Extrusion direction
 #define DFF_Prop_c3DExtrusionColor           647  //  MSO_CLR       Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering.
-#define DFF_Prop_c3DCrMod                    648  //  MSO_CLR       Modification for BW views
-#define DFF_Prop_f3D                         700  //  sal_Bool         Does this shape have a 3D effect?
-#define DFF_Prop_fc3DMetallic                701  //  sal_Bool         Use metallic specularity?
-#define DFF_Prop_fc3DUseExtrusionColor       702  //  BOOL
 #define DFF_Prop_fc3DLightFace               703  //  BOOL
 // 3D Style
 #define DFF_Prop_c3DYRotationAngle           704  //  LONG            degrees (16.16) about y axis
 #define DFF_Prop_c3DXRotationAngle           705  //  LONG            degrees (16.16) about x axis
-#define DFF_Prop_c3DRotationAxisX            706  //  LONG            These specify the rotation axis; only their relative magnitudes matter.
-#define DFF_Prop_c3DRotationAxisY            707  //  LONG
-#define DFF_Prop_c3DRotationAxisZ            708  //  LONG
-#define DFF_Prop_c3DRotationAngle            709  //  LONG            degrees (16.16) about axis
 #define DFF_Prop_c3DRotationCenterX          710  //  LONG            rotation center x (16.16 or g-units)
 #define DFF_Prop_c3DRotationCenterY          711  //  LONG            rotation center y (16.16 or g-units)
 #define DFF_Prop_c3DRotationCenterZ          712  //  LONG            rotation center z (absolute (emus))
@@ -508,36 +243,13 @@ enum DFF_TextHeader {
 #define DFF_Prop_c3DFillY                    728  //  LONG            tion; only their relative
 #define DFF_Prop_c3DFillZ                    729  //  LONG            magnitudes matter
 #define DFF_Prop_c3DFillIntensity            730  //  LONG            Fixed point intensity
-#define DFF_Prop_fc3DConstrainRotation       763  //  BOOL
-#define DFF_Prop_fc3DRotationCenterAuto      764  //  BOOL
-#define DFF_Prop_fc3DParallel                765  //  sal_Bool            Parallel projection?
-#define DFF_Prop_fc3DKeyHarsh                766  //  sal_Bool            Is key lighting harsh?
 #define DFF_Prop_fc3DFillHarsh               767  //  sal_Bool            Is fill lighting harsh?
 // Shape
 #define DFF_Prop_hspMaster                   769  //  MSO_HSP          master shape
 #define DFF_Prop_cxstyle                     771  //  MSO_CXSTYLE      Type of connector
-#define DFF_Prop_bWMode                      772  //  MSO_BWMODE       Settings for modifications to be made when in different forms of black-and-white mode.
-#define DFF_Prop_bWModePureBW                773  //  MSO_BWMODE
-#define DFF_Prop_bWModeBW                    774  //  MSO_BWMODE
-#define DFF_Prop_fOleIcon                    826  //  sal_Bool            For OLE objects, whether the object is in icon form
-#define DFF_Prop_fPreferRelativeResize       827  //  sal_Bool            For UI only. Prefer relative resizing.
-#define DFF_Prop_fLockShapeType              828  //  sal_Bool            Lock the shape type (don't allow Change Shape)
-#define DFF_Prop_fDeleteAttachedObject       830  //  BOOL
 #define DFF_Prop_fBackground                 831  //  sal_Bool            If sal_True, this is the background shape.
 
 // Callout
-#define DFF_Prop_spcot                       832  //  MSO_SPCOT        Callout type
-#define DFF_Prop_dxyCalloutGap               833  //  LONG            Distance from box to first point.(EMUs)
-#define DFF_Prop_spcoa                       834  //  MSO_SPCOA        Callout angle
-#define DFF_Prop_spcod                       835  //  MSO_SPCOD        Callout drop type
-#define DFF_Prop_dxyCalloutDropSpecified     836  //  LONG            if mso_spcodSpecified, the actual drop distance
-#define DFF_Prop_dxyCalloutLengthSpecified   837  //  LONG            if fCalloutLengthSpecified, the actual distance
-#define DFF_Prop_fCallout                    889  //  sal_Bool            Is the shape a callout?
-#define DFF_Prop_fCalloutAccentBar           890  //  sal_Bool            does callout have accent bar
-#define DFF_Prop_fCalloutTextBorder          891  //  sal_Bool            does callout have a text border
-#define DFF_Prop_fCalloutMinusX              892  //  BOOL
-#define DFF_Prop_fCalloutMinusY              893  //  BOOL
-#define DFF_Prop_fCalloutDropAuto            894  //  sal_Bool            If true, then we occasionally invert the drop distance
 #define DFF_Prop_fCalloutLengthSpecified     895  //  sal_Bool            if true, we look at dxyCalloutLengthSpecified
 
 // GroupShape
@@ -549,24 +261,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_dyWrapDistTop               901  //  LONG            Top wrapping distance from text (Word)
 #define DFF_Prop_dxWrapDistRight             902  //  LONG            Right wrapping distance from text (Word)
 #define DFF_Prop_dyWrapDistBottom            903  //  LONG            Bottom wrapping distance from text (Word)
-#define DFF_Prop_lidRegroup                  904  //  LONG            Regroup ID
 #define DFF_Prop_tableProperties             927  //  LONG
 #define DFF_Prop_tableRowProperties          928  //  LONG*
-#define DFF_Prop_fEditedWrap                 953  //  sal_Bool            Has the wrap polygon been edited?
-#define DFF_Prop_fBehindDocument             954  //  sal_Bool            Word-only (shape is behind text)
-#define DFF_Prop_fOnDblClickNotify           955  //  sal_Bool            Notify client on a double click
-#define DFF_Prop_fIsButton                   956  //  sal_Bool            A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
-#define DFF_Prop_fOneD                       957  //  sal_Bool            1D adjustment
 #define DFF_Prop_fHidden                     958  //  sal_Bool            Do not display
 #define DFF_Prop_fPrint                      959  //  sal_Bool            Print this shape
 // entsprechende BitFlags
-#define DFF_PBit_EditedWrap         0x00000040
-#define DFF_PBit_BehindDocument     0x00000020
-#define DFF_PBit_OnDblClickNotify   0x00000010
-#define DFF_PBit_IsButton           0x00000008
-#define DFF_PBit_OneD               0x00000004
-#define DFF_PBit_Hidden             0x00000002
-#define DFF_PBit_Print              0x00000001
 
 // properties of the second property set
 #define DFF_Prop_metroBlob					937 // XML ZipPackage*
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 0418f42c9dc1..b6ca6f61cb73 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -28,7 +28,6 @@ namespace svx { namespace sidebar {
 
 #define DEFAULT_BULLET_TYPES                            8
 #define DEFAULT_NONE                                    10
-#define DEFAULT_NUM_TYPE_MEMBER                         5
 #define DEFAULT_NUM_VALUSET_COUNT                       8
 #define DEFAULT_NUMBERING_CACHE_FORMAT_VERSION          0x10
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 30db1efdb21a..afd7908e62db 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -88,7 +88,6 @@ namespace sfx2
 }
 
 
-#define SDR_SWAPGRAPHICSMODE_NONE       0x00000000
 #define SDR_SWAPGRAPHICSMODE_TEMP       0x00000001
 #define SDR_SWAPGRAPHICSMODE_DOC        0x00000002
 #define SDR_SWAPGRAPHICSMODE_PURGE      0x00000100
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index a681186e9116..bf33813172af 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -51,8 +51,6 @@
 #define SDRSEARCHPASS_DIRECT       0x0000 /* Object is hit by 'direct hit' */
 #define SDRSEARCHPASS_INACTIVELIST 0x0001 /* Obj is on the page, but not in the AktGroup (at WHOLEPAGE) */
 #define SDRSEARCHPASS_MASTERPAGE   0x0002 /* Object was found on the MasterPage */
-#define SDRSEARCHPASS_BOUND        0x0010 /* Object found, butjust after Bound-Check gefunden   */
-#define SDRSEARCHPASS_NEAREST      0x0020 /* Object found, but just after Nearest-Check */
 
 enum SdrHitKind {SDRHIT_NONE,      // No hit
                  SDRHIT_OBJECT,    // Hit
@@ -81,7 +79,6 @@ enum SdrViewEditMode {SDREDITMODE_EDIT,           // Also known as arrow or poin
                       SDREDITMODE_CREATE,         // Tool for object creation
                       SDREDITMODE_GLUEPOINTEDIT}; // Glue point editing mode
 
-#define IMPSDR_MARKOBJDESCRIPTION    0x0000
 #define IMPSDR_POINTSDESCRIPTION     0x0001
 #define IMPSDR_GLUEPOINTSDESCRIPTION 0x0002
 
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 3f31dd1ecbc0..6516bc89cabd 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -36,7 +36,6 @@
 #define CMD_SID_BEZIER_MOVE                         ".uno:BezierMove"
 #define CMD_SID_BEZIER_SMOOTH                       ".uno:BezierSmooth"
 #define CMD_SID_BEZIER_SYMMTR                       ".uno:BezierSymmetric"
-#define CMD_SID_BMPMASK                             ".uno:BmpMask"
 #define CMD_SID_ATTR_CHAR_WEIGHT                    ".uno:Bold"
 #define CMD_SID_FRAME_TO_TOP                        ".uno:BringToFront"
 #define CMD_SID_ATTR_PARA_ADJUST_CENTER             ".uno:CenterPara"
@@ -80,10 +79,8 @@
 #define CMD_SID_UNGROUP                             ".uno:FormatUngroup"
 #define CMD_SID_GALLERY_ENABLE_ADDCOPY              ".uno:GalleryEnableAddCopy"
 #define CMD_SID_GALLERY_FORMATS                     ".uno:InsertGalleryPic"
-#define CMD_SID_ATTR_GRAF_CROP                      ".uno:GrafAttrCrop"
 #define CMD_SID_GRID_USE                            ".uno:GridUse"
 #define CMD_SID_GRID_VISIBLE                        ".uno:GridVisible"
-#define CMD_SID_OUTLINE_MAKE                        ".uno:Group"
 #define CMD_SID_INSERT_POSTIT                       ".uno:InsertAnnotation"
 #define CMD_SID_REPLYTO_POSTIT                      ".uno:ReplyToAnnotation"
 #define CMD_SID_RULER                               ".uno:ShowRuler"
@@ -95,7 +92,6 @@
 #define CMD_SID_ATTR_PARA_ADJUST_BLOCK              ".uno:JustifyPara"
 #define CMD_SID_LEAVE_GROUP                         ".uno:LeaveGroup"
 #define CMD_SID_ATTR_PARA_ADJUST_LEFT               ".uno:LeftPara"
-#define CMD_SID_ATTR_PARA_LINESPACE                 ".uno:LineSpacing"
 #define CMD_SID_FM_LISTBOX                          ".uno:ListBox"
 #define CMD_SID_FM_NUMERICFIELD                     ".uno:NumericField"
 #define CMD_SID_OBJECT_ALIGN                        ".uno:ObjectAlign"
@@ -120,16 +116,12 @@
 #define CMD_SID_SET_SUB_SCRIPT                      ".uno:SubScript"
 #define CMD_SID_SET_SUPER_SCRIPT                    ".uno:SuperScript"
 #define CMD_SID_FM_TAB_DIALOG                       ".uno:TabDialog"
-#define CMD_SID_THESAURUS                           ".uno:ThesaurusDialog"
 #define CMD_SID_FM_TIMEFIELD                        ".uno:TimeField"
 #define CMD_SID_BEZIER_EDIT                         ".uno:ToggleObjectBezierMode"
-#define CMD_SID_OBJECT_ROTATE                       ".uno:ToggleObjectRotateMode"
 #define CMD_SID_ATTR_TRANSFORM                      ".uno:TransformDialog"
 #define CMD_SID_ATTR_CHAR_UNDERLINE                 ".uno:Underline"
 #define CMD_SID_ATTR_CHAR_OVERLINE                  ".uno:Overline"
-#define CMD_SID_OUTLINE_REMOVE                      ".uno:Ungroup"
 #define CMD_SID_3D_WIN                              ".uno:Window3D"
-#define CMD_SID_ATTR_ZOOM                           ".uno:Zoom"
 #define CMD_SID_OPEN_HYPERLINK                      ".uno:OpenHyperlinkOnCursor"
 #define CMD_SID_TABLE_MERGE_CELLS                   ".uno:MergeCells"
 #define CMD_SID_TABLE_SPLIT_CELLS                   ".uno:SplitCell"
diff --git a/include/svx/unomid.hxx b/include/svx/unomid.hxx
index 5fc2831c1822..45d6a83d2c7e 100644
--- a/include/svx/unomid.hxx
+++ b/include/svx/unomid.hxx
@@ -30,8 +30,6 @@
 #define MID_PAGE_LAYOUT         2
 
 //SvxMarginItem
-#define MID_MARGIN_LR_MARGIN    0
-#define MID_MARGIN_UL_MARGIN    1
 #define MID_MARGIN_L_MARGIN     2
 #define MID_MARGIN_R_MARGIN     3
 #define MID_MARGIN_UP_MARGIN    4
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 52de1f120f33..3432165c52ee 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -32,7 +32,6 @@ class OutputDevice;
 #define XPOLYPOLY_APPEND     0xFFFF
 #define XPOLY_APPEND         0xFFFF
 
-#define XPOLY_MAXPOINTS      0xFFF0 /* Let space for the 32-Bit systems too */
 
 // point-styles in XPolygon:
 // NORMAL : start-/endpoint of a curve or a line
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 068ed3bfb08a..a180a92b20bc 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -40,7 +40,6 @@ namespace vcl { class Region; }
 #define INITOUTDEV_COLORS       0x0002
 #define INITOUTDEV_RASTEROP     0x0004
 #define INITOUTDEV_CLIPREGION   0x0008
-#define INITOUTDEV_ALL          0xFFFF
 
 
 
diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx
index 453cf34d25e5..92f772bf6f19 100644
--- a/include/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
@@ -233,9 +233,6 @@ namespace uno {
 #define PROPERTY_ALIGN_CENTER                   1
 #define PROPERTY_ALIGN_RIGHT                    2
 
-#define PROPERTY_STATE_OFF                      0
-#define PROPERTY_STATE_ON                       1
-#define PROPERTY_STATE_DONTCARE                 2
 
 TOOLKIT_DLLPUBLIC sal_uInt16        GetPropertyId( const OUString& rPropertyName );
 const ::com::sun::star::uno::Type*  GetPropertyType( sal_uInt16 nPropertyId );
diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx
index df86faec68fd..99149604349d 100644
--- a/include/tools/errcode.hxx
+++ b/include/tools/errcode.hxx
@@ -47,7 +47,6 @@ Warning           ||   ||      |
 #define ERRCODE_BUTTON_CANCEL             0x02
 #define ERRCODE_BUTTON_RETRY              0x04
 #define ERRCODE_BUTTON_OK_CANCEL          0x03
-#define ERRCODE_BUTTON_OK_RETRY_CANCEL    0x07
 #define ERRCODE_BUTTON_NO                 0x08
 #define ERRCODE_BUTTON_YES                0x10
 #define ERRCODE_BUTTON_YES_NO             0x18
@@ -139,7 +138,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
 #define ERRCODE_AREA_SW                  ERRCODE_AREA_APP4
 #define ERRCODE_AREA_SW_END              (ERRCODE_AREA_APP5-1)
 
-#define ERRCODE_AREA_OFA                 ERRCODE_AREA_APP5
 #define ERRCODE_AREA_OFA_END             (ERRCODE_AREA_APP6-1)
 
 #define ERRCODE_CLASS_NONE               (0UL   << ERRCODE_CLASS_SHIFT)
@@ -248,20 +246,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
                                          ERRCODE_AREA_IO)
 
 // FsysErrorCodes
-#define FSYS_ERR_OK                     ERRCODE_NONE
-#define FSYS_ERR_MISPLACEDCHAR          ERRCODE_IO_MISPLACEDCHAR
-#define FSYS_ERR_INVALIDCHAR            ERRCODE_IO_INVALIDCHAR
-#define FSYS_ERR_NOTEXISTS              ERRCODE_IO_NOTEXISTS
-#define FSYS_ERR_ALREADYEXISTS          ERRCODE_IO_ALREADYEXISTS
-#define FSYS_ERR_NOTADIRECTORY          ERRCODE_IO_NOTADIRECTORY
-#define FSYS_ERR_NOTAFILE               ERRCODE_IO_NOTAFILE
-#define FSYS_ERR_INVALIDDEVICE          ERRCODE_IO_INVALIDDEVICE
-#define FSYS_ERR_ACCESSDENIED           ERRCODE_IO_ACCESSDENIED
-#define FSYS_ERR_LOCKVIOLATION          ERRCODE_IO_LOCKVIOLATION
-#define FSYS_ERR_VOLUMEFULL             ERRCODE_IO_OUTOFSPACE
-#define FSYS_ERR_ISWILDCARD             ERRCODE_IO_ISWILDCARD
-#define FSYS_ERR_NOTSUPPORTED           ERRCODE_IO_NOTSUPPORTED
-#define FSYS_ERR_UNKNOWN                ERRCODE_IO_UNKNOWN
 
 // StreamErrorCodes
 #define SVSTREAM_OK                     ERRCODE_NONE
@@ -283,7 +267,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
 #define SVSTREAM_READ_ERROR             ERRCODE_IO_CANTREAD
 #define SVSTREAM_WRITE_ERROR            ERRCODE_IO_CANTWRITE
 #define SVSTREAM_SEEK_ERROR             ERRCODE_IO_CANTSEEK
-#define SVSTREAM_TELL_ERROR             ERRCODE_IO_CANTTELL
 
 #define SVSTREAM_OUTOFMEMORY            ERRCODE_IO_OUTOFMEMORY
 
@@ -297,9 +280,7 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
 
 #define PRINTER_OK                      ERRCODE_NONE
 #define PRINTER_ABORT                   ERRCODE_IO_ABORT
-#define PRINTER_OUTOFMEMORY             ERRCODE_IO_OUTOFMEMORY
 #define PRINTER_GENERALERROR            ERRCODE_IO_GENERAL
-#define PRINTER_ACCESSDENIED            ERRCODE_IO_ACCESSDENIED
 
 #define ERRCODE_INET_NAME_RESOLVE (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1)
 #define ERRCODE_INET_CONNECT      (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2)
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 4d38ce08ff37..bfc14ea1ea92 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -28,7 +28,6 @@
 #define POLY_APPEND             (0xFFFF)
 #define POLYPOLY_APPEND         (0xFFFF)
 
-#define POLY_OPTIMIZE_NONE      0x00000000UL
 #define POLY_OPTIMIZE_OPEN      0x00000001UL
 #define POLY_OPTIMIZE_CLOSE     0x00000002UL
 #define POLY_OPTIMIZE_NO_SAME   0x00000004UL
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 8747be4b575e..210211307398 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -77,9 +77,6 @@ typedef short RSWND_STYLE;
 #define ACCELITEM_KEY                   0x02
 
 // For "Field" resources:
-#define PATTERNFORMATTER_STRICTFORMAT   0x01
-#define PATTERNFORMATTER_EDITMASK       0x02
-#define PATTERNFORMATTER_LITTERALMASK   0x04
 
 #define NUMERICFORMATTER_MIN            0x01
 #define NUMERICFORMATTER_MAX            0x02
@@ -113,7 +110,6 @@ typedef short RSWND_STYLE;
 #define RSC_TOOLBOXITEM_STATE           0x0200
 #define RSC_TOOLBOXITEM_HIDE            0x0400
 #define RSC_TOOLBOXITEM_COMMAND         0x0800
-#define RSC_TOOLBOXITEM_MENUSTRINGS     0x1000
 
 // For "ToolBox" resources:
 #define RSC_TOOLBOX_BUTTONTYPE          0x01
@@ -142,8 +138,6 @@ typedef short RSWND_STYLE;
 #define RSC_IMAGE_MASKCOLOR             0x04
 
 // For "ImageList":
-#define RSC_IMAGELIST_IMAGEBITMAP       0x01
-#define RSC_IMAGELIST_MASKBITMAP        0x02
 #define RSC_IMAGELIST_MASKCOLOR         0x04
 #define RSC_IMAGELIST_IDLIST            0x08
 #define RSC_IMAGELIST_IDCOUNT           0x10
diff --git a/include/uno/lbnames.h b/include/uno/lbnames.h
index 83a4608925b1..a4c967616f63 100644
--- a/include/uno/lbnames.h
+++ b/include/uno/lbnames.h
@@ -43,8 +43,6 @@ provoking error here, because PP ignores #error
 
 /** Environment type name for binary C UNO. */
 #define UNO_LB_UNO "uno"
-/** Environment type name for ANSI C compilers. */
-#define UNO_LB_C "c"
 /** Environment type name for Java 1.3.1 compatible virtual machine. */
 #define UNO_LB_JAVA "java"
 /** Environment type name for CLI (Common Language Infrastructure). */
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index d83e814f16ac..c06f172ea00e 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -26,7 +26,6 @@
 namespace utl
 {
 
-#define CVC_READONLY_ACCESS     0x0000
 #define CVC_UPDATE_ACCESS       0x0001
 
 #define CVC_LAZY_UPDATE         0x0000
diff --git a/include/unotools/linguprops.hxx b/include/unotools/linguprops.hxx
index 4ad625eedadf..346a314503e4 100644
--- a/include/unotools/linguprops.hxx
+++ b/include/unotools/linguprops.hxx
@@ -63,14 +63,6 @@
 #define UPN_IS_TRANSLATE_COMMON_TERMS       "IsTranslateCommonTerms"
 #define UPN_IS_REVERSE_MAPPING              "IsReverseMapping"
 
-// new UNO propertynames to be used with 'dictionaries as extensions'
-#define UPN_DICTIONARIES                    "Dictionaries"
-#define UPN_SPELL_CHECKERS                  "SpellCheckers"
-#define UPN_HYPHENATORS                     "Hyphenators"
-#define UPN_THESAURI                        "Thesauri"
-#define UPN_CURRENT_ACTIVE_DICTIONARIES     "CurrentActiveDictionaries"
-#define UPN_LAST_ACTIVE_DICTIONARIES        "LastActiveDictionaries"
-
 #define UPN_IS_GRAMMAR_AUTO                 "IsAutoGrammarCheck"
 #define UPN_IS_GRAMMAR_INTERACTIVE          "IsInteractiveGrammarCheck"
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 26a221c6a226..2dbfa8161993 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -53,7 +53,6 @@
 #define BMP_DITHER_FLOYD            0x00000002UL
 #define BMP_DITHER_FLOYD_16         0x00000004UL
 
-#define BMP_VECTORIZE_NONE          BMP_VECTORIZE_OUTER
 #define BMP_VECTORIZE_INNER         0x00000001UL
 #define BMP_VECTORIZE_OUTER         0x00000002UL
 #define BMP_VECTORIZE_BOUND_ONLY    0x00000004UL
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 65bf763b10f6..30c2934888ef 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -52,7 +52,6 @@ class Gradient;
 #define METAFILE_LABEL_NOTFOUND         GDI_METAFILE_LABEL_NOTFOUND
 #endif
 
-#define MTF_MIRROR_NONE             0x00000000UL
 #define MTF_MIRROR_HORZ             0x00000001UL
 #define MTF_MIRROR_VERT             0x00000002UL
 
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 313ee02d364d..0515e205707e 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -75,7 +75,6 @@ struct ConvertData;
 #define EXP_PNG                 "SVEPNG"
 
 #define BMP_SHORTNAME           "BMP"
-#define MOV_SHORTNAME           "MOV"
 #define GIF_SHORTNAME           "GIF"
 #define JPG_SHORTNAME           "JPG"
 #define MET_SHORTNAME           "MET"
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 242873c95dd1..63d412960a34 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -51,7 +51,6 @@ namespace vcl {
 }
 
 
-#define PAGEQUEUE_ALLPAGES   0xFFFF
 
 enum PrinterSupport { SUPPORT_SET_ORIENTATION, SUPPORT_SET_PAPERBIN,
                       SUPPORT_SET_PAPERSIZE, SUPPORT_SET_PAPER,
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index ced84247eacd..359494075c0b 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -109,8 +109,6 @@ typedef sal_uInt32      ControlType;
 // popup menu
 #define CTRL_MENU_POPUP         121
 
-// The statusbar
-#define CTRL_STATUSBAR          130
 #define CTRL_PROGRESS           131
 // Progress bar for the intro window
 // (aka splash screen), in case some
@@ -357,7 +355,6 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue
  */
 
 /* TABITEM constants are OR-ed together */
-#define TABITEM_NOTALIGNED     0x000   // the tabitem is an inner item
 #define TABITEM_LEFTALIGNED    0x001   // the tabitem is aligned with the left  border of the TabControl
 #define TABITEM_RIGHTALIGNED   0x002   // the tabitem is aligned with the right border of the TabControl
 #define TABITEM_FIRST_IN_GROUP 0x004   // the tabitem is the first in group of tabitems
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 5873c8e323af..709d95eee439 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -153,8 +153,6 @@ struct FrameStyle
     {}
 };
 
-#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
-#define DEFAULT_WORKSPACE_GRADIENT_END_COLOR Color( 0x73, 0x7e, 0x88 )
 
 
 // - StyleSettings -
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index 205b008a8b2d..39a2175408ca 100644
--- a/include/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
@@ -27,7 +27,6 @@ namespace vcl { class Window; }
 
 #define STANDARD_TEXT_FIRST                     STANDARD_TEXT_SERVICE_NOT_AVAILABLE
 #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE     ((sal_uInt16)0)
-#define STANDARD_TEXT_LAST                      STANDARD_TEXT_SERVICE_NOT_AVAILABLE
 
 OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText);
 
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index f52d54d48e44..1f29d45f0613 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -34,19 +34,13 @@ class VclBox;
 // - Icon-Types -
 #define ICON_LO_DEFAULT                 1
 #define ICON_TEXT_DOCUMENT              2
-#define ICON_TEXT_TEMPLATE              3
 #define ICON_SPREADSHEET_DOCUMENT       4
-#define ICON_SPREADSHEET_TEMPLATE       5
 #define ICON_DRAWING_DOCUMENT           6
-#define ICON_DRAWING_TEMPLATE           7
 #define ICON_PRESENTATION_DOCUMENT      8
-#define ICON_PRESENTATION_TEMPLATE      9
-#define ICON_MASTER_DOCUMENT            10
 #define ICON_TEMPLATE                   11
 #define ICON_DATABASE_DOCUMENT          12
 #define ICON_MATH_DOCUMENT              13
 #define ICON_MACROLIBRARY               1
-#define ICON_SETUP                      500
 
 
 // - WindowStateData -
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index c727f8f12ce3..825f2ae54fe6 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -28,7 +28,6 @@
 
 namespace vcl { class Font; }
 
-#define TEXTATTR_INVALID    0
 #define TEXTATTR_FONTCOLOR  1
 #define TEXTATTR_HYPERLINK  2
 #define TEXTATTR_FONTWEIGHT 3
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 7d7ca50a20c8..3404d79c3bb8 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -49,7 +49,6 @@ enum GradientStyle
 #define HATCH_SINGLE            HatchStyle_SINGLE
 #define HATCH_DOUBLE            HatchStyle_DOUBLE
 #define HATCH_TRIPLE            HatchStyle_TRIPLE
-#define HATCH_FORCE_EQUAL_SIZE  HatchStyle_FORCE_EQUAL_SIZE
 
 enum HatchStyle
 {
@@ -63,7 +62,6 @@ enum HatchStyle
 #define LINE_NONE               LineStyle_NONE
 #define LINE_SOLID              LineStyle_SOLID
 #define LINE_DASH               LineStyle_DASH
-#define LINE_FORCE_EQUAL_SIZE   LineStyle_FORCE_EQUAL_SIZE
 
 enum LineStyle
 {
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 276321b0e5df..4e165a438643 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -178,15 +178,11 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_MENU_HIDE                  1251
 
 #define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED  1216
-#define VCLEVENT_LISTBOX_TREEEXPAND             1218
-#define VCLEVENT_LISTBOX_TREECOLLAPSE           1219
 #define VCLEVENT_LISTBOX_TREEFOCUS              1220
 #define VCLEVENT_LISTBOX_TREESELECT             1221
 #define VCLEVENT_EDIT_CARETCHANGED  1222
-#define VCLEVENT_COMBOBOX_UPDATEVALUE  1223
 
 #define VCLEVENT_LISTBOX_FOCUS             1224
-#define VCLEVENT_LISTBOX_CLEAR             1225
 
 // DockingWindow
 #define VCLEVENT_WINDOW_STARTDOCKING            1227    // pData = DockingData
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index eefc0051169a..5ced13491efc 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -299,7 +299,6 @@ enum class StateChangedType : sal_uInt16
 #define IMPL_SEP_BUTTON_X               5
 #define IMPL_SEP_BUTTON_Y               5
 #define IMPL_MINSIZE_MSGBOX_WIDTH       150
-#define IMPL_MINSIZE_MSGBOX_HEIGHT      80
 #define IMPL_DIALOG_OFFSET              5
 #define IMPL_DIALOG_BAR_OFFSET          3
 #define IMPL_MSGBOX_OFFSET_EXTRA_X      0
diff --git a/include/xmloff/families.hxx b/include/xmloff/families.hxx
index c8e64d91e54c..5f88b0f471c4 100644
--- a/include/xmloff/families.hxx
+++ b/include/xmloff/families.hxx
@@ -26,7 +26,6 @@
 // Misc (Pool)
 // reserved: 0..99
 #define XML_STYLE_FAMILY_DATA_STYLE             0
-#define XML_STYLE_FAMILY_DATA_STYLE_NAME        "data-style"
 #define XML_STYLE_FAMILY_PAGE_MASTER            1
 #define XML_STYLE_FAMILY_PAGE_MASTER_NAME       "page-layout"
 #define XML_STYLE_FAMILY_PAGE_MASTER_PREFIX     "pm"
@@ -102,7 +101,6 @@
 // Forms/Controls
 // reserved 600..649
 #define XML_STYLE_FAMILY_CONTROL_ID             600
-#define XML_STYLE_FAMILY_CONTROL_NAME           "control"
 #define XML_STYLE_FAMILY_CONTROL_PREFIX         "ctrl"
 
 #endif // INCLUDED_XMLOFF_FAMILIES_HXX
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index cc08bfcbd6b5..d6b4acbf167c 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -95,7 +95,6 @@ enum class SvXMLImportFlags {
     SETTINGS        = 0x0040,
     FONTDECLS       = 0x0080,
     EMBEDDED        = 0x0100,
-    OOO_NAMESPACES  = 0x0100,
     ALL             = 0xffff
 };
 namespace o3tl
@@ -104,7 +103,6 @@ namespace o3tl
 }
 
 
-
 class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
              ::com::sun::star::xml::sax::XExtendedDocumentHandler,
              ::com::sun::star::xml::sax::XFastDocumentHandler,