--14dae9cfcea461bfba04d37fe45f Content-Type: multipart/alternative; boundary=14dae9cfcea461bfb504d37fe45d --14dae9cfcea461bfb504d37fe45d Content-Type: text/plain; charset=ISO-8859-1 yes it's for 2.6, attached a diff with a rebased 2.6 On Thu, Jan 17, 2013 at 6:38 PM, Friedrich W. H. Kossebau wrote: > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/108444/ > > Is that for 2.6 or master (bug was for 2.6)? Did not apply cleanly for me against 2.6 at least. > > > - Friedrich W. H. > > On January 16th, 2013, 8:45 p.m. UTC, Pierre Stirnweiss wrote: > Review request for Calligra and Friedrich W. H. Kossebau. > By Pierre Stirnweiss. > > *Updated Jan. 16, 2013, 8:45 p.m.* > Description > > When creating a new character style, Words crashed because an null pointer was passed around and used. Also, the name of the style was not updated. > > *Bugs: * 313233 > Diffs > > - plugins/textshape/dialogs/StylesModel.cpp (80ea48d) > - plugins/textshape/dialogs/StyleManager.cpp (c561d35) > - plugins/textshape/dialogs/StyleManager.h (a45a58a) > - plugins/textshape/dialogs/FormattingPreview.cpp (1ed3b83) > - plugins/textshape/dialogs/CharacterGeneral.cpp (d3eead6) > > View Diff > --14dae9cfcea461bfb504d37fe45d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable yes it's for 2.6, attached a diff with a rebased 2.6

On Thu, Jan 17, 2013 at 6:38 PM, Friedrich W. H. Kossebau = <kossebau@kde.org> wrote:
This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/108444/ 

Is that for 2.=
6 or master (bug was for 2.6)? Did not apply cleanly for me against 2.6 at =
least.

- Friedrich W. H.


On January 16th, 2013, 8:45 p.m. UTC, Pierre Stirnweiss wrote:

Review request for Calligra and Friedrich W. H. Kossebau.
By Pierre Stirnweiss.

Updated Jan. 16, 2013, 8:45 p.m.

Description 
When creating a new character style, Words crashed because an null pointer=
 was passed around and used. Also, the name of the style was not updated.
Bugs: 313233

Diffs

  • plugins/textshape/dialogs/StylesModel.cpp (= 80ea48d)
  • plugins/textshape/dialogs/StyleManager.cpp = (c561d35)
  • plugins/textshape/dialogs/StyleManager.h (a= 45a58a)
  • plugins/textshape/dialogs/FormattingPreview.cpp (1ed3b83)
  • plugins/textshape/dialogs/CharacterGeneral.cpp (d3eead6)

View Diff

--14dae9cfcea461bfb504d37fe45d-- --14dae9cfcea461bfba04d37fe45f Content-Type: application/octet-stream; name=patch-fixCrashOnCreateNewCharStyle2 Content-Disposition: attachment; filename=patch-fixCrashOnCreateNewCharStyle2 Content-Transfer-Encoding: base64 X-Attachment-Id: f_hc27qwo20 Y29tbWl0IDc1ZGJmNDZjM2JlNjE5NGNjZjhlYzM0ZGEzODUwOWI0YTgzODBkZmUKQXV0aG9yOiBQ aWVycmUgU3Rpcm53ZWlzcyA8cHN0aXJud2Vpc3NAZ29vZ2xlbWFpbC5jb20+CkRhdGU6ICAgVGh1 IEphbiAxNyAxOTowMDo1MiAyMDEzICswMTAwCgogICAgRml4IGNyYXNoIG9uIGNyZWF0ZSBuZXcg Y2hhcmFjdGVyIHN0eWxlCiAgICAKICAgIFdoZW4gY3JlYXRpbmcgYSBuZXcgY2hhcmFjdGVyIHN0 eWxlLCBXb3JkcyBjcmFzaGVkIGJlY2F1c2UgYW4gbnVsbAogICAgcG9pbnRlciB3YXMgcGFzc2Vk IGFyb3VuZCBhbmQgdXNlZC4gQWxzbywgdGhlIG5hbWUgb2YgdGhlIHN0eWxlIHdhcwogICAgbm90 IHVwZGF0ZWQuCiAgICAKICAgIEJVRzogMzEzMjMzCiAgICBSRVZJRVc6IDEwODQ0NAoKZGlmZiAt LWdpdCBhL3BsdWdpbnMvdGV4dHNoYXBlL2RpYWxvZ3MvQ2hhcmFjdGVyR2VuZXJhbC5jcHAgYi9w bHVnaW5zL3RleHRzaGFwZS9kaWFsb2dzL0NoYXJhY3RlckdlbmVyYWwuY3BwCmluZGV4IGQzZWVh ZDYuLmJiN2VlNDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvdGV4dHNoYXBlL2RpYWxvZ3MvQ2hhcmFj dGVyR2VuZXJhbC5jcHAKKysrIGIvcGx1Z2lucy90ZXh0c2hhcGUvZGlhbG9ncy9DaGFyYWN0ZXJH ZW5lcmFsLmNwcApAQCAtNzQsNiArNzQsNyBAQCBDaGFyYWN0ZXJHZW5lcmFsOjpDaGFyYWN0ZXJH ZW5lcmFsKFFXaWRnZXQgKnBhcmVudCkKICAgICBtX2xhbmd1YWdlVGFiLT5zZXRWaXNpYmxlKGZh bHNlKTsKIAogICAgIGNvbm5lY3Qod2lkZ2V0Lm5hbWUsIFNJR05BTCh0ZXh0Q2hhbmdlZChjb25z dCBRU3RyaW5nICYpKSwgdGhpcywgU0lHTkFMKG5hbWVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKSkp OworICAgIG1fbmFtZUhpZGRlbiA9IGZhbHNlOwogfQogCiB2b2lkIENoYXJhY3RlckdlbmVyYWw6 OmhpZGVTdHlsZU5hbWUoYm9vbCBoaWRlKQpAQCAtMTE0LDggKzExNSw5IEBAIHZvaWQgQ2hhcmFj dGVyR2VuZXJhbDo6c2F2ZShLb0NoYXJhY3RlclN0eWxlICpzdHlsZSkKIHsKICAgICBLb0NoYXJh Y3RlclN0eWxlICpzYXZpbmdTdHlsZTsKICAgICBpZiAoc3R5bGUgPT0gMCkgewotICAgICAgICBp ZiAobV9zdHlsZSA9PSAwKQorICAgICAgICBpZiAobV9zdHlsZSA9PSAwKSB7CiAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICAgICAgc2F2aW5nU3R5 bGUgPSBtX3N0eWxlOwogICAgIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvdGV4dHNoYXBlL2RpYWxv Z3MvRm9ybWF0dGluZ1ByZXZpZXcuY3BwIGIvcGx1Z2lucy90ZXh0c2hhcGUvZGlhbG9ncy9Gb3Jt YXR0aW5nUHJldmlldy5jcHAKaW5kZXggMWVkM2I4My4uMTY0ODY0OSAxMDA2NDQKLS0tIGEvcGx1 Z2lucy90ZXh0c2hhcGUvZGlhbG9ncy9Gb3JtYXR0aW5nUHJldmlldy5jcHAKKysrIGIvcGx1Z2lu cy90ZXh0c2hhcGUvZGlhbG9ncy9Gb3JtYXR0aW5nUHJldmlldy5jcHAKQEAgLTg0LDYgKzg0LDkg QEAgdm9pZCBGb3JtYXR0aW5nUHJldmlldzo6c2V0VGV4dChjb25zdCBRU3RyaW5nICZzYW1wbGVU ZXh0KQogLy9DaGFyYWN0ZXIgcHJvcGVydGllcwogdm9pZCBGb3JtYXR0aW5nUHJldmlldzo6c2V0 Q2hhcmFjdGVyU3R5bGUoY29uc3QgS29DaGFyYWN0ZXJTdHlsZSogc3R5bGUpCiB7CisgICAgaWYg KCFzdHlsZSkgeworICAgICAgICByZXR1cm47CisgICAgfQogICAgIGlmIChtX2NoYXJhY3RlclN0 eWxlKSB7CiAgICAgICAgIGRlbGV0ZSBtX2NoYXJhY3RlclN0eWxlOwogICAgIH0KQEAgLTk3LDYg KzEwMCw5IEBAIHZvaWQgRm9ybWF0dGluZ1ByZXZpZXc6OnNldENoYXJhY3RlclN0eWxlKGNvbnN0 IEtvQ2hhcmFjdGVyU3R5bGUqIHN0eWxlKQogCiB2b2lkIEZvcm1hdHRpbmdQcmV2aWV3OjpzZXRQ YXJhZ3JhcGhTdHlsZShjb25zdCBLb1BhcmFncmFwaFN0eWxlICpzdHlsZSkKIHsKKyAgICBpZiAo IXN0eWxlKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgaWYgKG1fcGFyYWdyYXBoU3R5 bGUpIHsKICAgICAgICAgZGVsZXRlIG1fcGFyYWdyYXBoU3R5bGU7CiAgICAgfQpAQCAtMTIwLDcg KzEyNiw5IEBAIHZvaWQgRm9ybWF0dGluZ1ByZXZpZXc6OnBhaW50RXZlbnQoUVBhaW50RXZlbnQg KmV2ZW50KQogICAgIFFSZWN0IHJlY3RhbmcgPSBjb250ZW50c1JlY3QoKTsKIAogICAgIHAtPmZp bGxSZWN0KHJlY3RhbmcsIFFCcnVzaChRQ29sb3IoUXQ6OndoaXRlKSkpOwotICAgIHAtPmRyYXdJ bWFnZShyZWN0YW5nLCBtX3RodW1ibmFpbGVyLT50aHVtYm5haWwobV9jaGFyYWN0ZXJTdHlsZSxt X3BhcmFncmFwaFN0eWxlLHJlY3Rhbmcuc2l6ZSgpLG1fcHJldmlld0xheW91dFJlcXVpcmVkLCBL b1N0eWxlVGh1bWJuYWlsZXI6Ok5vRmxhZ3MpKTsKKyAgICBpZiAobV9jaGFyYWN0ZXJTdHlsZSkg eworICAgICAgICBwLT5kcmF3SW1hZ2UocmVjdGFuZywgbV90aHVtYm5haWxlci0+dGh1bWJuYWls KG1fY2hhcmFjdGVyU3R5bGUsbV9wYXJhZ3JhcGhTdHlsZSxyZWN0YW5nLnNpemUoKSxtX3ByZXZp ZXdMYXlvdXRSZXF1aXJlZCwgS29TdHlsZVRodW1ibmFpbGVyOjpOb0ZsYWdzKSk7CisgICAgfQog CiAgICAgbV9wcmV2aWV3TGF5b3V0UmVxdWlyZWQgPSBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvcGx1 Z2lucy90ZXh0c2hhcGUvZGlhbG9ncy9TdHlsZU1hbmFnZXIuY3BwIGIvcGx1Z2lucy90ZXh0c2hh cGUvZGlhbG9ncy9TdHlsZU1hbmFnZXIuY3BwCmluZGV4IGM1NjFkMzUuLjIwM2NkZjYgMTAwNjQ0 Ci0tLSBhL3BsdWdpbnMvdGV4dHNoYXBlL2RpYWxvZ3MvU3R5bGVNYW5hZ2VyLmNwcAorKysgYi9w bHVnaW5zL3RleHRzaGFwZS9kaWFsb2dzL1N0eWxlTWFuYWdlci5jcHAKQEAgLTQ3LDYgKzQ3LDcg QEAgU3R5bGVNYW5hZ2VyOjpTdHlsZU1hbmFnZXIoUVdpZGdldCAqcGFyZW50KQogICAgICAgICAs IG1fYmxvY2tTdHlsZUNoYW5nZVNpZ25hbHMoZmFsc2UpCiAgICAgICAgICwgbV91bmFwcGxpZWRT dHlsZUNoYW5nZXMoZmFsc2UpCiAgICAgICAgICwgbV9jdXJyZW50U3R5bGVDaGFuZ2VkKGZhbHNl KQorICAgICAgICAsIG1fbm9uRXhpc3RpbmdTdHlsZUlkKDgwOTQpCiB7CiAgICAgd2lkZ2V0LnNl dHVwVWkodGhpcyk7CiAgICAgbGF5b3V0KCktPnNldE1hcmdpbigwKTsKQEAgLTEzMSw2ICsxMzIs OSBAQCB2b2lkIFN0eWxlTWFuYWdlcjo6c2V0U3R5bGVNYW5hZ2VyKEtvU3R5bGVNYW5hZ2VyICpz bSkKIAogdm9pZCBTdHlsZU1hbmFnZXI6OnNldFBhcmFncmFwaFN0eWxlKEtvUGFyYWdyYXBoU3R5 bGUgKnN0eWxlKQogeworICAgIGlmICghc3R5bGUpIHsKKyAgICAgICAgcmV0dXJuOworICAgIH0K ICAgICBtX2Jsb2NrU3R5bGVDaGFuZ2VTaWduYWxzID0gdHJ1ZTsKICAgICBtX3NlbGVjdGVkQ2hh clN0eWxlID0gMDsKICAgICBtX3NlbGVjdGVkUGFyYWdTdHlsZSA9IHN0eWxlOwpAQCAtMTYyLDYg KzE2Niw5IEBAIHZvaWQgU3R5bGVNYW5hZ2VyOjpzZXRQYXJhZ3JhcGhTdHlsZShLb1BhcmFncmFw aFN0eWxlICpzdHlsZSkKIAogdm9pZCBTdHlsZU1hbmFnZXI6OnNldENoYXJhY3RlclN0eWxlKEtv Q2hhcmFjdGVyU3R5bGUgKnN0eWxlLCBib29sIGNhbkRlbGV0ZSkKIHsKKyAgICBpZiAoIXN0eWxl KSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgbV9ibG9ja1N0eWxlQ2hhbmdlU2lnbmFs cyA9IHRydWU7CiAgICAgbV9zZWxlY3RlZFBhcmFnU3R5bGUgPSAwOwogICAgIG1fc2VsZWN0ZWRD aGFyU3R5bGUgPSBzdHlsZTsKQEAgLTE3MCw4ICsxNzcsOCBAQCB2b2lkIFN0eWxlTWFuYWdlcjo6 c2V0Q2hhcmFjdGVyU3R5bGUoS29DaGFyYWN0ZXJTdHlsZSAqc3R5bGUsIGJvb2wgY2FuRGVsZXRl KQogICAgIHdpZGdldC5jaGFyYWN0ZXJTdHlsZVBhZ2UtPnNhdmUoKTsKICAgICBLb0NoYXJhY3Rl clN0eWxlICpsb2NhbFN0eWxlOwogCi0gICAgaWYgKG1fZHJhZnRQYXJhZ3JhcGhTdHlsZXMuY29u dGFpbnMoc3R5bGUtPnN0eWxlSWQoKSkpIHsKLSAgICAgICAgbG9jYWxTdHlsZSA9IG1fZHJhZnRQ YXJhZ3JhcGhTdHlsZXNbc3R5bGUtPnN0eWxlSWQoKV07CisgICAgaWYgKG1fZHJhZnRDaGFyYWN0 ZXJTdHlsZXMuY29udGFpbnMoc3R5bGUtPnN0eWxlSWQoKSkpIHsKKyAgICAgICAgbG9jYWxTdHls ZSA9IG1fZHJhZnRDaGFyYWN0ZXJTdHlsZXNbc3R5bGUtPnN0eWxlSWQoKV07CiAgICAgfQogICAg IGVsc2UgaWYgKCFtX2FsdGVyZWRDaGFyYWN0ZXJTdHlsZXMuY29udGFpbnMoc3R5bGUtPnN0eWxl SWQoKSkpIHsKICAgICAgICAgbG9jYWxTdHlsZSA9IHN0eWxlLT5jbG9uZSgpOwpAQCAtMjA3LDYg KzIxNCw3IEBAIHZvaWQgU3R5bGVNYW5hZ2VyOjpzYXZlKCkKICAgICBtX3N0eWxlTWFuYWdlci0+ YmVnaW5FZGl0KCk7CiAKICAgICBtX3BhcmFncmFwaFN0eWxlc01vZGVsLT5jbGVhckRyYWZ0U3R5 bGVzKCk7IC8vIGNsZWFyIGRyYWZ0IHN0eWxlcyBpbiBTdHlsZSBNb2RlbC4KKyAgICBtX2NoYXJh Y3RlclN0eWxlc01vZGVsLT5jbGVhckRyYWZ0U3R5bGVzKCk7CiAgICAgZm9yZWFjaChLb1BhcmFn cmFwaFN0eWxlICpzdHlsZSwgbV9kcmFmdFBhcmFncmFwaFN0eWxlcy52YWx1ZXMoKSkgewogICAg ICAgICBtX3N0eWxlTWFuYWdlci0+YWRkKHN0eWxlKTsKICAgICB9CkBAIC0zNDIsNyArMzUwLDE0 IEBAIHZvaWQgU3R5bGVNYW5hZ2VyOjpidXR0b25OZXdQcmVzc2VkKCkKICAgICAgICAgcmV0dXJu OwogICAgIH0KICAgICBpZiAod2lkZ2V0LnRhYnMtPmluZGV4T2Yod2lkZ2V0LnBhcmFncmFwaFN0 eWxlc0xpc3RWaWV3KSA9PSB3aWRnZXQudGFicy0+Y3VycmVudEluZGV4KCkpewotICAgICAgICBL b1BhcmFncmFwaFN0eWxlICpuZXdTdHlsZSA9IG1fc2VsZWN0ZWRQYXJhZ1N0eWxlLT5jbG9uZSgp OworICAgICAgICBLb1BhcmFncmFwaFN0eWxlICpuZXdTdHlsZTsKKyAgICAgICAgaWYgKG1fc2Vs ZWN0ZWRQYXJhZ1N0eWxlKSB7CisgICAgICAgICAgICBuZXdTdHlsZSA9IG1fc2VsZWN0ZWRQYXJh Z1N0eWxlLT5jbG9uZSgpOworICAgICAgICB9CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAg bmV3U3R5bGUgPSBuZXcgS29QYXJhZ3JhcGhTdHlsZSgpOworICAgICAgICAgICAgbmV3U3R5bGUt PnNldFN0eWxlSWQoLW1fbm9uRXhpc3RpbmdTdHlsZUlkKyspOworICAgICAgICB9CiAgICAgICAg IG5ld1N0eWxlLT5zZXROYW1lKGkxOG4oIk5ldyBTdHlsZSIpKTsKICAgICAgICAgbV9wYXJhZ3Jh cGhTdHlsZXNNb2RlbC0+YWRkRHJhZnRQYXJhZ3JhcGhTdHlsZShuZXdTdHlsZSk7CiAgICAgICAg IG1fZHJhZnRQYXJhZ3JhcGhTdHlsZXMuaW5zZXJ0KG5ld1N0eWxlLT5zdHlsZUlkKCksIG5ld1N0 eWxlKTsKQEAgLTM1MCw3ICszNjUsMTQgQEAgdm9pZCBTdHlsZU1hbmFnZXI6OmJ1dHRvbk5ld1By ZXNzZWQoKQogICAgICAgICB3aWRnZXQucGFyYWdyYXBoU3R5bGVQYWdlLT5zZWxlY3ROYW1lKCk7 CiAgICAgfQogICAgIGVsc2UgewotICAgICAgICBLb0NoYXJhY3RlclN0eWxlICpuZXdTdHlsZSA9 IG1fc2VsZWN0ZWRDaGFyU3R5bGUtPmNsb25lKCk7CisgICAgICAgIEtvQ2hhcmFjdGVyU3R5bGUg Km5ld1N0eWxlID0gKG1fc2VsZWN0ZWRDaGFyU3R5bGUpP21fc2VsZWN0ZWRDaGFyU3R5bGUtPmNs b25lKCk6bmV3IEtvQ2hhcmFjdGVyU3R5bGUoKTsKKyAgICAgICAgaWYgKG1fc2VsZWN0ZWRDaGFy U3R5bGUpIHsKKyAgICAgICAgICAgIG5ld1N0eWxlID0gbV9zZWxlY3RlZENoYXJTdHlsZS0+Y2xv bmUoKTsKKyAgICAgICAgfQorICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIG5ld1N0eWxlID0g bmV3IEtvQ2hhcmFjdGVyU3R5bGUoKTsKKyAgICAgICAgICAgIG5ld1N0eWxlLT5zZXRTdHlsZUlk KC1tX25vbkV4aXN0aW5nU3R5bGVJZCsrKTsKKyAgICAgICAgfQogICAgICAgICBuZXdTdHlsZS0+ c2V0TmFtZShpMThuKCJOZXcgU3R5bGUiKSk7CiAgICAgICAgIG1fY2hhcmFjdGVyU3R5bGVzTW9k ZWwtPmFkZERyYWZ0Q2hhcmFjdGVyU3R5bGUobmV3U3R5bGUpOwogICAgICAgICBtX2RyYWZ0Q2hh cmFjdGVyU3R5bGVzLmluc2VydChuZXdTdHlsZS0+c3R5bGVJZCgpLCBuZXdTdHlsZSk7CkBAIC00 MTksOSArNDQxLDEwIEBAIGJvb2wgU3R5bGVNYW5hZ2VyOjpjaGVja1VuaXF1ZVN0eWxlTmFtZSgp CiAgICAgICAgIFFMaXN0PGludD4gc3R5bGVMaXN0Q2hhciA9IG1fY2hhcmFjdGVyU3R5bGVzTW9k ZWwtPlN0eWxlTGlzdCgpOwogICAgICAgICBRTGlzdDxpbnQ+OjppdGVyYXRvciBpdGVyQ2hhciA9 IHN0eWxlTGlzdENoYXIuYmVnaW4oKTsKICAgICAgICAgZm9yICggOyBpdGVyQ2hhciAhPSBzdHls ZUxpc3RDaGFyLmVuZCgpOyArK2l0ZXJDaGFyKSB7Ci0gICAgICAgICAgICBLb0NoYXJhY3RlclN0 eWxlICp0ZW1wID0gbV9zdHlsZU1hbmFnZXItPmNoYXJhY3RlclN0eWxlKCppdGVyQ2hhcik7Owot ICAgICAgICAgICAgaWYgKCF0ZW1wICYmIG1fZHJhZnRDaGFyYWN0ZXJTdHlsZXMuY29udGFpbnMo Kml0ZXJDaGFyKSkKKyAgICAgICAgICAgIEtvQ2hhcmFjdGVyU3R5bGUgKnRlbXAgPSBtX3N0eWxl TWFuYWdlci0+Y2hhcmFjdGVyU3R5bGUoKml0ZXJDaGFyKTsKKyAgICAgICAgICAgIGlmICghdGVt cCAmJiBtX2RyYWZ0Q2hhcmFjdGVyU3R5bGVzLmNvbnRhaW5zKCppdGVyQ2hhcikpewogICAgICAg ICAgICAgICAgIHRlbXAgPSBtX2RyYWZ0Q2hhcmFjdGVyU3R5bGVzWyppdGVyQ2hhcl07CisgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgIGlmICh3aWRnZXQuY2hhcmFjdGVyU3R5bGVQYWdlLT5z dHlsZU5hbWUoKSA9PSB0ZW1wLT5uYW1lKCkpIHsKICAgICAgICAgICAgICAgICBpZiAodGVtcCAh PSBtX3NlbGVjdGVkQ2hhclN0eWxlKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL3RleHRzaGFwZS9k aWFsb2dzL1N0eWxlTWFuYWdlci5oIGIvcGx1Z2lucy90ZXh0c2hhcGUvZGlhbG9ncy9TdHlsZU1h bmFnZXIuaAppbmRleCBhNDVhNThhLi42NjY3MWE3IDEwMDY0NAotLS0gYS9wbHVnaW5zL3RleHRz aGFwZS9kaWFsb2dzL1N0eWxlTWFuYWdlci5oCisrKyBiL3BsdWdpbnMvdGV4dHNoYXBlL2RpYWxv Z3MvU3R5bGVNYW5hZ2VyLmgKQEAgLTgxLDYgKzgxLDggQEAgcHJpdmF0ZToKICAgICBib29sIG1f YmxvY2tTdHlsZUNoYW5nZVNpZ25hbHM7CiAgICAgYm9vbCBtX3VuYXBwbGllZFN0eWxlQ2hhbmdl czsKICAgICBib29sIG1fY3VycmVudFN0eWxlQ2hhbmdlZDsKKworICAgIGludCBtX25vbkV4aXN0 aW5nU3R5bGVJZDsKIH07CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy90ZXh0c2hhcGUv ZGlhbG9ncy9TdHlsZXNNb2RlbC5jcHAgYi9wbHVnaW5zL3RleHRzaGFwZS9kaWFsb2dzL1N0eWxl c01vZGVsLmNwcAppbmRleCA4MGVhNDhkLi5mMmQ4MWM5IDEwMDY0NAotLS0gYS9wbHVnaW5zL3Rl eHRzaGFwZS9kaWFsb2dzL1N0eWxlc01vZGVsLmNwcAorKysgYi9wbHVnaW5zL3RleHRzaGFwZS9k aWFsb2dzL1N0eWxlc01vZGVsLmNwcApAQCAtMzc4LDEwICszNzgsMTAgQEAgdm9pZCBTdHlsZXNN b2RlbDo6dXBkYXRlQ2hhcmFjdGVyU3R5bGVzKCkKIAogICAgIGZvcmVhY2goS29DaGFyYWN0ZXJT dHlsZSAqc3R5bGUsIHN0eWxlcykgewogICAgICAgICBpZiAoc3R5bGUgIT0gbV9zdHlsZU1hbmFn ZXItPmRlZmF1bHRDaGFyYWN0ZXJTdHlsZSgpKSB7IC8vVGhlIGRlZmF1bHQgY2hhcmFjdGVyIHN0 eWxlIGlzIG5vdCB1c2VyIHNlbGVjdGFibGUuIEl0IG9ubHkgcHJvdmlkZXMgaW5kaXZpZHVhbCBw cm9wZXJ0eSBkZWZhdWx0cyBhbmQgaXMgbm90IGEgc3R5bGUgcGVyIHNheS4KLQkgICAgbV9zdHls ZUxpc3QuYXBwZW5kKHN0eWxlLT5zdHlsZUlkKCkpOworICAgICAgICAgICAgbV9zdHlsZUxpc3Qu YXBwZW5kKHN0eWxlLT5zdHlsZUlkKCkpOwogICAgICAgICAgICAgbV9zdHlsZU1hcHBlci0+c2V0 TWFwcGluZyhzdHlsZSwgc3R5bGUtPnN0eWxlSWQoKSk7CiAgICAgICAgICAgICBjb25uZWN0KHN0 eWxlLCBTSUdOQUwobmFtZUNoYW5nZWQoY29uc3QgUVN0cmluZyYpKSwgbV9zdHlsZU1hcHBlciwg U0xPVChtYXAoKSkpOwotCX0KKyAgICAgICAgfQogICAgIH0KIAogICAgIGVuZFJlc2V0TW9kZWwo KTsKQEAgLTQ0MCw3ICs0NDAsNyBAQCB2b2lkIFN0eWxlc01vZGVsOjp1cGRhdGVOYW1lKGludCBz dHlsZUlkKQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAob2xkSW5kZXgg IT0gbmV3SW5kZXgpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gYmVnaW5Nb3ZlUm93cyBuZWVk cyB0aGUgaW5kZXggd2hlcmUgaXQgd291bGQgYmUgcGxhY2VkIHdoZW4gaXQgaXMgc3RpbGwgaW4g dGhlIG9sZCBwb3NpdGlvbgotICAgICAgICAgICAgICAgICAgICAvLyBzbyBhZGQgb25lIHdoZW4g bmV3SW5kZXggPiBvbGRJbmRleCAKKyAgICAgICAgICAgICAgICAgICAgLy8gc28gYWRkIG9uZSB3 aGVuIG5ld0luZGV4ID4gb2xkSW5kZXgKICAgICAgICAgICAgICAgICAgICAgYmVnaW5Nb3ZlUm93 cyhRTW9kZWxJbmRleCgpLCBvbGRJbmRleCwgb2xkSW5kZXgsIFFNb2RlbEluZGV4KCksIG5ld0lu ZGV4ID4gb2xkSW5kZXggPyBuZXdJbmRleCArIDEgOiBuZXdJbmRleCk7CiAgICAgICAgICAgICAg ICAgICAgIG1fc3R5bGVMaXN0LnJlbW92ZUF0KG9sZEluZGV4KTsKICAgICAgICAgICAgICAgICAg ICAgbV9zdHlsZUxpc3QuaW5zZXJ0KG5ld0luZGV4LCBzdHlsZUlkKTsKQEAgLTQ3Nyw3ICs0Nzcs NyBAQCB2b2lkIFN0eWxlc01vZGVsOjp1cGRhdGVOYW1lKGludCBzdHlsZUlkKQogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAob2xkSW5kZXggIT0gbmV3SW5kZXgpIHsKICAg ICAgICAgICAgICAgICAgICAgLy8gYmVnaW5Nb3ZlUm93cyBuZWVkcyB0aGUgaW5kZXggd2hlcmUg aXQgd291bGQgYmUgcGxhY2VkIHdoZW4gaXQgaXMgc3RpbGwgaW4gdGhlIG9sZCBwb3NpdGlvbgot ICAgICAgICAgICAgICAgICAgICAvLyBzbyBhZGQgb25lIHdoZW4gbmV3SW5kZXggPiBvbGRJbmRl eCAKKyAgICAgICAgICAgICAgICAgICAgLy8gc28gYWRkIG9uZSB3aGVuIG5ld0luZGV4ID4gb2xk SW5kZXgKICAgICAgICAgICAgICAgICAgICAgYmVnaW5Nb3ZlUm93cyhRTW9kZWxJbmRleCgpLCBv bGRJbmRleCwgb2xkSW5kZXgsIFFNb2RlbEluZGV4KCksIG5ld0luZGV4ID4gb2xkSW5kZXggPyBu ZXdJbmRleCArIDEgOiBuZXdJbmRleCk7CiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGVMaXN0 LnJlbW92ZUF0KG9sZEluZGV4KTsKICAgICAgICAgICAgICAgICAgICAgbV9zdHlsZUxpc3QuaW5z ZXJ0KG5ld0luZGV4LCBzdHlsZUlkKTsK --14dae9cfcea461bfba04d37fe45f Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel --14dae9cfcea461bfba04d37fe45f--