New branch 'feature/change-tracking' available with the following commits: commit cc046697174c878d184e183a1aa28a1167ede6f9 Author: Rosemary Sebastian <rosemary.s...@gmail.com> Date: Sat Jul 16 13:36:05 2016 +0530
WIP Insert redline into document Change-Id: I51bb9e5572b0265c41cc17ae06f26a76b584fde3 commit a6bc6c2b7138b7de5dcd45944eb5321fbd16d53b Author: Rosemary Sebastian <rosemary.s...@gmail.com> Date: Wed Jul 13 13:53:30 2016 +0530 WIP Insert redline into document Change-Id: I98857e98503176c812b0fb70a41cb8e79637da78 commit 45675aed3b9c121266d78e37bccc00dbfbcda09b Author: Rosemary Sebastian <rosemary.s...@gmail.com> Date: Wed Jul 13 06:28:30 2016 +0530 Access aRedlineMap when parsing content.xml - Moved aRedlineMap to global scope. - Made it two-dimensional with the first index indicating the paragraph index and the second indicating the text position within the paragraph. Change-Id: I1c21040e258344c2c42e880fd30dc0efc3689815 commit 7b673a8524e43cfd2b445d386465d71d82e97dc5 Author: Rosemary Sebastian <rosemary.s...@gmail.com> Date: Mon Jul 11 19:58:40 2016 +0530 WIP Insert redline into document Change-Id: I477ef0dc0e62b83059dc5877746c16071a88507b commit e9f5718b13865cd7988412f5d550657f5a4fbd2e Author: Rosemary Sebastian <rosemary.s...@gmail.com> Date: Mon Jul 4 16:19:18 2016 +0530 WIP Import text addition and deletion Change-Id: Ibd960642e6361181c3ab983a2138019e7e7508f8 commit 6ef8bbca51c3774596794a6f52aaab29e532c57e Author: Rosemary Sebastian <rosemary.s...@gmail.com> Date: Sat Jul 2 18:56:55 2016 +0530 Clean up code Change-Id: I637e99315a43a9542988062bdde88f3e033ca8a4 commit 39816f01c52176d6a262e7684ab9535d9f0ebb61 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Sat Jun 25 10:55:35 2016 +0530 Get text positions with changes applied Change-Id: I5ceaad492380d00e55c84cfcf0d66a7c3f4cf9c1 commit 1668fda4bfd7d2681b440497da2ab37f45cf47b8 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Thu Jun 23 09:56:09 2016 +0530 Clean up code Change-Id: Ib44e072f42620a9b17e813996a4ea817cb280da4 commit b4d0ec6e524cd9024d24c398cd911e1565e7495e Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Wed Jun 22 21:17:59 2016 +0530 Fix insertion of text and paragraph Change-Id: I19488bf89e119fbdd5124e14cbc7aa27990321fc commit 79651457952e910786474c9751178077ca121c06 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Wed Jun 22 14:37:36 2016 +0530 Implement export of insertion and deletion changes Change-Id: I6a8b580dc43c744bb181961ff26c95acd10207cb commit 376d7744306dc1f01d50bd7d436adc41b5405f9a Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Sat Jun 18 23:58:20 2016 +0530 No need to mention the type for format changes Change-Id: Idf59881cda5338d44c73702cfb55ce49df781075 commit 0e2e4319c5fd3232dbe09bb8fc18e2e48263643b Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Sat Jun 18 23:30:17 2016 +0530 Get the correct start and end positions Change-Id: I01db8d1556f8518e430e782d56a7310b1475dcb9 commit 70c230c10ad6ba678c00cf5b61235e7c261c7393 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Fri Jun 17 20:24:52 2016 +0530 Prevent crash This is not the correct way to find the element type. Hardcode the element type as "text" for now, to see the character start and end positions in the resulting xml. Change-Id: I254769ee922d6ecfd593e590293ee964878b0d0f commit ef1380d84b36bf0f8d8bb5b77c2eabe4a0d04f61 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Fri Jun 17 19:32:04 2016 +0530 Get the start position of redline Change-Id: I3fd5674b47e33f769cbb22203ab92444a1bb8d47 commit edd64d4304cdf6f18af08e573d0fa952391c7552 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Fri Jun 17 01:41:44 2016 +0530 WIP Get change-tracking information Change-Id: I33982d37ec6b04c1325be5f03455df35d9eaaebe commit 68a5a2baf0dce91569514edac2282d8da85fcb50 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Thu Jun 16 12:14:21 2016 +0530 Store changed element type Change-Id: I7ab24494e6545cd5392c4507d3b469d0e78f357c commit 8554bcbecdeeb709554712a711d75d69e4b5ec6e Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Thu Jun 16 16:49:17 2016 +0530 WIP Get start and end positions of redline Change-Id: I23550fb065eb36fd1be91826397e5d9d0034b0c7 commit 7b2d588fa7dd162c132103500774b278fc149e80 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Thu Jun 16 09:19:51 2016 +0530 No need to export changes inline Change-Id: I11340715aa40fa490339e03c09509d334dc289dd commit d24e473475b93f5c512a831570fa9c14f40ec0bf Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Wed Jun 15 23:32:49 2016 +0530 WIP Implement more types of changes Change-Id: I2d7878bc5e328f63b5f1e17a3cb787d6aebdcc8c commit db2c79d70c5c464ecd794db57f4961df27791997 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Wed Jun 15 12:17:42 2016 +0530 Create "Start" and "End" properties for redline Change-Id: I2c5a69948af9b80334e84f45382f290c9bfcad1a commit baf57f89f63d24aa4592ed52c6cc9236fcde6635 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Tue Jun 14 21:59:32 2016 +0530 Rework the placeholder XML Change-Id: I54d813588910bc2ea324873c8b41977e7ad6340c commit b345d1acaa19e7be250cc6c9cbc5b6bc4d6aff2a Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Mon Jun 13 00:10:48 2016 +0530 Remove all TODO's Change-Id: I8bdd2e54c31158858782045e7d4a86bb46927773 commit 094bbdcabc961e82de7534c5dfa7fa56df658a28 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Sun Jun 12 08:24:17 2016 +0530 The xml should not be nested Change-Id: I8470808c7ac12fd8d61427cd2fadaa1dd13758ca commit 3edd0d2e3591461af647e08f281c296923c8944d Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Tue Jun 7 16:36:18 2016 +0530 Add placeholder xml to store tracked changes Change-Id: I53ad233faa7d148c6d5dbcb1c301b31f5110ced0 commit 9ee00a7db3412f13f70034e168d0b7fa8201f519 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Tue Jun 7 16:34:49 2016 +0530 New namespace is not currently of interest Change-Id: I00f45f4f29f81128c80390acb3899a26cb3d2237 commit cf849897b91af349afbf352bb529acf2b5e9ecfc Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Mon Jun 6 12:06:24 2016 +0530 Import tracked changes from undo.xml Change-Id: If1003968accbc31acdb4b503940c53c01264e60c commit 28e1d02543b437e54c6dfa06141758ff8fe78baf Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Mon Jun 6 21:04:49 2016 +0530 Export addition of format All the values are hardcoded currently. Change-Id: I56ddfaa7f7facfc9c2359cd50031e6531ed05120 commit 49fa48961b58bae09b7872f8ff536b73d2a88f82 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Fri Jun 3 20:45:24 2016 +0530 WIP Save tracked changes in undo.xml Change-Id: I41326b89788ad85646b777d2a8df81f03619ae9f commit 2aa542764ff6816b14d500945666f72a4b3f7881 Author: Rosemary Sebastian <rosemarys...@gmail.com> Date: Tue May 24 17:52:41 2016 +0530 Create undo.xml for change-tracking Change-Id: I41a6de97b5c377e9a5c528c920d5c6e0195b7a10 Reviewed-on: https://gerrit.libreoffice.org/25404 Reviewed-by: Rosemary Sebastian <rosemarys...@gmail.com> Tested-by: Rosemary Sebastian <rosemarys...@gmail.com> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits