summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2011-08-31 22:17:29 -0400
committerKohei Yoshida <kohei.yoshida@suse.com>2011-08-31 22:23:58 -0400
commit6af23840bbf5be90b617f7e63deb074359e3e8a6 (patch)
tree15fb8421ec5bc48f0dc12eb24d42e261f728fe61 /oox
parent6825533b8d93f92a66558a9b6295003ceba52917 (diff)
fdo#40466: Make sure we have the same numbers of URI's and Id's.
This caused an immediate crash when trying to import xlsx documents with charts on Windows. No idea why this didn't crash on Linux, even valgrind's memcheck didn't pick it up.
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/xmlfilterbase.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 7d17921afd4a..732b67731820 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -146,7 +146,9 @@ namespace
"http://schemas.openxmlformats.org/spreadsheetml/2006/main",
"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing",
"http://schemas.microsoft.com/office/excel/2006/main",
- "http://schemas.openxmlformats.org/presentationml/2006/main"
+ "http://schemas.openxmlformats.org/presentationml/2006/main",
+ "http://schemas.openxmlformats.org/markup-compatibility/2006",
+ "http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2"
};
static const sal_Int32 namespaceIds[] = {
@@ -168,7 +170,7 @@ namespace
NMSP_ax,
NMSP_xm,
NMSP_mce,
- NMSP_mceTest,
+ NMSP_mceTest
};
Sequence< Pair< OUString, sal_Int32 > > aRet(STATIC_ARRAY_SIZE(namespaceIds));