diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2017-12-17 14:24:57 -0500 |
---|---|---|
committer | Kohei Yoshida <libreoffice@kohei.us> | 2017-12-19 01:16:33 +0100 |
commit | 40e1cb217396c7183ea3a7379a8a15c8df3aea2e (patch) | |
tree | dda004a7b50c1ac32362adb618be2795bce52756 /sc/source/filter/inc/orcusinterface.hxx | |
parent | a2158c6ca2ba831665019827889f01e98dc93394 (diff) |
Pick up sheet-local named expressions as well.
Change-Id: I8a081b5f81740fa91f43ac152a950d73d031ed10
Reviewed-on: https://gerrit.libreoffice.org/46666
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc/source/filter/inc/orcusinterface.hxx')
-rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 07c35fa78dfe..5d6cc1f55135 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -79,9 +79,10 @@ class ScOrcusNamedExpression : public orcus::spreadsheet::iface::import_named_ex { ScDocumentImport& mrDoc; const ScOrcusGlobalSettings& mrGlobalSettings; + SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named expressions. public: - ScOrcusNamedExpression( ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS ); + ScOrcusNamedExpression( ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab = -1 ); virtual void define_name(const char* p_name, size_t n_name, const char* p_exp, size_t n_exp) override; }; @@ -223,6 +224,7 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet ScOrcusAutoFilter maAutoFilter; ScOrcusSheetProperties maProperties; ScOrcusConditionalFormat maConditionalFormat; + ScOrcusNamedExpression maNamedExpressions; int mnCellCount; @@ -235,6 +237,7 @@ public: virtual orcus::spreadsheet::iface::import_table* get_table() override; virtual orcus::spreadsheet::iface::import_sheet_properties* get_sheet_properties() override; virtual orcus::spreadsheet::iface::import_conditional_format* get_conditional_format() override; + virtual orcus::spreadsheet::iface::import_named_expression* get_named_expression() override; // Orcus import interface virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; @@ -594,6 +597,8 @@ public: void incrementProgress(); void setStatusIndicator(const css::uno::Reference<css::task::XStatusIndicator>& rIndicator); + + const ScOrcusGlobalSettings& getGlobalSettings() const; }; #endif |