From koffice-devel Wed Sep 23 21:33:18 2009 From: Hans Bakker Date: Wed, 23 Sep 2009 21:33:18 +0000 To: koffice-devel Subject: Bug 185976 Message-Id: <761dc76c0909231433t62f1a739gc3dedb4958384004 () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=koffice-devel&m=125374164632228 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--00032555a9a2c99b06047445778b" --00032555a9a2c99b06047445778b Content-Type: multipart/alternative; boundary=00032555a9a2c99afd0474457789 --00032555a9a2c99afd0474457789 Content-Type: text/plain; charset=ISO-8859-1 Hi, this is a proposal for a patch for bug 185976 . Unfortunately I'm unable to commit it as I'm working on a temporary pc now. The first file in the diff should be the solution for the bug; the second file is about creating a user-friendly way to install python or ruby for running the disabled scripts. Kind regards, Hans Bakker --00032555a9a2c99afd0474457789 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi,

this is a proposal for a patch for bug 185976. Unfortunately I'm unable to commit it as I&#= 39;m working on a temporary pc now. The first file in the diff should be th= e solution for the bug; the second file is about creating a user-friendly w= ay to install python or ruby for running the disabled scripts.

Kind regards,

Hans Bakker
--00032555a9a2c99afd0474457789-- --00032555a9a2c99b06047445778b Content-Type: application/octet-stream; name="bug185976_firstpatch.patch" Content-Disposition: attachment; filename="bug185976_firstpatch.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fzz4odrk0 SW5kZXg6IEtvU2NyaXB0aW5nUGFydC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gS29TY3JpcHRpbmdQYXJ0 LmNwcAkocmV2aXNpb24gMTAxOTc3MykKKysrIEtvU2NyaXB0aW5nUGFydC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE3Myw4ICsxNzMsMTEgQEAKIAogdm9pZCBhZGRNZW51KFFNZW51ICptZW51LCBL cm9zczo6QWN0aW9uQ29sbGVjdGlvbiAqY29sbGVjdGlvbikKIHsKLSAgICBmb3JlYWNoIChLcm9z czo6QWN0aW9uICphLCBjb2xsZWN0aW9uLT5hY3Rpb25zKCkpCi0gICAgICAgIG1lbnUtPmFkZEFj dGlvbihhKTsKKyAgICBmb3JlYWNoIChLcm9zczo6QWN0aW9uICphLCBjb2xsZWN0aW9uLT5hY3Rp b25zKCkpIHsKKyAgICAgICAgaWYoYS0+aXNFbmFibGVkKCkpIHsKKyAgICAgICAgICAgIG1lbnUt PmFkZEFjdGlvbihhKTsKKyAgICAgICAgfQorICAgIH0KICAgICBmb3JlYWNoIChjb25zdCBRU3Ry aW5nICZjb2xsZWN0aW9ubmFtZSwgY29sbGVjdGlvbi0+Y29sbGVjdGlvbnMoKSkgewogICAgICAg ICBLcm9zczo6QWN0aW9uQ29sbGVjdGlvbiAqYyA9IGNvbGxlY3Rpb24tPmNvbGxlY3Rpb24oY29s bGVjdGlvbm5hbWUpOwogICAgICAgICBpZiAoYy0+aXNFbmFibGVkKCkpCkluZGV4OiBLb1Njcmlw dE1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEtvU2NyaXB0TWFuYWdlci5jcHAJKHJldmlzaW9u IDEwMTk3NzMpCisrKyBLb1NjcmlwdE1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2 ICszMiw4IEBACiAjaW5jbHVkZSA8a3N0YW5kYXJkZGlycy5oPgogI2luY2x1ZGUgPGtkZWJ1Zy5o PgogI2luY2x1ZGUgPFF0R3VpL1FCb3hMYXlvdXQ+CisjaW5jbHVkZSA8UUxhYmVsPgorI2luY2x1 ZGUgPFFQdXNoQnV0dG9uPgogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAgKiBLb1NjcmlwdE1h bmFnZXJDb2xsZWN0aW9uCkBAIC0yOTgsOCArMzAwLDI2IEBACiAgICAgc2V0QnV0dG9ucyhLRGlh bG9nOjpPayB8IEtEaWFsb2c6OkNhbmNlbCk7CiAgICAgc2V0QnV0dG9uVGV4dChLRGlhbG9nOjpP aywgaTE4bigiU2F2ZSIpKTsKICAgICBzZXRCdXR0b25JY29uKEtEaWFsb2c6Ok9rLCBLSWNvbigi ZG9jdW1lbnQtc2F2ZSIpKTsKLSAgICBtX2NvbGxlY3Rpb24gPSBuZXcgS29TY3JpcHRNYW5hZ2Vy Q29sbGVjdGlvbihtYWluV2lkZ2V0KCkpOwotICAgIHNldE1haW5XaWRnZXQobV9jb2xsZWN0aW9u KTsKKworICAgIFFXaWRnZXQgKmRpYWxvZ1dpZGdldCA9IG5ldyBRV2lkZ2V0KG1haW5XaWRnZXQo KSk7CisKKyAgICBRVkJveExheW91dCAqZGlhbG9nTGF5b3V0ID0gbmV3IFFWQm94TGF5b3V0KCk7 CisgICAgZGlhbG9nTGF5b3V0LT5zZXRNYXJnaW4oMCk7CisgICAgZGlhbG9nV2lkZ2V0LT5zZXRM YXlvdXQoZGlhbG9nTGF5b3V0KTsKKworICAgIG1fY29sbGVjdGlvbiA9IG5ldyBLb1NjcmlwdE1h bmFnZXJDb2xsZWN0aW9uKGRpYWxvZ1dpZGdldCk7CisgICAgZGlhbG9nTGF5b3V0LT5hZGRXaWRn ZXQobV9jb2xsZWN0aW9uKTsKKworICAgIGlmKCFLcm9zczo6TWFuYWdlcjo6c2VsZigpLmludGVy cHJldGVycygpLmNvbnRhaW5zKCJweXRob24iKSkgeworICAgICAgICBhZGRJbnN0YWxsSW50ZXJw cmV0ZXJXaWRnZXRzKGRpYWxvZ1dpZGdldCwgaTE4bigiUHl0aG9uIG5vdCBmb3VuZC4gWW91IHdp bGwgbm90IGJlIGFibGUgdG8gcnVuIHB5dG9uIHNjcmlwdHMuIiksIGkxOG4oIkluc3RhbGwgcHl0 aG9uIikpOworICAgIH0KKworCisgICAgaWYoIUtyb3NzOjpNYW5hZ2VyOjpzZWxmKCkuaW50ZXJw cmV0ZXJzKCkuY29udGFpbnMoInJ1YnkiKSkgeworICAgICAgICA6OmFkZEluc3RhbGxJbnRlcnBy ZXRlcldpZGdldHMoZGlhbG9nV2lkZ2V0LCBpMThuKCJSdWJ5IG5vdCBmb3VuZC4gWW91IHdpbGwg bm90IGJlIGFibGUgdG8gcnVuIHJ1Ynkgc2NyaXB0cy4iKSwgaTE4bigiSW5zdGFsbCBydWJ5Iikp OworICAgIH0KKworICAgIHNldE1haW5XaWRnZXQoZGlhbG9nV2lkZ2V0KTsKICAgICByZXNpemUo UVNpemUoNTIwLCAzODApLmV4cGFuZGVkVG8obWluaW11bVNpemVIaW50KCkpKTsKICAgICBjb25u ZWN0KHRoaXMsIFNJR05BTChhY2NlcHRlZCgpKSwgdGhpcywgU0xPVChzbG90QWNjZXB0ZWQoKSkp OwogfQpAQCAtMzIxLDQgKzM0MSwxOSBAQAogICAgIH0KIH0KIAorbmFtZXNwYWNlCit7CisgICAg dm9pZCBhZGRJbnN0YWxsSW50ZXJwcmV0ZXJXaWRnZXRzKFFXaWRnZXQqIHBhcmVudCwgY29uc3Qg UVN0cmluZyYgZXJyb3JNZXNzYWdlLCBjb25zdCBRU3RyaW5nJiBpbnN0YWxsTWVzc2FnZSkKKyAg ICB7CisgICAgICAgIFFXaWRnZXQgKmVycm9yV2lkZ2V0ID0gbmV3IFFXaWRnZXQocGFyZW50KTsK KyAgICAgICAgUUhCb3hMYXlvdXQgKmVycm9yTGF5b3V0ID0gbmV3IFFIQm94TGF5b3V0KCk7Cisg ICAgICAgIGVycm9yTGF5b3V0LT5zZXRNYXJnaW4oMCk7CisgICAgICAgIFFMYWJlbCAqZXJyb3JM YWJlbCA9IG5ldyBRTGFiZWwoZXJyb3JNZXNzYWdlKTsKKyAgICAgICAgUVB1c2hCdXR0b24gKmlu c3RhbGxCdXR0b24gPSBuZXcgUVB1c2hCdXR0b24oaW5zdGFsbE1lc3NhZ2UpOworICAgICAgICBl cnJvckxheW91dC0+YWRkV2lkZ2V0KGVycm9yTGFiZWwpOworICAgICAgICBlcnJvckxheW91dC0+ YWRkV2lkZ2V0KGluc3RhbGxCdXR0b24pOworICAgICAgICBwYXJlbnQtPmxheW91dCgpLT5hZGRX aWRnZXQoZXJyb3JXaWRnZXQpOworICAgIH0KK30KKwogI2luY2x1ZGUgIktvU2NyaXB0TWFuYWdl ci5tb2MiCg== --00032555a9a2c99b06047445778b 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 --00032555a9a2c99b06047445778b--