diff options
author | Aron Budea <aron.budea@collabora.com> | 2017-11-28 07:23:12 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-11-28 22:27:17 +0100 |
commit | bba57a7eb9dd118df5772068b3a70aedb3602003 (patch) | |
tree | 227e304f63b0c7e34ce26cd6530952099a091d9e /sc/source/filter/inc | |
parent | sd lok: ensure default view (diff) | |
download | core-bba57a7eb9dd118df5772068b3a70aedb3602003.tar.gz core-bba57a7eb9dd118df5772068b3a70aedb3602003.zip |
tdf#109240, tdf#112571: don't export dupe built-in named ranges
XclTools::GetBuiltInDefNameIndex(...) only checked for prefix used in
binary Excel format, and didn't recognize OOXML built-in names, which
resulted in saving them twice in OOXML files.
Adapt to check both binary and OOXML prefixes, similarly to
XclTools::IsBuiltInStyleName(...).
Saving "bad" files after the fix will purge bad "_0", "_0_0" etc.
suffixed built-in names due to how GetBuiltInDefNameIndex(...) works.
Change-Id: I1bbe11f9c654a142a4626003df4cb0fd2a0f9c71
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r-- | sc/source/filter/inc/xltools.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 2a202c3800b4..0939cddd6947 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -189,8 +189,8 @@ public: static OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name index of the passed defined name from Calc. @descr Ignores any characters following a valid representation of a built-in name. - @param pcBuiltIn (out-param) If not 0, the index of the built-in name will be returned here. - @return true = passed string is a built-in name; false = user-defined name. */ + @param rDefName raw English UI representation of a built-in defined name used in NAME records. + @return the index of the built-in name, or EXC_BUILTIN_UNKNOWN if it is not a built-in name. */ static sal_Unicode GetBuiltInDefNameIndex( const OUString& rDefName ); // built-in style names --------------------------------------------------- |