diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-02 20:49:14 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-02 20:49:14 +0100 |
| commit | e7ed68f3d23c08ffa94c31042ee66f772f1257b8 (patch) | |
| tree | bc35ef6f0f63c32ef02ac5fae3efaaf0bbe45866 /svx | |
| parent | bd5ae54c881418c31261e79c50cb8645411cc2dc (diff) | |
#i106421#: create new cui resource file
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/dialogs.hrc | 767 | ||||
| -rw-r--r-- | svx/inc/svx/svxdlg.hxx | 46 | ||||
| -rw-r--r-- | svx/inc/svx/svxids.hrc | 5 | ||||
| -rw-r--r-- | svx/source/dialog/frmdirlbox.src | 96 | ||||
| -rw-r--r-- | svx/source/dialog/grfflt.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/hangulhanja.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/hdft.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/makefile.mk | 2 | ||||
| -rw-r--r-- | svx/source/dialog/sdstring.src | 209 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 48 | ||||
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.src | 130 | ||||
| -rw-r--r-- | svx/source/items/makefile.mk | 1 | ||||
| -rw-r--r-- | svx/source/items/page.src | 258 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 2 |
14 files changed, 607 insertions, 963 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 6e6162ef61f2..c7cddf48e27c 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -40,39 +40,141 @@ // Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings) #define RID_SVX_FIRSTFREE 305 -// ResId fuer die Hintergrund-TabPage -#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1) - -// ResId fuer die Tabulator-TabPage -#define RID_SVXPAGE_TABULATOR (RID_SVX_START + 2) +// some strings also used in CUI +#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145) +#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149) +#define RID_SVXERRCTX (RID_SVX_START + 351) +#define RID_SVXSTR_COLOR (RID_SVX_START + 179) +#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190) +#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841) +#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178) +#define RID_SVXSTR_NONE (RID_SVX_START + 183) +#define RID_SVXSTR_SOLID (RID_SVX_START + 160) +#define RID_SVXSTR_LINEEND (RID_SVX_START + 237) +#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161) +#define RID_SVXSTR_HATCH (RID_SVX_START + 180) +#define RID_SVXSTR_BITMAP (RID_SVX_START + 167) +#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) +#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) +#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250) -// ResId's fuer die Zeichen-TabPages -#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3) -#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4) -// new char pages +// factory IDs of tabpages implemented in CUI +#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) +#define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7) +#define RID_SVXPAGE_GRFCROP (RID_SVX_START + 238) #define RID_SVXPAGE_CHAR_NAME (RID_SVX_START + 239) #define RID_SVXPAGE_CHAR_EFFECTS (RID_SVX_START + 240) #define RID_SVXPAGE_CHAR_POSITION (RID_SVX_START + 241) -#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) - -// ResId fuer die Umrahmung-TabPage +#define RID_SVXPAGE_STD_PARAGRAPH (RID_SVX_START + 6) +#define RID_SVXPAGE_ALIGN_PARAGRAPH (RID_SVX_START + 187) +#define RID_SVXPAGE_PARA_ASIAN (RID_SVX_START + 245) +#define RID_SVXPAGE_TABULATOR (RID_SVX_START + 2) +#define RID_SFXPAGE_DBREGISTER (RID_OFA_START + 123) +#define RID_SVXPAGE_NUMBERFORMAT (RID_SVX_START + 41) +#define RID_SVXPAGE_ALIGNMENT (RID_SVX_START + 90) #define RID_SVXPAGE_BORDER (RID_SVX_START + 5) +#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1) +#define RID_SVXPAGE_PAGE (RID_SVX_START + 25) +#define RID_SVXPAGE_LINE (RID_SVX_START + 51) +#define RID_SVXPAGE_AREA (RID_SVX_START + 56) +#define RID_SVXPAGE_SHADOW (RID_SVX_START + 61) +#define RID_SVXPAGE_TRANSPARENCE (RID_SVX_START + 54) +#define RID_SVXPAGE_TEXTATTR (RID_SVX_START + 153) +#define RID_SVXPAGE_TEXTANIMATION (RID_SVX_START + 184) +#define RID_SVXPAGE_MEASURE (RID_SVX_START + 161) +#define RID_SVXPAGE_CONNECTION (RID_SVX_START + 191) +#define RID_SVXPAGE_LINE_DEF (RID_SVX_START + 52) +#define RID_SVXPAGE_LINEEND_DEF (RID_SVX_START + 53) +#define RID_SVXPAGE_NUM_OPTIONS (RID_SVX_START + 219) +#define RID_SVXPAGE_NUM_POSITION (RID_SVX_START + 220) +#define RID_SVXPAGE_PICK_SINGLE_NUM (RID_SVX_START + 215) +#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216) +#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217) +#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218) +#define RID_SVXPAGE_CAPTION (RID_SVX_START + 150) +#define RID_SVXPAGE_SWPOSSIZE (RID_SVX_START + 288) +#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87) +#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303) +#define RID_SVXPAGE_HATCH (RID_SVX_START + 57) +#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) +#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) +#define RID_SVXPAGE_ANGLE (RID_SVX_START + 48) +#define RID_SVXPAGE_SLANT (RID_SVX_START + 49) +#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236) +#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302) +#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) -// ResId's fuer die Absatz-TabPages -#define RID_SVXPAGE_STD_PARAGRAPH (RID_SVX_START + 6) -#define RID_SVXPAGE_ALIGN_PARAGRAPH (RID_SVX_START + 187) -#define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7) + +// why extra defines for pages that already exist? +#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) +#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) + +// ID of tabpages implemented in SVX, but used in CUI +#define RID_SVXPAGE_GRID (RID_SVX_START + 152) + +// factory IDs of dialogs implemented in CUI +#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334) +#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335) +#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332) +#define RID_SVX_GRFFILTER_DLG_SOLARIZE (RID_SVX_START + 333) +#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336) +#define RID_SVXDLG_SEARCHFORMAT (RID_SVX_START + 21) +#define RID_SVXDLG_CHARMAP ( RID_SVX_START + 10 ) +#define RID_SVXDLG_POSTIT ( RID_SVX_START + 8 ) + +// only needed for layout: +#define RID_SVXDLG_ZOOM ( RID_SVX_START + 0 ) + +// IDs of options pages of applications +#define RID_SW_TP_MAILCONFIG (RID_OFA_START + 102) +#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247) +#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251) +#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214) +#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) +#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211) +#define RID_SW_TP_STD_FONT (RID_OFA_START + 208) +#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209) +#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) +#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) +#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) +#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) +#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242) +#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243) +#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244) +#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246) +#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217) +#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256) +#define SID_SC_TP_LAYOUT (RID_OFA_START + 218) +#define SID_SC_TP_CONTENT (RID_OFA_START + 219) +#define SID_SC_TP_INPUT (RID_OFA_START + 220) +#define SID_SC_TP_GRID (RID_OFA_START + 221) +#define SID_SC_TP_USERLISTS (RID_OFA_START + 222) +#define SID_SC_TP_CALC (RID_OFA_START + 223) +#define SID_SC_TP_CHANGES (RID_OFA_START + 224) +#define RID_SC_TP_PRINT (RID_OFA_START + 248) +#define SID_SI_TP_PRINT (RID_OFA_START + 236) +#define SID_SI_TP_CONTENTS (RID_OFA_START + 232) +#define SID_SI_TP_SNAP (RID_OFA_START + 234) +#define SID_SI_TP_MISC (RID_OFA_START + 237) +#define SID_SD_TP_PRINT (RID_OFA_START + 220) +#define SID_SD_TP_CONTENTS (RID_OFA_START + 225) +#define SID_SD_TP_SNAP (RID_OFA_START + 227) +#define SID_SD_TP_MISC (RID_OFA_START + 231) +#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) +#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) +#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // calc + +//--------------------------------------------------------------------- +// ResId's fuer die Zeichen-TabPages +#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3) +#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4) // moved ids +8 ... +17 to "ModalDialog" resource ids // ResId fuer den Suchen/Ersetzen-Dialog #define RID_SVXDLG_SEARCH (RID_SVX_START + 20) -#define RID_SVXDLG_SEARCHFORMAT (RID_SVX_START + 21) -#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) -#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) // ResId fuer die PageDialog -#define RID_SVXPAGE_PAGE (RID_SVX_START + 25) #define RID_SVXPAGE_FOOTER (RID_SVX_START + 26) #define RID_SVXPAGE_HEADER (RID_SVX_START + 27) #define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28) @@ -81,7 +183,6 @@ #define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) #define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) #define RID_SVXDLG_THES_LANGUAGE (RID_SVX_START + 38) -#define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32) // ResIds fuer HM-QueryBoxen und Error-Strings #define RID_SVXQB_THESAURUS (RID_SVX_START + 33) @@ -92,49 +193,14 @@ // + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE #define RID_SVXQB_BW_CONTINUE (RID_SVX_START + 39) -// ResId fuer den BB-Dialog -#define RID_SVXDLG_BBDLG (RID_SVX_START + 40) - -// ResId fuer die Zahlenformate-Page -#define RID_SVXPAGE_NUMBERFORMAT (RID_SVX_START + 41) - // ResId's fuer Dialoge aus StarDraw -#define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45) #define RID_SVXPAGE_POSITION (RID_SVX_START + 46) #define RID_SVXPAGE_SIZE (RID_SVX_START + 47) -#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87) -#define RID_SVXPAGE_SWPOSSIZE (RID_SVX_START + 288) #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) -#define RID_SVXPAGE_ANGLE (RID_SVX_START + 48) -#define RID_SVXPAGE_SLANT (RID_SVX_START + 49) - -#define RID_SVXDLG_LINE (RID_SVX_START + 50) -#define RID_SVXPAGE_LINE (RID_SVX_START + 51) -#define RID_SVXPAGE_LINE_DEF (RID_SVX_START + 52) -#define RID_SVXPAGE_LINEEND_DEF (RID_SVX_START + 53) - -#define RID_SVXDLG_AREA (RID_SVX_START + 55) -#define RID_SVXPAGE_AREA (RID_SVX_START + 56) -#define RID_SVXPAGE_TRANSPARENCE (RID_SVX_START + 54) -#define RID_SVXPAGE_HATCH (RID_SVX_START + 57) -#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) -#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) -#define RID_SVXPAGE_COLOR (RID_SVX_START + 60) -#define RID_SVXPAGE_SHADOW (RID_SVX_START + 61) - -#define RID_SVXDLG_NAME (RID_SVX_START + 62) -#define RID_SVXDLG_MESSBOX (RID_SVX_START + 63) - -// #i68101# -#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64) - #define RID_SVXIL_FRAME (RID_SVX_START + 65) #define RID_SVXIL_FRAME_HC (RID_SVX_START + 66) -// #i68101# -#define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67) - #define RID_SVXDLG_3D (RID_SVX_START + 70) #define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71) #define RID_SVXPAGE_3DATTR (RID_SVX_START + 72) @@ -192,9 +258,6 @@ #define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71) #define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72) -// Alignment-TabPage -#define RID_SVXPAGE_ALIGNMENT (RID_SVX_START + 90) - // Resource mit Bitmaps fuer die CheckListBox #define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91) @@ -224,8 +287,6 @@ #define RID_SVXBMP_SHADOW_SIZE (RID_SVX_START + 113) #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) -#define RID_SVXBMP_LOCK (RID_SVX_START + 118) -#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119) // fuer ToolboxControl-Style #define RID_SVXTBX_STYLE (RID_SVX_START + 120) @@ -233,39 +294,12 @@ #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140) #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141) -// Dialog bzw TabPage fuer Labelobjekte -#define RID_SVXPAGE_CAPTION (RID_SVX_START + 150) -#define RID_SVXDLG_CAPTION (RID_SVX_START + 151) - -//ResId fuer TabPage Raster -#define RID_SVXPAGE_GRID (RID_SVX_START + 152) - -// ResId fuer TextAttribut-Dialog -#define RID_SVXDLG_TEXT (RID_SVX_START + 183) -#define RID_SVXPAGE_TEXTATTR (RID_SVX_START + 153) -#define RID_SVXPAGE_TEXTANIMATION (RID_SVX_START + 184) - // ResId fuer InternetPage #define RID_SVXPAGE_INTERNET (RID_SVX_START + 154) -// ResId fuer FontSubstitution -#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) - -// insert row&col dialog -#define DLG_INS_ROW_COL (RID_SVX_START + 156) - //InetDlg -#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155) -#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157) #define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158) #define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159) -#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) -//added by jmeng begin -#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) -#define GB_MOZPLUGIN 1 -#define CB_MOZPLUGIN_CODE 2 -//added by jmeng end -#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) #define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202) #define RID_CACHE_EXTRA_DLG (RID_SVX_START + 203) @@ -279,9 +313,6 @@ #define RID_SVXPAGE_REGISTER_5 (RID_SVX_START + 198) #define RID_SVXPAGE_REGISTER_6 (RID_SVX_START + 199) -// ResId fuer Measure-Dialog -#define RID_SVXPAGE_MEASURE (RID_SVX_START + 161) - // 3D-Entfernung/Perspektive Bitmaps #define RID_SVXBMP_3D_DISTANCE_01 (RID_SVX_START + 162) #define RID_SVXBMP_3D_DISTANCE_02 (RID_SVX_START + 163) @@ -309,18 +340,12 @@ #define RID_SVXTBX_DRAW (RID_SVX_START + 189) #define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190) -#define RID_SVXPAGE_CONNECTION (RID_SVX_START + 191) - // Ids fuer Autokorrektur #define RID_SVX_AUTOCORR (RID_SVX_START + 192) // Auswahl ext. Linguitik #define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193) -// Extra Dialog f"ur Option Pfade -#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) -#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) - // TabPage und Dialog f"ur LDAP-Server #define RID_SVXPAGE_LDAP (RID_SVX_START + 204) #define RID_SVXDLG_LDAP (RID_SVX_START + 205) @@ -328,71 +353,26 @@ // Dialog fuer Funktionen #define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206) -// Errorbox f"ur Optionen/Pfade -#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) - -// Messboxen f"ur Optionen/Benutzerdaten -#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) - // QueryBox for Exit Recovery Wizard #define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215) // ResId fuer den ImportGraphic-Dialog #define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499) -#define RID_SVXPAGE_PICK_SINGLE_NUM (RID_SVX_START + 215) -#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216) -#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217) -#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218) -#define RID_SVXPAGE_NUM_OPTIONS (RID_SVX_START + 219) -#define RID_SVXPAGE_NUM_POSITION (RID_SVX_START + 220) - - -#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224) -#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225) #define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226) // ResId's f???r Hyperlink-Dialog-Tabpages -#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) -#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) -#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) -#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) -#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) -#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232) // ResId's for Starone impl. bitmaps #define RID_UNODRAW_OBJECTS (RID_SVX_START + 233) #define RID_UNODRAW_OLE2 (RID_SVX_START + 234) #define RID_UNODRAW_GRAPHICS (RID_SVX_START + 235) -// ResId fuer Distribute-Dialog -#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236) - -// tabpage for graphic cropping -#define RID_SVXPAGE_GRFCROP (RID_SVX_START + 238) - #define RID_SVXIMG_NOTCHECKED (RID_SVX_START + 243) #define RID_SVXIMG_CHECKED (RID_SVX_START + 244) -#define RID_SVXPAGE_PARA_ASIAN (RID_SVX_START + 245) -#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) - #define RID_SVXDLG_RUBY (RID_SVX_START + 247) -#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248) - -#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) -#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) -#define RID_SVXPAGE_SSO (RID_SVX_START + 251) -#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) -#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253) -#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254) -#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) -#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) -#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) - -#define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258) -#define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259) #define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260) #define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261) @@ -406,10 +386,6 @@ #define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269) #define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270) #define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271) -#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272) -#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273) -#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274) -#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275) #define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276) #define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277) #define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278) @@ -417,29 +393,11 @@ #define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280) #define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281) #define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282) -#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283) -#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284) #define RID_SVXIMG_CHECKED_H (RID_SVX_START + 285) #define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286) #define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287) -#define RID_DLG_NEWLIB (RID_SVX_START + 290) - -#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291) -#define RID_SVXPAGE_MENUS (RID_SVX_START + 292) -#define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293) -#define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294) -#define RID_SVXPAGE_EVENTS (RID_SVX_START + 295) -#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) -#define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297) -#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298) -#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) -#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300) -#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301) -#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302) -#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303) -#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304) // !!! please update RID_SVX_FIRSTFREE !!! see line 46 // Strings ------------------------------------------------------------------ @@ -479,7 +437,7 @@ #define RID_SVXSTR_HMERR_ADDWORD (RID_SVX_START + 95) #define RID_SVXSTR_HMSTATUS_INVALID_LANG (RID_SVX_START + 96) -// Strings fuers Paperformat +// paper formats #define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 100) #define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101) #define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102) @@ -518,50 +476,17 @@ #define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135) #define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136) -#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) -#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) #define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144) -#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145) // ResIds fuer die verschiedenen Strings des PageDlgs #define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) #define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) -#define RID_SVXSTR_WRITER_PAGE (RID_SVX_START + 148) - -#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149) // HM_ERR #define RID_SVXSTR_HMERR_THESAURUS (RID_SVX_START + 150) #define RID_SVXSTR_HMERR_HYPH (RID_SVX_START + 151) -// Strings aus den StarDraw-Dialogen -#define RID_SVXSTR_SOLID (RID_SVX_START + 160) -#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161) -#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) -#define RID_SVXSTR_DEL_GRADIENT (RID_SVX_START + 164) -#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) -#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166) -#define RID_SVXSTR_BITMAP (RID_SVX_START + 167) -#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) -#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169) -#define RID_SVXSTR_DEL_BITMAP (RID_SVX_START + 170) -#define RID_SVXSTR_ASK_DEL_BITMAP (RID_SVX_START + 171) -#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172) -#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) -#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174) -#define RID_SVXSTR_DEL_LINESTYLE (RID_SVX_START + 175) -#define RID_SVXSTR_ASK_DEL_LINESTYLE (RID_SVX_START + 176) -#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177) -#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178) -#define RID_SVXSTR_COLOR (RID_SVX_START + 179) -#define RID_SVXSTR_HATCH (RID_SVX_START + 180) -#define RID_SVXSTR_CHANGE (RID_SVX_START + 181) -#define RID_SVXSTR_ADD (RID_SVX_START + 182) -#define RID_SVXSTR_NONE (RID_SVX_START + 183) -#define RID_SVXSTR_ASK_CHANGE_LINEEND (RID_SVX_START + 184) - // Strings der ToolBox-Controls aus tbcontrl.cxx -#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190) #define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) #define RID_SVXSTR_FRAME (RID_SVX_START + 192) #define RID_SVXSTR_FRAME_COLOR (RID_SVX_START + 194) @@ -586,36 +511,12 @@ #define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213) #define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214) -// Strings fuer ColorTabPage -#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215) -#define RID_SVXSTR_DEL_COLOR (RID_SVX_START + 216) -#define RID_SVXSTR_ASK_DEL_COLOR (RID_SVX_START + 217) -#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218) -#define RID_SVXSTR_ASK_DEL_LINEEND (RID_SVX_START + 219) - -// "Tabelle" -#define RID_SVXSTR_TABLE (RID_SVX_START + 220) - #define RID_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222) #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223) #define RID_SVXSTR_XMLSEC_SIG_NOT_OK (RID_SVX_START + 224) #define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225) #define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226) -// Strings von der Hatch-Tabpage -#define RID_SVXSTR_WRITE_DATA_ERROR (RID_SVX_START + 229) -#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230) -#define RID_SVXSTR_WARN_TABLE_OVERWRITE (RID_SVX_START + 231) -#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232) -#define RID_SVXSTR_DEL_HATCH (RID_SVX_START + 233) -#define RID_SVXSTR_ASK_DEL_HATCH (RID_SVX_START + 234) -#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235) -#define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236) - -// Strings der Linienenden-TabPage -#define RID_SVXSTR_LINEEND (RID_SVX_START + 237) -#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238) -#define RID_SVXSTR_DEL_LINEEND (RID_SVX_START + 239) // weitere ID bei 219 // String-ResId fuer den ImportGraphic-Dialog @@ -628,9 +529,6 @@ #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248) -// unbekannte Farbe im Zeichen- oder Umrandungs-Dialog -#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250) - // File-/Grafik-Link String, Dialog Name #define RID_SVXSTR_FILELINK (RID_SVX_START + 255) #define RID_SVXSTR_GRAFIKLINK (RID_SVX_START + 256) @@ -686,35 +584,22 @@ #define RID_SVXSTR_NOTCENTERED (RID_SVX_START + 307) // String-Arrays -#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) #define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) -// Strings fuer die Optionen-TabPages -#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) - // Hyperlink-Dlg #define RID_SVXMN_HYPERLINK (RID_SVX_START + 321) // Hyperlink-QueryBoxen #define RID_SVXQB_NOCONNECT (RID_SVX_START + 322) #define RID_SVXQB_DONTEXIST (RID_SVX_START + 323) //color configuration -#define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324) // Graphic filter #define RID_SVX_GRFFILTER_START (RID_SVX_START + 330) #define RID_SVXTBX_GRFFILTER (RID_SVX_START + 331) -#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332) -#define RID_SVX_GRFFILTER_DLG_SOLARIZE (RID_SVX_START + 333) -#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334) -#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335) -#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336) -#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXERRCODE (RID_SVX_START + 350) -#define RID_SVXERRCTX (RID_SVX_START + 351) -// Define - Bereich fuer Gallery -// !!! aus diesem Bereich keine Defines benutzen !!! +// gallery #define RID_SVX_GALLERY_START (RID_SVX_START + 360) #define RID_SVX_GALLERY_END (RID_SVX_START + 410) @@ -747,13 +632,6 @@ #define RID_SVX_RELOAD_NORMAL (RID_SVX_START + 480) #define RID_SVX_RELOAD_SPECIAL (RID_SVX_START + 481) -// ResId's fuer SvxMultiFileDialog -#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) -#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) -#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) -#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) -#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) - // Defines fuer die 3D-Engine #define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489) #define RID_SVX_3D_CREATE_LATHE (RID_SVX_START + 490) @@ -766,22 +644,24 @@ #define RID_SVX_3D_UNDO_LATHE (RID_SVX_START + 497) #define RID_SVX_3D_UNDO_BREAK_LATHE (RID_SVX_START + 498) #define RID_SVX_3D_UNDO_ATTRIBUTES (RID_SVX_START + 499) + +#define RID_STR_FULLNUMS_START (RID_SVX_START + 500)//? +#define RID_STR_FULLNUMS_1 (RID_STR_FULLNUMS_START )//? +#define RID_STR_FULLNUMS_2 (RID_STR_FULLNUMS_START + 1)//? +#define RID_STR_FULLNUMS_3 (RID_STR_FULLNUMS_START + 2)//? +#define RID_STR_FULLNUMS_4 (RID_STR_FULLNUMS_START + 3)//? +#define RID_STR_FULLNUMS_5 (RID_STR_FULLNUMS_START + 4)//? +#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5)//? +#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6)//? +#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//? +#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//? + // RID_SVX_END == (RID_SVX_START + 499) !!! // am besten ab 520 frei (RB) // seit der Erfindung eigener Resourcen fuer jedes Projekt kann es hier keine // Obergrenze geben (abgesehen von USHRT_MAX) (os) -#define RID_STR_FULLNUMS_START (RID_SVX_START + 500) -#define RID_STR_FULLNUMS_1 (RID_STR_FULLNUMS_START ) -#define RID_STR_FULLNUMS_2 (RID_STR_FULLNUMS_START + 1) -#define RID_STR_FULLNUMS_3 (RID_STR_FULLNUMS_START + 2) -#define RID_STR_FULLNUMS_4 (RID_STR_FULLNUMS_START + 3) -#define RID_STR_FULLNUMS_5 (RID_STR_FULLNUMS_START + 4) -#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5) -#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6) -#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7) #define RID_STR_BULLET_THEME (RID_SVX_START + 508) -#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509) -#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510) + // ResIds for graphics drawmode #define RID_SVXSTR_GRAFMODE_STANDARD (RID_SVX_START + 520) @@ -811,17 +691,6 @@ #define RID_SVXSTR_SEABLUE (RID_SVX_START + 546) #define RID_SVXSTR_COLOR_SUN (RID_SVX_START + 547) -#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548) -#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) -#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) -#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) -#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) -#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553) -#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) -#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) -#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558) -#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) - // JP: string resource ids for table-autoformat-names, used in SW/SC // !!! Urgent: the order of Ids is persistent. New Ids have to append !!! #define RID_SVXSTR_TBLAFMT_BEGIN (RID_SVX_START + 560) @@ -843,16 +712,6 @@ #define RID_SVXSTR_TBLAFMT_YELLOW (RID_SVX_START + 575) #define RID_SVXSTR_TBLAFMT_END (RID_SVX_START + 576) -#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) -#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) -#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) -#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) -#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) -#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) -#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) - // string resources for XLineJoint item #define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE #define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 ) @@ -1062,9 +921,6 @@ #define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0 #define RID_SVXSTR_LEND_END RID_SVXSTR_LEND11 -#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800) -#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801) - #define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802) #define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803) #define RID_SVXSTR_QRY_PRINT_ALL (RID_SVX_START + 804) @@ -1075,10 +931,6 @@ #define RID_SVXSTR_DIC_ERR_FULL (RID_SVX_START + 811) #define RID_SVXSTR_DIC_ERR_READONLY (RID_SVX_START + 812) -#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) -#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) -#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) - // strings for graphic attributes/undo #define RID_SVXSTR_GRAFCROP (RID_SVX_START + 820) #define RID_SVXSTR_UNDO_GRAFMODE (RID_SVX_START + 821) @@ -1091,14 +943,6 @@ #define RID_SVXSTR_UNDO_GRAFTRANSPARENCY (RID_SVX_START + 828) #define RID_SVXSTR_UNDO_GRAFCROP (RID_SVXSTR_GRAFCROP) -// weitere ResId fuer die Linguistik-Dialoge -#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) -#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) - -// Japanese search options TabPage -#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) -#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841) - // listbox control for UNDO and REDO #define RID_SVXTBX_UNDO_REDO_CTRL (RID_SVX_START + 845) #define RID_SVXSTR_NUM_UNDO_ACTIONS (RID_SVX_START + 846) @@ -1115,9 +959,6 @@ #define RID_SVXSTR_TRASNGR_END RID_SVXSTR_TRASNGR0 #define RID_SVXSTR_BORDER_CONTROL (RID_SVX_START + 852) -#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853) -#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) -#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) // Accessibility strings. The actual string ids are defined in // svx/inc/accessibility.hrc, the strings are defined in @@ -1125,34 +966,6 @@ #define RID_SVXSTR_ACCESSIBILITY_START (RID_SVX_START + 860) #define RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950) -// string resources for svx::FrameDirectionListBox -#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960) -#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961) -#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962) - -#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965) -#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966) -#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967) -#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968) - -#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) -#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) -#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) -#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972) -#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973) - -#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974) -#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975) -#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976) -#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977) -#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978) - -#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979) -#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980) -#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981) -#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982) -#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983) - // 984: free #define RID_SVXFLOAT_EXTRUSION_DIRECTION (RID_SVX_START + 985) @@ -1184,129 +997,6 @@ RID_SVXFLOAT_FONTWORK_CHARSPACING above. But these IDs describe floating windows, and the following IDs are for strings, so this is no conflict. */ #define RID_SVXSTR_PAGES (RID_SVX_START + 1002) -#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) -#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003) -#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) -#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005) -#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006) -#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007) -#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008) -#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009) -#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010) -#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011) -#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012) -#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013) -#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014) -#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015) -#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016) -#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017) -#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018) -#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019) -#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020) -#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021) -#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022) -#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023) -#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024) -#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025) - -#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) - -#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) -#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028) -#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029) -#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030) -#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031) -#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032) -#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033) -#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034) -#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035) -#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036) -#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037) -#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038) - -#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039) -#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040) -#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041) - -#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042) -#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043) -#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044) -#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045) -#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046) -#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047) -#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048) -#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049) -#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050) -#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051) -#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052) -#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) -#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054) -#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055) -#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056) -#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057) -#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058) -#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059) -#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060) -#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061) -#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062) -#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063) -#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064) -#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065) -#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066) -//the form/dialog events -#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067) -#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068) -#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069) -#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070) -#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071) -#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072) -#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073) -#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074) -#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075) -#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076) -#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077) -#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078) -#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079) -#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080) -#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081) -#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082) -#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083) -#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084) -#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085) -#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086) -#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087) -#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088) -#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089) -#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090) -#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091) -#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092) -#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093) -#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094) -#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095) -#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096) -#define RID_SVXSTR_EVENT_ERROROCCURED (RID_SVX_START + 1097) -#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098) -#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099) -#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100) -#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101) -#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102) -#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103) -#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104) -#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105) -#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106) -#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107) -#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108) -#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109) - -#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) -#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) -#define STR_NAME_CONFLICT (RID_SVX_START + 1112) - -#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113) -#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114) -#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115) -#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116) -#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE (RID_SVX_START + 1118) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT (RID_SVX_START + 1119) @@ -1326,71 +1016,38 @@ #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE (RID_SVX_START + 1133) #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR (RID_SVX_START + 1134) -#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135) -#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136) -#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137) - -#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138) -#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0) -#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1) -#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2) -#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3) -#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4) -#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5) -#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6) -#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7) - -#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7) - -#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7) - -#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 -#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 #define RID_SVXSTR_SELMODE_BLK (RID_SVX_START + 1167) #define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168) -#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) -#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170) -#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171) - -#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) -#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) -#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) -#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) -#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) -#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) -#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) -#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) -#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) -#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) -#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) -#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) -#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) -#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) -#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) -#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) -#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) -#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) // if you add here, remember to adjust RID_SVXSTR_NEXTFREE +#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//? + #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1190) // ---------------------------------------------------------------------------- @@ -1406,37 +1063,23 @@ // ---------------------------------------------------------------------------- // "Window" resource ids -#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) // ---------------------------------------------------------------------------- // "ModalDialog" resource ids -#define RID_SVXDLG_ZOOM ( RID_SVX_START + 0 ) -#define RID_SVX_MDLG_HANGULHANJA ( RID_SVX_START + 1 ) #define RID_SVX_MDLG_FONTWORK_GALLERY ( RID_SVX_START + 2 ) #define RID_SVX_MDLG_EXTRUSION_DEPTH ( RID_SVX_START + 3 ) -#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 ) -#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 ) -#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 ) - -#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 ) -#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 ) -#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 ) // ---------------------------------------------------------------------------- // "Menu" resource ids #define RID_SVX_MDLG_SCRIPTORG_NEWLIB ( RID_SVX_START + 7 ) #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) -// ResId fuer den Notizzettel-Dialog -#define RID_SVXDLG_POSTIT ( RID_SVX_START + 8 ) - // ResId fuer den ImportClipboard-Dialog // depricated //#define RID_SVXDLG_CLIPBOARD ( RID_SVX_START + 9 ) // ResId fuer den Sonderzeichen-Dialog -#define RID_SVXDLG_CHARMAP ( RID_SVX_START + 10 ) // allgemeine DBMgr-Dialoge // depricated @@ -1463,116 +1106,42 @@ #define RID_SVXPAGE_ERR_REP_SEND ( RID_SVX_START + 11 ) // ---------------------------------------------------------------------------- -// "MessageBox" resource ids - -#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) -#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) -#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 ) - -// ---------------------------------------------------------------------------- // !!!! double defined ID's (see below) !!! -#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) #define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) -#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) -#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103) -#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104) #define RID_OFA_GENERAL_OPTIONS_DLG (RID_OFA_START + 105) #define RID_OFADLG_INTERNET (RID_OFA_START + 106) #define RID_OFA_TABNEW_DLG (RID_OFA_START + 107) #define RID_OFADLG_BROWSER (RID_OFA_START + 108) -#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) -#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) -#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) #define RID_OFA_FORMNEW_DLG (RID_OFA_START + 112) #define RID_OFA_TABPROPERTIES (RID_OFA_START + 113) #define RID_OFADLG_REGISTRATION (RID_OFA_START + 114) -#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115) -#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116) #define RID_OFADLG_AWCP_VALUES (RID_OFA_START + 117) -#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118) -#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119) -#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) -#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121) -#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122) -#define RID_SFXPAGE_DBREGISTER (RID_OFA_START + 123) -#define DLG_DOCUMENTLINK (RID_OFA_START + 124) -#define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125) // TabPages -------------------------------------------------------------- // !!!! double defined ID's (see above) !!! -#define RID_RIDER_SLL_SITE (RID_OFA_START + 100) -#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101) -#define RID_SW_TP_MAILCONFIG (RID_OFA_START + 102) - -#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) -#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175) -#define OFA_TP_MISC (RID_OFA_START + 200) - -#define OFA_TP_VIEW (RID_OFA_START + 202) #define OFA_TP_APPEARANCE (RID_OFA_START + 203) #define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204) -#define OFA_TP_LANGUAGES (RID_OFA_START + 205) //die RID_??_TP_* stehen nochmal im offids.hrc -#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) + #define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207) -#define RID_SW_TP_STD_FONT (RID_OFA_START + 208) -#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209) -#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) -#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211) -#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) #define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213) -#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214) #define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215) #define RID_SW_TP_OPTSRCVIEW (RID_OFA_START + 216) -#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217) -#define SID_SC_TP_LAYOUT (RID_OFA_START + 218) -#define SID_SC_TP_CONTENT (RID_OFA_START + 219) -#define SID_SC_TP_INPUT (RID_OFA_START + 220) -#define SID_SC_TP_GRID (RID_OFA_START + 221) -#define SID_SC_TP_USERLISTS (RID_OFA_START + 222) -#define SID_SC_TP_CALC (RID_OFA_START + 223) -#define SID_SC_TP_CHANGES (RID_OFA_START + 224) -#define SID_SD_TP_CONTENTS (RID_OFA_START + 225) +#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238) +#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241) #define SID_SD_TP_LAYOUT (RID_OFA_START + 226) -#define SID_SD_TP_SNAP (RID_OFA_START + 227) #define SID_SD_TP_SCALE (RID_OFA_START + 228) #define SID_SD_TP_GRID (RID_OFA_START + 229) -#define SID_SD_TP_PRINT (RID_OFA_START + 220) -#define SID_SD_TP_MISC (RID_OFA_START + 231) -#define SID_SI_TP_CONTENTS (RID_OFA_START + 232) #define SID_SI_TP_LAYOUT (RID_OFA_START + 233) -#define SID_SI_TP_SNAP (RID_OFA_START + 234) #define SID_SI_TP_GRID (RID_OFA_START + 235) -#define SID_SI_TP_PRINT (RID_OFA_START + 236) -#define SID_SI_TP_MISC (RID_OFA_START + 237) -#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238) #define SID_SC_TP_MISC (RID_OFA_START + 239) -#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) -#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241) -#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242) -#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243) -#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244) #define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245) -#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246) -#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247) -#define RID_SC_TP_PRINT (RID_OFA_START + 248) #define OFA_TP_HELPERPROG (RID_OFA_START + 249) -#define OFA_TP_MEMORY (RID_OFA_START + 250) -#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251) -#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // 4 SC & ID 4 resource -#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) // 4 SD -#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress -#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) -#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 ) - -//add for Dialog SchTransformTabDialog,SvxTransformTabDialog //CHINA001 -#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) -#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) #endif diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index fc79ee795c63..23db741f0991 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -366,30 +366,25 @@ public: virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, const SfxItemSet* pAttrSet, - sal_uInt32 nResId, SdrView* pView, SdrModel* pModel=0 ) = 0 ; //add for SvxTextTabDialog virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - sal_uInt32 nResId, USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001 virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, - sal_uInt32 nResId, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 - HangulHanjaConversion::ConversionDirection _ePrimaryDirection, - sal_uInt32 nResId) = 0; + HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0; virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog - const SfxItemSet& rCoreSet, - sal_uInt32 nResId) = 0 ; + const SfxItemSet& rCoreSet )=0; virtual AbstractSpellDialog * CreateSvxSpellDialog(Window* pParent, SfxBindings* pBindings, @@ -418,8 +413,7 @@ public: sal_uInt32 nResId) = 0; virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, //add for SvxSearchAttributeDialog SearchAttrItemList& rLst, - const USHORT* pWhRanges, - sal_uInt32 nResId )= 0; + const USHORT* pWhRanges)=0; virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, //add for SvxSearchSimilarityDialog BOOL bRelax, USHORT nOther, @@ -427,12 +421,10 @@ public: USHORT nLonger ) = 0; virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg const SfxItemSet& rCoreSet, - sal_uInt32 nResId, BOOL bEnableSelector = FALSE) = 0; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog const SfxItemSet* pAttr, const SdrView* pView, - sal_uInt32 nResId, USHORT nAnchorTypes = 0) = 0; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog const SfxItemSet* pAttr, @@ -441,9 +433,8 @@ public: bool bSizeTabPage = false )=0; virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, - const SfxItemSet& rOptionsSet, USHORT nUniqueId, - INT32 nInitialFlags, - sal_uInt32 nResId) = 0; //add for SvxJSearchOptionsDialog + const SfxItemSet& rOptionsSet, + INT32 nInitialFlags )=0; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, @@ -453,21 +444,18 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0;//add for SvxEditDictionaryDialog virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, - const String& rName, const String& rDesc, - sal_uInt32 nResId ) = 0; //add for SvxNameDialog + const String& rName, const String& rDesc ) = 0; //add for SvxNameDialog // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId) = 0; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId) = 0; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName ) = 0; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription) = 0; virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, const String& rText, const String& rDesc, Image* pImg = NULL ) = 0; //add for SvxMessDialog - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId, - BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId, - BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog + virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog SfxBindings* pBindings, sal_uInt32 nResId)=0; @@ -478,28 +466,23 @@ public: const Link& lnkContextSupplier)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss const Graphic& rGraphic, - RECT_POINT eLightSource, - sal_uInt32 nResId)=0; + RECT_POINT eLightSource, sal_uInt32 nResId )=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia const Graphic& rGraphic, USHORT nCount, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, - BYTE nGreyThreshold, BOOL bInvert, - sal_uInt32 nResId)=0; + BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, - sal_uInt32 nResId)=0; + USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog const SfxItemSet* pAttr, SdrModel* pModel, - sal_uInt32 nResId, const SdrView* pSdrView = NULL ) = 0 ; virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, - sal_uInt32 nResId, const SdrObject* pObj = NULL, BOOL bHasObj = TRUE )=0; virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; @@ -515,11 +498,10 @@ public: )=0; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, - sal_uInt32 nResId, BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0; virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0; - virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(USHORT nId ) = 0; // add for SvxDistributePage + virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; // add for SvxDistributePage virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog virtual AbstractScriptSelectorDialog* diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 1d9f10db8673..5c541b3b24dd 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -147,7 +147,7 @@ // -------------------------------------------------------------------------- // Resource-Id's ? (obsolete??? at least the one beginning with SID???) // -------------------------------------------------------------------------- - +/* #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) #define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) #define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207) @@ -196,8 +196,9 @@ #define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // 4 SC & ID 4 resource #define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) // 4 SD #define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress +*/ + #define SID_ATTR_PARENTWINDOW (RID_OFA_START + 255) -#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256) // -------------------------------------------------------------------------- // Event-Id's Block 1 diff --git a/svx/source/dialog/frmdirlbox.src b/svx/source/dialog/frmdirlbox.src deleted file mode 100644 index 4edc347908e0..000000000000 --- a/svx/source/dialog/frmdirlbox.src +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: frmdirlbox.src,v $ - * $Revision: 1.14 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svx/dialogs.hrc> - -// frame direction ------------------------------------------------------------ - -String RID_SVXSTR_FRAMEDIR_LTR -{ - Text [ en-US ] = "Left-to-right"; -}; - -String RID_SVXSTR_FRAMEDIR_RTL -{ - Text [ en-US ] = "Right-to-left"; -}; - -String RID_SVXSTR_FRAMEDIR_SUPER -{ - Text [ en-US ] = "Use superordinate object settings"; -}; - -// page direction ------------------------------------------------------------- - -String RID_SVXSTR_PAGEDIR_LTR_HORI -{ - Text [ en-US ] = "Left-to-right (horizontal)"; -}; - -String RID_SVXSTR_PAGEDIR_RTL_HORI -{ - Text [ en-US ] = "Right-to-left (horizontal)"; -}; - -String RID_SVXSTR_PAGEDIR_RTL_VERT -{ - Text [ en-US ] = "Right-to-left (vertical)"; -}; - -String RID_SVXSTR_PAGEDIR_LTR_VERT -{ - Text [ en-US ] = "Left-to-right (vertical)"; -}; - -// ---------------------------------------------------------------------------- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 24f9d805a502..9e87debfe3bd 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -194,7 +194,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC ); + AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC); DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx index f4fbe2acab23..64555110937f 100644 --- a/svx/source/dialog/hangulhanja.cxx +++ b/svx/source/dialog/hangulhanja.cxx @@ -347,7 +347,7 @@ namespace svx SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection, RID_SVX_MDLG_HANGULHANJA); + m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection ); DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");//CHINA001 m_pConversionDialog->EnableRubySupport( m_pAntiImpl->HasRubySupport() ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 2eaf00d2b73c..741df55c960a 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -560,7 +560,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, RID_SVXDLG_BBDLG,bEnableBackgroundSelector ); + SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() ) { diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index e2004027dd50..7bcdcf4a4c1f 100644 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk @@ -54,7 +54,6 @@ SRC1FILES = \ dlgctrl.src \ docrecovery.src \ fontwork.src \ - frmdirlbox.src \ frmsel.src \ hdft.src \ hyphen.src \ @@ -69,6 +68,7 @@ SRC1FILES = \ rubydialog.src\ ruler.src \ srchdlg.src \ + svxbmpnumvalueset.src \ swframeposstrings.src \ thesdlg.src \ txenctab.src \ diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 60bb838c6e96..4668e0c42fa0 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -42,92 +42,14 @@ String RID_SVXSTR_GRADIENT { Text [ en-US ] = "Gradient" ; }; -String RID_SVXSTR_DESC_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr den Farbverlauf ein: : Geben Sie hier bitte den Namen fr den Farbverlauf ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr den Farbverlauf ein: : Geben Sie hier bitte den Namen fr den Farbverlauf ein: */ - Text [ en-US ] = "Please enter a name for the gradient:" ; -}; -String RID_SVXSTR_DEL_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Farbverlauf lschen : Farbverlauf lschen */ - /* ### ACHTUNG: Neuer Text in Resource? Farbverlauf lschen : Farbverlauf lschen */ - Text [ en-US ] = "Delete gradient" ; -}; -String RID_SVXSTR_ASK_DEL_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelscht werden? : Soll der Farbverlauf wirklich gelscht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelscht werden? : Soll der Farbverlauf wirklich gelscht werden? */ - Text [ en-US ] = "Do you want to delete the gradient?" ; -}; -String RID_SVXSTR_ASK_CHANGE_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde gendert und nicht gesichert. \nSie knnen den selektierten Farbverlauf ndern \noder einen neuen Farbverlauf hinzufgen. : Der Farbverlauf wurde gendert und nicht gesichert. \nSie knnen den selektierten Farbverlauf ndern \noder einen neuen Farbverlauf hinzufgen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde gendert und nicht gesichert. \nSie knnen den selektierten Farbverlauf ndern \noder einen neuen Farbverlauf hinzufgen. : Der Farbverlauf wurde gendert und nicht gesichert. \nSie knnen den selektierten Farbverlauf ndern \noder einen neuen Farbverlauf hinzufgen. */ - Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; -}; String RID_SVXSTR_BITMAP { Text [ en-US ] = "Bitmap" ; }; -String RID_SVXSTR_DESC_NEW_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die Bitmap ein: : Geben Sie hier bitte den Namen fr die Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die Bitmap ein: : Geben Sie hier bitte den Namen fr die Bitmap ein: */ - Text [ en-US ] = "Please enter a name for the bitmap:" ; -}; -String RID_SVXSTR_DESC_EXT_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die externe Bitmap ein: : Geben Sie hier bitte den Namen fr die externe Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die externe Bitmap ein: : Geben Sie hier bitte den Namen fr die externe Bitmap ein: */ - Text [ en-US ] = "Please enter a name for the external bitmap:" ; -}; -String RID_SVXSTR_DEL_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Bitmap lschen : Bitmap lschen */ - /* ### ACHTUNG: Neuer Text in Resource? Bitmap lschen : Bitmap lschen */ - Text [ en-US ] = "Delete bitmap" ; -}; -String RID_SVXSTR_ASK_DEL_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelscht werden? : Soll die Bitmap wirklich gelscht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelscht werden? : Soll die Bitmap wirklich gelscht werden? */ - Text [ en-US ] = "Are you sure you want to delete the bitmap?" ; -}; -String RID_SVXSTR_ASK_CHANGE_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde gendert und nicht gesichert. \nSie knnen die selektierte Bitmap ndern \noder eine neue Bitmap hinzufgen. : Die Bitmap wurde gendert und nicht gesichert. \nSie knnen die selektierte Bitmap ndern \noder eine neue Bitmap hinzufgen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde gendert und nicht gesichert. \nSie knnen die selektierte Bitmap ndern \noder eine neue Bitmap hinzufgen. : Die Bitmap wurde gendert und nicht gesichert. \nSie knnen die selektierte Bitmap ndern \noder eine neue Bitmap hinzufgen. */ - Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; -}; String RID_SVXSTR_LINESTYLE { Text [ en-US ] = "Line Style" ; }; -String RID_SVXSTR_DESC_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr den Linienstil ein: : Geben Sie hier bitte den Namen fr den Linienstil ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr den Linienstil ein: : Geben Sie hier bitte den Namen fr den Linienstil ein: */ - Text [ en-US ] = "Please enter a name for the line style:" ; -}; -String RID_SVXSTR_DEL_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Linienstil lschen : Linienstil lschen */ - /* ### ACHTUNG: Neuer Text in Resource? Linienstil lschen : Linienstil lschen */ - Text [ en-US ] = "Delete line style" ; -}; -String RID_SVXSTR_ASK_DEL_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelscht werden? : Soll der Linienstil wirklich gelscht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelscht werden? : Soll der Linienstil wirklich gelscht werden? */ - Text [ en-US ] = "Do you want to delete the line style?" ; -}; -String RID_SVXSTR_ASK_CHANGE_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde gendert und nicht gesichert. \nSie knnen den selektierten Linienstil ndern \noder einen neuen Linienstil hinzufgen. : Der Linienstil wurde gendert und nicht gesichert. \nSie knnen den selektierten Linienstil ndern \noder einen neuen Linienstil hinzufgen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde gendert und nicht gesichert. \nSie knnen den selektierten Linienstil ndern \noder einen neuen Linienstil hinzufgen. : Der Linienstil wurde gendert und nicht gesichert. \nSie knnen den selektierten Linienstil ndern \noder einen neuen Linienstil hinzufgen. */ - Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; -}; String RID_SVXSTR_INVISIBLE { Text [ en-US ] = "Invisible" ; @@ -140,116 +62,11 @@ String RID_SVXSTR_HATCH { Text [ en-US ] = "Hatching" ; }; -String RID_SVXSTR_DESC_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die Schraffur ein: : Geben Sie hier bitte den Namen fr die Schraffur ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die Schraffur ein: : Geben Sie hier bitte den Namen fr die Schraffur ein: */ - Text [ en-US ] = "Please enter a name for the hatching:" ; -}; -String RID_SVXSTR_DEL_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Schraffur lschen : Schraffur lschen */ - /* ### ACHTUNG: Neuer Text in Resource? Schraffur lschen : Schraffur lschen */ - Text [ en-US ] = "Delete hatching" ; -}; -String RID_SVXSTR_ASK_DEL_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelscht werden? : Soll die Schraffur wirklich gelscht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelscht werden? : Soll die Schraffur wirklich gelscht werden? */ - Text [ en-US ] = "Do you want to delete the hatching?" ; -}; -String RID_SVXSTR_ASK_CHANGE_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde gendert und nicht gesichert. \nSie knnen die selektierte Schraffur ndern \noder eine neue Schraffur hinzufgen. : Die Schraffur wurde gendert und nicht gesichert. \nSie knnen die selektierte Schraffur ndern \noder eine neue Schraffur hinzufgen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde gendert und nicht gesichert. \nSie knnen die selektierte Schraffur ndern \noder eine neue Schraffur hinzufgen. : Die Schraffur wurde gendert und nicht gesichert. \nSie knnen die selektierte Schraffur ndern \noder eine neue Schraffur hinzufgen. */ - Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; -}; -String RID_SVXSTR_CHANGE -{ - /* ### ACHTUNG: Neuer Text in Resource? ndern : ndern */ - /* ### ACHTUNG: Neuer Text in Resource? ndern : ndern */ - Text [ en-US ] = "Modify" ; -}; -String RID_SVXSTR_ADD -{ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufgen : Hinzufgen */ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufgen : Hinzufgen */ - Text [ en-US ] = "Add" ; -}; -String RID_SVXSTR_DESC_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die neue Farbe ein: : Geben Sie hier bitte den Namen fr die neue Farbe ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr die neue Farbe ein: : Geben Sie hier bitte den Namen fr die neue Farbe ein: */ - Text [ en-US ] = "Please enter a name for the new color:" ; -}; -String RID_SVXSTR_DEL_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Farbe lschen : Farbe lschen */ - /* ### ACHTUNG: Neuer Text in Resource? Farbe lschen : Farbe lschen */ - Text [ en-US ] = "Delete color" ; -}; -String RID_SVXSTR_ASK_DEL_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelscht werden? : Soll die Farbe wirklich gelscht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelscht werden? : Soll die Farbe wirklich gelscht werden? */ - Text [ en-US ] = "Do you want to delete the color?" ; -}; -String RID_SVXSTR_ASK_CHANGE_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde gendert und nicht gesichert. \nSie knnen die selektierte Farbe ndern \noder eine neue Farbe hinzufgen. : Die Farbe wurde gendert und nicht gesichert. \nSie knnen die selektierte Farbe ndern \noder eine neue Farbe hinzufgen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde gendert und nicht gesichert. \nSie knnen die selektierte Farbe ndern \noder eine neue Farbe hinzufgen. : Die Farbe wurde gendert und nicht gesichert. \nSie knnen die selektierte Farbe ndern \noder eine neue Farbe hinzufgen. */ - Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; -}; -String RID_SVXSTR_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String RID_SVXSTR_WRITE_DATA_ERROR -{ - Text [ en-US ] = "The file could not be saved!" ; -}; -String RID_SVXSTR_READ_DATA_ERROR -{ - Text [ en-US ] = "The file could not be loaded!" ; -}; -String RID_SVXSTR_WARN_TABLE_OVERWRITE -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde gendert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde gendert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde gendert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde gendert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; -}; -String RID_SVXSTR_WARN_NAME_DUPLICATE -{ - Text [ en-US ] = "The name you have entered already exists. \nPlease choose another name." ; -}; String RID_SVXSTR_LINEEND { Text [ en-US ] = "Arrowheads" ; }; -String RID_SVXSTR_DESC_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr das neue Linienende ein: : Geben Sie hier bitte den Namen fr das neue Linienende ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen fr das neue Linienende ein: : Geben Sie hier bitte den Namen fr das neue Linienende ein: */ - Text [ en-US ] = "Please enter a name for the new arrowhead:" ; -}; -String RID_SVXSTR_DEL_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Linienende lschen : Linienende lschen */ - /* ### ACHTUNG: Neuer Text in Resource? Linienende lschen : Linienende lschen */ - Text [ en-US ] = "Delete line ends" ; -}; -String RID_SVXSTR_ASK_DEL_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelscht werden? : Soll das Linienende wirklich gelscht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelscht werden? : Soll das Linienende wirklich gelscht werden? */ - Text [ en-US ] = "Do you want to delete the arrowhead?" ; -}; -String RID_SVXSTR_ASK_CHANGE_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde gendert und nicht gesichert. \nMchten Sie das Linienende jetzt sichern? : Das Linienende wurde gendert und nicht gesichert. \nMchten Sie das Linienende jetzt sichern? */ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde gendert und nicht gesichert. \nMchten Sie das Linienende jetzt sichern? : Das Linienende wurde gendert und nicht gesichert. \nMchten Sie das Linienende jetzt sichern? */ - Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ; -}; + String RID_SVXSTR_CLOSE { /* ### ACHTUNG: Neuer Text in Resource? Schlieen : Schlieen */ @@ -1375,6 +1192,30 @@ String RID_SVXSTR_TRASNGR0 // ********************************************************************** EOF + // RID_SVXSTR_FIELDUNIT_TABLE -------------------------------------------- + +StringArray RID_SVXSTR_FIELDUNIT_TABLE +{ + ItemList [ en-US ] = + { + < "Millimeter" ; FUNIT_MM ; > ; + < "Centimeter" ; FUNIT_CM ; > ; + < "Meter" ; FUNIT_M ; > ; + < "Kilometer" ; FUNIT_KM ; > ; + < "Inch" ; FUNIT_INCH ; > ; + < "Foot" ; FUNIT_FOOT ; > ; + < "Miles" ; FUNIT_MILE ; > ; + < "Pica" ; FUNIT_PICA ; > ; + < "Point" ; FUNIT_POINT ; > ; + }; + }; + +// unbekannte Zeichenfarbe +String RID_SVXSTR_COLOR_USER +{ + Text [ en-US ] = "User" ; +}; + diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 5af535827c41..9a121a578448 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -286,47 +286,6 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen ) SrchAttrItemList::Remove( nPos, nLen ); } -/* //CHINA001 -// class SvxJSearchOptionsDialog ----------------------------------------- - -SvxJSearchOptionsDialog::SvxJSearchOptionsDialog( - Window *pParent, - const SfxItemSet& rOptionsSet, USHORT nUniqueId, INT32 nInitialFlags ) : - SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), - nInitialTlFlags( nInitialFlags ) -{ - pPage = (SvxJSearchOptionsPage *) - SvxJSearchOptionsPage::Create( this, rOptionsSet ); - SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! - pPage->EnableSaveOptions( FALSE ); -} - - -SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog() -{ - // pPage will be implicitly destroyed by the - // SfxSingleTabDialog destructor -} - - -void SvxJSearchOptionsDialog::Activate() -{ - pPage->SetTransliterationFlags( nInitialTlFlags ); -} - - -INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const -{ - return pPage->GetTransliterationFlags(); -} - - -void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings ) -{ - pPage->SetTransliterationFlags( nSettings ); -} -*/ //CHINA001 - #if ENABLE_LAYOUT #undef SfxModelessDialog #define SfxModelessDialog(bindings, child, parent, id) SfxDialog (parent, "find-and-replace.xml", id, bindings, child) @@ -1589,12 +1548,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { SfxItemSet aSet( SFX_APP()->GetPool() ); pSearchItem->SetTransliterationFlags( GetTransliterationFlags() ); - //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, - //CHINA001 pSearchItem->GetTransliterationFlags() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS ); + AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, + pSearchItem->GetTransliterationFlags() ); DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute(); if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true @@ -2280,7 +2238,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR ); + VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 pDlg->Execute(); delete pDlg; diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src new file mode 100644 index 000000000000..065bc7ee8f64 --- /dev/null +++ b/svx/source/dialog/svxbmpnumvalueset.src @@ -0,0 +1,130 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: numpages.src,v $ + * $Revision: 1.64.242.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include <svx/dialogs.hrc> + +String RID_SVXSTR_BULLET_DESCRIPTION_0 +{ + Text [en-US] = "Solid small circular bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_1 +{ + Text [en-US] = "Solid large circular bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_2 +{ + Text [en-US] = "Solid diamond bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_3 +{ + Text [en-US] = "Solid large square bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_4 +{ + Text [en-US] = "Right pointing arrow bullets filled out"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_5 +{ + Text [en-US] = "Right pointing arrow bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_6 +{ + Text [en-US] = "Check mark bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_7 +{ + Text [en-US] = "Tick mark bullets"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_0 +{ + Text [en-US] = "Number 1) 2) 3)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_1 +{ + Text [en-US] = "Number 1. 2. 3."; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_2 +{ + Text [en-US] = "Number (1) (2) (3)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_3 +{ + Text [en-US] = "Uppercase Roman number I. II. III."; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_4 +{ + Text [en-US] = "Uppercase letter A) B) C)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_5 +{ + Text [en-US] = "Lowercase letter a) b) c)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_6 +{ + Text [en-US] = "Lowercase letter (a) (b) (c)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_7 +{ + Text [en-US] = "Lowercase Roman number i. ii. iii."; +}; + +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 +{ + Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 +{ + Text [en-US] = "Numeric, lowercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 +{ + Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 +{ + Text [en-US] = "Numeric"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 +{ + Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 +{ + Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 +{ + Text [en-US] = "Numeric with all sublevels"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 +{ + Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet"; +}; + diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk index ef4bf0b00149..d99f1705f5b4 100644 --- a/svx/source/items/makefile.mk +++ b/svx/source/items/makefile.mk @@ -50,6 +50,7 @@ LIBTARGET=NO SRS1NAME=svxitems SRC1FILES = \ svxerr.src \ + page.src \ svxitems.src LIB1TARGET= $(SLB)$/$(TARGET)-core.lib diff --git a/svx/source/items/page.src b/svx/source/items/page.src new file mode 100644 index 000000000000..85cfd79e8cda --- /dev/null +++ b/svx/source/items/page.src @@ -0,0 +1,258 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: page.src,v $ + * $Revision: 1.71 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + // include --------------------------------------------------------------- + +#include <svx/dialogs.hrc> + +String RID_SVXSTR_PAPER_A0 +{ + Text = "A0" ; +}; +String RID_SVXSTR_PAPER_A1 +{ + Text = "A1" ; +}; +String RID_SVXSTR_PAPER_A2 +{ + Text = "A2" ; +}; +String RID_SVXSTR_PAPER_A3 +{ + Text = "A3" ; +}; +String RID_SVXSTR_PAPER_A4 +{ + Text = "A4" ; +}; +String RID_SVXSTR_PAPER_A5 +{ + Text = "A5" ; +}; +String RID_SVXSTR_PAPER_B4_ISO +{ + Text = "B4 (ISO)" ; +}; +String RID_SVXSTR_PAPER_B5_ISO +{ + Text = "B5 (ISO)" ; +}; +String RID_SVXSTR_PAPER_LETTER +{ + Text = "Letter" ; +}; +String RID_SVXSTR_PAPER_LEGAL +{ + Text = "Legal" ; +}; +String RID_SVXSTR_PAPER_TABLOID +{ + Text = "Tabloid" ; +}; +String RID_SVXSTR_PAPER_USER +{ + Text [ en-US ] = "User Defined" ; +}; +String RID_SVXSTR_PAPER_B6_ISO +{ + Text = "B6 (ISO)" ; +}; +String RID_SVXSTR_PAPER_C4 +{ + Text = "C4 Envelope" ; +}; +String RID_SVXSTR_PAPER_C5 +{ + Text = "C5 Envelope" ; +}; +String RID_SVXSTR_PAPER_C6 +{ + Text = "C6 Envelope" ; +}; +String RID_SVXSTR_PAPER_C65 +{ + Text = "C6/5 Envelope" ; +}; +String RID_SVXSTR_PAPER_DL +{ + Text = "DL Envelope" ; +}; +String RID_SVXSTR_PAPER_DIA +{ + Text = "Dia Slide" ; +}; +String RID_SVXSTR_PAPER_SCREEN +{ + Text [ en-US ] = "Screen" ; +}; +String RID_SVXSTR_PAPER_C +{ + Text = "C" ; +}; +String RID_SVXSTR_PAPER_D +{ + Text = "D" ; +}; +String RID_SVXSTR_PAPER_E +{ + Text = "E" ; +}; +String RID_SVXSTR_PAPER_EXECUTIVE +{ + Text = "Executive" ; +}; +String RID_SVXSTR_PAPER_LEGAL2 +{ + Text = "Long Bond" ; +}; +String RID_SVXSTR_PAPER_MONARCH +{ + Text = "#8 (Monarch) Envelope" ; +}; +String RID_SVXSTR_PAPER_COM675 +{ + Text = "#6 3/4 (Personal) Envelope" ; +}; +String RID_SVXSTR_PAPER_COM9 +{ + Text = "#9 Envelope" ; +}; +String RID_SVXSTR_PAPER_COM10 +{ + Text = "#10 Envelope" ; +}; +String RID_SVXSTR_PAPER_COM11 +{ + Text = "#11 Envelope" ; +}; +String RID_SVXSTR_PAPER_COM12 +{ + Text = "#12 Envelope" ; +}; +String RID_SVXSTR_PAPER_KAI16 +{ + Text = "16 Kai" ; +}; +String RID_SVXSTR_PAPER_KAI32 +{ + Text = "32 Kai" ; +}; +String RID_SVXSTR_PAPER_KAI32BIG +{ + Text = "Big 32 Kai" ; +}; +String RID_SVXSTR_PAPER_B4_JIS +{ + Text = "B4 (JIS)" ; +}; +String RID_SVXSTR_PAPER_B5_JIS +{ + Text = "B5 (JIS)" ; +}; +String RID_SVXSTR_PAPER_B6_JIS +{ + Text = "B6 (JIS)" ; +}; +String RID_SVXSTR_PAPERBIN +{ + Text [ en-US ] = "Paper tray" ; +}; +String RID_SVXSTR_PAPERBIN_SETTINGS +{ + Text [ en-US ] = "[From printer settings]" ; +}; + // ********************************************************************** EOF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 8a9c80c37ec7..f8394525dfcf 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -816,7 +816,7 @@ void SdrEditView::DistributeMarkedObjects() SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr, RID_SVXPAGE_DISTRIBUTE); + AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 UINT16 nResult = pDlg->Execute(); |