diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-29 23:54:26 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-12-01 11:21:31 +0100 |
| commit | b56cd8050137ed4555a5aca50d4949d941e1f132 (patch) | |
| tree | 9b53b74c6cc794461771fe4331b1246740aa7ecb /include | |
| parent | 7d12aa833aec8e9a5c453104a23bff70cec54a45 (diff) | |
Prepare for translated new AutoFormat Table Styles, tdf#101349
Stored in file are resource IDs for predefined style names, user
defined styles are stored with ID 0xffff and display the given
name. The 16 old styles have IDs 0..15, so add strings for the 10
new styles and append those to the already existing IDs assigning
them the range 16..25
Once the final autotbl.fmt file with only new styles will be
available, patch that to change the 0xffff user defined to those
16..25 (0x10 to 0x19) IDs, it is the uint16 immediately following
the style name (Little Endian). Order of styles should match the
one in this change, if not, change the change..
Also, this eliminates the duplicated translation entries in
sw/inc/strings.hrc and instead in
sw/source/core/doc/DocumentStylePoolManager.cxx pulls the
translations from include/svx/strings.hrc
Change-Id: I7827ae22ab05901e6580ff1b9cd812db55f94f7f
Reviewed-on: https://gerrit.libreoffice.org/45544
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/strings.hrc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 048cdc6c681e..2aad6c092bdc 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -640,6 +640,7 @@ #define RID_SVXSTR_COLOR_YELLOWGREEN NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green") #define RID_SVXSTR_COLOR_PINK NC_("RID_SVXSTR_COLOR_PINK", "Pink") #define RID_SVXSTR_COLOR_TURQUOISE NC_("RID_SVXSTR_COLOR_TURQUOISE", "Turquoise") +/* 16 old AutoFormat Table Styles */ #define RID_SVXSTR_TBLAFMT_3D NC_("RID_SVXSTR_TBLAFMT_3D", "3D") #define RID_SVXSTR_TBLAFMT_BLACK1 NC_("RID_SVXSTR_TBLAFMT_BLACK1", "Black 1") #define RID_SVXSTR_TBLAFMT_BLACK2 NC_("RID_SVXSTR_TBLAFMT_BLACK2", "Black 2") @@ -656,6 +657,17 @@ #define RID_SVXSTR_TBLAFMT_RED NC_("RID_SVXSTR_TBLAFMT_RED", "Red") #define RID_SVXSTR_TBLAFMT_TURQUOISE NC_("RID_SVXSTR_TBLAFMT_TURQUOISE", "Turquoise") #define RID_SVXSTR_TBLAFMT_YELLOW NC_("RID_SVXSTR_TBLAFMT_YELLOW", "Yellow") +/* 10 new AutoFormat Table Styles since LibreOffice 6.0 */ +#define RID_SVXSTR_TBLAFMT_LO6_ACADEMIC NC_("RID_SVXSTR_TBLAFMT_LO6_ACADEMIC", "Academic") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE", "Box List Blue") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN", "Box List Green") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED", "Box List Red") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW", "Box List Yellow") +#define RID_SVXSTR_TBLAFMT_LO6_ELEGANT NC_("RID_SVXSTR_TBLAFMT_LO6_ELEGANT", "Elegant") +#define RID_SVXSTR_TBLAFMT_LO6_FINANCIAL NC_("RID_SVXSTR_TBLAFMT_LO6_FINANCIAL", "Financial") +#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS", "Simple Grid Columns") +#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS", "Simple Grid Rows") +#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED", "Simple List Shaded") #define RID_SVXSTR_LINEJOINT_MIDDLE NC_("RID_SVXSTR_LINEJOINT_MIDDLE", "Line joint averaged") #define RID_SVXSTR_LINEJOINT_BEVEL NC_("RID_SVXSTR_LINEJOINT_BEVEL", "Line joint bevel") #define RID_SVXSTR_LINEJOINT_MITER NC_("RID_SVXSTR_LINEJOINT_MITER", "Line joint miter") |