summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-27sw lok: fix cursor position after inserting a commentMiklos Vajna
Make sure SwVisibleCursor::SetPosAndShow() doesn't emit LOK callbacks till a comment window is active. Need to invoke the unit test from desktop/, as the sw tests have the status bar disabled. (cherry picked from commit b9cc6653606c829805c6c01b9613a3a25d81c20b) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx Change-Id: Iab26024e9bb4da9c939bbd6cf769ec5c4dcb9a19
2016-09-27CppunitTest_sc_tiledrendering: std::string::find -> OString::startsWithMiklos Vajna
Change-Id: Ic7185cc0430e7007b1e4f27ba5c43d947405e198 Reviewed-on: https://gerrit.libreoffice.org/29292 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5bc4bcfde4955e3e48255310500102775ba4af23)
2016-09-27tdf#102384 sw: avoid moving cursors of other windows in SwTextNode::Update()Miklos Vajna
There is a list of exceptional SwIndex containers in that member function, like bookmarks, at-char anchored fly frames, etc. If we're growing (so basically in the safe case), don't touch the cursors of other windows, either. This helps to avoid the surprising "I didn't do anything and my cursor moved" behavior. (cherry picked from commit ecdec24c035513dbf2ee1814eb437e2a9d9a3d6c) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx sw/source/core/txtnode/ndtxt.cxx Change-Id: I9941fdcb6b7ad4b6e18a321cecc72fdf73d917fd
2016-09-26Resolves: tdf#99626 only the first queryTermination call in wizards worksCaolán McNamara
cause the first call looks up the "queryTermination" method on the object and replaces the object with that function, then calls on. Subsequent calls then try to lookup "queryTermination" on "queryTermination". Just pass queryTermination directly in the ctor (like all the other wrappers do) Change-Id: Ie042081c3c34e33b2f040d1ab1a33eeac4df9c3b (cherry picked from commit 01889962cab8449e1d9682d22db0f6e1e28252fd) Reviewed-on: https://gerrit.libreoffice.org/29230 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit a498e734f0954f401f430fd04c38e16ec7072489)
2016-09-26Resolves: tdf#99273 can't save specific docxCaolán McNamara
crashtesting: assert on export of tdf99571-1.docx to docx (cherry picked from commit fb045517532aababc06fb4b1112def53b03d9144) Change-Id: I2c8d82ac21451a2d2cc748dc28ac210c8e5ddf5f Reviewed-on: https://gerrit.libreoffice.org/29016 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit fa5830d02cec81921235357f4ed0372d104cf89e)
2016-09-26Resolves: tdf#101971 OleLoad under structured exception guardsCaolán McNamara
sample pptx crashes down in the depths of (apparently pre-installed on 32bit Windows 10) Flash.ocx Change-Id: I4e083d492e56e72df47b2c172d7f07f0e39b82ea Reviewed-on: https://gerrit.libreoffice.org/29199 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 373b44a2fcbe78e8a3ff14cd410826af151a6adf) Reviewed-on: https://gerrit.libreoffice.org/29213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit dafcb32f09c3acea8e2fa12e1d39261b13c740db)
2016-09-26Resolves: tdf#100795 SAL_MIN_INT32 32bit overflows on finding min limitCaolán McNamara
for control points, so halve it to the practical limit Change-Id: I1285631bebebf86e257a2fdd804c0c81dcefac96 (cherry picked from commit 25e4708c1f49986f3f082beb2e940aa2d7fb4d81) Reviewed-on: https://gerrit.libreoffice.org/29133 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 56a3b56689a458a8ff3f310940af07dac347a0c5)
2016-09-26editeng: invalidate everything only when toggling header-footer editAshod Nakashian
Change-Id: I928e881b3718666627a1cf33a162910ef17b47f9 Reviewed-on: https://gerrit.libreoffice.org/29278 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-24sc lok: avoid full invalidate tilesHenry Castro
Change-Id: Idd49dc61ba8dbd7af42f641bb019cf83814f9e8d Reviewed-on: https://gerrit.libreoffice.org/29240 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2016-09-23gtktiledviewer: Wrap dialogs in a GtkScrolledWindowPranav Kant
Change-Id: I33be18779ea680f7a9c20814ca3c3d94d206900b
2016-09-23cid#1373353 uninitialized membersMiklos Vajna
Change-Id: I88ae046866c616cc7de226e85eaab1a0e76eb59e (cherry picked from commit 52977bdbefefe73fb8032692deb2d57633d5c3f3)
2016-09-23sd lok: fix pixel-to-logic conversion in DrawViewShell::MakeVisible()Miklos Vajna
The problem, as seen by the user is that during shape text edit, sometimes just traveling with the cursor causes invalidations, which is unexpected. What happens is sd::Window::KeyInput() invokes sd::DrawViewShell::MakeVisible(), which does a pixel-to-logic conversion, but because the map mode is in general disabled in the LOK case, nothing happens. Then a bit later aVisArea.IsInside(rRect) fails, as it compares pixel and logic units, which results in sd::ViewOverlayManager::UpdateTags() scheduling an async call to sd::ViewOverlayManager::UpdateTagsHdl(), which at the end causes a full invalidation in sd::SmartTagSet::remove(). Fix the situation by temporarily enabling map mode, so we don't detect a visible cursor area as a non-visible one. (cherry picked from commit ba3d6d8a39d31316923d2326059c07b0a7e3c05e) Conflicts: sd/qa/unit/tiledrendering/tiledrendering.cxx Change-Id: I6d16f24d13143dc263a89317fbc38111e652c0ac
2016-09-23sw: move LOK_CALLBACK_VIEW_CURSOR_VISIBLE to SwCursorShellMiklos Vajna
That's where the non-view variant is emitted, and SwVisibleCursor said visibility=false even if the cursor was expected to be visible. Also fix the test callback that checked if the payload is equal to the "true" literal, but actually the payload was a JSON. (cherry picked from commit e387193eab0e4729d02b6ffd2c972c3d71942947) Conflicts: sw/source/core/crsr/crsrsh.cxx Change-Id: Ifa0e23eb274925e8ab8ef5e7c21370ad2cd22282
2016-09-23desktop: guard against nullptr frame in doc_registerCallback()Miklos Vajna
Change-Id: I96956d6631ed574c06df62e9b633d7e1e4d5a5f2 (cherry picked from commit a912ec7dad25bdb099f80f18b7f8d4892747000b)
2016-09-22lok::Document::getCommandValues: expose sw redline author colorsMiklos Vajna
These colors are used in the tiles, so it's a good idea if the client can use matching colors for cursors and selections. But to be able to do that, we need an API to expose these colors. Change-Id: Ia688c07e6c300fecdf8dc428d5a3f000d1857387 (cherry picked from commit d7788287456cb633226203f259e212c143b83050)
2016-09-22Related: tdf#102308 sw: ignore seconds when combining redlinesMiklos Vajna
The purpose of storing seconds was to get a better timestamp, not to make combining impossible. Also fix two issues with the existing testcase: - read both timestamps, so test doesn't fail if the second is 0 in the first redline - don't fail if minute changes while waiting for a second Change-Id: Ib6c8ecdcf2f0da9191f0b48e6aaefc0b2449583e (cherry picked from commit f240f073d228e62afd3f60563c23626efad0df7f)
2016-09-21Linux x86 build fixcp-5.1-7Andras Timar
Change-Id: I1464c429dd41feaeab97f2792eed40a9dfbadde3
2016-09-21lokdocview: guard against int overflowMiklos Vajna
If a too large rectangle is parsed, the width or the height may be larger than std::numeric_limits<int>::max(), in that case just set width/height to that max value, instead of allowing an overflow. Change-Id: Ic01319b01a3f9286501c346ea765868be57466a1 (cherry picked from commit 28447258fb6d9b8246f2a96d1a86945ef255d110)
2016-09-21tdf#102308 sw: improve redline timestamp precisionMiklos Vajna
It's not clear why it was like this since the initial import, but at least not clearing seconds is already an improvement. (cherry picked from commit d9dca1eef91faa710112ffd20a2b2d36b48a9287) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Ic452256d4ab47e6779ec71fe6576eacb5b74fb43
2016-09-20Bump version to 5.1-7Andras Timar
Change-Id: Ib204a5f7bb985a946ead74fcd47b29bc92835d81
2016-09-20disable generation of ole previews in ODF format until after loadCaolán McNamara
so the user update links dialog can control their generation SdrEmbedObjectLink becomes exposed to calc so it can detect if the link dialog needs to be used to update ole links. Reviewed-on: https://gerrit.libreoffice.org/28879 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3) detangle gadzillion checks into something readable no logic change intended (cherry picked from commit fad9786b06d188ba6e354620f57176f3d94a6637) + partial merge of commit c09b3e32372537be739182b02ae83a96386d1e1c Author: Noel Grandin <noel@peralex.com> Date: Tue Mar 8 13:13:59 2016 +0200 loplugin:constantparam in sw for bool bUI is always true in UpdateLinks Unmodified default SdrOle2Obj size is 101x101 svx/source/unodraw/unoshape.cxx sets a css::awt::Size maSize to 100, 100 svx/source/unodraw/unopage.cxx increases that by 1, 1 awt::Size aSize = xShape->getSize(); aSize.Width += 1; aSize.Height += 1; to call SdrObjFactory::MakeNewObject with 101, 101 so default size is 101x101 (getWidth() vs GetWidth() confusion ?) Reviewed-on: https://gerrit.libreoffice.org/28895 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7f0a219c9ad38ae33b51ff69d545f69659691c1e) b6af93afc1f80b7fc36239c96d5e0a71fcbcb789 4d4375dff64d7b8e236d1a24322e749e04ee530f Reviewed-on: https://gerrit.libreoffice.org/28930 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2ff4c68b63c4842ec85a21287317096b6ca8e66e) Change-Id: Id1dd7ea17342140eab9307d546528747e3a98090
2016-09-20tdf#101541 function WORKDAY.INTL not working properlyWinfried Donkers
When holidays are adjacent to weekend days, wrong results occurred. Change-Id: I9ec86e00f1a62ea941ff70617a1b448601aff9cc Reviewed-on: https://gerrit.libreoffice.org/28771 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 5e9d5eeb8a33fdcc500377d9eace40b5f5a7f750) Reviewed-on: https://gerrit.libreoffice.org/28970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/28973 (cherry picked from commit 3bf31803959ccc54bb949630f936a768ef47a90b)
2016-09-20fftester: break as soon as an exception is requiredCaolán McNamara
Change-Id: Ia787c42f484c00242f1bcaca8ea7459890ec5745 Reviewed-on: https://gerrit.libreoffice.org/28830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 0aa73cd0ff10c9b680c38e59147db684ff1ab14c)
2016-09-20tdf#101566 Remove untranslatable labels from changes toolbarYousuf Philips
Change-Id: I62cb3b8d0f57f7fd79cffce3b5aed5e384390e24 Reviewed-on: https://gerrit.libreoffice.org/28814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit f37d6837bf864a08f567c10c5f5bc0d4e4b5f9f7) Reviewed-on: https://gerrit.libreoffice.org/28822 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 4b7707bb8bcf0965d2d81f9c82672cb11829737f) Reviewed-on: https://gerrit.libreoffice.org/28863 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2e81f0770706758191ad871395fb36cfa5355cd4)
2016-09-20tdf#91966: In SDK, set CPPU_ENV=mscx for 64-bit WindowsStephan Bergmann
Change-Id: Ib93b2db40f43f98d8369cb91ca35692cc92f023b (cherry picked from commit 3aaa820446f1ad3d3b0ddc557238b6fb3496dd54) Reviewed-on: https://gerrit.libreoffice.org/28873 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 f09fd93be5d3c73d94bf67818f067a70b1594c35)
2016-09-20fftester: no table managerCaolán McNamara
Change-Id: Icb3c640e04416f9120d37558646a570daeddf0a4 Reviewed-on: https://gerrit.libreoffice.org/28827 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d7c00a1e54f72427aeadded00a3c5be03c1c997b)
2016-09-20fftester: no table managerCaolán McNamara
Change-Id: I033454670d1ee662bc80bc07578690155d97ce28 Reviewed-on: https://gerrit.libreoffice.org/28807 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 951c8ee5a5fdf1d57570dd4c1134a88ce7c22e22)
2016-09-20fftester: use of deleted RTFParserStateCaolán McNamara
but we only use the RTFParserState to use its m_pDocumentImpl and the m_pDocumentImpl is never changed for the RTFParserState lifetime, so take the m_pDocumentImpl at ctor time instead and use that directly later Reviewed-on: https://gerrit.libreoffice.org/28802 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 44d4d9d4e998de9b4dc939af4fa40e51e6300951) Change-Id: I15152e3f6d9008553b4a384a5e5da21373904cc9 Reviewed-on: https://gerrit.libreoffice.org/28804 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 4ed7ca7bfd5aab9846a02d3397771c0724344993)
2016-09-20rtf: don't skip backwards on skipping bin specified bytesCaolán McNamara
otherwise we could end up re-parsing the block endlessly Change-Id: Ia90a9e5b513951c91e1917483f9e030dbee98ffb Reviewed-on: https://gerrit.libreoffice.org/28710 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 4112594d60961d2d1a6b0f90422ce1b0924bf07d)
2016-09-20rtf: throw early on a bad nestrow tokenCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/28708 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5e9982668224345f901631d664985e823530e05a) Change-Id: I9de8d09bce18fd1e8a145617794594a99a5f996e Reviewed-on: https://gerrit.libreoffice.org/28713 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 10da1cf5b1e2446470b4892f0e49132217baf33d)
2016-09-20fftester: missing ValueLastCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/28693 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 30af3971d826d55426f51a7beb14c24ac3880250) Change-Id: I8e881871b1ae4dea757263d04796779e62e168dc Reviewed-on: https://gerrit.libreoffice.org/28712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f5bbdd05582a0a6fa9a3db399f97df18373215ad)
2016-09-20Resolves: tdf#91533 (rhbz#1364335) Tooltips are truncatedrpmbuild
Change-Id: Id9ec91ed9652f491e4e2a0556eeed27bf6517002 (cherry picked from commit e527edf06f8befb45b76ee8ebabe62e6dc885e45) Reviewed-on: https://gerrit.libreoffice.org/28220 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 02b6a8ae5a0ad4ebb0c929ebf079e01eb76762f8)
2016-09-20editeng: don't let wild-card auto-correct leave current wordMichael Stahl
If a paragraph has e.g. multiple -> in it then auto-correct of the first one will create via the .*->.* rule a new auto-correct entry that has as long-word the word that contains the first -> until the last -> and everything in between. This will be somewhat irritating when it is eventually applied. Avoid it by limiting the wild-card loop to the current word, which is apparently the intent anyway. (regression from a07425892205ff8951027ea20459b97370d01de6) Change-Id: I294bae863c44eb460627b61b4383133131fe4b3a Reviewed-on: https://gerrit.libreoffice.org/28608 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 9670f0d17ffed1ff07cb1deddcabc26c756e4bc1) Reviewed-on: https://gerrit.libreoffice.org/28634 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 0c0c421f1936417d72d6268aaeee86d119ae8841)
2016-09-20if we throw in sw on HoriOrientation::NONE then don't pass it in from rtfCaolán McNamara
Change-Id: Ie01cca9b7cc432fc1fe14bb600af5083d6ca6a0d Reviewed-on: https://gerrit.libreoffice.org/28690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 0ac170beb986997d57fd14c7dcdfff8f46820699)
2016-09-20Resolves: tdf#96451 do magic to enable embedded chart sidebar only for chartCaolán McNamara
objects, and do the normal thing for other objects, e.g. math Change-Id: Ifb786a841b843b0317713769cb214a44dceaf546 (cherry picked from commit c5977a89c28b285dfface71ca71e07bb0463ed19) Reviewed-on: https://gerrit.libreoffice.org/28153 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 3c51f207747150933c6725fa22af1682cf066d8c)
2016-09-20Make character dialog's hyperlink tab accessibleYousuf Philips
Change-Id: I6b2351b5a46562236dc93c6de3daa185e2a72fb2 Reviewed-on: https://gerrit.libreoffice.org/28653 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 62fdfdded30e3e7507590a07791cc78e6b2b1d80) Reviewed-on: https://gerrit.libreoffice.org/28704 (cherry picked from commit 99d2232e4fb701273d26457817a590f39bbace96)
2016-09-20a11y: fix missing labels in sw paragraph dialog textflow tabYousuf Philips
Change-Id: I3173cf240131788013345aa864156286affa476d Reviewed-on: https://gerrit.libreoffice.org/28657 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9ea5483d9bd44b136c89e45ef96bbf3df0a7cdef) Reviewed-on: https://gerrit.libreoffice.org/28705 (cherry picked from commit 27125fe629135e726bb4dd07f2a1b2d74e57548a)
2016-09-20fftester: apparent wrong property tested for existenceCaolán McNamara
Change-Id: I5d208bb2a85d7aa4eea9b1c950eeb6f35493f759 (cherry picked from commit a42f4aaba352a4d33ce77898e7b7b7bc0c10f1f8) Reviewed-on: https://gerrit.libreoffice.org/28631 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ea8be52737f74edb89eb459bcef6d2d697ea48e4)
2016-09-20tdf#101866: Get rid of two more erroneous upper-casings of stringsTor Lillqvist
Follow-up to f948dce856d51704e1962553198015dbebb6e527. Change-Id: I46c5a96a076fa6eec952e31201bb3563464cf602 Reviewed-on: https://gerrit.libreoffice.org/28626 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 326da3886e6f700ad1fb269df201fae9fa01d5df) Reviewed-on: https://gerrit.libreoffice.org/28629 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit f87b678a40ab73402366f409078f20425f258953)
2016-09-20pTemplate can probably be null hereStephan Bergmann
Observed with "make clean && make CppunitTest_sw_filters_test" (which misses a dependency, a bug to be fixed next, so happens to not set up m_pTemplate in SwHTMLWriter::WriteStream, so dereferences a null pTemplate here. Don't know whether there's also legitimate scenarios that can lead to a null pTemplate here, but at least the code in SwHTMLWriter::WriteStream setting up m_pTemplate takes into account that it can be set up as null, and the code in the called SwHTMLWriter::GetTemplateFormat takes into account that the passed in pTemplate (which used to be the same object as the outer pTemplate/pDoc, before breaking IDocumentStylePoolAccess out of SwDoc, see below) can be null. Regression introduced with 535971f3a166da6c0e44a6b7211c7f8c298f388f "Refactored IDocumentStylePoolAccess out of SwDoc." Change-Id: Iabb4ae2ca018ce3a19756d62b9002b245cb409cd (cherry picked from commit bf3c6237bb110d3eb84970e44593a7880e2e8536) Reviewed-on: https://gerrit.libreoffice.org/28591 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 94a3b4db75ca042ae0e134c8d497d1759f36270b)
2016-09-20libpng: upgrade to release 1.6.24Michael Stahl
Reviewed-on: https://gerrit.libreoffice.org/28364 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 1efbdfcffff97ec0834274d13abe0f0d318b5f3c) Reviewed-on: https://gerrit.libreoffice.org/28367 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit f90be96ed400a5471d6c3a5cfa5087957803a9fe) Change-Id: I5528522d866262655eadcfcf09c038e0c6097bb9 Reviewed-on: https://gerrit.libreoffice.org/28553 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 c663ffa4a1a5d2ad15a5b114c15ea5484b1dbb9c)
2016-09-20lcms2: Out-of-bounds read in Type_MLU_Read() (rhbz#1367357)Michael Stahl
Change-Id: I9c5a442125476412435ebefea29ad1b166faab8a (cherry picked from commit da7d3f708d0619fdb17128ffbaa430becb79121f) Reviewed-on: https://gerrit.libreoffice.org/28552 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 94497dcf3006a22111f32c7335771b7e97cc9a33)
2016-09-20sc draw: emit LOK_CALLBACK_GRAPHIC_VIEW_SELECTION when view is createdHenry Castro
In multiple view environment, when a new view is created ensure to notify other views graphic view selections. Change-Id: If75f9525af6e851e096b6d273957b94882c441cf
2016-09-20Resolves: tdf#102293 triple click results in visually unselected wordCaolán McNamara
in previously unselected textboxes in impress started happening after... commit 16c7f8916661df24f4681ec82f6bd4d7ad85d141 Date: Tue Jan 12 16:36:49 2016 +0000 tdf#97075 - don't render sdr overlays before we paint in impress instead flush the overlay after activating the edit object if we go on to put the cursor in there. Seems to work. Change-Id: Ib746c36d1074aee09771a3dc1d69834ce80a9c08 (cherry picked from commit 38a61ddaf63768ebe19c92d561eac6f50d67ded7)
2016-09-20sw: emit LOK_CALLBACK_STATE_CHANGED when cursor enters/leaves a redlineMiklos Vajna
For now only care about the start of the cursor, which can be only at a single redline. Add matching testcase + expose it in the gtktiledviewer status bar for interactive manual testing. Change-Id: Ib61757412d6b54bef64361d4a8563795ca0bab6c (cherry picked from commit 288013f25d2e52a76f7ce5368c505a6ccb3b64a2)
2016-09-19sd draw text: emit LOK_CALLBACK_VIEW_LOCK from registerCallback()Miklos Vajna
This is similar to commit 7b784e4e3927d91a96cd0b54fc43c9b488822e47 (sw draw text: emit LOK_CALLBACK_VIEW_LOCK from registerCallback(), 2016-09-14), but this fix is for Impress. Change-Id: I995d2ed223aa6ce7845c440039d176b6beada84e (cherry picked from commit d53bb5c044f039bd2fd38977a85012b03abbe32c)
2016-09-16sfx2: add SfxLokHelper::getViewIdsMiklos Vajna
and also expose it in the LOK API. This way clients don't have to keep track of what views they created / destroyed, they can also get an up to date list with this method. Change-Id: Ibaee42c545803e04a31e7c13ab6ec370b99465c4 (cherry picked from commit dcc92a7cb5aa1faa711c8da7f7d8ecee0a192c25)
2016-09-16LOK: tile rendering regression fixAshod Nakashian
Calc fast rendering requires us to offset the are being rendered and shift all bitmaps accordingly. This however is breaking Impress rendering since the offseting logic is common (in svx and vcl). This adds new API to enable or disable this local rendering (as opposed to rendering a full document as was previously done. The new flag is then set by Calc to enable the offseting logic in isolation without affecting other applications. In one case isolation was achieved by checking the MapModeUnit. Change-Id: Ia0aadfc3f6df7c1a891b97dc731f5897414c9420 Reviewed-on: https://gerrit.libreoffice.org/26367 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 60fdcda65bad242f99895cb453182578250fbdea) Reviewed-on: https://gerrit.libreoffice.org/26378 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c337011d2052ec3ddb80e61bcc4b0574b4e898ba)
2016-09-16LOK: fast tile rendering (cell editing)Ashod Nakashian
Cell editing uses editeng which has a different set of requirements. The coordinates are in 100th mm and so we have to convert the ofsets to 100mm. Change-Id: I278457ffc2273eb786101875c85ddfb959d4c5e3 Reviewed-on: https://gerrit.libreoffice.org/26205 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 0dbffca63191712d9f77297061a3d4651b8410aa)
2016-09-16LOK: fast tile rendering (graphics and buttons)Ashod Nakashian
Since embedded graphics and buttons use absolute coordinates, we set the origin to be the top-left corner of the tile. This includes the origin + ScrPos (see previous patch). Then, the coordinates of the graphic is shifted by this amount to make sure it renders in its relative position to the tile. This renders embedded graphics and buttons at their correct position, with some limitations. Tiles large enough to cover a graphic object show the graphic object where it should be. However, rendering a relatively small tile doesn't render the graphic. This seems to be an issue with moving the graphic's coordinate at a later stage than the 2D Processor decides what objects intersect with the 'view area' that is rendered. Another issue is that graphs don't render. What they seem to suffer is incorrect scale and a fix coordinates (they show up as tiny thumbnails at the top-left corner and grow in proportion to the real graph when resized). These shall be addressed in a separate patch. Reviewed-on: https://gerrit.libreoffice.org/26204 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 5f01d80f75dc86b393cc2fdb66b94aece964c674) Change-Id: I4b71bf5f2e357d1114d46022bc00905ceed0c2f9