diff options
| author | Eike Rathke <erack@redhat.com> | 2014-03-14 23:00:25 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-03-14 23:04:19 +0100 |
| commit | 83a55e63f15a2b5f9897636bfb33a3ceb4105eba (patch) | |
| tree | a1491a5b5ed4a06ae1ab2897ba6e89c25075b928 /sc/inc | |
| parent | a12de5aab0c2f1553086de13a7bdb92fac81ee70 (diff) | |
some formula interpreter options are document specific
Ideally they'd even be stored as document options. Future work?
Change-Id: Ida126a441ca88c35406fb66ea3722d6335e6e8e2
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/document.hxx | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index c477e726410a..1c0fadf289b4 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -47,6 +47,7 @@ struct SC_DLLPUBLIC ScCalcConfig ScCalcConfig(); void reset(); + void MergeDocumentSpecific( const ScCalcConfig& r ); bool operator== (const ScCalcConfig& r) const; bool operator!= (const ScCalcConfig& r) const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index a6af9fb6295f..2d39f5ac175f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -37,6 +37,7 @@ #include "typedstrdata.hxx" #include "compressedarray.hxx" #include "calcmacros.hxx" +#include "calcconfig.hxx" #include <tools/fract.hxx> #include <tools/gen.hxx> @@ -267,6 +268,8 @@ private: boost::scoped_ptr<sc::FormulaGroupContext> mpFormulaGroupCxt; mutable boost::scoped_ptr<sc::DocumentLinkManager> mpDocLinkMgr; + ScCalcConfig maCalcConfig; + SfxUndoManager* mpUndoManager; ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper @@ -2062,6 +2065,9 @@ public: SC_DLLPUBLIC void DumpFormulaGroups( SCTAB nTab, SCCOL nCol ) const; #endif + void SetCalcConfig( const ScCalcConfig& rConfig ); + const ScCalcConfig& GetCalcConfig() const; + private: // CLOOK-Impl-methods /** |