From koffice Wed Oct 17 06:41:41 2001 From: Nash Hoogwater Date: Wed, 17 Oct 2001 06:41:41 +0000 To: koffice Subject: Re: Diff for join (was Re: Proposal for new table-implementation in KWord) X-MARC-Message: https://marc.info/?l=koffice&m=100330089323436 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_HX7CF2QDB455K8MLQIYW" --------------Boundary-00=_HX7CF2QDB455K8MLQIYW Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit OK, new try :-). I did the joinCells method. There is still a bug in the displaying of the table after a join because the lines are exactly in one line, but when you move the table a bit, this will disappear. I also think there is another bug somewhere, because I had once a total **ckup of the table after a second join, but this wasn't reproducable. As far as I could see then it had to do with a reference to a frame that didn't exist anymore :-(. Well I still don't know if this is what you want, but as far as I can see, it works. Splitting will be harder :-). Nash On Tuesday 16 October 2001 12:10, Thomas Zander wrote: > On Tue, Oct 16, 2001 at 11:38:04AM +0200, Nash Hoogwater wrote: > > Hi Thomas, > > > > Well I looked at the code for join, but all I did was reinstating (I > > think) the commented code (see attachment) and it worked. I kinda have > > the feeling that I'm missing the point on "the new style" :-(... > > > > Cheers, > > > > Nash > > > > <- snip -> > > The new style does positioning differently. Instead of using the > positioning of the cells I not register the position of the rows and > columns in a list of doubles. > > The positioning of an individual cell is then done in the method > position(); > > The thing that has to be added is that the m_colPositions and > m_rowPositions have to be updated. > > Its pretty hairy code, so I can imagine you have real problems with this. > Tell me if you don't understand this stuff, we can find another nice thing > for you to do ;) --------------Boundary-00=_HX7CF2QDB455K8MLQIYW Content-Type: text/x-diff; charset="iso-8859-1"; name="join.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="join.diff" MzA2LDMwN2MzMDYsMzA3CjwgICAgIGlmKGFjdGl2ZUNlbGwtPmdldEZyYW1lKDApLT5yaWdodCgp IC0gYWN0aXZlQ2VsbC0+cmlnaHRCb3JkZXIoKSAhPSAKPCAgICAgICAgICAgICBtX2NvbFBvc2l0 aW9uc1thY3RpdmVDZWxsLT5tX2NvbCArIGFjdGl2ZUNlbGwtPm1fY29sc10pIHsgLy8gcmlnaHQg Ym9yZGVyIG1vdmVkIAotLS0KPiAgICAgaWYoYWN0aXZlQ2VsbC0+Z2V0RnJhbWUoMCktPnJpZ2h0 KCkgLSBhY3RpdmVDZWxsLT5yaWdodEJvcmRlcigpICE9Cj4gICAgICAgICAgICAgbV9jb2xQb3Np dGlvbnNbYWN0aXZlQ2VsbC0+bV9jb2wgKyBhY3RpdmVDZWxsLT5tX2NvbHMtMV0pIHsgLy8gcmln aHQgYm9yZGVyIG1vdmVkCjMzMGQzMjkKPCAgICAgICAgICAgICBsYXN0PWNvbFBvczsKMzMyLDMz M2QzMzAKPCAgICAgICAgIHJlZHJhd0Zyb21Db2w9Y29sOwo8ICAgICAgICAgaWYoY29sPjApIHJl ZHJhd0Zyb21Db2wtLTsKMzM0YTMzMiwzMzMKPiAgICAgcmVkcmF3RnJvbUNvbD1jb2w7Cj4gICAg IGlmKGNvbD4wKSByZWRyYXdGcm9tQ29sLS07CjM2NiwzNjdjMzY1LDM2Nwo8ICAgICBpZihhY3Rp dmVDZWxsLT5nZXRGcmFtZSgwKS0+Ym90dG9tKCkgLSBhY3RpdmVDZWxsLT5ib3R0b21Cb3JkZXIo KSAhPSAKPCAgICAgICAgICAgICBnZXRQb3NpdGlvbk9mUm93KGFjdGl2ZUNlbGwtPm1fcm93ICsg YWN0aXZlQ2VsbC0+bV9yb3dzKSkgeyAvLyBib3R0b20gbW92ZWQgCi0tLQo+IAo+ICAgICBpZihh Y3RpdmVDZWxsLT5nZXRGcmFtZSgwKS0+Ym90dG9tKCkgLSBhY3RpdmVDZWxsLT5ib3R0b21Cb3Jk ZXIoKSAhPQo+ICAgICAgICAgICAgIGdldFBvc2l0aW9uT2ZSb3coYWN0aXZlQ2VsbC0+bV9yb3cg KyBhY3RpdmVDZWxsLT5tX3Jvd3MpKSB7IC8vIGJvdHRvbSBtb3ZlZAo0MjBjNDIwCjwgICAgICAg ICAgICAgICAgIHBhZ2VCb3R0b20gPSBwYWdlTnVtYmVyICogbV9kb2MtPnB0UGFwZXJIZWlnaHQo KSAtIG1fZG9jLT5wdEJvdHRvbUJvcmRlcigpOyAgICAKLS0tCj4gICAgICAgICAgICAgICAgIHBh Z2VCb3R0b20gPSBwYWdlTnVtYmVyICogbV9kb2MtPnB0UGFwZXJIZWlnaHQoKSAtIG1fZG9jLT5w dEJvdHRvbUJvcmRlcigpOwo5OTBjOTkwCjwgICAgIH0gCi0tLQo+ICAgICB9CjEwNzQsMTA3NmMx MDc0LDEwNzcKPCBrZERlYnVnKCkgPDwgImJvdHRvbTEiIDw8IGdldENlbGwocm93RW5kLCBjb2xC ZWdpbiktPmdldEZyYW1lKDApLT5ib3R0b20oKSA8PCBlbmRsOwo8ICAgICAvL2RvdWJsZSBib3R0 b209Z2V0Q2VsbChyb3dFbmQsIGNvbEJlZ2luKS0+Z2V0RnJhbWUoMCktPmJvdHRvbSgpOwo8IGtk RGVidWcoKSA8PCAicmlnaHQxOiAiIDw8IGdldENlbGwocm93RW5kLCBjb2xFbmQpLT5nZXRGcmFt ZSgwKS0+cmlnaHQoKSA8PCBlbmRsOwotLS0KPiAKPiAvL2tkRGVidWcoKSA8PCAiYm90dG9tMSIg PDwgZ2V0Q2VsbChyb3dFbmQsIGNvbEJlZ2luKS0+Z2V0RnJhbWUoMCktPmJvdHRvbSgpIDw8IGVu ZGw7Cj4gLy8gICAgZG91YmxlIGJvdHRvbT1nZXRDZWxsKHJvd0VuZCwgY29sQmVnaW4pLT5nZXRG cmFtZSgwKS0+Ym90dG9tKCk7Cj4gLy9rZERlYnVnKCkgPDwgInJpZ2h0MTogIiA8PCBnZXRDZWxs KHJvd0VuZCwgY29sRW5kKS0+Z2V0RnJhbWUoMCktPnJpZ2h0KCkgPDwgZW5kbDsKMTA3OWExMDgx Cj4gCjEwOThhMTEwMQo+IAoxMTA3YzExMTAsMTExMQo8ICAgICBmaXJzdENlbGwtPmdldEZyYW1l KDApLT51cGRhdGVSZXNpemVIYW5kbGVzKCk7Ci0tLQo+ICAgICBmaXJzdENlbGwtPmdldEZyYW1l KDApLT5yZW1vdmVSZXNpemVIYW5kbGVzKCk7Cj4gLy8gICAgZmlyc3RDZWxsLT5nZXRGcmFtZSgw KS0+dXBkYXRlUmVzaXplSGFuZGxlcygpOwoxNzMwYzE3MzQKPCBkb3VibGUgS1dUYWJsZUZyYW1l U2V0OjpDZWxsOjpsZWZ0Qm9yZGVyKCkgeyAKLS0tCj4gZG91YmxlIEtXVGFibGVGcmFtZVNldDo6 Q2VsbDo6bGVmdEJvcmRlcigpIHsKCg== --------------Boundary-00=_HX7CF2QDB455K8MLQIYW--