Merge some fixes to the odf reader library

Desktop / KDE / Calligra - Inge Wallin [lysator.liu.se] - 20 September 2014 16:09 UTC

Squashed commit of the following:

commit b8b2d517ac8e24f870217cdfebea7feca436197a Author: Inge Wallin Date: Sat Sep 20 23:05:31 2014 +0200

README: Fixed some typos

commit 5334c0ee94191fd39dcb9336873ec48f6e298fe9 Author: Inge Wallin Date: Sat Sep 20 03:24:11 2014 +0200

Small fixes in the odf reader.

commit 6ae66d0202360b70ed65cac326cbb2a4054eaa46 Merge: 79016d9 e15f4cc Author: Inge Wallin Date: Fri Sep 19 21:34:41 2014 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit 79016d9731c3286ac0728580b0c9b284391f9d65 Merge: c3656f7 089dff6 Author: Inge Wallin Date: Sun Apr 13 12:54:49 2014 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit c3656f7df06f10af3d7abdb7725d334eb92469a5 Merge: b780dd3 f1c4432 Author: Inge Wallin Date: Sun Aug 25 19:23:06 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit b780dd3c0adb9874f7fc72d7bfd579f7ff5f60f1 Author: Inge Wallin Date: Sun Aug 25 11:10:56 2013 +0200

Define LIBODFREADER_INCLUDES in the main CMakeLists.txt

commit 6d01c07c0fd4086301794f22709c24918932e980 Author: Inge Wallin Date: Sun Aug 25 09:26:54 2013 +0200

Implement support for .

commit f8071086e346bee93ba6be4101e080dacce0f90c Author: Inge Wallin Date: Sun Aug 25 08:59:58 2013 +0200

Implement table:covered-table-cell

commit 003298177a95af1eb456c343fcbf8bedcfd6afa3 Author: Inge Wallin Date: Sun Aug 25 08:49:02 2013 +0200

Better comments

commit 33e182f456bff86d2bf6c9d7986d9bc5ff849091 Author: Inge Wallin Date: Sun Aug 25 08:20:29 2013 +0200

Enable reading of table contents.

commit 35a7e163725412fc972a4df52e11917fdd417542 Author: Inge Wallin Date: Sat Aug 24 18:56:41 2013 +0200

Add support for table header rows.

Also do some nicer formatting of some comments

commit 83111e63651ede0f22835d8e7ce23254d83cfaea Author: Inge Wallin Date: Sat Aug 24 11:24:14 2013 +0200

Implement very basic support for tables

commit 5de9e69685bdaf3e1620d07b7ca13117520bb381 Merge: 43d6494 9c43651 Author: Inge Wallin Date: Fri Aug 23 02:34:08 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

Conflicts: filters/libodfreader/OdtReaderBackend.cpp filters/libodfreader/OdtReaderBackend.h

commit 43d649485099d61cedbc91c5aafcd5ecd8a9bfaf Author: Inge Wallin Date: Thu Jul 18 23:02:13 2013 +0200

Make the API of the OdtReaderBackend slightly saner.

Previously there was a completely unused pointer given to the constructor.

commit 251716c604e68e5525f6b9c6bfd0ea01a943a407 Author: Inge Wallin Date: Thu Jul 18 22:32:16 2013 +0200

Split out a reader for ODF text contents.

This prepares for readers of e.g. ODS and ODP since it means that we can share the text reading part between them.

Also adapt the ascii filter to the new API.

commit eb5e0f50e3b2a461837f14daeaa725dfa8933dae Author: Inge Wallin Date: Thu Jul 18 15:04:47 2013 +0200

Prepare for merge into master

- Remove some things to come in later installments
- Fix a build issue.

commit 83017f4258513c5bfeaa7e877ce27c2db5fcc538 Merge: 73570b5 35ca4ac Author: Inge Wallin Date: Thu Jul 18 14:41:40 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit 73570b5a3f7b3478d772610c794aa7476c23d4d3 Merge: a46ecd9 cc6f5ab Author: Inge Wallin Date: Sun Jul 14 14:29:51 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit a46ecd992995474a85af245395e38d80c9a74b21 Merge: 80a6a66 7e03514 Author: Inge Wallin Date: Sat Jul 6 07:51:48 2013 +0700

Merge branch 'master' into filters-libodfreader-ingwa

Conflicts: filters/libodfreader/CMakeLists.txt

commit 80a6a66e1240bcc581e62276a2b9cd06cee3cd32 Author: Inge Wallin Date: Sat Jun 8 22:05:07 2013 +0200

Add documentation and support for a few new elements.

commit 591bacd9cb3e972528eb79ec489f65a26ff615ff Merge: bf7ed75 cedf488 Author: Inge Wallin Date: Sat Jun 1 15:12:31 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit bf7ed7502d85f6455312c8fb3888a21fe481e372 Author: Inge Wallin Date: Wed May 22 02:20:04 2013 +0200

Implement elementOfficeDocumentcontent() backend call

This is the last one of the document level callbacks.

commit 22c0ab5311d21491f8eb8249f408da55c1ff0054 Merge: 613c7b4 ac8f70b Author: Inge Wallin Date: Tue May 21 21:44:59 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

We need the newly merged changes from libs-odf2-ingwa.

commit 613c7b480b708c5370ce179765376788585da645 Author: Inge Wallin Date: Sun May 19 13:31:45 2013 +0200

Some cleanup.

commit 592c376fff0d9ab980c8f914cdad336013ad23cc Author: Inge Wallin Date: Sun May 19 12:30:31 2013 +0200

Make it easy to turn debug on and off.

commit 2e318ad5e0d2f3f40002b4f1209d5be056f51a22 Author: Inge Wallin Date: Sun May 19 12:11:09 2013 +0200

Fix last bug with the OdtReader.

This makes the ascii export filter work! In fact it's already better than the old one because this one also extracts contents inside tables.

commit 8d32f10efea822af97b187a9662d369980dedf7b Author: Inge Wallin Date: Sun May 19 12:01:24 2013 +0200

More fixes and more debug.

commit cc5c24036bc06147a80a26d4dd1d73b243e777ad Author: Inge Wallin Date: Sun May 19 03:23:14 2013 +0200

Improve debugging and fix a couple of bugs.

commit 53017dfbdd5546ec0912fb673410cf6a195f3b85 Author: Inge Wallin Date: Sun May 19 00:51:29 2013 +0200

Add more features to the reader

- support for all children office:text (most are ignored)- debug statements- better parsing

commit c3cb4a6065a25351a14342d8e9dee0f5cfb084d5 Author: Inge Wallin Date: Sat May 18 22:10:36 2013 +0200

Port the ascii filter to the odfreader.

Still doesn't work perfectly.

commit 0a4d1ee10c1d0104b24b89de4702d7859a02aa69 Author: Inge Wallin Date: Sat May 18 19:58:11 2013 +0200

Handle unknown elements

commit f7500ab149b243afe11bb1806d6bccb4be5653df Merge: 9c14652 0b8b9c7 Author: Inge Wallin Date: Sat May 18 19:02:40 2013 +0200

Merge branch 'master' into filters-libodfreader-ingwa

commit 9c14652d8f35946b80b9255b4d2113229f082875 Author: Inge Wallin Date: Sun May 12 21:33:35 2013 +0200

Add a simple README to the library.

commit e26e12a9baea6f8492926e12ce0e03ac3115b50f Author: Inge Wallin Date: Sun May 12 17:12:41 2013 +0200

Use our own version of prepareForOdf() until it's exported from libodf.

commit 884c2e681231fe4a926012b2a9f83510b4b598ec Author: Inge Wallin Date: Sun May 12 17:05:25 2013 +0200

Add the first embryo to the new reader and the backend class.

commit fb0a654b9577d12d7c42b49e3de6f798acf6f8b1 Author: Inge Wallin Date: Sun May 12 14:12:50 2013 +0200

Forgot the export macros.

commit 5bc522bc16c2fd962c2f8f2d2c80f5a3695d9194 Author: Inge Wallin Date: Sun May 12 14:11:28 2013 +0200

First commit on the new odfreader library.

This one contains:- create the directory- define the LIB_ODFREADER product in cmake- include it in all levels of cmake files- First two classes: OdfParser and OdfReaderContext

f436f6b Merge some fixes to the odf reader library
filters/libodfreader/OdfTextReader.cpp | 7 ++++---
filters/libodfreader/OdtReader.cpp | 8 ++++----
filters/libodfreader/README | 18 ++++++++++--------
3 files changed, 18 insertions(+), 15 deletions(-)

Upstream: quickgit.kde.org

  • Share