summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-08-23Resolves: tdf#101572 New Belarusian Ruble BYN/Br for [be-BY]Eike Rathke1-1/+8
Change-Id: I742ca7ae410f49cfa84e595433b241c4a7ca9ecb (cherry picked from commit 92ba4bc561293cc29e4e92bc3791dd9db1da6b9c) Reviewed-on: https://gerrit.libreoffice.org/28214 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3242a37f35d2691a7fe080e571c96ee8e40786c4)
2016-08-23Resolves: rhbz#1364406 inherit the actual format index also for date and timeEike Rathke1-3/+12
So summing [HH]:MM cells or calculating with dates uses the same format in the result, not just the default format of a type. This also fixes the apparently broken state stored by 4.4 (and earlier, later?) where no type information was stored with the formula cell, which may be just due to the old behavior of not applying the actual format but determining it on the fly instead. Change-Id: I14d0a7d07185bf5c77e0d7f6989a4a1d1a468d27 (cherry picked from commit f2e3de4dfcf10f9a59f8fc3f051c620fd50ef3c2) Reviewed-on: https://gerrit.libreoffice.org/27917 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 6b63d44fee68a8db94b045c60767ee11a7265446)
2016-08-23Resolves: tdf#100582 SetMatColsRows() when constructing matrix ScFormulaCellEike Rathke1-1/+13
... from an ScFormulaCellGroup token array, because ScFormulaResult that holds the matrix dimensions is not cloned in that case as we don't clone from an ScFormulaCell. Change-Id: I13ab1b29db71ae1618580de995fe12ec423d4dc7 (cherry picked from commit c82a81bbda104ef08dd9e18725a09475b2d65183) Reviewed-on: https://gerrit.libreoffice.org/27809 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 10195ce5563d6ac93177b67d484151c01a751922)
2016-08-19sw redlines: expose description as part of the UNO/LOK APIMiklos Vajna8-4/+26
A redline can have a manual comment and also an autogenerated description, like "Insert 'abc'". Expose this later property as well, as it provides useful additional information, especially when the comment property is empty. Change-Id: Id0f0ff62aef58d96b9b6071706c6f5b4a0d74800 (cherry picked from commit 9e310a4705ce956551059040696166aefb2388cb)
2016-08-19sw lok: add callbacks for redline table insertion / removalMiklos Vajna6-5/+111
An alternative would be to follow the Manage Changes dialog approach and subscribe to the SFX_HINT_DOCCHANGED notification in SwDocShell, cache the old redline table and find out the differences to the current one, but that way sound much more complex without benefits. (cherry picked from commit 0bc553f3ef3c188a96ea4875f4722ad4d40da4a3) Conflicts: sw/source/core/doc/docredln.cxx Change-Id: I20a45285b88255ccea9d6646c0b5288ac1c91879
2016-08-19sw: remove never read SwViewShell::mbInLibreOfficeKitCallbackMiklos Vajna6-6/+22
This was read in the now removed SwViewShell::libreOfficeKitCallback(), so add a similar flag to SfxViewShell instead, and restore the lost condition. This fixes paint/invalidation loops when inserting the first comment to a Writer document in gtktiledviewer. Reviewed-on: https://gerrit.libreoffice.org/28236 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 8b4705e0e0c76503b1ca61cb567d222f49466fc5) Conflicts: sfx2/source/view/viewsh.cxx Change-Id: Iad5ef90848f3b309ef8db4553760dd36d9b8a37c
2016-08-19sw: fix indentation in DocumentRedlineManager::AppendRedline()Miklos Vajna1-4/+4
Change-Id: I61cc418378ef6135c3da15cfa47b85fb422a7b34 (cherry picked from commit 0b95e19d257d2afc1ec161c712e213aedfd6ccbe)
2016-08-19tdf#101592 sw: track changes state is doc-specific, not view-specificMiklos Vajna5-3/+57
So update the bindings of all views after changing it. Reviewed-on: https://gerrit.libreoffice.org/28233 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d890ec2f130188af9d998abf5968f06e7218b7a4) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx Change-Id: I5355f40ba27be521dcdf343b08305f3736979bbb
2016-08-19sw: fix accepting/rejecting a change by index when cursor is not at a redlineMiklos Vajna2-3/+38
When there is no index, then the cursor position is used to find out which redline to accept/reject. LOK uses the index parameter instead, so there never disable the command. Change-Id: Icbe0905e4ebd170c6f33fe383cd3042d812a2eb0 (cherry picked from commit b6011f07254f8003929320ad842d8d09daca0e09)
2016-08-19gtktiledviewer: specify author name when calling initializeForRendering()Miklos Vajna3-7/+36
Open two views, and type into both of them when a Writer doc with redlining enabled is open: the manage changes dialog now shows how the correct author is used when creating the redline items. Change-Id: I48fb90301bfcc04b06d5be5544324ca76fe7b3d7 (cherry picked from commit f2afe318ce800c1b301f7e1aef769194aa676b12)
2016-08-19sw redlining: support per-view authorsMiklos Vajna6-0/+62
In case there are multiple SwView instances and SetRedlineAuthor() is called with a non-empty string on them, switching views will keep the SwModule redline author string up to date as expected. (cherry picked from commit cb9362faad9fe702031c5e657a31b1963ad4d374) Conflicts: sw/source/uibase/uno/unotxdoc.cxx Change-Id: I363221049dbacd67d7c8f4ff3e778f8032a3bc43
2016-08-19svl: no need to iterate in reverse order in GetRedoActionsInfo()Miklos Vajna1-2/+4
We have random access to the array after all, so the non-reverse order is OK as well, and it's more readable. Change-Id: I966a56ae2e161d95f56927be1b2a9f9162d0f7bb Reviewed-on: https://gerrit.libreoffice.org/28204 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 19eab7b79c13edc657f4e3f380889ed0206357bd)
2016-08-18sw: allow accept/reject of redline by indexMiklos Vajna4-11/+89
Previously .uno:AcceptTrackedChange / .uno:RejectTrackedChange always worked by cursor position, but redlines are stored in the redline table, so they have a unique index. Allow specifying that index when invoking the command, and in that case ignore the cursor position. The index is not stable after an insertion / deletion. Reviewed-on: https://gerrit.libreoffice.org/28192 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 087b71f423cf6c047137fb1316527132bb47fc05) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I493a22e84800ded224fb6b9c61261744dc0fb64f
2016-08-18lok::Document::getCommandValues: expose redline infoMiklos Vajna3-1/+145
Index is added as a property for each item, so that later changes can be identified by the index when they are accepted/rejected. Change-Id: I9362d208fdbed1f46d64558d44498d2b19150c81 (cherry picked from commit 69fb6a307172e244497bc618a102afccdd7c93b7)
2016-08-17sd lok: limit undo/redo access to undo actions created by the same viewMiklos Vajna4-1/+109
Unlike in Writer, the state and the exec method of .uno:Undo is different codepath so for now ignore the Repair argument of the command, assuming that the command is only dispatched if the command is enabled. Change-Id: I3bfe8d72522f32efe436e21c383c99b3612eab6b (cherry picked from commit e0a3269183bf145511361a3968dca07824923dd4)
2016-08-17LOK unit tests: document what is a view callbackMiklos Vajna3-0/+3
Reviewed-on: https://gerrit.libreoffice.org/28168 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c3c5635b9bbd3de65760409c7f4e72b295b749be) Conflicts: sc/qa/unit/tiledrendering/tiledrendering.cxx Change-Id: Ic605ca12cebfb6fd8239829942bbc6a70f45ac06
2016-08-17editeng: introduce OutlinerViewShell::NotifyOtherViews()Miklos Vajna6-2/+61
This allows notifying other views about e.g. cursor position changes even if SfxLokHelper::notifyOtherViews() is not accessible from editeng. Change-Id: I921e97344ffe562109a221f241e70b3f68ee9aaf Reviewed-on: https://gerrit.libreoffice.org/28162 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 77235ac64be61afd707931675fec100c7c50d01c)
2016-08-16unused class: drawinglayer::primitive3d::Primitive3DContainercp-5.1-4Andras Timar1-17/+0
Change-Id: I45a73463732c64ba61c2845f9294b4836ce0a6de
2016-08-16Revert part of 1f86864e97bea causing Windows build trouble.Michael Meeks1-0/+1
Change-Id: I835f8e33565d20d9fe371cafeededdd32f157f98 (cherry picked from commit decd9475986b4d90d550f824658c9424154dcb8a)
2016-08-16sw lok: limit undo/redo in SwDrawTextShellMiklos Vajna5-3/+106
So that one view can only undo/redo its own changes. This is used when editing shape text, as that doesn't use sw::UndoManager::GetLastUndoInfo(). Change-Id: Ibc3d6fcbd18398569190f06ed9b7399c54bb7d41 (cherry picked from commit 40231526b6a0d6d8713932b3ae60d665f615833c)
2016-08-16Updated coreChristian Lohmaier1-0/+0
Project: translations 5646c9aa1b687715f7a0126101663f1b1db03e43 update translations for 5.1.5 rc2 and force-fix errors using pocheck Change-Id: Ia267eb3eacadb04beab29b68f1a92ed66b1274c9
2016-08-16Updated coreAndras Timar1-0/+0
Project: dictionaries 0f1ab1fdfce99714b9af6090a0191facb21735b7 Update pt_PT dictionary to version 16.7.4.1 Change-Id: If00be0e9c05c5cf1cc67427eed723484ad33e6d2 (cherry picked from commit a4a8bb897b5e5dc0b90579b73ed071d47f66f699) Reviewed-on: https://gerrit.libreoffice.org/27000 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-15update creditsChristian Lohmaier1-1343/+1379
Change-Id: I004192541467afc5d8f31fe4c3c5f466b7b3dd17 (cherry picked from commit b17b4da3a713b935e7eb8cf23978689800d10f7f) (cherry picked from commit e19cfef1c0e185f179558ab68b3aec7ecc9b23ed)
2016-08-15OFFICE-3708: package: recognize correct SHA256 URLMichael Stahl4-3/+9
ODF 1.2 uses an incorrect URL to refer to SHA256, add support for the correct W3C URL on import but continue to export the incorrect URL for now. Change-Id: I3135bcf989070d20f85f14702db07595f304e706 (cherry picked from commit 1015d35f2362953f415804476037d4f162eb49b5) Reviewed-on: https://gerrit.libreoffice.org/28008 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 a040c39bb6be83f47449320eb4cc185458e2cc79)
2016-08-15Resolves: tdf#101213 drop use of CAIRO_OPERATOR_DIFFERENCECaolán McNamara1-14/+9
for tdf#99446 and rhbz#1283420 there is a hackaround which ended up in 5.1.5, which is not in 5.1.4, for corrupt glyphs under X. I can still reproduce the problem if I drop the CAIRO_OPERATOR_DIFFERENCE usage here with master and gtk2. This alternative hackaround to force a read of the underlying surface works just as well (help->license information is the reproducer) but reportedly solves the performance regression. (cherry picked from commit 705d7597480b2307d7e4929ce9386d80ce2a0f16) Change-Id: Ie3c5b07409537a1734226b4ce034620351297e25 Reviewed-on: https://gerrit.libreoffice.org/27984 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d89abe0806947149eafbd9d7ce4b3095ec38b236)
2016-08-15fftester: guard against empty table manager stackCaolán McNamara2-3/+1
(cherry picked from commit 145e2dfc4501cb3fa01a1771cb6829b5945df4a6) Reviewed-on: https://gerrit.libreoffice.org/27938 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 329f8d8b96d8abdaed31b8a5bcc417604d388931) Change-Id: Ibb4cadb58aa17eacfc9741f7f13c780be347cd8b
2016-08-15tdf#75256 Sifr icon updateMatthias Freund13-0/+0
Change-Id: I6d08448056f42b80c9ba04a3b5d99a5679952c5e Reviewed-on: https://gerrit.libreoffice.org/27847 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit a47aa43b5c6ad8bfbff2f052dd48555174150443)
2016-08-15Sifr: Add thesaurus duplicate to links.txtYousuf Philips1-0/+4
Change-Id: I0cfecbef999bb251c1fd8829aed0a4f0268e176c Reviewed-on: https://gerrit.libreoffice.org/27870 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit c63aaa624aa6e949e127fb8ef00c4f3744c72b76) Reviewed-on: https://gerrit.libreoffice.org/27877 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d936459505a081fbe3f608e52c7d110aee517548)
2016-08-15tdf#101147 New approach to fix minute/month detectionLaurent Balland-Poirier1-6/+4
Other formats may be differently interpreted HH YY/MM => Month expected HH DD/MM => Month expected Change-Id: Iabb17911bf2907c02b6b898052b6933692f8074a Reviewed-on: https://gerrit.libreoffice.org/27887 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 21639ac7f5b075808925186cdd5a102eb8d7a02a)
2016-08-15break the Excel rule for YMD and DMY, tdf#101147 follow-upEike Rathke1-2/+10
Clearly in {HH YYYY-MM-DD} the MM should not be minute. Also not in {HH DD.MM.YY}. Don't follow every bullshit. Period. It is debatable how to treat MDY, {HH:MM DD/YY} should be different from {HH MM/DD/YY}, Excel ironically takes both as minute, even in an en-US locale. (cherry picked from commit 88134dcba680418496f7a1c70a47fde0159ce390) Conflicts: svl/qa/unit/svl.cxx Change-Id: I13d39a36294e3c40cc0e9bf72026804b299bb264 Reviewed-on: https://gerrit.libreoffice.org/27814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 97c0d2cf817d0d995dbc3d0901dbbfb4491e9664)
2016-08-15fftester: null DestinationTextCaolán McNamara4-24/+31
(cherry picked from commit 0dd22165346f4296718656d17ae98ebbfe563719) Reviewed-on: https://gerrit.libreoffice.org/27670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 51ea0875a7d3c6cd794cdec885b610efe635544c) Change-Id: Icdd71733c4e9f4b36e6e957e4dea772087890faa
2016-08-15Related: tdf#92516 make menu accelerators always work even if...Caolán McNamara1-11/+2
keyboard not used yet. The gtk2/3 menus appear to work this way. (And when not in gtk2/3 it shouldn't disable the accelerators for other platforms anyway) (cherry picked from commit f6d0d92a5e249413df99a7f3677a28efe6d45426) Change-Id: Ib7a99bd9039cd07120b3b77380f810b5b028fd57 Reviewed-on: https://gerrit.libreoffice.org/27795 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 1288a0682ab4c960915722d2bb52a200e75580a3)
2016-08-15Galaxy: Minor fixes to newly created iconsYousuf Philips3-0/+0
Change-Id: I8c3deef63cf48dc8d7334df5baa5e49fc49a9e6a Reviewed-on: https://gerrit.libreoffice.org/27860 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 32b4c63a8915bfeda0c7912e2b61295aa4cfa4b0)
2016-08-15Galaxy: Replace tango icons with galaxy iconsYousuf Philips16-0/+2
Change-Id: I88c062299d4fbd757ee3b91ece1a75bec0fd3827 Reviewed-on: https://gerrit.libreoffice.org/27740 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 9001992ea312af4dcb3711d614a69d4d1df91784)
2016-08-15mapping ERROR.TYPE to ORG.OPENOFFICE.ERRORTYPE was always wrongEike Rathke1-1/+1
Change-Id: I02b941a1a884a984b39632cad36579130cd71d6c (cherry picked from commit 3d70765218986abba8b6d7c8e3cadd83a62ee035) Reviewed-on: https://gerrit.libreoffice.org/27853 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e1b88ef7dbbdf7e333630e9295bd317772907ad6)
2016-08-15Resolves: tdf#97193 restore pre 5-1 values for INS_INSROWS and INS_INSCOLSCaolán McNamara1-3/+3
i.e. INS_INSCOLS_BEFORE and INS_INSROWS_BEFORE have the same meaning as the old INS_INSROWS and INS_INSCOWS, so reorder the enum so they are at the positions of their corresponding originals. This makes macros recorded before 5-1 work like they did prior to 5-1-0. This unfortunately will have the same effect to macros recorded during the 5-1 period that the original change did. regression since... commit f97beeef352fdd9fd4f157a7a4c4f6af8341cbe6 Date: Wed May 20 16:54:27 2015 +0200 Calc: Insert row/col before/after [1/2] This part renames all INSROW / INSCOL to INSROWS_BEFORE / INSCOLS_BEFORE which is the current (default) behaviour. Change-Id: Ide90b8cfebe4af1a3718d93c34657663c20ccc62 (cherry picked from commit 7ec4a495291c7427bba5256bf2c54f1da999ea52) Reviewed-on: https://gerrit.libreoffice.org/27835 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 715664eb09c460e7f00fe4d114b65bb34bb051a3)
2016-08-15fftester: guard against no drawing object property setCaolán McNamara2-1/+1
(cherry picked from commit db686815b41c52598f0952613ff8c6be34b2f0e0) Change-Id: I51736459f9f098d9d793bff3b9a1a403962e099d Reviewed-on: https://gerrit.libreoffice.org/27801 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f9b830d7cd47c61cff3162fd396d81f29d205ce9)
2016-08-15fftester: another table manager stack checksCaolán McNamara2-2/+2
and a m_xTextFactory check too Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b (cherry picked from commit 8a6b2fb5b94de43316ab3ea95ff07cf5f46b6134) Reviewed-on: https://gerrit.libreoffice.org/27760 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit fbed48db0b09cfed8070d7644b0922c79d3d7512)
2016-08-15Resolves: tdf#100123 prefer notation priority in detecting range/addressCaolán McNamara1-43/+91
i.e. try and parse whether something is a range or an address in order of document address convention, Calc A1, Excel A1 and Excel R1C1, rather than check if something is a range in any of those conventions before checking if it might be an address in any of those conventions. Reviewed-on: https://gerrit.libreoffice.org/27821 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Backported. Conflicts: sc/source/ui/view/tabvwsh3.cxx Change-Id: Ibb744c3eda78a80f33bdbfa5f5ddf0aa5b6361af Reviewed-on: https://gerrit.libreoffice.org/27825 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 00992771455dae0eb83b8c705ae648ad3683f0ef)
2016-08-15avoid name clash for CDataFormatTranslator in ftransl, tdf#100872Markus Mohrhard3-17/+17
E.g. http://crashreport.libreoffice.org/stats/signature/com::sun::star::datatransfer::DataFormatTranslator::create%28com::sun::star::uno::Reference%3Ccom::sun::star::uno::XComponentContext%3E%20const%20&%29 Reviewed-on: https://gerrit.libreoffice.org/27157 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 37204431c68a4725b4539fa35e9fcea4fe94c166) Conflicts: dtrans/source/win32/ftransl/ftransl.hxx Change-Id: I55d7fc9a83526de0cc5f838f0ee2c7e4649dbe6b Reviewed-on: https://gerrit.libreoffice.org/27180 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e3ba28a55334c1eaa32714db7caad538486078fe)
2016-08-15tdf#101147 Improve (again) minute/month detectionLaurent Balland-Poirier1-8/+15
For format like HH:MM:SS MM/DD second MM is detected as minute: see tdf#95339 New rules: - first M following each H is minute - first M following first S is minute Detection Month/minute now fully compatible with Excel even with unwanted detection: SS:MM:HH DD/MM/YY second MM is minute even if user would expect month Reviewed-on: https://gerrit.libreoffice.org/27560 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit aa6bca0dfa0a58aae91eb5fa3564add642cd4238) Conflicts: svl/qa/unit/svl.cxx svl/source/numbers/zforscan.cxx Change-Id: Ia789fbc2dbd6d2dcbe9b9c34d3f288674966dd10 Reviewed-on: https://gerrit.libreoffice.org/27771 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 24a0aa8d9c28624b4e0961726922e054554af705)
2016-08-15Galaxy: Add icons for track changes, bookmark, and browser previewYousuf Philips17-0/+0
Change-Id: I11143967720c9cfa310c6a32f679894d15b94204 Reviewed-on: https://gerrit.libreoffice.org/22495 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 5101743e62980a1f6e1212116d20bbfaf9e86149) Reviewed-on: https://gerrit.libreoffice.org/27739 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9539d47be7c04234856880f7550cb8eada25358b)
2016-08-15fftester: another empty table manager stackCaolán McNamara4-6/+10
Change-Id: If3148cb6e16cff4aad28c4f86467c66ed04bcd05 (cherry picked from commit d00fc303bca7765762a602531b7d3b40ce8f1740) Reviewed-on: https://gerrit.libreoffice.org/27704 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit a63b63f59f83c81efc7c6d5c33da421bddaec62a)
2016-08-15VclPtr: password prompts never disposeCaolán McNamara1-14/+12
Change-Id: I917e5457be6de152b39e91ad41b6ed196dfe3e45 (cherry picked from commit 4b73aff7d2e4af7d3a1359df52133cd2c59058c5) Reviewed-on: https://gerrit.libreoffice.org/27676 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c0af6d6dac1f0b9d99d7ecec92e4f3377979a475)
2016-08-15fftester: context stack checkCaolán McNamara2-3/+4
(cherry picked from commit 2acc9d06291b3f271c2a88bb4995d52d2d8d2152) Change-Id: I4a135a9f9ac2f16f9dab096f5c234ff1d6e5e853 Reviewed-on: https://gerrit.libreoffice.org/27731 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit d795eb028160241bf47036a8d544320126b5e999)
2016-08-15sw undo: add a Repair argument to the .uno:Undo/Redo commandsMiklos Vajna8-6/+103
Undo/redo is limited to undo actions created by the same view in the LOK case, this argument removes this limit. This can be used by a client for "document repair" purposes, where undo/redo of others' changes is intentional. The sfx command dispatch has support for FASTCALL slots (a state function is not called, the command is always enabled) and also has support for state functions, but those functions only get the ID of the slots, not its parameters. What is needed here is a command that's disabled by default, but in case a Repair argument is used, then it's unconditionally enabled. So handle that case in the sfx dispatcher directly for now. Change-Id: I96c1130bf51abcdd722684b1fa4a8277f92fd555 (cherry picked from commit e9bcd3475131b24b0b8818cfdfa256854ca5a59d)
2016-08-15sfx2: make SfxLokHelper::setView() set also the active frameMiklos Vajna2-0/+47
Without this, comphelper::dispatchCommand() doesn't work on the current frame. This causes e.g. undo not working when only a given view is allowed to do undo. In the desktop case vcl::Window::ImplGrabFocus() calls both SfxViewFrame::MakeActive_Impl() and framework::Desktop::setActiveFrame(), but in the LOK case the first was called directly, that's how the active frame was outdated. Change-Id: If97a9de316b4c8dd49e55cd273bdb2dfe9866f38 Reviewed-on: https://gerrit.libreoffice.org/28032 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d6e8d4f773d970b69baedd8523a426f18a8d8eef)
2016-08-10tdf#101385: don't try to get SharePoint folder outside of allowed rangeMike Kaganski3-1/+26
for a given site. This patch uses the fact that getFolderByServerRelativeUrl API returns site's root folder if used with empty path (''). Hopefully this isn't otherwise context-dependent, so that it doesn't return other folders in some unknown circumstances. More correct would be instead to use the site's root path directly, like '/sites/mysite'. But I don't know a reliable way to filter the API part from the base URI. To make use of the corrected SharePoint repository root id, the patch also redirects all cases where "/" object is queried, to session's getRootFolder(). Reviewed-on: https://gerrit.libreoffice.org/27987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1b482aec4e7b6aec86fb20bcda555c4060a80332) Change-Id: Id31b4c2be0d8d81b94c0e9307acdfbc9e6441828 Reviewed-on: https://gerrit.libreoffice.org/28015 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2016-08-10sw lok: limit undo/redo access to undo actions created by the same viewMiklos Vajna8-16/+78
So one view can't undo the changes of an other view by accident. If this is found to be useful in the desktop case, perhaps a dedicated config option can be added for it; for now the behavior is LOK-only. Change-Id: I7ff505d021bd6f6be36953ecc8f8bb971ce8927e Reviewed-on: https://gerrit.libreoffice.org/28007 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5d8639aaf2f60157c99c3ee3a8bfa78e4efd010a)
2016-08-10gtktiledviewer: fix incorrect undo/redo stateMiklos Vajna1-16/+31
Edit state = false disabled undo, then edit state = true enabled the undo button, even the last LOK callback was '.uno:Undo=disabled'. Fix this by storing the LOK state in a map, and using it when edit is enabled. With this, clicking on the Edit button right after loading a document results disabled undo/redo buttons as expected. Change-Id: Id6023f976f135555a43486f71603c823e59d8d60 Reviewed-on: https://gerrit.libreoffice.org/28003 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5cb52cf97d04859c0c730cf03430254041d6388b)