UnoControls/source/inc/framecontrol.hxx | 1 UnoControls/source/inc/progressmonitor.hxx | 1 basic/source/inc/runtime.hxx | 4 basic/source/sbx/sbxres.hxx | 22 bin/find-unused-defines.awk | 18 bin/find-unused-defines.sh | 27 chart2/source/controller/inc/HelpIds.hrc | 10 chart2/source/inc/servicenames.hxx | 1 chart2/source/view/main/OpenGLRender.hxx | 1 connectivity/source/drivers/evoab2/NDriver.hxx | 5 connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx | 1 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 1 connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 1 cui/source/customize/acccfg.hrc | 1 cui/source/dialogs/scriptdlg.hrc | 5 cui/source/inc/cuioptgenrl.hxx | 1 cui/source/inc/helpid.hrc | 13 cui/source/inc/iconcdlg.hxx | 1 cui/source/inc/scriptdlg.hxx | 1 cui/source/tabpages/align.hrc | 3 cui/source/tabpages/page.h | 4 dbaccess/inc/dbaccess_helpid.hrc | 76 - dbaccess/source/core/inc/dbamiscres.hrc | 24 dbaccess/source/inc/dsntypes.hxx | 1 dbaccess/source/ui/inc/browserids.hxx | 2 dbaccess/source/ui/inc/dbu_resource.hrc | 4 desktop/source/app/desktop.hrc | 1 dtrans/source/win32/dtobj/DTransHelper.hxx | 3 filter/source/graphicfilter/icgm/chart.hxx | 11 filter/source/placeware/zipfile.hxx | 51 - filter/source/svg/svgwriter.hxx | 2 forms/source/component/EditBase.hxx | 6 formula/source/ui/dlg/formdlgs.hrc | 11 fpicker/source/office/iodlg.hxx | 2 fpicker/source/win32/filepicker/resource.h | 4 framework/inc/classes/resource.hrc | 1 framework/inc/properties.h | 59 - framework/inc/services.h | 36 framework/source/jobs/joburl.cxx | 1 framework/source/layoutmanager/helpers.hxx | 1 hwpfilter/source/drawdef.h | 8 hwpfilter/source/hbox.h | 16 hwpfilter/source/hwplib.h | 1 i18npool/inc/servicename.hxx | 1 idl/inc/basobj.hxx | 4 include/basic/sbxdef.hxx | 12 include/clew/clew.h | 199 ----- include/comphelper/classids.hxx | 1 include/comphelper/documentconstants.hxx | 23 include/cppuhelper/factory.hxx | 1 include/editeng/editdata.hxx | 2 include/editeng/eeitemid.hxx | 20 include/editeng/outliner.hxx | 3 include/editeng/unoprnms.hxx | 41 - include/filter/msfilter/escherex.hxx | 397 ---------- include/filter/msfilter/msdffimp.hxx | 5 include/filter/msfilter/svdfppt.hxx | 109 -- include/oox/ole/olehelper.hxx | 1 include/osl/detail/component-defines.h | 25 include/osl/process.h | 2 include/osl/socket.h | 1 include/postwin.h | 3 include/sfx2/childwin.hxx | 2 include/sfx2/docfac.hxx | 12 include/sfx2/msg.hxx | 1 include/sfx2/objsh.hxx | 2 include/sfx2/sfxcommands.h | 1 include/sfx2/shell.hxx | 1 include/sfx2/sidebar/ResourceDefinitions.hrc | 15 include/sfx2/tabdlg.hxx | 1 include/sfx2/viewsh.hxx | 3 include/sot/storage.hxx | 5 include/svl/filerec.hxx | 6 include/svl/smplhint.hxx | 11 include/svtools/grfmgr.hxx | 1 include/svtools/htmlkywd.hxx | 14 include/svtools/imgdef.hxx | 1 include/svtools/ivctrl.hxx | 2 include/svtools/treelistbox.hxx | 5 include/svtools/treelistentry.hxx | 1 include/svx/EnhancedCustomShape2d.hxx | 1 include/svx/gallery.hxx | 1 include/svx/galmisc.hxx | 1 include/svx/ifaceids.hxx | 1 include/svx/msdffdef.hxx | 301 ------- include/svx/nbdtmg.hxx | 1 include/svx/svdmodel.hxx | 1 include/svx/svdmrkv.hxx | 3 include/svx/svxcommands.h | 8 include/svx/unomid.hxx | 2 include/svx/xpoly.hxx | 1 include/toolkit/awt/vclxgraphics.hxx | 1 include/toolkit/helper/property.hxx | 3 include/tools/errcode.hxx | 19 include/tools/poly.hxx | 1 include/tools/rc.h | 6 include/uno/lbnames.h | 2 include/unotools/configvaluecontainer.hxx | 1 include/unotools/linguprops.hxx | 8 include/vcl/bitmap.hxx | 1 include/vcl/gdimtf.hxx | 1 include/vcl/graphicfilter.hxx | 1 include/vcl/print.hxx | 1 include/vcl/salnativewidgets.hxx | 3 include/vcl/settings.hxx | 2 include/vcl/stdtext.hxx | 1 include/vcl/syswin.hxx | 6 include/vcl/txtattr.hxx | 1 include/vcl/vclenum.hxx | 2 include/vcl/vclevent.hxx | 4 include/vcl/window.hxx | 1 include/xmloff/families.hxx | 2 include/xmloff/xmlimp.hxx | 2 l10ntools/inc/export.hxx | 2 mysqlc/source/mysqlc_connection.hxx | 1 package/inc/ZipFile.hxx | 1 reportdesign/source/filter/xml/xmlHelper.hxx | 3 reportdesign/source/inc/stringconstants.hrc | 12 reportdesign/source/inc/uistrings.hrc | 7 reportdesign/source/ui/inspection/metadata.cxx | 4 rsc/inc/rscall.h | 2 rsc/inc/rscerror.h | 2 rsc/inc/rscrsc.hxx | 5 rsc/source/rscpp/cpp.h | 2 sal/android/uthash.h | 1 sal/osl/unx/file_error_transl.hxx | 1 sal/osl/w32/file_url.h | 1 sal/osl/w32/sockimpl.h | 2 sal/qa/osl/socket/osl_Socket_Const_orig.h | 5 sc/inc/ViewSettingsSequenceDefines.hxx | 1 sc/inc/attrib.hxx | 2 sc/inc/cfgids.hxx | 1 sc/inc/document.hxx | 2 sc/inc/filter.hxx | 2 sc/inc/global.hxx | 3 sc/inc/helpids.h | 80 -- sc/inc/rechead.hxx | 67 - sc/inc/sccommands.h | 19 sc/inc/unonames.hxx | 2 sc/inc/userdat.hxx | 1 sc/source/filter/inc/excdefs.hxx | 2 sc/source/filter/inc/scflt.hxx | 15 sc/source/filter/inc/xlchart.hxx | 5 sc/source/ui/dbgui/pvfundlg.hrc | 2 sc/source/ui/inc/fupoor.hxx | 1 sc/source/ui/inc/miscdlgs.hrc | 3 sc/source/ui/inc/printfun.hxx | 1 sc/source/ui/inc/viewdata.hxx | 1 sd/inc/glob.hrc | 3 sd/inc/glob.hxx | 14 sd/inc/helpids.h | 59 - sd/inc/sdattr.hrc | 1 sd/inc/sdcommands.h | 19 sd/source/filter/eppt/epptdef.hxx | 106 -- sd/source/filter/html/htmlex.hxx | 3 sd/source/filter/ppt/propread.hxx | 15 sd/source/ui/inc/optsitem.hxx | 1 sd/source/ui/inc/unoprnms.hxx | 16 sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h | 271 ------ sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h | 28 sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h | 3 sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h | 1 sd/source/ui/view/DocumentRenderer.hrc | 1 sfx2/source/inc/helpid.hrc | 2 sfx2/source/inc/workwin.hxx | 1 shell/inc/internal/config.hxx | 2 shell/inc/internal/resource.h | 6 soltools/mkdepend/def.h | 1 starmath/inc/helpids.h | 3 starmath/inc/rect.hxx | 6 svl/source/inc/poolio.hxx | 12 svx/inc/galobj.hxx | 7 svx/inc/helpid.hrc | 2 svx/source/form/formcontroller.cxx | 17 svx/source/inc/datanavi.hrc | 2 svx/source/inc/docrecovery.hxx | 1 svx/source/inc/fmprop.hrc | 22 sw/inc/cmdid.h | 13 sw/inc/editsh.hxx | 1 sw/inc/helpid.h | 125 --- sw/inc/redline.hxx | 3 sw/inc/swabstdlg.hxx | 1 sw/inc/swcommands.h | 12 sw/inc/unocoll.hxx | 2 sw/inc/unomid.h | 1 sw/inc/unoprnms.hxx | 111 -- sw/inc/viewopt.hxx | 5 sw/source/core/inc/frame.hxx | 1 sw/source/core/inc/unofldmid.h | 1 sw/source/core/text/inftxt.hxx | 2 sw/source/core/text/porlin.hxx | 1 sw/source/filter/html/wrthtml.hxx | 1 sw/source/filter/inc/fltini.hxx | 6 sw/source/filter/ww8/ww8par.hxx | 7 sw/source/filter/xml/xmlitmap.hxx | 2 sw/source/uibase/inc/frmmgr.hxx | 2 sw/source/uibase/inc/num.hxx | 1 sw/source/uibase/inc/swcont.hxx | 3 sw/source/uibase/lingu/olmenu.hrc | 1 sw/source/uibase/ribbar/inputwin.hrc | 3 sw/source/uibase/sidebar/PropertyPanel.hrc | 1 sw/source/uibase/utlui/navipi.hrc | 1 ucb/source/ucp/file/filerror.hxx | 2 ucb/source/ucp/gio/gio_content.hxx | 1 ucb/source/ucp/gio/gio_provider.hxx | 1 ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 1 ucb/source/ucp/package/pkgprovider.hxx | 1 ucb/source/ucp/tdoc/tdoc_provider.hxx | 1 vcl/inc/cvtsvm.hxx | 3 vcl/inc/jobset.h | 3 vcl/inc/osx/salnativewidgets.h | 2 vcl/inc/unx/saldisp.hxx | 2 vcl/inc/win/saldata.hxx | 5 vcl/source/filter/jpeg/transupp.h | 1 vcl/source/filter/sgfbram.hxx | 4 vcl/source/filter/sgvmain.hxx | 1 vcl/source/filter/wmf/winmtf.hxx | 46 - wizards/source/importwizard/importwi.src | 7 xmlhelp/source/cxxhelp/provider/provider.hxx | 3 xmlsecurity/source/dialogs/dialogs.hrc | 2 xmlsecurity/source/dialogs/helpids.hrc | 4 xmlsecurity/source/xmlsec/nss/nssrenam.h | 8 222 files changed, 63 insertions(+), 2995 deletions(-)
New commits: commit 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 Author: Noel Grandin <[email protected]> Date: Tue Dec 23 09:47:48 2014 +0200 brute-force find-and-remove of unused #define constants. Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index 55389e8..e982851 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 1725455..4ac928d 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 10b8be8..b56a340 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 dcb3fc7..c635dd2 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 0000000..2649e41 --- /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 0000000..6c07de4 --- /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 e7f074a..9f5aeb7 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 d47f461..212632e 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 54ded30..dddf1c8 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 9b8fe33..5c3026b 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 5f407c4..7d9e5bd 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 f0b6f17..7f93b87 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 eef642b..5afbc95 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 19a5459..7ad1eba 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 41bcc3f..e79e2f0 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 86190a8..500bf7c 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 c227db7..ab1fdc3 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 566d4e1..531b0b6 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 0a734a9..ef0cea6 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 e56d7d1..b9e3ccd 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 64edfe3..8ad2278 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 e37a493..e62c1d7 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 cc1a8a0..3aaa9f0 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 5ca8c83..8fb8ff3 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 65369ec..0681883 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 4bf0d02..5b11a6d 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 4ed5c9f..173685d 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 308331e..7754ec3 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 e92b1a9..5b8e441 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 77a4ee6..92514c3 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 0a77dd7..8d296a2 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 1147dbb..8d8325c 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 84a20f9..3640c81 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 c727cfa..1a1bc55 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 c8f5c63..9cd716c 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 a74b314..8d23371 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 1b0972f..15a162d 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 5d93fac..e7f8573 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 3078d03..54e69f3 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 7acb026..9d66e4b 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 6cb38fe..52b3a9d 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 26a2962..1ae07fd 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 efa5b66..051b36d 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 1a5f14a..1daa886 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 0dd63c3..646cde6 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 3f10eca..dab0f2a 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 9105e7e..94b6c29 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 7cc708f..0658f79 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 7f7b48d..268bf99 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 2d82e288c..66fa074 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 343b969..1847780 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 c6b55f4..72e1852 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 7e250c4..f27818f 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 0d754ed..0566288 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 82c84e3..16a5a71 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 ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
