diff options
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 1 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/align.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/helpid.hrc | 244 | ||||
| -rw-r--r-- | cui/source/options/internationaloptions.cxx | 1 | ||||
| -rw-r--r-- | cui/source/options/internationaloptions.src | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/align.cxx | 3 | ||||
| -rw-r--r-- | cui/util/makefile.mk | 8 |
8 files changed, 132 insertions, 130 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9ba33f3f2c93..7fa606155832 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> +#include <sfx2/sfxuno.hxx> #include "gallery.hrc" diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 75c0c1a0f8c8..10095922f523 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -31,6 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" +#include "align.hxx" //add for SvxAlignmentTabPage #include "dlgfact.hxx" #include <tools/rc.hxx> @@ -88,7 +89,6 @@ #include "paragrph.hxx" //add for #include "tabstpge.hxx" // add for #include "textattr.hxx" // add for SvxTextAttrPage -#include "align.hxx" //add for SvxAlignmentTabPage #include "backgrnd.hxx" //add for SvxBackgroundTabPage #include "border.hxx" //add for SvxBorderTabPage #include "chardlg.hxx" //add for SvxCharNamePage,SvxCharEffectsPage,SvxCharPositionPage,SvxCharTwoLinesPage diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index a7299c1b4915..44a11eacccc9 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -32,6 +32,7 @@ // include --------------------------------------------------------------- +#include <svx/orienthelper.hxx> #include <vcl/field.hxx> #include <vcl/imagebtn.hxx> #include <vcl/fixed.hxx> @@ -40,7 +41,6 @@ #include <svtools/valueset.hxx> #include <svx/dialcontrol.hxx> #include <svx/wrapfield.hxx> -#include <svx/orienthelper.hxx> #include <svx/frmdirlbox.hxx> namespace svx { diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index d80e31b0d10f..a7e56ca3d864 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -50,125 +50,127 @@ #define HID_OPTIONS_SEARCH (HID_CUI_START + 13) #define HID_OPTIONS_MAIL (HID_CUI_START + 14) #define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) -#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) -#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) -#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) -#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) -#define HID_EDIT_MODULES (HID_CUI_START + 20) -#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) -#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) -#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) -#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) -#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) -#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) -#define HID_OPTIONS_JAVA (HID_CUI_START + 28) -#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) -#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) -#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) -#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) -#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) -#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 45) -#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) -#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) -#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) -#define HID_OFA_TP_MISC (HID_CUI_START + 40) -#define HID_OFA_TP_VIEW (HID_CUI_START + 41) -#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) -#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) -#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) -#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) -#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) -#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) -#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) -#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) -#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) -#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) -#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 53) -#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) -#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) -#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) -#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) -#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) -#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) -#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) -#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) -#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) -#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) -#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) -#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 69) -#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 70) -#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 71) -#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 72) -#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 73) -#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 74) -#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 75) -#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 76) -#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 77) -#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 78) -#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 79) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 80) -#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 81) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 82) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 83) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 84) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 85) -#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 86) -#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 87) -#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 88) -#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 89) -#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 90) -#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 91) -#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 92) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 93) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 94) -#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 95) -#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 96) -#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 97) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 98) -#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 99) -#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 100) -#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 101) -#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 102) -#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 103) -#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 104) -#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 105) -#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 106) -#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 107) -#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 108) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 109) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 110) -#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 111) -#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 112) -#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 113) -#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 114) -#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 115) -#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 116) -#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 117) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 118) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 119) -#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 120) -#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 121) -#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 122) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 123) -#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 124) -#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 125) -#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 126) -#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 127) -#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 128) -#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 129) -#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 130) -#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 131) -#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 132) -#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 133) -#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 134) +#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) +#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) +#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) +#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) +#define HID_EDIT_MODULES (HID_CUI_START + 20) +#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) +#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) +#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) +#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) +#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) +#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) +#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) +#define HID_OPTIONS_JAVA (HID_CUI_START + 28) +#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) +#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) +#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) +#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) +#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) +#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34) +#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) +#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) +#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) +#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) +#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) +#define HID_OFA_TP_MISC (HID_CUI_START + 40) +#define HID_OFA_TP_VIEW (HID_CUI_START + 41) +#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) +#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) +#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) +#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) +#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) +#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) +#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) +#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) +#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) +#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) +#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) +#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53) +#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54) +#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) +#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) +#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) +#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) +#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) +#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) +#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) +#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) +#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) +#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) +#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) +#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) +#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) +#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) +#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69) +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70) +#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71) +#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72) +#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73) +#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74) +#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75) +#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76) +#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77) +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78) +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79) +#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80) +#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81) +#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82) +#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83) +#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84) +#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85) +#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86) +#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87) +#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88) +#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89) +#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90) +#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91) +#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92) +#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93) +#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94) +#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94) +#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95) +#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96) +#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97) +#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98) +#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99) +#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100) +#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101) +#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102) +#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103) +#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104) +#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105) +#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106) +#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107) +#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108) +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109) +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110) +#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111) +#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112) +#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113) +#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114) +#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115) +#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116) +#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117) +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118) +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119) +#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120) +#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121) +#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122) +#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123) +#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124) +#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125) +#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126) +#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127) +#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128) +#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129) +#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130) +#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131) +#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132) +#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133) +#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134) #define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135) #define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136) #define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137) @@ -196,7 +198,7 @@ #define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) #define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) #define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) -#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 161) +#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) #define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) #define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) #define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) @@ -366,11 +368,9 @@ #define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) #define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) #define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 332) #define HID_PASTE_DLG (HID_CUI_START + 333) #define HID_LINKDLG_TABLB (HID_CUI_START + 334) - // please adjust ACT_SVX_HID_END2 below if you add entries here! // ----------------------------------------------------------------------- diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index 5544197e7246..c5e00404ced1 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -37,6 +37,7 @@ #include <cuires.hrc> #include "helpid.hrc" #include <dialmgr.hxx> +#include <svx/dialogs.hrc> namespace offapp { diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src index be9155fb3707..846bb444c9b5 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -31,6 +31,7 @@ #include "internationaloptions.hrc" #include "helpid.hrc" #include <cuires.hrc> +#include <svx/dialogs.hrc> TabPage RID_OFA_TP_INTERNATIONAL { diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 4f4b4fcbd593..c8b7bf6ea924 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -33,6 +33,8 @@ // include --------------------------------------------------------------- +#include "align.hxx" + #include <svx/svxenum.hxx> #include <svx/dialogs.hrc> #include <cuires.hrc> @@ -41,7 +43,6 @@ #include <svx/algitem.hxx> #include <svx/frmdiritem.hxx> -#include "align.hxx" #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <tools/shl.hxx> diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk index 9187965f141e..bedd1cee6407 100644 --- a/cui/util/makefile.mk +++ b/cui/util/makefile.mk @@ -36,8 +36,6 @@ TARGET=cui GEN_HID=TRUE GEN_HID_OTHER=TRUE -USE_DEFFILE=TRUE - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -49,9 +47,9 @@ LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30 SHL1TARGET= cui$(DLLPOSTFIX) SHL1VERSIONMAP= cui.map SHL1IMPLIB=icui - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEFNAME= $(SHL1TARGET) +SHL1DEPN= +SHL1DEF= $(MISC)$/$(SHL1TARGET).def +DEF1NAME= $(SHL1TARGET) SHL1LIBS= \ $(SLB)$/options.lib \ |