Jan Holesovsky [Fri, 5 Feb 2016 15:54:31 +0000 (5 16:54 +0100)]
lok: Search result should contain info if it is a 'search all' result.
Change-Id: Ia3ee81ced4f74c0d029a478bd59eff44d72ef327
Andras Timar [Fri, 5 Feb 2016 15:23:35 +0000 (5 16:23 +0100)]
Bump version to 5.0-22
Change-Id: I64601731b6f178bf1b6436e326b2064e397a1b02
Jan Holesovsky [Fri, 5 Feb 2016 11:20:11 +0000 (5 12:20 +0100)]
lok: Notify also about the states of .uno:CharBackgroundExt.
.uno:CharBackgroundExt is supplementary to .uno:BackColor.
When .uno:BackColor is set, Writer turns into a 'watercan' mode, where the
user directly marks parts of the text with the wanted background color.
.uno:CharBackgroundExt then controls this watercan mode - dispatching it
toggles the watercan mode on/off, and also the StateChanged events reflect the
on/off mode accordingly.
Change-Id: I6472eb39129d1b1517fba14bad584cbd125e826a
Marco Cecchetti [Thu, 4 Feb 2016 14:36:43 +0000 (4 15:36 +0100)]
impress - unable to search inside table - fixed
Conflicts:
sd/source/ui/view/Outliner.cxx
Change-Id: I07df8d0330390ac599aac364581aee1c9fd0f809
Tomaž Vajngerl [Thu, 4 Feb 2016 13:44:36 +0000 (4 14:44 +0100)]
lok: fix saveAs for a loaded HTML document
a HTML document is reported as "com.sun.star.text.WebDocument"
which is a unsupported document type in LOK so report it as a
LOK_DOCTYPE_TEXT instead.
Change-Id: Iaa77cb8b1f55cf31ebbb4fd4d69c02702e60e251
(cherry picked from commit
806d34981f480908645038f4cfc29ebcf25ca145)
Tomaž Vajngerl [Thu, 4 Feb 2016 13:43:28 +0000 (4 14:43 +0100)]
Allow HTML (WebDocument) to be exported as PNG or JPEG
(cherry picked from commit
9f84b757a2e6678a30a797e85d8236612b952646)
Change-Id: Id6b70a88ea479b402e680c7c216a20be3d6e116e
Xisco Fauli [Thu, 21 Jan 2016 19:56:31 +0000 (21 20:56 +0100)]
tdf#91762: Check wether the row and the cell have text...
... in order to set the row's min height
Regression from
4f2c8194f485b1527fb4f4dfe23ce804937f1f9c
After this commit, the row's min height was set based only on
the cells containing text in the row, but the problem appeared
when the row didn't have any cell with text.
Change logic to check wether there's text in the cell and in the row.
Now, height in SdImportTest::testRowHeight() is 507 instead of
508 but I can't figure it out why. However, I believe there's
no harm in change the test from 508 to 507 as, visually speaking,
the difference can't be distinguish.
Change-Id: I0b3a14c34eaeaa8e77227860ca290fb79a0302ce
Reviewed-on: https://gerrit.libreoffice.org/21692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit
13d4398820ded5914f635757865e258db2db2b57)
Reviewed-on: https://gerrit.libreoffice.org/22009
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit
7583d19a58f9aa0fed51c248c1773285e2cb39cf)
Tor Lillqvist [Sun, 18 Oct 2015 19:57:47 +0000 (18 22:57 +0300)]
tdf#97150: tdf#94924: If we can't handle strings, don't try to then
Fixes the VLOOKUP problem reported in tdf#94540 by falling back to
non-OpenCL for such a case, where one of the columns passed to the
VLOOKUP contained strings. And since a while, we don't claim to handle
strings in VLOOKUP. Which is true.
(cherry picked from commit
476bef70f1d9fd58b29a1f6fb95e54567b031acf)
Change-Id: I4140c86bf8166beb8201aa90c075d9f4432d9173
Reviewed-on: https://gerrit.libreoffice.org/21874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit
6f50edb1aabaf9de37782e63abd109e2276bd0c4)
Eike Rathke [Tue, 26 Jan 2016 15:10:06 +0000 (26 16:10 +0100)]
Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta
(cherry picked from commit
02e69f0c3acec2c2e81692bc53c4356591a84ba5)
Conflicts:
sc/source/core/tool/token.cxx
Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27
Reviewed-on: https://gerrit.libreoffice.org/21821
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit
406fdc37081a2bdbb4f15f80605f881105c15da0)
Caolán McNamara [Tue, 26 Jan 2016 15:33:40 +0000 (26 15:33 +0000)]
Resolves: tdf#97276 don't clip out line if the underlying page size is unknown
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
(cherry picked from commit
ad99c633908f7c70d06812ebfb4e0696666f0158)
(cherry picked from commit
38b362c58abd0df654665956ffc751d40cfb67ab)
Reviewed-on: https://gerrit.libreoffice.org/21814
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
5f9a61e877d79cce1f99c05a9c1598a029bf2c1c)
Caolán McNamara [Tue, 2 Feb 2016 11:50:51 +0000 (2 11:50 +0000)]
Resolves: tdf#97375 use Invalidate in all modes
makes the crash/hangs go away
(cherry picked from commit
ab5c427784fb72d52042b8122ffc5a0fd7108c6b)
(cherry picked from commit
c3f09ae629b349c52a4a7954e3017ceb8d7afeaf)
Change-Id: I91a4391190ec7aa0ffa5e41a8c1eb86b4bb9c484
Reviewed-on: https://gerrit.libreoffice.org/22026
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
1b49e14c82af691fe1ec5aa5de8392350bce11a1)
Michael Stahl [Tue, 2 Feb 2016 13:10:02 +0000 (2 14:10 +0100)]
xmloff: tdf#96147: ODF export: fix duplicate fo:background-color
... attributes that happen if both CharHighlight and CharBackColor
properties are used, because the CharBackTransparent property wasn't
taken into account, and combining the CharBackColor and
CharBackTransparent properties happens *after*
XMLTextExportPropertySetMapper::ContextFilter() runs.
Also, it looks like a transparent highlight wouldn't export properly but
apparently DomainMapper::getColorFromId() won't create such.
(regression from
f880962f5bf26bfaef06bd3f9e67e2d901a2e74c)
(cherry picked from commit
8dadefc35f8b33648fb6adbdaca75ea52b2705db)
Change-Id: Ib628ef8bb377482f74fadb97c81afb95fbbf7184
Reviewed-on: https://gerrit.libreoffice.org/22046
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
e92dcab1407fa26fc5ee68d0b626b87bc04f1b3b)
Caolán McNamara [Wed, 3 Feb 2016 12:36:09 +0000 (3 12:36 +0000)]
Resolves: tdf#96653 distorted images on export to pdf
regression from:
commit
ffe150ce903d9cdc62c25ad3437e61d24ede17d6
Date: Fri Dec 4 18:19:08 2015 +0100
tdf#94739 use GetScanlineSize instead of calculating it
which was on the right track in the sense that the original
code was wrong and only worked for <= 8 bit depth images
Change-Id: Iee54a9f29dd0fdaf3e1f2aeb7b9898cecb453e37
(cherry picked from commit
384c815eda697d75706f686dc2ceb227b4d3f245)
Andras Timar [Wed, 3 Feb 2016 12:30:35 +0000 (3 13:30 +0100)]
Bump version to 5.0-21
Change-Id: I2f1f6a61661faad76a9929ffc64125ffbd09ec6a
Michael Stahl [Wed, 3 Feb 2016 10:38:10 +0000 (3 11:38 +0100)]
libreofficekit: CppunitTest_libreofficekit_tiledrendering crashes
Need to check that a callback was actually set before calling it.
Change-Id: Icb2ca19aec0c74f6695d7286f046dadfe609d68c
Jan Holesovsky [Wed, 3 Feb 2016 10:59:04 +0000 (3 11:59 +0100)]
lok: Avoid the 'alien format' warning in LibreOfficeKit.
We immediately cancel all the dialogs that potentially come up when using
LibreOfficeKit; which means that when you tried to save a .docx to a remote
server (which triggered the 'alien format' warning), the save operation
couldn't be completed.
Change-Id: I6bb5eadac994c1f515d7a49299c21960b3491bbe
Jan Holesovsky [Tue, 2 Feb 2016 21:59:34 +0000 (2 22:59 +0100)]
lok interaction handler: Add handling of io and network errors.
Change-Id: If7c84a7b24f2072439718fb0c473b73243f2ecc1
Jan Holesovsky [Tue, 2 Feb 2016 10:54:35 +0000 (2 11:54 +0100)]
lok interaction handler: Move password handling to an own method.
Change-Id: I1b3cfdef5f4f81c9138ad5600e43755841df5d75
Miklos Vajna [Fri, 8 Jan 2016 10:23:48 +0000 (8 11:23 +0100)]
tdf#96308 RTF import: fix tab stop inheritance inside table cells
The tab stop list is a paragraph property, and RTF requires to repeat it
after \s as direct formatting, otherwise the parser should be assumed
that the tab stop list is cleared as a direct formatting.
Non-buffered text handles that in getDefaultSPRM(), handle it directly
in the RTF_PARD code for buffered text.
(cherry picked from commit
1ec88cdb82a28851c4b97d7f043d8bcec3c675e8)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I16b09bc4c177df5a74d16653b829b198aa1a800f
Reviewed-on: https://gerrit.libreoffice.org/21996
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
cb64c29389939048666141eb4dddcfae4dd70ee5)
Samuel Mehrbrodt [Fri, 11 Dec 2015 08:23:09 +0000 (11 09:23 +0100)]
tdf#96075 Frame alignment buttons not using correct tooltips
Tooltips change on state change, and they were taken from another source.
Unify this to reuse the existing strings from the uno command.
Change-Id: I8ff6fc43bc0469f15c9e930695d950f6d664bfdf
Reviewed-on: https://gerrit.libreoffice.org/20629
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/20633
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
acfc9935a41d45619d09d05abe6d933c3cd9fcc7)
Justin Luth [Wed, 28 Oct 2015 08:12:17 +0000 (28 11:12 +0300)]
tdf#93637 TAB_OVER_MARGIN support for a few more cases
Extending nMaxRight when TAB_OVER_MARGIN compatibility is set and
the right tabstop goes beyond the right margin fixes PDF output
as well as certain cases of screen display.
Reviewed-on: https://gerrit.libreoffice.org/19635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit
d1bd4465be649a4078c3a2f85a64c8a6300dd65d)
Reviewed-on: https://gerrit.libreoffice.org/21561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
8c564a1fd313da29088bed6453c5e16876690d24)
Change-Id: Ida4b4f399f06670d9bdefdc21978adf19a81d53a
Reviewed-on: https://gerrit.libreoffice.org/21694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
7b644045bebcd70e7324beac793b5018da1c4de5)
Stephan Bergmann [Wed, 27 Jan 2016 07:34:52 +0000 (27 08:34 +0100)]
Quickfix for Win 64-bit C++ UNO bridge (more than 20 params)
See <https://wiki.documentfoundation.org/Development/msvc-x86_64#Broken_C.2B.2B-UNO_Bridge>,
increase the number of supported params to 32 to at least make the
ooo.vba.excel.XApplication.Intersect case (and thus CppunitTest_sc_macros_test)
work. The true fix will be to abandon this simplistic approach, as elegant as
it may have appeared.
Change-Id: Ieeb17f682bd5ea8cb7a6188b89978698949461aa
(cherry picked from commit
ef99aad5868b308e1a421c3eaa8221f8f78d80d5)
Reviewed-on: https://gerrit.libreoffice.org/21834
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit
b7937f1caf86cb68ba8d9b04fb4069934a754cf1)
Caolán McNamara [Fri, 22 Jan 2016 10:52:19 +0000 (22 10:52 +0000)]
Resolves: rhbz#
1257635 after httpConnectEncrypt use cupsGetDests2
sometimes after calling httpConnectEncrypt + httpClose and then
calling cupsGetDests we get no printers found. Using
cupsGetDests2 with the return of httpConnectEncrypt consistently
provides results.
Change-Id: I7ea5b11fbaabbd7ca73e5c94d0757ebdea8445ad
(cherry picked from commit
6b86edae5c1eee51ee754b8013d463497bb75f65)
Reviewed-on: https://gerrit.libreoffice.org/21716
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit
41e96311290a85f190dc4838de6a9bc24fa96e9a)
Christian Lohmaier [Wed, 27 Jan 2016 00:51:30 +0000 (27 01:51 +0100)]
update credits
Change-Id: Id5647e0d72a5560c7bc0c75fd7a06a1897ca4071
(cherry picked from commit
446eb095354124406063b6467d1886b8647dc211)
(cherry picked from commit
de8b2cfbcec31077b09adb2b2856d1185d1559e9)
Caolán McNamara [Tue, 26 Jan 2016 14:46:49 +0000 (26 14:46 +0000)]
Resolves: tdf#97331 use VclPtr instead of pointers to avoid crash
(cherry picked from commit
5d29ed1801a07d4649e095c25935b50f5ad32eb4)
(cherry picked from commit
53e693ccfb19aa653ab2b5762c10ae87c9320954)
Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e
Reviewed-on: https://gerrit.libreoffice.org/21810
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
72c2f90a42dad97cf9bc1a20c15f9946348fe01b)
Michael Stahl [Fri, 15 Jan 2016 11:08:06 +0000 (15 12:08 +0100)]
oox: coverity#
1348468 copy-paste error
Change-Id: Ibea6944c4e61e9848aac936e399ed08192ec5812
(cherry picked from commit
99ab23d26010120e7e6344cb2b26e192890ec5c3)
Reviewed-on: https://gerrit.libreoffice.org/21489
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
436b1615b271bae46a43530c2dab3a80b4e46419)
Michael Stahl [Tue, 12 Jan 2016 22:01:34 +0000 (12 23:01 +0100)]
xmloff: there is no reason why office:version should be omitted
... if a document contains foreign elements or attributes.
In fact since ODF 1.2 the office:version attribute is mandatory and any
document that omits it is therefore invalid, while "extended conforming"
documents are allowed to contain foreign elements and attributes.
This mysterious check was there since CVS initial import, but without
any justification.
(cherry picked from commit
d277ac87455a599fbf4acd3c6401f09bc74d3dac)
Change-Id: Ifeafad2b7af41f06356461adb7ae65dbf7bae11d
Reviewed-on: https://gerrit.libreoffice.org/21475
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
32a25a623347c038ec75c3c594d615419c4da7fc)
Miklos Vajna [Thu, 7 Jan 2016 07:19:17 +0000 (7 08:19 +0100)]
tdf#95213 DOCX import: don't reuse list label styles
We used to optimize the creation of these styles, so in case two list
label had the same character properties, then we could avoid creating
two styles for those.
This isn't correct though: it means if the style is changed later by the
user, then unexpected other places in the document will change as well.
Do what the binary DOC filter does: create one character style for each
level of a numbering separately.
(cherry picked from commit
f9c8d97d82a85b897520a2fe897352ee5ad879d9)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/NumberingManager.cxx
Change-Id: I967b30fc078b1be30f7ef81b2706df2962fc3fb0
Reviewed-on: https://gerrit.libreoffice.org/21437
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
af55185eb9ffcf903bba22cad736797162a7eb4d)
Yogesh [Thu, 21 Jan 2016 10:54:40 +0000 (21 16:24 +0530)]
tdf#96910 : Calc crashes while using "Insert Column Left" for large Documents
Change-Id: I6e813b7525a3d9b1db131db9f08fc20f7320345f
Reviewed-on: https://gerrit.libreoffice.org/21661
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit
208883398dcf9af6b88611097d1f75d5fbc9afad)
Reviewed-on: https://gerrit.libreoffice.org/21792
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
10f3272bb1bf36cae5eb6e80f9f1e0f4753ebb5d)
Julien Nabet [Fri, 22 Jan 2016 19:18:33 +0000 (22 20:18 +0100)]
tdf#97308: fix logic with conditional "ends with"
Change-Id: Ib9f9ed627dc37b11d8c3911aa4fe62141ff471c2
Reviewed-on: https://gerrit.libreoffice.org/21723
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit
a0a4ea3c636fc18cca6a3b2f9391996fb909e81f)
Reviewed-on: https://gerrit.libreoffice.org/21731
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit
9cd87519d7a9d97b58fafff25280bd77fe04ab25)
Caolán McNamara [Thu, 21 Jan 2016 09:28:12 +0000 (21 09:28 +0000)]
valgrind: memleak on thrown exception
(cherry picked from commit
f5aefab2a62a90c631e05ec29022a2f7e19f00c3)
Change-Id: I2788c5fe04a984d6534adbd3186cc652685152e8
Reviewed-on: https://gerrit.libreoffice.org/21737
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit
636d45438f317d7ef39d660c11f6bab1dc42302a)
Caolán McNamara [Thu, 21 Jan 2016 09:54:29 +0000 (21 09:54 +0000)]
valgrind: memleak on thrown exception
(cherry picked from commit
15b1080e624447ca1af1396023bb1fbfdb44fb26)
Change-Id: If562dc69290021f898feff9f8e3983b867075172
Reviewed-on: https://gerrit.libreoffice.org/21736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit
85918431993fe3637145cca62b133c0c21cb5430)
David Ostrovsky [Tue, 1 Dec 2015 22:59:11 +0000 (1 23:59 +0100)]
Add build toolchain to upload LibreOffice API to Maven Central
Set up the toolchain to create sources and javadocs artifacts in
addition to JARs created during the build. Use Buck build tool for
that: [1]. This is a fork of Google's build tool Blaze, created by
Xooglers at Facebook. This build tool (like Blaze itself) uses
Python to write build files.
Add needed tools and build files to install LibreOffice API artifacts
to local Maven repository or deploy them to Maven Central.
To build all needed artifacts LibreOffice must be built regularly
with GNU make first. To build the rest of the API (sources and
javadocs):
$> buck build api
To replace version number with upcoming release version:
$> solenv/bin/version.py 5.1.0
To install the API to local Maven repository:
$> buck build api_install
To deploy the API to Maven Central:
$> buck build api_deploy
Detailed documentation is added to document the prerequisites and
the workflow to upload LibreOffice API to Maven Central.
* [1] https://buckbuild.com
Change-Id: Ibdd552a01110836703bc069abe829b9921491cac
Reviewed-on: https://gerrit.libreoffice.org/20343
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit
1fd41f43eb73c373cb94d32d82c5fb7a7e243367)
Reviewed-on: https://gerrit.libreoffice.org/20814
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
95fe7d0a68c230df13c80dd8759f86d635c48101)
Maxim Monastirsky [Thu, 21 Jan 2016 23:51:46 +0000 (22 01:51 +0200)]
Fix wrong use of OUString::copy
Code like:
if( aCommandURL.copy(5) != ".uno:" )
is obviously wrong, as OUString::copy(sal_Int32) takes the _beginning_
index, so for this condition to be false the command URL must have
".uno:" in the _middle_ of the string. This created some weird things
like an empty label attribute added to any submenu item. Moreover, the
command URL can be easily shorter than 5 (like when a custom submenu
added by the user). Using copy(5) in such case officially considered as
"undefined behavior" and will trigger an assert in debug build (that's
how I discovered this code actually).
Most likely the original intent was to check whether the command URL
doesn't start with ".uno:", and so should be changed to use
OUString::startsWith. But doing that will create a regression, as it
won't be possible anymore to change labels of commands that start with
".uno:". Simply dropping this check seems to be better solution here.
(cherry picked from commit
0dbe3d40579d20f4cbce3ce155996ff4b5c32c99)
Conflicts:
framework/source/fwe/xml/menudocumenthandler.cxx
Change-Id: I2f88807eceae1006066a14750f2003e235f49ad4
Reviewed-on: https://gerrit.libreoffice.org/21705
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit
23d363f019e8c6911adb5f8b07bdb7ff09d467cc)
Caolán McNamara [Wed, 20 Jan 2016 15:17:09 +0000 (20 15:17 +0000)]
Related: rhbz#
1149116 collateEquals was set with OString::boolean
but extracted with toInt32()
since
commit
c76cd71fe9bdefaef3f33f8ca193c32e3ab112ed
fdo#41524: CUPS printing: use "collate" option when PDF is available
though actual reported problem works fine for me with default f23
configuration already, this looks suspicious however
Change-Id: I6fcb5df8039296c0e8b0fe931cb490396182de38
Reviewed-on: https://gerrit.libreoffice.org/21629
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
e220ba8610f8315af473a230565daa978ca6a16c)
Reviewed-on: https://gerrit.libreoffice.org/21631
(cherry picked from commit
01c60a8452bf991bb5e09e9780d05a8376979255)
Christian Lohmaier [Wed, 20 Jan 2016 00:11:48 +0000 (20 01:11 +0100)]
update credits
Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b
(cherry picked from commit
00c523c0daac1934e300775ea370003e84da1971)
(cherry picked from commit
0465c9517302fa71629265f2c82e3fc639e182f7)
Michael Stahl [Fri, 8 Jan 2016 15:02:43 +0000 (8 16:02 +0100)]
tdf#96480: ODF import: eliminate duplicate cross reference heading bookmarks
7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c is apparently worse than it
appeared at first glance since there are numerous assumptions about
bookmarks, such as that if they were inserted successfully they may be
copied successfully, which isn't the case for duplicate cross reference
bookmarks.
So fix this differently, by eliminating the duplicates and mapping all
reference fields to refer to the surviving bookmark.
It was not possible to do this in SwXBookmark by checking the makeMark()
return as that would raise interesting problems such as it's currently
guaranteed to have 1:1 SwXBoomarks to core Marks so we can't just
connect 2 SwXBookmarks to the same core Mark, and we also can't leave
the SwXBookmark unconnected after attach.
Another alternative would be to temporarily allow inserting the
duplicate bookmarks and then eliminate them after the import, but what
is implemented now is to check from xmloff for duplicates, which is
reasonably simple.
(cherry picked from commit
774fb6d2e7cf36b677e66c54278225b1256bd40f)
Change-Id: I7ee4854d1c9d8bf74201089cbb7287b1bd8ee3b9
Reviewed-on: https://gerrit.libreoffice.org/21369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
55d2301ac658167396bf5533c940bceffff67f04)
Winfried Donkers [Mon, 18 Jan 2016 11:27:49 +0000 (18 12:27 +0100)]
follow-up of tdf#89031
No function name hints or autocompletion when character right of caret is '$'
Change-Id: I4fcfa6e29e5671e97743c7fc520953721d0bda24
Reviewed-on: https://gerrit.libreoffice.org/21577
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
1e2bcb3177d58e6f446296ae28fcff7f5da9b620)
Reviewed-on: https://gerrit.libreoffice.org/21602
(cherry picked from commit
26bafaacd071dcba4bf7f75776e31c5786cfd725)
Jan-Marek Glogowski [Tue, 5 Jan 2016 19:53:06 +0000 (5 20:53 +0100)]
tdf#93565 Use multiple docs for individual PDF MM
There is actually a comment in the mail merge code:
// convert fields to text if we are exporting to PDF
// this prevents a second merge while updating the fields
// in SwXTextDocument::getRendererCount()
This was included to fix i#93714.
But the reference to 2005-05-23 #122919# in the actual code
doesn't help to understand, why the original code is needed.
I would like to get rid of it, but currently don't have time
for tests.
So the optimization to skip ConvertFieldsToText() and use a
single working document for individual document mail merge
breaks for PDF, as the working document won't contain any
fields after the first document is written.
This uses multiple working documents for PDF export again.
(cherry picked from commit
d7e0d0135ba65243fab5ee038c21290b8e74e548)
Conflicts:
sw/inc/dbmgr.hxx
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: I0cf1c64da27863fc5fb4bb6c7812fed90b737d13
Reviewed-on: https://gerrit.libreoffice.org/21136
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
dcae0a5dba5aadc1e89828518102947f749db10e)
Reviewed-on: https://gerrit.libreoffice.org/21478
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
8d03d6dea84f8c0c9a83031b646e242df7ea5678)
Miklos Vajna [Tue, 2 Feb 2016 09:32:36 +0000 (2 10:32 +0100)]
LOK: add Document::setClientVisibleArea()
... and implement it in Writer.
Otherwise there is no way we can perform e.g. page down in an expected
way. Without this, the core visible area depends on the zoom in the
document, and the client visible area can be something entirely
different.
(cherry picked from commit
bd8610ebafa9caf9f09a5aba9cca04c23691513d)
Conflicts:
libreofficekit/source/gtk/lokdocview.cxx
sw/inc/unotxdoc.hxx
Change-Id: Iadfb5a225da09a2551ffa41ddf503bb3d22b3eae
Marco Cecchetti [Mon, 1 Feb 2016 17:50:02 +0000 (1 18:50 +0100)]
lool - now the fill cursor type is mapped correctly
Change-Id: I6d89df49b9f740b7f81394938222261f25a50dba
Michael Stahl [Fri, 22 Jan 2016 12:39:32 +0000 (22 13:39 +0100)]
libreofficekit: password interaction optional and off by default
Add setOptionalFeatures() function that clients must call during
initialization, and enum LibreOfficeKitOptionalFeatures.
Reviewed-on: https://gerrit.libreoffice.org/21809
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit
23a0ee3c01c3588472e1c19605909d6b9401253c)
libreofficekit: ask for password when loading encrypted documents
(cherry picked from commit
2b63e576a5cf06f4af877d63403ad7955ac71b72)
desktop: use x prefix for uno::Reference
(cherry picked from commit
0101cd3da6262169fa273309a86ba5e7cfe573bf)
loplugin:defaultparams
(cherry picked from commit
95c8b8e85d3328bfbe906ef3f69145842aae01db)
(cherry picked from commit
2241a7fd97b8b70d2d3106ac531cc72192ad708f)
Conflicts:
desktop/inc/lib/init.hxx
desktop/source/lib/lokinteractionhandler.hxx
libreofficekit/source/gtk/lokdocview.cxx
Change-Id: I73035193c87033052921c3aad94fdc057fe81111
Miklos Vajna [Thu, 21 Jan 2016 08:10:29 +0000 (21 09:10 +0100)]
Clean up lok::Office::freeError()
- let it take a non-const pointer, just like free() or g_free() does
- remove lok::Document::freeError(), which was declared, but not
implemented
- move the declaration at the end of the stable API, but before the
unstable section
(cherry picked from commit
8e0c4694f89dd66314faf5cfd411f58f2f8e1bca)
Conflicts:
include/LibreOfficeKit/LibreOfficeKit.h
include/LibreOfficeKit/LibreOfficeKit.hxx
Change-Id: I5a8ced61fc87641dc2fa0ea3615a350361fae3a1
Stephan Bergmann [Tue, 19 Jan 2016 21:05:00 +0000 (19 22:05 +0100)]
loplugin:cstylecast
Change-Id: Ib4052fa88cce3b21d20d050fff9c8d32fcde4c20
(cherry picked from commit
10c9f31ad7d0696327b67b6d2a4e3f244473d877)
Oliver Specht [Wed, 20 Jan 2016 06:52:51 +0000 (20 07:52 +0100)]
freeError function moved to the end of the list
Change-Id: I4aed102b25ddcd5f2e8fa03395e2ffd89c858bb9
Reviewed-on: https://gerrit.libreoffice.org/21619
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
(cherry picked from commit
23c2c7c9cb86db4a36f8a798e63402a053816ef2)
Oliver Specht [Tue, 19 Jan 2016 09:58:07 +0000 (19 10:58 +0100)]
Make LibreOffice kit usable on windows
Uses Ascii variants of LoadLibrary,Get/SetEnvironmentVariable_A_
and adds a freeError function
includes windows.h instead of pre/postwin.h
(cherry picked from commit
442a022cf7baefbd5519ea55c7978cf839e1f44d)
Conflicts:
include/LibreOfficeKit/LibreOfficeKitInit.h
Change-Id: I88b7e3ed3818078efec5688e207da47dc4049b98
Marco Cecchetti [Wed, 27 Jan 2016 22:32:05 +0000 (27 23:32 +0100)]
svg export - skip/rewind slide transition
The following actions messed up the animation engine if they were
performed while a slide transition was running:
- rewind/skip currect playing effect (Left/Right key)
- rewind last/skip next effect (Up/Down key)
- rewind/skip all effect (PgUp/PgDown key)
- jump to first/last slide (Home/End key)
Now:
- Left/Up/PgUp key: rewind slide transition
- Right/Down key: skip slide transition
- PgDown key: skip slide transition and all new slide effects
- Home key: skip slide transition and jump to first slide
- End key: skip slide transition and jump to last slide
Moreover the parsing of transition node properties missed to report some
type of not supported transitions which caused the animation engine to
hung.
Change-Id: I7018b8e8fb3041a95cc80e250431b6544c875e98
Jan Holesovsky [Mon, 25 Jan 2016 20:49:31 +0000 (25 21:49 +0100)]
sd lok: Fix normal 'search' performed after a 'search all'.
The DBG_ASSERT followed by the same test actually returning immediately
prevents the actual 'search' after a 'search all' being performed.
I hope this does not have any negative consequences; but if it does, we should
fix the root cause, instead of having this kind of defensive programming here.
Change-Id: I909533f301dda9c20cab1968de45e5fa7975e852
Andras Timar [Mon, 25 Jan 2016 19:53:24 +0000 (25 20:53 +0100)]
Bump version to 5.0-20
Change-Id: Ia2895520794ab3cf7e7750e6df443c601f59ab67
Andras Timar [Mon, 25 Jan 2016 07:46:57 +0000 (25 08:46 +0100)]
sc: build fix
Change-Id: I21627d09f772d33b5ca45ae11624387b2bee3c28
Henry Castro [Fri, 22 Jan 2016 20:47:51 +0000 (22 16:47 -0400)]
sc lokit: update zoom values to graphic and text selection
Change-Id: I750f31c5698d9dc5ed589a1812a6993991915dc5
Reviewed-on: https://gerrit.libreoffice.org/21724
Reviewed-by: Henry Castro <hcastro@collabora.com>
Tested-by: Henry Castro <hcastro@collabora.com>
Miklos Vajna [Fri, 22 Jan 2016 17:34:27 +0000 (22 18:34 +0100)]
sw tiled rendering: avoid unnecessary invalidation in SwView::SetVisArea()
SwWrtShell's visible area is set to the entire document since
12e3b51abe883202af09769873f87b27d7de118b (tdf#94237 tiled rendering: Use
the entire document as the visual area., 2015-09-15).
Let's be consistent and do the same for SwView, so that
SwView::PageDown() and all other similar functions do not cause
unnecessary invalidations, as this way later we'll realize that SwView's
and SwWrtShell's visible area is the same.
(cherry picked from commit
7b48a8fb2f0a0d8b854ec00d5f03ec09e8cfa4da)
Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx
Change-Id: Ia22f07ddfb18c6f5ab6cbafede7cf8799b1177a1
Miklos Vajna [Thu, 21 Jan 2016 14:20:45 +0000 (21 15:20 +0100)]
sw tiled editing: default to anchoring new images as-char
(cherry picked from commit
e7eca35148204d094dcdb7d8b3e4ec6c9d454159)
Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
sw/source/uibase/wrtsh/wrtsh1.cxx
Change-Id: I6aeb06fe1697b7a30e83a3b1b364f44e5822fe95
Miklos Vajna [Mon, 26 Oct 2015 13:25:26 +0000 (26 14:25 +0100)]
gtktiledviwer: try to paste as html, then as plain text
This commit (as a side effect) fixes LOKTransferable::getTransferData()
to not assume that the string is null-terminated, so it makes sense to
backport it even without gtktiledviewer. Otherwise rtl_str_getLength()
will read memory up till it finds a 0 byte, so it might read
uninitialized memory -> garbage at the end of the string.
(cherry picked from commit
080bd44f0b0300075ff18d377f31deebbc4009ed)
Conflicts:
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
Change-Id: I8e1c93fd36fb903c0625b29f9f73825438c9e113
Jan Holesovsky [Wed, 20 Jan 2016 23:42:59 +0000 (21 00:42 +0100)]
sc lok: Implement unit test for .uno:{Insert,Name,Remove} for sheets.
And fix indexing when at that - the inserting is 1-based, so let's be
consistent in the .uno:Name and .uno:Remove too.
Change-Id: Ib854e81551ae0a39d3ba7c68512e81ea227e9eb1
Jan Holesovsky [Wed, 20 Jan 2016 23:02:16 +0000 (21 00:02 +0100)]
sc lok: Fix .uno:Remove (removing sheets) to accept a parameter.
.sdi annouces that, but it was never implemented...
Change-Id: I7abfbdc88f055eeb993617a5a51371af0f825d34
Jan Holesovsky [Wed, 20 Jan 2016 21:12:33 +0000 (20 22:12 +0100)]
sc lok: Fix .uno:Name (renaming sheets) to really accept parameters.
The code handles them, but they were unusable, because .sdi did not announce
them.
Change-Id: I35bd3009d092eb48a36aee2ffed3964dc61946e2
Jan Holesovsky [Wed, 20 Jan 2016 21:12:19 +0000 (20 22:12 +0100)]
sc: Fix build.
Change-Id: I496015f119b1e102528ac5ec5d27e896de25e56c
Henry Castro [Tue, 19 Jan 2016 19:11:57 +0000 (19 15:11 -0400)]
sc lokit: the visible row/column must be 0, when loading a document
Change-Id: Ie980e0bb0726dd8bc4215d5b23ac6e1d2c9e2719
Reviewed-on: https://gerrit.libreoffice.org/21611
Reviewed-by: Henry Castro <hcastro@collabora.com>
Tested-by: Henry Castro <hcastro@collabora.com>
Andras Timar [Tue, 19 Jan 2016 16:11:09 +0000 (19 17:11 +0100)]
Bump version to 5.0-19
Change-Id: I59783e40f3274c37bd8d77aaa333727a526e99e0
Miklos Vajna [Tue, 19 Jan 2016 14:18:52 +0000 (19 15:18 +0100)]
LOK: include ModifiedStatus in CALLBACK_STATE_CHANGED
Change-Id: Ic44a9266a67bfad8b0490a8acb4a419af99ea42c
(cherry picked from commit
abbfbb4d35d6fa9edbb8f331a9d9503183eb0356)
Miklos Vajna [Tue, 19 Jan 2016 13:29:33 +0000 (19 14:29 +0100)]
CppunitTest_desktop_lib: add jpeg paste testcase
Fails without commit
27c6b8586d5d2cd1fa5425b4969d915a0b739475 (svtools:
implement clipboard import of JPEG files, 2016-01-19).
(cherry picked from commit
802564e036db1ee3df8b19593b7f9f1be0deec54)
Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
Change-Id: Ic4e3b036b3a6a1c294bf15ef0b206cf1e458fc4e
Miklos Vajna [Tue, 19 Jan 2016 11:47:45 +0000 (19 12:47 +0100)]
svtools: implement clipboard import of JPEG files
With this, lok::Document::paste("image/jpeg", "...") as invoked by
gtktiledviewer results in a Writer image just like the previously
already working PNG variant.
(cherry picked from commit
27c6b8586d5d2cd1fa5425b4969d915a0b739475)
Conflicts:
svtools/source/misc/transfer.cxx
Change-Id: I9e7b94043519db4ccf3c9ad32474a15275896dd4
Miklos Vajna [Tue, 19 Jan 2016 11:31:03 +0000 (19 12:31 +0100)]
sot: accept JPEG as a clipboard format where we accept PNG already
(cherry picked from commit
f731ecfd7bd3c703455e07447e9bb593e7b6e059)
Conflicts:
include/sot/formats.hxx
sot/source/base/exchange.cxx
Change-Id: I64602d31e8aa873e2280f86eaf618dd6007acaf1
Christian Lohmaier [Tue, 12 Jan 2016 12:24:45 +0000 (12 13:24 +0100)]
Updated core
Project: help
fd2137731a0361440b7b6a08ac28f6ef0e08aae9
<ahelp> should not be empty/self-closing element (<ahelp ../>)
f5fa46ed8626910d710fd535518ddf9e756f9356 already fixed (tried to) the
empty/self-closing ahelp tag, however <ahelp ..></ahelp> is merged to
<ahelp .. /> by "make translations", so po files ended up with the
self-closing form again. Surrounding a child/PCDATA with the tag solves
the problem.
(cherry picked from commit
8ecafdaa4e5b954941031e384b88c34309b7b27e)
Change-Id: I58725f6a7e5999609262abec2987a6d05445a7b2
Ricardo Palomares [Sat, 16 Jan 2016 20:34:41 +0000 (16 21:34 +0100)]
Updated core
Project: dictionaries
2d2df105c0ba5b7ac4bf7c95b9ecffb3a2f94121
Bring shipped Spanish dictionary up to version 2.0
Change-Id: Iecc9e2d62bd72fa5cdcafe6f04343c611b056cff
Reviewed-on: https://gerrit.libreoffice.org/21522
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit
0d3b5e5314e68c3cf5d573b2e7bdc11143dcb821)
Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Eike Rathke [Tue, 5 Jan 2016 14:42:27 +0000 (5 15:42 +0100)]
tdf#96198 accept WEEKNUM with only one parameter, tdf#50950 follow-up
Loading ISOWEEKNUM(date) maps to WEEKNUM(date) so accept the actual
ISOWEEKNUM parameter count defined in ODFF. This also ensures forward
compatibility with 5.1 where
3e5deb8ccfaf0b73fb6cf394822e560dc036a686
(cherry picked from commit
15494f0f99d1cf6f75e8c2996377b242af247bbf)
converts ISOWEEKNUM(date,mode) to real ISOWEEKNUM(date) if mode!=1 as
there is no matching WEEKNUM(date,mode) defined. This WEEKNUM here never
implemented the ODFF WEEKNUM but a mix of ISOWEEKNUM and something
undefined different.
Change-Id: Ibd0d4483486a1db28cc600821baae9f13b9dd687
Reviewed-on: https://gerrit.libreoffice.org/21118
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit
3665652285f29021f4a12cc493fe8791b6afc126)
Caolán McNamara [Tue, 12 Jan 2016 09:34:50 +0000 (12 09:34 +0000)]
fix a crash found in passing
save a spreadsheet with an embedded formula in it to xlsx
and alt tab away before the save has completed
Change-Id: I9df996d4cb459a2aa688d06a7d53465518bebf5c
(cherry picked from commit
50c2d561981d99abad9978811655365ff9884c87)
(cherry picked from commit
12bc593da98be68961a9ea7d31619a7718fd1d4b)
Reviewed-on: https://gerrit.libreoffice.org/21578
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
86a15daa99f57ddf5ddbdb2d67ed9d69e3bbbf37)
Matthias Freund [Tue, 12 Jan 2016 21:25:30 +0000 (12 22:25 +0100)]
tdf#75256 - Sifr updates
Change-Id: I97a8f0df0548ec05b29c09d160d5f09ddd14a96f
Reviewed-on: https://gerrit.libreoffice.org/21407
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit
fb45376fea3e3d0ff0fc2af56d67efad1e7751cf)
Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit
afa9abd94f1d178e0204deb3d155287e61d350b1)
Matthias Freund [Thu, 14 Jan 2016 21:29:59 +0000 (14 22:29 +0100)]
tdf#75256 Sifr updates
Change-Id: I693bc867c2c75141ebd061325e4d3c49011f6880
Reviewed-on: https://gerrit.libreoffice.org/21481
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit
a05c5deba8c2540872712bdc49eee4441011e454)
Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit
85628a0ee494ab99dbd7a36ee76085318e6ed151)
Julien Nabet [Mon, 28 Dec 2015 16:32:19 +0000 (28 17:32 +0100)]
tdf#65439: Export to PDF/A-1a gives transparency warning
There was a use of transparency because Watermark was always defined
Now we test if text of Watermark is empty or not
Remark: it seems we don't cope not-text Watermark in pdf export
(additional cleaning+renaming)
Change-Id: I9d9c759a80c0a61e4f0a94c0fa295f2950caa3bc
Reviewed-on: https://gerrit.libreoffice.org/20990
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
5c5017ea37e1bee205c6c1b9cafe753fcaf1a9a4)
Reviewed-on: https://gerrit.libreoffice.org/21398
(cherry picked from commit
e0a22b55c979edf703d42ea40a4b8b607e4ad24d)
Thorsten Behrens [Mon, 7 Dec 2015 22:40:39 +0000 (7 23:40 +0100)]
Related: tdf#71622 compress more gfx in odf streams
Except for jpeg and png, most natively-stored image fileformats compress
rather well with zlib. adding a number of vector and pixel formats.
Change-Id: I97407a98f620520b0d11552911d2339bf004dc5b
Reviewed-on: https://gerrit.libreoffice.org/20461
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit
ad0edc184792f3aa3f72e8d4ec8b76c3d1bf8479)
Reviewed-on: https://gerrit.libreoffice.org/20467
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
26f62c80aa3684301e29dd17f9efba1bcd68264d)
Reviewed-on: https://gerrit.libreoffice.org/21438
(cherry picked from commit
cb72051d70a844077363d52a1a54d083136cde03)
Christian Lohmaier [Wed, 13 Jan 2016 01:34:12 +0000 (13 02:34 +0100)]
update credits
Change-Id: I7d00e1eb3bb6d2da18ea2e6ae531aeb18e27c214
(cherry picked from commit
e7d1b8a608096a1a999b9b610ce8862b0fbfc54a)
(cherry picked from commit
35097f9a57a50ca6bd2d32c2f468d9b26bad4d1c)
Caolán McNamara [Mon, 21 Dec 2015 21:21:20 +0000 (21 21:21 +0000)]
Resolves: tdf#93703 0 scaling is CAIRO_STATUS_INVALID_MATRIX
so more drawing to the surface fails
prior to
4ac876084bb89b6460b31e090a666b395f66b1e8 we had
a new cairo context each time to the error was thrown away
along with the context and the new one would work
Change-Id: I90ab1a943e8908e87f391bdfb8ccd5f3818e13d5
(cherry picked from commit
f22d153a07231f2d41c7be9ba0e6b7ce963a0762)
Reviewed-on: https://gerrit.libreoffice.org/20852
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
cfaf07f88332dfe0476d559787c508a1688b5956)
Arul [Tue, 12 Jan 2016 10:05:14 +0000 (12 15:35 +0530)]
tdf#90606 Crash when delete a large part of a column with shift cells left
skipping splitFormulaCellGroup() and joinFormulaCellAbove() for nEndRow equal
to MAXROW since nEndRow + 1 is not valid
Change-Id: Iabfcb33bf58d20331841ca386cca4a91fd6598bf
Reviewed-on: https://gerrit.libreoffice.org/21389
Reviewed-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
975ceab198a06558875006bbd9a4d0a2708e416e)
Reviewed-on: https://gerrit.libreoffice.org/21393
(cherry picked from commit
293e7bef122fc5f5f4b9cc7719e22489913e8726)
Matúš Kukan [Mon, 11 Jan 2016 20:32:55 +0000 (11 21:32 +0100)]
tdf#94831: Check for null mpReadAccess before first use
There was erroneously added code before check in
45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36.
Change-Id: Ie2e84cfc061097c25e5d799e9c388abd9724bd93
(cherry picked from commit
d5dcfe40ff3774d82a7b8f9f3d75b5b3cdac78ba)
Reviewed-on: https://gerrit.libreoffice.org/21373
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit
39f0277ba71c8f3834579003c046d12fa4650e8f)
Jingtao Yan [Thu, 7 Jan 2016 15:28:31 +0000 (7 10:28 -0500)]
tdf#95494 Calc can not sort Chinese word by stroke and radical,
_length must at the tail of filename.
Change-Id: I434e89bf052d8f3130bfca62d71eaf8588c2bac9
Reviewed-on: https://gerrit.libreoffice.org/21213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit
1b683de366f4caf82225c632f02cf0f58ae76490)
Reviewed-on: https://gerrit.libreoffice.org/21368
(cherry picked from commit
9059f747c50eaf99a3c065f90b598208edbcb86b)
Miklos Vajna [Wed, 6 Jan 2016 07:23:20 +0000 (6 08:23 +0100)]
tdf#92045 DOCX import: <w:effect w:val="none"/> doesn't mean blinking
Regression from commit
eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use
constants for ST_TextEffect values, 2014-09-22), the problem was that
while the tokenizer stopped using hardcoded token values, the matching
dmapper code wasn't adapted.
(cherry picked from commit
ac6bfd85df271b650dbd24b45391dac346ecd72c)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0
Reviewed-on: https://gerrit.libreoffice.org/21363
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
a31708d9df01e7eae5c9ca39f4ee82fd6644dfe6)
Zolnai Tamás [Sun, 20 Dec 2015 13:21:43 +0000 (20 14:21 +0100)]
tdf#96051: FILESAVE: Roundtrip any PPTX file with Shapes creates invalid OOXML
Revert "bnc#584721: Import subtitle block to master slides"
This reverts commit
b3d50feaa87b670baf68288974005ac26ad31736.
It seems the imported subtitle block makes export corrupt the
output. Better to have a valid output.
(cherry picked from commit
a9db17aabc3ac970e6e4754e28310d20138144d9)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc
Reviewed-on: https://gerrit.libreoffice.org/20921
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
e18c062be49042945644db438608a6e58c7dc98a)
Miklos Vajna [Tue, 5 Jan 2016 08:08:21 +0000 (5 09:08 +0100)]
tdf#96674 drawingML import: fix handling of zero width/height lines
(cherry picked from commit
627c2469843c9461b665c4571f1214aca7fc36a4)
Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498
Reviewed-on: https://gerrit.libreoffice.org/21342
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit
c5f4c528123d6c65b489ac18ab7892bc92866b09)
Jan-Marek Glogowski [Thu, 3 Dec 2015 22:18:16 +0000 (3 23:18 +0100)]
tdf#92623 Handle StartOfContent node for copying bookmarks
For SwDoc::AppendDoc we use the StartOfContent node as the
starting copy node to prevent merging of the first node in
CopyRange and to get a 2nd node needed for CopyRange in case
of single content node documents.
This correctly counts StartOfContent as a non-copy node when
adapting the bookmark ranges for copying.
Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f
Reviewed-on: https://gerrit.libreoffice.org/20383
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
(cherry picked from commit
689962feae2054f965a7378c3408b0ccfad2bbd5)
tdf#92623 MM: add unit test
Adds the missing unit test to the bugfix.
Actually the original bug was a crash, so this just
does some test on the resulting MM document.
Change-Id: I4c9f031e57157fe5744aa8290b7503b7e1990fc7
(cherry picked from commit
480e943f0100154fa82942db092ed1f66b76ef66)
Reviewed-on: https://gerrit.libreoffice.org/21076
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
bdcafdff89836518cb94f362ca7ea4c09a82fa03)
Reviewed-on: https://gerrit.libreoffice.org/21138
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit
cce1320efa93cc42300e457b898d892ca580ddca)
Jan-Marek Glogowski [Wed, 30 Dec 2015 00:20:23 +0000 (30 01:20 +0100)]
tdf#96479 workaround bookmark end pos handling...
... when inserting text into a text node.
Seems SwTextNode::InsertText doesn't handle bookmark end
positions correctly. This is just handled correctly, if it
also contains the bookmark start.
This workaround simply concats the three strings to be
inserted in advance, so we just have to call
SwTextNode::InsertText once for the whole string.
(cherry picked from commit
c91024891ff10c2ae01e11a28a9aecca2f36b6c3)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
loplugin:stringconstant
(cherry picked from commit
67d440e6bd2c895833fa22d0f9bf5dc6901723e8)
loplugin:stringconstant
(cherry picked from commit
6aa4496c789fec271dcdc7995cf62ef2dabf1f96)
Reviewed-on: https://gerrit.libreoffice.org/21077
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
e781a8273eb2938f905485c00fbaf432e517d1dc)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
588a9c0205e03f701b617fd1775e7f9b9b88c6b0
60ee2ccc6090c305ade4ba16d3d298866cf89c4e
Reviewed-on: https://gerrit.libreoffice.org/21137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
107664a977c4893a0bc02f10cd20411c330b6d94)
Change-Id: Iab7708b4cc4df406bdbc3a685c7410e0e797fdc4
Andras Timar [Fri, 15 Jan 2016 16:22:03 +0000 (15 17:22 +0100)]
Bump version to 5.0-18
Change-Id: Ie74ded5f7d891ad7bf20180b61537d7f161b0111
David Ostrovsky [Mon, 30 Nov 2015 23:20:09 +0000 (1 00:20 +0100)]
Expose metadata to deploy LibreOffice artifacts on Maven Central
As outlined in the requirements to deploy the artifacts on Maven
Central, the metdata must be provided:
* Project Name, Description and URL
* License Information
* Developer Information
* SCM Information
[1] http://central.sonatype.org/pages/requirements.html
Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318
Reviewed-on: https://gerrit.libreoffice.org/20315
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit
9ca2de8c5995657973665189903aa2eebe0ef69a)
Reviewed-on: https://gerrit.libreoffice.org/20813
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit
708eab71f4d099a3887d32e59ef817db50324698)
Adolfo Jayme Barrientos [Fri, 8 Jan 2016 07:03:19 +0000 (8 01:03 -0600)]
Bump copyright year to 2016
(cherry picked from commit
8085555f6de5905028fdc0761c9e5b2fd4a3609a)
Change-Id: Ifbd88aa55d5aa32a7b8dc11d7ac0310d0ef1e5d1
(cherry picked from commit
2a8f10162deb89aebc7ed625b4072ed6af818a88)
Marco Cecchetti [Fri, 15 Jan 2016 10:28:28 +0000 (15 11:28 +0100)]
svg export: fall back to crossfade for not supported transitions
If we do not support the requested transition type we fall back to
crossfade transition.
If we do not provide an alternative transition and we set the state of
the animation node to 'invalid' the animation engine stops itself.
Change-Id: Ie476dd579248e9d776e27797dca2ea867f3e5e54
Miklos Vajna [Fri, 15 Jan 2016 09:06:33 +0000 (15 10:06 +0100)]
sc tiled rendering: it's pointless to send selection changes during search all
(cherry picked from commit
61161254ab880f02a7a26822d45ff96ec7ca76c3)
Change-Id: I787cd1760bca0bf7fbc3132579b569882ec25ae2
Miklos Vajna [Fri, 15 Jan 2016 07:24:09 +0000 (15 08:24 +0100)]
sw tiled rendering: it's pointless to send selection changes during search all
(cherry picked from commit
07054b050eb24442be92c1733aee27fe0a80ef69)
Change-Id: Iad3436c74d0ff95c84b5da870124b1e335241ca2
Jan Holesovsky [Thu, 14 Jan 2016 22:29:23 +0000 (14 23:29 +0100)]
sd lok: More places where we need to force the transparent color for bg.
Change-Id: Ic6e0ed45b118b27a86f8657671ae877ce494c5d4
Miklos Vajna [Thu, 14 Jan 2016 16:26:00 +0000 (14 17:26 +0100)]
sd: use ScopeGuard in Outliner::SearchAndReplaceAll()
So the flag will be reset on early return as well.
(cherry picked from commit
6372080cd396a7e8608806a35a1be68d288b8fda)
Conflicts:
sd/source/ui/view/Outliner.cxx
Change-Id: Ib086ec4a02dda291a0291a8ac40660c16de0fbf6
Miklos Vajna [Thu, 14 Jan 2016 13:48:44 +0000 (14 14:48 +0100)]
svx: loplugin:override
Change-Id: I532525fa12af2a0afbc1277b9a918c4d563f3b4f
(cherry picked from commit
d8551a79d2dcdad3bad5c437427b25b5131534ae)
Miklos Vajna [Thu, 14 Jan 2016 13:20:40 +0000 (14 14:20 +0100)]
editeng: handle SdrModel::isTiledSearching()
Given that the edit/outliner views can come and go, avoid the lifecycle
problems with just passing a pointer to the sdr model to editeng, and
then it'll always have the up to date "are we searching" information.
editeng can't depend on svx, so provide an interface class SdrModel can
implement.
(cherry picked from commit
7b5d20983dfbfb458898eeab54828ba5fef5841f)
Conflicts:
editeng/source/editeng/editview.cxx
editeng/source/editeng/impedit.cxx
include/editeng/outliner.hxx
sd/qa/unit/tiledrendering/tiledrendering.cxx
svx/source/svdraw/svdedxv.cxx
sw/inc/PostItMgr.hxx
sw/source/uibase/docvw/PostItMgr.cxx
sw/source/uibase/docvw/SidebarWin.cxx
Change-Id: I3b98011593b00ac0fab05b6b9c591dd20d94c579
Miklos Vajna [Thu, 14 Jan 2016 10:22:13 +0000 (14 11:22 +0100)]
sd tiled rendering: it's pointless to send selection changes during search all
But they do cause annoying flashing.
(cherry picked from commit
b9565ef0a73c235cd1e14fce9031db6e9237c524)
Conflicts:
include/svx/svdmodel.hxx
svx/source/svdraw/svdmodel.cxx
Change-Id: Ic313a15429c5db98c5660a5274aa49e95dd217e5
Jan Holesovsky [Thu, 14 Jan 2016 10:52:18 +0000 (14 11:52 +0100)]
sfx2: Convert the exception to one that we actually announce.
Otherwise saving to a non-existing http:// URL leads to a crash.
Change-Id: Ia4b49e2872616545dcedb2fc5553cf5a20a1f97d
Marco Cecchetti [Wed, 13 Jan 2016 16:27:56 +0000 (13 17:27 +0100)]
svg export: simultaneous move and zoom issue - fixed
Simultaneaous move and zoom of shapes did not work properly.
Fixed.
Change-Id: I445733c5ad3734966f6f5c08a5e5c798852cf74e
Marco Cecchetti [Wed, 13 Jan 2016 15:44:51 +0000 (13 16:44 +0100)]
svg export: added support for anim:formula attribute
Added support for formula attribute used from some effect such as spiral
in. Better support for parsing value list.
Change-Id: Ibf25482eba359acb279d9b212d7a829b3dc668b6
Marco Cecchetti [Tue, 12 Jan 2016 16:15:16 +0000 (12 17:15 +0100)]
svg export - group shape + indefinite duration - fixed
Fixed two issues:
- group shapes were not animated
- when smil:dur=indefinite final state of shapes was not frozen
Now when an audio or command node is hit a log message is printed
informing that such a type of animation nodes are not implemented.
Change-Id: I81853c982e6a2b68c3644b2ebc09e2d565d706af
Andras Timar [Wed, 13 Jan 2016 16:36:05 +0000 (13 17:36 +0100)]
Bump version to 5.0-17
Change-Id: I36e7094375cb6e6f30127cd50e3db06d50587f08
Jan Holesovsky [Wed, 13 Jan 2016 14:03:37 +0000 (13 15:03 +0100)]
sc: Fix the unit tests.
Change-Id: I1d5ea5835115bca3c8d24dc1f2e43c14d5d7b47a
Jan Holesovsky [Wed, 13 Jan 2016 10:56:34 +0000 (13 11:56 +0100)]
sc: Further .uno:Insert (inserting a new sheet) tweak.
Change-Id: I5437e173009be2b21594abfa133c1b48e53a2ff3