diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-29 23:54:26 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-12-01 18:31:23 +0100 |
| commit | a2d5b912e103c680339162ccfd15783ba6bfa232 (patch) | |
| tree | 5a88f24edce43f39df3143a0ece336950645a7a0 /sc | |
| parent | faf10d47142d6dde25b6d6c5f7994340075ab7ac (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>
(cherry picked from commit b56cd8050137ed4555a5aca50d4949d941e1f132)
Reviewed-on: https://gerrit.libreoffice.org/45651
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/autoform.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 296dae5b9026..371cf8c2347f 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -762,7 +762,17 @@ static const char* RID_SVXSTR_TBLAFMT[] = RID_SVXSTR_TBLAFMT_LAVENDER, RID_SVXSTR_TBLAFMT_RED, RID_SVXSTR_TBLAFMT_TURQUOISE, - RID_SVXSTR_TBLAFMT_YELLOW + RID_SVXSTR_TBLAFMT_YELLOW, + RID_SVXSTR_TBLAFMT_LO6_ACADEMIC, + RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE, + RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN, + RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED, + RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW, + RID_SVXSTR_TBLAFMT_LO6_ELEGANT, + RID_SVXSTR_TBLAFMT_LO6_FINANCIAL, + RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS, + RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS, + RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED }; bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions ) |