summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UnoControls/source/inc/framecontrol.hxx1
-rw-r--r--UnoControls/source/inc/progressmonitor.hxx1
-rw-r--r--basic/source/inc/runtime.hxx4
-rw-r--r--basic/source/sbx/sbxres.hxx22
-rw-r--r--bin/find-unused-defines.awk18
-rwxr-xr-xbin/find-unused-defines.sh27
-rw-r--r--chart2/source/controller/inc/HelpIds.hrc10
-rw-r--r--chart2/source/inc/servicenames.hxx1
-rw-r--r--chart2/source/view/main/OpenGLRender.hxx1
-rw-r--r--connectivity/source/drivers/evoab2/NDriver.hxx5
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx1
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx1
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx1
-rw-r--r--cui/source/customize/acccfg.hrc1
-rw-r--r--cui/source/dialogs/scriptdlg.hrc5
-rw-r--r--cui/source/inc/cuioptgenrl.hxx1
-rw-r--r--cui/source/inc/helpid.hrc13
-rw-r--r--cui/source/inc/iconcdlg.hxx1
-rw-r--r--cui/source/inc/scriptdlg.hxx1
-rw-r--r--cui/source/tabpages/align.hrc3
-rw-r--r--cui/source/tabpages/page.h4
-rw-r--r--dbaccess/inc/dbaccess_helpid.hrc76
-rw-r--r--dbaccess/source/core/inc/dbamiscres.hrc24
-rw-r--r--dbaccess/source/inc/dsntypes.hxx1
-rw-r--r--dbaccess/source/ui/inc/browserids.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc4
-rw-r--r--desktop/source/app/desktop.hrc1
-rw-r--r--dtrans/source/win32/dtobj/DTransHelper.hxx3
-rw-r--r--filter/source/graphicfilter/icgm/chart.hxx11
-rw-r--r--filter/source/placeware/zipfile.hxx51
-rw-r--r--filter/source/svg/svgwriter.hxx2
-rw-r--r--forms/source/component/EditBase.hxx6
-rw-r--r--formula/source/ui/dlg/formdlgs.hrc11
-rw-r--r--fpicker/source/office/iodlg.hxx2
-rw-r--r--fpicker/source/win32/filepicker/resource.h4
-rw-r--r--framework/inc/classes/resource.hrc1
-rw-r--r--framework/inc/properties.h59
-rw-r--r--framework/inc/services.h36
-rw-r--r--framework/source/jobs/joburl.cxx1
-rw-r--r--framework/source/layoutmanager/helpers.hxx1
-rw-r--r--hwpfilter/source/drawdef.h8
-rw-r--r--hwpfilter/source/hbox.h16
-rw-r--r--hwpfilter/source/hwplib.h1
-rw-r--r--i18npool/inc/servicename.hxx1
-rw-r--r--idl/inc/basobj.hxx4
-rw-r--r--include/basic/sbxdef.hxx12
-rw-r--r--include/clew/clew.h199
-rw-r--r--include/comphelper/classids.hxx1
-rw-r--r--include/comphelper/documentconstants.hxx23
-rw-r--r--include/cppuhelper/factory.hxx1
-rw-r--r--include/editeng/editdata.hxx2
-rw-r--r--include/editeng/eeitemid.hxx20
-rw-r--r--include/editeng/outliner.hxx3
-rw-r--r--include/editeng/unoprnms.hxx41
-rw-r--r--include/filter/msfilter/escherex.hxx397
-rw-r--r--include/filter/msfilter/msdffimp.hxx5
-rw-r--r--include/filter/msfilter/svdfppt.hxx109
-rw-r--r--include/oox/ole/olehelper.hxx1
-rw-r--r--include/osl/detail/component-defines.h25
-rw-r--r--include/osl/process.h2
-rw-r--r--include/osl/socket.h1
-rw-r--r--include/postwin.h3
-rw-r--r--include/sfx2/childwin.hxx2
-rw-r--r--include/sfx2/docfac.hxx12
-rw-r--r--include/sfx2/msg.hxx1
-rw-r--r--include/sfx2/objsh.hxx2
-rw-r--r--include/sfx2/sfxcommands.h1
-rw-r--r--include/sfx2/shell.hxx1
-rw-r--r--include/sfx2/sidebar/ResourceDefinitions.hrc15
-rw-r--r--include/sfx2/tabdlg.hxx1
-rw-r--r--include/sfx2/viewsh.hxx3
-rw-r--r--include/sot/storage.hxx5
-rw-r--r--include/svl/filerec.hxx6
-rw-r--r--include/svl/smplhint.hxx11
-rw-r--r--include/svtools/grfmgr.hxx1
-rw-r--r--include/svtools/htmlkywd.hxx14
-rw-r--r--include/svtools/imgdef.hxx1
-rw-r--r--include/svtools/ivctrl.hxx2
-rw-r--r--include/svtools/treelistbox.hxx5
-rw-r--r--include/svtools/treelistentry.hxx1
-rw-r--r--include/svx/EnhancedCustomShape2d.hxx1
-rw-r--r--include/svx/gallery.hxx1
-rw-r--r--include/svx/galmisc.hxx1
-rw-r--r--include/svx/ifaceids.hxx1
-rw-r--r--include/svx/msdffdef.hxx301
-rw-r--r--include/svx/nbdtmg.hxx1
-rw-r--r--include/svx/svdmodel.hxx1
-rw-r--r--include/svx/svdmrkv.hxx3
-rw-r--r--include/svx/svxcommands.h8
-rw-r--r--include/svx/unomid.hxx2
-rw-r--r--include/svx/xpoly.hxx1
-rw-r--r--include/toolkit/awt/vclxgraphics.hxx1
-rw-r--r--include/toolkit/helper/property.hxx3
-rw-r--r--include/tools/errcode.hxx19
-rw-r--r--include/tools/poly.hxx1
-rw-r--r--include/tools/rc.h6
-rw-r--r--include/uno/lbnames.h2
-rw-r--r--include/unotools/configvaluecontainer.hxx1
-rw-r--r--include/unotools/linguprops.hxx8
-rw-r--r--include/vcl/bitmap.hxx1
-rw-r--r--include/vcl/gdimtf.hxx1
-rw-r--r--include/vcl/graphicfilter.hxx1
-rw-r--r--include/vcl/print.hxx1
-rw-r--r--include/vcl/salnativewidgets.hxx3
-rw-r--r--include/vcl/settings.hxx2
-rw-r--r--include/vcl/stdtext.hxx1
-rw-r--r--include/vcl/syswin.hxx6
-rw-r--r--include/vcl/txtattr.hxx1
-rw-r--r--include/vcl/vclenum.hxx2
-rw-r--r--include/vcl/vclevent.hxx4
-rw-r--r--include/vcl/window.hxx1
-rw-r--r--include/xmloff/families.hxx2
-rw-r--r--include/xmloff/xmlimp.hxx2
-rw-r--r--l10ntools/inc/export.hxx2
-rw-r--r--mysqlc/source/mysqlc_connection.hxx1
-rw-r--r--package/inc/ZipFile.hxx1
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.hxx3
-rw-r--r--reportdesign/source/inc/stringconstants.hrc12
-rw-r--r--reportdesign/source/inc/uistrings.hrc7
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx4
-rw-r--r--rsc/inc/rscall.h2
-rw-r--r--rsc/inc/rscerror.h2
-rw-r--r--rsc/inc/rscrsc.hxx5
-rw-r--r--rsc/source/rscpp/cpp.h2
-rw-r--r--sal/android/uthash.h1
-rw-r--r--sal/osl/unx/file_error_transl.hxx1
-rw-r--r--sal/osl/w32/file_url.h1
-rw-r--r--sal/osl/w32/sockimpl.h2
-rw-r--r--sal/qa/osl/socket/osl_Socket_Const_orig.h5
-rw-r--r--sc/inc/ViewSettingsSequenceDefines.hxx1
-rw-r--r--sc/inc/attrib.hxx2
-rw-r--r--sc/inc/cfgids.hxx1
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/filter.hxx2
-rw-r--r--sc/inc/global.hxx3
-rw-r--r--sc/inc/helpids.h80
-rw-r--r--sc/inc/rechead.hxx67
-rw-r--r--sc/inc/sccommands.h19
-rw-r--r--sc/inc/unonames.hxx2
-rw-r--r--sc/inc/userdat.hxx1
-rw-r--r--sc/source/filter/inc/excdefs.hxx2
-rw-r--r--sc/source/filter/inc/scflt.hxx15
-rw-r--r--sc/source/filter/inc/xlchart.hxx5
-rw-r--r--sc/source/ui/dbgui/pvfundlg.hrc2
-rw-r--r--sc/source/ui/inc/fupoor.hxx1
-rw-r--r--sc/source/ui/inc/miscdlgs.hrc3
-rw-r--r--sc/source/ui/inc/printfun.hxx1
-rw-r--r--sc/source/ui/inc/viewdata.hxx1
-rw-r--r--sd/inc/glob.hrc3
-rw-r--r--sd/inc/glob.hxx14
-rw-r--r--sd/inc/helpids.h59
-rw-r--r--sd/inc/sdattr.hrc1
-rw-r--r--sd/inc/sdcommands.h19
-rw-r--r--sd/source/filter/eppt/epptdef.hxx106
-rw-r--r--sd/source/filter/html/htmlex.hxx3
-rw-r--r--sd/source/filter/ppt/propread.hxx15
-rw-r--r--sd/source/ui/inc/optsitem.hxx1
-rw-r--r--sd/source/ui/inc/unoprnms.hxx16
-rw-r--r--sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h271
-rw-r--r--sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h28
-rwxr-xr-xsd/source/ui/remotecontrol/mDNSResponder/dns_sd.h3
-rw-r--r--sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h1
-rw-r--r--sd/source/ui/view/DocumentRenderer.hrc1
-rw-r--r--sfx2/source/inc/helpid.hrc2
-rw-r--r--sfx2/source/inc/workwin.hxx1
-rw-r--r--shell/inc/internal/config.hxx2
-rw-r--r--shell/inc/internal/resource.h6
-rw-r--r--soltools/mkdepend/def.h1
-rw-r--r--starmath/inc/helpids.h3
-rw-r--r--starmath/inc/rect.hxx6
-rw-r--r--svl/source/inc/poolio.hxx12
-rw-r--r--svx/inc/galobj.hxx7
-rw-r--r--svx/inc/helpid.hrc2
-rw-r--r--svx/source/form/formcontroller.cxx17
-rw-r--r--svx/source/inc/datanavi.hrc2
-rw-r--r--svx/source/inc/docrecovery.hxx1
-rw-r--r--svx/source/inc/fmprop.hrc22
-rw-r--r--sw/inc/cmdid.h13
-rw-r--r--sw/inc/editsh.hxx1
-rw-r--r--sw/inc/helpid.h125
-rw-r--r--sw/inc/redline.hxx3
-rw-r--r--sw/inc/swabstdlg.hxx1
-rw-r--r--sw/inc/swcommands.h12
-rw-r--r--sw/inc/unocoll.hxx2
-rw-r--r--sw/inc/unomid.h1
-rw-r--r--sw/inc/unoprnms.hxx111
-rw-r--r--sw/inc/viewopt.hxx5
-rw-r--r--sw/source/core/inc/frame.hxx1
-rw-r--r--sw/source/core/inc/unofldmid.h1
-rw-r--r--sw/source/core/text/inftxt.hxx2
-rw-r--r--sw/source/core/text/porlin.hxx1
-rw-r--r--sw/source/filter/html/wrthtml.hxx1
-rw-r--r--sw/source/filter/inc/fltini.hxx6
-rw-r--r--sw/source/filter/ww8/ww8par.hxx7
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx2
-rw-r--r--sw/source/uibase/inc/frmmgr.hxx2
-rw-r--r--sw/source/uibase/inc/num.hxx1
-rw-r--r--sw/source/uibase/inc/swcont.hxx3
-rw-r--r--sw/source/uibase/lingu/olmenu.hrc1
-rw-r--r--sw/source/uibase/ribbar/inputwin.hrc3
-rw-r--r--sw/source/uibase/sidebar/PropertyPanel.hrc1
-rw-r--r--sw/source/uibase/utlui/navipi.hrc1
-rw-r--r--ucb/source/ucp/file/filerror.hxx2
-rw-r--r--ucb/source/ucp/gio/gio_content.hxx1
-rw-r--r--ucb/source/ucp/gio/gio_provider.hxx1
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.hxx1
-rw-r--r--ucb/source/ucp/package/pkgprovider.hxx1
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.hxx1
-rw-r--r--vcl/inc/cvtsvm.hxx3
-rw-r--r--vcl/inc/jobset.h3
-rw-r--r--vcl/inc/osx/salnativewidgets.h2
-rw-r--r--vcl/inc/unx/saldisp.hxx2
-rw-r--r--vcl/inc/win/saldata.hxx5
-rw-r--r--vcl/source/filter/jpeg/transupp.h1
-rw-r--r--vcl/source/filter/sgfbram.hxx4
-rw-r--r--vcl/source/filter/sgvmain.hxx1
-rw-r--r--vcl/source/filter/wmf/winmtf.hxx46
-rw-r--r--wizards/source/importwizard/importwi.src7
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.hxx3
-rw-r--r--xmlsecurity/source/dialogs/dialogs.hrc2
-rw-r--r--xmlsecurity/source/dialogs/helpids.hrc4
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssrenam.h8
222 files changed, 63 insertions, 2995 deletions
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 55389e8d0cb5..e98285146905 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -42,7 +42,6 @@ namespace unocontrols{
#define PROPERTYNAME_LOADERARGUMENTS "LoaderArguments"
#define PROPERTYNAME_COMPONENTURL "ComponentURL"
#define PROPERTYNAME_FRAME "Frame"
-#define ERRORTEXT_VOSENSHURE "This is an invalid property handle."
#define PROPERTY_COUNT 3 // you must count the propertys
#define PROPERTYHANDLE_COMPONENTURL 0 // Id must be the index into the array
#define PROPERTYHANDLE_FRAME 1
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 172545519293..4ac928d73954 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -78,7 +78,6 @@ class ProgressBar;
#define DEFAULT_BUTTONLABEL "Abbrechen"
#define PROGRESSMONITOR_DEFAULT_TOPIC ""
#define PROGRESSMONITOR_DEFAULT_TEXT ""
-#define PROGRESSMONITOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
#define PROGRESSMONITOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
#define PROGRESSMONITOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
#define PROGRESSMONITOR_DEFAULT_WIDTH 350
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 10b8be80146f..b56a340c3461 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -92,13 +92,9 @@ struct SbiGosubStack { // GOSUB-Stack:
#define MAXRECURSION 500
-#define Sb_ATTR_NORMAL 0x0000
#define Sb_ATTR_READONLY 0x0001
#define Sb_ATTR_HIDDEN 0x0002
-#define Sb_ATTR_SYSTEM 0x0004
-#define Sb_ATTR_VOLUME 0x0008
#define Sb_ATTR_DIRECTORY 0x0010
-#define Sb_ATTR_ARCHIVE 0x0020
class WildCard;
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index dcb3fc715765..c635dd20997d 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -27,35 +27,13 @@
// we can work with dummies.
#define STRING_TYPES 0
-#define STRING_EMPTY 0
-#define STRING_NULL 1
-#define STRING_INTEGER 2
-#define STRING_LONG 3
-#define STRING_SINGLE 4
-#define STRING_DOUBLE 5
-#define STRING_CURRENCY 6
-#define STRING_DATE 7
-#define STRING_STRING 8
-#define STRING_OBJECT 9
-#define STRING_ERROR 10
-#define STRING_BOOL 11
-#define STRING_VARIANT 12
#define STRING_ANY 13
-#define STRING_CHAR 16
-#define STRING_BYTE 17
-#define STRING_USHORT 18
-#define STRING_ULONG 19
-#define STRING_INT 22
-#define STRING_UINT 23
-#define STRING_LPSTR 30
-#define STRING_LPWSTR 31
#define STRING_AS 32
#define STRING_OPTIONAL 33
#define STRING_BYREF 34
#define STRING_NAMEPROP 35
#define STRING_PARENTPROP 36
-#define STRING_APPLPROP 37
#define STRING_COUNTPROP 38
#define STRING_ADDMETH 39
#define STRING_ITEMMETH 40
diff --git a/bin/find-unused-defines.awk b/bin/find-unused-defines.awk
new file mode 100644
index 000000000000..2649e41d0534
--- /dev/null
+++ b/bin/find-unused-defines.awk
@@ -0,0 +1,18 @@
+{
+ x++
+ y=$0
+}
+
+END {
+ tmp = substr(y, 0, index(y, ":"))
+ if (x==1) print "sed -i '/[[:space:]]" p1 "[[:space:]]/d' " tmp
+}
+
+
+
+
+# | xargs -P 4 -Ixxx sh -c "git grep -w 'xxx' | awk '{ x++; y=\$0 } END { if (x==1) print y }' && echo \"xxx\" 1>&2"
+
+# sed -i '' '/pattern/d'
+# | awk 'arr[$0]++ END { for (i in arr) { if(arr[i]==1) print i } }' \
+# | awk -f find-unused-defines.awk
diff --git a/bin/find-unused-defines.sh b/bin/find-unused-defines.sh
new file mode 100755
index 000000000000..6c07de4aeea5
--- /dev/null
+++ b/bin/find-unused-defines.sh
@@ -0,0 +1,27 @@
+#
+# This is a pretty brute-force approach. It takes several hours to run on a top-spec MacbookAir.
+# It also produces some false positives, so it requires careful examination and testing of the results.
+#
+# Algorithm Summary:
+# First we find all #defines,
+# then we search for each of them in turn,
+# and if we find only one instance of a #define, we print it out.
+#
+# Algorithm Detail:
+# (1) find #defines, excluding the externals folder
+# (2) extract just the constant name from the search results
+# (3) trim blank lines
+# (4) sort the results, mostly so I have an idea how far along the process is
+# (5) for each result:
+# (6) grep for the constant
+# (7) use awk to to check if only one match for a given constant was found
+# (8) if so, generate a sed command to remove the #define
+#
+git grep -P '^#define\s+\w+\s+\w' -- "[!e][!x][!t]*" \
+ | cut -s -d ' ' -f 2 \
+ | sed '/^$/d' \
+ | sort \
+ | xargs -Ixxx sh -c \
+ "git grep -w 'xxx' | awk -f bin/find-unused-defines.awk -v p1=xxx && echo \"xxx\" 1>&2"
+
+
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index e7f074a91585..9f5aeb76e503 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -21,22 +21,12 @@
#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT"
-#define HID_SCH_CB_SECONDARY_XAXIS "CHART2_HID_SCH_CB_SECONDARY_XAXIS"
-#define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS"
-#define HID_SCH_CB_SECONDARY_ZAXIS "CHART2_HID_SCH_CB_SECONDARY_ZAXIS"
-#define HID_SCH_LEGEND_POS_LEFT "CHART2_HID_SCH_LEGEND_POS_LEFT"
-#define HID_SCH_LEGEND_POS_TOP "CHART2_HID_SCH_LEGEND_POS_TOP"
-#define HID_SCH_LEGEND_POS_RIGHT "CHART2_HID_SCH_LEGEND_POS_RIGHT"
-#define HID_SCH_LEGEND_POS_BOTTOM "CHART2_HID_SCH_LEGEND_POS_BOTTOM"
-#define HID_SCH_STATISTIK_MEANVALUE "CHART2_HID_SCH_STATISTIK_MEANVALUE"
#define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP"
-#define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW"
#define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL"
-#define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS"
#endif
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index d47f4611f9a5..212632e7caa0 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -47,7 +47,6 @@ namespace chart
#define CHART_CHARTAPIWRAPPER_SERVICE_NAME "com.sun.star.chart2.ChartDocumentWrapper"
// accessibility
-#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.AccessibleTextComponent" )
#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME "com.sun.star.accessibility.AccessibleTextComponent"
} //namespace chart
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 54ded303c452..dddf1c8cb8ed 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -26,7 +26,6 @@
#include "glm/gtx/quaternion.hpp"
#define DEBUG_POSITIONING 0
-#define RENDER_TO_FILE 0
struct PosVecf3
{
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 9b8fe33bb922..5c3026b261f1 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -27,11 +27,6 @@
#include <connectivity/CommonTools.hxx>
#include <osl/module.h>
-#define EVOAB_EVOLUTION_SCHEMA "evolution"
-/*In Future, when separate schema is required for ldap, groupwise*/
-#define EVOAB_LDAP_SCHEMA "ldap"
-#define EVOAB_GWISE_SCHEMA "groupwise"
-
#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver"
namespace connectivity
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
index 5f407c4b69af..7d9e5bdba2ea 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
@@ -22,7 +22,6 @@
#include "mozilla_nsprofile.h"
-#define _MAX_LENGTH 256
class nsProfile: public nsIProfileInternal,
public nsIProfileChangeStatus,
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index f0b6f17b6c56..7f93b874645e 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -191,7 +191,6 @@ static nsresult insertPABDescription()
#define NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_RDF_DATASOURCE_CONTRACTID "?name="
#define NS_ABDIRECTORYDATASOURCE_CONTRACTID \
NS_RDF_DATASOURCE_CONTRACTID_PREFIX "addressdirectory"
-#define database_uri "@mozilla.org/rdf/datasource;1?name=addressdirectory"
#define NS_ABDIRECTORYDATASOURCE_CID \
{ /* 0A79186D-F754-11d2-A2DA-001083003D0C */ \
0xa79186d, 0xf754, 0x11d2, \
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index eef642b89a89..5afbc95bdb51 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -195,7 +195,6 @@ nsresult MNSMozabProxy::QueryHelperStub()
#define NS_LDAPCONNECTION_CONTRACTID "@mozilla.org/network/ldap-connection;1"
#define NS_LDAPOPERATION_CONTRACTID "@mozilla.org/network/ldap-operation;1"
-#define NS_LDAPMESSAGE_CONTRACTID "@mozilla.org/network/ldap-message;1"
#define NS_LDAPURL_CONTRACTID "@mozilla.org/network/ldap-url;1"
namespace connectivity {
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 19a5459f3c1f..7ad1eba98c1b 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -25,6 +25,5 @@
#define STR_BASICMACROS 67
#define STR_HUMAN_APPNAME 69
-#define STR_FILTERNAME_CFG 70
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 41bcc3f980e6..e79e2f0aa34c 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -20,11 +20,6 @@
#ifndef _SCRIPTDLG_HRC
#define _SCRIPTDLG_HRC
-#define STR_FT_NEWMACRO 11
-#define STR_NEWLIB 12
-#define STR_NEWMACRO 13
-#define STR_FT_RENAME 18
-#define STR_RENAME 19
#endif
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 86190a8c0ce3..500bf7cb20ba 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -32,7 +32,6 @@
class Edit;
-#define SfxGeneralTabPage SvxGeneralTabPage
// class SvxGeneralTabPage -----------------------------------------------
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c227db7f6788..ab1fdc322d59 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -32,13 +32,6 @@
#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED"
#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
-#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS"
-#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE"
-#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE"
-#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL"
-#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE"
-#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL"
-#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS"
#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"
#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"
@@ -54,13 +47,7 @@
#define HID_SVX_UP_TOOLBAR_ITEM "CUI_HID_SVX_UP_TOOLBAR_ITEM"
#define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM"
#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
-#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
-#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
-#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
-#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL"
-#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT"
-#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT"
#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN"
#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL"
#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH"
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 566d4e1e69fb..531b0b6e7b03 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -31,7 +31,6 @@
#include <vcl/layout.hxx>
#include <vector>
-#define CTRLS_OFFSET 3
#define RET_USER 100
#define RET_USER_CANCEL 101
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 0a734a9d2f84..ef0cea679595 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -34,7 +34,6 @@
#include <unordered_map>
-#define OBJTYPE_BASICMANAGER 1L
#define OBJTYPE_METHOD 2L
#define OBJTYPE_SCRIPTCONTAINER 3L
#define OBJTYPE_SFROOT 4L
diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc
index e56d7d1be172..b9e3ccd33c07 100644
--- a/cui/source/tabpages/align.hrc
+++ b/cui/source/tabpages/align.hrc
@@ -26,9 +26,6 @@
#define IID_TOPLOCK 2
#define IID_CELLLOCK 3
-#define STR_BOTTOMLOCK 1
-#define STR_TOPLOCK 2
-#define STR_CELLLOCK 3
#endif
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index 64edfe3c42ae..8ad22787904e 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -46,10 +46,6 @@
#define PAPERSIZE_DL 17
#define PAPERSIZE_DIA 18
#define PAPERSIZE_SCREEN_4_3 19
-#define PAPERSIZE_C 20
-#define PAPERSIZE_D 21
-#define PAPERSIZE_E 22
-#define PAPERSIZE_EXECUTIVE 23
#define PAPERSIZE_LEGAL2 24
#define PAPERSIZE_MONARCH 25
#define PAPERSIZE_COM675 26
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index e37a493bfd35..e62c1d7b18d5 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -20,7 +20,6 @@
#ifndef _DBA_DBACCESS_HELPID_HRC_
#define _DBA_DBACCESS_HELPID_HRC_
-#define HID_DSADMIN_CHARSET "DBACCESS_HID_DSADMIN_CHARSET"
#define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER"
#define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER"
@@ -29,20 +28,7 @@
#define UID_CTL_CONTENT "DBACCESS_UID_CTL_CONTENT"
#define HID_TLB_TREELISTBOX "DBACCESS_HID_TLB_TREELISTBOX"
-#define HID_DSADMIN_PAGE_DBASE "DBACCESS_HID_DSADMIN_PAGE_DBASE"
-#define HID_DSADMIN_PAGE_ODBC "DBACCESS_HID_DSADMIN_PAGE_ODBC"
-#define HID_DSADMIN_PAGE_TEXT "DBACCESS_HID_DSADMIN_PAGE_TEXT"
-#define HID_DSADMIN_URL_GENERAL "DBACCESS_HID_DSADMIN_URL_GENERAL"
#define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN"
-#define HID_DSADMIN_SHOWDELETED "DBACCESS_HID_DSADMIN_SHOWDELETED"
-#define HID_DSADMIN_DBASE_INDICIES "DBACCESS_HID_DSADMIN_DBASE_INDICIES"
-#define HID_DSADMIN_DRIVERCLASS "DBACCESS_HID_DSADMIN_DRIVERCLASS"
-#define HID_DSADMIN_ODBC_OPTIONS "DBACCESS_HID_DSADMIN_ODBC_OPTIONS"
-#define HID_DSADMIN_TEXT_HEADER "DBACCESS_HID_DSADMIN_TEXT_HEADER"
-#define HID_DSADMIN_FIELD_SEPARATOR "DBACCESS_HID_DSADMIN_FIELD_SEPARATOR"
-#define HID_DSADMIN_TEXT_SEPARATOR "DBACCESS_HID_DSADMIN_TEXT_SEPARATOR"
-#define HID_DSADMIN_DECIMAL_SEPARATOR "DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR"
-#define HID_DSADMIN_THOUSANDS_SEPARATOR "DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR"
#define HID_BROWSER_COLUMNFORMAT "DBACCESS_HID_BROWSER_COLUMNFORMAT"
#define HID_BROWSER_COLUMNWIDTH "DBACCESS_HID_BROWSER_COLUMNWIDTH"
@@ -57,7 +43,6 @@
#define UID_SQLERROR_BUTTONMORE "DBACCESS_UID_SQLERROR_BUTTONMORE"
-#define HID_DSADMIN_PAGE_ADO "DBACCESS_HID_DSADMIN_PAGE_ADO"
#define HID_CTL_QRYDGNTAB "DBACCESS_HID_CTL_QRYDGNTAB"
#define HID_CTL_QRYDGNCRIT "DBACCESS_HID_CTL_QRYDGNCRIT"
@@ -101,28 +86,14 @@
#define HID_TAB_ENT_LEN "DBACCESS_HID_TAB_ENT_LEN"
#define HID_TAB_ENT_SCALE "DBACCESS_HID_TAB_ENT_SCALE"
#define HID_BROWSER_TABLE_CREATE_DESIGN "DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN"
-#define HID_TAB_WIZ_TYPE_SELECT "DBACCESS_HID_TAB_WIZ_TYPE_SELECT"
-#define HID_TAB_NAMEMATCHING_COLS_AVAIL "DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL"
-#define HID_TAB_NAMEMATCHING_COLS_ASSIGN "DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN"
#define HID_CTL_RELATIONTAB "DBACCESS_HID_CTL_RELATIONTAB"
#define HID_RELATIONDIALOG_LEFTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
#define HID_RELATIONDIALOG_RIGHTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
#define HID_BROWSER_COLUMNINFO "DBACCESS_HID_BROWSER_COLUMNINFO"
-#define HID_DSADMIN_USECATALOG "DBACCESS_HID_DSADMIN_USECATALOG"
#define HID_BROWSER_VIEW_CREATE_DESIGN "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN"
#define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"
-#define HID_DSADMIN_PAGE_LDAP "DBACCESS_HID_DSADMIN_PAGE_LDAP"
#define HID_DSADMIN_LDAP_HOSTNAME "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"
-#define HID_DSADMIN_LDAP_BASEDN "DBACCESS_HID_DSADMIN_LDAP_BASEDN"
-#define HID_DSADMIN_LDAP_PORTNUMBER "DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER"
#define HID_DSBROWSER_DISCONNECTING "DBACCESS_HID_DSBROWSER_DISCONNECTING"
-#define HID_TAB_PAGE_USERADMIN "DBACCESS_HID_TAB_PAGE_USERADMIN"
-#define HID_TAB_PAGE_PBUSER "DBACCESS_HID_TAB_PAGE_PBUSER"
-#define HID_TAB_PAGE_PBCHGPWD "DBACCESS_HID_TAB_PAGE_PBCHGPWD"
-#define HID_TAB_PAGE_PBUSERDELETE "DBACCESS_HID_TAB_PAGE_PBUSERDELETE"
-#define HID_TAB_PAGE_TBLGRANTS "DBACCESS_HID_TAB_PAGE_TBLGRANTS"
-#define HID_TAB_PAGE_LBUSER "DBACCESS_HID_TAB_PAGE_LBUSER"
-#define HID_DSADMIN_LDAP_ROWCOUNT "DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT"
#define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
@@ -136,7 +107,6 @@
#define HID_DOCUMENT_CREATE_REPWIZ "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
#define HID_TAB_AUTOINCREMENTVALUE "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
-#define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP"
#define HID_DSADMIN_DBASE_PATH "DBACCESS_HID_DSADMIN_DBASE_PATH"
#define HID_DSADMIN_MYSQL_DATABASE "DBACCESS_HID_DSADMIN_MYSQL_DATABASE"
#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"
@@ -157,8 +127,6 @@
#define UID_APP_SWAP_VIEW "DBACCESS_UID_APP_SWAP_VIEW"
#define HID_APP_SWAP_ICONCONTROL "DBACCESS_HID_APP_SWAP_ICONCONTROL"
-#define HID_DSADMIN_HOSTNAME "DBACCESS_HID_DSADMIN_HOSTNAME"
-#define HID_DSADMIN_PORTNUMBER "DBACCESS_HID_DSADMIN_PORTNUMBER"
#define HID_APP_HELP_TEXT "DBACCESS_HID_APP_HELP_TEXT"
#define UID_APP_DATABASE_VIEW "DBACCESS_UID_APP_DATABASE_VIEW"
@@ -175,7 +143,6 @@
#define UID_APP_VIEW_PREVIEW_1 "DBACCESS_UID_APP_VIEW_PREVIEW_1"
#define HID_APP_VIEW_PREVIEW_3 "DBACCESS_HID_APP_VIEW_PREVIEW_3"
-#define HID_DSADMIN_TYPE_DIALOG "DBACCESS_HID_DSADMIN_TYPE_DIALOG"
#define HID_DBWIZ_PREVIOUS "DBACCESS_HID_DBWIZ_PREVIOUS"
#define HID_DBWIZ_NEXT "DBACCESS_HID_DBWIZ_NEXT"
@@ -185,64 +152,21 @@
#define HID_BROWSER_ADMINISTRATE "DBACCESS_HID_BROWSER_ADMINISTRATE"
-#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION "DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION"
-#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION "DBACCESS_HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION"
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES"
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES"
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES"
-#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION"
-#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE"
-#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE "DBACCESS_HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE"
-#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION"
-#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION"
-#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER"
-#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN"
-#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER"
-#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL "DBACCESS_HID_PAGE_DBWIZARD_LDAP_CB_USESSL"
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC"
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC"
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME"
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER"
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT"
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS"
-#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS"
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL"
-#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL"
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS"
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS"
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME"
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER"
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT"
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS"
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS"
-#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL "DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL"
-#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_ADOURL"
-#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE"
-#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE"
-#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH"
-#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH"
-#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED"
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED"
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME"
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION"
-#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE"
-#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE"
-#define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD"
#endif // _DBA_DBACCESS_HELPID_HRC_
diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc
index cc1a8a099df0..3aaa9f03ff0a 100644
--- a/dbaccess/source/core/inc/dbamiscres.hrc
+++ b/dbaccess/source/core/inc/dbamiscres.hrc
@@ -20,30 +20,6 @@
#ifndef _DBA_MISCRES_HRC_
#define _DBA_MISCRES_HRC_
-// string ids (relative to other resources, that's why not unique)
-#define STR_MYSQL_ODBC 1
-#define STR_MYSQL_JDBC 2
- // FREE
-#define STR_ORACLE_JDBC 4
-#define STR_JDBC 5
-#define STR_ODBC 6
-#define STR_DBASE 7
-#define STR_MSACCESS 8
-#define STR_MSACCESS2007 9
-#define STR_ADO 10
-#define STR_FLAT 11
-#define STR_CALC 12
-#define STR_MOZILLA 13
-#define STR_LDAP 14
-#define STR_OUTLOOK 15
-#define STR_OUTLOOKEXP 16
-#define STR_EVOLUTION 17
-#define STR_EVOLUTION_GROUPWISE 18
-#define STR_EVOLUTION_LDAP 19
-#define STR_KAB 20
-#define STR_MACAB 21
-#define STR_EMBEDDED_HSQLDB 22
-#define STR_THUNDERBIRD 23
#define STR_MYSQL_NATIVE 24
#define STR_END STR_MYSQL_NATIVE + 1
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 5ca8c83f3264..8fb8ff3a895c 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -91,7 +91,6 @@ enum DATASOURCE_TYPE
#define PAGE_DBSETUPWIZARD_ODBC 12
#define PAGE_DBSETUPWIZARD_SPREADSHEET 13
#define PAGE_DBSETUPWIZARD_AUTHENTIFICATION 14
-#define PAGE_DBSETUPWIZARD_MOZILLA 15
#define PAGE_DBSETUPWIZARD_FINAL 16
#define PAGE_DBSETUPWIZARD_USERDEFINED 17
#define PAGE_DBSETUPWIZARD_MYSQL_NATIVE 18
diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx
index 65369ec7d514..0681883b6d58 100644
--- a/dbaccess/source/ui/inc/browserids.hxx
+++ b/dbaccess/source/ui/inc/browserids.hxx
@@ -47,13 +47,11 @@
#define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT
#define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED
#define ID_BROWSER_REFRESH SID_FM_REFRESH
-#define ID_BROWSER_EXPL_PREVLEVEL SID_EXPLORER_PREVLEVEL
#define ID_BROWSER_COLATTRSET 20 // Spaltenformatierung
#define ID_BROWSER_COLWIDTH 21 // Spaltenbreite
#define ID_BROWSER_TABLEATTR 22 // table format attributes
#define ID_BROWSER_ROWHEIGHT 23 // Zeilenhoehe
#define ID_BROWSER_COLUMNINFO 24 // copies the column description to insert it into the table design
-#define ID_BROWSER_COUNTALL SID_FM_COUNTALL // count all
#define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE
#define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER
#define ID_BROWSER_DOCUMENT_DATASOURCE SID_DOCUMENT_DATA_SOURCE
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 4bf0d025e1e7..5b11a6d7539a 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -80,12 +80,9 @@
// FREE
#define PAGE_ADO RID_PAGE_START + 7
// FREE
-#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10
-#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11
// FREE
// FREE
#define PAGE_LDAP RID_PAGE_START + 15
-#define TAB_PAGE_USERADMIN RID_PAGE_START + 16
#define PAGE_MYSQL_ODBC RID_PAGE_START + 17
#define PAGE_USERDRIVER RID_PAGE_START + 19
#define PAGE_MYSQL_JDBC RID_PAGE_START + 20
@@ -94,7 +91,6 @@
#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24
// FREE
#define PAGE_ORACLE_JDBC RID_PAGE_START + 27
-#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28
// FREE
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 4ed5c9f81e37..173685d54696 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -22,7 +22,6 @@
#include <svl/solar.hrc>
-#define RID_DESKTOP_DIALOG_START 2000
// RID_FIRSTSTSTART_START 3000
#define RID_DESKTOP_STRING_START 10000
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 308331efabbe..7754ec302c20 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -30,9 +30,6 @@
#include "../misc/WinClip.hxx"
#define AUTO_INIT TRUE
-#define NO_AUTO_INIT FALSE
-#define MEM_DESTROY_ON_RELEASE TRUE
-#define NO_MEM_DESTROY_ON_RELEASE FALSE
// a helper class to manage a global memory area, the clients can write
// into the global memory area and extract the handle to the global mem
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index e92b1a90c7d5..5b8e441e8c0d 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -21,18 +21,7 @@
#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX
/* FILE TYPE CONSTANTS: */
-#define NOCHART 0 /* Undefined chart. */
-#define XYCHART 1 /* Standard XY chart. */
-#define PIECHART 21 /* Standard pie chart file. */
-#define ORGCHART 26 /* Standard org chart file. */
-#define TTLCHART 31 /* Title chart file. */
#define BULCHART 32 /* Bullet chart file. */
-#define TABCHART 33 /* Table chart file. */
-#define DRWCHART 41 /* Chart with drawings only.*/
-#define MLTCHART 42 /* Multiple chart file. */
-#define LASTCHART 45 /* The largest chart type. */
-#define SHWFILE 46 /* Slide show file. */
-#define SYMFILE 47 /* Symbol file. */
/* the following were added although SPC doesn't have a #define */
/* for them... */
#define AUTOTTLCHT 95 /* Autobuild TTL CHT */
diff --git a/filter/source/placeware/zipfile.hxx b/filter/source/placeware/zipfile.hxx
index 77a4ee68ad3c..92514c3ec61f 100644
--- a/filter/source/placeware/zipfile.hxx
+++ b/filter/source/placeware/zipfile.hxx
@@ -20,64 +20,13 @@
#ifndef INCLUDED_FILTER_SOURCE_PLACEWARE_ZIPFILE_HXX
#define INCLUDED_FILTER_SOURCE_PLACEWARE_ZIPFILE_HXX
-/* Local file head offsets. The header is followed by the filename and
- possibly the extra field. */
-#define zf_lfhSig 0
-#define zf_lfhExVers 4
-#define zf_lfhFlags 6
-#define zf_lfhComp 8
-#define zf_lfhModTime 10
-#define zf_lfhModDate 12
-#define zf_lfhCRC 14
-#define zf_lfhCompSize 18
-#define zf_lfhUncompSize 22
-#define zf_lfhNameLen 26
-#define zf_lfhExtraLen 28
#define zf_lfhSIZE 30 /* total size of header */
-/* We don't write data descriptors. */
-
-/* Central dir file header offsets. Each entry is followed by the filename,
- optional extra field, and file comment. */
-#define zf_cdhSig 0
-#define zf_cdhVers 4
-#define zf_cdhExVers 6
-#define zf_cdhFlags 8
-#define zf_cdhComp 10
-#define zf_cdhTime 12
-#define zf_cdhDate 14
-#define zf_cdhCRC 16
-#define zf_cdhCompSize 20
-#define zf_cdhUncompSize 24
-#define zf_cdhNameLen 28
-#define zf_cdhExtraLen 30
-#define zf_cdhCommentLen 32
-#define zf_cdhDiskNum 34
-#define zf_cdhIFAttrs 36
-#define zf_cdhEFAttrs 38
-#define zf_cdhLHOffset 42
-#define zf_cdhSIZE 46 /* total size of header */
-
-/* End of central dir record offsets. It is followed by the zipfile
- comment. */
-#define zf_ecdSig 0
-#define zf_ecdDiskNum 4
-#define zf_ecdDirDiskNum 6
-#define zf_ecdNumEntries 8
-#define zf_ecdTotalEntries 10
-#define zf_ecdDirSize 12
-#define zf_ecdDirOffset 16
-#define zf_ecdCommentLen 20
-#define zf_ecdSIZE 22 /* total size */
-
/* Magic constants to put in these structures. */
#define zf_LFHSIGValue 0x04034b50
#define zf_CDHSIGValue 0x02014b50
#define zf_ECDSIGValue 0x06054b50
-/* OS values for upper byte of version field. */
-#define zf_osUnix 3
-
/* Encode a major,minor version in a byte. */
#define zf_Vers(major,minor) ((major) * 10 + (minor))
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 0a77dd765711..8d296a22914f 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -73,9 +73,7 @@ using namespace ::com::sun::star::xml::sax;
#define SVG_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" )
-#define SVG_TINY_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG Tiny 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd\">" )
-#define SVGWRITER_WRITE_NONE 0x00000000
#define SVGWRITER_WRITE_FILL 0x00000001
#define SVGWRITER_WRITE_TEXT 0x00000002
#define SVGWRITER_NO_SHAPE_COMMENTS 0x01000000
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 1147dbb6c611..8d8325c37d8e 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -36,12 +36,6 @@
// If done so, this class will write an version without a call to writeCommonEditProperties.
#define PF_FAKE_FORMATTED_FIELD 0x4000
// .... hmmm .... a fake, as the name suggests. see OFormattedFieldWrapper
-#define PF_RESERVED_2 0x2000
-#define PF_RESERVED_3 0x1000
-#define PF_RESERVED_4 0x0800
-#define PF_RESERVED_5 0x0400
-#define PF_RESERVED_6 0x0200
-#define PF_RESERVED_7 0x0100
#define PF_SPECIAL_FLAGS 0xFF00
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 84a20f99bc22..3640c8157880 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -17,26 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define FT_RESULT 1
-#define WND_RESULT 2
-#define FT_EDITNAME 3
#define BTN_HELP 6
#define BTN_CANCEL 7
#define BTN_BACKWARD 8
#define BTN_FORWARD 9
#define BTN_END 10
#define BTN_MATRIX 11
-#define FT_FUNCNAME 12
-#define FT_FUNCDESC 13
-#define FT_HEADLINE 14
-#define GB_EDIT 15
-#define FT_FORMULA 16
#define ED_FORMULA 17
-#define TC_FUNCTION 18
#define ED_REF 19
#define RB_REF 20
-#define FT_FORMULA_RESULT 21
-#define WND_FORMULA_RESULT 22
// Fuer Tabpage
#define TP_FUNCTION 1
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c727cfa28c03..1a1bc55f098d 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -57,10 +57,8 @@ class SvtFileDialogFilter_Impl;
#define SFXWB_READONLY WB_READONLY
#define SFXWB_PATHDIALOG WB_PATH
#define SFXWB_CLASSPATH ( 0x08000000L | SFXWB_PATHDIALOG )
-#define SFXWB_SHOWALLFOLDER 0x10000000L // all directories including Mail/News/...
#define SFXWB_MULTISELECTION 0x20000000L // activate Multiselection
#define SFXWB_NOREMOTE 0x40000000L
-#define SFXWB_SHOWVERSIONS 0x80000000L // show version selection
#define SFX_EXTRA_AUTOEXTENSION 0x00000001L
#define SFX_EXTRA_FILTEROPTIONS 0x00000002L
diff --git a/fpicker/source/win32/filepicker/resource.h b/fpicker/source/win32/filepicker/resource.h
index c8f5c6324807..9cd716c20507 100644
--- a/fpicker/source/win32/filepicker/resource.h
+++ b/fpicker/source/win32/filepicker/resource.h
@@ -21,10 +21,6 @@
// Microsoft Developer Studio generated include file.
// Used by Fps.rc
-#define IDD_DIALOG1 101
-#define IDB_BITMAP1 117
-#define IDB_BITMAP2 118
-#define IDC_BUTTON1 1008
#define stc32 -1
#define IDC_STATIC -1
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index a74b314d3aa7..8d2337156bfb 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -23,7 +23,6 @@
#define RID_STR_START 2000
#define RID_MENU_START 10000
#define RID_IMAGE_START 15000
-#define RID_FWK_DIALOG_START 0
#define STR_MENU_ADDONS (RID_STR_START+0)
#define STR_MENU_ADDONHELP (RID_STR_START+1)
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index 1b0972fb4b88..15a162de61fb 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -102,59 +102,6 @@ namespace framework{
#define PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY "UserDictionary"
#define PATHSETTINGS_PROPNAME_ASCII_WORK "Work"
-#define PATHSETTINGS_PROPNAME_ADDIN OUString(PATHSETTINGS_PROPNAME_ASCII_ADDIN)
-#define PATHSETTINGS_PROPNAME_AUTOCORRECT OUString(PATHSETTINGS_PROPNAME_ASCII_AUTOCORRECT)
-#define PATHSETTINGS_PROPNAME_AUTOTEXT OUString(PATHSETTINGS_PROPNAME_ASCII_AUTOTEXT)
-#define PATHSETTINGS_PROPNAME_BACKUP OUString(PATHSETTINGS_PROPNAME_ASCII_BACKUP)
-#define PATHSETTINGS_PROPNAME_BASIC OUString(PATHSETTINGS_PROPNAME_ASCII_BASIC)
-#define PATHSETTINGS_PROPNAME_BITMAP OUString(PATHSETTINGS_PROPNAME_ASCII_BITMAP)
-#define PATHSETTINGS_PROPNAME_CONFIG OUString(PATHSETTINGS_PROPNAME_ASCII_CONFIG)
-#define PATHSETTINGS_PROPNAME_DICTIONARY OUString(PATHSETTINGS_PROPNAME_ASCII_DICTIONARY)
-#define PATHSETTINGS_PROPNAME_FAVORITE OUString(PATHSETTINGS_PROPNAME_ASCII_FAVORITE)
-#define PATHSETTINGS_PROPNAME_FILTER OUString(PATHSETTINGS_PROPNAME_ASCII_FILTER)
-#define PATHSETTINGS_PROPNAME_GALLERY OUString(PATHSETTINGS_PROPNAME_ASCII_GALLERY)
-#define PATHSETTINGS_PROPNAME_GRAPHIC OUString(PATHSETTINGS_PROPNAME_ASCII_GRAPHIC)
-#define PATHSETTINGS_PROPNAME_HELP OUString(PATHSETTINGS_PROPNAME_ASCII_HELP)
-#define PATHSETTINGS_PROPNAME_LINGUISTIC OUString(PATHSETTINGS_PROPNAME_ASCII_LINGUISTIC)
-#define PATHSETTINGS_PROPNAME_MODULE OUString(PATHSETTINGS_PROPNAME_ASCII_MODULE)
-#define PATHSETTINGS_PROPNAME_PALETTE OUString(PATHSETTINGS_PROPNAME_ASCII_PALETTE)
-#define PATHSETTINGS_PROPNAME_PLUGIN OUString(PATHSETTINGS_PROPNAME_ASCII_PLUGIN)
-#define PATHSETTINGS_PROPNAME_STORAGE OUString(PATHSETTINGS_PROPNAME_ASCII_STORAGE)
-#define PATHSETTINGS_PROPNAME_TEMP OUString(PATHSETTINGS_PROPNAME_ASCII_TEMP)
-#define PATHSETTINGS_PROPNAME_TEMPLATE OUString(PATHSETTINGS_PROPNAME_ASCII_TEMPLATE)
-#define PATHSETTINGS_PROPNAME_UICONFIG OUString(PATHSETTINGS_PROPNAME_ASCII_UICONFIG)
-#define PATHSETTINGS_PROPNAME_USERCONFIG OUString(PATHSETTINGS_PROPNAME_ASCII_USERCONFIG)
-#define PATHSETTINGS_PROPNAME_USERDICTIONARY OUString(PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY)
-#define PATHSETTINGS_PROPNAME_WORK OUString(PATHSETTINGS_PROPNAME_ASCII_WORK)
-
-// Please add new entries alphabetical sorted and correct all other handles!
-// Start counting with 0, so it can be used as direct index into an array too.
-// Don't forget updating of define PATHSETTINGS_PROPCOUNT below!!!
-#define PATHSETTINGS_PROPHANDLE_ADDIN 0
-#define PATHSETTINGS_PROPHANDLE_AUTOCORRECT 1
-#define PATHSETTINGS_PROPHANDLE_AUTOTEXT 2
-#define PATHSETTINGS_PROPHANDLE_BACKUP 3
-#define PATHSETTINGS_PROPHANDLE_BASIC 4
-#define PATHSETTINGS_PROPHANDLE_BITMAP 5
-#define PATHSETTINGS_PROPHANDLE_CONFIG 6
-#define PATHSETTINGS_PROPHANDLE_DICTIONARY 7
-#define PATHSETTINGS_PROPHANDLE_FAVORITE 8
-#define PATHSETTINGS_PROPHANDLE_FILTER 9
-#define PATHSETTINGS_PROPHANDLE_GALLERY 10
-#define PATHSETTINGS_PROPHANDLE_GRAPHIC 11
-#define PATHSETTINGS_PROPHANDLE_HELP 12
-#define PATHSETTINGS_PROPHANDLE_LINGUISTIC 13
-#define PATHSETTINGS_PROPHANDLE_MODULE 14
-#define PATHSETTINGS_PROPHANDLE_PALETTE 15
-#define PATHSETTINGS_PROPHANDLE_PLUGIN 16
-#define PATHSETTINGS_PROPHANDLE_STORAGE 17
-#define PATHSETTINGS_PROPHANDLE_TEMP 18
-#define PATHSETTINGS_PROPHANDLE_TEMPLATE 19
-#define PATHSETTINGS_PROPHANDLE_UICONFIG 20
-#define PATHSETTINGS_PROPHANDLE_USERCONFIG 21
-#define PATHSETTINGS_PROPHANDLE_USERDICTIONARY 22
-#define PATHSETTINGS_PROPHANDLE_WORK 23
-
#define PATHSETTINGS_PROPCOUNT 24
/** properties for "LayoutManager" class */
@@ -185,12 +132,7 @@ namespace framework{
#define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST "private:resource/image/commandrotateimagelist"
#define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST "private:resource/image/commandmirrorimagelist"
-#define UICOMMANDDESCRIPTION_PROPNAME_PROPERTIES "Properties"
-#define UICOMMANDDESCRIPTION_PROPNAME_POPUP "Popup"
-#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE 1
-#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_MIRRORED 2
-#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED 4
#define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
/** properties for "AutoRecovery" class */
@@ -236,7 +178,6 @@ namespace framework{
#define TABWINDOW_PROPCOUNT 2
#define TABWINDOWSERVICE_PROPHANDLE_WINDOW 0
-#define TABWINDOWSERVICE_PROPCOUNT 1
/** provides some helper methods to implement property sets. */
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 5d93fac75fef..e7f8573da8d5 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -32,60 +32,27 @@ namespace framework{
#define SERVICENAME_CONTENTHANDLER "com.sun.star.frame.ContentHandler"
#define SERVICENAME_JOB "com.sun.star.task.Job"
#define SERVICENAME_PROTOCOLHANDLER "com.sun.star.frame.ProtocolHandler"
-#define SERVICENAME_POPUPMENUCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.PopupMenuControllerFactory" )
#define SERVICENAME_POPUPMENUCONTROLLER "com.sun.star.frame.PopupMenuController"
-#define SERVICENAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.ui.UIElementFactory" )
-#define SERVICENAME_TOOLBARFACTORY DECLARE_ASCII("com.sun.star.ui.ToolBarFactory" )
-#define SERVICENAME_TOOLBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.ToolbarControllerFactory" )
-#define SERVICENAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.ui.StatusBarFactory" )
-#define SERVICENAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory" )
-#define SERVICENAME_STATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.frame.StatusbarController" )
#define SERVICENAME_TABWINFACTORY "com.sun.star.frame.TabWindowFactory"
#define SERVICENAME_TABWINDOW "com.sun.star.frame.TabWindow"
#define SERVICENAME_STRINGABBREVIATION "com.sun.star.util.UriAbbreviation"
-#define SERVICENAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow" )
// used implementationnames by framework
-#define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" )
-#define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" )
#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper")
#define IMPLEMENTATIONNAME_OXT_HANDLER DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" )
-#define IMPLEMENTATIONNAME_SFXTERMINATOR DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener" )
-#define IMPLEMENTATIONNAME_PIPETERMINATOR DECLARE_ASCII("com.sun.star.comp.OfficeIPCThreadController" )
#define IMPLEMENTATIONNAME_QUICKLAUNCHER DECLARE_ASCII("com.sun.star.comp.desktop.QuickstartWrapper" )
-#define IMPLEMENTATIONNAME_SWTHREADMANAGER DECLARE_ASCII("com.sun.star.util.comp.FinalThreadManager" )
-#define IMPLEMENTATIONNAME_JOBEXECUTOR DECLARE_ASCII("com.sun.star.comp.framework.JobExecutor" )
#define IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.comp.framework.DispatchRecorderSupplier")
#define IMPLEMENTATIONNAME_MAILTODISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.MailToDispatcher" )
#define IMPLEMENTATIONNAME_SERVICEHANDLER DECLARE_ASCII("com.sun.star.comp.framework.ServiceHandler" )
-#define IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.comp.framework.PathSubstitution" )
-#define IMPLEMENTATIONNAME_JOBDISPATCH DECLARE_ASCII("com.sun.star.comp.framework.jobs.JobDispatch" )
#define IMPLEMENTATIONNAME_DISPATCHHELPER DECLARE_ASCII("com.sun.star.comp.framework.services.DispatchHelper" )
-#define IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerFactory" )
#define IMPLEMENTATIONNAME_MACROSMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.MacrosMenuController" )
#define IMPLEMENTATIONNAME_FONTMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FontMenuController" )
#define IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FontSizeMenuController" )
-#define IMPLEMENTATIONNAME_OBJECTMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.ObjectMenuController" )
#define IMPLEMENTATIONNAME_HEADERMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.HeaderMenuController" )
#define IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.FooterMenuController" )
-#define IMPLEMENTATIONNAME_CONTROLMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.ControlMenuController" )
#define IMPLEMENTATIONNAME_NEWMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.NewMenuController" )
-#define IMPLEMENTATIONNAME_UICOMMANDDESCRIPTION DECLARE_ASCII("com.sun.star.comp.framework.UICommandDescription" )
-#define IMPLEMENTATIONNAME_UIELEMENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.UIElementFactoryManager" )
-#define IMPLEMENTATIONNAME_MODULEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ModuleManager" )
-#define IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGERSUPPLIER DECLARE_ASCII("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier" )
-#define IMPLEMENTATIONNAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.MenuBarFactory" )
-#define IMPLEMENTATIONNAME_WINDOWSTATECONFIGURATION DECLARE_ASCII("com.sun.star.comp.framework.WindowStateConfiguration" )
-#define IMPLEMENTATIONNAME_TOOLBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.ToolBarFactory" )
-#define IMPLEMENTATIONNAME_ADDONSTOOLBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.AddonsToolBarFactory" )
#define IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.ToolBarsMenuController" )
-#define IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.ToolBarControllerFactory" )
-#define IMPLEMENTATIONNAME_AUTORECOVERY DECLARE_ASCII("com.sun.star.comp.framework.AutoRecovery" )
-#define IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.RecentFilesMenuController" )
-#define IMPLEMENTATIONNAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.StatusBarFactory" )
-#define IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.StatusBarControllerFactory" )
-#define IMPLEMENTATIONNAME_SESSIONLISTENER DECLARE_ASCII("com.sun.star.comp.frame.SessionListener" )
#define IMPLEMENTATIONNAME_HELPONSTARTUP DECLARE_ASCII("com.sun.star.comp.framework.HelpOnStartup" )
#define IMPLEMENTATIONNAME_SHELLJOB DECLARE_ASCII("com.sun.star.comp.framework.ShellJob" )
#define IMPLEMENTATIONNAME_FWK_TASKCREATOR DECLARE_ASCII("com.sun.star.comp.framework.TaskCreator" )
@@ -94,10 +61,7 @@ namespace framework{
#define IMPLEMENTATIONNAME_SYSTEMEXEC DECLARE_ASCII("com.sun.star.comp.framework.SystemExecute" )
#define IMPLEMENTATIONNAME_URIABBREVIATION DECLARE_ASCII("com.sun.star.comp.framework.UriAbbreviation" )
#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerDispatcher" )
-#define IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LangSelectionStatusbarController" )
#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LanguageSelectionMenuController" )
-#define IMPLEMENTATIONNAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.comp.framework.TabWindowService" )
-#define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.WindowContentFactoryManager" )
} // namespace framework
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 3078d0386e31..54e69f3c84a2 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -265,7 +265,6 @@ bool JobURL::implst_split( /*IN*/ const OUString& sPart ,
*/
#ifdef ENABLE_COMPONENT_SELF_CHECK
-#define LOGFILE_JOBURL "joburl.log"
void JobURL::impldbg_checkIt()
{
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index 7acb0266ba4f..9d66e4b4f919 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -39,7 +39,6 @@
#define UIRESOURCE_URL "private:resource"
#define UIRESOURCETYPE_TOOLBAR "toolbar"
-#define UIRESOURCETYPE_STATUSBAR "statusbar"
#define UIRESOURCETYPE_MENUBAR "menubar"
namespace framework
diff --git a/hwpfilter/source/drawdef.h b/hwpfilter/source/drawdef.h
index 6cb38fe64cdc..52b3a9d51a04 100644
--- a/hwpfilter/source/drawdef.h
+++ b/hwpfilter/source/drawdef.h
@@ -44,21 +44,13 @@ enum objtype
};
#define HWPDO_PAT_TYPE_BITS 0xFF000000
-#define HWPDO_PAT_STYLE_BITS 0x00FFFFFF
#define HWPDO_PAT_SOLID 0x00000000
-#define HWPDO_PAT_WIN_HATCHED 0x01000000
-#define HWPDO_PAT_BITMAP 0x02000000
#define HWPDO_COLOR_NONE 0x10000000
-#define HWPDO_FLAG_ROUND_CORNER 0x00000001
#define HWPDO_FLAG_DRAW_PIE 0x00000002
-#define HWPDO_FLAG_SEMICIRCLE 0x00000004
-#define HWPDO_FLAG_SCALE_BITMAP 0x00000008
-#define HWPDO_FLAG_LOCAL_BITS 0x0000ffff
-#define HWPDO_FLAG_PROPERTY_BITS 0x00ff0000
#define HWPDO_FLAG_GRADATION 0x00010000
#define HWPDO_FLAG_ROTATION 0x00020000
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 26a29623057a..1ae07fd974bc 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -199,17 +199,6 @@ enum
EQU_CAP_POS
};
-/**
- * Definitions for frame's common 'option' member.
- */
-#define DRAW_FRAME 1 /* <-> no frame, bit 0 */
-#define NORMAL_PIC 2 /* <-> reverse, bit 1 */
-#define FIT_TO_COLUMN 4 /* fig_xs is columnlen */
-#define UNKNOWN_FILE 8 /* need check reverse for pcx mono */
-#define HYPERTEXT_FLAG 16
-#define UNKNOWN_SIZE 32
-#define FOPT_TEMP_BIT 0x00010000 /* temporary starts from 16th bits */
-
struct CellLine
{
unsigned char key;
@@ -617,7 +606,6 @@ typedef union
PicDefUnknown picun;
} PicDef;
-#define PIC_INFO_LEN 348
/**
* There are four kinds of image.
* @li External image
@@ -842,10 +830,6 @@ struct ShowPageNum: public HBox
};
/* 홀수쪽시작 (21) */
-#define HIDE_HD 1 /* bit 0 */
-#define HIDE_FT 2 /* bit 1 */
-#define HIDE_PGNUM 4 /* bit 2 */
-#define HIDE_FRAME 8 /* bit 3 */
/**
* Controls the display of page number, header, footer and border.
*/
diff --git a/hwpfilter/source/hwplib.h b/hwpfilter/source/hwplib.h
index efa5b66a45db..051b36d472fc 100644
--- a/hwpfilter/source/hwplib.h
+++ b/hwpfilter/source/hwplib.h
@@ -172,7 +172,6 @@ typedef struct
#define IS_SP_SKIP_BLOCK(hch) ((hch<5) || (hch==12) || (hch==27) || (hch == 29))
// file tag
-#define FILETAG_UNCOMPRESSED_BIT 0x80000000
#define FILETAG_END_OF_COMPRESSED 0x00000000
#define FILETAG_EMBEDDED_PICTURE 0x00000001
diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx
index 1a5f14a8fe06..1daa8864e837 100644
--- a/i18npool/inc/servicename.hxx
+++ b/i18npool/inc/servicename.hxx
@@ -61,7 +61,6 @@ Implementation Name
#define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "."
#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME_PREFIX "l10n"
-#define TRLT_IMPLNAME "com.sun.star.i18n.Transliteration"
#define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration."
// 1...5...901...5...901...5...901..4 --> 34
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 0dd63c3537c3..646cde618708 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -29,10 +29,6 @@ class SvMetaObject;
class SvIdlDataBase;
typedef SvMetaObject * (*CreateMetaObjectType)();
-#define IDL_WRITE_COMPILER 0x8000
-#define IDL_WRITE_BROWSER 0x4000
-#define IDL_WRITE_CALLING 0x2000
-#define IDL_WRITE_MASK 0xE000
#define C_PREF "C_"
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,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 28b678bc8691..c7ceb9b4af1a 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -111,8 +111,6 @@ public:
#define STRING_TYP_QUICKHELPTEXT 0x0040
#define STRING_TYP_TITLE 0x0080
-#define MERGE_MODE_NORMAL 0x0000
-#define MERGE_MODE_LIST 0x0001
typedef ::std::vector< ResData* > ResStack;
class ParserQueue;
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 8d4c0b625655..7377a0ba2d06 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -44,7 +44,6 @@
#include <map>
-#define UNUSED_PARAM __attribute__((unused))
namespace sql
{
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index a5a96e02c83e..510353ec6900 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -47,7 +47,6 @@ namespace rtl
*/
#define ZIP_MAXNAMELEN 512
-#define ZIP_MAXEXTRA 256
#define ZIP_MAXENTRIES (0x10000 - 2)
class ZipEnumeration;
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index e9281e24488a..2f70c58ddf79 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -30,9 +30,6 @@
#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1)
-#define XML_STYLE_FAMILY_REPORT_ID 700
-#define XML_STYLE_FAMILY_REPORT_NAME "report-element"
-#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem"
class SvXMLStylesContext;
diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
index f8e6c0708637..1927eafebd87 100644
--- a/reportdesign/source/inc/stringconstants.hrc
+++ b/reportdesign/source/inc/stringconstants.hrc
@@ -36,7 +36,6 @@
#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine"
#define SERVICE_SECTION "com.sun.star.report.Section"
#define SERVICE_GROUP "com.sun.star.report.Group"
-#define SERVICE_OLEOBJECT "com.sun.star.report.OleObject"
//= property names
@@ -56,27 +55,17 @@
#define PROPERTY_GROUP "Group"
#define PROPERTY_REPORTDEFINITION "ReportDefinition"
-#define PROPERTY_HEADER "Header"
-#define PROPERTY_FOOTER "Footer"
#define PROPERTY_GROUPINTERVAL "GroupInterval"
#define PROPERTY_EXPRESSION "Expression"
#define PROPERTY_GROUPON "GroupOn"
#define PROPERTY_SORTASCENDING "SortAscending"
-#define PROPERTY_GROUPS "Groups"
#define PROPERTY_MASTERFIELDS "MasterFields"
#define PROPERTY_DETAILFIELDS "DetailFields"
-#define PROPERTY_REPORTHEADER "ReportHeader"
-#define PROPERTY_REPORTFOOTER "ReportFooter"
-#define PROPERTY_PAGEHEADER "PageHeader"
-#define PROPERTY_PAGEFOOTER "PageFooter"
-#define PROPERTY_DETAIL "Detail"
#define PROPERTY_CAPTION "Caption"
-#define PROPERTY_BACKGRAPHICURL "BackGraphicURL"
#define PROPERTY_COMMAND "Command"
#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation"
#define PROPERTY_ORIENTATION "Orientation"
-#define PROPERTY_PAPERFORMAT "PaperFormat"
#define PROPERTY_PAPERSIZE "Size"
#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether"
#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption"
@@ -126,7 +115,6 @@
#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression"
#define PROPERTY_STARTNEWCOLUMN "StartNewColumn"
#define PROPERTY_RESETPAGENUMBER "ResetPageNumber"
-#define PROPERTY_SHAPE "Shape"
#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange"
#define PROPERTY_STATE "State"
#define PROPERTY_TIME_STATE "TimeState"
diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc
index 84982b7aa7d9..4aaca430f215 100644
--- a/reportdesign/source/inc/uistrings.hrc
+++ b/reportdesign/source/inc/uistrings.hrc
@@ -33,8 +33,6 @@
#define DBPAGEFOOTER "PageFooter"
#define DBGROUPHEADER "GroupHeader"
#define DBGROUPFOOTER "GroupFooter"
-#define DBCOLUMNHEADER "ColumnHeader"
-#define DBCOLUMNFOOTER "ColumnFooter"
#define DBDETAIL "Detail"
#define REPORTCONTROLFORMAT "ReportControlFormat"
#define CURRENT_WINDOW "CurrentWindow"
@@ -52,11 +50,6 @@
#define PROPERTY_TITLE "Title"
#define PROPERTY_AREA "Area"
#define PROPERTY_FILLCOLOR "FillColor"
-#define PROPERTY_FILLGRADIENT "FillGradient"
-#define PROPERTY_FILLGRADIENTNAME "FillGradientName"
-#define PROPERTY_FILLHATCHNAME "FillHatchName"
-#define PROPERTY_FILLBITMAPNAME "FillBitmapName"
-#define PROPERTY_FILLSTYLE "FillStyle"
#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent"
#endif // REPORTDESIGN_SHARED_UISTRINGS_HRC
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 7852b1cfb5c3..ea32550582ba 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -136,8 +136,8 @@ namespace rptui
,DEF_INFO_1( BACKCOLOR, BACKCOLOR, BACKCOLOR, COMPOSEABLE )
,DEF_INFO_1( CONTROLBACKGROUND, BACKCOLOR, BACKCOLOR, COMPOSEABLE )
,DEF_INFO_1( BACKTRANSPARENT, BACKTRANSPARENT, BACKTRANSPARENT, COMPOSEABLE )
- ,DEF_INFO_1( CONTROLBACKGROUNDTRANSPARENT, CONTROLBACKGROUNDTRANSPARENT
- ,CONTROLBACKGROUNDTRANSPARENT, COMPOSEABLE )
+ ,DEF_INFO_1( CONTROLBACKGROUNDTRANSPARENT, CONTROLBACKGROUNDTRANSPARENT,
+ CONTROLBACKGROUNDTRANSPARENT, COMPOSEABLE )
,DEF_INFO_1( CHARTTYPE, CHARTTYPE, CHARTTYPE, COMPOSEABLE )
,DEF_INFO_1( PREVIEW_COUNT, PREVIEW_COUNT, PREVIEW_COUNT, COMPOSEABLE )
,DEF_INFO_2( MASTERFIELDS, MASTERFIELDS, MASTERFIELDS, COMPOSEABLE,DATA_PROPERTY )
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 74bcf0b80ea7..cacd6d2d1e2e 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -61,8 +61,6 @@ extern AtomContainer* pHS;
#define NORESFILE_FLAG 0x0010 // keine .res-Datei erzeugen
#define DEFINE_FLAG 0x0020 // es wurde Definitionen angegeben
#define INCLUDE_FLAG 0x0040 // der Include-Pfad wurde erweitert
-#define MSCPREPRO_FLAG 0x0080 // spezial Preprozessor
-#define PRINTSYNTAX_FLAG 0x0100 // Syntax ausgeben
#define PRELOAD_FLAG 0x0200 // Alle Resourcen Preloaden
#define SRSDEFAULT_FLAG 0x1000 // immer der Default geschrieben
#define NOSYSRESTEST_FLAG 0x2000 // ueberprueft nicht die Richtigkeit von (bmp, ico, cur)
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 7cab3d52cefe..7fb6e794fe8d 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -48,12 +48,10 @@
#define ERR_CONT_INVALIDPOS (ERR_RSCCONT +1 ) // Return
#define ERR_CONT_INVALIDTYPE (ERR_RSCCONT +2 ) // Return
-#define ERR_RSCCMPED 0x0250
#define ERR_RSCINST 0x0260
#define ERR_RSCINST_NOVARNAME (ERR_RSCINST +1 ) // Return
#define ERR_RSCINST_RESERVEDNAME (ERR_RSCINST +2 ) // Return
-#define ERR_LEX 0x0270
#define ERR_YACC 0x0280
#define ERR_DOUBLEID (ERR_YACC +1 )
#define ERR_FALSETYPE (ERR_YACC +2 )
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 5842276c0d8d..f0cc6e025353 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -27,11 +27,6 @@
class RscTypCont;
-/****************** T Y P E S ********************************************/
-
-#define MAX_INPUTFILES 100
-#define MAX_SYMBOLS 10
-#define MAX_INCLUDES 10
/****************** R s c C m d L i n e **********************************/
class RscCmdLine
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 8cc28f9766be..af579fe6303e 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -108,12 +108,10 @@ extern FILE* pDefOut; /* ER */
/*
* The following are unary.
*/
-#define FIRST_UNOP OP_PLU /* First Unary operand */
#define OP_PLU 24 /* + (draft ANSI standard) */
#define OP_NEG 25 /* - */
#define OP_COM 26 /* ~ */
#define OP_NOT 27 /* ! */
-#define LAST_UNOP OP_NOT
#define OP_LPA 28 /* ( */
#define OP_RPA 29 /* ) */
#define OP_END 30 /* End of expression marker */
diff --git a/sal/android/uthash.h b/sal/android/uthash.h
index 48e7fba81026..076046903046 100644
--- a/sal/android/uthash.h
+++ b/sal/android/uthash.h
@@ -63,7 +63,6 @@ typedef unsigned int uint32_t;
#include <inttypes.h> /* uint32_t */
#endif
-#define UTHASH_VERSION 1.9.3
#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */
#define uthash_malloc(sz) malloc(sz) /* malloc fcn */
diff --git a/sal/osl/unx/file_error_transl.hxx b/sal/osl/unx/file_error_transl.hxx
index 33f282b8ae97..51be5aacf998 100644
--- a/sal/osl/unx/file_error_transl.hxx
+++ b/sal/osl/unx/file_error_transl.hxx
@@ -44,7 +44,6 @@
*********************************************/
-#define OSL_FET_SUCCESS false
#define OSL_FET_ERROR true
oslFileError oslTranslateFileError(bool bIsError, int Errno);
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
index 080b3ca7f93c..9f7a37ffac0f 100644
--- a/sal/osl/w32/file_url.h
+++ b/sal/osl/w32/file_url.h
@@ -52,7 +52,6 @@ extern "C" {
#define VALIDATEPATH_ALLOW_WILDCARDS 0x0001
#define VALIDATEPATH_ALLOW_ELLIPSE 0x0002
#define VALIDATEPATH_ALLOW_RELATIVE 0x0004
-#define VALIDATEPATH_ALLOW_UNC 0x0008
#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
#define MAX_LONG_PATH 32767
diff --git a/sal/osl/w32/sockimpl.h b/sal/osl/w32/sockimpl.h
index df56bdbdaeaf..d0e56f1a80d0 100644
--- a/sal/osl/w32/sockimpl.h
+++ b/sal/osl/w32/sockimpl.h
@@ -52,8 +52,6 @@ void __osl_destroySocketImpl(oslSocket pImpl);
/*****************************************************************************/
#define INTERNET_MODULE_NAME "wininet.dll"
-#define INTERNET_CONNECTION_MODEM 0x00000001L
-#define INTERNET_CONNECTION_LAN 0x00000002L
#define INTERNET_CONNECTION_HANGUP 0x80000000L
typedef DWORD (WINAPI *INTERNETATTEMPTCONNECT) (
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index 43f91d07c6d9..28e2fdc5237b 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -83,14 +83,10 @@ extern "C"
#define IP_PORT_ZERO 0
#define IP_PORT_FTP 21
#define IP_PORT_TELNET 23
-#define IP_PORT_SMTP 25
-#define IP_PORT_GOPHER 70
#define IP_PORT_HTTP1 80
#define IP_PORT_POP3 110
#define IP_PORT_NETBIOS_DGM 138
#define IP_PORT_NETBIOS 139
-#define IP_PORT_IMAP 143
-#define IP_PORT_HTTPS 443
#define IP_PORT_HTTP2 8080
/**reference: http://www.iana.org/assignments/port-numbers */
#define IP_PORT_MYPORT 8881 //8888
@@ -105,7 +101,6 @@ extern "C"
#define IP_PORT_MYPORT9 8897
#define IP_PORT_MYPORT10 8898
-#define IP_PORT_TMP 9999
#define IP_PORT_INVAL 99999
// service definitions.
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index d427377ab877..5bbaff44a48c 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -68,7 +68,6 @@
#define SC_TABLE_ZOOM_TYPE 11
#define SC_TABLE_ZOOM_VALUE 12
#define SC_TABLE_PAGE_VIEW_ZOOM_VALUE 13
-#define SC_TABLE_TAB_BG_COLOR 14
#define SC_TABLE_SHOWGRID 15
#define SC_CURSORPOSITIONX "CursorPositionX"
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 42535b99430a..8c86e0ea3e48 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -146,8 +146,6 @@ public:
// ScRangeItem: manages an area of a table
#define SCR_INVALID 0x01
-#define SCR_ALLTABS 0x02
-#define SCR_TONEWTAB 0x04
class ScRangeItem : public SfxPoolItem
{
diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx
index 3b0210378ddd..7f8db9f760db 100644
--- a/sc/inc/cfgids.hxx
+++ b/sc/inc/cfgids.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SC_INC_CFGIDS_HXX
#define INCLUDED_SC_INC_CFGIDS_HXX
-#define SCCFG_DOC SFX_ITEMTYPE_SC_BEGIN
#define SCCFG_VIEW (SFX_ITEMTYPE_SC_BEGIN + 1)
#define SCCFG_APP (SFX_ITEMTYPE_SC_BEGIN + 2)
#define SCCFG_SPELLCHECK (SFX_ITEMTYPE_SC_BEGIN + 3)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 003bf22889a6..57fcf7425ed0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -212,8 +212,6 @@ namespace com { namespace sun { namespace star {
#define SC_DOC_NEW 0xFFFF
#define SC_MACROCALL_ALLOWED 0
-#define SC_MACROCALL_NOTALLOWED 1
-#define SC_MACROCALL_ASK 2
#define SC_ASIANCOMPRESSION_INVALID 0xff
#define SC_ASIANKERNING_INVALID 0xff
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 6d3df3dedec3..4602f19b1c92 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -41,13 +41,11 @@ typedef sal_uLong FltError;
#define eERR_OK ERRCODE_NONE // no error
#define eERR_OPEN SCERR_IMPORT_OPEN
-#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unknown error, historical meaning
#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // out of memory
#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unknown WK? format (Lotus 1-2-3)
#define eERR_FORMAT SCERR_IMPORT_FORMAT // format error during reading (no formula error!)
#define eERR_NI SCERR_IMPORT_NI // filter not implemented
#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unknown BIFF format (Excel)
-#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // not implemented BIFF format
#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // file password protected
#define eERR_INTERN SCERR_IMPORT_INTERNAL // internal error
#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// overflow of cell coordinates
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 28eb5e70bb97..70bc85f59d9d 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -48,7 +48,6 @@ class Color;
// STRING_SCAPP was "scalc3", "scalc4", now just "scalc"
#define STRING_SCAPP "scalc"
-#define STRING_SCSTREAM "StarCalcDocument"
#define STRING_STANDARD "Standard"
@@ -127,7 +126,6 @@ namespace sc
#define OLE_STD_CELLS_X 4
#define OLE_STD_CELLS_Y 5
-#define SC_SIZE_OPTIMUM 0xFFFF
// repaint flags (for messages)
#define PAINT_GRID 1
@@ -264,7 +262,6 @@ const InsertDeleteFlags IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
// step = 10pt, max. indention = 100 steps
#define SC_INDENT_STEP 200
-#define SC_MAX_INDENT 20000
// scenario flags
#define SC_SCENARIO_COPYALL 1
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 6b23f9ab2bef..1e820214e10e 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -53,8 +53,6 @@
// Hilfe IDs fuer Dialoge / Pages (max.70) -----------------------------------
#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR"
-#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS"
-#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS"
#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT"
#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT"
@@ -67,13 +65,6 @@
#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME"
#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME"
-// Funktionsautopilot: nur als Unique-IDs
-#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE"
-#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1"
-#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2"
-#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3"
-#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4"
-
#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT"
#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME"
@@ -81,29 +72,17 @@
#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK"
#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY"
-#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT"
#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE"
#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT"
#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX"
-#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR"
-
-// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) -----------------------
-
-#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS"
-#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE"
-#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW"
-#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT"
-#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW"
// wrong group - HID_SC_DLG_START is full
-#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT"
#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME"
#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT"
-#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT"
#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG"
@@ -112,15 +91,6 @@
#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE"
#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR"
-#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1"
-#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2"
-#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3"
-#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4"
-#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1"
-#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2"
-#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3"
-#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4"
-#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA"
#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION"
#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR"
@@ -128,26 +98,17 @@
#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT"
#define HID_SORT_POSITION "SC_HID_SORT_POSITION"
#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT"
-#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST"
#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE"
#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC"
-#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE"
// Other help IDs (max.70) ---------------------------------------------------
#define HID_SELECTTABLES "SC_HID_SELECTTABLES"
#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN"
-#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME"
-#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL"
-#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS"
-#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED"
-#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED"
-#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED"
-#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED"
// Analysis Addin Functions (max.120) ----------------------------------------
#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY"
@@ -261,39 +222,13 @@
#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS"
#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13"
-#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT"
#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE"
#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN"
#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE"
// sidebar -----------------------------------------
-// AlignmentPropertyPanel -----------------------------------------
-#define HID_PROPERTYPANEL_SC_ALIGN_SECTION "SC_HID_PROPERTYPANEL_SC_ALIGN_SECTION"
-#define HID_PROPERTY_PANEL_ALIGN_TBX_HOR "SC_HID_PROPERTY_PANEL_ALIGN_TBX_HOR"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J"
-#define HID_PROPERTY_PANEL_ALIGN_TBX_VER "SC_HID_PROPERTY_PANEL_ALIGN_TBX_VER"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_T "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_T"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_C "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_C"
-#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_B "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_B"
-#define HID_PROPERTY_PANEL_ALIGN_MBX_INDENT "SC_HID_PROPERTY_PANEL_ALIGN_MBX_INDENT"
-#define HID_PROPERTY_PANEL_ALIGN_CBX_WRAP "SC_HID_PROPERTY_PANEL_ALIGN_CBX_WRAP"
-#define HID_PROPERTY_PANEL_ALIGN_CBX_MERGE "SC_HID_PROPERTY_PANEL_ALIGN_CBX_MERGE"
-#define HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE "SC_HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE"
-#define HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL "SC_HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL"
-#define HID_PROPERTY_PANEL_ALIGN_CBX_VERT "SC_HID_PROPERTY_PANEL_ALIGN_CBX_VERT"
// CellAppearancePropertyPanel -----------------------------------------
-#define HID_PROPERTYPANEL_SC_CELL_SECTION "SC_HID_PROPERTYPANEL_SC_CELL_SECTION"
-#define HID_PROPERTYPANEL_SC_TBX_BORDER "SC_HID_PROPERTYPANEL_SC_TBX_BORDER"
-#define HID_PROPERTYPANEL_SC_TBI_BORDER "SC_HID_PROPERTYPANEL_SC_TBI_BORDER"
-#define HID_PROPERTYPANEL_SC_TBX_STYLE "SC_HID_PROPERTYPANEL_SC_TBX_STYLE"
-#define HID_PROPERTYPANEL_SC_TBI_STYLE "SC_HID_PROPERTYPANEL_SC_TBI_STYLE"
-#define HID_PROPERTYPANEL_SC_TBX_LINECOLOR "SC_HID_PROPERTYPANEL_SC_TBX_LINECOLOR"
-#define HID_PROPERTYPANEL_SC_TBI_LINECOLOR "SC_HID_PROPERTYPANEL_SC_TBI_LINECOLOR"
-#define HID_PROPERTYPANEL_SC_CBOX_SHOWGRID "SC_HID_PROPERTYPANEL_SC_CBOX_SHOWGRID"
#define HID_PROPERTYPANEL_SC_STYLE_VS "SC_HID_PROPERTYPANEL_SC_STYLE_VS"
#define HID_PROPERTYPANEL_SC_STYLE_PB "SC_HID_PROPERTYPANEL_SC_STYLE_PB"
#define HID_PROPERTYPANEL_SC_BORDER1_TBX "SC_HID_PROPERTYPANEL_SC_BORDER1_TBX"
@@ -316,20 +251,6 @@
#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT"
#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT"
-// NumberFormatPropertyPanel -----------------------------------------
-#define HID_PROPERTYPANEL_SC_NUM_SECTION "SC_HID_PROPERTYPANEL_SC_NUM_SECTION"
-#define HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY "SC_HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY"
-#define HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY "SC_HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY"
-#define HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER "SC_HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER"
-#define HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT "SC_HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT"
-#define HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY "SC_HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY"
-#define HID_PROPERTY_PANEL_NUMFMT_ID_DATE "SC_HID_PROPERTY_PANEL_NUMFMT_ID_DATE"
-#define HID_PROPERTY_PANEL_NUMFMT_ID_TEXT "SC_HID_PROPERTY_PANEL_NUMFMT_ID_TEXT"
-#define HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS "SC_HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS"
-#define HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES "SC_HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES"
-#define HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED "SC_HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED"
-#define HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND "SC_HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND"
-
// Ende Hilfe IDs ------------------------------------------------------------
#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL"
@@ -673,7 +594,6 @@
#define HID_FUNC_GAMMAINV_MS "SC_HID_FUNC_GAMMAINV_MS"
#define HID_FUNC_GAMMALN_MS "SC_HID_FUNC_GAMMALN_MS"
#define HID_FUNC_LOGNORMDIST_MS "SC_HID_FUNC_LOGNORMDIST_MS"
-#define HID_FUNC_LOGINV_MS "SC_HID_FUNC_LOGINV_MS"
#define HID_FUNC_NORMDIST_MS "SC_HID_FUNC_NORMDIST_MS"
#define HID_FUNC_NORMINV_MS "SC_HID_FUNC_NORMINV_MS"
#define HID_FUNC_STD_NORMDIST_MS "SC_HID_FUNC_STD_NORMDIST_MS"
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index dfd5cb4e9b70..b5e5cb78da25 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -26,81 +26,14 @@
#define SCID_SIZES 0x4200
-#define SCID_POOLS 0x4210
-#define SCID_DOCPOOL 0x4211
-#define SCID_STYLEPOOL 0x4212
-#define SCID_NEWPOOLS 0x4213 // ID for SC 3.0a
-#define SCID_EDITPOOL 0x4214
-
-#define SCID_DOCUMENT 0x4220
-#define SCID_DOCFLAGS 0x4221
-#define SCID_TABLE 0x4222
-#define SCID_DRAWING 0x4223
-#define SCID_RANGENAME 0x4224
-#define SCID_DBAREAS 0x4225
-#define SCID_PIVOT 0x4226
-#define SCID_CHARTS 0x4227
-#define SCID_NUMFORMAT 0x4228
-#define SCID_DOCOPTIONS 0x4229
-#define SCID_VIEWOPTIONS 0x422a
-#define SCID_PRINTSETUP 0x422b
-#define SCID_CHARSET 0x422c
-#define SCID_NEWDOCUMENT 0x422d // ID for SC 3.0a
-#define SCID_DDELINKS 0x422e
-#define SCID_AREALINKS 0x422f
-#define SCID_CONDFORMATS 0x4230
-#define SCID_VALIDATION 0x4231
-#define SCID_COLNAMERANGES 0x4232
-#define SCID_ROWNAMERANGES 0x4233
-#define SCID_DETOPLIST 0x4234
-#define SCID_CONSOLIDATA 0x4235
-#define SCID_CHANGETRACK 0x4236
-#define SCID_CHGVIEWSET 0x4237
-#define SCID_LINKUPMODE 0x4238
-#define SCID_DATAPILOT 0x4239
-
-#define SCID_COLUMNS 0x4240
-#define SCID_COLROWFLAGS 0x4241
-#define SCID_TABOPTIONS 0x4242
-#define SCID_TABLINK 0x4243
-
-#define SCID_COLDATA 0x4250
-#define SCID_COLNOTES 0x4251
-#define SCID_COLATTRIB 0x4252
-
-#define SCID_DRAWPOOL 0x4260
-#define SCID_DRAWMODEL 0x4261
-
-// file version
-// if the high-byte is incremented, the document won't be opened by older SCs
-#define SC_INITIAL_VERSION 0x0001
-#define SC_FORMULA_LCLVER 0x0002 // formula with local version no.
-
-#define SC_NEW_TOKEN_ARRAYS 0x0003 // new TokenArray format
-#define SC_FORMULA_VALUES 0x0004 // values in formula cells
-#define SC_FORMULA_VALUES2 0x0005 // values in formula cells
-#define SC_DATABYTES 0x0006 // data bytes, small tables
-#define SC_DATABYTES2 0x0007 // data bytes, small tables
-#define SC_NUMFMT 0x0008 // number format of formula cell
-#define SC_NEWIF 0x0009 // new coding of ocIf (komp.)
-
-#define SC_RELATIVE_REFS 0x0010 // relative references
-#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal of formula cell
-#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges as ScRangePair
#define SC_31_EXPORT_VER 0x0012 // version for 3.1-export
// since 4.0
-#define SC_32K_ROWS 0x0100 // 32000 rows - incompatibel
#define SC_FONTCHARSET 0x0101 // Font-CharSets have to be right
-#define SC_40_EXPORT_VER 0x0101 // version for 4.0-Export
// since 5.0
-#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode
#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implicit intersection
-#define SC_VERSION_EDITPOOL 0x0203 // EditCells with EditPool
-#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal of formula cell (true)
// since 5.2
-#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // CONVERT function recalculated on each load
#define SC_CURRENT_VERSION 0x0205
// all above SC_31_EXPORT_VER has to be queried during saving,
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 8cfbd9978909..93a770e1ec58 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -19,20 +19,12 @@
#ifndef INCLUDED_SC_INC_SCCOMMANDS_H
#define INCLUDED_SC_INC_SCCOMMANDS_H
-#define CMD_FID_CHG_ACCEPT ".uno:AcceptChanges"
-#define CMD_FID_ADD_NAME ".uno:AddName"
#define CMD_SID_ADD_PRINTAREA ".uno:AddPrintArea"
#define CMD_SID_DETECTIVE_DEL_ALL ".uno:ClearArrows"
#define CMD_FID_COL_WIDTH ".uno:ColumnWidth"
-#define CMD_FID_USE_NAME ".uno:CreateNames"
#define CMD_SID_CREATE_SW_DRAWVIEW ".uno:CreateSWDrawView"
-#define CMD_SID_OPENDLG_CONSOLIDATE ".uno:DataConsolidate"
#define CMD_SID_OPENDLG_PIVOTTABLE ".uno:DataDataPilotRun"
-#define CMD_SID_SPECIAL_FILTER ".uno:DataFilterSpecialFilter"
-#define CMD_SID_FILTER ".uno:DataFilterStandardFilter"
#define CMD_SID_DATA_SELECT ".uno:DataSelect"
-#define CMD_SID_DEFINE_DBNAME ".uno:DefineDBName"
-#define CMD_FID_DEFINE_NAME ".uno:DefineName"
#define CMD_SID_DEFINE_PRINTAREA ".uno:DefinePrintArea"
#define CMD_FID_DELETE_CELL ".uno:DeleteCell"
#define CMD_FID_DEL_MANUALBREAKS ".uno:DeleteAllBreaks"
@@ -45,10 +37,7 @@
#define CMD_SID_FILL_DEL_SUCC ".uno:FillModeRemoveSuccessor"
#define CMD_SID_FILL_ADD_PRED ".uno:FillModeTracePredescessor"
#define CMD_SID_FILL_ADD_SUCC ".uno:FillModeTraceSuccessor"
-#define CMD_FID_FILL_SERIES ".uno:FillSeries"
#define CMD_FID_CELL_FORMAT ".uno:FormatCellDialog"
-#define CMD_SID_OPENDLG_SOLVE ".uno:GoalSeekDialog"
-#define CMD_SID_OPENDLG_OPTSOLVER ".uno:SolverDialog"
#define CMD_FID_TABLE_HIDE ".uno:Hide"
#define CMD_FID_COL_HIDE ".uno:HideColumn"
#define CMD_FID_ROW_HIDE ".uno:HideRow"
@@ -56,8 +45,6 @@
#define CMD_FID_INS_CELL ".uno:InsertCell"
#define CMD_FID_INS_COLBRK ".uno:InsertColumnBreak"
#define CMD_FID_INS_COLUMN ".uno:InsertColumns"
-#define CMD_FID_INS_CELL_CONTENTS ".uno:InsertContents"
-#define CMD_FID_INSERT_NAME ".uno:InsertName"
#define CMD_FID_INS_ROWBRK ".uno:InsertRowBreak"
#define CMD_FID_INS_ROW ".uno:InsertRows"
#define CMD_FID_MERGE_ON ".uno:MergeCells"
@@ -65,7 +52,6 @@
#define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
#define CMD_FID_TAB_MOVE ".uno:Move"
#define CMD_SID_PREVIEW_NEXT ".uno:NextPage"
-#define CMD_FID_NOTE_VISIBLE ".uno:NoteVisible"
#define CMD_FID_SHOW_NOTE ".uno:ShowNote"
#define CMD_FID_HIDE_NOTE ".uno:HideNote"
#define CMD_SID_DELETE_NOTE ".uno:DeleteNote"
@@ -82,7 +68,6 @@
#define CMD_SID_CELL_FORMAT_RESET ".uno:ResetAttributes"
#define CMD_FID_RESET_PRINTZOOM ".uno:ResetPrintZoom"
#define CMD_FID_ROW_HEIGHT ".uno:RowHeight"
-#define CMD_SID_SELECT_DB ".uno:SelectDB"
#define CMD_SID_ANCHOR_CELL ".uno:SetAnchorToCell"
#define CMD_SID_ANCHOR_PAGE ".uno:SetAnchorToPage"
#define CMD_FID_COL_OPT_WIDTH ".uno:SetOptimalColumnWidth"
@@ -91,7 +76,6 @@
#define CMD_FID_COL_SHOW ".uno:ShowColumn"
#define CMD_FID_ROW_SHOW ".uno:ShowRow"
#define CMD_SID_TEXT_STANDARD ".uno:StandardTextAttributes"
-#define CMD_SID_OPENDLG_TABOP ".uno:TableOperationDialog"
#define CMD_FID_TAB_MENU_RENAME ".uno:RenameTable"
#define CMD_FID_TAB_SELECTALL ".uno:TableSelectAll"
#define CMD_FID_TAB_DESELECTALL ".uno:TableDeselectAll"
@@ -100,12 +84,9 @@
#define CMD_SID_ULINE_VAL_DOUBLE ".uno:UnderlineDouble"
#define CMD_SID_DP_FILTER ".uno:DataPilotFilter"
#define CMD_FID_TAB_RTL ".uno:SheetRightToLeft"
-#define CMD_SID_SHARE_DOC ".uno:ShareDocument"
#define CMD_FID_TAB_EVENTS ".uno:TableEvents"
#define CMD_FID_TAB_MENU_SET_TAB_BG_COLOR ".uno:SetTabBgColor"
#define CMD_FID_TAB_SET_TAB_BG_COLOR ".uno:TabBgColor"
-#define CMD_SID_MANAGE_XML_SOURCE ".uno:ManageXMLSource"
-#define CMD_SID_CONVERT_FORMULA_TO_VALUE ".uno:ConvertFormulaToValue"
#endif
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index aaead415849b..73ab29378b32 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -194,7 +194,6 @@
// #i66550 HLINK_FOR_SHAPES
#define SC_UNONAME_HYPERLINK "Hyperlink"
#define SC_UNONAME_MOVEPROTECT "MoveProtect"
-#define SC_UNONAME_SIZEPROTECT "SizeProtect"
// other cell properties
#define SC_UNONAME_CHCOLHDR "ChartColumnAsLabel"
@@ -282,7 +281,6 @@
#define SC_UNONAME_SRCOBJ "SourceObject"
#define SC_UNONAME_SRCTYPE "SourceType"
#define SC_UNONAME_STRIPDAT "StripData"
-#define SC_UNONAME_UNIQUE "UniqueOnly"
#define SC_UNONAME_USEREGEX "UseRegularExpressions"
#define SC_UNONAME_ULIST "UserListEnabled"
#define SC_UNONAME_UINDEX "UserListIndex"
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index edfcf9b9425d..5083c989a105 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -32,7 +32,6 @@
#define SC_UD_OBJDATA 1
#define SC_UD_IMAPDATA 2
#define SC_UD_MACRODATA 3
-#define SC_UD_ALTOBJDATA 4
class ScDrawObjFactory
{
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index 204139b36a3c..121b7a22287b 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -72,8 +72,6 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06;
#define EXC_CHTR_OP_MOVE 0x0004
#define EXC_CHTR_OP_INSTAB 0x0005
#define EXC_CHTR_OP_CELL 0x0008
-#define EXC_CHTR_OP_RENAME 0x0009
-#define EXC_CHTR_OP_NAME 0x000A
#define EXC_CHTR_OP_FORMAT 0x000B
#define EXC_CHTR_OP_UNKNOWN 0xFFFF
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index fc6af9a43fc7..d3c291c63495 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -71,13 +71,11 @@
#define atStrikeOut 8
// Horizontal alignment
-#define hjNone 0
#define hjLeft 1
#define hjCenter 2
#define hjRight 3
// Vertical alignment
-#define vjNone 0
#define vjTop 1
#define vjCenter 2
#define vjBottom 3
@@ -93,7 +91,6 @@
#define raGray25 2
#define raGray50 3
#define raGray75 4
-#define raGray100 5
// Cell protection
#define paProtect 1
@@ -118,7 +115,6 @@
#define vfExponentRed 13
#define vfFormula 14
#define vfString 15
-#define vfNone 16
// Date format flags
#define df_NDMY_Long 0
@@ -154,28 +150,17 @@
#define dfFormula 0x0001 // formula
#define dfZerro 0x0002 // zero values
#define dfGrid 0x0004 // grid
-#define dfPageBreak 0x0008 // PageBreak
-#define dfColRowBar 0x0010 // Row/Col heads (Dummy)
#define dfSyntax 0x0020 // Syntax Highlighting
-#define dfPrintPage 0x0040 // PrintView (Dummy)
#define dfObjectAll 0x0080 // show objects
#define dfObjectFrame 0x0100 // objects as place holder
#define dfObjectNone 0x0200 // do not show objects
#define dfNoteMark 0x0400 // NoteMark
-#define dfProtectMark 0x0800 // ProtectMark
// Object types
-#define otNone 0 // see below
#define otOle 1
#define otImage 2
#define otChart 3
-// Grafic types
-#define gtNone 0 // not possible
-#define gtOle 1 // Ole 1.0 Object
-#define gtImage 2 // Image (Bitmap or Metafile)
-#define gtChart 3 // Chart
-
// Date/Time
struct Sc10DateTime
{
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 93e523f6e13e..1d7f72cc754d 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -69,7 +69,6 @@ class XclRoot;
#define EXC_CHPROP_CROSSOVERVALUE "CrossoverValue"
#define EXC_CHPROP_CURVESTYLE "CurveStyle"
#define EXC_CHPROP_CURVENAME "CurveName"
-#define EXC_CHPROP_D3DCAMERAGEOMETRY "D3DCameraGeometry"
#define EXC_CHPROP_D3DSCENEAMBIENTCOLOR "D3DSceneAmbientColor"
#define EXC_CHPROP_D3DSCENELIGHTON1 "D3DSceneLightOn1"
#define EXC_CHPROP_D3DSCENELIGHTCOLOR2 "D3DSceneLightColor2"
@@ -77,7 +76,6 @@ class XclRoot;
#define EXC_CHPROP_D3DSCENELIGHTON2 "D3DSceneLightOn2"
#define EXC_CHPROP_D3DSCENEPERSPECTIVE "D3DScenePerspective"
#define EXC_CHPROP_D3DSCENESHADEMODE "D3DSceneShadeMode"
-#define EXC_CHPROP_D3DTRANSFORMMATRIX "D3DTransformMatrix"
#define EXC_CHPROP_DISPLAYLABELS "DisplayLabels"
#define EXC_CHPROP_ERRORBARSTYLE "ErrorBarStyle"
#define EXC_CHPROP_ERRORBARX "ErrorBarX"
@@ -86,12 +84,9 @@ class XclRoot;
#define EXC_CHPROP_EXPTIMEINCREMENT "ExplicitTimeIncrement"
#define EXC_CHPROP_EXTRAPOLATE_FORWARD "ExtrapolateForward"
#define EXC_CHPROP_EXTRAPOLATE_BACKWARD "ExtrapolateBackward"
-#define EXC_CHPROP_FILLBITMAPMODE "FillBitmapMode"
-#define EXC_CHPROP_FILLSTYLE "FillStyle"
#define EXC_CHPROP_FORCE_INTERCEPT "ForceIntercept"
#define EXC_CHPROP_GAPWIDTHSEQ "GapwidthSequence"
#define EXC_CHPROP_GEOMETRY3D "Geometry3D"
-#define EXC_CHPROP_HASMAINTITLE "HasMainTitle"
#define EXC_CHPROP_INCLUDEHIDDENCELLS "IncludeHiddenCells"
#define EXC_CHPROP_INTERCEPT_VALUE "InterceptValue"
#define EXC_CHPROP_JAPANESE "Japanese"
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
index 02dd648c91d4..135f569de5c0 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.hrc
@@ -23,7 +23,5 @@
#define BTN_CANCEL 2
#define BTN_HELP 3
-#define LB_DIMS 10
-#define FT_DIMS 11
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 5bbab26c8457..bd86eff3efe8 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -36,7 +36,6 @@ class SdrObject;
// Return values for command
#define SC_CMD_NONE 0
#define SC_CMD_USED 1
-#define SC_CMD_IGNORE 2
/** Base class for all functions */
class FuPoor
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 56f7aeeb2e91..ad90be7f248d 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -19,9 +19,6 @@
#include "sc.hrc"
-#define STR_BTN_CLOSE 200
-#define STR_GROUP 1
-#define STR_UNGROUP 2
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 1b99dd51da22..2e8d51eb575e 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -46,7 +46,6 @@ class FmFormView;
#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM)
#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT)
-#define PRINT_HEADER_FONTHEIGHT 200
// Settings for headers/footers
struct ScPrintHFParam
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 515bc67a4f75..233c60a8001b 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -27,7 +27,6 @@
#include <boost/scoped_ptr.hpp>
-#define SC_SMALL3DSHADOW COL_BLACK
#define SC_SIZE_NONE 65535
const SCCOL SC_TABSTART_NONE = SCCOL_MAX;
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index bfcdc50567b8..3e12f4345472 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -114,9 +114,7 @@
#define STR_3DOBJECTBARSHELL RID_GLOB_START+104
#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105
-#define STR_SIDEBARVIEWSHELL RID_GLOB_START+107
#define STR_MASTERPAGESSELECTOR RID_GLOB_START+108
-#define STR_SIDEBAR_LAYOUTMENU RID_GLOB_START+109
#define STR_PAGE_NAME RID_GLOB_START+111
#define STR_SLIDE_NAME RID_GLOB_START+112
@@ -137,7 +135,6 @@
#define DLG_TABLEDESIGNPANE RID_GLOB_START+224
-#define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226
#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227
#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index e7da3a4a3c69..e229e9a2efd9 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -25,37 +25,23 @@
#define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0
#define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1
-#define SD_IF_SDVIEWSHELL SFX_INTERFACE_SD_START + 2
#define SD_IF_SDDRAWVIEWSHELL SFX_INTERFACE_SD_START + 3
-#define SD_IF_SDSLIDEVIEWSHELL SFX_INTERFACE_SD_START + 4
#define SD_IF_SDOUTLINEVIEWSHELL SFX_INTERFACE_SD_START + 5
-#define SD_IF_SDDRAWSTDOBJECTBAR SFX_INTERFACE_SD_START + 6
#define SD_IF_SDDRAWTEXTOBJECTBAR SFX_INTERFACE_SD_START + 7
#define SD_IF_SDDRAWBEZIEROBJECTBAR SFX_INTERFACE_SD_START + 8
-#define SD_IF_SDDRAWGLUEPOINTSOBJECTBAR SFX_INTERFACE_SD_START + 9
#define SD_IF_SDGRAPHICDOCSHELL SFX_INTERFACE_SD_START + 10
#define SD_IF_SDGRAPHICVIEWSHELL SFX_INTERFACE_SD_START + 11
-#define SD_IF_SDGRAPHICSTDOBJECTBAR SFX_INTERFACE_SD_START + 12
#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13
#define SD_IF_SDPRESVIEWSHELL SFX_INTERFACE_SD_START + 14
-#define SD_IF_SDPREVIEWVIEWSHELL SFX_INTERFACE_SD_START + 15
#define SD_IF_SDVIEWSHELLBASE SFX_INTERFACE_SD_START + 16
-#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17
-#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18
#define SD_IF_SDSLIDESORTERVIEWSHELL SFX_INTERFACE_SD_START + 19
-#define SD_IF_SDSIDEBARVIEWSHELL SFX_INTERFACE_SD_START + 20
-#define SD_IF_SDMASTERPAGESSELECTOR SFX_INTERFACE_SD_START + 21
-#define SD_IF_SDLAYOUTMENU SFX_INTERFACE_SD_START + 22
#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23
#define SD_IF_SDLEFTIMPRESSPANESHELL SFX_INTERFACE_SD_START + 24
#define SD_IF_SDLEFTDRAWPANESHELL SFX_INTERFACE_SD_START + 25
-#define SD_IF_SDRIGHTPANESHELL SFX_INTERFACE_SD_START + 26
#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27
-#define SD_IF_SDANNOTATIONSHELL SFX_INTERFACE_SD_START + 28
#define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29
#define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30
-#define SD_IF_SDTASKPANEVIEWSHELL SFX_INTERFACE_SD_START + 31
// Inventor-Id for StarDraw UserData
const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 51421d02de4c..c24b66273d74 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -23,26 +23,9 @@
#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL"
#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL"
#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL"
-#define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP"
-#define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED"
-#define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG"
-#define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE"
-#define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE"
-#define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER"
-#define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW"
-#define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE"
-#define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE"
-#define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES"
-#define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT"
#define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT"
-#define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT"
-#define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW"
-#define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL"
#define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB"
#define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR"
-#define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS"
-#define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS"
-#define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE"
#define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX"
#define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB"
#define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN"
@@ -65,7 +48,6 @@
#define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION"
-#define HID_SD_BTN_PRESENTATION "SD_HID_SD_BTN_PRESENTATION"
#define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1"
#define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2"
@@ -74,51 +56,19 @@
#define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5"
#define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6"
-#define HID_SD_CHGFOIL_LAYOUT "SD_HID_SD_CHGFOIL_LAYOUT"
-#define HID_SD_CHGFOIL_BACKGROUND "SD_HID_SD_CHGFOIL_BACKGROUND"
-#define HID_SD_CHGFOIL_OBJECTS "SD_HID_SD_CHGFOIL_OBJECTS"
-#define HID_SD_CHGFOIL_NAME "SD_HID_SD_CHGFOIL_NAME"
-#define HID_FM_CTL_SELECTION "SD_HID_FM_CTL_SELECTION"
#define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES"
#define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS"
-#define HID_SD_UNDODELETEWARNING_DLG "SD_HID_SD_UNDODELETEWARNING_DLG"
-#define HID_SD_UNDODELETEWARNING_CBX "SD_HID_SD_UNDODELETEWARNING_CBX"
#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT"
#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE"
#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND"
-#define HID_SD_TASK_PANE "SD_HID_SD_TASK_PANE"
-#define HID_SD_SLIDE_DESIGNS "SD_HID_SD_SLIDE_DESIGNS"
-#define HID_SD_CURRENT_MASTERS "SD_HID_SD_CURRENT_MASTERS"
-#define HID_SD_RECENT_MASTERS "SD_HID_SD_RECENT_MASTERS"
-#define HID_SD_ALL_MASTERS "SD_HID_SD_ALL_MASTERS"
-#define HID_SD_SLIDE_LAYOUTS "SD_HID_SD_SLIDE_LAYOUTS"
-#define HID_SD_CUSTOM_ANIMATIONS "SD_HID_SD_CUSTOM_ANIMATIONS"
-#define HID_SD_SLIDE_TRANSITIONS "SD_HID_SD_SLIDE_TRANSITIONS"
-
-#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES"
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL"
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY"
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW"
-#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW"
-
-#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS"
-#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED"
-#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND"
-#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND"
-#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE"
-#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO"
-#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER"
-#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL"
-#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY"
-#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW"
-#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW"
-
-#define HID_SD_TASK_PANE_VIEW_MENU "SD_HID_SD_TASK_PANE_VIEW_MENU"
+
+
+
#define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"
#define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT"
#define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL"
@@ -133,13 +83,10 @@
#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"
#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"
-#define HID_SD_SLIDESHOW_DISPLAY "SD_HID_SD_SLIDESHOW_DISPLAY"
#define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL"
#define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL"
-#define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN"
-#define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS"
#define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC"
#define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD"
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 94dc73ec9414..8ba4028bf50e 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -61,7 +61,6 @@
#define ATTR_PRESENT_CHANGE_PAGE ATTR_PRESENT_START + 8
#define ATTR_PRESENT_ALWAYS_ON_TOP ATTR_PRESENT_START + 9
#define ATTR_PRESENT_FULLSCREEN ATTR_PRESENT_START + 10
-#define ATTR_PRESENT_START_ACTUAL_PAGE ATTR_PRESENT_START + 11
#define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12
#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13
#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 276bf6dd62c6..2f4bf56121ef 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -21,7 +21,6 @@
#define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
#define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects"
-#define CMD_SID_ANIMATION_OBJECTS ".uno:AnimationObjects"
#define CMD_SID_MOREBACK ".uno:Backward"
#define CMD_SID_BEFORE_OBJ ".uno:BeforeObject"
#define CMD_SID_BEHIND_OBJ ".uno:BehindObject"
@@ -38,21 +37,10 @@
#define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast"
#define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap"
#define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile"
-#define CMD_SID_CONVERT_TO_1BIT_MATRIX ".uno:ConvertTo1BitMatrix"
-#define CMD_SID_CONVERT_TO_1BIT_THRESHOLD ".uno:ConvertTo1BitThreshold"
-#define CMD_SID_CONVERT_TO_4BIT_COLORS ".uno:ConvertTo4BitColors"
-#define CMD_SID_CONVERT_TO_4BIT_GRAYS ".uno:ConvertTo4BitGrays"
-#define CMD_SID_CONVERT_TO_8BIT_COLORS ".uno:ConvertTo8BitColors"
-#define CMD_SID_CONVERT_TO_8BIT_GRAYS ".uno:ConvertTo8BitGrays"
-#define CMD_SID_CONVERT_TO_24BIT ".uno:ConvertToTrueColor"
-#define CMD_SID_COPYOBJECTS ".uno:CopyObjects"
-#define CMD_SID_CUSTOMSHOW_DLG ".uno:CustomShowDialog"
#define CMD_SID_DELETE_LAYER ".uno:DeleteLayer"
#define CMD_SID_DELETE_PAGE ".uno:DeletePage"
#define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem"
-#define CMD_SID_DIAMODE ".uno:DiaMode"
#define CMD_SID_DISMANTLE ".uno:Dismantle"
-#define CMD_SID_DRAWINGMODE ".uno:DrawingMode"
#define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation"
#define CMD_SID_MOREFRONT ".uno:Forward"
#define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom"
@@ -83,19 +71,14 @@
#define CMD_SID_MODIFYLAYER ".uno:ModifyLayer"
#define CMD_SID_MODIFYPAGE ".uno:ModifyPage"
#define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject"
-#define CMD_SID_POLYGON_MORPHING ".uno:Morphing"
#define CMD_SID_NAME_GROUP ".uno:NameGroup"
#define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription"
#define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting"
#define CMD_SID_NOTESMODE ".uno:NotesMode"
#define CMD_SID_POSITION ".uno:ObjectPosition"
#define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize"
-#define CMD_SID_OUTLINEMODE ".uno:OutlineMode"
#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit"
#define CMD_SID_PAGESETUP ".uno:PageSetup"
-#define CMD_SID_PRESENTATION ".uno:Presentation"
-#define CMD_SID_PRESENTATION_CURRENT_SLIDE ".uno:PresentationCurrentSlide"
-#define CMD_SID_REMOTE_DLG ".uno:Remote"
#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
#define CMD_SID_RENAMELAYER ".uno:RenameLayer"
#define CMD_SID_RENAMEPAGE ".uno:RenamePage"
@@ -117,8 +100,6 @@
#define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview"
#define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster"
#define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage"
-#define CMD_SID_PHOTOALBUM ".uno:PhotoAlbumDialog"
-#define CMD_SID_PRESENTATION_MINIMIZER ".uno:PresentationMinimizer"
#define CMD_SID_HIDE_LAST_LEVEL ".uno:HideLastLevel"
#define CMD_SID_SHOW_NEXT_LEVEL ".uno:ShowNextLevel"
diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx
index e4f88bb18a2b..4bad4320561d 100644
--- a/sd/source/filter/eppt/epptdef.hxx
+++ b/sd/source/filter/eppt/epptdef.hxx
@@ -20,52 +20,25 @@
#ifndef INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX
#define INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX
-#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record
- // header takes on this value, the
- // record header marks the start of
- // a container.
-
-#define EPP_Unknown 0
-#define EPP_SubContainerCompleted 1
-#define EPP_IRRAtom 2
-#define EPP_PSS 3
-#define EPP_SubContainerException 4
-#define EPP_ClientSignal1 6
-#define EPP_ClientSignal2 7
-#define EPP_PowerPointStateInfoAtom 10
#define EPP_Document 1000
#define EPP_DocumentAtom 1001
#define EPP_EndDocument 1002
-#define EPP_SlidePersist 1003
-#define EPP_SlideBase 1004
-#define EPP_SlideBaseAtom 1005
#define EPP_Slide 1006
#define EPP_SlideAtom 1007
#define EPP_Notes 1008
#define EPP_NotesAtom 1009
#define EPP_Environment 1010
#define EPP_SlidePersistAtom 1011 //0x03F3
-#define EPP_Scheme 1012
-#define EPP_SchemeAtom 1013
-#define EPP_DocViewInfo 1014
-#define EPP_SslideLayoutAtom 1015
#define EPP_MainMaster 1016
#define EPP_SSSlideInfoAtom 1017
#define EPP_SlideViewInfo 1018
#define EPP_GuideAtom 1019
-#define EPP_ViewInfo 1020
#define EPP_ViewInfoAtom 1021
#define EPP_SlideViewInfoAtom 1022
#define EPP_VBAInfo 1023
#define EPP_VBAInfoAtom 1024
#define EPP_SSDocInfoAtom 1025
-#define EPP_Summary 1026
-#define EPP_Texture 1027
-#define EPP_VBASlideInfo 1028
-#define EPP_VBASlideInfoAtom 1029
-#define EPP_DocRoutingSlip 1030
#define EPP_OutlineViewInfo 1031
-#define EPP_SorterViewInfo 1032
#define EPP_ExObjList 1033
#define EPP_ExObjListAtom 1034
#define EPP_PPDrawingGroup 1035
@@ -75,47 +48,26 @@
#define EPP_NamedShowSlides 1042
#define EPP_List 2000
#define EPP_FontCollection 2005
-#define EPP_ListPlaceholder 2017
-#define EPP_BookmarkCollection 2019
#define EPP_SoundCollection 2020
#define EPP_SoundCollAtom 2021
#define EPP_Sound 2022
#define EPP_SoundData 2023
-#define EPP_BookmarkSeedAtom 2025
-#define EPP_GuideList 2026
-#define EPP_RunArray 2028
-#define EPP_RunArrayAtom 2029
-#define EPP_ArrayElementAtom 2030
-#define EPP_Int4ArrayAtom 2031
#define EPP_ColorSchemeAtom 2032
// these atoms first was seen in ppt2000 in a private Tag atom
#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041
-#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic
-#define EPP_OEShape 3008
#define EPP_ExObjRefAtom 3009
#define EPP_OEPlaceholderAtom 3011
-#define EPP_GrColor 3020
-#define EPP_GrectAtom 3025
-#define EPP_GratioAtom 3031
-#define EPP_Gscaling 3032
-#define EPP_GpointAtom 3034
-#define EPP_OEShapeAtom 3035
-#define EPP_OutlineTextRefAtom 3998
#define EPP_TextHeaderAtom 3999
#define EPP_TextCharsAtom 4000
#define EPP_StyleTextPropAtom 4001
#define EPP_BaseTextPropAtom 4002
#define EPP_TxMasterStyleAtom 4003
#define EPP_TxCFStyleAtom 4004
-#define EPP_TxPFStyleAtom 4005
#define EPP_TextRulerAtom 4006
-#define EPP_TextBookmarkAtom 4007
-#define EPP_TextBytesAtom 4008
#define EPP_TxSIStyleAtom 4009
#define EPP_TextSpecInfoAtom 4010
-#define EPP_DefaultRulerAtom 4011
// these atoms first was seen in ppt2000 in a private Tag atom
#define EPP_PST_ExtendedParagraphAtom 4012
@@ -125,52 +77,24 @@
// the first sal_uInt32 in this atom indices the current slideId
#define EPP_FontEnityAtom 4023
-#define EPP_FontEmbedData 4024
-#define EPP_TypeFace 4025
#define EPP_CString 4026
-#define EPP_ExternalObject 4027
-#define EPP_MetaFile 4033
-#define EPP_ExOleObj 4034
#define EPP_ExOleObjAtom 4035
-#define EPP_ExPlainLinkAtom 4036
-#define EPP_CorePict 4037
-#define EPP_CorePictAtom 4038
-#define EPP_ExPlainAtom 4039
#define EPP_SrKinsoku 4040
-#define EPP_Handout 4041
#define EPP_ExEmbed 4044
#define EPP_ExEmbedAtom 4045
-#define EPP_ExLink 4046
-#define EPP_ExLinkAtom_old 4047
-#define EPP_BookmarkEntityAtom 4048
-#define EPP_ExLinkAtom 4049
#define EPP_SrKinsokuAtom 4050
#define EPP_ExHyperlinkAtom 4051
-#define EPP_ExPlain 4053
-#define EPP_ExPlainLink 4054
#define EPP_ExHyperlink 4055
#define EPP_SlideNumberMCAtom 4056
#define EPP_HeadersFooters 4057
#define EPP_HeadersFootersAtom 4058
-#define EPP_RecolorEntryAtom 4062
#define EPP_TxInteractiveInfoAtom 4063
-#define EPP_EmFormatAtom 4065
-#define EPP_CharFormatAtom 4066
-#define EPP_ParaFormatAtom 4067
-#define EPP_MasterText 4068
-#define EPP_RecolorInfoAtom 4071
-#define EPP_ExQuickTime 4073
-#define EPP_ExQuickTimeMovie 4074
-#define EPP_ExQuickTimeMovieData 4075
-#define EPP_ExSubscription 4076
-#define EPP_ExSubscriptionSection 4077
#define EPP_ExControl 4078
#define EPP_ExControlAtom 4091
#define EPP_SlideListWithText 4080 // 0x0FF0
#define EPP_AnimationInfoAtom 4081
#define EPP_InteractiveInfo 4082
#define EPP_InteractiveInfoAtom 4083
-#define EPP_SlideList 4084
#define EPP_UserEditAtom 4085
#define EPP_CurrentUserAtom 4086
#define EPP_DateTimeMCAtom 4087
@@ -179,35 +103,19 @@
#define EPP_FooterMCAtom 4090
#define EPP_ExMediaAtom 4100
#define EPP_ExVideo 4101
-#define EPP_ExAviMovie 4102
#define EPP_ExMCIMovie 4103
-#define EPP_ExMIDIAudio 4109
-#define EPP_ExCDAudio 4110
-#define EPP_ExWAVAudioEmbedded 4111
-#define EPP_ExWAVAudioLink 4112
#define EPP_ExOleObjStg 4113
-#define EPP_ExCDAudioAtom 4114
-#define EPP_ExWAVAudioEmbeddedAtom 4115
#define EPP_AnimationInfo 4116
-#define EPP_RTFDateTimeMCAtom 4117
#define EPP_ProgTags 5000
-#define EPP_ProgStringTag 5001
#define EPP_ProgBinaryTag 5002
#define EPP_BinaryTagData 5003
-#define EPP_PrintOptions 6000
-#define EPP_PersistPtrFullBlock 6001
#define EPP_PersistPtrIncrementalBlock 6002
-#define EPP_RulerIndentAtom 10000
-#define EPP_GscalingAtom 10001
-#define EPP_GrColorAtom 10002
-#define EPP_GLPointAtom 10003
#define EPP_Comment10 12000
#define EPP_CommentAtom10 12001
#define EPP_PLACEHOLDER_NONE 0 // 0 None
#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title
#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body
-#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title
#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle
#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image
#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image
@@ -216,20 +124,8 @@
#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer
#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header
#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object
-#define EPP_PLACEHOLDER_TITLE 13 // 12 Title
-#define EPP_PLACEHOLDER_BODY 14 // 13 Body
#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body
-#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title
-#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle
-#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title
-#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body
#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image
-#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size)
-#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph
-#define EPP_PLACEHOLDER_TABLE 21 // 22 Table
-#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art
-#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart
-#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip
#define EPP_TEXTTYPE_Title 0
#define EPP_TEXTTYPE_Body 1
@@ -242,10 +138,8 @@
#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide )
#define EPP_SLIDESIZE_TYPEONSCREEN 0
-#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1
#define EPP_SLIDESIZE_TYPEA4PAPER 2
#define EPP_SLIDESIZE_TYPE35MM 3
-#define EPP_SLIDESIZE_TYPEOVERHEAD 4
#define EPP_SLIDESIZE_TYPEBANNER 5
#define EPP_SLIDESIZE_TYPECUSTOM 6
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index bb633fbade2a..eba3086029b8 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -41,11 +41,8 @@
#include <boost/scoped_ptr.hpp>
#define PUB_LOWRES_WIDTH 640
-#define PUB_LOWRES_HEIGHT 480
#define PUB_MEDRES_WIDTH 800
-#define PUB_MEDRES_HEIGHT 600
#define PUB_HIGHRES_WIDTH 1024
-#define PUB_HIGHRES_HEIGHT 768
#define PUB_THUMBNAIL_WIDTH 256
#define PUB_THUMBNAIL_HEIGHT 192
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index 7d2ea78f2581..ed968bca3ff2 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -36,27 +36,12 @@
#define PID_TEMPLATE 0x07
#define PID_LASTAUTHOR 0x08
#define PID_REVNUMBER 0x09
-#define PID_EDITTIME 0x0a
-#define PID_LASTPRINTED_DTM 0x0b
#define PID_CREATE_DTM 0x0c
-#define PID_LASTSAVED_DTM 0x0d
// DocumentSummaryInformation
-#define PID_CATEGORY 0x02
-#define PID_PRESFORMAT 0x03
-#define PID_BYTECOUNT 0x04
-#define PID_LINECOUNT 0x05
-#define PID_PARACOUNT 0x06
#define PID_SLIDECOUNT 0x07
-#define PID_NOTECOUNT 0x08
-#define PID_HIDDENCOUNT 0x09
-#define PID_MMCLIPCOUNT 0x0a
-#define PID_SCALE 0x0b
#define PID_HEADINGPAIR 0x0c
#define PID_DOCPARTS 0x0d
-#define PID_MANAGER 0x0e
-#define PID_COMPANY 0x0f
-#define PID_LINKSDIRTY 0x10
#define VT_EMPTY 0
#define VT_NULL 1
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 61f4dd0d1d56..a3ce85b949f0 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -30,7 +30,6 @@
// Option ranges
-#define SD_OPTIONS_NONE 0x00000000
#define SD_OPTIONS_ALL 0xffffffff
#define SD_OPTIONS_LAYOUT 0x00000001
diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx
index cb20a4af2882..d0af59c17a9c 100644
--- a/sd/source/ui/inc/unoprnms.hxx
+++ b/sd/source/ui/inc/unoprnms.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_UNOPRNMS_HXX
#define INCLUDED_SD_SOURCE_UI_INC_UNOPRNMS_HXX
-#define UNO_NAME_MODEL_LANGUAGE "CharLocale"
-#define UNO_NAME_MODEL_TABSTOP "TabStop"
#define UNO_NAME_PAGE_BACKGROUND "Background"
#define UNO_NAME_PAGE_LEFT "BorderLeft"
@@ -33,7 +31,6 @@
#define UNO_NAME_PAGE_HEIGHT "Height"
#define UNO_NAME_PAGE_LAYOUT "Layout"
#define UNO_NAME_PAGE_NUMBER "Number"
-#define UNO_NAME_PAGE_OBJECTS "Objects"
#define UNO_NAME_PAGE_ORIENTATION "Orientation"
#define UNO_NAME_PAGE_SPEED "Speed"
#define UNO_NAME_PAGE_WIDTH "Width"
@@ -67,18 +64,6 @@
#define UNO_NAME_LAYER_VISIBLE "IsVisible"
#define UNO_NAME_LAYER_NAME "Name"
-#define UNO_NAME_SHOW_ALLOWANIM "AllowAnimations"
-#define UNO_NAME_SHOW_CUSTOMSHOW "CustomShow"
-#define UNO_NAME_SHOW_FIRSTPAGE "FirstPage"
-#define UNO_NAME_SHOW_ONTOP "IsAlwaysOnTop"
-#define UNO_NAME_SHOW_AUTOMATIC "IsAutomatic"
-#define UNO_NAME_SHOW_ENDLESS "IsEndless"
-#define UNO_NAME_SHOW_FULLSCREEN "IsFullScreen"
-#define UNO_NAME_SHOW_MOUSEVISIBLE "IsMouseVisible"
-#define UNO_NAME_SHOW_PAGERANGE "PageRange"
-#define UNO_NAME_SHOW_PAUSE "Pause"
-#define UNO_NAME_SHOW_STARTWITHNAV "StartWithNavigator"
-#define UNO_NAME_SHOW_USEPEN "UsePen"
#define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards"
#define UNO_NAME_SEARCH_CASE "SearchCaseSensitive"
@@ -87,7 +72,6 @@
#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName"
#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap"
-#define UNO_NAME_STYLE_FAMILY "Family"
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
index 612b6eeeda2f..88d913fa25d0 100644
--- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
@@ -381,10 +381,7 @@ extern "C" {
#endif
#define LF '\n'
-#define CRSTR "\r"
-#define LFSTR "\n"
#define CRLF "\r\n"
-#define CRCR "\r\r"
#if 0
#pragma mark == Compatibility ==
@@ -1107,22 +1104,10 @@ typedef int32_t Duration;
// Seconds <-> Minutes <-> Hours <-> Days <-> Weeks <-> Months <-> Years conversions
-#define kNanosecondsPerMicrosecond 1000
-#define kNanosecondsPerMillisecond 1000000
-#define kNanosecondsPerSecond 1000000000
-#define kMicrosecondsPerSecond 1000000
-#define kMicrosecondsPerMillisecond 1000
-#define kMillisecondsPerSecond 1000
-#define kSecondsPerMinute 60
#define kSecondsPerHour ( 60 * 60 ) // 3600
#define kSecondsPerDay ( 60 * 60 * 24 ) // 86400
#define kSecondsPerWeek ( 60 * 60 * 24 * 7 ) // 604800
-#define kMinutesPerHour 60
#define kMinutesPerDay ( 60 * 24 ) // 1440
-#define kHoursPerDay 24
-#define kDaysPerWeek 7
-#define kWeeksPerYear 52
-#define kMonthsPerYear 12
/*! @defined VersionStages
@@ -1219,262 +1204,6 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight );
#define hex_digit8( a ) HEX_DIGIT_ ## a
#define hex_digit4( a ) HEX_DIGIT_ ## 0000 ## a
-#define HEX_DIGIT_00000000 00
-#define HEX_DIGIT_00000001 01
-#define HEX_DIGIT_00000010 02
-#define HEX_DIGIT_00000011 03
-#define HEX_DIGIT_00000100 04
-#define HEX_DIGIT_00000101 05
-#define HEX_DIGIT_00000110 06
-#define HEX_DIGIT_00000111 07
-#define HEX_DIGIT_00001000 08
-#define HEX_DIGIT_00001001 09
-#define HEX_DIGIT_00001010 0A
-#define HEX_DIGIT_00001011 0B
-#define HEX_DIGIT_00001100 0C
-#define HEX_DIGIT_00001101 0D
-#define HEX_DIGIT_00001110 0E
-#define HEX_DIGIT_00001111 0F
-#define HEX_DIGIT_00010000 10
-#define HEX_DIGIT_00010001 11
-#define HEX_DIGIT_00010010 12
-#define HEX_DIGIT_00010011 13
-#define HEX_DIGIT_00010100 14
-#define HEX_DIGIT_00010101 15
-#define HEX_DIGIT_00010110 16
-#define HEX_DIGIT_00010111 17
-#define HEX_DIGIT_00011000 18
-#define HEX_DIGIT_00011001 19
-#define HEX_DIGIT_00011010 1A
-#define HEX_DIGIT_00011011 1B
-#define HEX_DIGIT_00011100 1C
-#define HEX_DIGIT_00011101 1D
-#define HEX_DIGIT_00011110 1E
-#define HEX_DIGIT_00011111 1F
-#define HEX_DIGIT_00100000 20
-#define HEX_DIGIT_00100001 21
-#define HEX_DIGIT_00100010 22
-#define HEX_DIGIT_00100011 23
-#define HEX_DIGIT_00100100 24
-#define HEX_DIGIT_00100101 25
-#define HEX_DIGIT_00100110 26
-#define HEX_DIGIT_00100111 27
-#define HEX_DIGIT_00101000 28
-#define HEX_DIGIT_00101001 29
-#define HEX_DIGIT_00101010 2A
-#define HEX_DIGIT_00101011 2B
-#define HEX_DIGIT_00101100 2C
-#define HEX_DIGIT_00101101 2D
-#define HEX_DIGIT_00101110 2E
-#define HEX_DIGIT_00101111 2F
-#define HEX_DIGIT_00110000 30
-#define HEX_DIGIT_00110001 31
-#define HEX_DIGIT_00110010 32
-#define HEX_DIGIT_00110011 33
-#define HEX_DIGIT_00110100 34
-#define HEX_DIGIT_00110101 35
-#define HEX_DIGIT_00110110 36
-#define HEX_DIGIT_00110111 37
-#define HEX_DIGIT_00111000 38
-#define HEX_DIGIT_00111001 39
-#define HEX_DIGIT_00111010 3A
-#define HEX_DIGIT_00111011 3B
-#define HEX_DIGIT_00111100 3C
-#define HEX_DIGIT_00111101 3D
-#define HEX_DIGIT_00111110 3E
-#define HEX_DIGIT_00111111 3F
-#define HEX_DIGIT_01000000 40
-#define HEX_DIGIT_01000001 41
-#define HEX_DIGIT_01000010 42
-#define HEX_DIGIT_01000011 43
-#define HEX_DIGIT_01000100 44
-#define HEX_DIGIT_01000101 45
-#define HEX_DIGIT_01000110 46
-#define HEX_DIGIT_01000111 47
-#define HEX_DIGIT_01001000 48
-#define HEX_DIGIT_01001001 49
-#define HEX_DIGIT_01001010 4A
-#define HEX_DIGIT_01001011 4B
-#define HEX_DIGIT_01001100 4C
-#define HEX_DIGIT_01001101 4D
-#define HEX_DIGIT_01001110 4E
-#define HEX_DIGIT_01001111 4F
-#define HEX_DIGIT_01010000 50
-#define HEX_DIGIT_01010001 51
-#define HEX_DIGIT_01010010 52
-#define HEX_DIGIT_01010011 53
-#define HEX_DIGIT_01010100 54
-#define HEX_DIGIT_01010101 55
-#define HEX_DIGIT_01010110 56
-#define HEX_DIGIT_01010111 57
-#define HEX_DIGIT_01011000 58
-#define HEX_DIGIT_01011001 59
-#define HEX_DIGIT_01011010 5A
-#define HEX_DIGIT_01011011 5B
-#define HEX_DIGIT_01011100 5C
-#define HEX_DIGIT_01011101 5D
-#define HEX_DIGIT_01011110 5E
-#define HEX_DIGIT_01011111 5F
-#define HEX_DIGIT_01100000 60
-#define HEX_DIGIT_01100001 61
-#define HEX_DIGIT_01100010 62
-#define HEX_DIGIT_01100011 63
-#define HEX_DIGIT_01100100 64
-#define HEX_DIGIT_01100101 65
-#define HEX_DIGIT_01100110 66
-#define HEX_DIGIT_01100111 67
-#define HEX_DIGIT_01101000 68
-#define HEX_DIGIT_01101001 69
-#define HEX_DIGIT_01101010 6A
-#define HEX_DIGIT_01101011 6B
-#define HEX_DIGIT_01101100 6C
-#define HEX_DIGIT_01101101 6D
-#define HEX_DIGIT_01101110 6E
-#define HEX_DIGIT_01101111 6F
-#define HEX_DIGIT_01110000 70
-#define HEX_DIGIT_01110001 71
-#define HEX_DIGIT_01110010 72
-#define HEX_DIGIT_01110011 73
-#define HEX_DIGIT_01110100 74
-#define HEX_DIGIT_01110101 75
-#define HEX_DIGIT_01110110 76
-#define HEX_DIGIT_01110111 77
-#define HEX_DIGIT_01111000 78
-#define HEX_DIGIT_01111001 79
-#define HEX_DIGIT_01111010 7A
-#define HEX_DIGIT_01111011 7B
-#define HEX_DIGIT_01111100 7C
-#define HEX_DIGIT_01111101 7D
-#define HEX_DIGIT_01111110 7E
-#define HEX_DIGIT_01111111 7F
-#define HEX_DIGIT_10000000 80
-#define HEX_DIGIT_10000001 81
-#define HEX_DIGIT_10000010 82
-#define HEX_DIGIT_10000011 83
-#define HEX_DIGIT_10000100 84
-#define HEX_DIGIT_10000101 85
-#define HEX_DIGIT_10000110 86
-#define HEX_DIGIT_10000111 87
-#define HEX_DIGIT_10001000 88
-#define HEX_DIGIT_10001001 89
-#define HEX_DIGIT_10001010 8A
-#define HEX_DIGIT_10001011 8B
-#define HEX_DIGIT_10001100 8C
-#define HEX_DIGIT_10001101 8D
-#define HEX_DIGIT_10001110 8E
-#define HEX_DIGIT_10001111 8F
-#define HEX_DIGIT_10010000 90
-#define HEX_DIGIT_10010001 91
-#define HEX_DIGIT_10010010 92
-#define HEX_DIGIT_10010011 93
-#define HEX_DIGIT_10010100 94
-#define HEX_DIGIT_10010101 95
-#define HEX_DIGIT_10010110 96
-#define HEX_DIGIT_10010111 97
-#define HEX_DIGIT_10011000 98
-#define HEX_DIGIT_10011001 99
-#define HEX_DIGIT_10011010 9A
-#define HEX_DIGIT_10011011 9B
-#define HEX_DIGIT_10011100 9C
-#define HEX_DIGIT_10011101 9D
-#define HEX_DIGIT_10011110 9E
-#define HEX_DIGIT_10011111 9F
-#define HEX_DIGIT_10100000 A0
-#define HEX_DIGIT_10100001 A1
-#define HEX_DIGIT_10100010 A2
-#define HEX_DIGIT_10100011 A3
-#define HEX_DIGIT_10100100 A4
-#define HEX_DIGIT_10100101 A5
-#define HEX_DIGIT_10100110 A6
-#define HEX_DIGIT_10100111 A7
-#define HEX_DIGIT_10101000 A8
-#define HEX_DIGIT_10101001 A9
-#define HEX_DIGIT_10101010 AA
-#define HEX_DIGIT_10101011 AB
-#define HEX_DIGIT_10101100 AC
-#define HEX_DIGIT_10101101 AD
-#define HEX_DIGIT_10101110 AE
-#define HEX_DIGIT_10101111 AF
-#define HEX_DIGIT_10110000 B0
-#define HEX_DIGIT_10110001 B1
-#define HEX_DIGIT_10110010 B2
-#define HEX_DIGIT_10110011 B3
-#define HEX_DIGIT_10110100 B4
-#define HEX_DIGIT_10110101 B5
-#define HEX_DIGIT_10110110 B6
-#define HEX_DIGIT_10110111 B7
-#define HEX_DIGIT_10111000 B8
-#define HEX_DIGIT_10111001 B9
-#define HEX_DIGIT_10111010 BA
-#define HEX_DIGIT_10111011 BB
-#define HEX_DIGIT_10111100 BC
-#define HEX_DIGIT_10111101 BD
-#define HEX_DIGIT_10111110 BE
-#define HEX_DIGIT_10111111 BF
-#define HEX_DIGIT_11000000 C0
-#define HEX_DIGIT_11000001 C1
-#define HEX_DIGIT_11000010 C2
-#define HEX_DIGIT_11000011 C3
-#define HEX_DIGIT_11000100 C4
-#define HEX_DIGIT_11000101 C5
-#define HEX_DIGIT_11000110 C6
-#define HEX_DIGIT_11000111 C7
-#define HEX_DIGIT_11001000 C8
-#define HEX_DIGIT_11001001 C9
-#define HEX_DIGIT_11001010 CA
-#define HEX_DIGIT_11001011 CB
-#define HEX_DIGIT_11001100 CC
-#define HEX_DIGIT_11001101 CD
-#define HEX_DIGIT_11001110 CE
-#define HEX_DIGIT_11001111 CF
-#define HEX_DIGIT_11010000 D0
-#define HEX_DIGIT_11010001 D1
-#define HEX_DIGIT_11010010 D2
-#define HEX_DIGIT_11010011 D3
-#define HEX_DIGIT_11010100 D4
-#define HEX_DIGIT_11010101 D5
-#define HEX_DIGIT_11010110 D6
-#define HEX_DIGIT_11010111 D7
-#define HEX_DIGIT_11011000 D8
-#define HEX_DIGIT_11011001 D9
-#define HEX_DIGIT_11011010 DA
-#define HEX_DIGIT_11011011 DB
-#define HEX_DIGIT_11011100 DC
-#define HEX_DIGIT_11011101 DD
-#define HEX_DIGIT_11011110 DE
-#define HEX_DIGIT_11011111 DF
-#define HEX_DIGIT_11100000 E0
-#define HEX_DIGIT_11100001 E1
-#define HEX_DIGIT_11100010 E2
-#define HEX_DIGIT_11100011 E3
-#define HEX_DIGIT_11100100 E4
-#define HEX_DIGIT_11100101 E5
-#define HEX_DIGIT_11100110 E6
-#define HEX_DIGIT_11100111 E7
-#define HEX_DIGIT_11101000 E8
-#define HEX_DIGIT_11101001 E9
-#define HEX_DIGIT_11101010 EA
-#define HEX_DIGIT_11101011 EB
-#define HEX_DIGIT_11101100 EC
-#define HEX_DIGIT_11101101 ED
-#define HEX_DIGIT_11101110 EE
-#define HEX_DIGIT_11101111 EF
-#define HEX_DIGIT_11110000 F0
-#define HEX_DIGIT_11110001 F1
-#define HEX_DIGIT_11110010 F2
-#define HEX_DIGIT_11110011 F3
-#define HEX_DIGIT_11110100 F4
-#define HEX_DIGIT_11110101 F5
-#define HEX_DIGIT_11110110 F6
-#define HEX_DIGIT_11110111 F7
-#define HEX_DIGIT_11111000 F8
-#define HEX_DIGIT_11111001 F9
-#define HEX_DIGIT_11111010 FA
-#define HEX_DIGIT_11111011 FB
-#define HEX_DIGIT_11111100 FC
-#define HEX_DIGIT_11111101 FD
-#define HEX_DIGIT_11111110 FE
-#define HEX_DIGIT_11111111 FF
#if 0
#pragma mark == Debugging ==
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h
index b4e6ab2008f9..11d927a60fa5 100644
--- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h
@@ -282,27 +282,15 @@ typedef int32_t DebugLevel;
// Levels
-#define kDebugLevelMask 0x0000FFFF
-#define kDebugLevelChatty 100
-#define kDebugLevelVerbose 500
-#define kDebugLevelTrace 800
#define kDebugLevelInfo 1000
#define kDebugLevelNotice 3000
#define kDebugLevelWarning 5000
#define kDebugLevelAssert 6000
-#define kDebugLevelRequire 7000
#define kDebugLevelError 8000
-#define kDebugLevelCritical 9000
-#define kDebugLevelAlert 10000
-#define kDebugLevelEmergency 11000
-#define kDebugLevelTragic 12000
#define kDebugLevelMax 0x0000FFFF
// Level Flags
-#define kDebugLevelFlagMask 0xFFFF0000
-#define kDebugLevelFlagStackTrace 0x00010000
-#define kDebugLevelFlagDebugBreak 0x00020000
/*! @typedef LogLevel
@@ -313,21 +301,6 @@ typedef int32_t DebugLevel;
typedef int32_t LogLevel;
#define kLogLevelUninitialized -1L
-#define kLogLevelAll 0L
-#define kLogLevelChatty 100L
-#define kLogLevelVerbose 500L
-#define kLogLevelTrace 800L
-#define kLogLevelInfo 1000L
-#define kLogLevelNotice 3000L
-#define kLogLevelWarning 4000L
-#define kLogLevelAssert 6000L
-#define kLogLevelRequire 7000L
-#define kLogLevelError 8000L
-#define kLogLevelCritical 9000L
-#define kLogLevelAlert 10000L
-#define kLogLevelEmergency 11000L
-#define kLogLevelTragic 12000L
-#define kLogLevelOff 0x0000FFFEL
#if 0
#pragma mark == Properties ==
@@ -344,7 +317,6 @@ typedef uint32_t DebugPropertyTag;
#define kDebugPropertyTagPrintLevelMin 0x6D696E70U // 'minp' Get: 1st param = DebugLevel *
// Set: 1st param = DebugLevel
-#define kDebugPropertyTagPrintLevel kDebugPropertyTagPrintLevelMin
#define kDebugPropertyTagPrintLevelMax 0x706D786CU // 'maxp' Get: 1st param = DebugLevel *
// Set: 1st param = DebugLevel
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h
index 1549a9d67779..31daaeb91caf 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h
@@ -562,7 +562,6 @@ enum
/* Maximum length, in bytes, of a service name represented as a */
/* literal C-String, including the terminating NULL at the end. */
-#define kDNSServiceMaxServiceName 64
/* Maximum length, in bytes, of a domain name represented as an *escaped* C-String */
/* including the final trailing dot, and the C-String terminating NULL at the end. */
@@ -2465,8 +2464,6 @@ DNSServiceErrorType DNSSD_API DNSServiceSleepKeepalive
#ifdef __APPLE_API_PRIVATE
-#define kDNSServiceCompPrivateDNS "PrivateDNS"
-#define kDNSServiceCompMulticastDNS "MulticastDNS"
#endif //__APPLE_API_PRIVATE
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h
index 17d84f99dd6e..568c5218dcb8 100644
--- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h
@@ -200,7 +200,6 @@ uint16_t get_uint16(const char **ptr, const char *end);
#define put_flags put_uint32
#define get_flags get_uint32
-#define put_error_code put_uint32
#define get_error_code get_uint32
int put_string(const char *str, char **ptr);
diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc
index b1b07d8e321b..942e83f7f6c9 100644
--- a/sd/source/ui/view/DocumentRenderer.hrc
+++ b/sd/source/ui/view/DocumentRenderer.hrc
@@ -30,7 +30,6 @@
#define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16
-#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18
#define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20
#define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index b6989fa2502b..90b264c05d01 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -49,12 +49,10 @@
#define HID_HELP_BOOKMARKS_OPEN "SFX2_HID_HELP_BOOKMARKS_OPEN"
#define HID_HELP_BOOKMARKS_RENAME "SFX2_HID_HELP_BOOKMARKS_RENAME"
#define HID_HELP_BOOKMARKS_DELETE "SFX2_HID_HELP_BOOKMARKS_DELETE"
-#define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML"
#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE"
#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE"
-#define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN"
#define HID_HELP_ONSTARTUP_BOX "SFX2_HID_HELP_ONSTARTUP_BOX"
#define HID_CTRL_CUSTOMPROPS_YES_NO "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index f9bde5b23605..db58c1a54670 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -165,7 +165,6 @@ struct SfxObjectBarList_Impl
#define SFX_SPLITWINDOWS_LEFT 0
#define SFX_SPLITWINDOWS_TOP 2
#define SFX_SPLITWINDOWS_RIGHT 1
-#define SFX_SPLITWINDOWS_BOTTOM 3
#define SFX_SPLITWINDOWS_MAX 4
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index b2c543b2aff9..641edc0e5936 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -56,11 +56,9 @@
#define META_INFO_TABLES L"table-count"
#define META_INFO_DRAWS L"image-count"
#define META_INFO_OBJECTS L"object-count"
-#define META_INFO_OLE_OBJECTS L"object-count"
#define META_INFO_PARAGRAPHS L"paragraph-count"
#define META_INFO_WORDS L"word-count"
#define META_INFO_CHARACTERS L"character-count"
-#define META_INFO_ROWS L"row-count"
#define META_INFO_CELLS L"cell-count"
#define META_INFO_DOCUMENT_STATISTIC L"document-statistic"
#define META_INFO_MODIFIED L"date"
diff --git a/shell/inc/internal/resource.h b/shell/inc/internal/resource.h
index 5acc180ea3a2..e17d3b81cabf 100644
--- a/shell/inc/internal/resource.h
+++ b/shell/inc/internal/resource.h
@@ -27,12 +27,8 @@
#define IDC_TITLE 1000
#define IDC_SUBJECT 1001
#define IDC_AUTHOR 1002
-#define IDC_CREATOR 1003
-#define IDC_LANGUAGE 1004
#define IDC_COMMENTS 1005
#define IDC_KEYWORDS 1006
-#define IDC_EXTENDED 1009
-#define IDC_DLGSIMPLE 1012
#define IDC_STATISTICSLIST 1013
#define IDS_TITLE 1014
@@ -52,7 +48,6 @@
#define IDS_VERSION 1028
#define IDS_SHEETS 1029
#define IDS_CELLS 1030
-#define IDS_STATISTICS 1031
#define IDS_PROPERTY 1032
#define IDS_PROPERTY_VALUE 1033
#define IDS_PROPPAGE_SUMMARY_TITLE 1034
@@ -61,7 +56,6 @@
#define IDS_SUBJECT_COLON 1037
#define IDS_AUTHOR_COLON 1038
#define IDS_OBJECTS 1039
-#define IDS_DOCUMENT_STATISTIC 1040
#define IDS_MODIFIED 1041
#define IDS_DOCUMENT_NUMBER 1042
#define IDS_EDITING_TIME 1043
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 3ad3e16011c9..d831b5bedea3 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -62,7 +62,6 @@ in this Software without prior written authorization from the X Consortium.
#define S_IFREG 0100000
#endif
-#define MAXDEFINES 512
#define MAXFILES 65536
#define MAXDIRS 64
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index caa30296a3cb..923496b0a110 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -19,8 +19,6 @@
#ifndef INCLUDED_STARMATH_INC_HELPIDS_H
#define INCLUDED_STARMATH_INC_HELPIDS_H
-#define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG"
-#define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG"
#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT"
#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT"
@@ -251,7 +249,6 @@
#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX"
#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX"
-#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW"
#define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE"
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 16a9d1f37e61..480bb7c66ee5 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -50,12 +50,6 @@ inline long SmFromTo(long nFrom, long nTo, double fRelDist)
// Note: however, italic spaces can be negative!
-// possible flags for the 'Draw' function below (just for debugging)
-#define SM_RECT_CORE 0x0001
-#define SM_RECT_ITALIC 0x0002
-#define SM_RECT_LINES 0x0004
-#define SM_RECT_MID 0x0008
-
// possible positions and alignments for the 'AlignTo' function
enum RectPos
// (RP_LEFT : align the current object to the left of the argument, ...)
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index a73ba0ec59cb..b9b5854ef547 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -213,14 +213,6 @@ struct SfxItemPool_Impl
#define SFX_ITEMPOOL_TAG_STARTPOOL_4 sal_uInt16(0x1111)
#define SFX_ITEMPOOL_TAG_STARTPOOL_5 sal_uInt16(0xBBBB)
-#define SFX_ITEMPOOL_TAG_ITEMPOOL sal_uInt16(0xAAAA)
-#define SFX_ITEMPOOL_TAG_ITEMS sal_uInt16(0x2222)
-#define SFX_ITEMPOOL_TAG_ITEM sal_uInt16(0x7777)
-#define SFX_ITEMPOOL_TAG_SIZES sal_uInt16(0x3333)
-#define SFX_ITEMPOOL_TAG_DEFAULTS sal_uInt16(0x4444)
-#define SFX_ITEMPOOL_TAG_VERSIONMAP sal_uInt16(0x5555)
-#define SFX_ITEMPOOL_TAG_HEADER sal_uInt16(0x6666)
-#define SFX_ITEMPOOL_TAG_ENDPOOL sal_uInt16(0xEEEE)
#define SFX_ITEMPOOL_TAG_TRICK4OLD sal_uInt16(0xFFFF)
#define SFX_ITEMPOOL_REC sal_uInt8(0x01)
@@ -230,11 +222,7 @@ struct SfxItemPool_Impl
#define SFX_ITEMPOOL_REC_ITEMS sal_uInt16(0x0040)
#define SFX_ITEMPOOL_REC_DEFAULTS sal_uInt16(0x0050)
-#define SFX_ITEMSET_REC sal_uInt8(0x02)
-#define SFX_STYLES_REC sal_uInt8(0x03)
-#define SFX_STYLES_REC_HEADER sal_uInt16(0x0010)
-#define SFX_STYLES_REC_STYLES sal_uInt16(0x0020)
/** Read in a Unicode string from a streamed byte string representation.
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 6b960e0986c7..bf7abafc786f 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -27,13 +27,6 @@
#define S_THUMB 80
-#define SGA_FORMAT_NONE 0x00000000L
-#define SGA_FORMAT_STRING 0x00000001L
-#define SGA_FORMAT_GRAPHIC 0x00000010L
-#define SGA_FORMAT_SOUND 0x00000100L
-#define SGA_FORMAT_OLE 0x00001000L
-#define SGA_FORMAT_SVDRAW 0x00010000L
-#define SGA_FORMAT_ALL 0xFFFFFFFFL
enum GalSoundType
{
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 52ce367836c4..82269b1c8da7 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -91,8 +91,6 @@
#define HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS "SVX_HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS"
#define HID_PPROPERTYPANEL_LINE_VS_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_VS_WIDTH"
#define HID_PPROPERTYPANEL_LINE_MTR_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_MTR_WIDTH"
-#define HID_PPROPERTYPANEL_LINE_VS_STYLE "SVX_HID_PPROPERTYPANEL_LINE_VS_STYLE"
-#define HID_PPROPERTYPANEL_LINE_BTN_STYLE "SVX_HID_PPROPERTYPANEL_LINE_BTN_STYLE"
#define HID_PPROPERTYPANEL_TEXT_SPACING_VS "SVX_HID_PPROPERTYPANEL_TEXT_SPACING_VS"
#define HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES "SVX_HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES"
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index a253efd05d28..725326cd22fa 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -868,14 +868,6 @@ Reference< XPropertySetInfo > FormController::getPropertySetInfo() throw( Runti
}
-#define DECL_PROP_CORE(varname, type) \
-pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((const type*)0),
-
-
-#define DECL_PROP1(varname, type, attrib1) \
- DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1)
-
-
void FormController::fillProperties(
Sequence< Property >& /* [out] */ _rProps,
Sequence< Property >& /* [out] */ /*_rAggregateProps*/
@@ -884,8 +876,13 @@ void FormController::fillProperties(
_rProps.realloc(2);
sal_Int32 nPos = 0;
Property* pDesc = _rProps.getArray();
- DECL_PROP1(FILTER, OUString, READONLY);
- DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY);
+
+ pDesc[nPos++] = Property(FM_PROP_FILTER, FM_ATTR_FILTER,
+ ::getCppuType((const OUString*)0),
+ PropertyAttribute::READONLY);
+ pDesc[nPos++] = Property(FM_PROP_FORM_OPERATIONS, FM_ATTR_FORM_OPERATIONS,
+ ::getCppuType((const Reference< XFormOperations >*)0),
+ PropertyAttribute::READONLY);
}
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 2168994641dd..5a13af57629a 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -47,8 +47,6 @@
#define IID_TEXT 5
#define IID_OTHER 6
-#define STR_HEADER_PREFIX 10
-#define STR_HEADER_URL 11
#endif //_SVX_DATANAVI_HRC
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b3b095378ed7..5d41f28ac598 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -71,7 +71,6 @@
#define DLG_RET_UNKNOWN -1
#define DLG_RET_OK 1
#define DLG_RET_CANCEL 0
-#define DLG_RET_BACK 100
#define DLG_RET_OK_AUTOLUNCH 101
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index 18013b653fe2..7e602301eb5e 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
@@ -107,11 +107,6 @@
#define FM_PROP_FILTERPROPOSAL "UseFilterValueProposal"
#define FM_PROP_FIELDSOURCE "FieldSource"
#define FM_PROP_TABLENAME "TableName"
-#define FM_PROP_FILTERSUPPLIER "FilterSupplier"
-#define FM_PROP_CURRENTFILTER "CurrentFilter"
-#define FM_PROP_SELECTED_FIELDS "SelectedFields"
-#define FM_PROP_SELECTED_TABLES "SelectedTables"
-#define FM_PROP_THREADSAFE "ThreadSafe"
#define FM_PROP_CONTROLLABEL "LabelControl"
#define FM_PROP_CURSORCOLOR "CursorColor"
#define FM_PROP_ALWAYSSHOWCURSOR "AlwaysShowCursor"
@@ -131,30 +126,13 @@
#define FM_PROP_ISCURRENCY "IsCurrency"
#define FM_PROP_URL "URL"
#define FM_PROP_ACTIVE_CONNECTION "ActiveConnection"
-#define FM_PROP_SORT "Order"
#define FM_PROP_CONTROLSOURCEPROPERTY "DataFieldProperty"
#define FM_PROP_REALNAME "RealName"
#define FM_PROP_TEXTLINECOLOR "TextLineColor"
#define FM_PROP_FONTEMPHASISMARK "FontEmphasisMark"
#define FM_PROP_FONTRELIEF "FontRelief"
-#define FM_PROP_SCROLLVALUE_MIN "ScrollValueMin"
-#define FM_PROP_SCROLLVALUE_MAX "ScrollValueMax"
-#define FM_PROP_DEFAULT_SCROLLVALUE "DefaultScrollValue"
-#define FM_PROP_LINEINCREMENT "LineIncrement"
-#define FM_PROP_BLOCKINCREMENT "BlockIncrement"
#define FM_PROP_ORIENTATION "Orientation"
-#define FM_PROP_REPEAT "Repeat"
-#define FM_PROP_REPEATDELAY "RepeatDelay"
-#define FM_PROP_SYMBOLCOLOR "SymbolColor"
-#define FM_PROP_VISIBILESIZE "VisibleSize"
-#define FM_PROP_SPINVALUE_MIN "SpinValueMin"
-#define FM_PROP_SPINVALUE_MAX "SpinValueMax"
-#define FM_PROP_DEFAULT_SPINVALUE "DefaultSpinValue"
-#define FM_PROP_SPININCREMENT "SpinIncrement"
#define FM_PROP_LINEENDFORMAT "LineEndFormat"
-#define FM_PROP_TOGGLE "Toggle"
-#define FM_PROP_FOCUSONCLICK "FocusOnClick"
-#define FM_PROP_HIDEINACTIVESELECTION "HideInactiveSelection"
#define FM_PROP_VISUALEFFECT "VisualEffect"
#define FM_PROP_BORDERCOLOR "BorderColor"
#define FM_PROP_DYNAMIC_CONTROL_BORDER "DynamicControlBorder"
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 9a656a692f41..d84496c60c1d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -861,19 +861,6 @@
#define MID_12 0xf9
#define MID_13 0xfa
-// defines for Event-assignments per Macro
-#define MAC_EVENT_MOUSEOVER 0x01
-#define MAC_EVENT_MOUSECLICK 0x02
-#define MAC_EVENT_MOUSEOUT 0x03
-#define MAC_EVENT_OBJECT_SELECT 0x04
-#define MAC_EVENT_KEYINPUT_ALPHA 0x05
-#define MAC_EVENT_KEYINPUT_NOALPHA 0x06
-#define MAC_EVENT_FRM_RESIZE 0x07
-#define MAC_EVENT_FRM_MOVE 0x08
-#define MAC_EVENT_IMAGE_LOAD 0x09
-#define MAC_EVENT_IMAGE_ABORT 0x0a
-#define MAC_EVENT_IMAGE_ERROR 0x0b
-
#endif // INCLUDED_SW_INC_CMDID_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 815dfa1ac960..60d1fe22f597 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -113,7 +113,6 @@ namespace sw {
}
#define GETSELTXT_PARABRK_TO_BLANK 0
-#define GETSELTXT_PARABRK_KEEP 1
#define GETSELTXT_PARABRK_TO_ONLYCR 2
/// For querying the INet-attributes for Navigator.
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 41291964c244..8513271e278d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -20,47 +20,29 @@
#include <svx/svxcommands.h>
#include <sfx2/sfxcommands.h>
-#define HID_DOCINFO_EDT "SW_HID_DOCINFO_EDT"
-#define HID_PASSWD "SW_HID_PASSWD"
#define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE"
-#define HID_FORMEDT_CONTENT "SW_HID_FORMEDT_CONTENT"
-#define HID_FORMEDT_USER "SW_HID_FORMEDT_USER"
-#define HID_FORMEDT_INDEX "SW_HID_FORMEDT_INDEX"
-#define HID_SCRL_PAGEUP "SW_HID_SCRL_PAGEUP"
-#define HID_SCRL_PAGEDOWN "SW_HID_SCRL_PAGEDOWN"
#define HID_EDIT_WIN "SW_HID_EDIT_WIN"
-#define HID_INSERT_FIELD_CTRL "SW_HID_INSERT_FIELD_CTRL"
#define HID_SOURCEVIEW "SW_HID_SOURCEVIEW"
-#define HID_AUTOFORMAT_CLB "SW_HID_AUTOFORMAT_CLB"
-#define HID_SCRL_NAVI "SW_HID_SCRL_NAVI"
#define HID_NAVI_DRAG_HYP "SW_HID_NAVI_DRAG_HYP"
#define HID_NAVI_DRAG_LINK "SW_HID_NAVI_DRAG_LINK"
#define HID_NAVI_DRAG_COPY "SW_HID_NAVI_DRAG_COPY"
#define HID_NAVI_OUTLINES "SW_HID_NAVI_OUTLINES"
-#define HID_AUTOFORMAT_EXEC "SW_HID_AUTOFORMAT_EXEC"
-#define HID_AUTOFORMAT_CLOSE "SW_HID_AUTOFORMAT_CLOSE"
#define HID_PAGEPREVIEW "SW_HID_PAGEPREVIEW"
#define HID_SOURCE_EDITWIN "SW_HID_SOURCE_EDITWIN"
// Dialog Help-IDs
-#define HID_INSERT_CHART "SW_HID_INSERT_CHART"
#define HID_NAVIGATOR_TREELIST "SW_HID_NAVIGATOR_TREELIST"
#define HID_NAVIGATOR_TOOLBOX "SW_HID_NAVIGATOR_TOOLBOX"
#define HID_NAVIGATOR_LISTBOX "SW_HID_NAVIGATOR_LISTBOX"
-#define HID_VS_SINGLENUM "SW_HID_VS_SINGLENUM"
-#define HID_VS_NUM "SW_HID_VS_NUM"
-#define HID_VS_BULLET "SW_HID_VS_BULLET"
-#define HID_VS_NUMBMP "SW_HID_VS_NUMBMP"
-#define HID_NAVI_TBX1 "SW_HID_NAVI_TBX1"
#define HID_NAVI_TBX2 "SW_HID_NAVI_TBX2"
#define HID_NAVI_TBX3 "SW_HID_NAVI_TBX3"
#define HID_NAVI_TBX4 "SW_HID_NAVI_TBX4"
@@ -76,12 +58,7 @@
#define HID_NAVI_TBX14 "SW_HID_NAVI_TBX14"
#define HID_NAVI_TBX15 "SW_HID_NAVI_TBX15"
#define HID_NAVI_VS "SW_HID_NAVI_VS"
-#define HID_NUM_FORMAT_BTN "SW_HID_NUM_FORMAT_BTN"
#define HID_NAVI_TBX16 "SW_HID_NAVI_TBX16"
-#define HID_LTEMPL_TEXT "SW_HID_LTEMPL_TEXT"
-#define HID_LTEMPL_FRAME "SW_HID_LTEMPL_FRAME"
-#define HID_LTEMPL_PAGE "SW_HID_LTEMPL_PAGE"
-#define HID_LTEMPL_OVERRIDE "SW_HID_LTEMPL_OVERRIDE"
#define HID_NAVI_TBX17 "SW_HID_NAVI_TBX17"
#define HID_NAVI_TBX18 "SW_HID_NAVI_TBX18"
#define HID_NAVI_TBX19 "SW_HID_NAVI_TBX19"
@@ -92,14 +69,11 @@
#define HID_NAVI_TBX24 "SW_HID_NAVI_TBX24"
#define HID_NAVIGATOR_GLOBAL_TOOLBOX "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX"
#define HID_NAVIGATOR_GLOB_TREELIST "SW_HID_NAVIGATOR_GLOB_TREELIST"
-#define HID_GLOS_GROUP_TREE "SW_HID_GLOS_GROUP_TREE"
#define HID_GLBLTREE_UPDATE "SW_HID_GLBLTREE_UPDATE"
#define HID_GLBLTREE_INSERT "SW_HID_GLBLTREE_INSERT"
#define HID_GLBLTREE_EDIT "SW_HID_GLBLTREE_EDIT"
#define HID_GLBLTREE_DEL "SW_HID_GLBLTREE_DEL"
#define HID_GLBLTREE_INS_IDX "SW_HID_GLBLTREE_INS_IDX"
-#define HID_GLBLTREE_INS_CNTIDX "SW_HID_GLBLTREE_INS_CNTIDX"
-#define HID_GLBLTREE_INS_USRIDX "SW_HID_GLBLTREE_INS_USRIDX"
#define HID_GLBLTREE_INS_FILE "SW_HID_GLBLTREE_INS_FILE"
#define HID_GLBLTREE_INS_NEW_FILE "SW_HID_GLBLTREE_INS_NEW_FILE"
#define HID_GLBLTREE_INS_TEXT "SW_HID_GLBLTREE_INS_TEXT"
@@ -109,86 +83,24 @@
#define HID_GLBLTREEUPD_ALL "SW_HID_GLBLTREEUPD_ALL"
#define HID_NAVI_CONTENT "SW_HID_NAVI_CONTENT"
#define HID_NAVI_GLOBAL "SW_HID_NAVI_GLOBAL"
-#define HID_LTEMPL_NUMBERING "SW_HID_LTEMPL_NUMBERING"
#define HID_SORT_ACTION "SW_HID_SORT_ACTION"
#define HID_SORT_AUTHOR "SW_HID_SORT_AUTHOR"
#define HID_SORT_DATE "SW_HID_SORT_DATE"
#define HID_SORT_COMMENT "SW_HID_SORT_COMMENT"
#define HID_SW_SORT_POSITION "SW_HID_SW_SORT_POSITION"
#define HID_EDIT_COMMENT "SW_HID_EDIT_COMMENT"
-#define HID_DLG_FLDEDT_NEXT "SW_HID_DLG_FLDEDT_NEXT"
-#define HID_DLG_FLDEDT_PREV "SW_HID_DLG_FLDEDT_PREV"
-#define HID_DLG_FLDEDT_ADDRESS "SW_HID_DLG_FLDEDT_ADDRESS"
-#define HID_FILEDLG_LOADTEMPLATE "SW_HID_FILEDLG_LOADTEMPLATE"
-#define HID_FILEDLG_MAILMRGE1 "SW_HID_FILEDLG_MAILMRGE1"
-#define HID_FILEDLG_FRMPAGE "SW_HID_FILEDLG_FRMPAGE"
-#define HID_FILEDLG_SRCVIEW "SW_HID_FILEDLG_SRCVIEW"
-#define HID_FILEDLG_WIZDOKU "SW_HID_FILEDLG_WIZDOKU"
#define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK"
-#define HID_FORMAT_NAME_OBJECT_NAME "SW_HID_FORMAT_NAME_OBJECT_NAME"
// TabPage Help-IDs
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
-#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB"
-
-#define HID_COMPATIBILITY_OPTIONS_BOX "SW_HID_COMPATIBILITY_OPTIONS_BOX"
-
-#define HID_PROPERTYPANEL_WRAP_SECTION "SW_HID_PROPERTYPANEL_WRAP_SECTION"
-#define HID_PROPERTYPANEL_WRAP_RB_NO_WRAP "SW_HID_PROPERTYPANEL_WRAP_RB_NO_WRAP"
-#define HID_PROPERTYPANEL_WRAP_RB_WRAP_LEFT "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_LEFT"
-#define HID_PROPERTYPANEL_WRAP_RB_WRAP_RIGHT "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_RIGHT"
-#define HID_PROPERTYPANEL_WRAP_RB_WRAP_PARALLEL "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_PARALLEL"
-#define HID_PROPERTYPANEL_WRAP_RB_WRAP_THROUGH "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_THROUGH"
-#define HID_PROPERTYPANEL_WRAP_RB_WRAP_IDEAL "SW_HID_PROPERTYPANEL_WRAP_RB_WRAP_IDEAL"
-
-// AutoPilot Help-IDs
-
-#define HID_LETTER_PAGE1 "SW_HID_LETTER_PAGE1"
-#define HID_LETTER_PAGE2 "SW_HID_LETTER_PAGE2"
-#define HID_LETTER_PAGE3 "SW_HID_LETTER_PAGE3"
-#define HID_LETTER_PAGE4 "SW_HID_LETTER_PAGE4"
-#define HID_LETTER_PAGE5 "SW_HID_LETTER_PAGE5"
-#define HID_LETTER_PAGE6 "SW_HID_LETTER_PAGE6"
-#define HID_LETTER_PAGE7 "SW_HID_LETTER_PAGE7"
-#define HID_LETTER_PAGE8 "SW_HID_LETTER_PAGE8"
-#define HID_LETTER_PAGE9 "SW_HID_LETTER_PAGE9"
-
-#define HID_FAX_PAGE1 "SW_HID_FAX_PAGE1"
-#define HID_FAX_PAGE2 "SW_HID_FAX_PAGE2"
-#define HID_FAX_PAGE3 "SW_HID_FAX_PAGE3"
-#define HID_FAX_PAGE4 "SW_HID_FAX_PAGE4"
-#define HID_FAX_PAGE5 "SW_HID_FAX_PAGE5"
-#define HID_FAX_PAGE6 "SW_HID_FAX_PAGE6"
-#define HID_FAX_PAGE7 "SW_HID_FAX_PAGE7"
-#define HID_FAX_PAGE8 "SW_HID_FAX_PAGE8"
-
-#define HID_MEMO_PAGE1 "SW_HID_MEMO_PAGE1"
-#define HID_MEMO_PAGE2 "SW_HID_MEMO_PAGE2"
-#define HID_MEMO_PAGE3 "SW_HID_MEMO_PAGE3"
-#define HID_MEMO_PAGE4 "SW_HID_MEMO_PAGE4"
-#define HID_MEMO_PAGE5 "SW_HID_MEMO_PAGE5"
-
-#define HID_AGENDA_PAGE1 "SW_HID_AGENDA_PAGE1"
-#define HID_AGENDA_PAGE2 "SW_HID_AGENDA_PAGE2"
-#define HID_AGENDA_PAGE3 "SW_HID_AGENDA_PAGE3"
-#define HID_AGENDA_PAGE4 "SW_HID_AGENDA_PAGE4"
-#define HID_AGENDA_PAGE5 "SW_HID_AGENDA_PAGE5"
-#define HID_AGENDA_PAGE6 "SW_HID_AGENDA_PAGE6"
+
// sw::sidebar::PagePropertyPanel
-#define HID_SWPAGE_ORIENTATION "HID_SWPAGE_ORIENTATION"
-#define HID_SWPAGE_TBI_ORIENTATION "HID_SWPAGE_TBI_ORIENTATION"
-#define HID_SWPAGE_MARGIN "HID_SWPAGE_MARGIN"
-#define HID_SWPAGE_TBI_MARGIN "HID_SWPAGE_TBI_MARGIN"
-#define HID_SWPAGE_SIZE "HID_SWPAGE_SIZE"
-#define HID_SWPAGE_TBI_SIZE "HID_SWPAGE_TBI_SIZE"
-#define HID_SWPAGE_COLUMN "HID_SWPAGE_COLUMN"
-#define HID_SWPAGE_TBI_COLUMN "HID_SWPAGE_TBI_COLUMN"
#define HID_SWPAGE_LEFT_MARGIN "HID_SWPAGE_LEFT_MARGIN"
#define HID_SWPAGE_RIGHT_MARGIN "HID_SWPAGE_RIGHT_MARGIN"
#define HID_SWPAGE_TOP_MARGIN "HID_SWPAGE_TOP_MARGIN"
@@ -199,7 +111,6 @@
#define HID_SWPAGE_VS_MARGIN "HID_SWPAGE_VS_MARGIN"
#define HID_SWPAGE_VS_SIZE "HID_SWPAGE_VS_SIZE"
#define HID_SWPAGE_VS_COLUMN "HID_SWPAGE_VS_COLUMN"
-#define HID_PROPERTYPANEL_SWPAGE_SECTION "HID_PROPERTYPANEL_SWPAGE_SECTION"
// HelpIds for Menu
@@ -254,49 +165,22 @@
#define HID_MN_READONLY_GRAPHICOFF "SW_HID_MN_READONLY_GRAPHICOFF"
#define HID_MN_READONLY_PLUGINOFF "SW_HID_MN_READONLY_PLUGINOFF"
-#define HID_MD_GLOS_DEFINE "SW_HID_MD_GLOS_DEFINE"
-#define HID_MD_GLOS_REPLACE "SW_HID_MD_GLOS_REPLACE"
-#define HID_MD_GLOS_RENAME "SW_HID_MD_GLOS_RENAME"
-#define HID_MD_GLOS_DELETE "SW_HID_MD_GLOS_DELETE"
-#define HID_MD_GLOS_EDIT "SW_HID_MD_GLOS_EDIT"
-#define HID_MD_GLOS_MACRO "SW_HID_MD_GLOS_MACRO"
#define HID_LINGU_ADD_WORD "SW_HID_LINGU_ADD_WORD"
#define HID_LINGU_IGNORE_WORD "SW_HID_LINGU_IGNORE_WORD"
#define HID_LINGU_SPELLING_DLG "SW_HID_LINGU_SPELLING_DLG"
#define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR"
#define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE"
-#define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE"
-#define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE"
-#define HID_MD_GLOS_DEFINE_TEXT "SW_HID_MD_GLOS_DEFINE_TEXT"
-#define HID_MD_COPY_TO_CLIPBOARD "SW_HID_MD_COPY_TO_CLIPBOARD"
-#define HID_MD_GLOS_IMPORT "SW_HID_MD_GLOS_IMPORT"
#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS
#define HID_LINGU_IGNORE_SELECTION "SW_HID_LINGU_IGNORE_SELECTION" // grammar check context menu
// More Help-IDs
#define HID_EDIT_FORMULA "SW_HID_EDIT_FORMULA"
-#define HID_INSERT_FILE "SW_HID_INSERT_FILE"
-#define HID_FORMAT_PAGE "SW_HID_FORMAT_PAGE"
-#define HID_CONFIG_MENU "SW_HID_CONFIG_MENU"
#define HID_NAVIGATION_PI "SW_HID_NAVIGATION_PI"
-#define HID_NAVIGATION_IMGBTN "SW_HID_NAVIGATION_IMGBTN"
-
-#define HID_TEXT_TOOLBOX "SW_HID_TEXT_TOOLBOX"
-#define HID_TABLE_TOOLBOX "SW_HID_TABLE_TOOLBOX"
-#define HID_FRAME_TOOLBOX "SW_HID_FRAME_TOOLBOX"
-#define HID_GRAFIK_TOOLBOX "SW_HID_GRAFIK_TOOLBOX"
-#define HID_OLE_TOOLBOX "SW_HID_OLE_TOOLBOX"
-#define HID_DRAW_TOOLBOX "SW_HID_DRAW_TOOLBOX"
-#define HID_BEZIER_TOOLBOX "SW_HID_BEZIER_TOOLBOX"
-#define HID_DRAW_TEXT_TOOLBOX "SW_HID_DRAW_TEXT_TOOLBOX"
-#define HID_NUM_TOOLBOX "SW_HID_NUM_TOOLBOX"
+
#define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX"
-#define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX"
-#define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE"
-#define HID_NUM_RESET "SW_HID_NUM_RESET"
#define HID_AUTOFORMAT_REJECT "SW_HID_AUTOFORMAT_REJECT"
#define HID_AUTOFORMAT_ACCEPT "SW_HID_AUTOFORMAT_ACCEPT"
@@ -339,7 +223,6 @@
#define HID_BUSINESS_FMT_PAGE_SHEET "SW_HID_BUSINESS_FMT_PAGE_SHEET"
#define HID_BUSINESS_FMT_PAGE_BRAND "SW_HID_BUSINESS_FMT_PAGE_BRAND"
#define HID_BUSINESS_FMT_PAGE_TYPE "SW_HID_BUSINESS_FMT_PAGE_TYPE"
-#define HID_SEND_MASTER_DIALOG "SW_HID_SEND_MASTER_DIALOG"
#define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK"
#define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL"
#define HID_SEND_MASTER_CTRL_LISTBOX_FILTER "SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER"
@@ -348,7 +231,6 @@
#define HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION"
#define HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE"
-#define HID_SEND_HTML_DIALOG "SW_HID_SEND_HTML_DIALOG"
#define HID_SEND_HTML_CTRL_PUSHBUTTON_OK "SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK"
#define HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL"
#define HID_SEND_HTML_CTRL_LISTBOX_FILTER "SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER"
@@ -358,9 +240,7 @@
#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE"
#define HID_PVIEW_ZOOM_LB "SW_HID_PVIEW_ZOOM_LB"
-#define HID_MAIL_MERGE_SELECT "SW_HID_MAIL_MERGE_SELECT"
-#define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG"
#define HID_NID_TBL "SW_HID_NID_TBL"
#define HID_NID_FRM "SW_HID_NID_FRM"
@@ -397,6 +277,5 @@
#define HID_TBX_FORMULA_CANCEL "SW_HID_TBX_FORMULA_CANCEL"
#define HID_TBX_FORMULA_APPLY "SW_HID_TBX_FORMULA_APPLY"
-#define HID_TITLEPAGE "SW_HID_TITLEPAGE"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 38058d4448a3..0767fb096265 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -352,10 +352,7 @@ public:
class SW_DLLPUBLIC SwRedlineHint : public SfxHint
{
#define SWREDLINE_INSERTED 1
-#define SWREDLINE_REMOVED 2
#define SWREDLINE_FOCUS 3
-#define SWREDLINE_CHANGED 4
-#define SWREDLINE_LANGUAGE 5
const SwRangeRedline* pRedline;
sal_Int16 nWhich;
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c94ca6fc589f..64b0f2c759f3 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -304,7 +304,6 @@ public:
#define RET_EDIT_RESULT_DOC 102
#define RET_TARGET_CREATED 103
#define RET_REMOVE_TARGET 104
-#define RET_APPLY_TEMPLATE 105
class SwView;
class SwMailMergeConfigItem;
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 5f85b5157eea..09c93b4ad096 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -31,19 +31,15 @@
#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter"
#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
-#define CMD_FN_CONVERT_TEXT_TABLE ".uno:ConvertTableText"
#define CMD_FN_NUM_BULLET_DOWN ".uno:DecrementLevel"
#define CMD_FN_TABLE_DELETE_COL ".uno:DeleteColumns"
#define CMD_FN_TABLE_DELETE_ROW ".uno:DeleteRows"
#define CMD_FN_TABLE_BALANCE_CELLS ".uno:DistributeColumns"
#define CMD_FN_TABLE_BALANCE_ROWS ".uno:DistributeRows"
#define CMD_FN_EDIT_CURRENT_TOX ".uno:EditCurIndex"
-#define CMD_FN_GLOSSARY_DLG ".uno:EditGlossary"
#define CMD_FN_EDIT_HYPERLINK ".uno:EditHyperlink"
-#define CMD_FN_EDIT_REGION ".uno:EditRegion"
#define CMD_FN_TABLE_SELECT_COL ".uno:EntireColumn"
#define CMD_FN_TABLE_SELECT_ROW ".uno:EntireRow"
-#define CMD_FN_EXPAND_GLOSSARY ".uno:ExpandGlossary"
#define CMD_FN_EDIT_FIELD ".uno:FieldDialog"
#define CMD_FN_EDIT_FOOTNOTE ".uno:EditFootnote"
#define CMD_FN_FORMAT_FRAME_DLG ".uno:FrameDialog"
@@ -51,14 +47,10 @@
#define CMD_FN_NUM_BULLET_UP ".uno:IncrementLevel"
#define CMD_FN_EDIT_IDX_ENTRY_DLG ".uno:IndexEntryDialog"
#define CMD_FN_INSERT_FLD_AUTHOR ".uno:InsertAuthorField"
-#define CMD_FN_INSERT_AUTH_ENTRY_DLG ".uno:InsertAuthoritiesEntry"
-#define CMD_FN_INSERT_BOOKMARK ".uno:InsertBookmark"
-#define CMD_FN_INSERT_BREAK_DLG ".uno:InsertBreak"
#define CMD_FN_INSERT_CAPTION ".uno:InsertCaptionDialog"
#define CMD_FN_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
#define CMD_FN_INSERT_FLD_DATE ".uno:InsertDateField"
#define CMD_FN_INSERT_FIELD ".uno:InsertField"
-#define CMD_FN_INSERT_IDX_ENTRY_DLG ".uno:InsertIndexesEntry"
#define CMD_FN_INSERT_FLD_PGCOUNT ".uno:InsertPageCountField"
#define CMD_FN_INSERT_FLD_PGNUMBER ".uno:InsertPageNumberField"
#define CMD_FN_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
@@ -66,7 +58,6 @@
#define CMD_FN_INSERT_FLD_TITLE ".uno:InsertTitleField"
#define CMD_FN_INSERT_FLD_TOPIC ".uno:InsertTopicField"
#define CMD_FN_TABLE_MERGE_CELLS ".uno:MergeCells"
-#define CMD_FN_QRY_MERGE ".uno:MergeDialog"
#define CMD_FN_TABLE_MERGE_TABLE ".uno:MergeTable"
#define CMD_FN_TITLE_DESCRIPTION_SHAPE ".uno:ObjectTitleDescription"
#define CMD_FN_NAME_SHAPE ".uno:NameGroup"
@@ -90,15 +81,12 @@
#define CMD_FN_TABLE_ADJUST_CELLS ".uno:SetOptimalColumnWidth"
#define CMD_FN_TABLE_OPTIMAL_HEIGHT ".uno:SetOptimalRowHeight"
#define CMD_FN_TABLE_SET_ROW_HEIGHT ".uno:SetRowHeight"
-#define CMD_FN_SORTING_DLG ".uno:SortDialog"
#define CMD_FN_TABLE_SPLIT_CELLS ".uno:SplitCell"
#define CMD_FN_TABLE_SPLIT_TABLE ".uno:SplitTable"
#define CMD_FN_SET_SUB_SCRIPT ".uno:SubScript"
#define CMD_FN_SET_SUPER_SCRIPT ".uno:SuperScript"
-#define CMD_FN_VIEW_TABLEGRID ".uno:TableBoundaries"
#define CMD_FN_FORMAT_TABLE_DLG ".uno:TableDialog"
#define CMD_FN_NUM_FORMAT_TABLE_DLG ".uno:TableNumberFormatDialog"
-#define CMD_FN_SET_MODOPT_TBLNUMFMT ".uno:TableNumberRecognition"
#define CMD_FN_DRAWTEXT_ATTR_DLG ".uno:TextAttributes"
#define CMD_FN_DRAW_WRAP_DLG ".uno:TextWrap"
#define CMD_FN_TOOL_ANCHOR ".uno:ToggleAnchorType"
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index c365b7d0dabe..ee43c986588d 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -134,7 +134,6 @@ class SwUnoCollection
#define SW_SERVICE_FIELDTYPE_DOCINFO_DESCRIPTION 59
#define SW_SERVICE_FIELDTYPE_DOCINFO_CREATE_AUTHOR 60
#define SW_SERVICE_FIELDTYPE_DOCINFO_CREATE_DATE_TIME 61
-#define SW_SERVICE_FIELDTYPE_DUMMY_O 62
#define SW_SERVICE_FIELDTYPE_DUMMY_1 63
#define SW_SERVICE_FIELDTYPE_DUMMY_2 64
#define SW_SERVICE_FIELDTYPE_DUMMY_3 65
@@ -187,7 +186,6 @@ class SwUnoCollection
#define SW_SERVICE_VBAPROJECTNAMEPROVIDER 112
#define SW_SERVICE_VBAGLOBALS 113
-#define SW_SERVICE_LAST SW_SERVICE_VBAGLOBALS
#define SW_SERVICE_INVALID USHRT_MAX
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 9d514a2350b1..bc0794409c74 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -44,7 +44,6 @@
#define MID_ANCHOR_PAGENUM 1
#define MID_ANCHOR_ANCHORFRAME 2
-#define MID_URL_HYPERLINKFORMAT 0
#define MID_URL_HYPERLINKNAME 1
#define MID_URL_CLIENTMAP 2
#define MID_URL_SERVERMAP 3
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index fbfbe9487416..e4d24cd0c6ee 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -35,18 +35,14 @@
#define UNO_NAME_BACK_GRAPHIC_URL "BackGraphicURL"
#define UNO_NAME_BACK_GRAPHIC_FILTER "BackGraphicFilter"
#define UNO_NAME_BACK_GRAPHIC_LOCATION "BackGraphicLocation"
-#define UNO_NAME_BACK_GRAPHIC_BITMAP "BackGraphicBitmap"
#define UNO_NAME_GRAPHIC_URL "GraphicURL"
#define UNO_NAME_GRAPHIC_FILTER "GraphicFilter"
-#define UNO_NAME_GRAPHIC_LOCATION "GraphicLocation"
#define UNO_NAME_GRAPHIC_SIZE "GraphicSize"
#define UNO_NAME_GRAPHIC_BITMAP "GraphicBitmap"
#define UNO_NAME_BULLET_FONT "BulletFont"
#define UNO_NAME_PARA_GRAPHIC_LOCATION "ParaBackGraphicLocation"
#define UNO_NAME_HEADER_GRAPHIC_LOCATION "HeaderBackGraphicLocation"
#define UNO_NAME_FOOTER_GRAPHIC_LOCATION "FooterBackGraphicLocation"
-#define UNO_NAME_PARA_LEFT_PARA_MARGIN "ParaLeftParaMargin"
-#define UNO_NAME_PARA_RIGHT_PARA_MARGIN "ParaRightParaMargin"
#define UNO_NAME_PARA_LEFT_MARGIN "ParaLeftMargin"
#define UNO_NAME_PARA_RIGHT_MARGIN "ParaRightMargin"
#define UNO_NAME_PARA_LEFT_MARGIN_RELATIVE "ParaLeftMarginRelative"
@@ -67,15 +63,11 @@
#define UNO_NAME_TEXT_RANGE "TextRange"
#define UNO_NAME_TEXT_BOX "TextBox"
#define UNO_NAME_NAME "Name"
-#define UNO_NAME_NUMBERING_ALIGNMENT "NumberingAlignment"
-#define UNO_NAME_BULLET_FONT_NAME "BulletFontName"
-#define UNO_NAME_BULLET_ID "BulletId"
#define UNO_NAME_CHAR_STYLE_NAME "CharStyleName"
#define UNO_NAME_ANCHOR_CHAR_STYLE_NAME "AnchorCharStyleName"
#define UNO_NAME_SUFFIX "Suffix"
#define UNO_NAME_PREFIX "Prefix"
#define UNO_NAME_PARENT_NUMBERING "ParentNumbering"
-#define UNO_NAME_START_WITH "StartWith"
#define UNO_NAME_CHAR_FONT_NAME "CharFontName"
#define UNO_NAME_CHAR_FONT_STYLE_NAME "CharFontStyleName"
#define UNO_NAME_CHAR_FONT_FAMILY "CharFontFamily"
@@ -143,42 +135,31 @@
#define UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE "ParaBottomMarginRelative"
#define UNO_NAME_PARA_EXPAND_SINGLE_WORD "ParaExpandSingleWord"
#define UNO_NAME_END_NOTICE "EndNotice"
-#define UNO_NAME_EMBEDDED_OBJECTS "EmbeddedObjects"
-#define UNO_NAME_ALPHABETICAL_SEPARATORS "AlphabeticalSeparators"
-#define UNO_NAME_BACKGROUND_COLOR "BackgroundColor"
#define UNO_NAME_BEGIN_NOTICE "BeginNotice"
-#define UNO_NAME_CASE_SENSITIVE "CaseSensitive"
#define UNO_NAME_FRAME_STYLE_NAME "FrameStyleName"
#define UNO_NAME_NUMBERING_STYLE_NAME "NumberingStyleName"
#define UNO_NAME_NUMBERING_LEVEL "NumberingLevel"
#define UNO_NAME_NUMBERING_START_VALUE "NumberingStartValue"
#define UNO_NAME_NUMBERING_IS_NUMBER "NumberingIsNumber"
-#define UNO_NAME_COMBINE_ENTRIES "CombineEntries"
#define UNO_NAME_COUNT_LINES_IN_FRAMES "CountLinesInFrames"
#define UNO_NAME_DDE_COMMAND_TYPE "DDECommandType"
#define UNO_NAME_DDE_COMMAND_FILE "DDECommandFile"
#define UNO_NAME_DDE_COMMAND_ELEMENT "DDECommandElement"
#define UNO_NAME_IS_AUTOMATIC_UPDATE "IsAutomaticUpdate"
-#define UNO_NAME_DEFAULT_TABSTOP_DISTANCE "DefaultTabstopDistance"
#define UNO_NAME_DISTANCE "Distance"
#define UNO_NAME_DROP_CAP_FORMAT "DropCapFormat"
#define UNO_NAME_DROP_CAP_WHOLE_WORD "DropCapWholeWord"
#define UNO_NAME_DROP_CAP_CHAR_STYLE_NAME "DropCapCharStyleName"
#define UNO_NAME_FILE_LINK "FileLink"
#define UNO_NAME_GRAPHIC "Graphic"
-#define UNO_NAME_GRAPHICS "Graphics"
#define UNO_NAME_IS_PROTECTED "IsProtected"
-#define UNO_NAME_KEY_AS_ENTRY "KeyAsEntry"
#define UNO_NAME_PARA_KEEP_TOGETHER "ParaKeepTogether"
#define UNO_NAME_KEEP_TOGETHER "KeepTogether"
#define UNO_NAME_IS_LANDSCAPE "IsLandscape"
#define UNO_NAME_SEPARATOR_TEXT "SeparatorText"
-#define UNO_NAME_MARKS "Marks"
#define UNO_NAME_NUMBER_POSITION "NumberPosition"
-#define UNO_NAME_OUTLINES "Outlines"
#define UNO_NAME_PAGE_STYLE_NAME "PageStyleName"
#define UNO_NAME_PAGE_STYLE_LAYOUT "PageStyleLayout"
-#define UNO_NAME_PARA_STYLES "ParaStyles"
#define UNO_NAME_PARA_ADJUST "ParaAdjust"
#define UNO_NAME_PARA_REGISTER_MODE_ACTIVE "ParaRegisterModeActive"
#define UNO_NAME_PARA_STYLE_NAME "ParaStyleName"
@@ -194,20 +175,7 @@
#define UNO_NAME_POSITION_PROTECTED "PositionProtected"
#define UNO_NAME_ALTERNATIVE_TEXT "AlternativeText"
#define UNO_NAME_PRIMARY_KEY "PrimaryKey"
-#define UNO_NAME_PRINT_TABLES "PrintTables"
-#define UNO_NAME_PRINT_GRAPHICS "PrintGraphics"
-#define UNO_NAME_PRINT_REVERSED "PrintReversed"
-#define UNO_NAME_PRINT_PROSPECT "PrintProspect"
-#define UNO_NAME_PRINT_CONTROLS "PrintControls"
-#define UNO_NAME_PRINT_DRAWINGS "PrintDrawings"
-#define UNO_NAME_PRINT_RIGHT_PAGES "PrintRightPages"
-#define UNO_NAME_PRINT_LEFT_PAGES "PrintLeftPages"
-#define UNO_NAME_PRINT_BLACK_FONTS "PrintBlackFonts"
#define UNO_NAME_PRINTER_PAPER_TRAY "PrinterPaperTray"
-#define UNO_NAME_PRINT_PAGE_BACKGROUND "PrintPageBackground"
-#define UNO_NAME_PRINT_ANNOTATION_MODE "PrintAnnotationMode"
-#define UNO_NAME_PRINT_FAX_NAME "PrintFaxName"
-#define UNO_NAME_PRINT_PAPER_FROM_SETUP "PrintPaperFromSetup"
#define UNO_NAME_REGISTER_MODE_ACTIVE "RegisterModeActive"
#define UNO_NAME_RELATIVE_WIDTH "RelativeWidth"
#define UNO_NAME_RELATIVE_WIDTH_RELATION "RelativeWidthRelation"
@@ -217,7 +185,6 @@
#define UNO_NAME_SEARCH_STYLES "SearchStyles"
#define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards"
#define UNO_NAME_SEARCH_SIMILARITY "SearchSimilarity"
-#define UNO_NAME_SEARCH_IN_SELECTION "SearchInSelection"
#define UNO_NAME_SEARCH_CASE_SENSITIVE "SearchCaseSensitive"
#define UNO_NAME_SEARCH_SIMILARITY_ADD "SearchSimilarityAdd"
#define UNO_NAME_SEARCH_SIMILARITY_RELAX "SearchSimilarityRelax"
@@ -236,28 +203,17 @@
#define UNO_NAME_SHOW_VERT_RULER "ShowVertRuler"
#define UNO_NAME_SHOW_PARA_BREAKS "ShowParaBreaks"
#define UNO_NAME_SHOW_HIDDEN_TEXT "ShowHiddenText"
-#define UNO_NAME_SHOW_ANNOTATIONS "ShowAnnotations"
#define UNO_NAME_SHOW_SOFT_HYPHENS "ShowSoftHyphens"
#define UNO_NAME_SHOW_VERT_SCROLL_BAR "ShowVertScrollBar"
#define UNO_NAME_SHOW_HORI_SCROLL_BAR "ShowHoriScrollBar"
#define UNO_NAME_SHOW_FIELD_COMMANDS "ShowFieldCommands"
-#define UNO_NAME_SHOW_TEXT_BOUNDARIES "ShowTextBoundaries"
#define UNO_NAME_SHOW_PROTECTED_SPACES "ShowProtectedSpaces"
-#define UNO_NAME_SHOW_TABLE_BOUNDARIES "ShowTableBoundaries"
#define UNO_NAME_SHOW_HIDDEN_PARAGRAPHS "ShowHiddenParagraphs"
-#define UNO_NAME_SHOW_INDEX_MARK_BACKGROUND "ShowIndexMarkBackground"
-#define UNO_NAME_SHOW_FOOTNOTE_BACKGROUND "ShowFootnoteBackground"
-#define UNO_NAME_SHOW_TEXT_FIELD_BACKGROUND "ShowTextFieldBackground"
#define UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT "IsSyncWidthToHeight"
#define UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH "IsSyncHeightToWidth"
#define UNO_NAME_SIZE_PROTECTED "SizeProtected"
-#define UNO_NAME_SMOOTH_SCROLLING "SmoothScrolling"
-#define UNO_NAME_TABLES "Tables"
-#define UNO_NAME_TEXT_FRAMES "TextFrames"
#define UNO_NAME_TEXT_COLUMNS "TextColumns"
#define UNO_NAME_BACK_TRANSPARENT "BackTransparent"
-#define UNO_NAME_USE_PP "UsePP"
-#define UNO_NAME_USER_METRIC "UserMetric"
#define UNO_NAME_ANCHOR_TYPE "AnchorType"
#define UNO_NAME_ANCHOR_TYPES "AnchorTypes"
#define UNO_NAME_ANCHOR_PAGE_NO "AnchorPageNo"
@@ -288,9 +244,6 @@
#define UNO_NAME_FILE_FORMAT "FileFormat"
#define UNO_NAME_IS_FIXED "IsFixed"
#define UNO_NAME_FOOTNOTE_COUNTING "FootnoteCounting"
-#define UNO_NAME_FORMULA "Formula"
-#define UNO_NAME_FRAME_NAME "FrameName"
-#define UNO_NAME_GRAPHIC_NAME "GraphicName"
#define UNO_NAME_FULL_NAME "FullName"
#define UNO_NAME_HEIGHT "Height"
#define UNO_NAME_IS_AUTO_HEIGHT "IsAutoHeight"
@@ -372,7 +325,6 @@
#define UNO_NAME_CHAR_WORD_MODE "CharWordMode"
#define UNO_NAME_GRAPHIC_CROP "GraphicCrop"
#define UNO_NAME_CHARACTER_FORMAT_NONE "CharacterFormatNone"
-#define UNO_NAME_TEXT_POSITION "TextPosition"
#define UNO_NAME_DOCUMENT_INDEX_MARK "DocumentIndexMark"
#define UNO_NAME_DOCUMENT_INDEX "DocumentIndex"
#define UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION "IsGlobalDocumentSection"
@@ -387,7 +339,6 @@
#define UNO_NAME_ENDNOTE "Endnote"
#define UNO_NAME_CHART_ROW_AS_LABEL "ChartRowAsLabel"
#define UNO_NAME_CHART_COLUMN_AS_LABEL "ChartColumnAsLabel"
-#define UNO_NAME_TABLE_COLUMS "TableColumns"
#define UNO_NAME_LEFT_BORDER "LeftBorder"
#define UNO_NAME_RIGHT_BORDER "RightBorder"
#define UNO_NAME_TOP_BORDER "TopBorder"
@@ -442,8 +393,6 @@
#define UNO_NAME_LOAD_TEXT_STYLES "LoadTextStyles"
#define UNO_NAME_FILE_NAME "FileName"
#define UNO_NAME_FILTER_NAME "FilterName"
-#define UNO_NAME_FILTER_OPTION "FilterOption"
-#define UNO_NAME_PASSWORD "Password"
#define UNO_NAME_COPY_COUNT "CopyCount"
#define UNO_NAME_COLLATE "Collate"
#define UNO_NAME_SORT "Sort"
@@ -462,7 +411,6 @@
#define UNO_NAME_ZOOM_TYPE "ZoomType"
#define UNO_NAME_CREATE_FROM_MARKS "CreateFromMarks"
#define UNO_NAME_CREATE_FROM_OUTLINE "CreateFromOutline"
-#define UNO_NAME_PARAGRAPH_STYLE_NAMES "ParagraphStyleNames"
#define UNO_NAME_CREATE_FROM_CHAPTER "CreateFromChapter"
#define UNO_NAME_CREATE_FROM_LABELS "CreateFromLabels"
#define UNO_NAME_USE_ALPHABETICAL_SEPARATORS "UseAlphabeticalSeparators"
@@ -477,7 +425,6 @@
#define UNO_NAME_USE_LEVEL_FROM_SOURCE "UseLevelFromSource"
#define UNO_NAME_LEVEL_FORMAT "LevelFormat"
#define UNO_NAME_LEVEL_PARAGRAPH_STYLES "LevelParagraphStyles"
-#define UNO_NAME_RECALC_TAB_STOPS "RecalcTabStops"
#define UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME "MainEntryCharacterStyleName"
#define UNO_NAME_CREATE_FROM_TABLES "CreateFromTables"
#define UNO_NAME_CREATE_FROM_TEXT_FRAMES "CreateFromTextFrames"
@@ -529,8 +476,6 @@
#define UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE "FooterBottomBorderDistance"
#define UNO_NAME_PARA_IS_NUMBERING_RESTART "ParaIsNumberingRestart"
#define UNO_NAME_HIDE_FIELD_TIPS "HideFieldTips"
-#define UNO_NAME_HEADER_USER_DEFINED_ATTRIBUTES "HeaderUserDefinedAttributes"
-#define UNO_NAME_FOOTER_USER_DEFINED_ATTRIBUTES "FooterUserDefinedAttributes"
#define UNO_NAME_PARA_SHADOW_FORMAT "ParaShadowFormat"
#define UNO_NAME_CONTOUR_POLY_POLYGON "ContourPolyPolygon"
#define UNO_NAME_INDEX_ENTRY_TYPE "IndexEntryType"
@@ -663,59 +608,7 @@
#define UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME UNO_NAME_FILLTRANSPARENCEGRADIENTNAME
#define UNO_NAME_SW_FILLCOLOR_2 UNO_NAME_FILLCOLOR_2
-#define UNO_NAME_HEADER_FILLBMP_LOGICAL_SIZE "HeaderFillBitmapLogicalSize"
-#define UNO_NAME_HEADER_FILLBMP_OFFSET_X "HeaderFillBitmapOffsetX"
-#define UNO_NAME_HEADER_FILLBMP_OFFSET_Y "HeaderFillBitmapOffsetY"
-#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_X "HeaderFillBitmapPositionOffsetX"
-#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_Y "HeaderFillBitmapPositionOffsetY"
-#define UNO_NAME_HEADER_FILLBMP_RECTANGLE_POINT "HeaderFillBitmapRectanglePoint"
-#define UNO_NAME_HEADER_FILLBMP_SIZE_X "HeaderFillBitmapSizeX"
-#define UNO_NAME_HEADER_FILLBMP_SIZE_Y "HeaderFillBitmapSizeY"
-#define UNO_NAME_HEADER_FILLBMP_STRETCH "HeaderFillBitmapStretch"
-#define UNO_NAME_HEADER_FILLBMP_TILE "HeaderFillBitmapTile"
-#define UNO_NAME_HEADER_FILLBMP_MODE "HeaderFillBitmapMode"
-#define UNO_NAME_HEADER_FILLCOLOR "HeaderFillColor"
-#define UNO_NAME_HEADER_FILLBACKGROUND "HeaderFillBackground"
-#define UNO_NAME_HEADER_FILLBITMAP "HeaderFillBitmap"
-#define UNO_NAME_HEADER_FILLBITMAPNAME "HeaderFillBitmapName"
-#define UNO_NAME_HEADER_FILLBITMAPURL "HeaderFillBitmapURL"
-#define UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT "HeaderFillGradientStepCount"
-#define UNO_NAME_HEADER_FILLGRADIENT "HeaderFillGradient"
-#define UNO_NAME_HEADER_FILLGRADIENTNAME "HeaderFillGradientName"
-#define UNO_NAME_HEADER_FILLHATCH "HeaderFillHatch"
-#define UNO_NAME_HEADER_FILLHATCHNAME "HeaderFillHatchName"
-#define UNO_NAME_HEADER_FILLSTYLE "HeaderFillStyle"
-#define UNO_NAME_HEADER_FILL_TRANSPARENCE "HeaderFillTransparence"
-#define UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENT "HeaderFillTransparenceGradient"
-#define UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENTNAME "HeaderFillTransparenceGradientName"
-#define UNO_NAME_HEADER_FILLCOLOR_2 "HeaderFillColor2"
-#define UNO_NAME_FOOTER_FILLBMP_LOGICAL_SIZE "FooterFillBitmapLogicalSize"
-#define UNO_NAME_FOOTER_FILLBMP_OFFSET_X "FooterFillBitmapOffsetX"
-#define UNO_NAME_FOOTER_FILLBMP_OFFSET_Y "FooterFillBitmapOffsetY"
-#define UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_X "FooterFillBitmapPositionOffsetX"
-#define UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_Y "FooterFillBitmapPositionOffsetY"
-#define UNO_NAME_FOOTER_FILLBMP_RECTANGLE_POINT "FooterFillBitmapRectanglePoint"
-#define UNO_NAME_FOOTER_FILLBMP_SIZE_X "FooterFillBitmapSizeX"
-#define UNO_NAME_FOOTER_FILLBMP_SIZE_Y "FooterFillBitmapSizeY"
-#define UNO_NAME_FOOTER_FILLBMP_STRETCH "FooterFillBitmapStretch"
-#define UNO_NAME_FOOTER_FILLBMP_TILE "FooterFillBitmapTile"
-#define UNO_NAME_FOOTER_FILLBMP_MODE "FooterFillBitmapMode"
-#define UNO_NAME_FOOTER_FILLCOLOR "FooterFillColor"
-#define UNO_NAME_FOOTER_FILLBACKGROUND "FooterFillBackground"
-#define UNO_NAME_FOOTER_FILLBITMAP "FooterFillBitmap"
-#define UNO_NAME_FOOTER_FILLBITMAPNAME "FooterFillBitmapName"
-#define UNO_NAME_FOOTER_FILLBITMAPURL "FooterFillBitmapURL"
-#define UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT "FooterFillGradientStepCount"
-#define UNO_NAME_FOOTER_FILLGRADIENT "FooterFillGradient"
-#define UNO_NAME_FOOTER_FILLGRADIENTNAME "FooterFillGradientName"
-#define UNO_NAME_FOOTER_FILLHATCH "FooterFillHatch"
-#define UNO_NAME_FOOTER_FILLHATCHNAME "FooterFillHatchName"
-#define UNO_NAME_FOOTER_FILLSTYLE "FooterFillStyle"
-#define UNO_NAME_FOOTER_FILL_TRANSPARENCE "FooterFillTransparence"
-#define UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENT "FooterFillTransparenceGradient"
-#define UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENTNAME "FooterFillTransparenceGradientName"
-#define UNO_NAME_FOOTER_FILLCOLOR_2 "FooterFillColor2"
#define UNO_NAME_PARA_STYLEHEADING "ParaStyleHeading"
#define UNO_NAME_PARA_STYLELEVEL1 "ParaStyleLevel1"
@@ -761,7 +654,6 @@
#define UNO_NAME_CONNECTION "ActiveConnection"
#define UNO_NAME_MODEL "Model"
#define UNO_NAME_DATA_SOURCE_NAME "DataSourceName"
-#define UNO_NAME_DATA_COMMAND "DataCommand"
#define UNO_NAME_FILTER "Filter"
#define UNO_NAME_DOCUMENT_URL "DocumentURL"
#define UNO_NAME_OUTPUT_URL "OutputURL"
@@ -789,7 +681,6 @@
#define UNO_NAME_COLLAPSING_BORDERS "CollapsingBorders"
#define UNO_NAME_WRAP_INFLUENCE_ON_POSITION "WrapInfluenceOnPosition"
#define UNO_NAME_DATA_BASE_URL "DataBaseURL"
-#define UNO_NAME_DATA_BASE_RESOURCE "DataBaseResource"
#define UNO_NAME_TRANSFORMATION_IN_HORI_L2R "TransformationInHoriL2R"
#define UNO_NAME_POSITION_LAYOUT_DIR "PositionLayoutDir"
#define UNO_NAME_NUMBERING_IS_OUTLINE "NumberingIsOutline"
@@ -821,7 +712,6 @@
#define UNO_NAME_IS_FIELD_DISPLAYED "IsFieldDisplayed"
#define UNO_NAME_BUILDID "BuildId"
#define UNO_NAME_PARA_STYLE_CONDITIONS "ParaStyleConditions"
-#define UNO_NAME_PRINT_EMPTY_PAGES "PrintEmptyPages"
#define UNO_NAME_ROLE "Role"
#define UNO_NAME_FIELD_CODE "FieldCode"
#define UNO_NAME_HAS_VALID_SIGNATURES "HasValidSignatures"
@@ -839,7 +729,6 @@
#define UNO_NAME_LISTTAB_STOP_POSITION "ListtabStopPosition"
#define UNO_NAME_FIRST_LINE_INDENT "FirstLineIndent"
#define UNO_NAME_INDENT_AT "IndentAt"
-#define UNO_NAME_CHAPTER_LEVEL "ChapterLevel"
#define UNO_NAME_GRID_BASE_WIDTH "GridBaseWidth"
#define UNO_NAME_GRID_SNAP_TO_CHARS "GridSnapToChars"
#define UNO_NAME_GRID_STANDARD_PAGE_MODE "StandardPageMode"
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 25c1d88cc106..bae0e1db1d63 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -60,7 +60,6 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_1_SYNCHRONIZE 0x01000000L
#define VIEWOPT_1_GRIDVISIBLE 0x02000000L
#define VIEWOPT_1_ONLINESPELL 0x04000000L
-#define VIEWOPT_1_RESERVED1 0x10000000L
#define VIEWOPT_1_VIEWMETACHARS 0x20000000L
#define VIEWOPT_1_PAGEBACK 0x40000000L
@@ -71,19 +70,15 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_CORE2_PDF_EXPORT 0x00000010L
#define VIEWOPT_CORE2_PRINTING 0x00000020L
-#define VIEWOPT_2_UNUSED1 0x00000100L
-#define VIEWOPT_2_UNUSED2 0x00000200L
#define VIEWOPT_2_H_RULER 0x00000400L
#define VIEWOPT_2_VSCROLLBAR 0x00000800L
#define VIEWOPT_2_HSCROLLBAR 0x00001000L
-#define VIEWOPT_2_STATUSLINE 0x00002000L
#define VIEWOPT_2_V_RULER 0x00004000L
#define VIEWOPT_2_ANY_RULER 0x00008000L
#define VIEWOPT_2_MODIFIED 0x00010000L
#define VIEWOPT_2_KEEPASPECTRATIO 0x00020000L
#define VIEWOPT_2_GRFKEEPZOOM 0x00040000L
#define VIEWOPT_2_CONTENT_TIPS 0x00100000L
-#define VIEWOPT_2_RESERVED3 0x00200000L
#define VIEWOPT_2_SCROLLBAR_TIPS 0x00400000L
#define VIEWOPT_2_PRTFORMAT 0x00800000L
#define VIEWOPT_2_SHADOWCRSR 0x01000000L
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 689490570ab9..e03806bdd924 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -102,7 +102,6 @@ typedef struct _xmlTextWriter *xmlTextWriterPtr;
#define FRMC_BODY 7
#define FRMC_FLY 8
#define FRMC_SECTION 9
-#define FRMC_UNUSED 10
#define FRMC_TAB 11
#define FRMC_ROW 12
#define FRMC_CELL 13
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index 4652871e02b8..dda98df41cfa 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -47,7 +47,6 @@ namespace com { namespace sun { namespace star { namespace uno {
#define FIELD_PROP_BOOL4 28
#define FIELD_PROP_STRINGS 29
#define FIELD_PROP_PAR5 30
-#define FIELD_PROP_PAR6 31
#define FIELD_PROP_IS_FIELD_USED 32
#define FIELD_PROP_IS_FIELD_DISPLAYED 33
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 34f9e1bee568..71db7d9aa809 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -55,8 +55,6 @@ struct SwMultiCreator;
class SwMultiPortion;
class SwWrongList;
-/* Minimum percentage for kerning */
-#define MINKERNPERCENT 5
#define ARROW_WIDTH 200
#define DIR_LEFT2RIGHT 0
#define DIR_BOTTOM2TOP 1
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 8e0eb6cb9b30..1b45b8a128a0 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -49,7 +49,6 @@ class SwPortionHandler;
#define PORGRP_GLUE 0x0400
#define PORGRP_FIX 0x0200
#define PORGRP_TAB 0x0100
-#define PORGRP_NOTRECY 0x0080
// Small special groups
#define PORGRP_FIXMARG 0x0040
//#define PORGRP_? 0x0020
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index ee5b0e6ac712..53c25527d19d 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -149,7 +149,6 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG =
#define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG)
#define CSS1_OUTMODE_STYLE_OPT CSS1_OUTMODE_ONOFF(STYLE_OPT)
#define CSS1_OUTMODE_RULE CSS1_OUTMODE_ONOFF(RULE)
-#define CSS1_OUTMODE_SPAN_TAG1 CSS1_OUTMODE_ONOFF(TAG1)
// Die folgenden Flags legen fest, was ausgegeben wird
// bit 6,7,8,9
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 287615410fda..f89c4f96aa12 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -71,12 +71,6 @@ public:
~SwRelNumRuleSpaces();
};
-#define SW_SV_BRUSH_25 0
-#define SW_SV_BRUSH_50 1
-#define SW_SV_BRUSH_75 2
-#define SW_SV_BRUSH_NULL 3
-#define SW_SV_BRUSH_SOLID 4
-#define SW_SV_BRUSH_INVALID 5
// Get size of fly (if 'automatic' in WW) and check if not too small
SW_DLLPUBLIC void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index b3f5c169f10d..06d446576eee 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -112,16 +112,9 @@ namespace com{namespace sun {namespace star{
}}}
// defines nur fuer die WW8-variable der INI-Datei
-#define WW8FL_NO_TEXT 1
#define WW8FL_NO_STYLES 2
-#define WW8FL_NO_ZSTYLES 4 // keine Zeichenstyles importieren
#define WW8FL_NO_GRAF 0x80
-// falls gestetzt, werden fuer Writer-Def-Styles neue Styles mit den
-// WW8-Def-Style-Eigenschaften erzeugt, statt die Writer-Standards zu
-// ueberschreiben
-#define WW8FL_NO_DEFSTYLES 0x400
-
#define WW8FL_NO_OUTLINE 0x1000
#define WW8FL_NO_IMPLPASP 0x4000 // no implicit para space
#define WW8FL_NO_GRAFLAYER 0x8000
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 23fda32c2b23..3a3ab7614733 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -31,8 +31,6 @@
#define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000
#define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000
#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000
-#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export
-#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export
#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000
#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000
#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 9027732b0ada..0cb84faeed57 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -38,13 +38,11 @@ class SwFmtCol;
const SwTwips DFLT_WIDTH = MM50 * 4;
const SwTwips DFLT_HEIGHT = MM50;
-#define FULL_ATTRSET 0xffff
#define FRMMGR_TYPE_NONE 0x00
#define FRMMGR_TYPE_TEXT 0x01
#define FRMMGR_TYPE_GRF 0x02
#define FRMMGR_TYPE_OLE 0x04
-#define FRMMGR_TYPE_LABEL 0x08
#define FRMMGR_TYPE_ENVELP 0x10
class SW_DLLPUBLIC SwFlyFrmAttrMgr
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 09875a9a01c6..91ed4d39929b 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -46,7 +46,6 @@ struct SwBmpItemInfo
#define NUM_PAGETYPE_SINGLENUM 1
#define NUM_PAGETYPE_NUM 2
#define NUM_PAGETYPE_BMP 3
-#define PAGETYPE_USER_START 10
class SwNumPositionTabPage : public SfxTabPage
{
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 219a60570f76..c36fb85ebd03 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -39,9 +39,6 @@ class SwContentType;
#define CONTENT_TYPE_DRAWOBJECT 11
#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1
-// types for global document
-#define GLOBAL_CONTENT_TEXT 102
-
// strings for context menus
#define CONTEXT_COUNT 12
#define GLOBAL_CONTEXT_COUNT 14
diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc
index fcd19f46d70b..fe6cbd803194 100644
--- a/sw/source/uibase/lingu/olmenu.hrc
+++ b/sw/source/uibase/lingu/olmenu.hrc
@@ -43,7 +43,6 @@
#define MN_AUTOCORR 204
#define MN_SET_LANGUAGE_SELECTION 205
#define MN_SET_LANGUAGE_PARAGRAPH 206
-#define MN_SET_LANGUAGE_ALL_TEXT 207
#define MN_SHORT_COMMENT 208
#define MN_EXPLANATION_LINK 209
#define MN_ADD_TO_DIC_SINGLE 210
diff --git a/sw/source/uibase/ribbar/inputwin.hrc b/sw/source/uibase/ribbar/inputwin.hrc
index a62748a019c1..c7d371c8f8e4 100644
--- a/sw/source/uibase/ribbar/inputwin.hrc
+++ b/sw/source/uibase/ribbar/inputwin.hrc
@@ -53,9 +53,6 @@
#define ED_POS 2
#define ED_FORMULA 3
-#define STR_ED_POS 1
-#define STR_ED_FORMULA 2
-#define STR_TOOLBAR_FORMULA 35
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PropertyPanel.hrc b/sw/source/uibase/sidebar/PropertyPanel.hrc
index b374ab3dc96b..8e9bd36469b8 100644
--- a/sw/source/uibase/sidebar/PropertyPanel.hrc
+++ b/sw/source/uibase/sidebar/PropertyPanel.hrc
@@ -28,7 +28,6 @@
#define RID_POPUP_SWPAGE_COLUMN (RC_PROPERTYPANEL_BEGIN + 5)
#define RID_POPUP_SWPAGE_SIZE (RC_PROPERTYPANEL_BEGIN + 6)
-#define PROPERTY_PANEL_END RID_POPUP_SWPAGE_SIZE
#endif
diff --git a/sw/source/uibase/utlui/navipi.hrc b/sw/source/uibase/utlui/navipi.hrc
index 651cd0dba506..36cab2dba5ed 100644
--- a/sw/source/uibase/utlui/navipi.hrc
+++ b/sw/source/uibase/utlui/navipi.hrc
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define IL_CONTENT 7
-#define FT_PAGE 10
#define TB_CONTENT 50
#define TL_CONTENT 51
#define LB_DOCS 53
diff --git a/ucb/source/ucp/file/filerror.hxx b/ucb/source/ucp/file/filerror.hxx
index 7e08a495dbda..a31de1b790bf 100644
--- a/ucb/source/ucp/file/filerror.hxx
+++ b/ucb/source/ucp/file/filerror.hxx
@@ -23,7 +23,6 @@
namespace fileaccess {
// Error codes used to deliver the resulting exceptions
-#define LOWEST_FREE_ERROR 72
#define TASKHANDLER_NO_ERROR 0
#define TASKHANDLER_UNSUPPORTED_COMMAND 1
@@ -53,7 +52,6 @@ namespace fileaccess {
#define TASKHANDLING_NONAMESET_INSERT_COMMAND 23
#define TASKHANDLING_NOCONTENTTYPE_INSERT_COMMAND 24
-#define TASKHANDLING_ANYOTHER_WRITE 25 // not used
#define TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE 26
#define TASKHANDLING_NO_OPEN_FILE_FOR_WRITE 27
#define TASKHANDLING_NOTCONNECTED_FOR_WRITE 28
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index ac42a66bd3c7..4b1c7d0bc8d0 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -49,7 +49,6 @@ namespace ucbhelper
namespace gio
{
-#define GIO_CONTENT_SERVICE_NAME "com.sun.star.ucb.GIOContent"
#define GIO_FILE_TYPE "application/vnd.sun.staroffice.gio-file"
#define GIO_FOLDER_TYPE "application/vnd.sun.staroffice.gio-folder"
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 569ba113f181..1d6a0932b932 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/beans/Property.hpp>
#include <ucbhelper/providerhelper.hxx>
-#define GIO_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.GIOContentProvider"
namespace gio
{
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 29e465d5cdec..dec90befbe79 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -39,7 +39,6 @@ namespace hierarchy_ucp {
#define HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME \
"com.sun.star.ucb.HierarchyContentProvider"
-#define HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 41
#define HIERARCHY_URL_SCHEME \
"vnd.sun.star.hier"
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 14213abc3d66..6fc6a70ba5ea 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -35,7 +35,6 @@ namespace package_ucp {
// create instances of the provider.
#define PACKAGE_CONTENT_PROVIDER_SERVICE_NAME \
"com.sun.star.ucb.PackageContentProvider"
-#define PACKAGE_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 39
// UCB Content Type.
#define PACKAGE_FOLDER_CONTENT_TYPE \
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 0bbf31854b47..e8855497c356 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -42,7 +42,6 @@ namespace tdoc_ucp {
#define TDOC_CONTENT_PROVIDER_SERVICE_NAME \
"com.sun.star.ucb.TransientDocumentsContentProvider"
-#define TDOC_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 50
#define TDOC_ROOT_CONTENT_TYPE \
"application/" TDOC_URL_SCHEME "-root"
diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx
index 5c5e006fdfa1..5f2b69933c68 100644
--- a/vcl/inc/cvtsvm.hxx
+++ b/vcl/inc/cvtsvm.hxx
@@ -43,12 +43,10 @@
#define GDI_TEXT_ACTION 13
#define GDI_TEXTARRAY_ACTION 14
#define GDI_STRETCHTEXT_ACTION 15
-#define GDI_ICON_ACTION 16
#define GDI_BITMAP_ACTION 17
#define GDI_BITMAPSCALE_ACTION 18
#define GDI_PEN_ACTION 19
#define GDI_FONT_ACTION 20
-#define GDI_BACKBRUSH_ACTION 21
#define GDI_FILLBRUSH_ACTION 22
#define GDI_MAPMODE_ACTION 23
#define GDI_CLIPREGION_ACTION 24
@@ -57,7 +55,6 @@
#define GDI_POP_ACTION 27
#define GDI_MOVECLIPREGION_ACTION 28
#define GDI_ISECTCLIPREGION_ACTION 29
-#define GDI_MTF_ACTION 30
#define GDI_BITMAPSCALEPART_ACTION 32
#define GDI_GRADIENT_ACTION 33
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index e1ba5bbe629e..9ce9c5cbc899 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -25,12 +25,9 @@
#include <unordered_map>
// see com.sun.star.portal.client.JobSetupSystem.idl:
-#define JOBSETUP_SYSTEM_DONTKNOW 0
#define JOBSETUP_SYSTEM_WINDOWS 1
-#define JOBSETUP_SYSTEM_OS2 2
#define JOBSETUP_SYSTEM_UNIX 3
#define JOBSETUP_SYSTEM_MAC 4
-#define JOBSETUP_SYSTEM_JAVA 5
struct ImplJobSetup
{
diff --git a/vcl/inc/osx/salnativewidgets.h b/vcl/inc/osx/salnativewidgets.h
index 2a987627e82a..1ba697afafa2 100644
--- a/vcl/inc/osx/salnativewidgets.h
+++ b/vcl/inc/osx/salnativewidgets.h
@@ -27,8 +27,6 @@
//standard height of the AHIG
//tabs
#define TAB_HEIGHT_NORMAL 20
-#define TAB_HEIGHT_SMALL 17
-#define TAB_HEIGHT_MINI 15
#define TAB_TEXT_OFFSET 12
#define VCL_TAB_TEXT_OFFSET 2
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 2eca3a3c269f..358a77946e9a 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -56,9 +56,7 @@ namespace vcl_sal { class WMAdaptor; }
// dither brush each time
#define PROPERTY_BUG_FillPolygon_Tile 0x00010000 // always Toggle Fillstyle
#define PROPERTY_BUG_DrawLine 0x00020000 // a DrawLine is one point to short
-#define PROPERTY_BUG_Bitmap_Bit_Order 0x00100000
-#define PROPERTY_FEATURE_SharedMemory 0x02000000
#define PROPERTY_FEATURE_TrustedSolaris 0x04000000
#define PROPERTY_DEFAULT 0x00000FCB
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 2c0731eaa623..c850c7eb799a 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -201,18 +201,13 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
#define SAL_FRAME_WNDEXTRA sizeof( DWORD )
#define SAL_FRAME_THIS 0
-#define SAL_FRAME_CLASSNAMEA "SALFRAME"
#define SAL_FRAME_CLASSNAMEW L"SALFRAME"
-#define SAL_SUBFRAME_CLASSNAMEA "SALSUBFRAME"
#define SAL_SUBFRAME_CLASSNAMEW L"SALSUBFRAME"
#define SAL_TMPSUBFRAME_CLASSNAMEW L"SALTMPSUBFRAME"
#define SAL_OBJECT_WNDEXTRA sizeof( DWORD )
#define SAL_OBJECT_THIS 0
#define SAL_OBJECT_CLASSNAMEA "SALOBJECT"
-#define SAL_OBJECT_CLASSNAMEW L"SALOBJECT"
#define SAL_OBJECT_CHILDCLASSNAMEA "SALOBJECTCHILD"
-#define SAL_OBJECT_CHILDCLASSNAMEW L"SALOBJECTCHILD"
-#define SAL_COM_CLASSNAMEA "SALCOMWND"
#define SAL_COM_CLASSNAMEW L"SALCOMWND"
#define SAL_MOUSELEAVE_TIMEOUT 300
diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/source/filter/jpeg/transupp.h
index 4dbbc2ae9bc6..d556228691a6 100644
--- a/vcl/source/filter/jpeg/transupp.h
+++ b/vcl/source/filter/jpeg/transupp.h
@@ -205,7 +205,6 @@ typedef enum {
JCOPYOPT_ALL /* copy all optional markers */
} JCOPY_OPTION;
-#define JCOPYOPT_DEFAULT JCOPYOPT_COMMENTS /* recommended default */
/* Setup decompression object to save desired markers in memory */
EXTERN(void) jcopy_markers_setup
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index 501b2f26b635..9e0eeedcd7c3 100644
--- a/vcl/source/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
@@ -27,12 +27,8 @@
#define SgfSimpVect 2 /* Simple vectorformat */
#define SgfPostScrp 3 /* Postscript file */
#define SgfStarDraw 7 /* StarDraw SGV-file */
-#define SgfDontKnow 255 /* Unknown or no SGF/SGV */
// constants for SgfHeader.SwGrCol
-#define SgfBlckWhit 1 /* black/white image SimpVector, */
-#define SgfGrayscal 2 /* image with greyscale StarDraw and */
-#define Sgf16Colors 3 /* colour image (16 colours) Bit Image */
#define SgfVectFarb 4 /* use colours in lines */
#define SgfVectGray 5 /* use greyscale for lines only for */
#define SgfVectWdth 6 /* use line widths for lines SimpVector */
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 7958ec8c340b..521a21a100f7 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -268,7 +268,6 @@ public:
};
#define TextOutlBit 0x01 /* 1=Sourcecode for outliner (ignored byDrawObjekt()) */
#define TextFitSBit 0x02 /* Bit1: 1=Text-Fit2Size, also outliner (2.0) */
-#define TextDrftBit 0x04 /* Bit2: 1=DraftDraw (2.0) */
#define TextFitZBit 0x08 /* Bit3: 1=Fit2Size line by line (2.0) */
#define TextFitBits (TextFitSBit | TextFitZBit)
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 8eae6155977c..7d96353f92c1 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -31,7 +31,6 @@
#define ERROR 0
#define NULLREGION 1
-#define SIMPLEREGION 2
#define COMPLEXREGION 3
#define RGN_AND 1
@@ -63,34 +62,19 @@ enum class BkMode
#define DKGRAY_BRUSH 3
#define BLACK_BRUSH 4
#define NULL_BRUSH 5
-#define HOLLOW_BRUSH NULL_BRUSH
#define WHITE_PEN 6
#define BLACK_PEN 7
#define NULL_PEN 8
-#define OEM_FIXED_FONT 10
#define ANSI_FIXED_FONT 11
#define ANSI_VAR_FONT 12
-#define SYSTEM_FONT 13
-#define DEVICE_DEFAULT_FONT 14
-#define DEFAULT_PALETTE 15
#define SYSTEM_FIXED_FONT 16
#define R2_BLACK 1
-#define R2_NOTMERGEPEN 2
#define R2_MASKNOTPEN 3
-#define R2_NOTCOPYPEN 4
-#define R2_MASKPENNOT 5
#define R2_NOT 6
#define R2_XORPEN 7
-#define R2_NOTMASKPEN 8
-#define R2_MASKPEN 9
-#define R2_NOTXORPEN 10
#define R2_NOP 11
-#define R2_MERGENOTPEN 12
#define R2_COPYPEN 13
-#define R2_MERGEPENNOT 14
-#define R2_MERGEPEN 15
-#define R2_WHITE 16
/* Mapping modes */
#define MM_TEXT 1
@@ -105,18 +89,15 @@ enum class BkMode
/* Graphics modes */
#define GM_COMPATIBLE 1
#define GM_ADVANCED 2
-#define GM_LAST 2
/* StretchBlt() modes */
#define BLACKONWHITE 1
#define WHITEONBLACK 2
#define COLORONCOLOR 3
#define HALFTONE 4
-#define MAXSTRETCHBLTMODE 4
#define STRETCH_ANDSCANS BLACKONWHITE
#define STRETCH_ORSCANS WHITEONBLACK
#define STRETCH_DELETESCANS COLORONCOLOR
-#define STRETCH_HALFTONE HALFTONE
#define LF_FACESIZE 32
@@ -154,14 +135,8 @@ struct WMF_EXTERNALHEADER;
#define SRCAND 0x008800C6L
#define SRCINVERT 0x00660046L
#define SRCERASE 0x00440328L
-#define NOTSRCCOPY 0x00330008L
-#define NOTSRCERASE 0x001100A6L
-#define MERGECOPY 0x00C000CAL
-#define MERGEPAINT 0x00BB0226L
#define PATCOPY 0x00F00021L
-#define PATPAINT 0x00FB0A09L
#define PATINVERT 0x005A0049L
-#define DSTINVERT 0x00550009L
#define BLACKNESS 0x00000042L
#define WHITENESS 0x00FF0062L
@@ -172,23 +147,16 @@ struct WMF_EXTERNALHEADER;
#define PS_DASHDOTDOT 4
#define PS_NULL 5
#define PS_INSIDEFRAME 6
-#define PS_USERSTYLE 7
-#define PS_ALTERNATE 8
#define PS_STYLE_MASK 15
#define PS_ENDCAP_ROUND 0x000
#define PS_ENDCAP_SQUARE 0x100
#define PS_ENDCAP_FLAT 0x200
-#define PS_ENDCAP_MASK 0xF00
#define PS_JOIN_ROUND 0x0000
#define PS_JOIN_BEVEL 0x1000
#define PS_JOIN_MITER 0x2000
-#define PS_JOIN_MASK 0xF000
-#define PS_COSMETIC 0x00000
-#define PS_GEOMETRIC 0x10000
-#define PS_TYPE_MASK 0xF0000
#define ANSI_CHARSET 0
#define DEFAULT_CHARSET 1
@@ -211,14 +179,10 @@ struct WMF_EXTERNALHEADER;
#define MAC_CHARSET 77
#define BALTIC_CHARSET 186
-#define ETO_OPAQUE 0x0002
#define ETO_CLIPPED 0x0004
/*WINVER >= 0x0400*/
#define ETO_GLYPH_INDEX 0x0010
#define ETO_RTLREADING 0x0080
-#define ETO_NUMERICSLOCAL 0x0400
-#define ETO_NUMERICSLATIN 0x0800
-#define ETO_IGNORELANGUAGE 0x1000
/*_WIN32_WINNT >= 0x0500*/
#define ETO_PDY 0x2000
@@ -234,7 +198,6 @@ struct WMF_EXTERNALHEADER;
#define FF_SCRIPT 0x40
#define FF_DECORATIVE 0x50
-#define FW_DONTCARE 0
#define FW_THIN 100
#define FW_EXTRALIGHT 200
#define FW_LIGHT 300
@@ -243,10 +206,7 @@ struct WMF_EXTERNALHEADER;
#define FW_SEMIBOLD 600
#define FW_BOLD 700
#define FW_EXTRABOLD 800
-#define FW_HEAVY 900
#define FW_ULTRALIGHT 200
-#define FW_REGULAR 400
-#define FW_DEMIBOLD 600
#define FW_ULTRABOLD 800
#define FW_BLACK 900
@@ -262,12 +222,6 @@ struct WMF_EXTERNALHEADER;
#define BS_DIBPATTERN8X8 8
#define BS_MONOPATTERN 9
-#define W_HS_HORIZONTAL 0
-#define W_HS_VERTICAL 1
-#define W_HS_FDIAGONAL 2
-#define W_HS_BDIAGONAL 3
-#define W_HS_CROSS 4
-#define W_HS_DIAGCROSS 5
#define RDH_RECTANGLES 1
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
index ed27ba56e9fc..8f5fa58c0834 100644
--- a/wizards/source/importwizard/importwi.src
+++ b/wizards/source/importwizard/importwi.src
@@ -34,7 +34,6 @@
#define sSearchInSubDir 1022
#define sMSContainerName 1030
#define sSummaryHeader 1031
-#define sSummaryFrame 1032
#define sTextImportLabel 1033
#define sTextExportLabel 1034
#define sGroupnameDefault 1036
@@ -51,12 +50,6 @@
#define sConvertError2 1056
#define sRTErrorDesc 1057
#define sRTErrorHeader 1058
-#define sPathErrorTemplates_1_ 1059
-#define sPathErrorTemplates_2_ 1060
-#define sPathErrorTemplates_3_ 1061
-#define sPathErrorDocument_1_ 1062
-#define sPathErrorDocument_2_ 1063
-#define sPathErrorDocument_3_ 1064
#define sOverwriteallFiles 1070
#define sreeditMacro 1071
#define scouldNotsaveDocument 1072
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index b7fbc6605fa3..5a71b07159b4 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -34,17 +34,14 @@ namespace chelp {
// create instances of the provider.
#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 "com.sun.star.help.XMLHelp"
-#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH1 25
#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 "com.sun.star.ucb.HelpContentProvider"
-#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH2 36
// URL scheme. This is the scheme the provider will be able to create
// contents for. The UCB will select the provider ( i.e. in order to create
// contents ) according to this scheme.
#define MYUCP_URL_SCHEME "vnd.sun.star.help"
-#define MYUCP_URL_SCHEME_LENGTH 18
#define MYUCP_CONTENT_TYPE "application/vnd.sun.star.xmlhelp" // UCB Content Type.
class Databases;
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index 39483ad1b48b..dec628da44a8 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -55,8 +55,6 @@
// --------- tab page Certificate viewer - Certification Path ---------
-#define STR_PATH_CERT_OK 8
-#define STR_PATH_CERT_NOT_VALIDATED 9
#endif
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 0972ac444f05..c0602fc7bbfd 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -22,10 +22,6 @@
#include <svl/solar.hrc>
-#define HID_XMLSEC_TP_GENERAL "XMLSECURITY_HID_XMLSEC_TP_GENERAL"
-#define HID_XMLSEC_TP_DETAILS "XMLSECURITY_HID_XMLSEC_TP_DETAILS"
-#define HID_XMLSEC_TP_MACROWARN "XMLSECURITY_HID_XMLSEC_TP_MACROWARN"
-#define HID_XMLSEC_CTRL_ELEMENTS "XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS"
#define HID_XMLSEC_TREE_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_TREE_SIGNATURESDLG"
#endif // #ifndef _XMLSEC_HELPIDS_HRC
diff --git a/xmlsecurity/source/xmlsec/nss/nssrenam.h b/xmlsecurity/source/xmlsec/nss/nssrenam.h
index c56cf3e9a7b3..411f279e06c5 100644
--- a/xmlsecurity/source/xmlsec/nss/nssrenam.h
+++ b/xmlsecurity/source/xmlsec/nss/nssrenam.h
@@ -36,16 +36,8 @@
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_NSSRENAM_H
#define CERT_NewTempCertificate __CERT_NewTempCertificate
-#define PK11_CreateContextByRawKey __PK11_CreateContextByRawKey
#define PK11_GetKeyData __PK11_GetKeyData
-#define nss_InitLock __nss_InitLock
-#define CERT_ClosePermCertDB __CERT_ClosePermCertDB
#define CERT_DecodeDERCertificate __CERT_DecodeDERCertificate
-#define CERT_TraversePermCertsForNickname __CERT_TraversePermCertsForNickname
-#define CERT_TraversePermCertsForSubject __CERT_TraversePermCertsForSubject
-#define PBE_CreateContext __PBE_CreateContext
-#define PBE_DestroyContext __PBE_DestroyContext
-#define PBE_GenerateBits __PBE_GenerateBits
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_NSSRENAM_H