From koffice-devel Mon Jul 26 11:39:16 2004 From: p.stirnweiss_koffice () bluewin ! ch Date: Mon, 26 Jul 2004 11:39:16 +0000 To: koffice-devel Subject: Re: Bug 76757 : modification of style manager Message-Id: <40F7A9ED0003BBB7 () mssbzhb-int ! msg ! bluewin ! ch> X-MARC-Message: https://marc.info/?l=koffice-devel&m=109084199826685 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--========/40F7A9ED0003BBB7/mssbzhb-int.msg.bluewin.ch" --========/40F7A9ED0003BBB7/mssbzhb-int.msg.bluewin.ch Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 8bit >-- Message original -- >From: Nicolas Goutte >To: For developer's discussion about KOffice >Date: Sun, 25 Jul 2004 15:54:46 +0200 >Subject: Re: Bug 76757 : modification of style manager >Reply-To: For developer's discussion about KOffice > > >On Sunday 25 July 2004 15:41, p.stirnweiss_koffice@bluewin.ch wrote: >> >-- Message original -- >> >> From: Nicolas Goutte >> >> >To: For developer's discussion about KOffice >> >Date: Sun, 25 Jul 2004 14:52:42 +0200 >> >Subject: Re: Bug 76757 : modification of style manager >> >Reply-To: For developer's discussion about KOffice >> > >> > >> >On Sunday 25 July 2004 10:50, p.stirnweiss_koffice@bluewin.ch wrote: >> >> >-- Message original -- >> >> >> >> From: Nicolas Goutte >> >> >> >> >To: For developer's discussion about KOffice >> >> > Date: Sat, 24 Jul 2004 23:36:52 +0200 >> >> >Subject: Re: Bug 76757 : modification of style manager >> >> >Reply-To: For developer's discussion about KOffice >> >> > >> >> > >> >> >On Saturday 24 July 2004 19:07, p.stirnweiss_koffice@bluewin.ch wrote: >> >> >> Hi, I am starting to have a look at this one. >> >> >> I would like to change some stuff in the way the style manager is >> >> >> organised. Let me know your opinions on these ideas (I personaly >find >> >> >> >> them >> >> >> >> >> more logical, but it may not look the same to everybody): >> >> > >> >> >The problem of splitting dialogs is that it is only good if it is not >> > >> >done >> > >> >> >only in the stylist but also in each of the individual dialogs. >> >> > (Especially >> >> > >> >> >for the points 2 and 3 below.) >> > >> >I want to add to my comment here, that it is also important, as KWord >is >> > >> >supposed to get character styles soon and possibly the stylist dialog >> > should >> > >> >be modified having this idea in mind too. >> >> Wow, this seems to evolve way beyond my current level of understanding. >I >> am not sure it is Junior level anymore :). > >Well, I had always doubts about marking this bug as Junior Job due to the > >Stylist, but I did anyway. :-) > >To be serious again: I do not mean that you need to do it. I just want to >tell >that layout (paragraph formatting) and character formatting have to be kept > >separated due to this. (Image layout dialogs being greyed out for character > >styles.) > >> Anyway, I have a patch that only move the Font position to the Font effect >> tab. This solve the Format/Font dialog in 800x600 all together. And make >> the Style manager just a bit to big (height wise) but the buttons >> (OK,Cancel...) are now reachable. I do not know if this patch is >> interesting if the whole thing is going to have a face lift anyway. > >Fix the bug first. (As we have not too much developers, it always possible > >that the changes would be for after KOffice 1.4.) OK. Here is a patch (bug76757...dif) that transfers the Font position to the font effect tab. This reduces the height of the style manager. It is still a bit too big, but the buttons are reachable in 800x600 with the panel normal size. It also fixes the format/font dialog. In order to reduce the height of this dialog more, there are two tabs that need work : font effect (a bit) and mainly Indent and spacing. The format/paragraph is about the same (usable but a little bit big), this is also due to indent and spacing. Configure autocorrect seems allright to me, as well as configure Kword. So the bug is not entirely fixed but at least the dialog boxes are now usable. Once again, this is my second piece of programming so please make sure I have not broken anything. The software compiles, and the functionality seems to work OK (both in style manager and in individual format font dialog). > >> >(...) >> >> >> 2. Create a "Paragraph flow" tab (better name welcome) that would >> >> >> group >> >> >> >> >> >> General/Next style (perhaps renamed to Style of next paragraph), >> >> >> Font/Font Effect/Language and Hyphenation. >> >> > >> >> >No! >> >> > >> >> >General/Next style is at layout level (layout == paragraph formating) >> >> > >> >> >But font effect, language and hypenation are charcter properties. >> >> >> >> I did not want to move font effect, just the langage and hyphenation >(I >> >> was indicating the path, but I see now that it was not very clear) and >> > >> >the >> > >> >> next style. >> >> >> >> >> >> I agree that langages are not always used at the whole paragraph and >can >> >> be used at a word level. However, I don't agree it is a character >> >> property. The minimum item you will give a langage property is a word >> >> and most of the time it is set for paragraphs. In order to set it for >an >> >> individual word we might need to add a langage sub-menu in the format >> >> menu. I would definitly not expect to find the langage setting in Fonts. >> > >> >But it is a character property. If you want it word-wise you cannot have >> >it >> >paragraph-wise. A property can be at paragraph level or at character >> > level. >> > >> >That is all. (That perhaps "font" is a bad title is perhaps another >> > problem.) >> >> OK. I understand the problem now. (Sorry to be a bit slow but I just >> started to have a look at Koffice and programming in general). I will give >> a thorough thinking (yes, with the proper fuel, I can do this :) ). I still >> think that there is a way to accomodate the programming constraints and >> still have something logical on the user perspective. > >Yes, of course, I suppose that the user interface could be improved. I just > >wanted to tell that we have constraints so that we cannot mix the properties > >freely (because otherwise users would not understand anymore what is only >paragraph-level only and what can be done at character-level too.) > >> >(...) >> > >> >> >> Pierre >> > >> >Have a nice day! >(...) > The second patch is to have a longer sentence (that uses more than two lines) to show the indent and spacing of the style. If we need something more serious, let me know. I would also like to display a paragraph in front of it with standard formating and one after with the "next style" applied but there is a problem with the bullet/number preview. >_______________________________________________ >koffice-devel mailing list >koffice-devel@mail.kde.org >https://mail.kde.org/mailman/listinfo/koffice-devel --========/40F7A9ED0003BBB7/mssbzhb-int.msg.bluewin.ch Content-Type: text/x-diff Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="Patch stylist_longer_preview_phrase.diff" SW5kZXg6IGtvU3R5bGlzdC5jYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGVjdnMva2Rl L2tvZmZpY2UvbGliL2tvdGV4dC9rb1N0eWxpc3QuY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu NTYKZGlmZiAtdSAtMyAtcCAtdSAtcCAtcjEuNTYga29TdHlsaXN0LmNjCi0tLSBrb1N0eWxpc3Qu Y2MJMjMgSnVsIDIwMDQgMTU6MTU6NTEgLTAwMDAJMS41NgorKysga29TdHlsaXN0LmNjCTI2IEp1 bCAyMDA0IDA5OjUwOjAzIC0wMDAwCkBAIC0yMjcsNyArMjI3LDcgQEAgdm9pZCBLb1N0eWxlTWFu YWdlcjo6YWRkR2VuZXJhbFRhYiggaW50IAogICAgICAgICBkLT5jYkluY2x1ZGVJblRPQyA9IDA7 CiAgICAgfQogCi0gICAgZC0+cHJldmlldyA9IG5ldyBLb1N0eWxlUHJldmlldyggaTE4biggIlBy ZXZpZXciICksIGkxOG4oICJUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkg ZG9nIiApLCB0YWIsICJzdHlsZXByZXZpZXciICk7CisgICAgZC0+cHJldmlldyA9IG5ldyBLb1N0 eWxlUHJldmlldyggaTE4biggIlByZXZpZXciICksIGkxOG4oICJUaGUgcXVpY2sgYnJvd24gZm94 IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBBbmQsIHdoYXQgYWJvdXQgdGhlIGNhdCwgb25lIG1h eSBhc2s/IFdlbGwsIHRoZSBjYXQgaXMgcGxheWluZyBjYXJkcyB3aXRoIHRoZSBtb3VzZSwgdGhl IGJpcmQgYW5kIHRoZSBmaXNoLiBJdCBpcywgdG8gc2F5IHRoZSBsZWFzdCBhIGhlbGwgb2YgYSBw YXJ0eSEiICksIHRhYiwgInN0eWxlcHJldmlldyIgKTsKIAogICAgIHRhYkxheW91dC0+YWRkTXVs dGlDZWxsV2lkZ2V0KCBkLT5wcmV2aWV3LCByb3csIHJvdywgMCwgMSApOwogCg== --========/40F7A9ED0003BBB7/mssbzhb-int.msg.bluewin.ch Content-Type: text/x-diff Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="bug76757_stylemgr+font.diff" SW5kZXg6IGtvRm9udERpYS5jYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGVjdnMva2Rl L2tvZmZpY2UvbGliL2tvdGV4dC9rb0ZvbnREaWEuY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu NTQKZGlmZiAtdSAtMyAtcCAtdSAtcCAtcjEuNTQga29Gb250RGlhLmNjCi0tLSBrb0ZvbnREaWEu Y2MJOSBNYXkgMjAwNCAxNzoxNjo1OSAtMDAwMAkxLjU0CisrKyBrb0ZvbnREaWEuY2MJMjYgSnVs IDIwMDQgMDk6NTA6MDMgLTAwMDAKQEAgLTM1MCw4ICszNTAsOCBAQCBLb0ZvbnRDaG9vc2VyOjpL b0ZvbnRDaG9vc2VyKCBRV2lkZ2V0KiBwCiAgICAgOiBRVGFiV2lkZ2V0KCBwYXJlbnQsIG5hbWUg KQogewogICAgIGQgPSBuZXcgS29Gb250Q2hvb3NlclByaXZhdGU7Ci0gICAgc2V0dXBUYWIxKF93 aXRoU3ViU3VwZXJTY3JpcHQsIGZvbnRMaXN0Q3JpdGVyaWEgKTsKLSAgICBzZXR1cFRhYjIoKTsK KyAgICBzZXR1cFRhYjEoIGZvbnRMaXN0Q3JpdGVyaWEgKTsKKyAgICBzZXR1cFRhYjIoIF93aXRo U3ViU3VwZXJTY3JpcHQgKTsKICAgICAvLyBNb3JlIG1vZHVsYXIgc29sdXRpb246IG9uZSB3aWRn ZXQgcGVyIHRhYi4uLi4KICAgICBkLT5tX3NoYWRvd1dpZGdldCA9IG5ldyBLb1RleHRTaGFkb3dX aWRnZXQoIHRoaXMgKTsKICAgICBjb25uZWN0KCBkLT5tX3NoYWRvd1dpZGdldCwgU0lHTkFMKGNo YW5nZWQoKSksIHRoaXMsIFNMT1Qoc2xvdFNoYWRvd0NoYW5nZWQoKSkgKTsKQEAgLTM2OSw3ICsz NjksNyBAQCBRQ29sb3IgS29Gb250Q2hvb3Nlcjo6Y29sb3IoKSBjb25zdAogICAgIHJldHVybiBk LT5tX3RleHRDb2xvcjsKIH0KIAotdm9pZCBLb0ZvbnRDaG9vc2VyOjpzZXR1cFRhYjEoYm9vbCBf d2l0aFN1YlN1cGVyU2NyaXB0LCB1aW50IGZvbnRMaXN0Q3JpdGVyaWEgKQordm9pZCBLb0ZvbnRD aG9vc2VyOjpzZXR1cFRhYjEoIHVpbnQgZm9udExpc3RDcml0ZXJpYSApCiB7CiAgICAgUVdpZGdl dCAqcGFnZSA9IG5ldyBRV2lkZ2V0KCB0aGlzICk7CiAgICAgYWRkVGFiKCBwYWdlLCBpMThuKCAi JkZvbnRzIiApICk7CkBAIC0zNzksNTEgKzM3OSw2IEBAIHZvaWQgS29Gb250Q2hvb3Nlcjo6c2V0 dXBUYWIxKGJvb2wgX3dpdGgKICAgICBtX2Nob29zZUZvbnQgPSBuZXcgS0ZvbnRDaG9vc2VyKHBh Z2UsICJGb250TGlzdCIsIGZhbHNlLCBsaXN0KTsKICAgICBsYXkxLT5hZGRXaWRnZXQobV9jaG9v c2VGb250KTsKIAotICAgIFFWR3JvdXBCb3ggKmdycCA9IG5ldyBRVkdyb3VwQm94KGkxOG4oIlBv c2l0aW9uIiksIHBhZ2UpOwotICAgIGxheTEtPmFkZFdpZGdldChncnApOwotICAgIFFXaWRnZXQq IGdycEJveCA9IG5ldyBRV2lkZ2V0KCBncnAgKTsgLy8gY29udGFpbmVyIGZvciB0aGUgZ3JpZCAt IGxhaWQgb3V0IGluc2lkZSB0aGUgUVZHcm91cEJveAotICAgIFFHcmlkTGF5b3V0ICpncmlkID0g bmV3IFFHcmlkTGF5b3V0KCBncnBCb3gsIDIsIDMsIDAsIEtEaWFsb2c6OnNwYWNpbmdIaW50KCkg KTsKLSAgICBncmlkLT5zZXRDb2xTdHJldGNoKCAxLCAxICk7IC8vIGJldHRlciBzdHJldGNoIGxh YmVscyB0aGFuIHNwaW5ib3hlcy4KLQotICAgIC8vIHN1cGVyc2NyaXB0L3N1YnNjcmlwdCBuZWVk IHRvIGJlIGNoZWNrYm94ZXMsIG5vdCByYWRpb2J1dHRvbnMuCi0gICAgLy8gb3RoZXJ3aXNlIGl0 J3Mgbm90IHBvc3NpYmxlIHRvIGRpc2FibGUgYm90aCwgYW5kIHRoZXJlJ3Mgbm8gcm9vbSBmb3Ig YSAzcmQgb25lIGxpa2UgJ25vbmUnCi0gICAgbV9zdXBlclNjcmlwdCA9IG5ldyBRQ2hlY2tCb3go aTE4bigiU3UmcGVyc2NyaXB0IiksZ3JwQm94KTsKLSAgICBncmlkLT5hZGRXaWRnZXQobV9zdXBl clNjcmlwdCwwLDApOwotCi0gICAgbV9zdWJTY3JpcHQgPSBuZXcgUUNoZWNrQm94KGkxOG4oIlN1 JmJzY3JpcHQiKSxncnBCb3gpOwotICAgIGdyaWQtPmFkZFdpZGdldChtX3N1YlNjcmlwdCwxLDAp OwotCi0gICAgZC0+bV9sUmVsYXRpdmVTaXplID0gbmV3IFFMYWJlbCAoIGkxOG4oIlJlbGF0aXZl ICZzaXplOiIpLCBncnBCb3gpOwotICAgIGQtPm1fbFJlbGF0aXZlU2l6ZS0+c2V0QWxpZ25tZW50 KCBRdDo6QWxpZ25SaWdodCApOwotICAgIGdyaWQtPmFkZFdpZGdldChkLT5tX2xSZWxhdGl2ZVNp emUsMCwxKTsKLQotICAgIC8vICMjIEhvdyB0byBtYWtlIHRoaXMgd2lkZ2V0IHNtYWxsZXI/IFNv dW5kcyBsaWtlIHRoZSBbbWluaW11bV1zaXplSGludCBmb3IgS0ludE51bUlucHV0IGlzIGJpZy4u LgotICAgIGQtPm1fcmVsYXRpdmVTaXplID0gbmV3IEtJbnROdW1JbnB1dCggZ3JwQm94ICk7Ci0g ICAgZC0+bV9sUmVsYXRpdmVTaXplLT5zZXRCdWRkeSggZC0+bV9yZWxhdGl2ZVNpemUgKTsKLSAg ICBncmlkLT5hZGRXaWRnZXQoZC0+bV9yZWxhdGl2ZVNpemUsMCwyKTsKLQotICAgIGQtPm1fcmVs YXRpdmVTaXplLT4gc2V0UmFuZ2UoMSwgMTAwLCAxLGZhbHNlKTsKLSAgICBkLT5tX3JlbGF0aXZl U2l6ZS0+c2V0U3VmZml4KCIlIik7Ci0KLSAgICBRTGFiZWwgKmxhYiA9IG5ldyBRTGFiZWwgKCBp MThuKCJPZmZzZSZ0IGZyb20gYmFzZWxpbmU6IiksIGdycEJveCk7Ci0gICAgbGFiLT5zZXRBbGln bm1lbnQoIFF0OjpBbGlnblJpZ2h0ICk7Ci0gICAgZ3JpZC0+YWRkV2lkZ2V0KGxhYiwxLDEpOwot Ci0gICAgZC0+bV9vZmZzZXRCYXNlTGluZT0gbmV3IEtJbnROdW1JbnB1dCggZ3JwQm94ICk7Ci0g ICAgbGFiLT5zZXRCdWRkeSggZC0+bV9vZmZzZXRCYXNlTGluZSApOwotICAgIGdyaWQtPmFkZFdp ZGdldChkLT5tX29mZnNldEJhc2VMaW5lLDEsMik7Ci0KLSAgICBkLT5tX29mZnNldEJhc2VMaW5l LT5zZXRSYW5nZSgtOSwgOSwgMSxmYWxzZSk7Ci0gICAgZC0+bV9vZmZzZXRCYXNlTGluZS0+c2V0 U3VmZml4KCJwdCIpOwotCi0gICAgaWYoIV93aXRoU3ViU3VwZXJTY3JpcHQpCi0gICAgewotICAg ICAgICBtX3N1YlNjcmlwdC0+c2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgICAgIG1fc3VwZXJTY3Jp cHQtPnNldEVuYWJsZWQoZmFsc2UpOwotICAgICAgICBkLT5tX3JlbGF0aXZlU2l6ZS0+ c2V0RW5hYmxlZCggZmFsc2UgKTsKLSAgICAgICAgZC0+bV9sUmVsYXRpdmVTaXplLT5zZXRFbmFi bGVkKCBmYWxzZSApOwotICAgIH0KLQogICAgIFFIR3JvdXBCb3gqIGNvbG9yc0dycCA9IG5ldyBR SEdyb3VwQm94KGkxOG4oIkNvbG9ycyIpLCBwYWdlKTsKICAgICBsYXkxLT5hZGRXaWRnZXQoY29s b3JzR3JwKTsKICAgICAvL2dyaWQgPSBuZXcgUUdyaWRMYXlvdXQoIGNvbG9yc0dycCwgMiwgMiwg S0RpYWxvZzo6bWFyZ2luSGludCgpLCBLRGlhbG9nOjpzcGFjaW5nSGludCgpICk7CkBAIC00MzMs OCArMzg4LDYgQEAgdm9pZCBLb0ZvbnRDaG9vc2VyOjpzZXR1cFRhYjEoYm9vbCBfd2l0aAogICAg IG1fYmFja0dyb3VuZENvbG9yQnV0dG9uID0gbmV3IFFQdXNoQnV0dG9uKCBpMThuKCAiQ2hhbmdl IEJhYyZrZ3JvdW5kIENvbG9yLi4uIiApLCBjb2xvcnNHcnAgKTsKICAgICAvL2dyaWQtPmFkZFdp ZGdldChtX2JhY2tHcm91bmRDb2xvckJ1dHRvbiwwLDEpOwogCi0gICAgY29ubmVjdCggbV9zdWJT Y3JpcHQsIFNJR05BTChjbGlja2VkKCkpLCB0aGlzLCBTTE9UKCBzbG90U3ViU2NyaXB0Q2xpY2tl ZCgpICkgKTsKLSAgICBjb25uZWN0KCBtX3N1cGVyU2NyaXB0LCBTSUdOQUwoY2xpY2tlZCgpKSwg dGhpcywgU0xPVCggc2xvdFN1cGVyU2NyaXB0Q2xpY2tlZCgpICkgKTsKICAgICBjb25uZWN0KCBt X2NvbG9yQnV0dG9uLCBTSUdOQUwoY2xpY2tlZCgpKSwgdGhpcywgU0xPVCggc2xvdENoYW5nZUNv bG9yKCkgKSApOwogCiAgICAgY29ubmVjdCggbV9iYWNrR3JvdW5kQ29sb3JCdXR0b24sICBTSUdO QUwoY2xpY2tlZCgpKSwgdGhpcywgU0xPVCggc2xvdENoYW5nZUJhY2tHcm91bmRDb2xvcigpICkg KTsKQEAgLTQ0MiwxNCArMzk1LDkgQEAgdm9pZCBLb0ZvbnRDaG9vc2VyOjpzZXR1cFRhYjEoYm9v bCBfd2l0aAogICAgIGNvbm5lY3QoIG1fY2hvb3NlRm9udCwgU0lHTkFMKCBmb250U2VsZWN0ZWQo IGNvbnN0IFFGb250ICYgKSksCiAgICAgICAgICAgICAgdGhpcywgU0xPVCggc2xvdEZvbnRDaGFu Z2VkKGNvbnN0IFFGb250ICYpICkgKTsKIAotICAgIGNvbm5lY3QoIGQtPm1fcmVsYXRpdmVTaXpl LCBTSUdOQUwoIHZhbHVlQ2hhbmdlZChpbnQpICksIHRoaXMsIFNMT1QoIHNsb3RSZWxhdGl2ZVNp emVDaGFuZ2VkKCBpbnQgKSkpOwotICAgIGNvbm5lY3QoIGQtPm1fb2Zmc2V0QmFzZUxpbmUsIFNJ R05BTCggdmFsdWVDaGFuZ2VkKGludCkgKSwgdGhpcywgU0xPVCggc2xvdE9mZnNldEZyb21CYXNl TGluZUNoYW5nZWQoIGludCApKSk7Ci0KLSAgICB1cGRhdGVQb3NpdGlvbkJ1dHRvbigpOwotCiB9 CiAKLXZvaWQgS29Gb250Q2hvb3Nlcjo6c2V0dXBUYWIyKCkKK3ZvaWQgS29Gb250Q2hvb3Nlcjo6 c2V0dXBUYWIyKCBib29sIF93aXRoU3ViU3VwZXJTY3JpcHQgKQogewogICAgIFFXaWRnZXQgKnBh Z2UgPSBuZXcgUVdpZGdldCggdGhpcyApOwogICAgIGFkZFRhYiggcGFnZSwgaTE4biggIkZvbnQg JkVmZmVjdHMiICkgKTsKQEAgLTQ5Myw3ICs0NDEsNTMgQEAgdm9pZCBLb0ZvbnRDaG9vc2VyOjpz ZXR1cFRhYjIoKQogICAgIG1fc3RyaWtlT3V0VHlwZS0+aW5zZXJ0U3RyaW5nTGlzdCggS29UZXh0 Rm9ybWF0OjpzdHJpa2VPdXRTdHlsZUxpc3QoKSApOwogCiAgICAgZC0+bV93b3JkQnlXb3JkID0g bmV3IFFDaGVja0JveCggaTE4bigiJldvcmQgYnkgd29yZCIpLCBncnApOwotICAgIGdyaWQtPmFk ZFdpZGdldCggZC0+bV93b3JkQnlXb3JkLCA1LCAwKTsKKyAgICBncmlkLT5hZGRXaWRnZXQoIGQt Pm1fd29yZEJ5V29yZCwgNCwgMCk7CisgICAgICAgCisgICAgUVZHcm91cEJveCAqZ3JwMSA9IG5l dyBRVkdyb3VwQm94KGkxOG4oIlBvc2l0aW9uIiksIHBhZ2UpOworICAgIGdyaWQtPmFkZE11bHRp Q2VsbFdpZGdldCggZ3JwMSwgNSwgNSwgMCwgZ3JpZC0+bnVtQ29scygpLTEgKTsKKyAgICBRV2lk Z2V0KiBncnBCb3ggPSBuZXcgUVdpZGdldCggZ3JwMSApOyAvLyBjb250YWluZXIgZm9yIHRoZSBn cmlkIC0gbGFpZCBvdXQgaW5zaWRlIHRoZSBRVkdyb3VwQm94CisgICAgUUdyaWRMYXlvdXQgKmdy aWQxID0gbmV3IFFHcmlkTGF5b3V0KCBncnBCb3gsIDIsIDMsIDAsIEtEaWFsb2c6OnNwYWNpbmdI aW50KCkgKTsKKyAgICBncmlkMS0+c2V0Q29sU3RyZXRjaCggMSwgMSApOyAvLyBiZXR0ZXIgc3Ry ZXRjaCBsYWJlbHMgdGhhbiBzcGluYm94ZXMuCisKKyAgICAvLyBzdXBlcnNjcmlwdC9zdWJzY3Jp cHQgbmVlZCB0byBiZSBjaGVja2JveGVzLCBub3QgcmFkaW9idXR0b25zLgorICAgIC8vIG90aGVy d2lzZSBpdCdzIG5vdCBwb3NzaWJsZSB0byBkaXNhYmxlIGJvdGgsIGFuZCB0aGVyZSdzIG5vIHJv b20gZm9yIGEgM3JkIG9uZSBsaWtlICdub25lJworICAgIG1fc3VwZXJTY3JpcHQgPSBuZXcgUUNo ZWNrQm94KGkxOG4oIlN1JnBlcnNjcmlwdCIpLGdycEJveCk7CisgICAgZ3JpZDEtPmFkZFdpZGdl dChtX3N1cGVyU2NyaXB0LDAsMCk7CisKKyAgICBtX3N1YlNjcmlwdCA9IG5ldyBRQ2hlY2tCb3go aTE4bigiU3UmYnNjcmlwdCIpLGdycEJveCk7CisgICAgZ3JpZDEtPmFkZFdpZGdldChtX3N1YlNj cmlwdCwxLDApOworCisgICAgZC0+bV9sUmVsYXRpdmVTaXplID0gbmV3IFFMYWJlbCAoIGkxOG4o IlJlbGF0aXZlICZzaXplOiIpLCBncnBCb3gpOworICAgIGQtPm1fbFJlbGF0aXZlU2l6ZS0+c2V0 QWxpZ25tZW50KCBRdDo6QWxpZ25SaWdodCApOworICAgIGdyaWQxLT5hZGRXaWRnZXQoZC0+bV9s UmVsYXRpdmVTaXplLDAsMSk7CisKKyAgICAvLyAjIyBIb3cgdG8gbWFrZSB0aGlzIHdpZGdldCBz bWFsbGVyPyBTb3VuZHMgbGlrZSB0aGUgW21pbmltdW1dc2l6ZUhpbnQgZm9yIEtJbnROdW1JbnB1 dCBpcyBiaWcuLi4KKyAgICBkLT5tX3JlbGF0aXZlU2l6ZSA9IG5ldyBLSW50TnVtSW5wdXQoIGdy cEJveCApOworICAgIGQtPm1fbFJlbGF0aXZlU2l6ZS0+c2V0QnVkZHkoIGQtPm1fcmVsYXRpdmVT aXplICk7CisgICAgZ3JpZDEtPmFkZFdpZGdldChkLT5tX3JlbGF0aXZlU2l6ZSwwLDIpOworCisg ICAgZC0+bV9yZWxhdGl2ZVNpemUtPiBzZXRSYW5nZSgxLCAxMDAsIDEsZmFsc2UpOwor ICAgIGQtPm1fcmVsYXRpdmVTaXplLT5zZXRTdWZmaXgoIiUiKTsKKworICAgIFFMYWJlbCAqbGFi NSA9IG5ldyBRTGFiZWwgKCBpMThuKCJPZmZzZSZ0IGZyb20gYmFzZWxpbmU6IiksIGdycEJveCk7 CisgICAgbGFiNS0+c2V0QWxpZ25tZW50KCBRdDo6QWxpZ25SaWdodCApOworICAgIGdyaWQxLT5h ZGRXaWRnZXQobGFiNSwxLDEpOworCisgICAgZC0+bV9vZmZzZXRCYXNlTGluZT0gbmV3IEtJbnRO dW1JbnB1dCggZ3JwQm94ICk7CisgICAgbGFiNS0+c2V0QnVkZHkoIGQtPm1fb2Zmc2V0QmFzZUxp bmUgKTsKKyAgICBncmlkMS0+YWRkV2lkZ2V0KGQtPm1fb2Zmc2V0QmFzZUxpbmUsMSwyKTsKKwor ICAgIGQtPm1fb2Zmc2V0QmFzZUxpbmUtPnNldFJhbmdlKC05LCA5LCAxLGZhbHNlKTsKKyAgICBk LT5tX29mZnNldEJhc2VMaW5lLT5zZXRTdWZmaXgoInB0Iik7CisKKyAgICBpZighX3dpdGhTdWJT dXBlclNjcmlwdCkKKyAgICB7CisgICAgICAgIG1fc3ViU2NyaXB0LT5zZXRFbmFibGVkKGZhbHNl KTsKKyAgICAgICAgbV9zdXBlclNjcmlwdC0+c2V0RW5hYmxlZChmYWxzZSk7CisgICAgICAgIGQt Pm1fcmVsYXRpdmVTaXplLT5zZXRFbmFibGVkKCBmYWxzZSApOworICAgICAgICBkLT5tX2xSZWxh dGl2ZVNpemUtPnNldEVuYWJsZWQoIGZhbHNlICk7CisgICAgfQorICAgIAogCiAjaWZkZWYgQVRU UkNPTUJPCiAgICAgUUxhYmVsICogbGFiMyA9IG5ldyBRTGFiZWwoIGkxOG4oIkEmdHRyaWJ1dGU6 IiksIGdycCk7CkBAIC01MzgsNiArNTMyLDE0IEBAIHZvaWQgS29Gb250Q2hvb3Nlcjo6c2V0dXBU YWIyKCkKICAgICBjb25uZWN0KCBkLT5tX3dvcmRCeVdvcmQsIFNJR05BTChjbGlja2VkKCkpLCB0 aGlzLCBTTE9UKCBzbG90V29yZEJ5V29yZENsaWNrZWQoKSApICk7CiAgICAgY29ubmVjdCggZC0+ bV9sYW5ndWFnZSwgIFNJR05BTCggYWN0aXZhdGVkICggaW50ICApICksIHRoaXMsIFNMT1QoIHNs b3RDaGFuZ2VMYW5ndWFnZSggaW50ICkpKTsKICAgICBjb25uZWN0KCBkLT5tX2h5cGhlbmF0aW9u LCBTSUdOQUwoIGNsaWNrZWQoKSksIHRoaXMsIFNMT1QoIHNsb3RIeXBoZW5hdGlvbkNsaWNrZWQo KSkpOworICAgIGNvbm5lY3QoIG1fc3ViU2NyaXB0LCBTSUdOQUwoY2xpY2tlZCgpKSwgdGhpcywg U0xPVCggc2xvdFN1YlNjcmlwdENsaWNrZWQoKSApICk7CisgICAgY29ubmVjdCggbV9zdXBlclNj cmlwdCwgU0lHTkFMKGNsaWNrZWQoKSksIHRoaXMsIFNMT1QoIHNsb3RTdXBlclNjcmlwdENsaWNr ZWQoKSApICk7CisgICAgY29ubmVjdCggZC0+bV9yZWxhdGl2ZVNpemUsIFNJR05BTCggdmFsdWVD aGFuZ2VkKGludCkgKSwgdGhpcywgU0xPVCggc2xvdFJlbGF0aXZlU2l6ZUNoYW5nZWQoIGludCAp KSk7CisgICAgY29ubmVjdCggZC0+bV9vZmZzZXRCYXNlTGluZSwgU0lHTkFMKCB2YWx1ZUNoYW5n ZWQoaW50KSApLCB0aGlzLCBTTE9UKCBzbG90T2Zmc2V0RnJvbUJhc2VMaW5lQ2hhbmdlZCggaW50 ICkpKTsKKworICAgIHVwZGF0ZVBvc2l0aW9uQnV0dG9uKCk7CisKKwogfQogCiB2b2lkIEtvRm9u dENob29zZXI6OnVwZGF0ZVBvc2l0aW9uQnV0dG9uKCkKSW5kZXg6IGtvRm9udERpYS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZWN2cy9rZGUva29mZmljZS9saWIva290ZXh0L2tvRm9u dERpYS5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjI1CmRpZmYgLXUgLTMgLXAgLXUgLXAgLXIx LjI1IGtvRm9udERpYS5oCi0tLSBrb0ZvbnREaWEuaAkxOCBNYXIgMjAwNCAxNjo0NDozMCAtMDAw MAkxLjI1CisrKyBrb0ZvbnREaWEuaAkyNiBKdWwgMjAwNCAwOTo1MDowMyAtMDAwMApAQCAtMTA4 LDggKzEwOCw4IEBAIHByb3RlY3RlZDoKICAgICBpbnQgb2Zmc2V0RnJvbUJhc2VMaW5lKCkgY29u c3Q7CiAgICAgdm9pZCBzZXRPZmZzZXRGcm9tQmFzZUxpbmUoaW50IF9vZmZzZXQpOwogCi0gICAg dm9pZCBzZXR1cFRhYjEoYm9vbCBfd2l0aFN1YlN1cGVyU2NyaXB0LCB1aW50IGZvbnRMaXN0Q3Jp dGVyaWEgKTsKLSAgICB2b2lkIHNldHVwVGFiMigpOworICAgIHZvaWQgc2V0dXBUYWIxKCB1aW50 IGZvbnRMaXN0Q3JpdGVyaWEgKTsKKyAgICB2b2lkIHNldHVwVGFiMiggYm9vbCBfd2l0aFN1YlN1 cGVyU2NyaXB0ICk7CiAgICAgdm9pZCB1cGRhdGVQb3NpdGlvbkJ1dHRvbigpOwogCiBwcm90ZWN0 ZWQgc2xvdHM6Cg== --========/40F7A9ED0003BBB7/mssbzhb-int.msg.bluewin.ch Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ koffice-devel mailing list koffice-devel@mail.kde.org https://mail.kde.org/mailman/listinfo/koffice-devel --========/40F7A9ED0003BBB7/mssbzhb-int.msg.bluewin.ch--