diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-13 18:41:19 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-20 14:14:02 +0200 |
| commit | 8a2ddbeff52978336dc9173dacc0c0a8f292ce1a (patch) | |
| tree | 4e7b117763c465a23386fe434d2728b784ccbd7d /sc/inc | |
| parent | 188d3e4b576d6c98f84a6c01883620219d8feaa4 (diff) | |
tdf#92256: Improved interop of INDIRECT function
This is a combination of 12 commits from master branch:
tdf#92256: ODF save/load syntax for string reference
Related tdf#92256: map CONV_OOO to listbox item no.1
tdf#92256: Introducing CONV_A1_XL_A1 address pseudoconvention
tdf#92256: OOXML save/load syntax for string reference
add unhandled case in switch
that comment is not correct anymore
don't generate invalid XLSX files
tdf#92256: Handle case when string ref syntax is unknown
tdf#92256: Make OOXML filter CONV_A1_XL_A1 aware too
tdf#92256: Make sure ref syntax of Excel docs gets saved
tdf#92256: Save ref syntax when different from native one
tdf#92256: Don't force CalcA1 syntax on all !Microsoft xlsx docs
Change-Id: I226d5644ce729f1311aefc9a8998b3a75633c334
Reviewed-on: https://gerrit.libreoffice.org/17837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/unonames.hxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index d10154c426f4..18aab2166c0d 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -43,6 +43,7 @@ struct SC_DLLPUBLIC ScCalcConfig formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax; StringConversion meStringConversion; bool mbEmptyStringAsZero:1; + bool mbHasStringRefSyntax:1; bool mbOpenCLSubsetOnly:1; bool mbOpenCLAutoSelect:1; @@ -59,6 +60,7 @@ struct SC_DLLPUBLIC ScCalcConfig void reset(); void MergeDocumentSpecific( const ScCalcConfig& r ); + void SetStringRefSyntax( formula::FormulaGrammar::AddressConvention eConv ); bool operator== (const ScCalcConfig& r) const; bool operator!= (const ScCalcConfig& r) const; diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index d937775769c0..b064995a1468 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -511,6 +511,7 @@ #define SC_UNO_INTEROPGRABBAG "InteropGrabBag" #define SC_UNO_RECORDCHANGES "RecordChanges" #define SC_UNO_ISRECORDCHANGESPROTECTED "IsRecordChangesProtected" +#define SC_UNO_SYNTAXSTRINGREF "SyntaxStringRef" // document properties from FormModel |