diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-10-05 10:32:10 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-10-05 10:32:10 -0400 |
| commit | 35c75a3c2f07c9662893af50789fd21586ccc88c (patch) | |
| tree | 71aa09abceca6e8326884a0c70c73e9a859b3b8d /sc/inc | |
| parent | 52dc6590c55a2edd17afd252789cc5606a594c4f (diff) | |
Ported calc-formula-variable-sep-config-check-sc.diff from ooo-build.
This code handles situations where the formula arg separator is in
conflict with the locale specific decimal and/or thousand separators.
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/docoptio.hxx | 3 | ||||
| -rw-r--r-- | sc/inc/globstr.hrc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index d9efdf01d0e5..3e751e598af6 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -117,7 +117,8 @@ public: void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; } ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; } - const LocaleDataWrapper& GetLocaleDataWrapper() const; + void ResetFormulaSeparators(); + static const LocaleDataWrapper& GetLocaleDataWrapper(); }; diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 4639c028a464..bc3094424d69 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -578,7 +578,9 @@ #define STR_UNDO_INSERT_CURRENT_DATE 440 #define STR_UNDO_INSERT_CURRENT_TIME 441 -#define STR_COUNT 442 +#define STR_OPTIONS_WARN_SEPARATORS 442 + +#define STR_COUNT 443 #endif |