From 8a2ddbeff52978336dc9173dacc0c0a8f292ce1a Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Mon, 13 Jul 2015 18:41:19 +0200 Subject: 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 Reviewed-by: Thorsten Behrens --- oox/source/core/xmlfilterbase.cxx | 6 ++++-- oox/source/token/namespaces-strict.txt | 3 +++ oox/source/token/namespaces.hxx.tail | 1 + oox/source/token/namespaces.txt | 3 +++ oox/source/token/tokens.txt | 8 ++++++++ 5 files changed, 19 insertions(+), 2 deletions(-) (limited to 'oox') diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 4ef16d0c6bce..13deec20eeaa 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -118,7 +118,8 @@ struct NamespaceIds: public rtl::StaticWithInit< "http://schemas.openxmlformats.org/markup-compatibility/2006", "http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2", "http://schemas.microsoft.com/office/drawing/2008/diagram", - "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" + "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main", + "http://schemas.libreoffice.org/" }; static const sal_Int32 namespaceIds[] = { @@ -145,7 +146,8 @@ struct NamespaceIds: public rtl::StaticWithInit< NMSP_mce, NMSP_mceTest, NMSP_dsp, - NMSP_xls14Lst + NMSP_xls14Lst, + NMSP_loext }; Sequence< beans::Pair< OUString, sal_Int32 > > aRet(SAL_N_ELEMENTS(namespaceIds)); diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 9359f8b48094..026fcfe8ded9 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -80,3 +80,6 @@ a14 http://schemas.microsoft.com/office/drawingml/2010/main # xls14Lst for features introduced by excel 2010 xls14Lst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main + +# LibreOffice's own extensions +loext http://schemas.libreoffice.org/ diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index de5cc21d86a6..24de6457698a 100644 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -55,6 +55,7 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } #define WPS_TOKEN( token ) OOX_TOKEN( wps, token ) #define WPG_TOKEN( token ) OOX_TOKEN( wpg, token ) #define W_TOKEN( token ) OOX_TOKEN( doc, token ) +#define LOEXT_TOKEN( token ) OOX_TOKEN( loext, token ) diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index face9d62db10..2c61d606ff9d 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -80,3 +80,6 @@ a14 http://schemas.microsoft.com/office/drawing/2010/main # xls14Lst for features introduced by excel 2010 xls14Lst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main + +# LibreOffice's own extensions +loext http://schemas.libreoffice.org/ diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index c26e957f6d6b..c5843faffdd8 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -69,6 +69,8 @@ BroadcastTitle Broadcaster Button CF +CalcA1 +CalcA1ExcelA1 Camera Cancel Caption @@ -141,6 +143,8 @@ Editor ElectronicSource Embed EnhancedMetaFile +ExcelA1 +ExcelR1C1 Extend Extension External @@ -392,6 +396,7 @@ True Type Types UIObj +Unspecified URI URL UpdateMode @@ -2137,6 +2142,7 @@ exp explosion expression ext +extCalcPr extLst extend extendable @@ -3165,6 +3171,7 @@ lockWindows locked lockedCanvas lockrotationcenter +loext log logBase lon @@ -4954,6 +4961,7 @@ strikeH strikeTLBR strikeV string +stringRefSyntax stringValue1 stringValue2 stripedRightArrow -- cgit