summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2016-08-10GSoC notebookbar: changed labelsSzymon Kłos
Change-Id: I824e7b871edb9506a25ca7918431bf917e237709
2016-08-10sw undo: add a Repair argument to the .uno:Undo/Redo commandsMiklos Vajna
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
2016-08-10sfx2: make SfxLokHelper::setView() set also the active frameMiklos Vajna
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>
2016-08-10GSoC Writer Table Styles; Create by example; fix undoJakub Trzebiatowski
- Create style by example, tracked by undo; - Fixed delete style, now is tracked by undo Change-Id: Ic39b549b0b970b1b15001d527a82fb26e4a630aa Reviewed-on: https://gerrit.libreoffice.org/27990 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-09sw lok: limit undo/redo access to undo actions created by the same viewMiklos Vajna
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>
2016-08-09Resolves: tdf#101383 don't crash is merge has no targetview on mail setupCaolán McNamara
Change-Id: I7d5d97443a64e2fe99d575e0e59914777f1723c4
2016-08-09Resolves: tdf#101382 turn SetMailMergeConfigItem into a shared_ptrCaolán McNamara
so if the SwView it nominally belongs to is deleted while a mail merge wizard is open it still exists while the wizard has a ref to it Change-Id: I4f5acbcc1ea6404851cf6e0179fd3c795342f726
2016-08-09sw: prefix members of SwCalcMiklos Vajna
Change-Id: I8603ce669c09419919ba9fb93788666f45783caa Reviewed-on: https://gerrit.libreoffice.org/27998 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-08Resolves: tdf#101359 getBookmarksCount includes more than aTableBookmarksCaolán McNamara
aTableBookmarks is just "BOOKMARK"s while getBookmarksCount() includes two extra types. So cache the result of getBookmarksCount when filling aTableBookmarks to compare if the count from the time of filling aTableBookmarks is unchanged. Change-Id: I69fedab613f23e4e2b30498e4620a370d92272e0
2016-08-08GSoC notebookbar: updated .ui filesSzymon Kłos
Change-Id: Ibddb6f7c3bb8970f82cc58c71048416a7f09059c
2016-08-08tdf#39468: Translate German commentsJulian Mehne
Change-Id: Ie1bfc2f976f0f53e320cba0a69eb9f258415d8e6 Reviewed-on: https://gerrit.libreoffice.org/27885 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-08-08tdf#83830: Adjust alignment of Writer Tab PanelsSusobhan Ghosh
Change-Id: I4590d8448c997665882b0b1e26b1bdfbd4b3539e Reviewed-on: https://gerrit.libreoffice.org/27758 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2016-08-07can drop the intermediate OUString hereCaolán McNamara
Change-Id: I19ef66c037a69debc90f260f82cbc2bf6355ea8d
2016-08-07Fix string concatenation in ww8export that breaks the build.Mark Hung
Fix what has been done in commit 07966a9. Replace string constant concatenation with a single constructor. Change-Id: I8a848cd0211a75321263b0b7413c079db9245471 Reviewed-on: https://gerrit.libreoffice.org/27928 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-08-05tdf#98739 recover CJK and CTL fonts after symbols.Mark Hung
This fix what has been done in 203e3c0f1190473d2e587a0801dc9f3883a6874a , which set CJK and CTL font in SwWW8ImplReader::Read_Symbol but didn't close CJK and CTL fonts in SwWW8ImplReader::ReadChars. Change-Id: I7c1d3b2a284d00a524a61785a5a94ca2d589295e Reviewed-on: https://gerrit.libreoffice.org/27090 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-08-05use std::move in a few placesNoel Grandin
found by git grep -n '.reset.*.release' Change-Id: I498709bd32b21d9dbbaa73603ce21d21c274f8dc Reviewed-on: https://gerrit.libreoffice.org/27863 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-08-04GSoC notebookbar: updated .ui filesSzymon Kłos
Change-Id: Ibc79cb49ed85ba3d96811bc5790faa16ea488472
2016-08-04tdf#78506 RTF import: fix handling of invalid \levelnumbersMiklos Vajna
In case ';' is written in \u form in \levelnumbers, then Word ignores the whole \levelnumbers contents, do the same. Change-Id: I93ce5810af2b5ed703e804199c0b236d2c4c36b5 Reviewed-on: https://gerrit.libreoffice.org/27869 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-04the sole caller is ok with rPoint being modified, so change to non-const argCaolán McNamara
Change-Id: I40a24502e2e8ad312e13e0c47ee1fde3118d2251
2016-08-04only called if !bDrawCaolán McNamara
Change-Id: I7310b5f8cbbc4176e76d92ce2bcd49168470843c
2016-08-04SwLinePortion::GetCursorOfst is const and its ret is ignored hereCaolán McNamara
so nOfst is unnecessary Change-Id: I27f73057b55ebdf30eb69a19ee1b0647ba25583e
2016-08-04pPos can never be nullCaolán McNamara
Change-Id: Ib7b57d628fbd80a1d2214917cd439e09d4803d91
2016-08-04Resolves: tdf#101269 cannot click/edit text inside a frameCaolán McNamara
regression from... commit b0c0a074a2318a231f3f635784da494f1b713c53 Date: Mon Apr 18 11:03:43 2016 +0200 clang-tidy clang-analyzer-deadcode.DeadStores suspect that some of these may reveal latent bugs.... and restore method then removed by commit 47f62540bd2c2f107313bb0c6f141cd4460b6379 Date: Thu May 19 10:31:47 2016 +0200 loplugin:unusedmethods in sw Change-Id: I14826eecadbc1a74e408f8907eea8746debe4db4
2016-08-04add more nullptr checks, related tdf#100820Markus Mohrhard
See http://crashreport.libreoffice.org/stats/crash_details/8569250c-b04a-43b0-b4b8-4b3a94daffe1 Change-Id: I9070be3db57e77befe70c0a32ef6aa54c6c1cf85 Reviewed-on: https://gerrit.libreoffice.org/27842 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-08-03translate German in fmtatr2.cxxJohannes Berg
Change-Id: Ifa10003b7bbae6404690ec9046107b533d6c67b1 Reviewed-on: https://gerrit.libreoffice.org/27833 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-08-03partially translate German comments in ww8graf.cxxJohannes Berg
Change-Id: Iad9ce00869ac2dc989ee95e97ac3ef53de77c007 Reviewed-on: https://gerrit.libreoffice.org/27832 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-08-03GSoC notebookbar: updated ui filesSzymon Kłos
Change-Id: Ie087e0bf8bbce2770c6576817d32747607f38105
2016-08-03GSoC Writer Table Styles; Table styles panel; Delete table styleJakub Trzebiatowski
+ Enabled delete from context menu of Table style tab in Styles and Formatting panel Change-Id: I23523169e0427eb14571102e30fa693b5777af76 Reviewed-on: https://gerrit.libreoffice.org/27797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-03sw: use std::move() in RtfAttributeOutputMiklos Vajna
Change-Id: Ie410d6d34a663fd438d4e4e966578acc74865c55 Reviewed-on: https://gerrit.libreoffice.org/27819 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-02editeng: track view shells in SfxListUndoActionsMiklos Vajna
This is needed for e.g. tracking deletions by backspace in Writer shape text. Change-Id: I6f873872566313096c2c57f4a13ac2f1db67e77d Reviewed-on: https://gerrit.libreoffice.org/27807 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-02editeng: implement SfxUndoAction::GetViewShellId() interface in EditUndoMiklos Vajna
With this, e.g. inserting a character in a Writer shape text remembers its view shell. Change-Id: Ic82a3f45a66cf622496e3131390d365440dffb3b Reviewed-on: https://gerrit.libreoffice.org/27796 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-02editeng: make SfxUndoAction::GetViewShellId() interface availableMiklos Vajna
Extend the existing OutlinerViewCallable interface to be able to obtain the view shell ID of a view shell, even from editeng. Change-Id: I13708b0e4f58ee86643b913c7d21de022a685223 Reviewed-on: https://gerrit.libreoffice.org/27788 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-02Resolves: tdf#101241 Revert "fix paint table border in DOUBLE_THIN style"Caolán McNamara
because of the never-ending invalidate and paint of tdf#101241 there was no bug or route to reproduce the original problem so can't try to solve it a different way. This reverts commit 9a95520948de1d92c55252aa5f90606b01d6ac9e.
2016-08-01GSoC notebookbar: writer ui improvementsSzymon Kłos
Change-Id: Ib8d8dcaa1b6a1d22eaba5fad7e90719dfe6044b9
2016-08-01svl: implement SfxUndoAction::GetViewShellId() interface in SfxListUndoActionMiklos Vajna
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. Change-Id: Idad587e6ca07ba69bf59aa7013b251af8bf95bab Reviewed-on: https://gerrit.libreoffice.org/27781 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-01GSoC Writer Table Styles; Table Styles PanelJakub Trzebiatowski
Table styles panel: + Added simple table style panel tab icon. icon-themes/galaxy/sw/imglst/sf06.png + Listing table styles (hierarchical, same order as in container) + Listing all table styles (sorted by name). + Listing applied table styles. + Listing custom styles. + Listing hidden styles. + Hide/show style. + Applying style by double clicking. + Highlight current table style. Everything else yet to be done. Table styles (SwTableAutoFormat): + "hidden" property. + "userDefined" property. "Default style" is not user defined. Styles loaded from tblauto.fmt are also not user defined. Styles loaded from .odt are user defined. Styles created manually (before binary load/save roundtrip) are user defined. Change-Id: I739a48ae1d7ae66f4f8c08076871437ca491bd4e Reviewed-on: https://gerrit.libreoffice.org/27638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-01sw, writerfilter: fix indentationMiklos Vajna
These files had a consistent style before, keep it that way. Change-Id: I325e13e402abb01c347d1185b85468f23a18bba3 Reviewed-on: https://gerrit.libreoffice.org/27773 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-01sw: prefix members of SwMasterUsrPrefMiklos Vajna
Change-Id: I4988e6f58cfdabc0abcab56e912d46074b0946fe Reviewed-on: https://gerrit.libreoffice.org/27764 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-08-01Simplify dynamic_cast followed by a static_cast.Jan Holesovsky
Change-Id: I3eab142e0df07371c1a5657d9304e556542a513a
2016-07-30tdf#95251 MM just allow print as single documentJan-Marek Glogowski
Remove kept block from revert of 138d29aa09417eba4d15ade4c9f4dab2620b6326 After this revert MM just supports pinting via a single merged document. Printing as inidividual files should have still worked, but as a workaround we remove this functionality, until the print backend can handle multiple-file print jobs correctly. Change-Id: I70d0852cdcc369b0fc9f344086830f15d8dea451 Reviewed-on: https://gerrit.libreoffice.org/27721 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2016-07-29sw undo: implement SfxUndoAction::GetViewShellId() interfaceMiklos Vajna
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. Change-Id: Ia76d218a1d8b578aaad00ab733c772b10dda39f0 Reviewed-on: https://gerrit.libreoffice.org/27693 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-07-29sw layout xml dump: mention SfxViewShell addressesMiklos Vajna
Change-Id: I2e5c8102684494fd3d7c1c70971a09d0c940a124 Reviewed-on: https://gerrit.libreoffice.org/27637 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-07-28GSoC Emoji ControlAkshay Deep
Tab Window Add emoji.json to installation directory Read the JSON data from code Filter emojis according to categories Insert Emoji at cursor position Toolbar control Change-Id: Ia5a577ce41398132872914ebfa499e4d4077d57e Reviewed-on: https://gerrit.libreoffice.org/26700 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-07-28Resolves: tdf#98793 create a MailMergeConfigItem if toolbar is active...Caolán McNamara
and one hasn't been set yet via the mail merge wizard. This should have the same effect as launching mail merge and cancelling it, which is given as the workaround Change-Id: I9deb8173d2e18ccde705a923a74ef8a1175e9393
2016-07-28unreferenced local variableCaolán McNamara
Change-Id: I33c2c9b1c4ea3979f16b36af170c515df1f6b0c2
2016-07-28not interested in exceptions for fftester testingCaolán McNamara
Change-Id: I825e89a9d515f2f19eca190b1e3cc2d2ad565df3
2016-07-28Revert "temp tinderbox fix"Caolán McNamara
This reverts commit d4cb9c3a8851cb874fd8b6c77d4d7521da7579b7. Change-Id: Ifd11427ea6b4137d0e0c007e7f140fbc6caa3f31
2016-07-28tdf#101168 sw: fix missing repaint on undo with multiple windowsMiklos Vajna
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>
2016-07-28add rtf to fftesterCaolán McNamara
Change-Id: If00b1de1e1be16214df78d15554d95847e3239e7
2016-07-28sw: rename generic rSh in SwBaseShell::ExecUndo()Miklos Vajna
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>