[PATCH] Basic IDE Object Catalog improvements

János Uray uray.janos at gmail.com
Mon Aug 6 06:35:27 PDT 2012


I've resolved the conflicts, than (in a second patch) removed the commented
code lines, as András suggested.

Uray M. János

2012/8/6 Tor Lillqvist <tml at iki.fi>

> Hmm, the patch doesn't apply for me?
>
> patching file basctl/inc/basidesh.hrc
> patching file basctl/source/basicide/baside2.cxx
> Hunk #1 succeeded at 49 (offset -1 lines).
> Hunk #2 FAILED at 1413.
> Hunk #3 FAILED at 1484.
> 2 out of 3 hunks FAILED -- saving rejects to file
> basctl/source/basicide/baside2.cxx.rej
> patching file basctl/source/basicide/baside2.hxx
> Hunk #2 FAILED at 427.
> 1 out of 4 hunks FAILED -- saving rejects to file
> basctl/source/basicide/baside2.hxx.rej
> patching file basctl/source/basicide/baside2b.cxx
> Hunk #1 succeeded at 47 (offset -1 lines).
> Hunk #2 succeeded at 1518 (offset -6 lines).
>
> etc.
>
> --tml
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120806/35a7f654/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Basic-IDE-Object-Catalog-improvements.patch
Type: text/x-patch
Size: 44190 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120806/35a7f654/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Basic-IDE-Object-Catalog-improvements.patch
Type: text/x-patch
Size: 5346 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120806/35a7f654/attachment-0003.bin>


More information about the LibreOffice mailing list