diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-01-27 10:32:23 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-27 13:40:21 +0100 |
| commit | 7fbfed6539d607b34fb19c48ea418b2e16454de2 (patch) | |
| tree | 58591cf2a7efe3269e411c98293348cebd8908ad /svx | |
| parent | 8715ca8cfda5159706b32d89886da8a4e35e8148 (diff) | |
Revert "Removed list and numbering paragraph styles and related option page"
This reverts commits 359d0fbd03a68d9131e8fb25e7dac9f19ddf6dcb,
6a15a2898b7f822ddfba23553dd127e25af15fff and
21352f88caba9dee73d5a87c8e3724d17ac6b428.
This change is not mature enought: needs more work
(cherry picked from commit e9ec6d58b58739ce43ff563fd78c2326e11d1741)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
sw/source/core/doc/poolfmt.cxx
unusedcode.easy
Diffstat (limited to 'svx')
| -rwxr-xr-x | svx/inc/svx/dialogs.hrc | 3 | ||||
| -rwxr-xr-x | svx/source/src/app.hrc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 76b0c0a4405d..66a5be761d4a 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -130,9 +130,12 @@ // 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) diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index e2ee4daf3a03..8f105d1698b0 100755 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -148,6 +148,7 @@ //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) @@ -186,9 +187,11 @@ #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 |