diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-10 11:19:38 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-10 15:17:55 +0100 |
| commit | 34c157e0032e182a044979ce210009decb20e755 (patch) | |
| tree | b00b1b2ff37f93b44f91ec2de7c19b4febfc7ddd /sc/inc | |
| parent | 688c668003739042c2431ec3f7a94d6b3ac6998a (diff) | |
improve the recalc dialog for ooxml
Change-Id: I94ea2d52f86a340ce3802ea4b63642cfc637bd2d
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/formulaopt.hxx | 13 | ||||
| -rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
| -rw-r--r-- | sc/inc/scmod.hxx | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 7cc2dd8fe7fe..4f07c40e3c21 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -37,6 +37,14 @@ #include "global.hxx" #include "calcconfig.hxx" +// have to match the registry values +enum SC_DLLPUBLIC ScRecalcOptions +{ + RECALC_ALWAYS = 0, + RECALC_ASK = 1, + RECALC_NEVER = 2 +}; + class SC_DLLPUBLIC ScFormulaOptions { private: @@ -48,6 +56,8 @@ private: ::rtl::OUString aFormulaSepArrayRow; ::rtl::OUString aFormulaSepArrayCol; + ScRecalcOptions meOOXMLRecalc; + public: ScFormulaOptions(); ScFormulaOptions( const ScFormulaOptions& rCpy ); @@ -74,6 +84,9 @@ public: void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; } ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; } + void SetOOXMLRecalcOptions( ScRecalcOptions eOpt ) { meOOXMLRecalc = eOpt; } + ScRecalcOptions GetOOXMLRecalcOptions() const { return meOOXMLRecalc; } + void ResetFormulaSeparators(); static void GetDefaultFormulaSeparators(rtl::OUString& rSepArg, rtl::OUString& rSepArrayCol, rtl::OUString& rSepArrayRow); diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 3f23dc1936f2..c1873b5bfb52 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -618,7 +618,9 @@ #define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 492 #define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 493 +#define STR_ALWAYS 494 +#define STR_NEVER 495 -#define STR_COUNT 494 +#define STR_COUNT 496 #endif diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index e0235468e39e..acc0e17f0aaf 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -173,14 +173,14 @@ public: const ScDocOptions& GetDocOptions (); SC_DLLPUBLIC const ScAppOptions& GetAppOptions (); SC_DLLPUBLIC const ScDefaultsOptions& GetDefaultsOptions (); - const ScFormulaOptions& GetFormulaOptions (); + SC_DLLPUBLIC const ScFormulaOptions& GetFormulaOptions (); const ScInputOptions& GetInputOptions (); SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); void SetViewOptions ( const ScViewOptions& rOpt ); void SetDocOptions ( const ScDocOptions& rOpt ); SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); void SetDefaultsOptions ( const ScDefaultsOptions& rOpt ); - void SetFormulaOptions ( const ScFormulaOptions& rOpt ); + SC_DLLPUBLIC void SetFormulaOptions ( const ScFormulaOptions& rOpt ); void SetInputOptions ( const ScInputOptions& rOpt ); void SetPrintOptions ( const ScPrintOptions& rOpt ); void InsertEntryToLRUList(sal_uInt16 nFIndex); |