From koffice-devel Thu Aug 04 17:41:06 2005 From: Peter Simonsson Date: Thu, 04 Aug 2005 17:41:06 +0000 To: koffice-devel Subject: Patch: New actions for kpresenter Message-Id: <9966b304050804104161613787 () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=koffice-devel&m=112317739608469 MIME-Version: 1 Content-Type: multipart/mixed; boundary="------=_Part_1001_23174612.1123177266128" ------=_Part_1001_23174612.1123177266128 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi! This patch will make kpresenter use the same actions as kivio for pen width and style. If none have any objections I'll commit the patch on saturday (or earlier if told so). --=20 LLaP Peter Simonsson ------=_Part_1001_23174612.1123177266128 Content-Type: text/plain; name="kpresenter.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kpresenter.diff" SW5kZXg6IGtwcmVzZW50ZXJfZG9jLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga3ByZXNlbnRlcl9kb2MuaAko cmV2aXNpb24gNDQyOTAwKQorKysga3ByZXNlbnRlcl9kb2MuaAkoYXJiZXRza29waWEpCkBAIC01 MzYsNiArNTM2LDcgQEAKICAgICB2b2lkIHNpZ191cGRhdGVSdWxlcigpOwogICAgIHZvaWQgc2ln X3Rlcm1pbmF0ZUVkaXRpbmcoIEtQVGV4dE9iamVjdCAqICk7CiAgICAgdm9pZCBzaWdfdXBkYXRl TWVudUJhcigpOworICAgIHZvaWQgdW5pdENoYW5nZWQoS29Vbml0OjpVbml0KTsKIAogcHJvdGVj dGVkIHNsb3RzOgogICAgIHZvaWQgc2xvdERvY3VtZW50UmVzdG9yZWQoKTsKSW5kZXg6IEtQcmVz ZW50ZXJWaWV3SWZhY2UuY2MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gS1ByZXNlbnRlclZpZXdJZmFjZS5jYwko cmV2aXNpb24gNDQyOTAwKQorKysgS1ByZXNlbnRlclZpZXdJZmFjZS5jYwkoYXJiZXRza29waWEp CkBAIC0yODYsMTIgKzI4NiwxNCBAQAogCiB2b2lkIEtQcmVzZW50ZXJWaWV3SWZhY2U6OmV4dHJh UGVuU3R5bGUoKQogewotICAgIHZpZXctPmV4dHJhUGVuU3R5bGUoKTsKKy8vIEZJWE1FCisvLyAg ICAgdmlldy0+ZXh0cmFQZW5TdHlsZSgpOwogfQogCiB2b2lkIEtQcmVzZW50ZXJWaWV3SWZhY2U6 OmV4dHJhUGVuV2lkdGgoKQogewotICAgIHZpZXctPmV4dHJhUGVuV2lkdGgoKTsKKy8vIEZJWE1F CisvLyAgICAgdmlldy0+ZXh0cmFQZW5XaWR0aCgpOwogfQogCiB2b2lkIEtQcmVzZW50ZXJWaWV3 SWZhY2U6OnNjcmVlblRyYW5zRWZmZWN0KCkKSW5kZXg6IGtwcmVzZW50ZXJfdmlldy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIGtwcmVzZW50ZXJfdmlldy5oCShyZXZpc2lvbiA0NDI5MDApCisrKyBrcHJlc2Vu dGVyX3ZpZXcuaAkoYXJiZXRza29waWEpCkBAIC02NCw2ICs2NCw4IEBACiBjbGFzcyBLb1BhcnRT ZWxlY3RBY3Rpb247CiBjbGFzcyBLb1BpY3R1cmU7CiBjbGFzcyBLb1BhcmFnU3R5bGU7CitjbGFz cyBLb0xpbmVTdHlsZUFjdGlvbjsKK2NsYXNzIEtvTGluZVdpZHRoQWN0aW9uOwogCiBjbGFzcyBL b0NoYXJTZWxlY3REaWE7CiBjbGFzcyBLb1RleHRGb3JtYXQ7CkBAIC0yNjAsOCArMjYyLDggQEAK ICAgICB2b2lkIGV4dHJhRGVmYXVsdFRlbXBsYXRlKCk7CiAgICAgdm9pZCBleHRyYUdyb3VwKCk7 CiAgICAgdm9pZCBleHRyYVVuR3JvdXAoKTsKLSAgICB2b2lkIGV4dHJhUGVuU3R5bGUoKTsKLSAg ICB2b2lkIGV4dHJhUGVuV2lkdGgoKTsKKyAgICB2b2lkIGV4dHJhUGVuU3R5bGUoIGludCBuZXdT dHlsZSApOworICAgIHZvaWQgZXh0cmFQZW5XaWR0aCggZG91YmxlIG5ld1dpZHRoICk7CiAKICAg ICB2b2lkIGNvbmZpZ3VyZUNvbXBsZXRpb24oKTsKIApAQCAtNjkzLDI0ICs2OTUsNyBAQAogICAg IHZvaWQgZXh0cmFMaW5lRW5kRG91YmxlTGluZUFycm93KCk7CiAgICAgdm9pZCBzZXRFeHRyYUxp bmVFbmQoTGluZUVuZCBsZSk7CiAKLSAgICB2b2lkIGV4dHJhUGVuU3R5bGVTb2xpZCgpOwotICAg IHZvaWQgZXh0cmFQZW5TdHlsZURhc2goKTsKLSAgICB2b2lkIGV4dHJhUGVuU3R5bGVEb3QoKTsK LSAgICB2b2lkIGV4dHJhUGVuU3R5bGVEYXNoRG90KCk7Ci0gICAgdm9pZCBleHRyYVBlblN0eWxl RGFzaERvdERvdCgpOwotICAgIHZvaWQgZXh0cmFQZW5TdHlsZU5vUGVuKCk7CiAgICAgdm9pZCBz ZXRFeHRyYVBlblN0eWxlKCBRdDo6UGVuU3R5bGUgc3R5bGUgKTsKLQotICAgIHZvaWQgZXh0cmFQ ZW5XaWR0aDEoKTsKLSAgICB2b2lkIGV4dHJhUGVuV2lkdGgyKCk7Ci0gICAgdm9pZCBleHRyYVBl bldpZHRoMygpOwotICAgIHZvaWQgZXh0cmFQZW5XaWR0aDQoKTsKLSAgICB2b2lkIGV4dHJhUGVu V2lkdGg1KCk7Ci0gICAgdm9pZCBleHRyYVBlbldpZHRoNigpOwotICAgIHZvaWQgZXh0cmFQZW5X aWR0aDcoKTsKLSAgICB2b2lkIGV4dHJhUGVuV2lkdGg4KCk7Ci0gICAgdm9pZCBleHRyYVBlbldp ZHRoOSgpOwotICAgIHZvaWQgZXh0cmFQZW5XaWR0aDEwKCk7CiAgICAgdm9pZCBzZXRFeHRyYVBl bldpZHRoKCB1bnNpZ25lZCBpbnQgd2lkdGggKTsKIAogICAgIC8qKgpAQCAtODI5LDcgKzgxNCw3 IEBACiAgICAgYm9vbCBtX3NjcmVlblNhdmVyV2FzRW5hYmxlZDsKIAogICAgIC8vIHJpZ2h0IGJ1 dHRvbiBwb3B1cCBtZW51cwotICAgIFFQb3B1cE1lbnUgKnJiX29hbGlnbiwgKnJiX2xiZWdpbiwg KnJiX2xlbmQsICpyYl9wc3R5bGUsICpyYl9wd2lkdGg7CisgICAgUVBvcHVwTWVudSAqcmJfb2Fs aWduLCAqcmJfbGJlZ2luLCAqcmJfbGVuZDsKICAgICBRUG9wdXBNZW51ICptX2FycmFuZ2VPYmpl Y3RzUG9wdXA7CiAgICAgUVB0ckxpc3Q8S0FjdGlvbj4gbV9hY3Rpb25MaXN0OyAvLyBmb3IgdGhl IGtvZGF0YXRvb2xzCiAgICAgUVB0ckxpc3Q8S0FjdGlvbj4gbV92YXJpYWJsZUFjdGlvbkxpc3Q7 CkBAIC0xMDA3LDggKzk5Miw4IEBACiAgICAgS0FjdGlvbiAqYWN0aW9uRXh0cmFMaW5lRW5kOwog ICAgIEtBY3Rpb24gKmFjdGlvbkV4dHJhR3JvdXA7CiAgICAgS0FjdGlvbiAqYWN0aW9uRXh0cmFV bkdyb3VwOwotICAgIEtBY3Rpb24gKmFjdGlvbkV4dHJhUGVuU3R5bGU7Ci0gICAgS0FjdGlvbiAq YWN0aW9uRXh0cmFQZW5XaWR0aDsKKyAgICBLb0xpbmVTdHlsZUFjdGlvbiAqYWN0aW9uRXh0cmFQ ZW5TdHlsZTsKKyAgICBLb0xpbmVXaWR0aEFjdGlvbiAqYWN0aW9uRXh0cmFQZW5XaWR0aDsKIAog ICAgIEtBY3Rpb24gKmFjdGlvblNjcmVlbkNvbmZpZ1BhZ2VzOwogICAgIEtBY3Rpb24gKmFjdGlv blNjcmVlbkFzc2lnbkVmZmVjdDsKSW5kZXg6IGtwcmVzZW50ZXJfdmlldy5jYwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBrcHJlc2VudGVyX3ZpZXcuY2MJKHJldmlzaW9uIDQ0MjkwMCkKKysrIGtwcmVzZW50ZXJf dmlldy5jYwkoYXJiZXRza29waWEpCkBAIC05OCw2ICs5OCw4IEBACiAjaW5jbHVkZSA8cWNvbWJv Ym94Lmg+CiAjaW5jbHVkZSA8a29QYXJ0U2VsZWN0QWN0aW9uLmg+CiAjaW5jbHVkZSA8a296b29t aGFuZGxlci5oPgorI2luY2x1ZGUgPGtvbGluZXN0eWxlYWN0aW9uLmg+CisjaW5jbHVkZSA8a29s aW5ld2lkdGhhY3Rpb24uaD4KIAogI2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHNpZ25h bC5oPgpAQCAtMzk2LDggKzM5OCw2IEBACiAgICAgZGVsZXRlIHBnQ29uZkRpYTsKICAgICBkZWxl dGUgcm90YXRlRGlhOwogICAgIGRlbGV0ZSBzaGFkb3dEaWE7Ci0gICAgZGVsZXRlIHJiX3BzdHls ZTsKLSAgICBkZWxldGUgcmJfcHdpZHRoOwogICAgIGRlbGV0ZSBhZkNob29zZTsKICAgICBkZWxl dGUgbV9mb250RGxnOwogICAgIGRlbGV0ZSBtX3BhcmFnRGxnOwpAQCAtMTM1OSwxOCArMTM1OSwx NiBAQAogICAgIG9iamVjdFNlbGVjdGVkQ2hhbmdlZCgpOwogfQogCi12b2lkIEtQcmVzZW50ZXJW aWV3OjpleHRyYVBlblN0eWxlKCkKK3ZvaWQgS1ByZXNlbnRlclZpZXc6OmV4dHJhUGVuU3R5bGUo IGludCBuZXdTdHlsZSApCiB7CiAgICAgbV9jYW52YXMtPnNldFRvb2xFZGl0TW9kZSggVEVNX01P VVNFICk7Ci0gICAgUVBvaW50IHBudCggUUN1cnNvcjo6cG9zKCkgKTsKLSAgICByYl9wc3R5bGUt PnBvcHVwKCBwbnQgKTsKKyAgICBzZXRFeHRyYVBlblN0eWxlKHN0YXRpY19jYXN0PFF0OjpQZW5T dHlsZT4obmV3U3R5bGUpKTsKIH0KIAotdm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0 aCgpCit2b2lkIEtQcmVzZW50ZXJWaWV3OjpleHRyYVBlbldpZHRoKCBkb3VibGUgbmV3V2lkdGgg KQogewogICAgIG1fY2FudmFzLT5zZXRUb29sRWRpdE1vZGUoIFRFTV9NT1VTRSApOwotICAgIFFQ b2ludCBwbnQoIFFDdXJzb3I6OnBvcygpICk7Ci0gICAgcmJfcHdpZHRoLT5wb3B1cCggcG50ICk7 CisgICAgc2V0RXh0cmFQZW5XaWR0aCggcVJvdW5kKCBuZXdXaWR0aCApICk7CiB9CiAKIHZvaWQg S1ByZXNlbnRlclZpZXc6OnNjcmVlbkNvbmZpZ1BhZ2VzKCkKQEAgLTIwMTAsMzYgKzIwMDgsNiBA QAogICAgICAgICBsaW5lRW5kID0gbGU7CiB9CiAKLXZvaWQgS1ByZXNlbnRlclZpZXc6OmV4dHJh UGVuU3R5bGVTb2xpZCgpCi17Ci0gICAgc2V0RXh0cmFQZW5TdHlsZSggUXQ6OlNvbGlkTGluZSAp OwotfQotCi12b2lkIEtQcmVzZW50ZXJWaWV3OjpleHRyYVBlblN0eWxlRGFzaCgpCi17Ci0gICAg c2V0RXh0cmFQZW5TdHlsZSggUXQ6OkRhc2hMaW5lICk7Ci19Ci0KLXZvaWQgS1ByZXNlbnRlclZp ZXc6OmV4dHJhUGVuU3R5bGVEb3QoKQotewotICAgIHNldEV4dHJhUGVuU3R5bGUoIFF0OjpEb3RM aW5lICk7Ci19Ci0KLXZvaWQgS1ByZXNlbnRlclZpZXc6OmV4dHJhUGVuU3R5bGVEYXNoRG90KCkK LXsKLSAgICBzZXRFeHRyYVBlblN0eWxlKCBRdDo6RGFzaERvdExpbmUgKTsKLX0KLQotdm9pZCBL UHJlc2VudGVyVmlldzo6ZXh0cmFQZW5TdHlsZURhc2hEb3REb3QoKQotewotICAgIHNldEV4dHJh UGVuU3R5bGUoIFF0OjpEYXNoRG90RG90TGluZSApOwotfQotCi12b2lkIEtQcmVzZW50ZXJWaWV3 OjpleHRyYVBlblN0eWxlTm9QZW4oKQotewotICAgIHNldEV4dHJhUGVuU3R5bGUoIFF0OjpOb1Bl biApOwotfQotCiB2b2lkIEtQcmVzZW50ZXJWaWV3OjpzZXRFeHRyYVBlblN0eWxlKCBRdDo6UGVu U3R5bGUgc3R5bGUgKQogewogICAgIEtDb21tYW5kICogY21kKCBnZXRQZW5DbWQoIGkxOG4oIkNo YW5nZSBPdXRsaW5lIFN0eWxlIiksIFFQZW4oc3R5bGUpLApAQCAtMjA1MSw1NiArMjAxOSw2IEBA CiAgICAgICAgIHBlbi5zZXRTdHlsZSggc3R5bGUgKTsKIH0KIAotdm9pZCBLUHJlc2VudGVyVmll dzo6ZXh0cmFQZW5XaWR0aDEoKQotewotICAgIHNldEV4dHJhUGVuV2lkdGgoIDEgKTsKLX0KLQot dm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0aDIoKQotewotICAgIHNldEV4dHJhUGVu V2lkdGgoIDIgKTsKLX0KLQotdm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0aDMoKQot ewotICAgIHNldEV4dHJhUGVuV2lkdGgoIDMgKTsKLX0KLQotdm9pZCBLUHJlc2VudGVyVmlldzo6 ZXh0cmFQZW5XaWR0aDQoKQotewotICAgIHNldEV4dHJhUGVuV2lkdGgoIDQgKTsKLX0KLQotdm9p ZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0aDUoKQotewotICAgIHNldEV4dHJhUGVuV2lk dGgoIDUgKTsKLX0KLQotdm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0aDYoKQotewot ICAgIHNldEV4dHJhUGVuV2lkdGgoIDYgKTsKLX0KLQotdm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0 cmFQZW5XaWR0aDcoKQotewotICAgIHNldEV4dHJhUGVuV2lkdGgoIDcgKTsKLX0KLQotdm9pZCBL UHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0aDgoKQotewotICAgIHNldEV4dHJhUGVuV2lkdGgo IDggKTsKLX0KLQotdm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQZW5XaWR0aDkoKQotewotICAg IHNldEV4dHJhUGVuV2lkdGgoIDkgKTsKLX0KLQotdm9pZCBLUHJlc2VudGVyVmlldzo6ZXh0cmFQ ZW5XaWR0aDEwKCkKLXsKLSAgICBzZXRFeHRyYVBlbldpZHRoKCAxMCApOwotfQotCiB2b2lkIEtQ cmVzZW50ZXJWaWV3OjpzZXRFeHRyYVBlbldpZHRoKCB1bnNpZ25lZCBpbnQgd2lkdGggKQogewog ICAgIFFQZW4gdG1wUGVuOwpAQCAtMjcwNywxMyArMjYyNSwxOCBAQAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0aGlzLCBTTE9UKCBleHRyYUxpbmVFbmQoKSApLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY3Rpb25Db2xsZWN0aW9uKCksICJl eHRyYV9saW5lZW5kIiApOwogCi0gICAgYWN0aW9uRXh0cmFQZW5TdHlsZSA9IG5ldyBLQWN0aW9u KCBpMThuKCJPdXRsaW5lIFN0eWxlIiksICJwZW5fc3R5bGUiLCAwLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdGhpcywgU0xPVCggZXh0cmFQZW5TdHlsZSgpICksCisg ICAgYWN0aW9uRXh0cmFQZW5TdHlsZSA9IG5ldyBLb0xpbmVTdHlsZUFjdGlvbiggaTE4bigiT3V0 bGluZSBTdHlsZSIpLCAicGVuX3N0eWxlIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRoaXMsIFNMT1QoIGV4dHJhUGVuU3R5bGUoaW50KSApLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uQ29sbGVjdGlvbigpLCAiZXh0cmFfcGVu c3R5bGUiICk7CisgICAgYWN0aW9uRXh0cmFQZW5TdHlsZS0+c2V0U2hvd0N1cnJlbnRTZWxlY3Rp b24oZmFsc2UpOwogCi0gICAgYWN0aW9uRXh0cmFQZW5XaWR0aCA9IG5ldyBLQWN0aW9uKCBpMThu KCJPdXRsaW5lIFdpZHRoIiksICJwZW5fd2lkdGgiLCAwLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGhpcywgU0xPVCggZXh0cmFQZW5XaWR0aCgpICksCisgICAgYWN0 aW9uRXh0cmFQZW5XaWR0aCA9IG5ldyBLb0xpbmVXaWR0aEFjdGlvbiggaTE4bigiT3V0bGluZSBX aWR0aCIpLCAicGVuX3dpZHRoIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRoaXMsIFNMT1QoIGV4dHJhUGVuV2lkdGgoZG91YmxlKSApLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uQ29sbGVjdGlvbigpLCAiZXh0cmFfcGVud2lk dGgiICk7CisgICAgYWN0aW9uRXh0cmFQZW5XaWR0aC0+c2V0VW5pdCgga1ByZXNlbnRlckRvYygp LT5nZXRVbml0KCkgKTsKKyAgICBhY3Rpb25FeHRyYVBlbldpZHRoLT5zZXRTaG93Q3VycmVudFNl bGVjdGlvbihmYWxzZSk7CisgICAgY29ubmVjdCgga1ByZXNlbnRlckRvYygpLCBTSUdOQUwoIHVu aXRDaGFuZ2VkKCBLb1VuaXQ6OlVuaXQgKSApLAorICAgICAgICAgICAgIGFjdGlvbkV4dHJhUGVu V2lkdGgsIFNMT1QoIHNldFVuaXQoIEtvVW5pdDo6VW5pdCApICkgKTsKIAogICAgIGFjdGlvbkV4 dHJhR3JvdXAgPSBuZXcgS0FjdGlvbiggaTE4biggIiZHcm91cCBPYmplY3RzIiApLCAiZ3JvdXAi LCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcywgU0xPVCggZXh0 cmFHcm91cCgpICksCkBAIC0zNjc2LDQ4ICszNTk5LDYgQEAKICAgICByYl9sZW5kLT5zZXRNb3Vz ZVRyYWNraW5nKCB0cnVlICk7CiAgICAgcmJfbGVuZC0+c2V0Q2hlY2thYmxlKCBmYWxzZSApOwog Ci0gICAgLy8gY3JlYXRlIHJpZ2h0IGJ1dHRvbiBwZW4gc3R5bGUKLSAgICByYl9wc3R5bGUgPSBu ZXcgUVBvcHVwTWVudSgpOwotICAgIFFfQ0hFQ0tfUFRSKCByYl9wc3R5bGUgKTsKLSAgICByYl9w c3R5bGUtPmluc2VydEl0ZW0oIEtQQmFySWNvbiggInBlbl9zdHlsZV9zb2xpZCIgKSwgdGhpcywg U0xPVCggZXh0cmFQZW5TdHlsZVNvbGlkKCkgKSApOwotICAgIHJiX3BzdHlsZS0+aW5zZXJ0U2Vw YXJhdG9yKCk7Ci0gICAgcmJfcHN0eWxlLT5pbnNlcnRJdGVtKCBLUEJhckljb24oICJwZW5fc3R5 bGVfZGFzaCIgKSwgdGhpcywgU0xPVCggZXh0cmFQZW5TdHlsZURhc2goKSApICk7Ci0gICAgcmJf cHN0eWxlLT5pbnNlcnRTZXBhcmF0b3IoKTsKLSAgICByYl9wc3R5bGUtPmluc2VydEl0ZW0oIEtQ QmFySWNvbiggInBlbl9zdHlsZV9kb3QiICksIHRoaXMsIFNMT1QoIGV4dHJhUGVuU3R5bGVEb3Qo KSApICk7Ci0gICAgcmJfcHN0eWxlLT5pbnNlcnRTZXBhcmF0b3IoKTsKLSAgICByYl9wc3R5bGUt Pmluc2VydEl0ZW0oIEtQQmFySWNvbiggInBlbl9zdHlsZV9kYXNoZG90IiApLCB0aGlzLCBTTE9U KCBleHRyYVBlblN0eWxlRGFzaERvdCgpICkgKTsKLSAgICByYl9wc3R5bGUtPmluc2VydFNlcGFy YXRvcigpOwotICAgIHJiX3BzdHlsZS0+aW5zZXJ0SXRlbSggS1BCYXJJY29uKCAicGVuX3N0eWxl X2Rhc2hkb3Rkb3QiICksIHRoaXMsIFNMT1QoIGV4dHJhUGVuU3R5bGVEYXNoRG90RG90KCkgKSAp OwotICAgIHJiX3BzdHlsZS0+aW5zZXJ0U2VwYXJhdG9yKCk7Ci0gICAgcmJfcHN0eWxlLT5pbnNl cnRJdGVtKCBLUEJhckljb24oICJwZW5fc3R5bGVfbm9wZW4iICksIHRoaXMsIFNMT1QoIGV4dHJh UGVuU3R5bGVOb1BlbigpICkgKTsKLSAgICByYl9wc3R5bGUtPnNldE1vdXNlVHJhY2tpbmcoIHRy dWUgKTsKLSAgICByYl9wc3R5bGUtPnNldENoZWNrYWJsZSggZmFsc2UgKTsKLQotICAgIC8vIGNy ZWF0ZSByaWdodCBidXR0b24gcGVuIHdpZHRoCi0gICAgcmJfcHdpZHRoID0gbmV3IFFQb3B1cE1l bnUoKTsKLSAgICBRX0NIRUNLX1BUUiggcmJfcHdpZHRoICk7Ci0gICAgcmJfcHdpZHRoLT5pbnNl cnRJdGVtKCBLUEJhckljb24oICJwZW5fd2lkdGgxIiApLCB0aGlzLCBTTE9UKCBleHRyYVBlbldp ZHRoMSgpICkgKTsKLSAgICByYl9wd2lkdGgtPmluc2VydFNlcGFyYXRvcigpOwotICAgIHJiX3B3 aWR0aC0+aW5zZXJ0SXRlbSggS1BCYXJJY29uKCAicGVuX3dpZHRoMiIgKSwgdGhpcywgU0xPVCgg ZXh0cmFQZW5XaWR0aDIoKSApICk7Ci0gICAgcmJfcHdpZHRoLT5pbnNlcnRTZXBhcmF0b3IoKTsK LSAgICByYl9wd2lkdGgtPmluc2VydEl0ZW0oIEtQQmFySWNvbiggInBlbl93aWR0aDMiICksIHRo aXMsIFNMT1QoIGV4dHJhUGVuV2lkdGgzKCkgKSApOwotICAgIHJiX3B3aWR0aC0+aW5zZXJ0U2Vw YXJhdG9yKCk7Ci0gICAgcmJfcHdpZHRoLT5pbnNlcnRJdGVtKCBLUEJhckljb24oICJwZW5fd2lk dGg0IiApLCB0aGlzLCBTTE9UKCBleHRyYVBlbldpZHRoNCgpICkgKTsKLSAgICByYl9wd2lkdGgt Pmluc2VydFNlcGFyYXRvcigpOwotICAgIHJiX3B3aWR0aC0+aW5zZXJ0SXRlbSggS1BCYXJJY29u KCAicGVuX3dpZHRoNSIgKSwgdGhpcywgU0xPVCggZXh0cmFQZW5XaWR0aDUoKSApICk7Ci0gICAg cmJfcHdpZHRoLT5pbnNlcnRTZXBhcmF0b3IoKTsKLSAgICByYl9wd2lkdGgtPmluc2VydEl0ZW0o IEtQQmFySWNvbiggInBlbl93aWR0aDYiICksIHRoaXMsIFNMT1QoIGV4dHJhUGVuV2lkdGg2KCkg KSApOwotICAgIHJiX3B3aWR0aC0+aW5zZXJ0U2VwYXJhdG9yKCk7Ci0gICAgcmJfcHdpZHRoLT5p bnNlcnRJdGVtKCBLUEJhckljb24oICJwZW5fd2lkdGg3IiApLCB0aGlzLCBTTE9UKCBleHRyYVBl bldpZHRoNygpICkgKTsKLSAgICByYl9wd2lkdGgtPmluc2VydFNlcGFyYXRvcigpOwotICAgIHJi X3B3aWR0aC0+aW5zZXJ0SXRlbSggS1BCYXJJY29uKCAicGVuX3dpZHRoOCIgKSwgdGhpcywgU0xP VCggZXh0cmFQZW5XaWR0aDgoKSApICk7Ci0gICAgcmJfcHdpZHRoLT5pbnNlcnRTZXBhcmF0b3Io KTsKLSAgICByYl9wd2lkdGgtPmluc2VydEl0ZW0oIEtQQmFySWNvbiggInBlbl93aWR0aDkiICks IHRoaXMsIFNMT1QoIGV4dHJhUGVuV2lkdGg5KCkgKSApOwotICAgIHJiX3B3aWR0aC0+aW5zZXJ0 U2VwYXJhdG9yKCk7Ci0gICAgcmJfcHdpZHRoLT5pbnNlcnRJdGVtKCBLUEJhckljb24oICJwZW5f d2lkdGgxMCIgKSwgdGhpcywgU0xPVCggZXh0cmFQZW5XaWR0aDEwKCkgKSApOwotICAgIHJiX3B3 aWR0aC0+c2V0TW91c2VUcmFja2luZyggdHJ1ZSApOwotICAgIHJiX3B3aWR0aC0+c2V0Q2hlY2th YmxlKCBmYWxzZSApOwotCiAgICAgLy8gY3JlYXRlIGFycmFuZ2Utb2JqZWN0cyBwb3B1cAogICAg IG1fYXJyYW5nZU9iamVjdHNQb3B1cCA9IG5ldyBRUG9wdXBNZW51KCk7CiAgICAgUV9DSEVDS19Q VFIobV9hcnJhbmdlT2JqZWN0c1BvcHVwKTsKSW5kZXg6IGtwcmVzZW50ZXJfZG9jLmNjCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIGtwcmVzZW50ZXJfZG9jLmNjCShyZXZpc2lvbiA0NDI5MDApCisrKyBrcHJlc2Vu dGVyX2RvYy5jYwkoYXJiZXRza29waWEpCkBAIC0zMDksNiArMzA5LDExIEBACiAKIHZvaWQgS1By ZXNlbnRlckRvYzo6c2V0VW5pdCggS29Vbml0OjpVbml0IF91bml0ICkKIHsKKyAgICBpZiggbV91 bml0ID09IF91bml0ICkKKyAgICB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBtX3Vu aXQgPSBfdW5pdDsKIAogICAgIFFQdHJMaXN0SXRlcmF0b3I8S29WaWV3PiBpdCggdmlld3MoKSAp OwpAQCAtMzE2LDYgKzMyMSw4IEBACiAgICAgICAgICgoS1ByZXNlbnRlclZpZXcqKWl0LmN1cnJl bnQoKSktPmdldEhSdWxlcigpLT5zZXRVbml0KCBtX3VuaXQgKTsKICAgICAgICAgKChLUHJlc2Vu dGVyVmlldyopaXQuY3VycmVudCgpKS0+Z2V0VlJ1bGVyKCktPnNldFVuaXQoIG1fdW5pdCApOwog ICAgIH0KKworICAgIGVtaXQgdW5pdENoYW5nZWQoIG1fdW5pdCApOwogfQogCiB2b2lkIEtQcmVz ZW50ZXJEb2M6OnNhdmVDb25maWcoKQo= ------=_Part_1001_23174612.1123177266128 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ koffice-devel mailing list koffice-devel@kde.org https://mail.kde.org/mailman/listinfo/koffice-devel ------=_Part_1001_23174612.1123177266128--