--------------Boundary-00=_MKN9GR6A99RCSG3EWEX6 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Following patch adresses 2 issues: 1. Row limitation: Rows were limited by 10000 lines (see also BR 11819): I don't know if all the changes were realy necessary, but from my point all are obvious: file kspread_canvas.cc: Limitation should be more than 9999 lines/columns file kspread_cluster.h: This is the main reason for the limitation. file kspread/kspread_layout.cc: Again a limitation by 10000 file kspread_table.cc: Don't know if this part is necessary, but I think int=0x10000 is wrong, it should be maximum int=0xFFFF. But this should be left to one, that knows the difference better. Even in the worst case 0x8000 should already be the end. 2. Limitation of column labels: file: kspread_util.cc I already sent this to the koffice mailing list and still think, that this single part doesn't have an logical influence on the other part of the code. Again this patch makes only possible that this routine can generate senseful text labels for values > 26*26. It can now generate texts for values up to 2^16 values, even if it is limited by code to 2^15. Please apply. Philipp --------------Boundary-00=_MKN9GR6A99RCSG3EWEX6 Content-Type: text/x-diff; charset="iso-8859-1"; name="kspread_patch.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kspread_patch.diff" SW5kZXg6IGtzcHJlYWQva3NwcmVhZF9jYW52YXMuY2MKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hv bWUva2RlL2tvZmZpY2Uva3NwcmVhZC9rc3ByZWFkX2NhbnZhcy5jYyx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4yMTcKZGlmZiAtdSAtMyAtcCAtdSAtcjEuMjE3IGtzcHJlYWRfY2FudmFzLmNjCi0t LSBrc3ByZWFkL2tzcHJlYWRfY2FudmFzLmNjCTIwMDIvMDIvMDggMTY6MjI6MTUJMS4yMTcKKysr IGtzcHJlYWQva3NwcmVhZF9jYW52YXMuY2MJMjAwMi8wMi8yOCAyMjo1MzoyMgpAQCAtMjIzOSw4 ICsyMjM5LDggQEAgdm9pZCBLU3ByZWFkQ2FudmFzOjp1cGRhdGVTZWxlY3Rpb24oIGNvbgogICAg IFFSZWN0IHVuaSA9IG9sZF9zZWwudW5pdGUoIG5ld19zZWwgKS51bml0ZSggb2xkX291dGVyICku dW5pdGUoIG9sZF9tYXJrZXIgKS51bml0ZSggbmV3X21hcmtlciApOwoKICAgICAvLyBMaW1pdCB0 aGUgbnVtYmVyIG9mIGNlbGxzCi0gICAgdW5pLnJCb3R0b20oKSA9IFFNSU4oIDk5OTksIHVuaS5i b3R0b20oKSApOwotICAgIHVuaS5yUmlnaHQoKSA9IFFNSU4oIDk5OTksIHVuaS5yaWdodCgpICk7 CisgICAgdW5pLnJCb3R0b20oKSA9IFFNSU4oIDB4N0ZGRiwgdW5pLmJvdHRvbSgpICk7CisgICAg dW5pLnJSaWdodCgpID0gUU1JTiggMHg3RkZGLCB1bmkucmlnaHQoKSApOwoKICAgICAvL3FEZWJ1 ZygiVU5JIGxlZnQvdG9wIDolaS8laSByaWdodC9ib3R0b20gOiVpLyVpIiwgdW5pLmxlZnQoKSwg dW5pLnRvcCgpLCB1bmkucmlnaHQoKSwgdW5pLmJvdHRvbSgpICk7CgpJbmRleDoga3NwcmVhZC9r c3ByZWFkX2NsdXN0ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva29mZmljZS9r c3ByZWFkL2tzcHJlYWRfY2x1c3Rlci5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQKZGlmZiAt dSAtMyAtcCAtdSAtcjEuNCBrc3ByZWFkX2NsdXN0ZXIuaAotLS0ga3NwcmVhZC9rc3ByZWFkX2Ns dXN0ZXIuaAkyMDAwLzA3LzEzIDE5OjM1OjAxCTEuNAorKysga3NwcmVhZC9rc3ByZWFkX2NsdXN0 ZXIuaAkyMDAyLzAyLzI4IDIyOjUzOjIyCkBAIC03LDkgKzcsMTAgQEAgY2xhc3MgUm93TGF5b3V0 OwoKIGNsYXNzIFFQb2ludDsKCi0jZGVmaW5lIEtTUFJFQURfQ0xVU1RFUl9MRVZFTDEgMTAwCi0j ZGVmaW5lIEtTUFJFQURfQ0xVU1RFUl9MRVZFTDIgMTAwCi0jZGVmaW5lIEtTUFJFQURfQ0xVU1RF Ul9NQVggKDEwMCoxMDApCisjZGVmaW5lIEtTUFJFQURfQ0xVU1RFUl9MRVZFTDEgMjU2CisjZGVm aW5lIEtTUFJFQURfQ0xVU1RFUl9MRVZFTDIgMjU2CisvKiBLU1BSRUFEX0NMVVNURVJfTUFYIGlz IENVUlJFTlRMWSAyXjE1IG9ubHksIHNvIGl0J3MgMjU2KjI1NiBkaXZpZGVkIGJ5IDIgKi8KKyNk ZWZpbmUgS1NQUkVBRF9DTFVTVEVSX01BWCAoMjU2KjI1Ni8yKQoKIGNsYXNzIEtTcHJlYWRDbHVz dGVyCiB7CkluZGV4OiBrc3ByZWFkL2tzcHJlYWRfbGF5b3V0LmNjCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZp bGU6IC9ob21lL2tkZS9rb2ZmaWNlL2tzcHJlYWQva3NwcmVhZF9sYXlvdXQuY2MsdgpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuNjgKZGlmZiAtdSAtMyAtcCAtdSAtcjEuNjgga3NwcmVhZF9sYXlvdXQu Y2MKLS0tIGtzcHJlYWQva3NwcmVhZF9sYXlvdXQuY2MJMjAwMS8xMC8yNSAwODozNToyNgkxLjY4 CisrKyBrc3ByZWFkL2tzcHJlYWRfbGF5b3V0LmNjCTIwMDIvMDIvMjggMjI6NTM6MjIKQEAgLTE3 NTcsNyArMTc1Nyw3IEBAIGJvb2wgUm93TGF5b3V0Ojpsb2FkKCBjb25zdCBRRG9tRWxlbWVudCYK IAlrZERlYnVnKDM2MDAxKSA8PCAiVmFsdWUgaGVpZ2h0PSIgPDwgbV9mSGVpZ2h0IDw8ICIgb3V0 IG9mIHJhbmdlIiA8PCBlbmRsOwogCXJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgaWYgKCBtX2lS b3cgPCAxIHx8IG1faVJvdyA+PSAxMDAwMCApCisgICAgaWYgKCBtX2lSb3cgPCAxIHx8IG1faVJv dyA+PSAweDdGRkYgKQogICAgIHsKIAlrZERlYnVnKDM2MDAxKSA8PCAiVmFsdWUgcm93PSIgPDwg bV9pUm93IDw8ICIgb3V0IG9mIHJhbmdlIiA8PCBlbmRsOwogCXJldHVybiBmYWxzZTsKQEAgLTE5 MzQsNyArMTkzNCw3IEBAIGJvb2wgQ29sdW1uTGF5b3V0Ojpsb2FkKCBjb25zdCBRRG9tRWxlbWUK IAlrZERlYnVnKDM2MDAxKSA8PCAiVmFsdWUgd2lkdGg9IiA8PCBtX2ZXaWR0aCA8PCAiIG91dCBv ZiByYW5nZSIgPDwgZW5kbDsKIAlyZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIGlmICggbV9pQ29s dW1uIDwgMSB8fCBtX2lDb2x1bW4gPj0gMTAwMDAgKQorICAgIGlmICggbV9pQ29sdW1uIDwgMSB8 fCBtX2lDb2x1bW4gPj0gMHg3RkZGICkKICAgICB7CiAJa2REZWJ1ZygzNjAwMSkgPDwgIlZhbHVl IGNvbD0iIDw8IG1faUNvbHVtbiA8PCAiIG91dCBvZiByYW5nZSIgPDwgZW5kbDsKIAlyZXR1cm4g ZmFsc2U7CkluZGV4OiBrc3ByZWFkL2tzcHJlYWRfdGFibGUuY2MKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUva2RlL2tvZmZpY2Uva3NwcmVhZC9rc3ByZWFkX3RhYmxlLmNjLHYKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjMxNQpkaWZmIC11IC0zIC1wIC11IC1yMS4zMTUga3NwcmVhZF90YWJsZS5j YwotLS0ga3NwcmVhZC9rc3ByZWFkX3RhYmxlLmNjCTIwMDIvMDIvMjYgMTM6MzY6MjIJMS4zMTUK KysrIGtzcHJlYWQva3NwcmVhZF90YWJsZS5jYwkyMDAyLzAyLzI4IDIyOjUzOjI1CkBAIC0yNzQs NyArMjc0LDcgQEAgaW50IEtTcHJlYWRUYWJsZTo6bGVmdENvbHVtbiggaW50IF94cG9zLAogICAg IHdoaWxlICggeCA8IF94cG9zICkKICAgICB7CiAgICAgICAgIC8vIFNob3VsZCBuZXZlciBoYXBw ZW4KLSAgICAgICAgaWYgKCBjb2wgPT0gMHgxMDAwMCApCisgICAgICAgIGlmICggY29sID09IDB4 ODAwMCApCiAgICAgICAgICAgICByZXR1cm4gMTsKICAgICAgICAgX2xlZnQgKz0gY29sdW1uTGF5 b3V0KCBjb2wgKS0+d2lkdGgoIF9jYW52YXMgKTsKICAgICAgICAgY29sKys7CkBAIC0yOTQsOCAr Mjk0LDggQEAgaW50IEtTcHJlYWRUYWJsZTo6cmlnaHRDb2x1bW4oIGludCBfeHBvcwogICAgIHdo aWxlICggeCA8IF94cG9zICkKICAgICB7CiAgICAgICAgIC8vIFNob3VsZCBuZXZlciBoYXBwZW4K LSAgICAgICAgaWYgKCBjb2wgPT0gMHgxMDAwMCApCi0gICAgICAgICAgICByZXR1cm4gMHgxMDAw MDsKKyAgICAgICAgaWYgKCBjb2wgPT0gMHg4MDAwICkKKyAgICAgICAgICAgIHJldHVybiAweDgw MDA7CiAgICAgICAgIHggKz0gY29sdW1uTGF5b3V0KCBjb2wgKS0+d2lkdGgoIF9jYW52YXMgKTsK ICAgICAgICAgY29sKys7CiAgICAgfQpAQCAtMzE4LDcgKzMxOCw3IEBAIGludCBLU3ByZWFkVGFi bGU6OnRvcFJvdyggaW50IF95cG9zLCBpbnQKICAgICB3aGlsZSAoIHkgPCBfeXBvcyApCiAgICAg ewogICAgICAgICAvLyBTaG91bGQgbmV2ZXIgaGFwcGVuCi0gICAgICAgIGlmICggcm93ID09IDB4 MTAwMDAgKQorICAgICAgICBpZiAoIHJvdyA9PSAweDgwMDAgKQogICAgICAgICAgICAgcmV0dXJu IDE7CiAgICAgICAgIF90b3AgKz0gcm93TGF5b3V0KCByb3cgKS0+aGVpZ2h0KCBfY2FudmFzICk7 CiAgICAgICAgIHJvdysrOwpAQCAtMzM4LDggKzMzOCw4IEBAIGludCBLU3ByZWFkVGFibGU6OmJv dHRvbVJvdyggaW50IF95cG9zLAogICAgIHdoaWxlICggeSA8IF95cG9zICkKICAgICB7CiAgICAg ICAgIC8vIFNob3VsZCBuZXZlciBoYXBwZW4KLSAgICAgICAgaWYgKCByb3cgPT0gMHgxMDAwMCAp Ci0gICAgICAgICAgICByZXR1cm4gMHgxMDAwMDsKKyAgICAgICAgaWYgKCByb3cgPT0gMHg4MDAw ICkKKyAgICAgICAgICAgIHJldHVybiAweDgwMDA7CiAgICAgICAgIHkgKz0gcm93TGF5b3V0KCBy b3cgKS0+aGVpZ2h0KCBfY2FudmFzICk7CiAgICAgICAgIHJvdysrOwogICAgIH0KQEAgLTM1NSw3 ICszNTUsNyBAQCBpbnQgS1NwcmVhZFRhYmxlOjpjb2x1bW5Qb3MoIGludCBfY29sLCBLCiAgICAg Zm9yICggaW50IGNvbCA9IDE7IGNvbCA8IF9jb2w7IGNvbCsrICkKICAgICB7CiAgICAgICAgIC8v IFNob3VsZCBuZXZlciBoYXBwZW4KLSAgICAgICAgaWYgKCBjb2wgPT0gMHgxMDAwMCApCisgICAg ICAgIGlmICggY29sID09IDB4ODAwMCApCiAgICAgICAgICAgICByZXR1cm4geDsKCiAgICAgICAg IHggKz0gY29sdW1uTGF5b3V0KCBjb2wgKS0+d2lkdGgoIF9jYW52YXMgKTsKQEAgLTM3Miw3ICsz NzIsNyBAQCBpbnQgS1NwcmVhZFRhYmxlOjpyb3dQb3MoIGludCBfcm93LCBLU3ByCiAgICAgZm9y ICggaW50IHJvdyA9IDEgOyByb3cgPCBfcm93IDsgcm93KysgKQogICAgIHsKICAgICAgICAgLy8g U2hvdWxkIG5ldmVyIGhhcHBlbgotICAgICAgICBpZiAoIHJvdyA9PSAweDEwMDAwICkKKyAgICAg ICAgaWYgKCByb3cgPT0gMHg4MDAwICkKICAgICAgICAgICAgIHJldHVybiB5OwoKICAgICAgICAg eSArPSByb3dMYXlvdXQoIHJvdyApLT5oZWlnaHQoIF9jYW52YXMgKTsKQEAgLTUwMzksNyArNTAz OSw3IEBAIGJvb2wgS1NwcmVhZFRhYmxlOjppc09uTmV3UGFnZVgoIGludCBfY28KICAgICB3aGls ZSAoIGNvbCA8PSBfY29sdW1uICkKICAgICB7CiAgICAgICAgIC8vIFNob3VsZCBuZXZlciBoYXBw ZW4KLSAgICAgICAgaWYgKCBjb2wgPT0gMHgxMDAwMCApCisgICAgICAgIGlmICggY29sID09IDB4 ODAwMCApCiAgICAgICAgICAgICByZXR1cm4gRkFMU0U7CgogICAgICAgICBpZiAoIHggPiBtX3BE b2MtPnByaW50YWJsZVdpZHRoKCkgKQpAQCAtNTA2NCw3ICs1MDY0LDcgQEAgYm9vbCBLU3ByZWFk VGFibGU6OmlzT25OZXdQYWdlWSggaW50IF9ybwogICAgIHdoaWxlICggcm93IDw9IF9yb3cgKQog ICAgIHsKICAgICAgICAgLy8gU2hvdWxkIG5ldmVyIGhhcHBlbgotICAgICAgICBpZiAoIHJvdyA9 PSAweDEwMDAwICkKKyAgICAgICAgaWYgKCByb3cgPT0gMHg4MDAwICkKICAgICAgICAgICAgIHJl dHVybiBGQUxTRTsKCiAgICAgICAgIGlmICggeSA+IG1fcERvYy0+cHJpbnRhYmxlSGVpZ2h0KCkg KQpJbmRleDoga3NwcmVhZC9rc3ByZWFkX3V0aWwuY2MKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hv bWUva2RlL2tvZmZpY2Uva3NwcmVhZC9rc3ByZWFkX3V0aWwuY2MsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuMjYKZGlmZiAtdSAtMyAtcCAtdSAtcjEuMjYga3NwcmVhZF91dGlsLmNjCi0tLSBrc3By ZWFkL2tzcHJlYWRfdXRpbC5jYwkyMDAxLzEwLzExIDEzOjU1OjIwCTEuMjYKKysrIGtzcHJlYWQv a3NwcmVhZF91dGlsLmNjCTIwMDIvMDIvMjggMjI6NTM6MjUKQEAgLTI2OCwxNCArMjY4LDMzIEBA IHV0aWxfZGF0ZUZvcm1hdChLTG9jYWxlICogbG9jYWxlLCBRRGF0ZQoKIFFTdHJpbmcgdXRpbF9j b2x1bW5MYWJlbChpbnQgY29sdW1uKQogewotICAgIGlmIChjb2x1bW4gPD0gMjYpCi0JcmV0dXJu IFFTdHJpbmcoIiUxIikuYXJnKChjaGFyKSAoJ0EnICsgY29sdW1uIC0gMSkpOworICAgIGludCB0 bXA7CgotICAgIGlmIChjb2x1bW4gPD0gMjYgKiAyNikKLQlyZXR1cm4gUVN0cmluZygiJTElMiIp LmFyZygoY2hhcikoJ0EnICsgKChjb2x1bW4gLSAxKSAvIDI2KSAtIDEpKS5hcmcoKGNoYXIpKCdB JyArCi0JCQkJCQkJCSAgICAgICgoY29sdW1uIC0gMSkgJSAyNikpKTsKKyAgICAvKiB3ZSBzdGFy dCB3aXRoIHplcm8gKi8KKyAgICB0bXAgPSBjb2x1bW4gLSAxOwoKLSAgICAvKiBsaW1pdCBpcyAy NioyNiAqLworICAgIGlmICh0bXAgPCAyNikgLyogQS1aICovCisJcmV0dXJuIFFTdHJpbmcoIiUx IikuYXJnKChjaGFyKSAoJ0EnICsgdG1wKSk7CisKKyAgICB0bXAgLT0gMjY7CisgICAgaWYgKHRt cCA8IDI2KjI2KSAvKiBBQS1aWiAqLworCXJldHVybiBRU3RyaW5nKCIlMSUyIikuYXJnKCAoY2hh cikgKCdBJyArIHRtcCAvIDI2KSApCisJCQkgICAgICAuYXJnKCAoY2hhcikgKCdBJyArIHRtcCAl IDI2KSApOworCisgICAgdG1wIC09IDI2KjI2OworICAgIGlmICh0bXAgPCAyNiAqIDI2ICogMjYg KSAvKiBBQUEtWlpaICovCisJcmV0dXJuIFFTdHJpbmcoIiUxJTIlMyIpLmFyZyggKGNoYXIpICgn QScgKyB0bXAgLyAoMjYgKiAyNikpICkKKwkJCQkuYXJnKCAoY2hhcikgKCdBJyArICh0bXAgLyAy NikgJSAyNiApICkKKwkJCQkuYXJnKCAoY2hhcikgKCdBJyArIHRtcCAlIDI2KSApOworCisgICAg dG1wIC09IDI2KjI2KjI2OworICAgIGlmICh0bXAgPCAyNiAqIDI2ICogMjYgKiAyNikgLyogQUFB QS1aWlpaICovCisJcmV0dXJuIFFTdHJpbmcoIiUxJTIlMyU0IikuYXJnKCAoY2hhcikgKCdBJyAr ICh0bXAgLyAoMjYgKiAyNiAqIDI2ICkgICAgICApICkpCisJCQkJICAuYXJnKCAoY2hhcikgKCdB JyArICh0bXAgLyAoMjYgKiAyNiAgICAgICkgJSAyNiApICkpCisJCQkJICAuYXJnKCAoY2hhcikg KCdBJyArICh0bXAgLyAoMjYgICAgICAgICAgICkgJSAyNiApICkpCisJCQkJICAuYXJnKCAoY2hh cikgKCdBJyArICh0bXAgICAgICAgICAgICAgICAgICAgJSAyNiApICkpOworCisgICAgLyogbGlt aXQgaXMgY3VycmVudGx5IDI2XjQgKyAyNl4zICsgMjZeMiArIDI2XjEgPSA0NzUyNTQgKi8KICAg ICBrZERlYnVnKDM2MDAxKSA8PCAiaW52YWxpZCBjb2x1bW5cbiI7CiAgICAgcmV0dXJuIFFTdHJp bmcoIkBAQCIpOwogfQo= --------------Boundary-00=_MKN9GR6A99RCSG3EWEX6-- _______________________________________________ koffice-devel mailing list koffice-devel@mail.kde.org http://mail.kde.org/mailman/listinfo/koffice-devel