From koffice Sat Sep 23 12:48:36 2000 From: montel laurent Date: Sat, 23 Sep 2000 12:48:36 +0000 To: koffice Subject: patch for kspread X-MARC-Message: https://marc.info/?l=koffice&m=96971312928213 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_0LBC0UCY4S0Q62C6BMLT" --------------Boundary-00=_0LBC0UCY4S0Q62C6BMLT Content-Type: text/plain Content-Transfer-Encoding: 8bit Hi, I fixed a bug when you reload a kspread file which contains merged cell. Sometime you don't see merged cell after reloading. So now I refresh view after loading. Could you test it please and apply it please. Thanks bye --------------Boundary-00=_0LBC0UCY4S0Q62C6BMLT Content-Type: text/plain; name="patch74.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch74.diff" PyBLU3ByZWFkQ2VsbElmYWNlX3N0dWIuaAo/IEtTcHJlYWRDZWxsSWZhY2Vfc3R1Yi5jcHAKY3Zz IHNlcnZlcjogRGlmZmluZyAuCkluZGV4OiBrc3ByZWFkX3RhYmxlLmNjCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9ob21lL2tkZS9rb2ZmaWNlL2tzcHJlYWQva3NwcmVhZF90YWJsZS5jYyx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS4yMTIKZGlmZiAtdSAtcCAtcjEuMjEyIGtzcHJlYWRfdGFibGUuY2MK LS0tIGtzcHJlYWRfdGFibGUuY2MJMjAwMC8wOS8yMiAyMDo1OTo0OAkxLjIxMgorKysga3NwcmVh ZF90YWJsZS5jYwkyMDAwLzA5LzIzIDEyOjQ2OjA5CkBAIC00MDgwLDcgKzQwODAsMTAgQEAgYm9v bCBLU3ByZWFkVGFibGU6OmxvYWRTZWxlY3Rpb24oIGNvbnN0IAogICAgICAgICBjZWxsLT51cGRh dGVDaGFydCgpOwogICAgICAgICB9CiAgICAgbV9wRG9jLT5zZXRNb2RpZmllZCggdHJ1ZSApOwot ICAgIHJlZnJlc2hNZXJnZWRDZWxsKCk7CisKKyAgICBpZighaXNMb2FkaW5nKCkpCisgICAgICAg IHJlZnJlc2hNZXJnZWRDZWxsKCk7CisKICAgICBlbWl0IHNpZ191cGRhdGVWaWV3KCB0aGlzICk7 CiAgICAgZW1pdCBzaWdfdXBkYXRlSEJvcmRlciggdGhpcyApOwogICAgIGVtaXQgc2lnX3VwZGF0 ZVZCb3JkZXIoIHRoaXMgKTsKSW5kZXg6IGtzcHJlYWRfdmlldy5jYwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBm aWxlOiAvaG9tZS9rZGUva29mZmljZS9rc3ByZWFkL2tzcHJlYWRfdmlldy5jYyx2CnJldHJpZXZp bmcgcmV2aXNpb24gMS4yOTAKZGlmZiAtdSAtcCAtcjEuMjkwIGtzcHJlYWRfdmlldy5jYwotLS0g a3NwcmVhZF92aWV3LmNjCTIwMDAvMDkvMjIgMjA6NTk6NDgJMS4yOTAKKysrIGtzcHJlYWRfdmll dy5jYwkyMDAwLzA5LzIzIDEyOjQ2OjE4CkBAIC00MjEsMTQgKzQyMSwxOSBAQCB2b2lkIEtTcHJl YWRWaWV3Ojppbml0aWFsUG9zaXRpb24oKQogICAgIGludCByb3cgPSBtX3BEb2MtPm1hcCgpLT5p bml0aWFsTWFya2VyUm93KCk7CiAgICAgaWYgKCByb3cgPD0gMCApIHJvdyA9IDE7CiAgICAgbV9w Q2FudmFzLT5nb3RvTG9jYXRpb24oIGNvbCwgcm93ICk7Ci0gICAgCisKICAgICAvL2luaXQgdG9n Z2xlIGJ1dHRvbgogICAgIG1fc2hvd1BhZ2VCb3JkZXJzLT5zZXRDaGVja2VkKCBtX3BUYWJsZS0+ aXNTaG93UGFnZUJvcmRlcnMoKSk7CiAgICAgbV90YWJsZUZvcm1hdC0+c2V0RW5hYmxlZChmYWxz ZSk7CiAgICAgLypyZWNhbGMgYWxsIGRlcGVuZGVudCBhZnRlciBsb2FkaW5nKi8KICAgICBLU3By ZWFkVGFibGUgKnRibDsKICAgICBmb3IgKCB0YmwgPSBtX3BEb2MtPm1hcCgpLT5maXJzdFRhYmxl KCk7IHRibCAhPSAwTDsgdGJsID0gbV9wRG9jLT5tYXAoKS0+bmV4dFRhYmxlKCkgKQorICAgICAg ICB7CiAgICAgICAgIHRibC0+cmVjYWxjKHRydWUpOworICAgICAgICB0YmwtPnJlZnJlc2hNZXJn ZWRDZWxsKCk7CisgICAgICAgIH0KKworICAgIHNsb3RVcGRhdGVWaWV3KCBhY3RpdmVUYWJsZSgp ICk7CiAgICAgbV9iTG9hZGluZyA9dHJ1ZTsKIH0KIApjdnMgc2VydmVyOiBEaWZmaW5nIGR0ZApj dnMgc2VydmVyOiBEaWZmaW5nIGV4dGVuc2lvbnMKY3ZzIHNlcnZlcjogRGlmZmluZyBwaWNzCmN2 cyBzZXJ2ZXI6IERpZmZpbmcgcGx1Z2lucwpjdnMgc2VydmVyOiBEaWZmaW5nIHBsdWdpbnMvY2Fs Y3VsYXRvcgpjdnMgc2VydmVyOiBEaWZmaW5nIHBsdWdpbnMvY2FsY3VsYXRvci9waWNzCmN2cyBz ZXJ2ZXI6IERpZmZpbmcgc2NyaXB0cwpjdnMgc2VydmVyOiBEaWZmaW5nIHRhYmxlc3R5bGVzCmN2 cyBzZXJ2ZXI6IERpZmZpbmcgdG9vbGJhcgpjdnMgc2VydmVyOiBEaWZmaW5nIHRvb2xiYXIvaGlj b2xvcgpjdnMgc2VydmVyOiBEaWZmaW5nIHRvb2xiYXIvbG9jb2xvcgo= --------------Boundary-00=_0LBC0UCY4S0Q62C6BMLT--