[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                      |    3 +
 patches/dev300/calc-xls-import-name-on-higher-sheets.diff |   22 ++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit ad20a1bb82753f9080e6430430131f01d21ec9d3
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Nov 8 16:16:21 2010 -0500

    Fixed crash on importing named ranges on higher sheets.
    
    Calc would crash when importing xls document containing named ranges
    on sheets higher than 256. (n#649941)
    
    * patches/dev300/apply:
    * patches/dev300/calc-xls-import-name-on-higher-sheets.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4e939b7..093162c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3922,6 +3922,9 @@ calc-dp-sort-fix.diff, n#629920, kohei
 # Fix poor performance in importing external ref cache from xls.
 calc-perf-import-xls-extref-cache.diff, kohei
 
+# Fix a crash when importing named ranges on sheets > 256.
+calc-xls-import-name-on-higher-sheets.diff, n#649941, kohei
+
 [ GentooExperimental ]
 SectionOwner => hmth
 # jemalloc, FreeBSD 7 allocator
diff --git a/patches/dev300/calc-xls-import-name-on-higher-sheets.diff b/patches/dev300/calc-xls-import-name-on-higher-sheets.diff
new file mode 100644
index 0000000..4a77cbf
--- /dev/null
+++ b/patches/dev300/calc-xls-import-name-on-higher-sheets.diff
@@ -0,0 +1,22 @@
+diff --git sc/source/filter/excel/frmbase.cxx sc/source/filter/excel/frmbase.cxx
+index 1156561..71bf8da 100644
+--- sc/source/filter/excel/frmbase.cxx
++++ sc/source/filter/excel/frmbase.cxx
+@@ -103,7 +103,7 @@ void _ScRangeListTabs::Append( ScSingleRefData a, SCsTAB nTab, const BOOL b )
+ 	if( nTab < 0)
+ 		nTab = a.nTab;
+ 
+-    if( nTab >= 0 )
++    if( nTab >= 0 && nTab <= MAXTAB)
+     {
+         _ScRangeList*   p = ppTabLists[ nTab ];
+ 
+@@ -168,7 +168,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCsTAB nTab, const BOOL b )
+ 	if( nTab < -1)
+ 		nTab = a.Ref1.nTab;
+ 
+-    if( nTab >= 0 )
++    if( nTab >= 0 && nTab <= MAXTAB)
+     {
+         _ScRangeList*   p = ppTabLists[ nTab ];
+