From koffice-devel Sat Jan 19 18:55:43 2008 From: "Aron Stansvik" Date: Sat, 19 Jan 2008 18:55:43 +0000 To: koffice-devel Subject: Re: Precision "display mode" for KoRuler Message-Id: <751a4f870801191055ie8dc3f6qc9dcbac5c81b3938 () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=koffice-devel&m=120076899323314 MIME-Version: 1 Content-Type: multipart/mixed; boundary="------=_Part_8383_2922359.1200768943201" ------=_Part_8383_2922359.1200768943201 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline 2008/1/18, Aron Stansvik : > 2008/1/18, Aron Stansvik : > > 2008/1/17, C. Boemann : > > > from a quick glance I think it looks ok, however: > > > > > > - why not cache the strategies rather than create and delete them everytime > > > shift is pressed or released > > > > Hm. You mean have a KoRulerPrivate::lastStrategy which holds the last > > strategy and just flip back and forth? Sorry if I'm getting this > > straight away :) > > err, s/if i'm/if i'm not/ Okay. Attached is a new updated patch that caches the painting strategies. Please have a look at it. Aron > > > > > - please be sure this mode only happens when there is actually something to > > > be moved > > > > Sorry, my mistake. Fixed. > > > > Aron > > > > > > > > best regards > > > Casper > > > > > > ----- Original Message ----- > > > From: "Aron Stansvik" > > > To: "For developer's discussion about KOffice" > > > Sent: Thursday, January 17, 2008 11:12 PM > > > Subject: Re: Precision "display mode" for KoRuler > > > > > > > > > > Hi everybody. > > > > > > > > Attached is a patch for this feature for review. Please try it out. > > > > The actual activation of my display mode turned out to be more > > > > complicated than I thought, with no really elegant solution, but after > > > > having discussed it a bit in #koffice with Casper and others, we > > > > decided this was the least ugly way to do it. > > > > > > > > It only implements this feature for the horizontal rulers so far, as > > > > the margins in the ruler can't be moved yet I had no way to test it > > > > for the vertical one. Maybe I'll look into fixing moving of the > > > > margins. > > > > > > > > Typing this from a buzzing KDE 4.0 release event in Mountain View, > > > > very exciting :) > > > > > > > > Take care, > > > > Aron > > > > > > > > 2007/11/3, Thomas Zander : > > > >> On Saturday 03 November 2007 12:24:35 Aron Stansvik wrote: > > > >> > I think this is pure genius :) Thomas? > > > >> > > > >> Agreed > > > >> > > > >> -- > > > >> Thomas Zander > > > >> > > > >> _______________________________________________ > > > >> koffice-devel mailing list > > > >> koffice-devel@kde.org > > > >> https://mail.kde.org/mailman/listinfo/koffice-devel > > > >> > > > >> > > > >> > > > > > > > > > > > > > -------------------------------------------------------------------------------- > > > > > > > > > > _______________________________________________ > > > > koffice-devel mailing list > > > > koffice-devel@kde.org > > > > https://mail.kde.org/mailman/listinfo/koffice-devel > > > > > > > > > > _______________________________________________ > > > koffice-devel mailing list > > > koffice-devel@kde.org > > > https://mail.kde.org/mailman/listinfo/koffice-devel > > > > > > ------=_Part_8383_2922359.1200768943201 Content-Type: text/x-patch; name=koruler-distances-paintingstrategy.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fbmitdy3 Content-Disposition: attachment; filename=koruler-distances-paintingstrategy.diff SW5kZXg6IEtvUnVsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEtvUnVsZXIuY3BwCShyZXZpc2lvbiA3 NjI4NTUpCisrKyBLb1J1bGVyLmNwcAkoYXJiZXRza29waWEpCkBAIC0xOTEsNyArMTkxLDcgQEAK ICNlbmRpZgogfQogCi12b2lkIEhvcml6b250YWxQYWludGluZ1N0cmF0ZWd5OjpkcmF3UnVsZXJT dHJpcGVzKGNvbnN0IEtvUnVsZXJQcml2YXRlICpkLCBRUGFpbnRlciAmcGFpbnRlciwgY29uc3Qg UVJlY3RGICZyZWN0YW5nbGUpIHsKK3ZvaWQgSG9yaXpvbnRhbFBhaW50aW5nU3RyYXRlZ3k6OmRy YXdNZWFzdXJlbWVudHMoY29uc3QgS29SdWxlclByaXZhdGUgKmQsIFFQYWludGVyICZwYWludGVy LCBjb25zdCBRUmVjdEYgJnJlY3RhbmdsZSkgewogICAgIGRvdWJsZSBudW1iZXJTdGVwID0gZC0+ bnVtYmVyU3RlcEZvclVuaXQoKTsgLy8gbnVtYmVyIHN0ZXAgaW4gdW5pdAogICAgIFFSZWN0RiBh Y3RpdmVSYW5nZVJlY3RhbmdsZTsKICAgICBpbnQgbnVtYmVyU3RlcFBpeGVsID0gcVJvdW5kKGQt PnZpZXdDb252ZXJ0ZXItPmRvY3VtZW50VG9WaWV3WChkLT51bml0LmZyb21Vc2VyVmFsdWUobnVt YmVyU3RlcCkpKTsKQEAgLTQwNiw3ICs0MDYsNyBAQAogICAgIHJldHVybiByZWN0YW5nbGU7CiB9 CiAKLXZvaWQgVmVydGljYWxQYWludGluZ1N0cmF0ZWd5OjpkcmF3UnVsZXJTdHJpcGVzKGNvbnN0 IEtvUnVsZXJQcml2YXRlICpkLCBRUGFpbnRlciAmcGFpbnRlciwgY29uc3QgUVJlY3RGICZyZWN0 YW5nbGUpIHsKK3ZvaWQgVmVydGljYWxQYWludGluZ1N0cmF0ZWd5OjpkcmF3TWVhc3VyZW1lbnRz KGNvbnN0IEtvUnVsZXJQcml2YXRlICpkLCBRUGFpbnRlciAmcGFpbnRlciwgY29uc3QgUVJlY3RG ICZyZWN0YW5nbGUpIHsKICAgICBkb3VibGUgbnVtYmVyU3RlcCA9IGQtPm51bWJlclN0ZXBGb3JV bml0KCk7IC8vIG51bWJlciBzdGVwIGluIHVuaXQKICAgICBpbnQgbnVtYmVyU3RlcFBpeGVsID0g cVJvdW5kKGQtPnZpZXdDb252ZXJ0ZXItPmRvY3VtZW50VG9WaWV3WSggZC0+dW5pdC5mcm9tVXNl clZhbHVlKG51bWJlclN0ZXApKSk7CiAgICAgUUZvbnRNZXRyaWNzIGZvbnRNZXRyaWNzKEtHbG9i YWxTZXR0aW5nczo6dG9vbEJhckZvbnQoKSk7CkBAIC01MjMsNiArNTIzLDcyIEBACiAgICAgcmV0 dXJuIHNpemU7CiB9CiAKKwordm9pZCBIb3Jpem9udGFsRGlzdGFuY2VzUGFpbnRpbmdTdHJhdGVn eTo6ZHJhd0Rpc3RhbmNlTGluZShjb25zdCBLb1J1bGVyUHJpdmF0ZSAqZCwgUVBhaW50ZXIgJnBh aW50ZXIsIGNvbnN0IGRvdWJsZSBzdGFydCwgY29uc3QgZG91YmxlIGVuZCkgeworCisgICAgLy8g RG9uJ3QgZHJhdyB0b28gc2hvcnQgbGluZXMKKyAgICBpZiAocU1heChzdGFydCwgZW5kKSAtIHFN aW4oc3RhcnQsIGVuZCkgPCAxKQorICAgICAgICByZXR1cm47CisKKyAgICBwYWludGVyLnNhdmUo KTsKKyAgICBwYWludGVyLnRyYW5zbGF0ZShkLT5vZmZzZXQsIGQtPnJ1bGVyLT5oZWlnaHQoKSAv IDIpOworICAgIHBhaW50ZXIuc2V0UGVuKGQtPnJ1bGVyLT5wYWxldHRlKCkuY29sb3IoUVBhbGV0 dGU6OlRleHQpKTsKKyAgICBwYWludGVyLnNldEJydXNoKGQtPnJ1bGVyLT5wYWxldHRlKCkuY29s b3IoUVBhbGV0dGU6OlRleHQpKTsKKworICAgIFFMaW5lRiBsaW5lKFFQb2ludEYoZC0+dmlld0Nv bnZlcnRlci0+ZG9jdW1lbnRUb1ZpZXdYKHN0YXJ0KSwgMCksCisgICAgICAgICAgICBRUG9pbnRG KGQtPnZpZXdDb252ZXJ0ZXItPmRvY3VtZW50VG9WaWV3WChlbmQpLCAwKSk7CisgICAgUVBvaW50 RiBtaWRQb2ludCA9IGxpbmUucG9pbnRBdCgwLjUpOworCisgICAgLy8gRHJhdyB0aGUgbGFiZWwg dGV4dAorICAgIFFGb250IGZvbnQgPSBLR2xvYmFsU2V0dGluZ3M6OnNtYWxsZXN0UmVhZGFibGVG b250KCk7CisgICAgZm9udC5zZXRQb2ludFNpemUoNik7CisgICAgUUZvbnRNZXRyaWNzIGZvbnRN ZXRyaWNzKGZvbnQpOworICAgIFFTdHJpbmcgbGFiZWwgPSBkLT51bml0LnRvVXNlclN0cmluZ1Zh bHVlKAorICAgICAgICAgICAgZC0+dmlld0NvbnZlcnRlci0+dmlld1RvRG9jdW1lbnRYKGxpbmUu bGVuZ3RoKCkpKSArICIgIiArIEtvVW5pdDo6dW5pdE5hbWUoZC0+dW5pdCk7CisgICAgUVBvaW50 RiBsYWJlbFBvc2l0aW9uID0gUVBvaW50RihtaWRQb2ludC54KCkgLSBmb250TWV0cmljcy53aWR0 aChsYWJlbCkvMiwKKyAgICAgICAgICAgIG1pZFBvaW50LnkoKSArIGZvbnRNZXRyaWNzLmFzY2Vu dCgpLzIpOworICAgIHBhaW50ZXIuc2V0Rm9udChmb250KTsKKyAgICBwYWludGVyLmRyYXdUZXh0 KGxhYmVsUG9zaXRpb24sIGxhYmVsKTsKKworICAgIC8vIERyYXcgdGhlIGFycm93IGxpbmVzCisg ICAgZG91YmxlIGFycm93TGVuZ3RoID0gKGxpbmUubGVuZ3RoKCkgLSBmb250TWV0cmljcy53aWR0 aChsYWJlbCkpIC8gMiAtIDI7CisgICAgYXJyb3dMZW5ndGggPSBxTWF4KDAuMCwgYXJyb3dMZW5n dGgpOworICAgIFFMaW5lRiBzdGFydEFycm93KGxpbmUucDEoKSwgbGluZS5wb2ludEF0KGFycm93 TGVuZ3RoIC8gbGluZS5sZW5ndGgoKSkpOworICAgIFFMaW5lRiBlbmRBcnJvdyhsaW5lLnAyKCks IGxpbmUucG9pbnRBdCgxLjAgLSBhcnJvd0xlbmd0aCAvIGxpbmUubGVuZ3RoKCkpKTsKKyAgICBw YWludGVyLmRyYXdMaW5lKHN0YXJ0QXJyb3cpOworICAgIHBhaW50ZXIuZHJhd0xpbmUoZW5kQXJy b3cpOworCisgICAgLy8gRHJhdyB0aGUgYXJyb3cgaGVhZHMKKyAgICBRUG9seWdvbkYgYXJyb3dI ZWFkOworICAgIGFycm93SGVhZCA8PCBsaW5lLnAxKCkgPDwgUVBvaW50RihsaW5lLngxKCkrMywg bGluZS55MSgpLTMpCisgICAgICAgIDw8IFFQb2ludEYobGluZS54MSgpKzMsIGxpbmUueTEoKSsz KTsKKyAgICBwYWludGVyLmRyYXdQb2x5Z29uKGFycm93SGVhZCk7CisgICAgYXJyb3dIZWFkLmNs ZWFyKCk7CisgICAgYXJyb3dIZWFkIDw8IGxpbmUucDIoKSA8PCBRUG9pbnRGKGxpbmUueDIoKS0z LCBsaW5lLnkyKCktMykKKyAgICAgICAgPDwgUVBvaW50RihsaW5lLngyKCktMywgbGluZS55Migp KzMpOworICAgIHBhaW50ZXIuZHJhd1BvbHlnb24oYXJyb3dIZWFkKTsKKworICAgIHBhaW50ZXIu cmVzdG9yZSgpOworfQorCit2b2lkIEhvcml6b250YWxEaXN0YW5jZXNQYWludGluZ1N0cmF0ZWd5 OjpkcmF3TWVhc3VyZW1lbnRzKGNvbnN0IEtvUnVsZXJQcml2YXRlICpkLCBRUGFpbnRlciAmcGFp bnRlciwgY29uc3QgUVJlY3RGJikgeworICAgIFFMaXN0PGRvdWJsZT4gcG9pbnRzOworICAgIHBv aW50cyA8PCAwLjA7CisgICAgcG9pbnRzIDw8IGQtPmFjdGl2ZVJhbmdlU3RhcnQgKyBkLT5wYXJh Z3JhcGhJbmRlbnQgKyBkLT5maXJzdExpbmVJbmRlbnQ7CisgICAgcG9pbnRzIDw8IGQtPmFjdGl2 ZVJhbmdlU3RhcnQgKyBkLT5wYXJhZ3JhcGhJbmRlbnQ7CisgICAgcG9pbnRzIDw8IGQtPmFjdGl2 ZVJhbmdlRW5kIC0gZC0+ZW5kSW5kZW50OworICAgIHBvaW50cyA8PCBkLT5hY3RpdmVSYW5nZVN0 YXJ0OworICAgIHBvaW50cyA8PCBkLT5hY3RpdmVSYW5nZUVuZDsKKyAgICBwb2ludHMgPDwgZC0+ cnVsZXJMZW5ndGg7CisgICAgcVNvcnQocG9pbnRzLmJlZ2luKCksIHBvaW50cy5lbmQoKSk7Cisg ICAgUUxpc3RJdGVyYXRvcjxkb3VibGU+IGkocG9pbnRzKTsKKyAgICBpLm5leHQoKTsKKyAgICB3 aGlsZSAoaS5oYXNOZXh0KCkgJiYgaS5oYXNQcmV2aW91cygpKSB7CisgICAgICAgIGRyYXdEaXN0 YW5jZUxpbmUoZCwgcGFpbnRlciwgaS5wZWVrUHJldmlvdXMoKSwgaS5wZWVrTmV4dCgpKTsKKyAg ICAgICAgaS5uZXh0KCk7CisgICAgfQorfQorCiBLb1J1bGVyUHJpdmF0ZTo6S29SdWxlclByaXZh dGUoS29SdWxlciAqcGFyZW50LCBjb25zdCBLb1ZpZXdDb252ZXJ0ZXIgKnZjLCBRdDo6T3JpZW50 YXRpb24gbykKICAgICA6IHVuaXQoS29Vbml0KEtvVW5pdDo6UG9pbnQpKSwKICAgICBvcmllbnRh dGlvbihvKSwKQEAgLTU0Niw4ICs2MTIsMTAgQEAKICAgICBzZWxlY3RlZChOb25lKSwKICAgICBz ZWxlY3RPZmZzZXQoMCksCiAgICAgdGFiQ2hvb3NlcigwKSwKLSAgICBwYWludGluZ1N0cmF0ZWd5 KG8gPT0gUXQ6Okhvcml6b250YWwgPworICAgIG5vcm1hbFBhaW50aW5nU3RyYXRlZ3kobyA9PSBR dDo6SG9yaXpvbnRhbCA/CiAgICAgICAgICAgICAoUGFpbnRpbmdTdHJhdGVneSopbmV3IEhvcml6 b250YWxQYWludGluZ1N0cmF0ZWd5KCkgOiAoUGFpbnRpbmdTdHJhdGVneSopbmV3IFZlcnRpY2Fs UGFpbnRpbmdTdHJhdGVneSgpKSwKKyAgICBkaXN0YW5jZXNQYWludGluZ1N0cmF0ZWd5KChQYWlu dGluZ1N0cmF0ZWd5KiluZXcgSG9yaXpvbnRhbERpc3RhbmNlc1BhaW50aW5nU3RyYXRlZ3koKSks CisgICAgcGFpbnRpbmdTdHJhdGVneShub3JtYWxQYWludGluZ1N0cmF0ZWd5KSwKICAgICBydWxl cihwYXJlbnQpCiB7CiAjaWYgUVRfVkVSU0lPTiA+PSBLREVfTUFLRV9WRVJTSU9OKDQsNCwwKQpA QCAtNTU4LDcgKzYyNiw4IEBACiAKIEtvUnVsZXJQcml2YXRlOjp+S29SdWxlclByaXZhdGUoKQog ewotICAgIGRlbGV0ZSBwYWludGluZ1N0cmF0ZWd5OworICAgIGRlbGV0ZSBub3JtYWxQYWludGlu Z1N0cmF0ZWd5OworICAgIGRlbGV0ZSBkaXN0YW5jZXNQYWludGluZ1N0cmF0ZWd5OwogfQogCiBk b3VibGUgS29SdWxlclByaXZhdGU6Om51bWJlclN0ZXBGb3JVbml0KCkgY29uc3QKQEAgLTcwMSw3 ICs3NzAsNyBAQAogICAgIFFSZWN0RiByZWN0YW5nbGUgPSBkLT5wYWludGluZ1N0cmF0ZWd5LT5k cmF3QmFja2dyb3VuZChkLCBwYWludGVyKTsKICAgICBwYWludGVyLnJlc3RvcmUoKTsKICAgICBw YWludGVyLnNhdmUoKTsKLSAgICBkLT5wYWludGluZ1N0cmF0ZWd5LT5kcmF3UnVsZXJTdHJpcGVz KGQsIHBhaW50ZXIsIHJlY3RhbmdsZSk7CisgICAgZC0+cGFpbnRpbmdTdHJhdGVneS0+ZHJhd01l YXN1cmVtZW50cyhkLCBwYWludGVyLCByZWN0YW5nbGUpOwogICAgIHBhaW50ZXIucmVzdG9yZSgp OwogICAgIGlmIChkLT5zaG93SW5kZW50cykgewogICAgICAgICBwYWludGVyLnNhdmUoKTsKQEAg LTkxNyw2ICs5ODYsMTEgQEAKICAgICAgICAgdXBkYXRlKCk7CiAgICAgfQogI2VuZGlmCisgICAg aWYgKGQtPm9yaWVudGF0aW9uID09IFF0OjpIb3Jpem9udGFsICYmIChldi0+bW9kaWZpZXJzKCkg JiBRdDo6U2hpZnRNb2RpZmllcikgJiYKKyAgICAgICAgICAgIChkLT5zZWxlY3RlZCA9PSBLb1J1 bGVyUHJpdmF0ZTo6Rmlyc3RMaW5lSW5kZW50IHx8CisgICAgICAgICAgICAgZC0+c2VsZWN0ZWQg PT0gS29SdWxlclByaXZhdGU6OlBhcmFncmFwaEluZGVudCB8fAorICAgICAgICAgICAgIGQtPnNl bGVjdGVkID09IEtvUnVsZXJQcml2YXRlOjpFbmRJbmRlbnQpKQorICAgICAgICBkLT5wYWludGlu Z1N0cmF0ZWd5ID0gZC0+ZGlzdGFuY2VzUGFpbnRpbmdTdHJhdGVneTsKIH0KIAogdm9pZCBLb1J1 bGVyOjptb3VzZVJlbGVhc2VFdmVudCAoIFFNb3VzZUV2ZW50KiBldiApCkBAIC05MjksNiArMTAw Myw3IEBACiAgICAgaWYoIGQtPnNlbGVjdGVkID09IEtvUnVsZXJQcml2YXRlOjpUYWIpCiAgICAg ICAgIGVtaXQgdGFic0NoYW5nZWQodHJ1ZSk7CiAKKyAgICBkLT5wYWludGluZ1N0cmF0ZWd5ID0g ZC0+bm9ybWFsUGFpbnRpbmdTdHJhdGVneTsKICAgICBkLT5zZWxlY3RlZCA9IEtvUnVsZXJQcml2 YXRlOjpOb25lOwogfQogCkBAIC05NDYsOCArMTAyMSwxMyBAQAogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBkLT5maXJzdExpbmVJbmRlbnQgPSBkLT52aWV3Q29udmVydGVyLT52aWV3VG9Eb2N1 bWVudFgocG9zLngoKSArIGQtPnNlbGVjdE9mZnNldAogICAgICAgICAgICAgICAgIC0gZC0+b2Zm c2V0KSAtIGQtPmFjdGl2ZVJhbmdlU3RhcnQgLSBkLT5wYXJhZ3JhcGhJbmRlbnQ7Ci0gICAgICAg IGlmKCAhIChldi0+bW9kaWZpZXJzKCkgJiBRdDo6U2hpZnRNb2RpZmllcikpCisgICAgICAgIGlm KCAhIChldi0+bW9kaWZpZXJzKCkgJiBRdDo6U2hpZnRNb2RpZmllcikpIHsKICAgICAgICAgICAg IGQtPmZpcnN0TGluZUluZGVudCA9IGQtPmRvU25hcHBpbmcoZC0+Zmlyc3RMaW5lSW5kZW50KTsK KyAgICAgICAgICAgIGQtPnBhaW50aW5nU3RyYXRlZ3kgPSBkLT5ub3JtYWxQYWludGluZ1N0cmF0 ZWd5OworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKGQtPm9yaWVudGF0aW9uID09 IFF0OjpIb3Jpem9udGFsKQorICAgICAgICAgICAgICAgIGQtPnBhaW50aW5nU3RyYXRlZ3kgPSBk LT5kaXN0YW5jZXNQYWludGluZ1N0cmF0ZWd5OworICAgICAgICB9CiAKICAgICAgICAgZW1pdCBp bmRlbnRzQ2hhbmdlZChmYWxzZSk7CiAgICAgICAgIGJyZWFrOwpAQCAtOTU4LDggKzEwMzgsMTQg QEAKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZC0+cGFyYWdyYXBoSW5kZW50ID0gZC0+dmll d0NvbnZlcnRlci0+dmlld1RvRG9jdW1lbnRYKHBvcy54KCkgKyBkLT5zZWxlY3RPZmZzZXQKICAg ICAgICAgICAgICAgICAtIGQtPm9mZnNldCkgLSBkLT5hY3RpdmVSYW5nZVN0YXJ0OwotICAgICAg ICBpZiggISAoZXYtPm1vZGlmaWVycygpICYgUXQ6OlNoaWZ0TW9kaWZpZXIpKQorICAgICAgICBp ZiggISAoZXYtPm1vZGlmaWVycygpICYgUXQ6OlNoaWZ0TW9kaWZpZXIpKSB7CiAgICAgICAgICAg ICBkLT5wYXJhZ3JhcGhJbmRlbnQgPSBkLT5kb1NuYXBwaW5nKGQtPnBhcmFncmFwaEluZGVudCk7 CisgICAgICAgICAgICBkLT5wYWludGluZ1N0cmF0ZWd5ID0gZC0+bm9ybWFsUGFpbnRpbmdTdHJh dGVneTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmIChkLT5vcmllbnRhdGlvbiA9 PSBRdDo6SG9yaXpvbnRhbCkKKyAgICAgICAgICAgICAgICBkLT5wYWludGluZ1N0cmF0ZWd5ID0g ZC0+ZGlzdGFuY2VzUGFpbnRpbmdTdHJhdGVneTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChk LT5wYXJhZ3JhcGhJbmRlbnQgPCAwKQogICAgICAgICAgICAgZC0+cGFyYWdyYXBoSW5kZW50ID0g MDsKICAgICAgICAgaWYgKGQtPnBhcmFncmFwaEluZGVudCArIGQtPmVuZEluZGVudCA+IGFjdGl2 ZUxlbmd0aCkKQEAgLTk3Myw4ICsxMDU5LDE0IEBACiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IGQtPmVuZEluZGVudCA9IGQtPmFjdGl2ZVJhbmdlRW5kIC0gZC0+dmlld0NvbnZlcnRlci0+dmll d1RvRG9jdW1lbnRYKHBvcy54KCkKICAgICAgICAgICAgICAgICAgKyBkLT5zZWxlY3RPZmZzZXQg LSBkLT5vZmZzZXQpOwotICAgICAgICBpZiggISAoZXYtPm1vZGlmaWVycygpICYgUXQ6OlNoaWZ0 TW9kaWZpZXIpKQorICAgICAgICBpZiggISAoZXYtPm1vZGlmaWVycygpICYgUXQ6OlNoaWZ0TW9k aWZpZXIpKSB7CiAgICAgICAgICAgICBkLT5lbmRJbmRlbnQgPSBkLT5kb1NuYXBwaW5nKGQtPmVu ZEluZGVudCk7CisgICAgICAgICAgICBkLT5wYWludGluZ1N0cmF0ZWd5ID0gZC0+bm9ybWFsUGFp bnRpbmdTdHJhdGVneTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmIChkLT5vcmll bnRhdGlvbiA9PSBRdDo6SG9yaXpvbnRhbCkKKyAgICAgICAgICAgICAgICBkLT5wYWludGluZ1N0 cmF0ZWd5ID0gZC0+ZGlzdGFuY2VzUGFpbnRpbmdTdHJhdGVneTsKKyAgICAgICAgfQorCiAgICAg ICAgIGlmIChkLT5lbmRJbmRlbnQgPCAwKQogICAgICAgICAgICAgZC0+ZW5kSW5kZW50ID0gMDsK ICAgICAgICAgaWYgKGQtPnBhcmFncmFwaEluZGVudCArIGQtPmVuZEluZGVudCA+IGFjdGl2ZUxl bmd0aCkKSW5kZXg6IEtvUnVsZXJfcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEtvUnVsZXJfcC5oCShyZXZp c2lvbiA3NjI3MzYpCisrKyBLb1J1bGVyX3AuaAkoYXJiZXRza29waWEpCkBAIC00Miw3ICs0Miw3 IEBACiAKICAgICB2aXJ0dWFsIFFSZWN0RiBkcmF3QmFja2dyb3VuZChjb25zdCBLb1J1bGVyUHJp dmF0ZSAqcnVsZXIsIFFQYWludGVyICZwYWludGVyKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRy YXdUYWJzKGNvbnN0IEtvUnVsZXJQcml2YXRlICpydWxlciwgUVBhaW50ZXIgJnBhaW50ZXIpID0g MDsKLSAgICB2aXJ0dWFsIHZvaWQgZHJhd1J1bGVyU3RyaXBlcyhjb25zdCBLb1J1bGVyUHJpdmF0 ZSAqcnVsZXIsIFFQYWludGVyICZwYWludGVyLCBjb25zdCBRUmVjdEYgJnJlY3RhbmdsZSkgPSAw OworICAgIHZpcnR1YWwgdm9pZCBkcmF3TWVhc3VyZW1lbnRzKGNvbnN0IEtvUnVsZXJQcml2YXRl ICpydWxlciwgUVBhaW50ZXIgJnBhaW50ZXIsIGNvbnN0IFFSZWN0RiAmcmVjdGFuZ2xlKSA9IDA7 CiAgICAgdmlydHVhbCB2b2lkIGRyYXdJbmRlbnRzKGNvbnN0IEtvUnVsZXJQcml2YXRlICpydWxl ciwgUVBhaW50ZXIgJnBhaW50ZXIpID0gMDsKICAgICB2aXJ0dWFsIFFTaXplIHNpemVIaW50KCkg PSAwOwogCkBAIC01NCw3ICs1NCw3IEBACiAKICAgICB2aXJ0dWFsIFFSZWN0RiBkcmF3QmFja2dy b3VuZChjb25zdCBLb1J1bGVyUHJpdmF0ZSAqcnVsZXIsIFFQYWludGVyICZwYWludGVyKTsKICAg ICB2aXJ0dWFsIHZvaWQgZHJhd1RhYnMoY29uc3QgS29SdWxlclByaXZhdGUgKnJ1bGVyLCBRUGFp bnRlciAmcGFpbnRlcik7Ci0gICAgdmlydHVhbCB2b2lkIGRyYXdSdWxlclN0cmlwZXMoY29uc3Qg S29SdWxlclByaXZhdGUgKnJ1bGVyLCBRUGFpbnRlciAmcGFpbnRlciwgY29uc3QgUVJlY3RGICZy ZWN0YW5nbGUpOworICAgIHZpcnR1YWwgdm9pZCBkcmF3TWVhc3VyZW1lbnRzKGNvbnN0IEtvUnVs ZXJQcml2YXRlICpydWxlciwgUVBhaW50ZXIgJnBhaW50ZXIsIGNvbnN0IFFSZWN0RiAmcmVjdGFu Z2xlKTsKICAgICB2aXJ0dWFsIHZvaWQgZHJhd0luZGVudHMoY29uc3QgS29SdWxlclByaXZhdGUg KnJ1bGVyLCBRUGFpbnRlciAmcGFpbnRlcik7CiAgICAgdmlydHVhbCBRU2l6ZSBzaXplSGludCgp OwogCkBAIC02OCw3ICs2OCw3IEBACiAKICAgICB2aXJ0dWFsIFFSZWN0RiBkcmF3QmFja2dyb3Vu ZChjb25zdCBLb1J1bGVyUHJpdmF0ZSAqcnVsZXIsIFFQYWludGVyICZwYWludGVyKTsKICAgICB2 aXJ0dWFsIHZvaWQgZHJhd1RhYnMoY29uc3QgS29SdWxlclByaXZhdGUgKiwgUVBhaW50ZXIgJikg e30KLSAgICB2aXJ0dWFsIHZvaWQgZHJhd1J1bGVyU3RyaXBlcyhjb25zdCBLb1J1bGVyUHJpdmF0 ZSAqcnVsZXIsIFFQYWludGVyICZwYWludGVyLCBjb25zdCBRUmVjdEYgJnJlY3RhbmdsZSk7Cisg ICAgdmlydHVhbCB2b2lkIGRyYXdNZWFzdXJlbWVudHMoY29uc3QgS29SdWxlclByaXZhdGUgKnJ1 bGVyLCBRUGFpbnRlciAmcGFpbnRlciwgY29uc3QgUVJlY3RGICZyZWN0YW5nbGUpOwogICAgIHZp cnR1YWwgdm9pZCBkcmF3SW5kZW50cyhjb25zdCBLb1J1bGVyUHJpdmF0ZSAqLCBRUGFpbnRlciAm KSB7IH0KICAgICB2aXJ0dWFsIFFTaXplIHNpemVIaW50KCk7CiAKQEAgLTc2LDYgKzc2LDE2IEBA CiAgICAgZG91YmxlIGxlbmd0aEluUGl4ZWw7CiB9OwogCitjbGFzcyBIb3Jpem9udGFsRGlzdGFu Y2VzUGFpbnRpbmdTdHJhdGVneSA6IHB1YmxpYyBIb3Jpem9udGFsUGFpbnRpbmdTdHJhdGVneSB7 CitwdWJsaWM6CisgICAgSG9yaXpvbnRhbERpc3RhbmNlc1BhaW50aW5nU3RyYXRlZ3koKSB7fQor CisgICAgdmlydHVhbCB2b2lkIGRyYXdNZWFzdXJlbWVudHMoY29uc3QgS29SdWxlclByaXZhdGUg KnJ1bGVyLCBRUGFpbnRlciAmcGFpbnRlciwgY29uc3QgUVJlY3RGICZyZWN0YW5nbGUpOworCitw cml2YXRlOgorICAgIHZvaWQgZHJhd0Rpc3RhbmNlTGluZShjb25zdCBLb1J1bGVyUHJpdmF0ZSAq ZCwgUVBhaW50ZXIgJnBhaW50ZXIsIGNvbnN0IGRvdWJsZSBzdGFydCwgY29uc3QgZG91YmxlIGVu ZCk7Cit9OworCiBjbGFzcyBLb1J1bGVyUHJpdmF0ZSB7CiBwdWJsaWM6CiAgICAgS29SdWxlclBy aXZhdGUoS29SdWxlciAqcGFyZW50LCBjb25zdCBLb1ZpZXdDb252ZXJ0ZXIgKnZjLCBRdDo6T3Jp ZW50YXRpb24gb3JpZW50YXRpb24pOwpAQCAtMTI3LDcgKzEzNywxNCBAQAogICAgIFFMaXN0PFFB Y3Rpb24qPiBwb3B1cEFjdGlvbnM7CiAKICAgICBSdWxlclRhYkNob29zZXIgKnRhYkNob29zZXI7 Ci0gICAgUGFpbnRpbmdTdHJhdGVneSAqIGNvbnN0IHBhaW50aW5nU3RyYXRlZ3k7CisKKyAgICAv LyBDYWNoZWQgcGFpbnRpbmcgc3RyYXRlZ2llcworICAgIFBhaW50aW5nU3RyYXRlZ3kgKiBub3Jt YWxQYWludGluZ1N0cmF0ZWd5OworICAgIFBhaW50aW5nU3RyYXRlZ3kgKiBkaXN0YW5jZXNQYWlu dGluZ1N0cmF0ZWd5OworCisgICAgLy8gQ3VycmVudCBwYWludGluZyBzdHJhdGVneQorICAgIFBh aW50aW5nU3RyYXRlZ3kgKiBwYWludGluZ1N0cmF0ZWd5OworCiAgICAgS29SdWxlciAqcnVsZXI7 CiAKICAgICBkb3VibGUgbnVtYmVyU3RlcEZvclVuaXQoKSBjb25zdDsK ------=_Part_8383_2922359.1200768943201 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ koffice-devel mailing list koffice-devel@kde.org https://mail.kde.org/mailman/listinfo/koffice-devel ------=_Part_8383_2922359.1200768943201--