summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-05-31Resolves: tdf#92695 protect both branches against missing ToolItemCaolán McNamara1-8/+7
(cherry picked from commit ab0dc9524a36a394e97df9499bf1f5e4b94cfdca) (cherry picked from commit c845c7bf597caa11b1617ab71029c499819028bc) Related: tdf#92695 we already have ImplGetItem from mnHighItemId here no logic change intended (cherry picked from commit c380f0fc125f50ad8efca2ce032d3d2a67d78f0a) (cherry picked from commit df668868917d1dac11d49f1f650c43666fadea54) Change-Id: Ide54fddf7b217e65a405bd80853d5302a419f046 a53a21db56c857e1274c60f846fc955fef9e3dfb Reviewed-on: https://gerrit.libreoffice.org/25711 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-31tdf#96516 do not increment position counter when an entry is removedLionel Elie Mamane1-1/+3
Change-Id: I81a4455df1fd5962d0362f4e5fa3396764a0ae5a Reviewed-on: https://gerrit.libreoffice.org/25548 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-31Don't use pInsert after it has been movedStephan Bergmann1-1/+1
Regression introduced with 38ea2d0ecc1d59844f9371ae6da7980c4e3a9e10 "sw: replace boost::ptr_vector with std::vector<std::unique_ptr>". Change-Id: I15f556319693c4728812d5ffd5002d0eba58ae82 (cherry picked from commit 9d8184b34e9e4c53f93e4d44ac53590e9231c520) Reviewed-on: https://gerrit.libreoffice.org/25710 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-05-31Resolves: tdf#97158 CopyOneCellFromClip() does not handle multiple sheetsEike Rathke1-0/+4
... so check that and bail out to let the remainder of CopyFromClip() handle it. (cherry picked from commit dc9eac5a5f4f247ba5efb67931ffde61f2c8d5b6) 9d07f557572bdeaeda8e923525c8895d79fc0d22 f65b29ff13211449144455668014a80aa8b331a3 Change-Id: I9d139de905fd108ae41fed79a38860058525272c Reviewed-on: https://gerrit.libreoffice.org/25682 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-31prevent out of bounds string accessEike Rathke2-12/+15
Yet another reminiscence of String to OUString conversion.. where the terminating NULL-character was obtained and SvNumberformat::InsertBlanks() effectively did nothing. Could be triggered already by entering an '_' underscore character as number format code, which is a place holder for blanks of the same width as the following character, which there isn't then yet. Change-Id: I0534e1417d4bd35e9e7ed4bd0170b9ea3b5fb575 (cherry picked from commit c75ce37560c05271ba56c9dd0d98c5001e83cc2f) Reviewed-on: https://gerrit.libreoffice.org/25693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-30tdf#100134 xmloff: only update the progressbar twice for every percentMiklos Vajna2-3/+9
This restores the state before commit e1b78d36008d1fd188ca8dc154ad069d3476520c (#95181#; call the setValue method of the XStatusIndicator as often as possible to enable reschedule, 2001-11-26), which doesn't seem to be necessary anymore, perhaps due to the current scheduler that has priorities. Rather than a plain revert, still allow the progressbar to jump back, as that seems to be used relatively frequently. So just filter out the calls that would increment the value, but only with a small difference, compared to the shown value. (cherry picked from commit 20ad9893d5d3be13d8aa17764e483afaa083b5c0) Change-Id: I7136b20f1c64e267b0b4a35bbe2564e5163d9468 Reviewed-on: https://gerrit.libreoffice.org/25666 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-30tdf#100080 set unused shader attribs with values, fixes GL on AMDTomaž Vajngerl4-28/+78
AMD drivers don't work well if a shader has a defined but not enabled shader attributes. For this reason we need to make sure that all attributes are set to some value even if the shader doesn't use that attribute. Intel drivers, on the other hand, crash if you enable an attribute and don't set it (set it to null) - so we can't use this workaround. (cherry picked from commit fdcd13c1c2b8b9fbc3480c8fa92920d8c8d4e5a7) Change-Id: If0abcfb664c3b71bb657b9a810d2d2a14fe5d9b4 Reviewed-on: https://gerrit.libreoffice.org/25592 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30tdf#98666: Don't cache progress bars eitherTor Lillqvist1-0/+1
Fixes the bug only partially, though. (cherry picked from commit 483b4d6bfdb4800811e87a07f25b24e3f6019e38) Change-Id: I262f671659e8ad0a3ecd735f5b36362c4119b26c Reviewed-on: https://gerrit.libreoffice.org/25655 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30tdf#100115: _nColId is sal_uInt16Julien Nabet2-4/+4
like the other methods, so fix it in canCopyCellText + copyCellText Change-Id: I3395f8823602f0a1791908945e3dec5034d3d612 Reviewed-on: https://gerrit.libreoffice.org/25605 Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit 634fd0016ef7396a782d28272852302841f37201) Reviewed-on: https://gerrit.libreoffice.org/25622 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-30Resolves: tdf#100097 dbaccess self-dnd depends on getting its own transferableCaolán McNamara4-9/+41
on drop that it set on drag. It does some uno tunnel foo to drag the data it needs back out of it in some grotesque fashion. So we have to follow the same style of hackery as under MacOSX to detect on drop that there is an active drag started by ourself and so use that active drag's transferable as the source transferable for the drop, rather that use the intermediate universal GtkDnDTransferable. Change-Id: I3c3a94416db908603bde8f15dc5b1c9d726b8dbd (cherry picked from commit 73f84ab139cb1d2564f9292fba08d69a0ab822c1) (cherry picked from commit 6f41a9b06219c2d8e176f84a5ae4b80b22dc9ce5) Reviewed-on: https://gerrit.libreoffice.org/25659 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-05-30tdf#99870 writer: don't delete selection with delete-commentJustin Luth1-0/+1
When using the keyboard to select text and then deleting a comment, all the text between the cursor and the comment would also be deleted. (Not necessarily the selected text, but everything from the point or the mark would be included in the delete.) Change-Id: Id15a00d112d118227bc4a34b5102bb09d8d167b0 Reviewed-on: https://gerrit.libreoffice.org/25651 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#97839 a single character may be more than 1 utf-16 code pointsCaolán McNamara1-1/+1
Change-Id: Iba2460bfb9335615796db3f5e233b870a8d63339 (cherry picked from commit 847cdd8efd0662d61d288a4d944edc30e864d145) (cherry picked from commit f0e35cb2fb6f0f595d44c7a7c01ddaf60b19d642) Reviewed-on: https://gerrit.libreoffice.org/25638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Related: tdf#87967 valgrind reported invalid reads on 1 pixel wide bitmapCaolán McNamara1-5/+5
Change-Id: Iddd18280c780d8b9f5e11fcc2af80749917192c4 (cherry picked from commit a9d2302d4d0732a0c1203bbb7c0182b8de59403d) (cherry picked from commit 6fb88a0c67150a751f59ebcba5f5419b24e6f4a7) Reviewed-on: https://gerrit.libreoffice.org/25533 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#97854 crash on deleting inner join relationshipCaolán McNamara6-63/+64
seems to be a regression from... commit 356bc0f697299e5fb6156ce25dc69845eaa6f9e6 Author: Michael Meeks <michael.meeks@collabora.com> Date: Wed Jul 1 19:03:55 2015 +0100 tdf#92434 - fix iteration, and remember to disposeAndClear. which is part of the VclPtr stuff so hold the connection by VclPtr when removing it from m_vTableConnection and only call dispose on it when _bDelete is true, not always. Change-Id: I38e65c6928499dc1e8bbf6b71e9901a4eaa5d913 (cherry picked from commit e55f83e1731e1031c63d8463b57c434cceb126e3) plus (easier to read as individual commits) Related: tdf#97854 confirm that on !bDelete there's a ref to the connection so that its not deleted on removal from the vector Change-Id: I6c1f7691ee415abf0f419fdd7fcf2341fe2bd1f3 (cherry picked from commit 3185d9b8fbaad56fc7170a277569b5e441d946f4) Reviewed-on: https://gerrit.libreoffice.org/25508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#97879 loop in style hierarchy on odt loopCaolán McNamara2-1/+7
Change-Id: I0098c434b89b6a57e8b888a4d4f643e4d0865d29 (cherry picked from commit e954697a9d39e40473fb9f59a791ccb7129e763c) Reviewed-on: https://gerrit.libreoffice.org/25498 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#98436 crash trying To create remote folder before connectedCaolán McNamara1-0/+3
Change-Id: I953167c9b78f9c9eba560390ecef7ccd8e5f1f68 (cherry picked from commit 7d397201060ba71a188b5ef9853984a635e70531) Reviewed-on: https://gerrit.libreoffice.org/25500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-28Estonian localization of aboveWord and belowWordMihkel Tõnnov1-2/+2
Change-Id: Ie872c593c531b99360efe7fcf807e76cb88acb79 (cherry picked from commit 91244b95b7826ec5c1075c00e6b4013804c4ab2f) Reviewed-on: https://gerrit.libreoffice.org/25589 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-05-27Typo fixTor Lillqvist1-1/+1
Change-Id: Ibf279e723c11a4a5f62ce082938e723a46e40f6d Reviewed-on: https://gerrit.libreoffice.org/25541 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-05-26tdf#86282 handle both, base name and Sheet1, as external reference sheet nameEike Rathke4-32/+192
This is a combination of 4 commits. Resolves: tdf#86282 do not use file name as sheet name for linked documents ... and external references. (cherry picked from commit 43030487c45f49bccdfad987c60d9483b938ebac) tdf#86282 handle both, base name and Sheet1, as external reference sheet name While 43030487c45f49bccdfad987c60d9483b938ebac fixed things for older 'name.csv'#Sheet1.A1 references, loading documents that meanwhile stored 'name.csv'#name.A1 lead to #REF! when the external links were updated. Now recognize both, the base file name and Sheet1 name and set up one as the alias of the other, so both variants can be handled. (cherry picked from commit ec693d9b9df631605028271f62daa7dfbe8e273d) tdf#86282 switch to base name sheet name again for external references CSV ... now that we can handle both, a base name and Sheet1 name. For the following reasons: * Since 4.3 we write and expect the base name as sheet name for CSV. While 43030487c45f49bccdfad987c60d9483b938ebac switched that back to Sheet1 or its equivalent to be able to load older documents, a mixed environment of earlier and later versions gets confused by this. * The name Sheet1 can be localized and even customized by the user and thus fails to update/refresh in a different localized or customized environment. This also was already the case for all versions prior to 4.3 but apparently wasn't recognized or brought in connection with some possible failures when updating externally referenced CSV files. * Deriving the sheet name to be stored from the base name prevents all problems related to localized or customized environments, and keeps interoperability with all versions from 4.3 on. (cherry picked from commit d9e7a54809c88c4ac166630c11038188c8f50a6f) remove now moot comment, tdf#86282 follow-up (cherry picked from commit 386b284241a16d96eaf792e2385c41f57ce3d870) Change-Id: I6e23eeff39086091f13914a3f964aec1016a7de4 e9314e11be19c3316a06e10583777e2d5f5ec1b8 8d71b3ad6370747115ea419a21094b649326642c 7e720de93a5f47ca6a81addbb75c113dc2fe53f0 Reviewed-on: https://gerrit.libreoffice.org/25471 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-26tdf#74795 RTF import: handle row-level default cell marginsMiklos Vajna3-0/+88
(cherry picked from commit db1a4f8d1d44351ca65742d3d94371a0c0536ff2) Conflicts: writerfilter/source/rtftok/rtfdispatchsymbol.cxx writerfilter/source/rtftok/rtfdispatchvalue.cxx Change-Id: I5bdd7b8624a9e2ac1aef963ccc5ed457ebda3f84 Reviewed-on: https://gerrit.libreoffice.org/25493 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-26tdf#100051 Partially revert "loplugin:constantparam in sw"Miklos Vajna1-8/+4
This partially reverts commit 9585c8b8c8d8724cc1bad4a2060c828c15599929. Instead of removing the nCount parameters, make use of them in SwXTextViewCursor::go{Left,Right,Down,Up}. For the following testcase: a document with 1000 lines, and calling goDown(1000, true) the spent time goes from 4 secs to 1.8 secs with this for me. (cherry picked from commit cbe78f817da8db78d226b3ad2b1a10d0c2dcf188) Conflicts: sw/source/uibase/inc/wrtsh.hxx sw/source/uibase/uno/unotxvw.cxx sw/source/uibase/wrtsh/move.cxx Change-Id: I10351a6dbaa6d3fff883520c85701f60b05b4873 Reviewed-on: https://gerrit.libreoffice.org/25496 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-26Resolves: tdf#96244 get the right Writer window view for Formula windowCaolán McNamara2-4/+7
if you hit F1 and F2 together, then the help window is a writer window too (in disguise) so asking for the "active view" on processing the F2 in the real writer will get the help window as the active view, which doesn't match expectations. Take the view from the bindings, where its correct from when the event has been dispatched. Investigating a bit further, the F2 formula window only works correctly when its in an "active" window. So get the correct view from the dispatcher but only accept that view if its the active one. Change-Id: I2fd52ca6b68e887d34b07b70b830722f1d00b37a (cherry picked from commit 77e7dc648ebb8b7d946111e2be4dfdbba72840b2) Reviewed-on: https://gerrit.libreoffice.org/25446 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26Resolves: tdf#99874 gtk3: all-black xbm cursorsCaolán McNamara1-7/+17
(cherry picked from commit 81a8d1250319023f6ca272e0b233ef638cae40f7) Change-Id: I1feca80dd75f7a09e05ac43293e8645da391a775 Reviewed-on: https://gerrit.libreoffice.org/25436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26Resolves: tdf#100024 CRASH when setting a background imageCaolán McNamara1-1/+1
possibly triggered by changes like... commit bb3671180eb7327be9ac178e0d8341322f63d72a Author: Caolán McNamara <caolanm@redhat.com> Date: Tue May 17 20:38:37 2016 +0100 Related: tdf#99523 NotifyPageEvent ultimately comes from HINT_PAGEORDERCHG... which is called for removepage, insertpage *and* change page number. e.g. ctrl+shift+end and similar *move* the page, in those cases not removing before adding results in duplicate pages/slides in the list, causing inconsistencies on what gets selected on undo which made things not get arbitrarily duplicated during page changes Change-Id: I0acf241947c9688f3512b54cc3d8f6892126495b (cherry picked from commit c5ab14e2bca0cc4fabd25b27f078a1c38fda4fa7) Reviewed-on: https://gerrit.libreoffice.org/25435 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26CVE-2016-0718 and CVE-2015-1283 expat woesCaolán McNamara3-0/+794
Change-Id: I83691e616bf964db2cb1e708b57f65b92ea2697e Reviewed-on: https://gerrit.libreoffice.org/25401 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 b33fb0a8a09c2c383b5ed7915da52742cd457fec) Reviewed-on: https://gerrit.libreoffice.org/25407 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26update creditsChristian Lohmaier1-1463/+1521
Change-Id: Ia4d4e0687e79d546876042beebea4eafe66d3f37 (cherry picked from commit 5b168b3fa568e48e795234dc5fa454bf24c9805e)
2016-05-25tdf#38097 min numerator/denominator at least 1Laurent Balland-Poirier1-3/+3
In <number:fraction> attributes min-denominator-digits and min-numerator-digits should be at least 1. Gnumeric can create file with 0 values Change-Id: I08ef51c23ce686136f51277671bf630807353484 Reviewed-on: https://gerrit.libreoffice.org/24670 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit a75aa73b2bf793faac1adb3b5f67e09d252d5fe9) Reviewed-on: https://gerrit.libreoffice.org/25449 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#95339 Extend test to distinguish minute/monthLaurent Balland-Poirier1-0/+4
Detect minute in user number format such as SSMM or MMHH Change-Id: Iadb29dabba167b8f59903ff05e7367857378738a Reviewed-on: https://gerrit.libreoffice.org/25222 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit c9ed6e832213129cc579c1c309ce9dbd3593c57a) Reviewed-on: https://gerrit.libreoffice.org/25448 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#61996 Skip quoted text in number formatLaurent Balland-Poirier1-5/+32
Quoted text should be detected and skiped before detecting conditions Change-Id: I1c78fed7f543fb335fbb8ec9ed50d9ab9dd10aa7 Reviewed-on: https://gerrit.libreoffice.org/24550 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 88a79589843efc24f8af99bd511a1fff0f7bebef) Reviewed-on: https://gerrit.libreoffice.org/25453 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#31449 Correctly test if fraction has no integer partLaurent Balland-Poirier3-2/+14
Test if fraction format has no integer part is modified to take into account all cases: ??/?? or ##/## and do not detect false positive like ? ??/?? Change-Id: Ia8677a5ad496e5df56ce6bf1290323555e46ba0a Reviewed-on: https://gerrit.libreoffice.org/24540 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 3beb146b34fa931e2d63f4738a3ae69fe286545f) Reviewed-on: https://gerrit.libreoffice.org/25452 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#97835 No decimal separtor for empty decimalLaurent Balland-Poirier2-14/+9
If decimal part is empty (with #) decimal separator should not be added. It was not removed if there was text after value. Change-Id: I891cad8b6bec0f27f4cef8aea80c5dad264f062d Reviewed-on: https://gerrit.libreoffice.org/24586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 48435bfddf38de2b31df50e70438ef7946a0c3cb) Reviewed-on: https://gerrit.libreoffice.org/25451 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25opengl: use existing code for "legacy" polyline, polygon render.Tomaž Vajngerl9-294/+306
Rendering polylines, polygons, polypolygons which take an array as parameter ("legacy" code) can re-use the other, already existing code paths (same thing as "headless" svp backend does). (cherry picked from commit 6473093d4f6ee7d06905ddd71c90180fcffb0bef) opengl: use line shader for all line drawing not just polylines Line drawing using the line shader was used only when drawing polylines. With this commit every line drawing is using the line shader. This gives a marginal performance win and removes the old code for doing anti-aliased line drawing. (cherry picked from commit c8fc1f40ad8e20af32574e0aa73bdec51ae64e14) opengl: combined shaders to reduce shader switching Combine most common shaders for non-texture drawing and texture drawing into two combined shaders. Inside the shader we switch between the code paths with if statements. Using if statements (or any other branching statements) is discouraged inside shaders but on the other hand we reduce program state changes if we have less shader changes - which is more important for us as we want to push more work to the GPU. (cherry picked from commit 3cac38b2311538a0aecca765eb62c30c5098a85c) Change-Id: I19a486b6f65b1c4db0b15a54e5e4d12f42a9f6d5 Reviewed-on: https://gerrit.libreoffice.org/25382 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25ruler: close the polygon when drawing indent handle (gtk3, gl)Tomaž Vajngerl1-1/+3
Change-Id: I9d1d20f889f73c73a1b861485a956a25f743e245 (cherry picked from commit 17e329e4092a2e49f47452d89fea51eb702d4fd2) Reviewed-on: https://gerrit.libreoffice.org/25383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#95954: Reasonable background for roadmap widgetKatarina Behrens2-8/+13
also move setting control font/text style to ApplySettings func Reviewed-on: https://gerrit.libreoffice.org/25054 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 433cb02f88c75428fe5a34ca090fd43ae1cc855d) Change-Id: Iec71ebb42424e0d29fb5c5e155773b61bfcf2313 Reviewed-on: https://gerrit.libreoffice.org/25403 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#98753 Find Toolbar does not display "Search key not found"Samuel Mehrbrodt1-7/+22
Revert "Toolbar: Refactor insert toolitem code" This reverts commit 27bdc70d83d4a4f1ebb89429f61b39084e739aaa. Change-Id: I1d46cddfd656ab8c809b6cd6308725a8e67fe538 Reviewed-on: https://gerrit.libreoffice.org/25433 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3349594bffc1eda4ee1d258be207b40f2f6f9b12) Reviewed-on: https://gerrit.libreoffice.org/25434 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25libxml2: upgrade to release 2.9.4Michael Stahl2-2/+2
Reviewed-on: https://gerrit.libreoffice.org/25412 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 469aa7fb9e42757267347b986f0e2b1184ebb508) Change-Id: Ia3109b704155b9baa28f2a5f224e55af161f4fa1 Reviewed-on: https://gerrit.libreoffice.org/25417 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#99130 use subdivision on B2DPolygon, angle based subdivisionTomaž Vajngerl4-38/+2
Remove the subdivider we used until now as there is a better way to subdivide a polygon with getDefaultAdaptiveSubdivision, which in additiona also caches the result. The subdivider used in getDefaultAdaptiveSubdivision was a limited count based subdivider so this exchanges that with an angle based one which gives much better results. Reviewed-on: https://gerrit.libreoffice.org/25033 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 37ed508022e0be8b793caa4748cfee634c1c8a9c) Change-Id: I95c009ccf3d54305df0d8eef177cab0df0a23bea Reviewed-on: https://gerrit.libreoffice.org/25381 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25opengl: track the state of blend, DrawArrays on OpenGLProgramTomaž Vajngerl5-84/+115
This adds tracking of GL_BLEND and glBlendFunc which are usually set when setting up the current draw call on OpenGLProgram with SetBlendFunc method. Until now the final draw call (glDrawArrays) was called outside of OpenGLProgram. This is a problem because we need to know if we did call SetBlendFunc or not between when we used or reused the current program. So we added DrawArrays to OpenGLProgram and refactored all draw calls in OpenGLSalGraphicsImpl to use this. From now on glDrawArrays should not be called directly but always through OpenGLProgram. (cherry picked from commit e480b2cf3e362760de8e35cbb950104e47ebe7ec) Change-Id: I530b4b948af8a962669a3751e1a95ff3986ffec9 Reviewed-on: https://gerrit.libreoffice.org/25359 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-24Resolves: tdf#99733 don't crash on moving range of cellsCaolán McNamara2-0/+10
Reviewed-on: https://gerrit.libreoffice.org/25405 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 0d116ad98d7c25df4ad63839bcf2fd7f152956df) Change-Id: Ib9afc8ef292e517954b24321100862f5235290e5 Reviewed-on: https://gerrit.libreoffice.org/25408 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-23Resolves: tdf#95620 crash in presentation wizardCaolán McNamara2-0/+12
possibly a regression from VclPtr or maybe from VclBuilder, or a bit of both. Change-Id: I46acf07e219334547429da7b2983d5be9cdb6ef8 (cherry picked from commit 1ea14bb0bbb7ca79c0a60a1041243bbebda31e18) Reviewed-on: https://gerrit.libreoffice.org/25112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-23Resolves: tdf#99523 exit text edit and unmark objects before moving slideCaolán McNamara9-80/+141
otherwise correct undo isn't recorded for moving the slides Change-Id: I08338a413f10242c4bdf92a73d504f125bc26631 (cherry picked from commit 4e41e784b97a5b6f5e0cc1f5b24b816ef887b310) Related: tdf#99523 select only the desired slides when selecting the same slides in the document as are selected in the slide pane, don't forget to unselect any slides already selected in the document. Change-Id: I97d744c1c57b68dc312a17a5cd5290e1b6ccf083 (cherry picked from commit db00223e6d3132eac9603e5dabd20cd03f599cb3) give this tremendously useful snippet a descriptive name and de-duplicate it This is the magic smoke which sets the right selection on an undo of move slides when the slidesorter has the focus. If the main shell has the focus then the undo doesn't reselect the original slides like it does when this artifact is in the mix. Change-Id: I5ebe0195225136bfaf81e28ad4ba8e9ec431cc22 (cherry picked from commit e226c19e9136dda366c1485a9d53a0c5d433387c) move the KeepSlideSorterInSyncWithPageChanges to a level lower so that is a SlideSorter is present it is kept in sync on undo/redo. regardless of whether focus is in the SlideSorter or in the main shell. Change-Id: I11b3333b4447a6020862092e89e9a89de1768f87 (cherry picked from commit a0de7474400ae0a84daf688de12c9344d028df93) maDeletedPages member of slidesorter is only written to, never read Change-Id: I5eb58462306f3d8cab54eb00f4ff492c80585dbb (cherry picked from commit 9288886b01907545e22b98dca1dc666a11d71e55) Related: tdf#99523 NotifyPageEvent ultimately comes from HINT_PAGEORDERCHG... which is called for removepage, insertpage *and* change page number. e.g. ctrl+shift+end and similar *move* the page, in those cases not removing before adding results in duplicate pages/slides in the list, causing inconsistencies on what gets selected on undo Change-Id: I7e0a0231e90a77adea03619a0dd92ddbbcbba442 (cherry picked from commit bb3671180eb7327be9ac178e0d8341322f63d72a) refactor this repeated code into a single method no logic change Change-Id: I362d888323bb22ded7812147811efbebce933564 (cherry picked from commit cc03133e1b719ad6ae3885f2eca519196843f2c4) Reviewed-on: https://gerrit.libreoffice.org/25107 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-23Resolves: tdf#93101 handle external references and propagate errorEike Rathke3-16/+112
Cherry-picked 5 commits from master: tdf#93101 propagate external reference error from refcache token (cherry picked from commit 7de92ad48d8c4fe7a1f9fb24ef8afc7d8907788e) tdf#93101 correctly resolve svExternalSingleRef token in GetMatrix() ... including error propagation, and use GetNewMat() instead of a plain ScFullMatrix so the interpreter error handling is set up. (cherry picked from commit 2f94ff566f7827792175daedb92f12a7e61ad95d) tdf#93101 handle svExternalSingleRef in ISERROR() (cherry picked from commit 824cf015683383b553c744a746ac8e8ea65495cf) handle svExternalSingleRef in all IS*() functions, tdf#93101 related (cherry picked from commit f053086fbc625fca8ba7b956738d33ba78a80f9b) handle svExternalDoubleRef in all IS*() functions, tdf#93101 related (cherry picked from commit 365c4d8c60e89fd57a91f51ca51a8796fe91edd7) 862c46f9afc2afd0bb2a23aa767158e0945583a5 9e2a4aeb16d6777153d2f47a1c1af68fe2e97780 14181dd2dbb5d412e3dd165dcbf7468cb8ea8b21 48813de703ea926b8828f4e262393f7643216989 Change-Id: I90491a7b18fddaddb3bbb4d7a3f8b9555b9b1198 Reviewed-on: https://gerrit.libreoffice.org/25207 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-23set parent window of windows system file picker on save(as)Oliver Specht6-5/+38
If no parent is provided the Windows system file picker uses either the current foreground window or the desktop. The decision depends on the thread id of the foreground window. To make sure the document window is used as parent this is now also sent to the system file picker as it was already done for the internal file picker. Change-Id: Id589cbc1f91db30e065175aaea42ef1512ffb1b9 Reviewed-on: https://gerrit.libreoffice.org/24635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/25211 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-20Resolves: tdf#83746 wrapAddress() didn't do what it was supposed to doEike Rathke1-6/+47
i.e. subtracted nMaxRow from MAXROW that is set for entire column references, resulting in row 983040=1048576-65536, instead of doing a modulo operation. Also, entire column/row references are now untouched so they still reference the entire column/row. Note that in Excel BIFF8 an absolute addressing of row 1 and 65536 means entire column, so B$1:B$65536 saved and reloaded results in B:B, which may be unexpected. Change-Id: Iae65d47ba937b9ade95e4ea1be98012b80e1c9db (cherry picked from commit 6821ad076c276b997c44520fd700817566a718c5) Reviewed-on: https://gerrit.libreoffice.org/25182 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-20use vector replication for single row/column arraysEike Rathke1-6/+6
... also in GetStringFromMatrix() and GetDoubleOrStringFromMatrix(), not only in GetDoubleFromMatrix(). Change-Id: Idb4bd7d7ed7574cf80d2998d1e5bfa5a6015b833 (cherry picked from commit ccc49b79a8425138d46e7be2acf3ef43b5aa232f) Reviewed-on: https://gerrit.libreoffice.org/25218 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-20handle svExternalDoubleRef just the same as svMatrix in MATCHEike Rathke1-4/+0
Change-Id: Ibd2b6fcc2be85948a7e228494e4e388e79c1e9ab (cherry picked from commit 9512dd16c92231514b9a5df3891517861a882d73) Reviewed-on: https://gerrit.libreoffice.org/25220 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-20always use GetNewMat() in interpreter context instead of plain ScFullMatrix()Eike Rathke1-3/+3
... so error handling interpreter is set and im-/mutable flagged correctly. Change-Id: I3e2647b6e4a4f4bcfdf7264d6942844941ea6c6b (cherry picked from commit 981ff6dfd8627981462ec7c10a8a74d636d3d0d5) Reviewed-on: https://gerrit.libreoffice.org/25213 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-05-20 tdf#64748: added placeholder option to pdf export dialog in WriterOliver Specht11-14/+69
This patch introduces a setting 'Export placeholders' to File/Export as PDF. It works like the related printer setting. Change-Id: I3a11a4601b1244b57e55c9b73b58116d355e105c Reviewed-on: https://gerrit.libreoffice.org/24976 Reviewed-by: Oliver Specht <oliver.specht@cib.de> Tested-by: Oliver Specht <oliver.specht@cib.de> Reviewed-on: https://gerrit.libreoffice.org/25053 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-19tdf#99850 Menu entry for Select Sheets...Olivier Hallot1-1/+1
(Signed off in l10n list) Change-Id: I045677d79894791b8add3b79eddac73e3a526d4e Reviewed-on: https://gerrit.libreoffice.org/25035 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 6e96587601e7f73869d09ac2e3296b606b290721) Reviewed-on: https://gerrit.libreoffice.org/25181 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-05-19Resolves: tdf#86502 split formula groups referring bounds shifted intoEike Rathke1-7/+31
So references can be updated or invalidated individually when deleting cells with shifting cells up or left. Change-Id: I03a57e94cf0fa9bb0716ffec21960e85ad5c7094 (cherry picked from commit a2e591e26549294cdb07eb685d4069343404d898) Reviewed-on: https://gerrit.libreoffice.org/25118 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 15:20:29 +0000