[Libreoffice-commits] core.git: Changes to 'private/hcvcastro/undo-row-comment'
Eike Rathke
erack at redhat.com
Mon May 8 12:50:29 UTC 2017
New branch 'private/hcvcastro/undo-row-comment' available with the following commits:
commit ab2d5675fa5e40d15de597024b5dbb771ef9b24f
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 22:38:57 2017 +0100
it's raining drawing layers
Change-Id: Ieee5cb5792535185ef09c3775072ed739fb0e4b0
commit aacb7e3029dd7a1f4baed2234388f66b41001018
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 22:08:38 2017 +0100
sprinkle some drawing layers over test cases
... so things actually work like intended and creation of caption objects
doesn't silently fail. Well, it does SAL_WARN or OSL_ENSURE but that's never
displayed unless a test fails.
Change-Id: Ibf4cc075cc3d6dadbe8f6208b2949310124b5749
commit 0efa1517a7aad5a6c3ff5129cfb7da82be920c9f
Author: Eike Rathke <erack at redhat.com>
Date: Wed Feb 22 18:50:34 2017 +0100
less ugly ClosingClipboardSource()
Change-Id: Ie53837e4dd5f779255eac25e090b23e49c3786ce
commit 5b2827ced1d0610b2bff8ccc62d5f745513d7e91
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 21 23:14:06 2017 +0100
do not test for different caption pointers ...
... if it's not guaranteed they may not be identical.
Change-Id: Ieb4b0eb07a1b1832df65dde3c2e5a92b5121a162
commit cd343b2da25e902d5e6397cc3e43b28fd253bd62
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 21 23:04:48 2017 +0100
this should be GetOrCreateCaption()
... as the caption object has to be created after the note was pasted from a
clipboard where the caption was forgotten..
Change-Id: I9b04f0146a7609ac44973dc181fa2ab6b11295b9
commit 2db14a6acb32a44c7d0fdcc8ba5f173ae7a11e89
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 21 19:03:32 2017 +0100
unit test for copying note from clipboard after closing orig doc, tdf#104967
Change-Id: I165363eecbb37561d8265638415e0f5f069878d7
commit f14ef408777ff3eb53cca272d9b1b52ed06d64c8
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 21 18:18:17 2017 +0100
this should had been GetNote() and GetCaption()
Not creating if there wasn't.
Change-Id: I3e7a0d167e604b13674d24de18bd2bc7d3b36aa0
commit 091c3c85075eb8a714cb3016470845ed1c0c9444
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 21 15:32:35 2017 +0100
move ScDocShell de-/init related to getNewDocShell() and closeDocShell()
In preparation for being able to handle two documents.
Conflicts:
sc/qa/unit/ucalc.cxx
Change-Id: Ie7ea65136bcd6719031af6b1034d002058bfd81a
commit e6c0fbc9e98dbef3fca9f8d37e097b1f4de7ed6d
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 21 14:37:59 2017 +0100
unit test for cell merge with note caption undo, tdf#105667
Change-Id: Ib49e0f35aa554025634c8496fbb80d87dbc86d89
commit 98722be9d6b1940174c309a08e41944b0ef908e4
Author: Eike Rathke <erack at redhat.com>
Date: Thu Apr 13 00:46:33 2017 +0200
finally switch the workaround off
Change-Id: I284292a2749c2b38ef874315d5b526e403d578e8
commit fb5202095b8a9de31b480eb53d68843d852a042b
Author: Eike Rathke <erack at redhat.com>
Date: Thu Apr 13 00:34:34 2017 +0200
turn assert into SAL_INFO
The old assert conditions don't hold anymore since removeFromDrawPageAndFree()
only deletes the SdrCaptionObj on the last refcount, but info can be useful.
Change-Id: I456149b8799a0509dcd7a2da09d627fb0de1a912
commit 4f00a78443b2a2c168b49195065c6d5a688f28f0
Author: Eike Rathke <erack at redhat.com>
Date: Wed Apr 12 23:24:34 2017 +0200
control deletion of SdrCaptionObj within ScCaptionPtr by refcount
I guess this is about the first time ever that repeated Undo and Redo of
Cut&Paste of a cell comment does not crash..
Change-Id: I493a0a5439efde133a07d73ddcbcdf5bda4bc276
commit dc778f8e0a4d1f4587a4e97d44b41e5a67f8ba95
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 11 21:23:27 2017 +0200
bail out early if there is no caption to remove
Change-Id: Id08d82751560092fd6225131970f607dbb2e4801
commit adca2a5a7aa19597992c378d834c80c3f1a3c7bc
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 11 20:58:34 2017 +0200
in RemoveCaption() forget() instead of reset(nullptr)
Change-Id: Id97d4d97c1d46ac6de6198515756a0786a54626e
commit 4a73c962169af4631f253744d4673f6f1f03676f
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 11 18:53:36 2017 +0200
set mbNotOwner at various places
Change-Id: I1ff14c573d556cad15513dfe3f0fecbf9107fa41
commit e87b79ec124c92cf85141c1a8c1fa9b8d1fcbb1d
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 11 18:05:09 2017 +0200
reset variables when not owner
Change-Id: Ieab4bf36b89abac2d2ff377fc2b6f31ce0e1d3aa
commit 624a4372bf4271046ec8a827417f89b27f32cc95
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 11 17:16:32 2017 +0200
rename ScCaptionPtr (mb|set)InUndo to (mb|set)NotOwner
... which better suits the general purpose we'll need
Change-Id: I32805c91d17180d5f18225a02c8a436826242e19
commit 25e1080b27eb528b041459833b36986f00c01780
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 23:25:34 2017 +0200
flag ScCaptionPtr::setInUndo() in ScUndoReplaceNote
Change-Id: I174be1262074e1fed784806d2f052b36749dff0d
commit 898b1ba60088112beed640ee6ffa8d7398e7611f
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 11 13:41:44 2017 +0200
there are still cases where the caption pointer is dangling
Change-Id: I8c186fa32d7fc3f26d7952268cb1e614025ecf37
commit e192250454ef26d08894b3d46e561e9b0b9b44f0
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 23:31:14 2017 +0200
finally free the SdrObject in ScCaptionPtr::decRefAndDestroy()
There may be cases left still to be discovered where a setInUndo() is necessary
in some Undo situations, but this is a start.
Change-Id: Ic62267e3c3d24e4587343ff42da0292fbb166929
commit c237b3366c7a2b5c07406615cbcf5c08210c5cb3
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 23:24:00 2017 +0200
introduce ScCaptionPtr InUndo
Change-Id: Iccc2671b61f524244107233b77b56aaa45f5c72a
commit e1523481d3fdf30ba68d6307458f8618deb39c0b
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 21:26:35 2017 +0200
Add bool bIgnoreUndo parameter to removeFromDrawPageAndFree()
In preparation of using that in the dtor.
Change-Id: I9a8713390c548e774c1e23cef201effe00a29be9
commit 3226a277ce80137eeb15c86e462c521f86d49187
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 20:00:52 2017 +0200
move implementation from RemoveCaption() to removeFromDrawPageAndFree()
Change-Id: I4f98112c13dfcd5c6c2fdb5b682cca494d63a954
commit b0c83fa165e6cdf99614a054fd9d28af09591aca
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 18:54:17 2017 +0200
narrow the assert condition further down
Change-Id: Ia9b1db652b2f15b66b89b51038d16fb0da6ffb6d
commit 7fbfb42ed6015c2d354ce5cd45754811cc984f94
Author: Eike Rathke <erack at redhat.com>
Date: Mon Apr 10 16:25:45 2017 +0200
can't keep track of drawlayer insertion
Draw Undo independently can reinsert a caption to the drawlayer, which
is beyond our knowledge. To track that cumbersome manual tracking (or
callbacks or whatever) would be needed, which actually this tries to get
rid of instead of increasing..
Change-Id: I373843ad61d0b6e19b9d3f98fd8f9e01a448296d
commit 76a061c3153d594ca1993dee76710ef70f0a6199
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 7 16:58:13 2017 +0200
yet another mxCaption refs==1 case to exclude from assert
Change-Id: Iffa8f2bc7d0bb77d5145a569da2c03aefbb9de4a
commit a9b96349dffe344aa98c2028507b658e8c30040c
Author: Dennis Nielen <d.nielen at posteo.nl>
Date: Tue Mar 21 16:09:26 2017 +0100
tdf#96099 Reduce no of typedefs used for trivial containers
Change-Id: Idf7bd4c80f9dc1fb9f93859e1e1106dd620d2311
Reviewed-on: https://gerrit.libreoffice.org/35511
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
commit d24ee03618d183993605d8733cc3523104e3dc25
Author: Eike Rathke <erack at redhat.com>
Date: Tue Mar 14 19:57:04 2017 +0100
no assert for one reference while destroying the Undo document
Change-Id: Idf9e0b2600d503ff50cd6269e8d528c0fad12a3e
commit b1e81a980e449316616e3ac1ce35fcd2761042f9
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 23:15:42 2017 +0100
finally turn this into a hard assert
Change-Id: Iba6abafeaa2542fc94b76a642ddb0eb5b70b572d
commit d18f568cea0f3e9235ac842a891e597fbe689bf0
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 22:09:55 2017 +0100
add/use ScCaptionPtr::removeFromDrawPage()
Change-Id: Ibe073f071b120b61738b7e813a14824248f1fcfc
commit a1b940dd78c36345452188b1cfcb0ba06511100e
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 19:50:31 2017 +0100
probably should work like sketched
Change-Id: I5ad52c718cf53c2f3fb14a7970917e0012d01875
commit 40281dc243ef529a6e715fc78bd2381fd9c4f297
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 16:05:12 2017 +0100
use ScCaptionPtr::insertToDrawPage()
Change-Id: I98dafdf8e571e4745e05df6cbcbf00fd9ecd8ec6
commit 0462f29e7381e43e7bd2126358df2559632dd31b
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 15:22:57 2017 +0100
add ScCaptionPtr::insertToDrawPage()
Change-Id: I1266b55c2558d306b20b0f2d9fba07b0bc46544e
commit 93860e236a0f1aa42e84078b90629a6140d3c4a1
Author: Eike Rathke <erack at redhat.com>
Date: Thu Mar 9 14:29:40 2017 +0100
move assignment onto self should not happen
Change-Id: Ic44f4362762cb1c1fe027b69a78baf768c0a53da
commit 6739f9b2e03ccdc48b202714ec5f8a7e78aee149
Author: Eike Rathke <erack at redhat.com>
Date: Wed Mar 8 18:14:29 2017 +0100
let ScNoteUtil::CreateTempCaption() return ScCaptionPtr
Change-Id: Idcb7fc24a13d650d88bec9ba359d7c78006096ec
commit b306878fb4b2e11fba9ee03a3d3d76a2438335ac
Author: Eike Rathke <erack at redhat.com>
Date: Tue Mar 7 21:26:56 2017 +0100
coverity#1401471 implement move assignment and move ctor at ScCaptionPtr
Conflicts:
sc/inc/postit.hxx
Change-Id: Ic429f5e177bb1a35857f00c6e13e5cbb34d46578
commit dd5c3309faa2e3336382c606257eae588406100e
Author: Eike Rathke <erack at redhat.com>
Date: Tue Mar 7 20:35:45 2017 +0100
Resolves: tdf#106385 don't release ScCaptionPtr too early
Change-Id: Ibf0afa1d6c582251a5a2e00f2d6d9c1f267bf746
commit f912285f4c13ab3f23f4d610693ede8a57a31cac
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 28 18:28:53 2017 +0100
in decRefAndDestroy() the remaining element must be one and only one
So head can be destroyed already there and removeFromList() take a short cut.
Change-Id: I8f53d252c4e0ad867674ee410ecfaa300ac0c731
commit 695aefdf029c13490d6e289a30a8dc89993980a9
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 28 17:16:33 2017 +0100
dissolve() needs to delete head now that it's not a list element anymore
Change-Id: I9949a1006e6d1b4b50dd5350106ad69b643e833c
commit d356ef6846526724eab5b3990d7fff5bd33ef399
Author: Eike Rathke <erack at redhat.com>
Date: Tue Feb 28 13:47:54 2017 +0100
assert that nullptr captions are not in a list
Change-Id: I0c286891454d290ec4373dbc37e31d65c22c746d
commit 4e64d7eedf00aee86461a1f56710196409563f91
Author: Eike Rathke <erack at redhat.com>
Date: Mon Feb 27 22:24:14 2017 +0100
move assign() into operator=() and add the relevant bits to copy-ctor
Change-Id: Iac606a8e5e4fc9beb019d95d2a05f0ab9d9dad34
commit bc0a39989c10d96457d40e7ec7a6e0a20286ef7d
Author: Eike Rathke <erack at redhat.com>
Date: Mon Feb 27 19:50:07 2017 +0100
rework ScCaptionPtr to have a distinct head element
Not only saves a pointer per list element, but future versions could
hold a document pointer and/or drawing layer's draw page as well.
Change-Id: I85e05981239223bec88c47f2ebe4c22e50cd9a0d
commit ee6b6a883b8851bcc63eb7c3e86221e9932e1059
Author: Eike Rathke <erack at redhat.com>
Date: Fri Feb 24 15:30:24 2017 +0100
a first stab against the note caption ownership mess
This should not change any existing behavior, but may help tracking down
what happens where and when. The final goal is to let ScCaptionPtr also
handle deletion of caption objects once they're unreferenced and guard
against dangling pointers and double delete, and/or to manage transfer
of ownership to the drawing layer. Further improvement to the structure
could involve a head data element so that the duplicated (and unused
except in head) mnRefs field could be eliminated and the walk simplified
when removing an element from the list.
Change-Id: Ifbb2fb1d9dc4d2594a1eae2a8489270dd1fe0d0c
Reviewed-on: https://gerrit.libreoffice.org/34616
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins <ci at libreoffice.org>
More information about the Libreoffice-commits
mailing list