From koffice-devel Thu May 17 18:15:24 2007 From: Pinaraf Date: Thu, 17 May 2007 18:15:24 +0000 To: koffice-devel Subject: API change in KoCharacterStyle Message-Id: <2d74a35c0705171115m396dd111pc52732b45ca2b901 () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=koffice-devel&m=117942577223159 MIME-Version: 1 Content-Type: multipart/mixed; boundary="------=_Part_39973_2527830.1179425724254" ------=_Part_39973_2527830.1179425724254 Content-Type: multipart/alternative; boundary="----=_Part_39974_5341573.1179425724254" ------=_Part_39974_5341573.1179425724254 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi I'm trying to get the font names working in KWord ODF loading code, but after facing the problem with font-face-decls I'm getting another problem with KoCharacterStyle : it's getting access only to KoStyleStack, which doesn't make it possible (ok, more exactly : I didn't find any way but there is perhaps a way I didn't find) to access KoOasisStyles. That's why I'd like to change the loadOasis fonction in KoCharacterStyle : its argument would be the KoOasisLoadingContext instead of KoStyleStack. I attached a svn diff for this small change... What do you think about it ? ------=_Part_39974_5341573.1179425724254 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi

I'm trying to get the font names working in KWord ODF loading code, but after facing the problem with font-face-decls I'm getting another problem with KoCharacterStyle : it's getting access only to KoStyleStack, which doesn't make it possible (ok, more exactly : I didn't find any way but there is perhaps a way I didn't find) to access KoOasisStyles.
That's why I'd like to change the loadOasis fonction in KoCharacterStyle : its argument would be the KoOasisLoadingContext instead of KoStyleStack.
I attached a svn diff for this small change...

What do you think about it ?
------=_Part_39974_5341573.1179425724254-- ------=_Part_39973_2527830.1179425724254 Content-Type: text/x-diff; name="koCharacterStyle-loadOasis.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="koCharacterStyle-loadOasis.diff" X-Attachment-Id: f_f1tjl1mm SW5kZXg6IGt3b3JkL3BhcnQvS1dPcGVuRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IGt3b3JkL3BhcnQvS1dPcGVuRG9jdW1lbnRMb2FkZXIuY3BwCShyw6l2aXNpb24gNjY1NTk3KQor Kysga3dvcmQvcGFydC9LV09wZW5Eb2N1bWVudExvYWRlci5jcHAJKGNvcGllIGRlIHRyYXZhaWwp CkBAIC00NTAsNyArNDUwLDcgQEAKICAgICAgICAgLy8xLjY6IEtvVGV4dEZvcm1hdDo6bG9hZAog ICAgICAgICBLb0NoYXJhY3RlclN0eWxlICpjaGFyc3R5bGUgPSBwYXJhc3R5bGUtPmNoYXJhY3Rl clN0eWxlKCk7CiAgICAgICAgIGNvbnRleHQuc3R5bGVTdGFjaygpLnNldFR5cGVQcm9wZXJ0aWVz KCAidGV4dCIgKTsgLy8gbG9hZCBhbGwgc3R5bGUgYXR0cmlidXRlcyBmcm9tICJzdHlsZTp0ZXh0 LXByb3BlcnRpZXMiCi0gICAgICAgIGNoYXJzdHlsZS0+bG9hZE9hc2lzKGNvbnRleHQuc3R5bGVT dGFjaygpKTsgLy8gbG9hZCB0aGUgS29DaGFyYWN0ZXJTdHlsZSBmcm9tIHRoZSBzdHlsZXN0YWNr CisgICAgICAgIGNoYXJzdHlsZS0+bG9hZE9hc2lzKGNvbnRleHQpOyAvLyBsb2FkIHRoZSBLb0No YXJhY3RlclN0eWxlIGZyb20gdGhlIHN0YWNrIHVzaW5nIHRoZSBjb250ZXh0CiAKICAgICAgICAg Y29udGV4dC5zdHlsZVN0YWNrKCkucmVzdG9yZSgpOwogICAgIH0KQEAgLTY5NSw3ICs2OTUsNyBA QAogICAgICAgICBpZiggISBjaGFyc3R5bGUxICkgewogICAgICAgICAgICAgY2hhcnN0eWxlMSA9 IG5ldyBLb0NoYXJhY3RlclN0eWxlKCk7CiAgICAgICAgICAgICBjaGFyc3R5bGUxLT5zZXROYW1l KHRleHRTdHlsZU5hbWUpOwotICAgICAgICAgICAgY2hhcnN0eWxlMS0+bG9hZE9hc2lzKCBjb250 ZXh0LnN0eWxlU3RhY2soKSApOworICAgICAgICAgICAgY2hhcnN0eWxlMS0+bG9hZE9hc2lzKCBj b250ZXh0ICk7CiAgICAgICAgICAgICBkLT5kb2N1bWVudC0+c3R5bGVNYW5hZ2VyKCktPmFkZChj aGFyc3R5bGUxKTsKICAgICAgICAgfQogICAgICAgICBjaGFyc3R5bGUxLT5hcHBseVN0eWxlKCZj dXJzb3IpOwpAQCAtODQzLDcgKzg0Myw3IEBACiAgICAgICAgIHBhcmFnc3R5bGUtPmxvYWRPYXNp cyhjb250ZXh0LnN0eWxlU3RhY2soKSk7IC8vIGxvYWQgdGhlIEtvUGFyYWdyYXBoU3R5bGUgZnJv bSB0aGUgc3R5bGVzdGFjawogICAgICAgICBLb0NoYXJhY3RlclN0eWxlICpjaGFyc3R5bGUgPSBw YXJhZ3N0eWxlLT5jaGFyYWN0ZXJTdHlsZSgpOwogICAgICAgICBjb250ZXh0LnN0eWxlU3RhY2so KS5zZXRUeXBlUHJvcGVydGllcyggInRleHQiICk7IC8vIGxvYWQgYWxsIHN0eWxlIGF0dHJpYnV0 ZXMgZnJvbSAic3R5bGU6dGV4dC1wcm9wZXJ0aWVzIgotICAgICAgICBjaGFyc3R5bGUtPmxvYWRP YXNpcyhjb250ZXh0LnN0eWxlU3RhY2soKSk7IC8vIGxvYWQgdGhlIEtvQ2hhcmFjdGVyU3R5bGUg ZnJvbSB0aGUgc3R5bGVzdGFjaworICAgICAgICBjaGFyc3R5bGUtPmxvYWRPYXNpcyhjb250ZXh0 KTsgLy8gbG9hZCB0aGUgS29DaGFyYWN0ZXJTdHlsZSBmcm9tIHRoZSBzdGFjayB1c2luZyB0aGUg Y29udGV4dAogICAgIH0KICAgICAvL2NvbnRleHQuc3R5bGVTdGFjaygpLnNldFR5cGVQcm9wZXJ0 aWVzKCAicGFyYWdyYXBoIiApOwogICAgIC8vc3R5bGUtPmxvYWRPYXNpcyggY29udGV4dC5zdHls ZVN0YWNrKCkgKTsKQEAgLTEwMzYsNyArMTAzNiw3IEBACiAgICAgICAgICAgICAgICAgaWYoICEg Y2hhcnN0eWxlMSApIHsKICAgICAgICAgICAgICAgICAgICAgY2hhcnN0eWxlMSA9IG5ldyBLb0No YXJhY3RlclN0eWxlKCk7CiAgICAgICAgICAgICAgICAgICAgIGNoYXJzdHlsZTEtPnNldE5hbWUo dGV4dFN0eWxlTmFtZSk7Ci0gICAgICAgICAgICAgICAgICAgIGNoYXJzdHlsZTEtPmxvYWRPYXNp cyggY29udGV4dC5zdHlsZVN0YWNrKCkgKTsKKyAgICAgICAgICAgICAgICAgICAgY2hhcnN0eWxl MS0+bG9hZE9hc2lzKCBjb250ZXh0ICk7CiAgICAgICAgICAgICAgICAgICAgIGQtPmRvY3VtZW50 LT5zdHlsZU1hbmFnZXIoKS0+YWRkKGNoYXJzdHlsZTEpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICBjaGFyc3R5bGUxLT5hcHBseVN0eWxlKCZjdXJzb3IpOwpJbmRleDogbGli cy9rb3RleHQvc3R5bGVzL0tvQ2hhcmFjdGVyU3R5bGUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYnMv a290ZXh0L3N0eWxlcy9Lb0NoYXJhY3RlclN0eWxlLmNwcAkocsOpdmlzaW9uIDY2NTU5NykKKysr IGxpYnMva290ZXh0L3N0eWxlcy9Lb0NoYXJhY3RlclN0eWxlLmNwcAkoY29waWUgZGUgdHJhdmFp bCkKQEAgLTI0LDYgKzI0LDcgQEAKICNpbmNsdWRlIDxRVGV4dEN1cnNvcj4KIAogI2luY2x1ZGUg PEtvU3R5bGVTdGFjay5oPgorI2luY2x1ZGUgPEtvT2FzaXNMb2FkaW5nQ29udGV4dC5oPgogI2lu Y2x1ZGUgPEtvWG1sTlMuaD4KIAogI2luY2x1ZGUgPEtEZWJ1Zz4KQEAgLTIwMyw3ICsyMDQsOCBA QAogICAgIC8vIFdlIHNob3VsZCBzZXBhcmF0ZSB0aGVtIGluIGtvdGV4dC4uLgogfQogCi12b2lk IEtvQ2hhcmFjdGVyU3R5bGU6OmxvYWRPYXNpcyhLb1N0eWxlU3RhY2smIHN0eWxlU3RhY2spIHsK K3ZvaWQgS29DaGFyYWN0ZXJTdHlsZTo6bG9hZE9hc2lzKEtvT2FzaXNMb2FkaW5nQ29udGV4dCYg Y29udGV4dCkgeworICAgIEtvU3R5bGVTdGFjayAmc3R5bGVTdGFjayA9IGNvbnRleHQuc3R5bGVT dGFjaygpOwogICAgIC8vaW4gMS42IHRoaXMgd2FzIGRlZmluZWQgaW4gS29UZXh0Rm9ybWF0Ojps b2FkKEtvT2FzaXNDb250ZXh0JiBjb250ZXh0KQogCiAgICAgaWYgKCBzdHlsZVN0YWNrLmhhc1By b3BlcnR5KCBLb1htbE5TOjpmbywgImNvbG9yIiApICkgeyAvLyAzLjEwLjMKCkluZGV4OiBsaWJz L2tvdGV4dC9zdHlsZXMvS29DaGFyYWN0ZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYnMva290 ZXh0L3N0eWxlcy9Lb0NoYXJhY3RlclN0eWxlLmgJKHLDqXZpc2lvbiA2NjU1OTcpCisrKyBsaWJz L2tvdGV4dC9zdHlsZXMvS29DaGFyYWN0ZXJTdHlsZS5oCShjb3BpZSBkZSB0cmF2YWlsKQpAQCAt MjksNiArMjksNyBAQAogY2xhc3MgU3R5bGVQcml2YXRlOwogY2xhc3MgUVRleHRCbG9jazsKIGNs YXNzIEtvU3R5bGVTdGFjazsKK2NsYXNzIEtvT2FzaXNMb2FkaW5nQ29udGV4dDsKIAogLyoqCiAg KiBBIGNvbnRhaW5lciBmb3IgYWxsIHByb3BlcnRpZXMgZm9yIGEgY2hhcmFjdGVyIHN0eWxlLgpA QCAtMTYzLDcgKzE2NCw3IEBACiAgICAgICogTG9hZCB0aGUgc3R5bGUgZnJvbSB0aGUgXGEgS29T dHlsZVN0YWNrIHN0eWxlIHN0YWNrIHVzaW5nIHRoZQogICAgICAqIE9wZW5Eb2N1bWVudCBmb3Jt YXQuCiAgICAgICovCi0gICAgdm9pZCBsb2FkT2FzaXMoS29TdHlsZVN0YWNrJiBzdHlsZVN0YWNr KTsKKyAgICB2b2lkIGxvYWRPYXNpcyhLb09hc2lzTG9hZGluZ0NvbnRleHQmIGNvbnRleHQpOwog CiBwcml2YXRlOgogICAgIHZvaWQgc2V0UHJvcGVydHkoaW50IGtleSwgY29uc3QgUVZhcmlhbnQg JnZhbHVlKTsK ------=_Part_39973_2527830.1179425724254 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 ------=_Part_39973_2527830.1179425724254--