diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/cmdid.h | 13 | ||||
| -rw-r--r-- | sw/inc/editsh.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/helpid.h | 125 | ||||
| -rw-r--r-- | sw/inc/redline.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/swcommands.h | 12 | ||||
| -rw-r--r-- | sw/inc/unocoll.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/unomid.h | 1 | ||||
| -rw-r--r-- | sw/inc/unoprnms.hxx | 111 | ||||
| -rw-r--r-- | sw/inc/viewopt.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/inc/frame.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/inc/unofldmid.h | 1 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/porlin.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/inc/fltini.hxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 7 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlitmap.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/frmmgr.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/num.hxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/inc/swcont.hxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/lingu/olmenu.hrc | 1 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/inputwin.hrc | 3 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PropertyPanel.hrc | 1 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.hrc | 1 |
25 files changed, 2 insertions, 305 deletions
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 |