summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-05-03it's raining drawing layersprivate/hcvcastro/undo-row-commentEike Rathke1-0/+15
Change-Id: Ieee5cb5792535185ef09c3775072ed739fb0e4b0
2017-05-03sprinkle some drawing layers over test casesEike Rathke2-13/+39
... 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
2017-05-03less ugly ClosingClipboardSource()Eike Rathke3-4/+18
Change-Id: Ie53837e4dd5f779255eac25e090b23e49c3786ce
2017-05-03do not test for different caption pointers ...Eike Rathke1-1/+3
... if it's not guaranteed they may not be identical. Change-Id: Ieb4b0eb07a1b1832df65dde3c2e5a92b5121a162
2017-05-03this should be GetOrCreateCaption()Eike Rathke1-1/+1
... as the caption object has to be created after the note was pasted from a clipboard where the caption was forgotten.. Change-Id: I9b04f0146a7609ac44973dc181fa2ab6b11295b9
2017-05-03unit test for copying note from clipboard after closing orig doc, tdf#104967Eike Rathke1-0/+36
Change-Id: I165363eecbb37561d8265638415e0f5f069878d7
2017-05-03this should had been GetNote() and GetCaption()Eike Rathke1-2/+2
Not creating if there wasn't. Change-Id: I3e7a0d167e604b13674d24de18bd2bc7d3b36aa0
2017-05-03move ScDocShell de-/init related to getNewDocShell() and closeDocShell()Eike Rathke2-8/+24
In preparation for being able to handle two documents. Conflicts: sc/qa/unit/ucalc.cxx Change-Id: Ie7ea65136bcd6719031af6b1034d002058bfd81a
2017-05-03unit test for cell merge with note caption undo, tdf#105667Eike Rathke1-0/+21
Change-Id: Ib49e0f35aa554025634c8496fbb80d87dbc86d89
2017-05-02finally switch the workaround offEike Rathke1-2/+3
Change-Id: I284292a2749c2b38ef874315d5b526e403d578e8
2017-05-02turn assert into SAL_INFOEike Rathke1-11/+7
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
2017-05-02control deletion of SdrCaptionObj within ScCaptionPtr by refcountEike Rathke1-1/+5
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
2017-05-02bail out early if there is no caption to removeEike Rathke1-1/+3
Change-Id: Id08d82751560092fd6225131970f607dbb2e4801
2017-05-02in RemoveCaption() forget() instead of reset(nullptr)Eike Rathke1-1/+6
Change-Id: Id97d4d97c1d46ac6de6198515756a0786a54626e
2017-05-02set mbNotOwner at various placesEike Rathke1-0/+7
Change-Id: I1ff14c573d556cad15513dfe3f0fecbf9107fa41
2017-05-02reset variables when not ownerEike Rathke1-2/+9
Change-Id: Ieab4bf36b89abac2d2ff377fc2b6f31ce0e1d3aa
2017-05-02rename ScCaptionPtr (mb|set)InUndo to (mb|set)NotOwnerEike Rathke3-13/+13
... which better suits the general purpose we'll need Change-Id: I32805c91d17180d5f18225a02c8a436826242e19
2017-05-02flag ScCaptionPtr::setInUndo() in ScUndoReplaceNoteEike Rathke1-1/+12
Change-Id: I174be1262074e1fed784806d2f052b36749dff0d
2017-05-02there are still cases where the caption pointer is danglingEike Rathke1-0/+5
Change-Id: I8c186fa32d7fc3f26d7952268cb1e614025ecf37
2017-05-02finally free the SdrObject in ScCaptionPtr::decRefAndDestroy()Eike Rathke1-10/+12
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
2017-05-02introduce ScCaptionPtr InUndoEike Rathke2-4/+20
Change-Id: Iccc2671b61f524244107233b77b56aaa45f5c72a
2017-05-02Add bool bIgnoreUndo parameter to removeFromDrawPageAndFree()Eike Rathke2-8/+12
In preparation of using that in the dtor. Change-Id: I9a8713390c548e774c1e23cef201effe00a29be9
2017-05-02move implementation from RemoveCaption() to removeFromDrawPageAndFree()Eike Rathke2-21/+30
Change-Id: I4f98112c13dfcd5c6c2fdb5b682cca494d63a954
2017-05-02narrow the assert condition further downEike Rathke1-3/+4
Change-Id: Ia9b1db652b2f15b66b89b51038d16fb0da6ffb6d
2017-05-02can't keep track of drawlayer insertionEike Rathke2-12/+4
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
2017-05-02yet another mxCaption refs==1 case to exclude from assertEike Rathke1-2/+4
Change-Id: Iffa8f2bc7d0bb77d5145a569da2c03aefbb9de4a
2017-05-02tdf#96099 Reduce no of typedefs used for trivial containersDennis Nielen1-5/+2
Change-Id: Idf7bd4c80f9dc1fb9f93859e1e1106dd620d2311 Reviewed-on: https://gerrit.libreoffice.org/35511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-02no assert for one reference while destroying the Undo documentEike Rathke1-2/+3
Change-Id: Idf9e0b2600d503ff50cd6269e8d528c0fad12a3e
2017-05-02finally turn this into a hard assertEike Rathke1-1/+3
Change-Id: Iba6abafeaa2542fc94b76a642ddb0eb5b70b572d
2017-05-02add/use ScCaptionPtr::removeFromDrawPage()Eike Rathke2-2/+21
Change-Id: Ibe073f071b120b61738b7e813a14824248f1fcfc
2017-05-02probably should work like sketchedEike Rathke1-5/+11
Change-Id: I5ad52c718cf53c2f3fb14a7970917e0012d01875
2017-05-02use ScCaptionPtr::insertToDrawPage()Eike Rathke1-3/+4
Change-Id: I98dafdf8e571e4745e05df6cbcbf00fd9ecd8ec6
2017-05-02add ScCaptionPtr::insertToDrawPage()Eike Rathke2-5/+26
Change-Id: I1266b55c2558d306b20b0f2d9fba07b0bc46544e
2017-05-02move assignment onto self should not happenEike Rathke1-2/+1
Change-Id: Ic44f4362762cb1c1fe027b69a78baf768c0a53da
2017-05-02let ScNoteUtil::CreateTempCaption() return ScCaptionPtrEike Rathke4-17/+15
Change-Id: Idcb7fc24a13d650d88bec9ba359d7c78006096ec
2017-05-02coverity#1401471 implement move assignment and move ctor at ScCaptionPtrEike Rathke2-4/+60
Conflicts: sc/inc/postit.hxx Change-Id: Ic429f5e177bb1a35857f00c6e13e5cbb34d46578
2017-05-02Resolves: tdf#106385 don't release ScCaptionPtr too earlyEike Rathke1-4/+5
Change-Id: Ibf0afa1d6c582251a5a2e00f2d6d9c1f267bf746
2017-05-02in decRefAndDestroy() the remaining element must be one and only oneEike Rathke1-8/+5
So head can be destroyed already there and removeFromList() take a short cut. Change-Id: I8f53d252c4e0ad867674ee410ecfaa300ac0c731
2017-05-02dissolve() needs to delete head now that it's not a list element anymoreEike Rathke1-2/+5
Change-Id: I9949a1006e6d1b4b50dd5350106ad69b643e833c
2017-05-02assert that nullptr captions are not in a listEike Rathke1-2/+4
Change-Id: I0c286891454d290ec4373dbc37e31d65c22c746d
2017-05-02move assign() into operator=() and add the relevant bits to copy-ctorEike Rathke2-28/+31
Change-Id: Iac606a8e5e4fc9beb019d95d2a05f0ab9d9dad34
2017-05-02rework ScCaptionPtr to have a distinct head elementEike Rathke2-64/+84
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
2017-05-02a first stab against the note caption ownership messEike Rathke6-99/+391
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@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-02tdf#106359: missing leading dotMike Kaganski1-1/+1
Change-Id: Ibfcbeb0778d9000dad8097384d7f5c7d75be2252 Reviewed-on: https://gerrit.libreoffice.org/37152 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit aebdeb6541e2feea180f9f632e6a626c6ee14957) Reviewed-on: https://gerrit.libreoffice.org/37153
2017-04-27tdf#107392 ODF import: fix z-order sorting of SVG imagescp-5.3-8-winMiklos Vajna9-8/+62
The problem was that in case the document has shapes where the order does not match the z-index order, so sorting is needed, then sorting failed to take the multi-image feature into account. E.g. SVG images have a PNG fallback, but at the end of the shape import the PNG fallback is removed, which means the "actual" (not the "wished") z-index of the shapes after the SVG image has to be adjusted. Without this happening SvxDrawPage::getByIndex() (or in case of Writer, SwTextBoxHelper::getByIndex()) will throw when the importer calls getByIndex(3) but we only have 3 shapes. This results in not honoring the z-index request of the remaining shapes. Regression from commit 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 (re-base on ALv2 code. Includes (at least) relevant parts of:, 2012-10-09), from the Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement http://svn.apache.org/viewvc?view=revision&revision=1220836 part. Reviewed-on: https://gerrit.libreoffice.org/36998 Tested-by: Jenkins <ci@libreoffice.org> Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: Ibe880e5c6c74b728b4a760498720ee31f052b726
2017-04-26Bump version to 5.3-8cp-5.3-8Andras Timar1-1/+1
Change-Id: I882c0bb8199191e1422f8751129004b23f45fcca
2017-04-26Hack-around an unclear Windows problem in the test.Jan Holesovsky1-2/+10
Reviewed-on: https://gerrit.libreoffice.org/36985 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 8b2a287dacc4083c1cb3d6fba9ba41c5422beb12) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I5194c6a20953eb66745539493a8782f089e25e2a
2017-04-26sc lok: Do not change comment indicator settingPranav Kant1-4/+0
This setting is saved to doc model when document is saved eventually. We should respect the user settings, and not play with it like this - changing this setting to false unconditionally. Originally, setting SetNotesMode to false was meant to prevent any kind of in-tile note rendering in case of LOK when it is turned off. But turns out this option is only for note indicator i.e the red button. We already have a LOK in-tile rendering guard in ScDocFunc::ShowNote that prevents popping drawinglayer note even if corresponding UNO command is sent by the LOK client. Change-Id: Id6c7b2cd30cdbefe7dacc2a701638b2488ab245d Reviewed-on: https://gerrit.libreoffice.org/36993 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-04-26tdf#107205 vcl: don't always use D2DWriteTextOutRendererMichael Stahl2-7/+15
... because it cannot rotate text. (regression from commit df556aa47da22f96b3fcd356c12419d3035cba3c) Change-Id: If9bc6e98b8979c5eb02f1a5cfc12b4d19bdc481b (cherry picked from commit 2eb91035c2f60e9dc476336474d51b23b666bb04) Reviewed-on: https://gerrit.libreoffice.org/36904 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 8f51b4272450b6220f563740538f143c0bc70175)
2017-04-26Enable MSP patchingAndras Timar4-3/+4
Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 00:47:31 +0000