summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-08-10LOK init: strcpy() -> strncpy()Miklos Vajna1-4/+5
'strcpy' is insecure as it does not provide bounding of the memory buffer in general, so let's avoid it even here. Change-Id: If39319a2df7ddd9297938bc0be67fe5f8a2af962 Reviewed-on: https://gerrit.libreoffice.org/27999 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 60cfbcf9e77d4d88aae94226d74300e2490f8549)
2016-08-09gtktiledviewer: expose undo/redo info in a repair document dialogMiklos Vajna3-4/+110
This shows the full undo and redo stack, with all the metadata available via the LOK API. Also fix SfxUndoManager::GetRedoActionsInfo(), so it's easy to show the undo/redo stack in linear time; and fix a use-after-free in lokdocview. Change-Id: I66625ed453efa61b5738d99d7d1ad8f468908240 Reviewed-on: https://gerrit.libreoffice.org/27913 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit a141cba76606c7dcc4965f0a25cc9a4ff2d8879e)
2016-08-09desktop: add undo/redo support to lok::Document::getCommandValues()Miklos Vajna4-1/+118
Expose the undo/redo stack and the metadata of each item. Reviewed-on: https://gerrit.libreoffice.org/27905 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9dd8a0dcfdff21269f6423224d39d168519fb67e) Conflicts: include/svl/undo.hxx Change-Id: I66b81e855a945c97be3d491ed709959f310d4b73
2016-08-09tdf#101154 Classification -> TSCP Classification for the toolbar nameMiklos Vajna3-3/+3
Change-Id: Iebca1cfcecb1c498c195be919ed9f50e7eb40400 Reviewed-on: https://gerrit.libreoffice.org/27892 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit adbaad53624bd88c58cd1ee2ecfb7207c9ab59ee)
2016-08-09Also the Serbian (Latin and Cyrillic) localisation is woefully incompleteTor Lillqvist1-1/+1
Including a localisation that is painfully incomplete already at the top-level menu level is counter-productive, I think. Change-Id: I73f8cdb1bdbcb5e8cd6c491ad49b8f154f23edc1
2016-08-09Bump patchlevel to 4 as 5.1-3 has now been released in the Mac App StoreTor Lillqvist1-1/+1
Change-Id: I616897acfccc20cacf9f160094dc8c06b1d315a6
2016-08-08Drop UI languages that sadly have quite visibly bad coverageTor Lillqvist1-1/+1
Change-Id: I739afa078b545c0b99fcfdc81fa68251199e8193
2016-08-05LOK init: avoid non-inline function definition in header fileMiklos Vajna1-5/+5
To prevent possible ODR violations. Change-Id: Ic9538244a0bf3760808904d2bcf608151c53f899 Reviewed-on: https://gerrit.libreoffice.org/27883 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 3f02b2aa51e32c46d5b6610480bc1ba22156a3ec)
2016-08-05svl: track creation time of SfxUndoAction instancesMiklos Vajna2-1/+14
It's not yet clear how to expose this on the UI, though. Reviewed-on: https://gerrit.libreoffice.org/27878 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 33a5ab1eb74d140265b471fb33ca98aca7cfb1a6) Conflicts: svl/source/undo/undo.cxx Change-Id: Iee6737922d36e896653b4fae557442747dda1b8b
2016-08-05svl: expose redo actions in SfxUndoManager::dumpAsXml()Miklos Vajna1-1/+17
To see if an undo action is actually deleted or just moved to the redo stack. Change-Id: I40632ea29353e50b643b8b1831d5ffdf443ca75a Reviewed-on: https://gerrit.libreoffice.org/27871 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit ba8fc726ebae7b1ebaf65ae462d56ee0b4af14a3)
2016-08-05sc: implement SfxUndoAction::GetViewShellId() interface ...Miklos Vajna5-3/+58
... in SfxUndoAction subclasses Change-Id: I1504e2cfb0f58ff97e2de7a641d72e4867238164 Reviewed-on: https://gerrit.libreoffice.org/27861 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 7cbb0664b94bb9f4587098c1940de98e4f7aae16)
2016-08-04svl: handle nullptr pWriter in SfxUndoManager::dumpAsXml()Miklos Vajna1-0/+13
This is useful when it's called from gdb for Calc. Change-Id: I22b3e5bbfc5627bff27899a288f7c25179f750ec Reviewed-on: https://gerrit.libreoffice.org/27836 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9460d24883067160c53b53a018a88298131908da)
2016-08-04sd: track view shell id in SdUndoActionMiklos Vajna3-2/+45
This helps in case of e.g. setting the page size of an Impress slide from the sidebar. Change-Id: I6247d6efcc59f2c6311dcd33d0f989a39fd7b3f9 Reviewed-on: https://gerrit.libreoffice.org/27827 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit f6283cf6b4342a0492f1127c2d7a8597255a75c3)
2016-08-04tdf#89466: Slide Background tabRishabh Kumar2-0/+6
Reviewed-on: https://gerrit.libreoffice.org/17007 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 93b4bf647a5899f54ef51f8b4bfed0faa66b466e, just the SID_ATTR_PAGE_SIZE part) Change-Id: Ic3ba6b47a1e5fcaeec76c4e4ff0ba6128653af86
2016-08-04sd doc model dump: include undo manager infoMiklos Vajna2-1/+9
So that it's easy to see where the implementation for a given undo action is. Reviewed-on: https://gerrit.libreoffice.org/24243 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 7a06ef161cc27a3d1bcc8b970928f776500c267e) Change-Id: I93b8603f75d0b5a68922e02540b9db6824f4d0db
2016-08-04svx: track view shell id in SdrUndoActionMiklos Vajna3-3/+29
This is used in Impress e.g. when resizing a picture. Change-Id: I2e0a9228ed0ff9ecfd72696ef84e56f88e4c0f70 Reviewed-on: https://gerrit.libreoffice.org/27822 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 4acac00df5a85ff006ecead06c4018e88caaf401)
2016-08-03editeng: track view shells in SfxListUndoActionsMiklos Vajna3-2/+49
This is needed for e.g. tracking deletions by backspace in Writer shape text. Reviewed-on: https://gerrit.libreoffice.org/27807 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c86e89c5bb040786193f7b8bba8516ffa706a14a) Change-Id: I6f873872566313096c2c57f4a13ac2f1db67e77d
2016-08-03editeng: implement SfxUndoAction::GetViewShellId() interface in EditUndoMiklos Vajna5-1/+51
With this, e.g. inserting a character in a Writer shape text remembers its view shell. Reviewed-on: https://gerrit.libreoffice.org/27796 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit b567278c4aa6e3dee331b60c71eb996babcc9d08) Change-Id: Ic82a3f45a66cf622496e3131390d365440dffb3b
2016-08-03editeng: make SfxUndoAction::GetViewShellId() interface availableMiklos Vajna11-45/+38
Extend the existing OutlinerViewCallable interface to be able to obtain the view shell ID of a view shell, even from editeng. Reviewed-on: https://gerrit.libreoffice.org/27788 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 0762a119fc0a17b80dab1e49fb832a2214f85fdc) Change-Id: I13708b0e4f58ee86643b913c7d21de022a685223
2016-08-02sc lok: add parameters for column/row resizeHenry Castro3-8/+74
Change-Id: I189178b6060c229dd8d93b6fdee7d4d81354ced5 Reviewed-on: https://gerrit.libreoffice.org/27701 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2016-08-02lok: re-load UNO bootstrap pieces and set UserInstallation on second init.Michael Meeks1-1/+3
Ideally should check whether the path is different. Changing the user-install path is useful for valgrinding online outside of a chroot jail. Change-Id: I6ad76af1245491acdcb6664896be89073406b742 Reviewed-on: https://gerrit.libreoffice.org/27782 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-08-02Seems that Clang in Xcode 7.3.1 produces broken code with -O2 in some casesTor Lillqvist1-0/+2
For instance CppunitTest_sw_mailmerge crashes when dbaccess is compiled with -O2, but works fine with -O1. Did not bother with any closer checks for Clang version for now in this branch. Change-Id: I7941e89af312f3102d8b2f4476e29deaaa4d966c
2016-08-02svl: implement SfxUndoAction::GetViewShellId() interface in SfxListUndoActionMiklos Vajna49-75/+168
Client code in sw, sd, sc and svx is adapted, the rest is just a placeholder for now. With this, e.g. the undo item for Writer's insert comment properly tracks which window was used for the insertion. Reviewed-on: https://gerrit.libreoffice.org/27781 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 4cbaa49c0ee707a2e1e1d842279b32473e8c8a28) Conflicts: sc/source/ui/view/viewfun3.cxx Change-Id: Idad587e6ca07ba69bf59aa7013b251af8bf95bab
2016-08-02svl: avoid defaulted parameter in SfxUndoManager::EnterListAction()Miklos Vajna42-62/+62
It's a virtual function, and defaulted parameters there are problematic. Reviewed-on: https://gerrit.libreoffice.org/27772 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 6850f4e8454652ec475811860f5e8cf9bdea67a7) Conflicts: sc/source/ui/view/viewfun3.cxx Change-Id: I3f110c7ac36dfda90811b033620286ad9fce1af1
2016-08-02Don't use spaces in the product names when packaging.cp-5.1-3Jan Holesovsky3-5/+10
Change-Id: I55f332117cc7530eb6d562846db379d95e628a22
2016-08-01Bump version to 5.1-3Jan Holesovsky1-1/+1
Change-Id: I1f252ad57bb12a7758cb056da10a8abc4cd19825
2016-08-01sw undo: implement SfxUndoAction::GetViewShellId() interfaceMiklos Vajna39-125/+164
With this, it's possible to tell which view shell created which undo actions. It's visible only in the doc model xml dump only, though. Reviewed-on: https://gerrit.libreoffice.org/27693 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d60708c5116b4c48b30b94095aafd3e77de46f6a) Conflicts: sw/source/core/undo/unsort.cxx Change-Id: Ia76d218a1d8b578aaad00ab733c772b10dda39f0
2016-08-01svl: add SfxUndoAction::GetViewShellId()Miklos Vajna2-0/+7
In preparation of a Writer version that overrides this and remembers which view shell introduced which action. Change-Id: I4970f8ce9c56f1b57ab1ae92f3ea8be804ca27bf Reviewed-on: https://gerrit.libreoffice.org/27682 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 7494466e43daa4d071224f401267e2b6fd4222aa)
2016-08-01sfx2: introduce SfxViewShell::GetViewShellId()Miklos Vajna4-23/+18
This is quite similar to SwFrame::GetFrameId(), i.e. it assigns a numeric identifier to each instance to help debugging, as those identifiers are stable accross runs. Reviewed-on: https://gerrit.libreoffice.org/27669 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 389d4d414291879b9097658080e405a06dc0c1fc) Conflicts: compilerplugins/clang/badstatics.cxx Change-Id: I9cc57e316435f0284a1d481a956a703be859d67e
2016-07-29fftester: throw on empty stack accessCaolán McNamara4-4/+32
rather than spend the rest of my life protecting each one Change-Id: I181df33b052a0303f072ce0252d98562231569e2 (cherry picked from commit 2710211eb2333cafdb894742a8fa73fb02dc513b) fftester: empty states stack Change-Id: I05dfffced9a8677650a46b43f65a29e9b21c5524 (cherry picked from commit 5de2d02806669812d43e7f23db58ab7a16373ce6) Related: tdf#75757 remove inheritance from std::deque Change-Id: Ia50ea146052c2014ea16474186e2d15ce93581c1 (cherry picked from commit 7a887df4db129ac5222fd4068173b5a06d107a59) Reviewed-on: https://gerrit.libreoffice.org/27640 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 3e0fad77595438e1d36b94bfd6c17d8de8f8ceb0)
2016-07-29fftester: empty table manager stackCaolán McNamara2-0/+3
Change-Id: Ia7f7ace8130d5dfe290207e0cd3d2e6a43b8ab46 (cherry picked from commit df9414084b46c1712dc7151f50023438c62301e2) Reviewed-on: https://gerrit.libreoffice.org/27633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 3f320c21d27c409aa086d044502acf42f60a1a36)
2016-07-29sd: OOoXML import: fix loss of animationsMichael Stahl6-0/+59
There are 2 different animation formats, legacy one used in OOoXML format, based on presentation:animations element, and SMIL based one used in ODF format, based on a node hierarchy with <anim:par presentation:node-type="timing-root"> at the top. The problem is that when the legacy animations are imported, they are not immediately set on the draw-page in the same way as the new animations are imported. "soffice --convert-to odp ooo28334-1.sxi" loses all of the animations, whereas loading the file in the UI and storing it all animations are converted, and if you use API load/store methods some are converted and some not depending on timing. The problem is that there is a necessary conversion step MainSequence::implRebuild() that needs to happen after all the EffectMigration calls for a particular SdPage are finished, which is only triggered by a timer MainSequence::onTimerHdl(). Fix it by forcing a call to implRebuild() from DrawDocShell::Load(). Note: SdDrawDocument::NewOrLoadCompleted() is a horribly misleading function name as it is actually called *before* loading the document. (cherry picked from commit 5206929f3a125a739adb860709586a0f50cb9611) Reviewed-on: https://gerrit.libreoffice.org/27509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 4ca12100ef036c6005d799e26801970118f591f4) Change-Id: I9881cb9bf2ae6ccc5fcf06602343f2d0e0704699 Reviewed-on: https://gerrit.libreoffice.org/27538 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e36acbf3aae7c92c2724b9f3c801735f2321cf05)
2016-07-29Related: tdf#100813 crash in this doc on scrolling past page 44Caolán McNamara1-2/+2
Change-Id: Ib9f1f6f43229ce29e7db7e3fcdacaa10fb692ca4 (cherry picked from commit e1b90609d50b9b8bb48e7c6548b197ed7de77253) Reviewed-on: https://gerrit.libreoffice.org/27361 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit be1cd0aded725d307ee9b53529c1122655b2a391)
2016-07-29update creditsChristian Lohmaier1-1287/+1314
Change-Id: I9679f7b0693ecc380d756b18025b09225afd414c (cherry picked from commit ce3577056dd44d35b38894b7ec573951208209eb) (cherry picked from commit b80a85b160126c758e210b7243047b83705b1efd)
2016-07-29tdf#101138 opengl: blacklist intel drivers for Win 7Tomaž Vajngerl1-0/+3
Change-Id: I1b3db15b2fbdd948dcc9bacf7891f8429f066150 Reviewed-on: https://gerrit.libreoffice.org/27547 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 97fb2a8a43f11dba7c3e82380589b2334d09865a)
2016-07-29No need for own implementation of erfc() in OpenCLTor Lillqvist3-192/+1
The own code was copied from the C++ one we used to have in sal/rtl/math.cxx but which was removed in a62bc6a65abb47adb0e4caff7e38823c15b302fc. However, it did not work correctly on some machines at least, like my AMD A10-7800 running Windows 10. I was unable to figure out why not. This lead to OpenCL being disabled by the Desktop::CheckOpenCLCompute() code we now run early on startup. Anyway, as OpenCL has erfc(), just use that. (cherry picked from commit 4afa88f289de1150850b52d36f2345fd9a9fbc1e) Change-Id: I1684ca5619f8eb6f2e56fc3fea8cb92176f97f54 Reviewed-on: https://gerrit.libreoffice.org/27542 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 36efa60718b37fbd309dcb85e71023e7e9ffbdfd)
2016-07-29Need to try to avoid TDR also with NVIDIA cards on Windows 7 or earlierLaszlo Nemeth3-6/+38
(TDR is Timeout detection and recovery, was introduced in Vista.) Change-Id: If88f8e9e2aff2a5ffd633607ee6aebb5614c5caf Reviewed-on: https://gerrit.libreoffice.org/27522 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cb7b91e9946fdf628b750bcfd318545f8a033b34)
2016-07-29Resolves: tdf#101096 remove the "H after M" ruleEike Rathke1-3/+7
wrongly introduced with c9ed6e832213129cc579c1c309ce9dbd3593c57a Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633 (cherry picked from commit c6e7dbaaa471861dcf76186ed3978ac95f81256e) Reviewed-on: https://gerrit.libreoffice.org/27528 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 57137b00aebbf93b458c04a67f38f62139ee0e20)
2016-07-29crashtesting: fix tdf92993-1.docx failureCaolán McNamara2-1/+17
Change-Id: I76f09a09fd6c3b114ba74737d4a1ba5dad0fd28f (cherry picked from commit 5e46e382694587e88ecdebc7fa57e90fbaca7a76) Reviewed-on: https://gerrit.libreoffice.org/27436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e213a7cfe79f594065b6d64114749c5f49f2380c)
2016-07-29tdf#101070: svg/insert, avoid infinite recursive loop when referencing oneselfJulien Nabet1-1/+1
See bt https://bugs.documentfoundation.org/attachment.cgi?id=126377 Change-Id: I3c6546a5449fc42613e30a7f45f31862752b7187 Reviewed-on: https://gerrit.libreoffice.org/27468 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b7a18f18efbba086454e3b5ec157b156980f97b6) Reviewed-on: https://gerrit.libreoffice.org/27479 (cherry picked from commit 373e73418addd13bdf55716ccb424feaa42708fc)
2016-07-29s/LibreOffice/Collabora Office/ for the product name in one more placeTor Lillqvist1-1/+1
Otherwise I get: ERROR: Product Collabora Office not defined in /Users/tml/lo/co-5.1/instsetoo_native/util/openoffice.lst at /Users/tml/lo/co-5.1/solenv/bin/modules/installer/ziplist.pm line 150. Change-Id: Ibd38e8f081c883ceb393896c0ac35c9be0260847
2016-07-29Quote the product name as it might contain spacesTor Lillqvist1-1/+1
Otherwise we get "ERROR: unknown parameter: Office" for a product called Collabora Office, for instance. Change-Id: Iec99a3eb0848c34861be03ab6036aed707b20ac4
2016-07-29sw layout xml dump: mention SfxViewShell addressesMiklos Vajna5-3/+30
Change-Id: I2e5c8102684494fd3d7c1c70971a09d0c940a124 Reviewed-on: https://gerrit.libreoffice.org/27637 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 73c8bc849c0024d5d81ab0370cffa6aa24b56d22)
2016-07-29tdf#101168 sw: fix missing repaint on undo with multiple windowsMiklos Vajna2-4/+44
Need to lock / unlock all view shells, not just the current one. Change-Id: I754214a202c6bbb74daac6f933481cb3fe7b9dbb Reviewed-on: https://gerrit.libreoffice.org/27620 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1e21c32a2f81b4ae5302fc8d537e4f200a1a3e76)
2016-07-29sw: rename generic rSh in SwBaseShell::ExecUndo()Miklos Vajna1-8/+8
So that it's a bit more obvious it's not a base shell nor a view shell. Change-Id: I723a6394c59f4013576e3c4e2ff3016369d2227c Reviewed-on: https://gerrit.libreoffice.org/27616 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9e903fc1d477e2f65653b36364de0c46a5151955)
2016-07-29gtktiledviewer: quit after the last view is destroyedMiklos Vajna1-1/+16
To allow debugging crash-on-exit problems. Change-Id: Ie54a8391e721c3ba8034b4618dd30733bac97a27 Reviewed-on: https://gerrit.libreoffice.org/27605 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 538ea31c992acb9d47ffd783543e50e149272aac)
2016-07-28fix typoMarkus Mohrhard1-1/+1
Change-Id: Iad24dfe97c9d360879d471606a9df340268860b2 (cherry picked from commit 4186368f9240acf0b5951d541d5ed1a4790e711f)
2016-07-28svx: fix loplugin:nullptrMiklos Vajna1-1/+1
Change-Id: Iff5fbb5c8b2885b0ba84c08f1357fdfc82ecf016 (cherry picked from commit 66dd26659e7c4bb731a88e7dbc809c5b53cb79c3)
2016-07-28svx lok: fix handling of text edit drawing when view/page changesMiklos Vajna4-9/+107
This is a follow-up to commit 9d91d371e92548c7f75a7d0155eecaf3769fdee6 (svx lok: draw text edits in all views, 2016-07-26). Two corner-cases are now handled: 1) When the SfxViewShell is created after begin text edit and 2) When the other draw view is already created, but at the time begin text edit happens, the other draw view shows a different page. And the opposite of these: switching away from a page were we observe a text edit done in an other view or destroying a view that observes a text edit. When the complete view goes away, then SdrObjEditView::HideSdrPage() is not called, so also try to destroy the outliner view of the text edit from SdrObjEditView::DeleteWindowFromPaintView(). The GetSfxViewShell() call in SdrObjEditView::ShowSdrPage() is important, because we let the other draw view create the outliner view, but the outliner view should invoke our view shell, not the view shell of the other draw view. Also improve the SdTiledRenderingTest::testCursorViews() testcase, so that it asserts it managed to begin text edit and use a test document that still has a single slide and shape, but the shape is not auto-sized; otherwise invalidations happen even if outliner views are not created in all draw views, so the test would pass even without the fixes. Change-Id: I2c3bb27826c6887115366db818599fc8adabc5a5 Reviewed-on: https://gerrit.libreoffice.org/27583 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5f65ca15a2297f298536d07cfa8564a1f7c67abb)
2016-07-28svx lok: avoid SfxViewShell::Current() during constructing a new view shellMiklos Vajna4-1/+28
Currently when a text edit is started, then in the LOK case if there is an other view that shows the same page, then both draw views will have an outliner view showing the text edit. This means that in case a view shell is created after starting the text edit, that won't have an outliner view for the text edit. Before fixing this, calls to SfxViewShell::Current() has to be avoided when we're in the process of setting up a new LOK view. In case of Impress, this is a double initialization, and by the time SdrObjEditView::ImpMakeOutlinerView() is called, we're already in the process of setting up the second SfxViewShell (as part of SdXImpressDocument::initializeForTiledRendering()), but SfxViewShell::Current() still points to the old view shell. Which means that the outliner view would refer to a view shell that's deleted soon, and we crash as soon as it tries to invoke a LOK callback. Fix this by adding a virtual member function to SdrObjEditView, and override it in sd, so in case applications want to provide a more precise way of giving the view shell owning a draw view, then they can. Change-Id: Ie0005f73237d4ff9cf576bf16fa5b46280f13759 Reviewed-on: https://gerrit.libreoffice.org/27561 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c0f1c0da77cf9f148b3f29aaf0965dfb43b8a32c)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 23:12:51 +0000