summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-03-26tdf#90010 Partially revert "package: Do not bother with deflating jpeg images"Matúš Kukan1-1/+2
This reverts commit 0843ade74e5848c0babad509b10c334b01847be2 for the case, when the document is protected by password. Would be nice to fix properly later. Change-Id: If159639d6f74de4e106e9dad382faac9d5de4a09 (cherry picked from commit ca5ff4559726455d0c8fbdd08cb35af3308492bf) Reviewed-on: https://gerrit.libreoffice.org/15006 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit da651b6ccb47e82f71d890fc8bb9d6cf0201f289) Reviewed-on: https://gerrit.libreoffice.org/15010 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-26Updated coreChristian Lohmaier1-0/+0
Project: translations d856589b6c5eef15b7cdf47615bedffecf0d4069
2015-03-21Updated coreAndras Timar1-0/+0
Project: translations 87cf73a1e1a4d5956db0593cb3f8a9cbf3037104
2015-03-21Resolves: tdf#89958 filter ends with / does not end with correctionEike Rathke1-5/+5
Regression of 8850633fe4cdac306c35caab1a0d14c13d9df864 String to OUString and xub_StrLen to sal_Int32 conversion, it worked by accident only anyway.. Change-Id: Id6fea7075949b98e58294d9fdaae4313f69f9b55 (cherry picked from commit 9e2e9453cbca9399e1c670b354cfc3c23d70307f) Reviewed-on: https://gerrit.libreoffice.org/14922 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2015-03-20tdf#89482 fix __refheading__ regression, set only CrossRefs as TOC.Justin Luth2-2/+11
bugfix tdf#68963 marked all __refheading__ bookmarks at TOC, but those crossreferences were deleted if they are not recorded in aReferencedTOCBookmarks. Redesigned the fix to include _Toc in the crossreference name that is auto-generated, which is how MSWord differentiates the markers.y Change-Id: Ie11b90b1b933d275e4d59ee89f22ff527eb6c2ba Reviewed-on: https://gerrit.libreoffice.org/14870 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-03-18Make "Embedded Objects" frame expendable to fill space betterZolnai Tamás1-0/+2
(cherry picked from commit b5aa8604ec39f7f8d573fe2dde94b7c7e70d93b8) (cherry picked from commit 36c76e4731236c8044f757182954a7d8faabfb18) Change-Id: I9b9335464c774bca13013576583877895d673592 Reviewed-on: https://gerrit.libreoffice.org/14832 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-14Updated coreAndras Timar1-0/+0
Project: translations 6a1faadb92c350550da21bef341383e12f7bd5a1
2015-03-10bump product version to 4.4.2.1.0+Christian Lohmaier1-1/+1
Change-Id: Icd0a963a0152ed4ca0e66e2e9de2d98ee7f61ed5
2015-03-10Branch libreoffice-4-4-2Christian Lohmaier4-1/+1
This is 'libreoffice-4-4-2' - the stable branch for the 4.4.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.4.x release, please use the 'libreoffice-4-4' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8423702d1abb78d87f4e0e97cc11f664870d177e
2015-03-10tdf#89665: i18npool: speed up TextSearch::searchBackward()Michael Stahl1-12/+9
There does not appear to be a good reason why searchBackward() needs to call transliterate() on the entire passed string, so don't do that, as in the previous commit for the other direction. Change-Id: Iadfca806da89bf8825e5a3df7fcad64ea08d7f9c (cherry picked from commit 666fb8b7bc210be6d785515bc7660e5a5d19b82e) Reviewed-on: https://gerrit.libreoffice.org/14827 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-03-10tdf#89665: i18npool: speed up TextSearch::searchForward()Michael Stahl1-12/+9
There does not appear to be a good reason why searchForward() needs to call transliterate() on the entire passed string. Restricting it to the passed range speeds it up from 104 billion to 0.19 billion callgrind cycles when built with GCC 4.9.2 -m32 -Os. Change-Id: I440f16c34f38659b64f1eb60c50f0e414e3dfee8 (cherry picked from commit 806ced87cfe3da72df0d8e4faf5b82535fc7d1b7) Reviewed-on: https://gerrit.libreoffice.org/14826 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-03-10Updated coreChristian Lohmaier1-0/+0
Project: translations 961bd6f3fa7eac6391de5b0dd3cd76ebe55539bc
2015-03-10tdf#40835 add backward compatibility for ODFF function FDIST.Winfried Donkers1-14/+34
Change-Id: I611531e86363d6c2b4ccce1aa0f1a940693bc8d8 Reviewed-on: https://gerrit.libreoffice.org/14658 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-03-10tdf#53861 - add libGLU.so.1 and libXinerama.so.1 to rpm/deb requirementsChristian Lohmaier1-0/+2
only used for upstream packages/when epm is used (any auto-dependency creation is disabled for those). Add two that might be missing in barebone installations Change-Id: I97c3af8cc8622c63ac831701e509097711822098 (cherry picked from commit 441523b0df8983fb34409a5f4e25dde571be1af7)
2015-03-10tdf#89791: DOCX: don't save custom.xml if it's emptyJulien Nabet1-3/+8
Change-Id: I90f8e6c4de383b05345b8df9118000167bd20d2f Reviewed-on: https://gerrit.libreoffice.org/14735 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 97c9bc9fada9cdfff956101a4a5e264b4dba58be) Reviewed-on: https://gerrit.libreoffice.org/14815 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-03-10tdf#84102: Expose duplicated "level" accessible attribute.Jacobo Aragunde Pérez1-0/+2
There is no standard for this so some ATs will expect "level" and others "heading-level"; we will expose both. Change-Id: Ia935f7efdea11dc9be66fd9a54e1df0432c74662 (cherry picked from commit e697d9694a62b2943fa19b0fcd19e9b3354f6ad7) Reviewed-on: https://gerrit.libreoffice.org/14808 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-03-10tdf#89520 Make TOX creation more robustTobias Lippert2-0/+21
The code is now more robust and will accept illegal arguments. Change-Id: I43ae82b953cea845fb170aa7b6e8d42470ad4e5e Reviewed-on: https://gerrit.libreoffice.org/14580 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 4bdbea5447f36beb9cc33df173a89a49a9918290) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-03-10Fix issue in re-use of ScTokenArray objects from a TokenPoolTor Lillqvist3-1/+8
The TokenPool::operator[] is used to initialise and take into use an object from the pool. Which is a fascinating thing as such and probably not entirely in good style. Anyway, the objects in the pool are of type ScTokenArray, a class derived from FormulaTokenArray. The operator[] called the FormulaTokenArray::Clear() function to initialise the object. This left the fields added in ScTokenArray uninitialised, having whatever value the previous use of the object had set. Which of course is bad. In practice, this showed up in the handling of formulas in the .xls input filter. If an earlier (or the first?) formula had happened to be one for which we don't want to use OpenCL, the meVectorState of its ScTokenArray object in the pool had been set to FormulaVectorDisabled. When the same pool object was later re-used for another formula, it kept that same meVectorState, even if there was no reason to. Thus formula groups that should have been OpenCL accelerated weren't. This can have a significant impact on performance of document loading and recalculation for large documents. I added a function to ScTokenArray to clear (initialise) such an object, both the FormulaTokenArray part and the ScTokenArray-specific part, and call that instead. This fixes the issue. I named the added function ClearScTokenArray() to make it clear that it is a separate function. Sure, possibly Clear() should be made into a virtual of FormulaTokenArry and overridden in ScTokenArray, and the overriding Clear() would first call the base class's Clear(). But I can't be sure that there aren't other calls of FormulaTokenArray::Clear() that *must* mean the base class one. Better safe than sorry. And of course, I did *not* want to name the function in ScTokenArray also "Clear()", like in the base class, without it being virtual. That is horrible style in my opinion, even if there certainly is precedence for such even in the very same classes, i.e. the Clone() function... Change-Id: I0e0e13e5ca705603005a1e0a46866f095cd2ac4d Reviewed-on: https://gerrit.libreoffice.org/14824 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-03-10Also relative row references need to wrap around, like fdo#84556 for columnsTor Lillqvist1-1/+10
Change-Id: I07400d6dead66ec437436b5ea8b49491f8048335 Reviewed-on: https://gerrit.libreoffice.org/14823 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-03-09Resolves: fdo#86493 Fix crash while scaling large bitmaps.Ashod Nakashian1-6/+7
Fast bitmap scaling overflowed the LUT used by the nearest-neighbor algorithm. When a bitmap has 46k pixel on a side and is enlarged, the scaling code overflows the 32-bit long, resulting in negative indexes, which then segfaults. This isn't as rare as it sounds. At least in web-view in writer the border/shadow bitmap is as long as the document (which is an issue in its own right,) which can overflow for large documents during scaling and segfault. Reviewed-on: https://gerrit.libreoffice.org/14597 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c91bfb9ac7d110c5dca0ea34ec0e1668a985b34c) Change-Id: I1ccf73d02469f6601a9a7e67b30524cb497cf6bc Reviewed-on: https://gerrit.libreoffice.org/14809 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-03-09Revert "fdo#88547 allow inline date-arrays for array functions", tdf#89872Eike Rathke1-8/+1
This reverts commit 104a1e641554be2e789758ae67c0e24620df8035. A number sequence has to ignore all string and empty elements by definition, see tdf#89872 for an example regression, further affected are all functions that use ScInterpreter::GetSortArray() which in turn uses ScInterpreter::GetNumberSequenceArray() (cherry picked from commit 18de9b1de1aa404b3ca12e2018e5e5e220dd9786)
2015-03-09tdf#84102: Expose XAccessibleExtendedAttributes through ATKJacobo Aragunde Pérez3-0/+66
Those attributes contain a lot of interesting properties, among them the heading level which fixes this bug. Change-Id: I634ef404123cb1b2831563b9b186db4b7e9e7d8b (cherry picked from commit 1e6515e64cb4a40071e09d5df000a94f96311ea1) Reviewed-on: https://gerrit.libreoffice.org/14807 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-09Don't use configuration syntax that breaks when upgrading to 4.5Tor Lillqvist3-52/+11
Use symbolic (not numeric) opcodes in the registry for the OpenCL use subset. The opcode numeric values are not stable, and have in fact changed in master recently. Even if they were stable, storing them symbolically would be a good idea. Makes it easier to edit them manually directly in the registry files. (Something end-users are of course not expected to do, but admins or hackers may want to do.) I figured out how to do the mapping from symbolic names to enum values and back without an ScDocument, turned out it was not complicated after all. Change-Id: I062dbfa633668a645c6c308acacf0826b6459a93 Reviewed-on: https://gerrit.libreoffice.org/14775 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-03-09Fix bugs in the OpenCL implementation of some statistical functionsTor Lillqvist4-8/+29
Don't return negative values from ScGroupTokenConverter::trimLength(). It doesn't make sense, we should return zero instead. At the two call sites, there are tests against a zero having been returned, but not against a negative value. And the return value is even passed as the nArrayLength parameter to a formula::DoubleVectorRefToken constructor, which is of type size_t, thus unsigned. Passing for instance -4 to it ends up being interpreted as 18446744073709551612, which has fun consequences. I got a crash from a spreadsheet with formulas that referenced some empty cells. Set #VALUE! error in COVAR() and PEARSON() OpenCL implementation when appropriate. Returning a "bare" NaN with no "double error" semantic payload does not make sense. Bare NaNs are displayed in Calc as 'nan' which probably is not what we want. Set #VALUE! error in COVAR() OpenCL implementation when appropriate. Returning -DBL_MAX doesn't make sense. The traditional C++ implementation and other spreadsheet products return an error. Set #DIV/0! error in VAR() OpenCL implementation when appropriate. Returning DBL_MAX doesn't make sense. The traditional C++ implementation and other spreadsheet products return an error. Return a #DIV/0! error in one case and #VALUE! in another in the OpenCL SLOPE() implementation instead of bare NANs. There are still many places in this function where the code bluntly returns a bare NAN. That is always the wrong thing to do. However, it is not certain which error code is the right error in each case. One would have to check in each case how to get to that place in the code, and compare to what the reference C++ implementation and other spreadsheet products do in each case. Return #VALUE! instead of NaN in the OpenCL NORMSINV() Add NORMSDIST, VAR, CORREL, COVAR, PEARSON and SLOPE to the OpenCL-enabled default opcode subset. Having these statistical functions perform fast is essential in many cases, and their implementations seem to be correct now. Change-Id: Idb202756f5b64e30b9bb87c00e340b8060694509 Reviewed-on: https://gerrit.libreoffice.org/14769 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-03-09Resolves tdf#80137 Paste array formula into range pastes as non-array formulaHenry Castro3-2/+72
Reviewed-on: https://gerrit.libreoffice.org/14770 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 097a16b59884c777f724cec6c5d42734974ed44b) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sc/qa/unit/ucalc.cxx sc/qa/unit/ucalc.hxx Change-Id: I500008b32e5af07702b76afb901a3ec270453462
2015-03-08tdf#39279: Prioritise Thunderbird address books in first-match searchJulien Nabet2-14/+14
stopgap measure until tdf#57873 is fully implemented, since these days by far more people use Thunderbird than Seamonkey (or Firefox address book, if the latter even has any...). Change-Id: I638ec90277063b1e7536c045bffb1052d3b76911 Reviewed-on: https://gerrit.libreoffice.org/14800 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-03-08tdf#50133: Wrong underlining in ReportsJulien Nabet1-1/+1
Change-Id: Ia1d37d150c2186f014733cd87179445722b54346 (cherry picked from commit 27bc6714df6638c6fd9d2ee5c26870ae5eb2f63e) Reviewed-on: https://gerrit.libreoffice.org/14791 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-03-07tdf#88847: Fields of query design can be moved to the left onlyJulien Nabet1-1/+2
Part of code 1299 ImplHeadItemList::iterator it = mpItemList->begin(); 1300 ::std::advance( it, nPos ); 1301 ImplHeadItem* pItem = *it; 1302 mpItemList->erase( it ); 1303 if ( nNewPos < nPos ) <-- case move to left 1304 nPos = nNewPos; 1305 it = mpItemList->begin(); 1306 ::std::advance( it, nPos ); 1307 mpItemList->insert( it, pItem ); So in move to right case, we erase and insert pItem at the same place We just have to use nNewPos in all cases regression from bd24a310be1459510b760b812838cb87923853c5 Also add back "ImplUpdate" call erroneously removed in merge commit 67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (there is an ImplUpdate call in each parent of that merge commit) Change-Id: I100b0c6874b366f777c5d38470fcee7a9a7326df (cherry picked from commit 63050dccbc50f148cd788730faa53d822d37e54f) Reviewed-on: https://gerrit.libreoffice.org/14786 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-03-06tdf#89391 : Datasource URL in Database Properties window cannot be viewedSzymon Kłos3-0/+17
Change-Id: Ia3e978e3fd9c0ce19ec679c41d40a34338147c37 (cherry picked from commit 1ac9985ade97f91869a11ce45231ffd6a5440959) Reviewed-on: https://gerrit.libreoffice.org/14768 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-03-05Resolves tdf#84012 FORMATTING: Partially missing text in shrink-to-fit cellsHenry Castro1-0/+4
Change-Id: I32f44acbcf5a6aed4d9f7442ad7212af31073352 Reviewed-on: https://gerrit.libreoffice.org/14723 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 4acffa65b58c8bd359215345dca2c61e2c5ceba5) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2015-03-05Resolves tdf#78221 Cannot drag twice the same cell when editing formulaHenry Castro3-6/+56
Change-Id: I69402778e68a2955bdda1ba2c9d31d9b10fb60cc Reviewed-on: https://gerrit.libreoffice.org/14748 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 3381cb4a421bf390445b7dac9ea42f9ccaf3d875) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2015-03-05Resolves tdf#71095 Calc doesn't paste images copied from some web browsersHenry Castro1-63/+95
Fixed. When I try to paste an web image copied from web browser, it paste now Reviewed-on: https://gerrit.libreoffice.org/14529 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 b05330c64799067ca2e0b8ea8bfdee8ce8b023b2) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sc/source/ui/view/viewfun3.cxx Change-Id: I696feb3438022b506303b2f354ac9c4d306e08f4
2015-03-05tdf#89482 - return size of system virtual device resource at construction.Michael Meeks15-22/+48
Reviewed-on: https://gerrit.libreoffice.org/14678 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Conflicts: vcl/inc/win/salinst.h Change-Id: I832a5626b52935180f24857e56297840667eec2a Reviewed-on: https://gerrit.libreoffice.org/14679 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04tdf#89266 SwDrawShell::GetState: fix crash on adding textbox to fontworkMiklos Vajna1-1/+9
Till we find a use case where it makes sense to support this, just hide the menu item to avoid the crash. (cherry picked from commit 5bfff14d8f2240ff37b91b78c337438214dfa1bc) Change-Id: Ic1df38edc38495d7899038ec2b8ad753da87d352 Reviewed-on: https://gerrit.libreoffice.org/14726 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04gbuild: CppunitTest: always use unittest configurationMichael Stahl54-108/+9
The sc_subsequent_filters_test was failing because of a lock file because it did not use the unittest configuration. Refactor gb_CppunitTest_use_configuration so it uses both the instdir and unittest configuration to prevent such errors. In case there ever is a test that does not work with the unittest configuration it should call gb_CppunitTest_use_instdir_configuration. (cherry picked from commit f0a60415597bae7ca54767b397a217882578ce97) Conflicts: dbaccess/CppunitTest_dbaccess_RowSetClones.mk sc/CppunitTest_sc_condformats.mk sc/CppunitTest_sc_recordchanges.mk Change-Id: Ibc00d42f8b6102d50d922f51173120798fa45c6e Reviewed-on: https://gerrit.libreoffice.org/14738 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04configure: properly check for Windows SDK 8.1AMichael Stahl1-2/+2
Due to the wildcard checking for it will actually attempt to check for the SDK 8.0, which fails with Visual Studio 2013 because its SDK 8.0 apparently lacks a midl.exe, so configure fails. Change-Id: Ib0e61a3a999d6a2ebe16645225fc9838dab3bdb1 (cherry picked from commit c503d3780fd095cc94103bf0f89b662c446b3b2b) Reviewed-on: https://gerrit.libreoffice.org/14736 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04sw: PVS V656 Variables initialized through call to same functionMichael Stahl1-2/+4
(regression from c2ccd20c0fd92bddfff76447754541705e3eb8f3) Change-Id: I78ac92869b0e9b56df708aa7d2d35b45bfb5f751 (cherry picked from commit 7d79ae437e16191a62dbe3ec81f9b82e79daf7ea) Reviewed-on: https://gerrit.libreoffice.org/14737 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04Missing dependencyStephan Bergmann1-0/+3
Change-Id: I4b66f7e549fe318f61b5ec8127ca073b2eb19ed3 (cherry picked from commit defbb4752bfa4bc2a35f5ee4c24d0e1654afeb2c) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-03-03cp#1000115 SwTxtFrm: don't join follow just because it has no contentMiklos Vajna5-34/+241
The problem was that the bugdoc had a table, and inside the table there was a long paragraph that flows to the next page, but only the paragraph mark of it does so. We first split the frame to have space for the paragraph mark, but later decided that all the content would fit the first frame, and this way the last hard line break and the paragraph mark was painted on each other. This is normally not a problem without tables, because SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to join it, and we're ready. However, when the paragraph is inside a table, then the paragraph was formatted multiple times, and next time when we already had a follow nNew was not set, so even if there was a correct split first, the new frame was joined later. Fix the problem by explicitly setting nNew for the "in a table and paragraph ends with a hard line break" case, that way we don't blindly join the frame, only in case there is enough space for the follow in the master. (cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a Reviewed-on: https://gerrit.libreoffice.org/14476 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-03Resolves: tdf#89500 catch ISO 8601 datetime in all localesEike Rathke1-7/+26
Change-Id: I906ebdc6aa5c365df98a29e9e0f319f89f6833c6 (cherry picked from commit 5d572e673dec3396487b14bb1f9e86aa8ab86786) Reviewed-on: https://gerrit.libreoffice.org/14565 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-03jpeg-turbo: work around failure in AC_PROG_MAKE_SET on WNTMichael Stahl1-0/+11
autoconf < 2.61a uses "echo" here and for some bizarre reason that converts " inside ' to \ so remove the " to get it to work. echo 'foo="bar"' foo=\bar" Change-Id: I6bee94d4d075ce953f5788b7fdf9d3b66a7db0c7 (cherry picked from commit 9c6ce47eaf1a891edf7c200145de400fd1cf2871) Reviewed-on: https://gerrit.libreoffice.org/14589 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-03getAny() is not a safe default, it assumes there is actually an AnyLionel Elie Mamane1-16/+16
at *m_aValue.m_pValue. But there could not even be a pointer there, e.g. if m_aValue.m_nIntXX is in use. Then the pointer dereference usually leads to a crash. Can e.g. be reproduced by calling getBytes() on an integer column of a RowSet. Change-Id: Ib5361d838d2869142fd797d4e3454e2562ea7acf Reviewed-on: https://gerrit.libreoffice.org/14718 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-02tdf#87820 Images not displayed properly in CalcHenry Castro1-0/+6
Fixed. After opening, images were not displayed properly in Calc 4.3 and 4.4 Change-Id: I1f0dd7e9d332889df81be84a6c1e28a09f509733 Reviewed-on: https://gerrit.libreoffice.org/14505 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 6c84442f99de109b585d3ba8964deb8dcf261c0f) Reviewed-on: https://gerrit.libreoffice.org/14721
2015-03-02More improvements of graphic cache size handlingZolnai Tamás5-46/+8
* ImplFillSwappedGraphicObject method is part of the old caching mechanism which interferes with the newer one, so remove this method. * Use Graphic size directly becuase in some case it does not match with the GraphicObject's size. * Assertions to avoid underflow of mnUsedSize Change-Id: I3381f49ca05e3e5d565848c8af24c78e7b9ac3af (cherry picked from commit ab00ac3e88e0a28d0e38c5968c23014a6a8fb194) Reviewed-on: https://gerrit.libreoffice.org/14699 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-03-02in BITFIELDS mode (3) there are *3* pal entries not 12Caolán McNamara1-1/+1
There are 12 *bytes*, which presumably is the thinko there. But this nPalCount gets multiplied by 4 to convert it to bytes later. This is the source of the bad mask values found after "Use the cairo-compatible basebmp surface for headless" etc. Arbitrary values ended up being read as mask values. Change-Id: If5d93f74b1c58d3ecdb5186f93cb0215a556586a (cherry picked from commit 5e5b90c12862b522a4553337fbf6309bb8278b8c) Reviewed-on: https://gerrit.libreoffice.org/14659 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-28sdbc:address:kab URLs don't have a trailing ":"Stephan Bergmann1-1/+1
broken since 4bf95c4c31dd871065d4042028a4b3ae476dab70 "make use of startsWith()" where the tricky !url.compareTo(::rtl::OUString("sdbc:address:kab:"), 16) was replaced with url.startsWith("sdbc:address:kab:") even though the original exempted the trailing ":" from the comparison (cherry picked from commit 27e85dd314e02dc97612bf1682fccacaf0244127) Conflicts: connectivity/source/drivers/kab/KDriver.cxx Change-Id: I45175b2669d61eb4cee36d4456ccb69d0f11ef63 Reviewed-on: https://gerrit.libreoffice.org/14670 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-28Adapt code to changed libkabdrv1lo.so nameStephan Bergmann1-1/+2
broken since LO 3.6, commit 07d512eff12fc89adbfb73e546b3946494f21472 "connectivity: convert kab to gbuild" (cherry picked from commit d8a2a0b84a9aa570116febf23a6f1d6430fec287) Conflicts: connectivity/source/drivers/kab/KDriver.cxx Change-Id: I65cc32fa55f1d5c0358585489b8b3dc3aaf8004b Reviewed-on: https://gerrit.libreoffice.org/14669 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-27tdf#89679 - fix incorrect mapping of font-family-complex and CharFontNameAsianMark Hung1-1/+1
Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371 Reviewed-on: https://gerrit.libreoffice.org/14663 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae) Reviewed-on: https://gerrit.libreoffice.org/14667
2015-02-27Resolves: tdf#81659 handle expand reference edge correctlyEike Rathke3-6/+158
split formula grouping for reference edge expansion, tdf#81659 related Edge expansion may change expressions individually, which must be split off the group. Change-Id: Id4328bd8c42f2ff9f83d2edc845537971f3a39d3 (cherry picked from commit 0cd15b4494f8e8abe67a258fb10189135bf5a8ac) tdf#81659 check that references are at least 2 cols/rows to expand edge Needs also 0cd15b4494f8e8abe67a258fb10189135bf5a8ac if edges are to be expanded and formula grouping is affected. Change-Id: Ib3cee8dd214d216907248316a2ac5a290399b169 (cherry picked from commit 23b0112ecea2f8796a4e237e9061de1a36997a30) Reviewed-on: https://gerrit.libreoffice.org/14655 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-27tdf#89666: vcl: speed up HbLayoutEngine line layout for large paragraphsMichael Stahl1-1/+1
When formatting a 180k char Writer paragraph, most of the time is spent in vcl::ScriptRun::next(), which is called twice per line from SwTxtGuess::Guess(), once via GetTxtBreak() and once via GetTxtSize(). In the second call, from GetTxtSize(), the end position of the line is known, and passed to vcl, and iterating beyond that position seems pointless. This reduces vcl::ScriptRun::next() from 24 to 11 billion callgrind cycles when built with GCC 4.9.2 -m32 -Os. Change-Id: Ia23fcccaf5ef9c9ecdcb54bfc8f0f8a043c8711e (cherry picked from commit 7fde44c85620f8079bc4863fe3f7ea1f69a0f88c) Reviewed-on: https://gerrit.libreoffice.org/14646 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>