--------------Boundary-00=_M8W8SZ8UYYVCNXN7H0E9
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit

Hi

On Wednesday 27 February 2002 21:08, David Faure wrote:
> On Wednesday 27 February 2002 19:29, Krister Wicksell Eriksson wrote:
> > Hi
> >
> > Wanted to learn some of the kword code so I have started trying to
> > implement line break (shift+enter) cause that is a thing I really miss in
> > kword.
> >
> > Have attached a patch that I be happy if someone could take a look at and
> > give some feedback.
>
> Wow! This is really great job. I'm amazed, you seem to have grasped the
> text formatter quickly, as complex as it is ;)))
>
> I like the formatting-chars drawing change very much. The UI part is fine
> too, no problem.
>
> I'm surprised by the patch to the formatter though. It's already supposed
> to have support for line breaks, by using the character '\n' in the string
> (and enabling something like setAllowNewLine() in paragraphs). This comes
> from the original Qt classes, and was never tested/used in KWord. Did you
> try it out and determined you'd prefer writing separate code for this, or
> did you miss that code ? If it works and it's the same functionality, I'd
> rather use it than add special support for 0x0b with its own code.

Have rewritten my patch with setNewLinesAllowed(TRUE) and'\n' insted. Don't 
know if this is any better. Had to change QTextParag::paint() so it now sends 
'\n' to drawParagString(), if not there is no way (at least that I know of) 
to know where to draw the line breaks in drawFormattingChars(). The thing is 
if there are only a line break on a line no char from that line i sent to 
drawFormattingChars().

>
> David, really glad to see more and more KWord contributions coming in ;)

Hope this mail will reach the list...got a return on the last mail I sent 
saying that it had to be approved by a moderator cause I was not on the 
list...but I am.

/Krister

-- 
krister.wicksell@spray.se
http://hem.spray.se/krister.wicksell/
--------------Boundary-00=_M8W8SZ8UYYVCNXN7H0E9
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="koffice-20020228.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="koffice-20020228.patch"

SW5kZXg6IGt3b3JkL2t3dGV4dHBhcmFnLmNjCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tk
ZS9rb2ZmaWNlL2t3b3JkL2t3dGV4dHBhcmFnLmNjLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE4
OQpkaWZmIC11IC0zIC1wIC11IC1yMS4xODkga3d0ZXh0cGFyYWcuY2MKLS0tIGt3b3JkL2t3dGV4
dHBhcmFnLmNjCTIwMDIvMDIvMjAgMTM6NTg6MTUJMS4xODkKKysrIGt3b3JkL2t3dGV4dHBhcmFn
LmNjCTIwMDIvMDIvMjggMTI6NDY6MTMKQEAgLTgxLDE5ICs4MSwxOSBAQCB2b2lkIEtXVGV4dFBh
cmFnOjpkcmF3Rm9ybWF0dGluZ0NoYXJzKCBRCiAgICAgICAgICAgICAgICAgICAgIEtvVGV4dEZv
cm1hdCogZm9ybWF0ID0gc3RhdGljX2Nhc3Q8S29UZXh0Rm9ybWF0ICo+KCBhdCggbGVuZ3RoKCkg
LSAxICktPmZvcm1hdCgpICk7CiAgICAgICAgICAgICAgICAgICAgIGludCB3ID0gZm9ybWF0LT5z
Y3JlZW5Gb250TWV0cmljcyh6aCkud2lkdGgoJ3gnKTsgLy8gc2VlIEtXVGV4dEZyYW1lU2V0Ojpm
b3JtYXRWZXJ0aWNhbGx5CiAgICAgICAgICAgICAgICAgICAgIGludCBzaXplID0gUU1JTiggdywg
aF9waXggKiAzIC8gNCApOwotICAgICAgICAgICAgICAgICAgICBpbnQgYXJyb3dzaXplID0gemgt
Pnpvb21JdFkoIDIgKTsKLSAgICAgICAgICAgICAgICAgICAgLy8geCx5IGlzIHRoZSBib3R0b20g
cmlnaHQgY29ybmVyIG9mIHRoZSByZXZlcnNlZCBMCisgICAgICAgICAgICAgICAgICAgIC8vIHgs
eSBpcyB0aGUgYm90dG9tIHJpZ2h0IGNvcm5lciBvZiB0aGUgtgogICAgICAgICAgICAgICAgICAg
ICAvL2tkRGVidWcoKSA8PCAic3RhcnRYPSIgPDwgc3RhcnRYIDw8ICIgYnc9IiA8PCBidyA8PCAi
IHc9IiA8PCB3IDw8IGVuZGw7CiAgICAgICAgICAgICAgICAgICAgIGludCB4ID0gKCBzdGFydFhf
cGl4ICsgYncgKSArIHcgLSAxOwotICAgICAgICAgICAgICAgICAgICBpbnQgeSA9IGxhc3RZX3Bp
eCArIGJhc2VMaW5lX3BpeCAtIGFycm93c2l6ZTsKKyAgICAgICAgICAgICAgICAgICAgaW50IHkg
PSBsYXN0WV9waXggKyBiYXNlTGluZV9waXg7CiAgICAgICAgICAgICAgICAgICAgIC8va2REZWJ1
ZygpIDw8ICJLV1RleHRQYXJhZzo6ZHJhd0Zvcm1hdHRpbmdDaGFycyBkcmF3aW5nIENSIGF0ICIg
PDwgeCA8PCAiLCIgPDwgeSA8PCBlbmRsOwotICAgICAgICAgICAgICAgICAgICBwYWludGVyLmRy
YXdMaW5lKCB4LCB5IC0gc2l6ZSwgeCwgeSApOwotICAgICAgICAgICAgICAgICAgICBwYWludGVy
LmRyYXdMaW5lKCB4LCB5LCB4IC0gc2l6ZSwgeSApOwotICAgICAgICAgICAgICAgICAgICAvLyBO
b3cgdGhlIGFycm93Ci0gICAgICAgICAgICAgICAgICAgIHBhaW50ZXIuZHJhd0xpbmUoIHggLSBz
aXplLCB5LCB4IC0gc2l6ZSArIGFycm93c2l6ZSwgeSAtIGFycm93c2l6ZSApOwotICAgICAgICAg
ICAgICAgICAgICBwYWludGVyLmRyYXdMaW5lKCB4IC0gc2l6ZSwgeSwgeCAtIHNpemUgKyBhcnJv
d3NpemUsIHkgKyBhcnJvd3NpemUgKTsKKyAgICAgICAgICAgICAgICAgICAgcGFpbnRlci5kcmF3
TGluZSggKGludCkoeCAtIHNpemUgKiAwLjIpLCB5IC0gc2l6ZSwgKGludCkoeCAtIHNpemUgKiAw
LjIpLCB5ICk7CisgICAgICAgICAgICAgICAgICAgIHBhaW50ZXIuZHJhd0xpbmUoIChpbnQpKHgg
LSBzaXplICogMC41KSwgeSAtIHNpemUsIChpbnQpKHggLSBzaXplICogMC41KSwgeSApOworICAg
ICAgICAgICAgICAgICAgICBwYWludGVyLmRyYXdMaW5lKCB4LCB5LCAoaW50KSh4IC0gc2l6ZSAq
IDAuNyksIHkgKTsKKyAgICAgICAgICAgICAgICAgICAgcGFpbnRlci5kcmF3TGluZSggeCwgeSAt
IHNpemUsIChpbnQpKHggLSBzaXplICogMC41KSwgeSAtIHNpemUpOworICAgICAgICAgICAgICAg
ICAgICBwYWludGVyLmRyYXdBcmMoIHggLSBzaXplLCB5IC0gc2l6ZSwgc2l6ZSwgKGludCkoc2l6
ZSAvIDIpLCAtOTAqMTYsIC0xODAqMTYgKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg
ICB9CisKICAgICAgICAgICAgIC8vIE5vdyBkcmF3IHNwYWNlcyBhbmQgdGFicwogICAgICAgICAg
ICAgaW50IGVuZCA9IFFNSU4oIHN0YXJ0ICsgbGVuLCBsZW5ndGgoKSAtIDEgKTsgLy8gZG9uJ3Qg
bG9vayBhdCB0aGUgdHJhaWxpbmcgc3BhY2UKICAgICAgICAgICAgIGZvciAoIGludCBpID0gc3Rh
cnQgOyBpIDwgZW5kIDsgKytpICkKQEAgLTEyMiwxMyArMTIyLDMzIEBAIHZvaWQgS1dUZXh0UGFy
YWc6OmRyYXdGb3JtYXR0aW5nQ2hhcnMoIFEKIAogICAgICAgICAgICAgICAgICAgICBpbnQgYXZh
aWxXaWR0aCA9IGNoLnBpeGVsd2lkdGg7CiAKKyAgICAgICAgICAgICAgICAgICAgS29UZXh0Rm9y
bWF0KiBmb3JtYXQgPSBzdGF0aWNfY2FzdDxLb1RleHRGb3JtYXQgKj4oIGNoLmZvcm1hdCgpICk7
CiAgICAgICAgICAgICAgICAgICAgIGludCB4ID0gemgtPmxheW91dFVuaXRUb1BpeGVsWCggY2gu
eCApICsgY2gucGl4ZWx4YWRqICsgYXZhaWxXaWR0aCAvIDI7Ci0gICAgICAgICAgICAgICAgICAg
IGludCBzaXplID0gUU1JTiggYXZhaWxXaWR0aCx6aC0+bGF5b3V0VW5pdFRvUGl4ZWxYKGNoLmZv
cm1hdCgpLT53aWR0aCgnVycpKSApIC8gMiA7IC8vIGFjdHVhbGx5IHRoZSBoYWxmIHNpemUKKyAg
ICAgICAgICAgICAgICAgICAgaW50IHNpemUgPSBRTUlOKCBhdmFpbFdpZHRoLGZvcm1hdC0+c2Ny
ZWVuRm9udE1ldHJpY3MoemgpLndpZHRoKCdXJykpIC8gMiA7IC8vIGFjdHVhbGx5IHRoZSBoYWxm
IHNpemUKICAgICAgICAgICAgICAgICAgICAgaW50IHkgPSBsYXN0WV9waXggKyBiYXNlTGluZV9w
aXggLSB6aC0+bGF5b3V0VW5pdFRvUGl4ZWxZKCBjaC5hc2NlbnQoKS8yICk7CiAgICAgICAgICAg
ICAgICAgICAgIGludCBhcnJvd3NpemUgPSB6aC0+em9vbUl0WSggMiApOwogICAgICAgICAgICAg
ICAgICAgICBwYWludGVyLmRyYXdMaW5lKCB4ICsgc2l6ZSwgeSwgeCAtIHNpemUsIHkgKTsKICAg
ICAgICAgICAgICAgICAgICAgcGFpbnRlci5kcmF3TGluZSggeCArIHNpemUsIHksIHggKyBzaXpl
IC0gYXJyb3dzaXplLCB5IC0gYXJyb3dzaXplICk7CiAgICAgICAgICAgICAgICAgICAgIHBhaW50
ZXIuZHJhd0xpbmUoIHggKyBzaXplLCB5LCB4ICsgc2l6ZSAtIGFycm93c2l6ZSwgeSArIGFycm93
c2l6ZSApOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBlbHNlIGlmICggY2gu
YyA9PSAnXG4nICkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIC8vIGRy
YXcgbGluZSBicmVhaworICAgICAgICAgICAgICAgICAgICBLb1RleHRGb3JtYXQqIGZvcm1hdCA9
IHN0YXRpY19jYXN0PEtvVGV4dEZvcm1hdCAqPiggY2guZm9ybWF0KCkgKTsKKyAgICAgICAgICAg
ICAgICAgICAgaW50IHcgPSBmb3JtYXQtPnNjcmVlbkZvbnRNZXRyaWNzKHpoKS53aWR0aCgnWCcp
OworICAgICAgICAgICAgICAgICAgICBpbnQgc2l6ZSA9IFFNSU4oIHcsIGhfcGl4ICogMyAvIDQg
KTsKKyAgICAgICAgICAgICAgICAgICAgaW50IGFycm93c2l6ZSA9IHpoLT56b29tSXRZKCAyICk7
CisgICAgICAgICAgICAgICAgICAgIEtvVGV4dFN0cmluZ0NoYXIgJmNoID0gc3RyaW5nKCktPmF0
KGkpOworICAgICAgICAgICAgICAgICAgICAvLyB4LHkgaXMgdGhlIGJvdHRvbSByaWdodCBjb3Ju
ZXIgb2YgdGhlIHJldmVyc2VkIEwKKyAgICAgICAgICAgICAgICAgICAgLy9rZERlYnVnKCkgPDwg
InN0YXJ0WD0iIDw8IHN0YXJ0WCA8PCAiIGJ3PSIgPDwgYncgPDwgIiB3PSIgPDwgdyA8PCBlbmRs
OworICAgICAgICAgICAgICAgICAgICBpbnQgeCA9IHpoLT5sYXlvdXRVbml0VG9QaXhlbFgoIGNo
LnggKSArIGNoLnBpeGVseGFkaiArIHcgLSAxOworICAgICAgICAgICAgICAgICAgICBpbnQgeSA9
IGxhc3RZX3BpeCArIGJhc2VMaW5lX3BpeCAtIGFycm93c2l6ZTsKKyAgICAgICAgICAgICAgICAg
ICAgLy9rZERlYnVnKCkgPDwgIktXVGV4dFBhcmFnOjpkcmF3Rm9ybWF0dGluZ0NoYXJzIGRyYXdp
bmcgTGluZSBCcmVhayBhdCAiIDw8IHggPDwgIiwiIDw8IHkgPDwgZW5kbDsKKyAgICAgICAgICAg
ICAgICAgICAgcGFpbnRlci5kcmF3TGluZSggeCwgeSAtIHNpemUsIHgsIHkgKTsKKyAgICAgICAg
ICAgICAgICAgICAgcGFpbnRlci5kcmF3TGluZSggeCwgeSwgKGludCkoeCAtIHNpemUgKiAwLjcp
LCB5ICk7CisgICAgICAgICAgICAgICAgICAgIC8vIE5vdyB0aGUgYXJyb3cKKyAgICAgICAgICAg
ICAgICAgICAgcGFpbnRlci5kcmF3TGluZSggKGludCkoeCAtIHNpemUgKiAwLjcpLCB5LCAoaW50
KSh4IC0gc2l6ZSAqIDAuNyArIGFycm93c2l6ZSksIHkgLSBhcnJvd3NpemUgKTsKKyAgICAgICAg
ICAgICAgICAgICAgcGFpbnRlci5kcmF3TGluZSggKGludCkoeCAtIHNpemUgKiAwLjcpLCB5LCAo
aW50KSh4IC0gc2l6ZSAqIDAuNyArIGFycm93c2l6ZSksIHkgKyBhcnJvd3NpemUgKTsKICAgICAg
ICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBwYWludGVyLnJlc3RvcmUo
KTsKSW5kZXg6IGt3b3JkL2t3dmlldy5jYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUv
a29mZmljZS9rd29yZC9rd3ZpZXcuY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDk2CmRpZmYg
LXUgLTMgLXAgLXUgLXIxLjQ5NiBrd3ZpZXcuY2MKLS0tIGt3b3JkL2t3dmlldy5jYwkyMDAyLzAy
LzI3IDE2OjQyOjM5CTEuNDk2CisrKyBrd29yZC9rd3ZpZXcuY2MJMjAwMi8wMi8yOCAxMjo0Njox
MwpAQCAtODE1LDExICs4MTUsMTQgQEAgdm9pZCBLV1ZpZXc6OnNldHVwQWN0aW9ucygpCiAgICAg
ICAgICAgICAgICAgICAgICAgICB0aGlzLCBTTE9UKCBzbG90Tm9uYnJlYWtpbmdTcGFjZSgpICks
IGFjdGlvbkNvbGxlY3Rpb24oKSwgIm5vbmJyZWFraW5nX3NwYWNlIiApOwogICAgIEtBY3Rpb24q
IGFjdFNvZnRIeXBoZW4gPSBuZXcgS0FjdGlvbiggaTE4biggIkluc2VydCBzb2Z0IGh5cGhlbiIg
KSwgQ1RSTCtLZXlfTWludXMsCiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLCBTTE9UKCBz
bG90U29mdEh5cGhlbigpICksIGFjdGlvbkNvbGxlY3Rpb24oKSwgInNvZnRfaHlwaGVuIiApOwor
ICAgIEtBY3Rpb24qIGFjdExpbmVCcmVhayA9IG5ldyBLQWN0aW9uKCBpMThuKCAiTGluZSBicmVh
ayIgKSwgU0hJRlQrS2V5X1JldHVybiwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMsIFNM
T1QoIHNsb3RMaW5lQnJlYWsoKSApLCBhY3Rpb25Db2xsZWN0aW9uKCksICJsaW5lX2JyZWFrIiAp
OwogICAgIC8vIE5lY2Vzc2FyeSBmb3IgdGhlIGFjdGlvbnMgdGhhdCBhcmUgbm90IHBsdWdnZWQg
YW55d2hlcmUKICAgICBLQWNjZWwgKiBhY2NlbCA9IG5ldyBLQWNjZWwoIHRoaXMgKTsKICAgICBh
Y3ROYnNwIC0+cGx1Z0FjY2VsKCBhY2NlbCApOwogICAgIGFjY2VsID0gbmV3IEtBY2NlbCggdGhp
cyApOyAvLyBuZWVkZWQgPwogICAgIGFjdFNvZnRIeXBoZW4tPnBsdWdBY2NlbCggYWNjZWwgKTsK
KyAgICBhY3RMaW5lQnJlYWstPnBsdWdBY2NlbCggYWNjZWwgKTsKIH0KIAogdm9pZCBLV1ZpZXc6
OnJlZnJlc2hNZW51RXhwcmVzc2lvbigpCkBAIC00MTkwLDYgKzQxOTMsMTMgQEAgdm9pZCBLV1Zp
ZXc6OnNob3dEb2NTdHJ1Y3R1cmUoKQogICAgIG1fZG9jLT5yZW9yZ2FuaXplR1VJKCk7CiB9CiAK
K3ZvaWQgS1dWaWV3OjpzbG90U29mdEh5cGhlbigpCit7CisgICAgS1dUZXh0RnJhbWVTZXRFZGl0
ICogZWRpdCA9IGN1cnJlbnRUZXh0RWRpdCgpOworICAgIGlmICggZWRpdCApCisgICAgICAgIGVk
aXQtPmluc2VydFNvZnRIeXBoZW4oKTsKK30KKwogdm9pZCBLV1ZpZXc6OnNsb3ROb25icmVha2lu
Z1NwYWNlKCkKIHsKICAgICBLV1RleHRGcmFtZVNldEVkaXQgKiBlZGl0ID0gY3VycmVudFRleHRF
ZGl0KCk7CkBAIC00MTk3LDExICs0MjA3LDExIEBAIHZvaWQgS1dWaWV3OjpzbG90Tm9uYnJlYWtp
bmdTcGFjZSgpCiAgICAgICAgIGVkaXQtPmluc2VydE5vbmJyZWFraW5nU3BhY2UoKTsKIH0KIAot
dm9pZCBLV1ZpZXc6OnNsb3RTb2Z0SHlwaGVuKCkKK3ZvaWQgS1dWaWV3OjpzbG90TGluZUJyZWFr
KCkKIHsKICAgICBLV1RleHRGcmFtZVNldEVkaXQgKiBlZGl0ID0gY3VycmVudFRleHRFZGl0KCk7
CiAgICAgaWYgKCBlZGl0ICkKLSAgICAgICAgZWRpdC0+aW5zZXJ0U29mdEh5cGhlbigpOworICAg
ICAgICBlZGl0LT5pbnNlcnRMaW5lQnJlYWsoKTsKIH0KIAogdm9pZCBLV1ZpZXc6OnJlZnJlc2hB
bGxWYXJpYWJsZSgpCkluZGV4OiBrd29yZC9rd3ZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv
aG9tZS9rZGUva29mZmljZS9rd29yZC9rd3ZpZXcuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4x
MzgKZGlmZiAtdSAtMyAtcCAtdSAtcjEuMTM4IGt3dmlldy5oCi0tLSBrd29yZC9rd3ZpZXcuaAky
MDAyLzAyLzI3IDAxOjEyOjAzCTEuMTM4CisrKyBrd29yZC9rd3ZpZXcuaAkyMDAyLzAyLzI4IDEy
OjQ2OjEzCkBAIC0zMTIsNiArMzEyLDcgQEAgcHVibGljIHNsb3RzOgogICAgIHZvaWQgc2hvd0Rv
Y1N0cnVjdHVyZSgpOwogCiAgICAgdm9pZCBzbG90U29mdEh5cGhlbigpOworICAgIHZvaWQgc2xv
dExpbmVCcmVhaygpOwogICAgIHZvaWQgc2xvdE5vbmJyZWFraW5nU3BhY2UoKTsKIAogICAgIHZv
aWQgcmVmcmVzaEFsbFZhcmlhYmxlKCk7CkluZGV4OiBsaWIva290ZXh0L2tvdGV4dGZvcm1hdHRl
ci5jYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva29mZmljZS9saWIva290ZXh0L2tv
dGV4dGZvcm1hdHRlci5jYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNwpkaWZmIC11IC0zIC1w
IC11IC1yMS4xNyBrb3RleHRmb3JtYXR0ZXIuY2MKLS0tIGxpYi9rb3RleHQva290ZXh0Zm9ybWF0
dGVyLmNjCTIwMDIvMDIvMTggMTQ6MzE6MjQJMS4xNworKysgbGliL2tvdGV4dC9rb3RleHRmb3Jt
YXR0ZXIuY2MJMjAwMi8wMi8yOCAxMjo0NjoxMwpAQCAtMjA2LDcgKzIwNiw3IEBAIGludCBLb1Rl
eHRGb3JtYXR0ZXI6OmZvcm1hdCggUXQzOjpRVGV4dEQKIAkgICAgICggd3JhcEF0Q29sdW1uKCkg
PT0gLTEgJiYgeCArIHd3ID4gdyAmJiBsYXN0QnJlYWsgIT0gLTEgfHwKIAkgICAgICAgd3JhcEF0
Q29sdW1uKCkgPT0gLTEgJiYgeCArIHd3ID4gdyAtIDQgJiYgbGFzdEJyZWFrID09IC0xICYmIGFs
bG93QnJlYWtJbldvcmRzKCkgfHwKIAkgICAgICAgd3JhcEF0Q29sdW1uKCkgIT0gLTEgJiYgY29s
ID49IHdyYXBBdENvbHVtbigpICkgfHwKLQkgICAgICAgcGFyYWctPmlzTmV3TGluZXNBbGxvd2Vk
KCkgJiYgbGFzdENociA9PSAnXG4nICkgeworCSAgICAgICBwYXJhZy0+aXNOZXdMaW5lc0FsbG93
ZWQoKSAmJiBsYXN0Q2hyID09ICdcbicgJiYgbGFzdEJyZWFrID4gLTEgKSB7CiAjaWZkZWYgREVC
VUdfRk9STUFUVEVSCiAJICAgIHFEZWJ1ZyggIkJSRUFLSU5HIiApOwogI2VuZGlmCkluZGV4OiBs
aWIva290ZXh0L2tvdGV4dHBhcmFnLmNjCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9r
b2ZmaWNlL2xpYi9rb3RleHQva290ZXh0cGFyYWcuY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu
MzgKZGlmZiAtdSAtMyAtcCAtdSAtcjEuMzgga290ZXh0cGFyYWcuY2MKLS0tIGxpYi9rb3RleHQv
a290ZXh0cGFyYWcuY2MJMjAwMi8wMi8yMSAyMTozMDozMQkxLjM4CisrKyBsaWIva290ZXh0L2tv
dGV4dHBhcmFnLmNjCTIwMDIvMDIvMjggMTI6NDY6MTMKQEAgLTM0LDYgKzM0LDcgQEAgS29UZXh0
UGFyYWc6OktvVGV4dFBhcmFnKCBLb1RleHREb2N1bWVudAogewogICAgIC8va2REZWJ1ZygpIDw8
ICJLb1RleHRQYXJhZzo6S29UZXh0UGFyYWcgIiA8PCB0aGlzIDw8IGVuZGw7CiAgICAgbV9pdGVt
ID0gMEw7CisgICAgc2V0TmV3TGluZXNBbGxvd2VkKFRSVUUpOwogfQogCiBLb1RleHRQYXJhZzo6
fktvVGV4dFBhcmFnKCkKQEAgLTQ0MCw5ICs0NDEsMTcgQEAgdm9pZCBLb1RleHRQYXJhZzo6ZHJh
d1BhcmFnU3RyaW5nKCBRUGFpbgogICAgIGlmICggbGFzdEZvcm1hdC0+dGV4dEJhY2tncm91bmRD
b2xvcigpLmlzVmFsaWQoKSApCiAgICAgICAgIHBhaW50ZXIuZmlsbFJlY3QoIHN0YXJ0WF9waXgs
IGxhc3RZX3BpeCwgYncsIGhfcGl4LCBsYXN0Rm9ybWF0LT50ZXh0QmFja2dyb3VuZENvbG9yKCkg
KTsKIAotICAgIGRyYXdQYXJhZ1N0cmluZ0ludGVybmFsKCBwYWludGVyLCBzLCBzdGFydCwgbGVu
LCBzdGFydFhfcGl4LAorICAgIC8vIGRvbid0IHdhbnQgdG8gZHJhdyBsaW5lIGJyZWFrcyBidXQg
d2FudCB0aGVtIHdoZW4gZHJhd2luZyBmb3JtYXR0aW5nIGNoYXJzCisgICAgaW50IGRyYXdfbGVu
ID0gbGVuOworICAgIGludCBkcmF3X2J3ID0gYnc7CisgICAgaWYgKCBhdCggc3RhcnQgKyBsZW4g
LSAxICktPmMgPT0gJ1xuJyApIHsKKyAgICAgICAgZHJhd19sZW4tLTsKKyAgICAgICAgZHJhd19i
dyAtPSBhdCggc3RhcnQgKyBsZW4gLSAxICktPnBpeGVsd2lkdGg7CisgICAgfQorCisgICAgZHJh
d1BhcmFnU3RyaW5nSW50ZXJuYWwoIHBhaW50ZXIsIHMsIHN0YXJ0LCBkcmF3X2xlbiwgc3RhcnRY
X3BpeCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdFlfcGl4LCBiYXNlTGluZV9w
aXgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ3LCAvLyBOb3RlIHRoYXQgYncgaXMg
YWxyZWFkeSBpbiBwaXhlbHMgKHNlZSBRVGV4dFBhcmFnOjpwYWludCkKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgZHJhd19idywgLy8gTm90ZSB0aGF0IGJ3IGlzIGFscmVhZHkgaW4gcGl4
ZWxzIChzZWUgUVRleHRQYXJhZzo6cGFpbnQpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IGhfcGl4LCBkcmF3U2VsZWN0aW9ucywgbGFzdEZvcm1hdCwgaSwgc2VsZWN0aW9uU3RhcnRzLAog
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3Rpb25FbmRzLCBjZywgcmlnaHRUb0xl
ZnQsIHpoICk7CiAKQEAgLTY2Miw4ICs2NzEsNyBAQCBpbnQgS29UZXh0UGFyYWc6Om5leHRUYWIo
IGludCBjaG51bSwgaW50CiAgICAgICAgICAgICAgICAgICAgIC8vIExvb2sgZm9yIHRoZSBuZXh0
IHRhYiAob3IgRU9MKQogICAgICAgICAgICAgICAgICAgICBpbnQgYyA9IGNobnVtICsgMTsKICAg
ICAgICAgICAgICAgICAgICAgaW50IHcgPSAwOwotICAgICAgICAgICAgICAgICAgICAvLyBXZSBp
bmNsdWRlIHRoZSB0cmFpbGluZyBzcGFjZSBpbiB0aGUgY2FsY3VsYXRpb24gYmVjYXVzZSBRUlQg
YWN0dWFsbHkgZm9ybWF0cyBpdAotICAgICAgICAgICAgICAgICAgICB3aGlsZSAoIGMgPCBzdHJp
bmcoKS0+bGVuZ3RoKCkgLSAxICYmIHN0cmluZygpLT5hdCggYyApLmMgIT0gJ1x0JyApCisgICAg
ICAgICAgICAgICAgICAgIHdoaWxlICggYyA8IHN0cmluZygpLT5sZW5ndGgoKSAtIDEgJiYgc3Ry
aW5nKCktPmF0KCBjICkuYyAhPSAnXHQnICYmIHN0cmluZygpLT5hdCggYyApLmMgIT0gJ1xuJyAp
CiAgICAgICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgICAgIEtvVGV4dFN0
cmluZ0NoYXIgJiBjaCA9IHN0cmluZygpLT5hdCggYyApOwogICAgICAgICAgICAgICAgICAgICAg
ICAgLy8gRGV0ZXJtaW5lIGNoYXIgd2lkdGggKHNhbWUgY29kZSBhcyB0aGUgb25lIGluIFFUZXh0
Rm9ybWF0dGVyQnJlYWtbSW5dV29yZHM6OmZvcm1hdCgpKQpAQCAtNjg2LDcgKzY5NCw3IEBAIGlu
dCBLb1RleHRQYXJhZzo6bmV4dFRhYiggaW50IGNobnVtLCBpbnQKICAgICAgICAgICAgICAgICAg
ICAgaW50IHcgPSAwOwogICAgICAgICAgICAgICAgICAgICBpbnQgZGVjaW1hbFBvaW50ID0gS0ds
b2JhbDo6bG9jYWxlKCktPmRlY2ltYWxTeW1ib2woKVswXS51bmljb2RlKCk7CiAgICAgICAgICAg
ICAgICAgICAgIGJvb2wgZGlnaXRGb3VuZCA9IGZhbHNlOwotICAgICAgICAgICAgICAgICAgICB3
aGlsZSAoIGMgPCBzdHJpbmcoKS0+bGVuZ3RoKCktMSAmJiBzdHJpbmcoKS0+YXQoIGMgKS5jICE9
ICdcdCcgKQorICAgICAgICAgICAgICAgICAgICB3aGlsZSAoIGMgPCBzdHJpbmcoKS0+bGVuZ3Ro
KCktMSAmJiBzdHJpbmcoKS0+YXQoIGMgKS5jICE9ICdcdCcgJiYgc3RyaW5nKCktPmF0KCBjICku
YyAhPSAnXG4nICkKICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAg
ICAgS29UZXh0U3RyaW5nQ2hhciAmIGNoID0gc3RyaW5nKCktPmF0KCBjICk7CiAgICAgICAgICAg
ICAgICAgICAgICAgICBpZiAoIGNoLmMuaXNEaWdpdCgpICkKSW5kZXg6IGxpYi9rb3RleHQva290
ZXh0dmlldy5jYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva29mZmljZS9saWIva290
ZXh0L2tvdGV4dHZpZXcuY2MsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDAKZGlmZiAtdSAtMyAt
cCAtdSAtcjEuNDAga290ZXh0dmlldy5jYwotLS0gbGliL2tvdGV4dC9rb3RleHR2aWV3LmNjCTIw
MDIvMDIvMjcgMDE6MTA6NDUJMS40MAorKysgbGliL2tvdGV4dC9rb3RleHR2aWV3LmNjCTIwMDIv
MDIvMjggMTI6NDY6MTMKQEAgLTkzOSw2ICs5MzksMTIgQEAgdm9pZCBLb1RleHRWaWV3OjppbnNl
cnRTb2Z0SHlwaGVuKCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgZmFsc2UgLyogbm8gbmV3
bGluZSAqLywgdHJ1ZSwgaTE4bigiSW5zZXJ0IFNvZnQgSHlwaGVuIikgKTsKIH0KIAordm9pZCBL
b1RleHRWaWV3OjppbnNlcnRMaW5lQnJlYWsoKQoreworICAgIHRleHRPYmplY3QoKS0+aW5zZXJ0
KCBjdXJzb3IoKSwgY3VycmVudEZvcm1hdCgpLCBRQ2hhcignXG4nKSwKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgZmFsc2UgLyogbm8gbmV3bGluZSAqLywgdHJ1ZSwgaTE4bigiSW5zZXJ0IExp
bmUgQnJlYWsiKSApOworfQorCiB2b2lkIEtvVGV4dFZpZXc6Omluc2VydE5vbmJyZWFraW5nU3Bh
Y2UoKQogewogICAgIHRleHRPYmplY3QoKS0+aW5zZXJ0KCBjdXJzb3IoKSwgY3VycmVudEZvcm1h
dCgpLCBRQ2hhcigweGEwKSAvKiBzZWUgUVJpY2hUZXh0ICovLApJbmRleDogbGliL2tvdGV4dC9r
b3RleHR2aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tvZmZpY2UvbGliL2tv
dGV4dC9rb3RleHR2aWV3LmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzEKZGlmZiAtdSAtMyAt
cCAtdSAtcjEuMzEga290ZXh0dmlldy5oCi0tLSBsaWIva290ZXh0L2tvdGV4dHZpZXcuaAkyMDAy
LzAyLzI3IDAxOjEwOjQ1CTEuMzEKKysrIGxpYi9rb3RleHQva290ZXh0dmlldy5oCTIwMDIvMDIv
MjggMTI6NDY6MTMKQEAgLTEyMCw2ICsxMjAsNyBAQCBwdWJsaWM6CiAKIAogICAgIHZvaWQgaW5z
ZXJ0U29mdEh5cGhlbigpOworICAgIHZvaWQgaW5zZXJ0TGluZUJyZWFrKCk7CiAgICAgdm9pZCBp
bnNlcnROb25icmVha2luZ1NwYWNlKCk7CiAgICAgdm9pZCBpbnNlcnRTcGVjaWFsQ2hhcihRQ2hh
ciBfYyk7CiAgICAgdm9pZCBjaGFuZ2VDYXNlT2ZUZXh0KEtvQ2hhbmdlQ2FzZURpYTo6VHlwZU9m
Q2FzZSBfdHlwZSk7CkluZGV4OiBsaWIva290ZXh0L3FyaWNodGV4dC5jcHAKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS
Q1MgZmlsZTogL2hvbWUva2RlL2tvZmZpY2UvbGliL2tvdGV4dC9xcmljaHRleHQuY3BwLHYKcmV0
cmlldmluZyByZXZpc2lvbiAxLjMyCmRpZmYgLXUgLTMgLXAgLXUgLXIxLjMyIHFyaWNodGV4dC5j
cHAKLS0tIGxpYi9rb3RleHQvcXJpY2h0ZXh0LmNwcAkyMDAyLzAyLzIxIDIxOjMwOjMxCTEuMzIK
KysrIGxpYi9rb3RleHQvcXJpY2h0ZXh0LmNwcAkyMDAyLzAyLzI4IDEyOjQ2OjEzCkBAIC00MTky
LDggKzQxOTIsNyBAQCB2b2lkIFFUZXh0UGFyYWc6OnBhaW50KCBRUGFpbnRlciAmcGFpbnRlCiAJ
ICAgIGxhc3RGb3JtYXQgPSBjaHItPmZvcm1hdCgpOwogCSAgICBsYXN0WSA9IGN5OwogCSAgICBz
dGFydFggPSBjaHItPng7Ci0JICAgIGlmICggIWNoci0+aXNDdXN0b20oKSAmJiBjaHItPmMgIT0g
J1xuJyApCi0JCXBhaW50RW5kID0gaTsKKwkgICAgcGFpbnRFbmQgPSBpOwogCSAgICBidyA9IGN3
OwogCSAgICBpZiAoICFjaHItPmlzQ3VzdG9tKCkgKQogCQljb250aW51ZTsKQEAgLTQyMjUsMTMg
KzQyMjQsOCBAQCB2b2lkIFFUZXh0UGFyYWc6OnBhaW50KCBRUGFpbnRlciAmcGFpbnRlCiAJCQkJ
IGxhc3RGb3JtYXQsIGksIHNlbGVjdGlvblN0YXJ0cywgc2VsZWN0aW9uRW5kcywgY2csIGxhc3RE
aXJlY3Rpb24gKTsKIAkgICAgfQogCSAgICBpZiAoICFjaHItPmlzQ3VzdG9tKCkgKSB7Ci0JCWlm
ICggY2hyLT5jICE9ICdcbicgKSB7Ci0JCSAgICBwYWludFN0YXJ0ID0gaTsKLQkJICAgIHBhaW50
RW5kID0gaTsKLQkJfSBlbHNlIHsKLQkJICAgIHBhaW50U3RhcnQgPSBpKzE7Ci0JCSAgICBwYWlu
dEVuZCA9IC0xOwotCQl9CisJCXBhaW50U3RhcnQgPSBpOworCQlwYWludEVuZCA9IGk7CiAJCWxh
c3RGb3JtYXQgPSBjaHItPmZvcm1hdCgpOwogCQlsYXN0WSA9IGN5OwogCQlzdGFydFggPSBjaHIt
Png7CkBAIC00MjU3LDEyICs0MjUxLDEwIEBAIHZvaWQgUVRleHRQYXJhZzo6cGFpbnQoIFFQYWlu
dGVyICZwYWludGUKIAkJfQogCSAgICB9CiAJfSBlbHNlIHsKLQkgICAgaWYgKCBjaHItPmMgIT0g
J1xuJyApIHsKLQkJaWYoIGNoci0+cmlnaHRUb0xlZnQgKSB7Ci0JCSAgICBzdGFydFggPSBjaHIt
Png7Ci0JCX0KLQkJcGFpbnRFbmQgPSBpOworCSAgICBpZiggY2hyLT5yaWdodFRvTGVmdCApIHsK
KwkJc3RhcnRYID0gY2hyLT54OwogCSAgICB9CisJICAgIHBhaW50RW5kID0gaTsKIAkgICAgYncg
Kz0gY3c7CiAJfQogCWxhc3RCYXNlTGluZSA9IGJhc2VMaW5lOwo=

--------------Boundary-00=_M8W8SZ8UYYVCNXN7H0E9--
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel