From koffice-devel Thu Jul 12 11:11:10 2001 From: Toshitaka Fujioka Date: Thu, 12 Jul 2001 11:11:10 +0000 To: koffice-devel Subject: Patch for KIllustrator and KWord (XIM) X-MARC-Message: https://marc.info/?l=koffice-devel&m=99493615203799 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_MQXC7BXTNFUOMP2HO98N" --------------Boundary-00=_MQXC7BXTNFUOMP2HO98N Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Hello, These patches can let XIM work in KIllustrator and KWord . XIM completely work. ;) I hope that this patch is adopted for every XIM user using KIllustrator and KWord. Please review. Thank you. -- Toshitaka Fujioka http://www.kde.org The K Desktop Environment Project fujioka@kde.org http://www.kde.gr.jp Japan KDE User's Group toshitaka@kde.gr.jp -- We offer the best Desktop Environment to you. (This is my goal. ;-)) -- --------------Boundary-00=_MQXC7BXTNFUOMP2HO98N Content-Type: text/x-diff; charset="iso-8859-1"; name="koffice-killustrator-xim-20010712.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="koffice-killustrator-xim-20010712.diff" ZGlmZiAtdXIga29mZmljZS5vcmlnL2tpbGx1c3RyYXRvci9DYW52YXMuY2Mga29mZmljZS9raWxs dXN0cmF0b3IvQ2FudmFzLmNjCi0tLSBrb2ZmaWNlLm9yaWcva2lsbHVzdHJhdG9yL0NhbnZhcy5j YwlUaHUgSnVsIDEyIDAxOjIyOjE5IDIwMDEKKysrIGtvZmZpY2Uva2lsbHVzdHJhdG9yL0NhbnZh cy5jYwlUaHUgSnVsIDEyIDAxOjI5OjE3IDIwMDEKQEAgLTkwNCw0ICs5MDQsOSBAQAogICB9CiB9 CiAKK3ZvaWQgQ2FudmFzOjpzZXRYaW1Qb3NpdGlvbihpbnQgeCwgaW50IHksIGludCB3LCBpbnQg aCkKK3sKKyAgUVdpZGdldDo6c2V0TWljcm9Gb2N1c0hpbnQoeCwgeSwgdywgaCk7Cit9CisKICNp bmNsdWRlIDxDYW52YXMubW9jPgpkaWZmIC11ciBrb2ZmaWNlLm9yaWcva2lsbHVzdHJhdG9yL0Nh bnZhcy5oIGtvZmZpY2Uva2lsbHVzdHJhdG9yL0NhbnZhcy5oCi0tLSBrb2ZmaWNlLm9yaWcva2ls bHVzdHJhdG9yL0NhbnZhcy5oCVRodSBKdWwgMTIgMDE6MjI6MTkgMjAwMQorKysga29mZmljZS9r aWxsdXN0cmF0b3IvQ2FudmFzLmgJVGh1IEp1bCAxMiAwMToyOTo1MCAyMDAxCkBAIC05NCw2ICs5 NCw4IEBACiAgIHZvaWQgc2hvd0Jhc2VQb2ludHMgKGJvb2wgZmxhZyA9IHRydWUpOwogICB2b2lk IHNldE91dGxpbmVNb2RlIChib29sIGZsYWcpOwogCisgIHZvaWQgc2V0WGltUG9zaXRpb24oaW50 IHgsIGludCB5LCBpbnQgdywgaW50IGgpOworCiBwcm90ZWN0ZWQ6CiAgIFFSZWN0IG1fcGFwZXJB cmVhOwogICBRUmVjdCBtX3Zpc2libGVBcmVhOwpkaWZmIC11ciBrb2ZmaWNlLm9yaWcva2lsbHVz dHJhdG9yL0dUZXh0LmNjIGtvZmZpY2Uva2lsbHVzdHJhdG9yL0dUZXh0LmNjCi0tLSBrb2ZmaWNl Lm9yaWcva2lsbHVzdHJhdG9yL0dUZXh0LmNjCVRodSBKdWwgMTIgMDE6MjI6MjEgMjAwMQorKysg a29mZmljZS9raWxsdXN0cmF0b3IvR1RleHQuY2MJVGh1IEp1bCAxMiAwMTozMDozNCAyMDAxCkBA IC0xODMsNiArMTgzLDEwIEBACiAKICAgICBwLnNldFBlbiAoYmxhY2spOwogICAgIHAuZHJhd0xp bmUgKHFSb3VuZCAoeDEpLCBxUm91bmQgKHkxKSwgcVJvdW5kICh4MSksIHFSb3VuZCAoeTIpKTsK KworICAgIFFQb2ludCBwb3MgPSBwLnBvcygpOworICAgIGdsb2JhbF9wb3NYID0gcG9zLngoKTsK KyAgICBnbG9iYWxfcG9zWSA9IHBvcy55KCk7CiAgIH0KIH0KIApkaWZmIC11ciBrb2ZmaWNlLm9y aWcva2lsbHVzdHJhdG9yL0dUZXh0Lmgga29mZmljZS9raWxsdXN0cmF0b3IvR1RleHQuaAotLS0g a29mZmljZS5vcmlnL2tpbGx1c3RyYXRvci9HVGV4dC5oCVRodSBKdWwgMTIgMDE6MjI6MjEgMjAw MQorKysga29mZmljZS9raWxsdXN0cmF0b3IvR1RleHQuaAlUaHUgSnVsIDEyIDAxOjMxOjA2IDIw MDEKQEAgLTk5LDYgKzk5LDggQEAKIAogICBib29sIGlzRW1wdHkgKCkgY29uc3Q7CiAKKyAgaW50 IGdsb2JhbF9wb3NYLCBnbG9iYWxfcG9zWTsKKwogcHVibGljIHNsb3RzOgogICB2b2lkIHVwZGF0 ZU1hdHJpY2VzRm9yUGF0aCAoKTsKICAgdm9pZCBkZWxldGVQYXRoT2JqZWN0ICgpOwpkaWZmIC11 ciBrb2ZmaWNlLm9yaWcva2lsbHVzdHJhdG9yL1RleHRUb29sLmNjIGtvZmZpY2Uva2lsbHVzdHJh dG9yL1RleHRUb29sLmNjCi0tLSBrb2ZmaWNlLm9yaWcva2lsbHVzdHJhdG9yL1RleHRUb29sLmNj CVRodSBKdWwgMTIgMDE6MjI6MjEgMjAwMQorKysga29mZmljZS9raWxsdXN0cmF0b3IvVGV4dFRv b2wuY2MJVGh1IEp1bCAxMiAwMTozMjowMiAyMDAxCkBAIC0xMDEsNiArMTAxLDkgQEAKICAgICAg ICAgICAgIHRleHQtPnNob3dDdXJzb3IgKHRydWUpOwogICAgICAgICAgICAgZG9jLT5hY3RpdmVQ YWdlKCktPmluc2VydE9iamVjdCAodGV4dCk7CiAgICAgICAgIH0KKworICAgICAgICAvLyBYSU0g cG9zaXRpb24KKyAgICAgICAgY2FudmFzLT5zZXRYaW1Qb3NpdGlvbiggdGV4dC0+Z2xvYmFsX3Bv c1gsIHRleHQtPmdsb2JhbF9wb3NZLCAwLCAwICk7CiAgICAgfQogICAgIGVsc2UgaWYgKGUtPnR5 cGUgKCkgPT0gUUV2ZW50OjpLZXlQcmVzcykgewogICAgICAgICBRS2V5RXZlbnQgKmtlID0gKFFL ZXlFdmVudCAqKSBlOwpAQCAtMTc4LDYgKzE4MSw5IEBACiAgICAgICAgIGlmKGNoYW5nZWQpIHsK ICAgICAgICAgICAgIHRleHQtPnNldEN1cnNvciAoeCwgeSk7CiAgICAgICAgIH0KKworICAgICAg ICAvLyBYSU0gcG9zaXRpb24KKyAgICAgICAgY2FudmFzLT5zZXRYaW1Qb3NpdGlvbiggdGV4dC0+ Z2xvYmFsX3Bvc1gsIHRleHQtPmdsb2JhbF9wb3NZLCAwLCAwICk7CiAgICAgfQogICAgIHJldHVy bjsKIH0K --------------Boundary-00=_MQXC7BXTNFUOMP2HO98N Content-Type: text/x-diff; charset="iso-8859-1"; name="koffice-kword-xim-20010712.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="koffice-kword-xim-20010712.diff" ZGlmZiAtdXIga29mZmljZS5vcmlnL2t3b3JkL2t3dGV4dGZyYW1lc2V0LmNjIGtvZmZpY2Uva3dv cmQva3d0ZXh0ZnJhbWVzZXQuY2MKLS0tIGtvZmZpY2Uub3JpZy9rd29yZC9rd3RleHRmcmFtZXNl dC5jYwlUaHUgSnVsIDEyIDAxOjIyOjQwIDIwMDEKKysrIGtvZmZpY2Uva3dvcmQva3d0ZXh0ZnJh bWVzZXQuY2MJVGh1IEp1bCAxMiAyMDowMDowOCAyMDAxCkBAIC00NTQsNiArNDU0LDkgQEAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGl4LCBjZywgY3Vyc29yVmlzaWJsZSwgY3Vy c29yICk7CiAgICAgICAgICAgICBwLT5yZXN0b3JlKCk7CiAgICAgICAgICAgICBjdXJzb3ItPnBh cmFnKCktPnNldENoYW5nZWQoIHdhc0NoYW5nZWQgKTsgICAgICAvLyBNYXliZSB3ZSBoYXZlIG1v cmUgY2hhbmdlcyB0byBkcmF3IQorCisgICAgICAgICAgICAvL1hJTSBQb3NpdGlvbgorICAgICAg ICAgICAgY2FudmFzLT5ndWkoKS0+c2V0WGltUG9zaXRpb24oIGNQb2ludC54KCkrMzAsICBjUG9p bnQueSgpKzIwLCAwLCBoICk7CiAgICAgICAgIH0KICAgICB9CiAgICAgbV9jdXJyZW50RHJhd25D YW52YXMgPSAwTDsKZGlmZiAtdXIga29mZmljZS5vcmlnL2t3b3JkL2t3dmlldy5jYyBrb2ZmaWNl L2t3b3JkL2t3dmlldy5jYwotLS0ga29mZmljZS5vcmlnL2t3b3JkL2t3dmlldy5jYwlUaHUgSnVs IDEyIDAxOjIyOjQwIDIwMDEKKysrIGtvZmZpY2Uva3dvcmQva3d2aWV3LmNjCVRodSBKdWwgMTIg MjA6MDA6NDAgMjAwMQpAQCAtMzQwMiw0ICszNDAyLDkgQEAKICAgICB2aWV3LT5rV29yZERvY3Vt ZW50KCktPnNldFVuaXQoIEtXVW5pdDo6dW5pdCggdSApICk7CiB9CiAKK3ZvaWQgS1dHVUk6OnNl dFhpbVBvc2l0aW9uKCBpbnQgeCwgaW50IHksIGludCB3aWR0aCwgaW50IGhlaWd0aCApCit7Cisg ICAgUVdpZGdldDo6c2V0TWljcm9Gb2N1c0hpbnQoIHgsIHksIHdpZHRoLCBoZWlndGggKTsKK30K KwogI2luY2x1ZGUgImt3dmlldy5tb2MiCmRpZmYgLXVyIGtvZmZpY2Uub3JpZy9rd29yZC9rd3Zp ZXcuaCBrb2ZmaWNlL2t3b3JkL2t3dmlldy5oCi0tLSBrb2ZmaWNlLm9yaWcva3dvcmQva3d2aWV3 LmgJVGh1IEp1bCAxMiAwMToyMjo0MCAyMDAxCisrKyBrb2ZmaWNlL2t3b3JkL2t3dmlldy5oCVRo dSBKdWwgMTIgMjA6MDE6MTIgMjAwMQpAQCAtNDY5LDYgKzQ2OSw4IEBACiAgICAgS29UYWJDaG9v c2VyICpnZXRUYWJDaG9vc2VyKCkgeyByZXR1cm4gdGFiQ2hvb3NlcjsgfQogICAgIEtXRG9jU3Ry dWN0ICpnZXREb2NTdHJ1Y3QoKSB7IHJldHVybiBkb2NTdHJ1Y3Q7IH0KIAorICAgIHZvaWQgc2V0 WGltUG9zaXRpb24oIGludCB4LCBpbnQgeSwgaW50IHdpZHRoLCBpbnQgaGVpZ3RoICk7CisKIHB1 YmxpYyBzbG90czoKICAgICB2b2lkIHJlb3JnYW5pemUoKTsKIAo= --------------Boundary-00=_MQXC7BXTNFUOMP2HO98N-- _______________________________________________ Koffice-devel mailing list Koffice-devel@master.kde.org http://master.kde.org/mailman/listinfo/koffice-devel