summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-31tdf#93532 - Bitmap CRC unit tests.private/mcecchetti/bitmapcrc64-5-0Michael Meeks1-0/+56
Change-Id: Ic75801d7ad941ba802ffe418d5c666b1e7b0e94f
2015-08-31Removed no more needed code in ImpBitmap::ImplGetChecksuMarco Cecchetti1-2/+1
Change-Id: I647941591615733caa546a8710817616923afa85
2015-08-31filter: avoid casting BitmapChecksum to sal_uInt32Miklos Vajna3-8/+8
Since BitmapChecksum is a typedef for sal_uInt64. Change-Id: I768fa5134fa6e86559f3c6cbe1071093b4e68152
2015-08-31Fixed a bug the 64-bit checksum switch code was affected byMarco Cecchetti1-1/+1
Changed the size of the string buffer used for converting 4 integer values into a hexadecimal string: aHexStr.setLength(24 + (2 * BITMAP_CHECKSUM_SIZE)) Change-Id: I5936bae4ce3b41e85a68f6f342b5288f7f9395fe
2015-08-31switch to 64-bit checksum: fixed a missed substitutionMarco Cecchetti1-1/+1
Change-Id: I733240798a8415602b824a9732193c344fe53a5c
2015-08-31truncate checksum to 32-bit when it slips inside a file streamMarco Cecchetti3-8/+8
Change-Id: I2cedf8acf73f71529f4090ff2f9fce7ab7663e68
2015-08-31gl-checksum: added a minimum size check for using GL versionMarco Cecchetti2-2/+13
(nWidth * nHeight) < (1024*768) || nWidth < 128 || nHeight < 128 Change-Id: Iedda6a333958c76c19b837890eb3fa28e631bc90
2015-08-31switch to 64-bit checksum: now BitmapChecksum is a sal_uInt64Marco Cecchetti2-4/+3
Changed hardcoded checksum value in ooxmlimport unit test (testN777345). Change-Id: Ied43bf626be82c0e7f6c62e965d0704fc645ac19
2015-08-31CRC is an integer type -> mnChecksum.Michael Meeks2-5/+5
Change-Id: I9e4d36105a59c5f81677d8e062106dae6f709464
2015-08-31squash into Marco's commit.Michael Meeks1-1/+1
g Conflicts: vcl/inc/salbmp.hxx Change-Id: I57d1e4b8e4909ce0b82c9e61ca271768cc73cd8b
2015-08-31switch to 64-bit checksum: conversion from BitmapChecksum to an octet arrayMarco Cecchetti4-30/+50
Defined BitmapChecksumOctetArray which is an array of bytes whose size is the same of BitmapChecksum. Defined a routine for converting a BitmapChecksum into a BitmapChecksumOctetArray. Change-Id: I70d17ab8b841795ae27c60b418d6b090bff604bb
2015-08-31vcl_get_checksum wraps the call to the real checksum functionMarco Cecchetti7-92/+101
Change-Id: I72916f18966756ecc99e77f1b164e99377eb456e
2015-08-31Switching to 64-bit checksum: substituted sal_uLong with BitmapChecksumMarco Cecchetti25-51/+58
A typedef sal_uLong BitmapChecksum; has been added to include/vcl/checksum.hxx Wherever needed sal_uLong and sal_Int32 has been substituted with BitmapChecksum. A BITMAP_CHECKSUM_BITS constant equal to the amount of bits used by the BitmapChecksum type has been defined and used in `GraphicID::GetIDString` (vstools/source/graphic/grfcache.cxx). Change-Id: I74bd285089e58a8b18c06233d75b87023c7bf31b
2015-08-31moved chechsum.hxx in include/vclMarco Cecchetti4-4/+3
Change-Id: I70f82f16d5907ce0bbe2d838c4acee226886aab2
2015-08-31Added support for computing 64-bit checksum of bitmap in OpenGLMarco Cecchetti15-61/+469
Added a C++ and a GLSL implementation of a 64-bit CRC algorithm. Changed hardcoded checksum value in ooxmlimport unit test (testN777345). Change-Id: I16bb985a14866775efda49e21fe033ff64645896
2015-08-31vcl: Improve management of mnRef0Count.Jan Holesovsky3-5/+20
Follow-up to 34700400247e378e074ce4164ab2809edb092201; this fixes sw_ww8export unit test on Windows. Change-Id: Ic0c3228efb59a182e1562b73117418cd8b5e6017 Reviewed-on: https://gerrit.libreoffice.org/18175 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-08-31Add missing helpful GL trace messages outside of the impl. itself.Michael Meeks3-25/+25
Change-Id: I5b71e3c9edc3e1e89e52c2e17b5fe0a025ac66ea Reviewed-on: https://gerrit.libreoffice.org/18109 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31Avoid bogus warnings with VCL_GL_INFO, by making the optimizer work.Michael Meeks1-10/+9
Change-Id: Ia4afcd58b4ce0b4d6d9708a4cede0857b7633b9e Reviewed-on: https://gerrit.libreoffice.org/18171 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31tdf#93798 - avoid apitrace provoked infinite loop dumping errors.Michael Meeks1-3/+13
Change-Id: I6c42e6a9ead90ed6fad2f289cd686a72cffa0c2d Reviewed-on: https://gerrit.libreoffice.org/18165 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31do not parse range fragments as valid rangesEike Rathke1-2/+9
For example, "B2:" or ":B2" were accepted as valid range, with the missing part set to A1, which resulted in a A1:B2 range. An omitted sheet specifier always results in a valid relative sheet, hence that flag is set, so testing flags for non-null before the final result is available isn't sufficient. Additionally this revealed a flaw in handling of external references when loading documents if the original file name differs from the resulting real file name due to relative paths. Actually now the displayed file name matches the real file name when such a document was loaded, where before the original file name was displayed. Probably such references didn't even work before if the reference spanned more than one sheet, which is a rather rare case for external references. Change-Id: I38035f2e4b3a11c0280457498cf62b02f882d2a1 (cherry picked from commit 56238d58a7da705e4e91604964e6564d819a9196) Reviewed-on: https://gerrit.libreoffice.org/18035 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31tdf#89245 xmloff: fix Calc header background image savingMiklos Vajna3-6/+22
Regression from commit 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of DrawingLayer FillAttributes..., 2014-06-02), the problem was that the new CTF_PM_REPEAT_OFFSET_X..CTF_PM_FILLTRANSNAME range's values overlapped with the existing CTF_PM_HEADERHEIGHT..CTF_PM_HEADERGRAPHICURL range's values, so when the new code in XMLPageMasterExportPropMapper::ContextFilter() tried to tweak header repeat offset properties, it actually disabled HeaderBackGraphicURL instead. (cherry picked from commit 3b40329f9a64b93b1e1230b1bff74ed8cda8cd70) Conflicts: sc/qa/unit/subsequent_export-test.cxx Change-Id: I9c2700fa71a4ef2a813ec671049ee9d98171b57e Reviewed-on: https://gerrit.libreoffice.org/18163 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-08-31tdf#75973 : User Defined Types in password encrypted macrosLaurent Godard7-9/+236
save/load basic script so that when executing password protected the user defined types can be rebuilt supports array and nested types New identifier B_USERTYPE for save/open macro with user defined types No version bump but saves binary format now to current_version a unit test in sc macros-test.cxx full round trip on password protected document (ie. use binary storage) master --(0)--> master --(1)--> libreoffice 4.4 --(2)--> master --(3)--> master (0) in master, User type supported, big module supported (1) in libreoffice 4.4, user type not supported, big module supported, no loss of code (2) in master, user type not supported, big module not found, no loss of code it is OK as libreoffice 4.4 saves to LegacyVersion (see sbxmod.cxx changes) (3) in master, User type supported, big module supported (all is restored) it is OK as module was saved with CURRENT_VERSION (see sbxmod.cxx changes) Change-Id: Idab5de85e948dc11f4aba631b1569a1cc1cb4bf6 Reviewed-on: https://gerrit.libreoffice.org/17841 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31VclPtr: no dialog loaded from a .ui ever actually destructedCaolán McNamara1-0/+1
Change-Id: I51a0596049a43cbc80f914f3d8491c2125c8109e Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18158 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31WaE: remove unused parameter.Michael Meeks1-1/+1
Change-Id: Idd7ec17eed51f79ead56349bb644945826d0a695
2015-08-31pClientData can be nullCaolán McNamara2-1/+1
Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc (cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1) Reviewed-on: https://gerrit.libreoffice.org/18149 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-30tdf#93536 - avoid crash when calling ToTop on disposed window.Michael Meeks1-0/+2
Change-Id: I677f47f6b60271dc56c9d3d123cf982c00866eb9 Reviewed-on: https://gerrit.libreoffice.org/18136 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2015-08-30Don't check SAL_DETAIL_ENABLE_LOG_INFO, check SAL_LOG_INFOTor Lillqvist1-3/+3
SAL_DETAIL_ENABLE_LOG_INFO is always defined, as "true" or "false". It is SAL_LOG_INFO that is defined or not, and can be used to avoid unnecessary non-trivial code that the compiler might not be able to optimise away. Change-Id: I9903faab64b39fee86bff3b085cdce3614b0d921 (cherry picked from commit d23a1f4dabda939a216293c150c3679b0979d0bd)
2015-08-29ODF import: workaround dubious draw:fill="solid" on frame stylesMichael Stahl5-2/+40
Since the gradient frame backgrounds were added in LO 4.1, we export this: fo:background-color="transparent" draw:fill="solid" Which doesn't make a whole lot of sense as this is really a "none" fill, and now with the backward compatibility stuff in the style import code we get the pool default color added when setting the BackTransparent property, and with the draw:fill="solid" it becomes visible and the background color is now Sky Blue 1. So try to detect draw:fill="solid" without draw:fill-color attribute and contradicting transparent legacy attribute and nerf it. This way we also export draw:fill="none" again, although still with a bogus draw:fill-color but that shouldn't cause any harm. Change-Id: I1c2bea46ba7d9a3f042b875df0ca12c7f6037909 (cherry picked from commit 68efa6f5128abf4cd097ae81a4cfd7fecbcb2a80) Reviewed-on: https://gerrit.libreoffice.org/18040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29related: tdf#92379: sw: backward compatible ODF export of overridingMichael Stahl2-1/+22
... frame/paragraph backgrounds. If a style is set to have draw:fill="solid" and a derived style to draw:fill="none" then the derived one must have fo:background-color="transparent" to override the parent for old consumers like LO <= 4.3/AOO <= 4.1 that don't understand draw:fill. Change-Id: I5b56c7ace927338239195c6bfcfef1950544c8d2 (cherry picked from commit 25c50a71ffdf7c43f8f3dd10736188271cc75ef0) Reviewed-on: https://gerrit.libreoffice.org/18039 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29tdf#92379: sw: ODF import: fix fo:background-color="transparent"Michael Stahl3-2/+73
The problem is that if the FillStyle is NONE, setting only ParaBackTransparent but not ParaBackColor does absolutely nothing. This means that if a parent style sets a background color, then a derived style cannot override it to be transparent. Cause is that getSvxBrushItemFromSourceSet() defaults to setting a 0xFF transparency on the SvxBrushItem. There is still a problem that getSvxBrushItemFromSourceSet() sets the pool default item's color and that is also exported to ODF again as draw:fill-color, but together with draw:fill="none" it should not cause harm, at least for consumers that prefer draw:fill attributes like LO >= 4.4. (regression from 7d9bb549d498d6beed2c4050c402d09643febdfa) Change-Id: I5312901166a0e6f0cf02369b173dc8498e4113ed (cherry picked from commit f38f018053a43d1f7b473103e936abe2d4d8fa05) Reviewed-on: https://gerrit.libreoffice.org/18038 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29tdf#92379: svx: don't overwrite fo:background-color on ODF importMichael Stahl6-6/+81
getSvxBrushItemFromSourceSet() is called once for each property of a frame style that is set, and the "solid" fill-style is set by first applying the BackColorRGB and then BackTransparency property. So there is an intermediate state that has fill-style NONE but a XFillColorItem set - don't reset the color to white in that case! Apparently writerfilter generally relies on the current reset-to-AUTO implementation (loads of test failures), so for now limit the fix for when we know that a frame style is imported from ODF. (regression from 3d399b0e45720354fc64dc3d121ee486e01eff89) (cherry picked from commit 79fb61efb847405fa47235002b52ee8efad5e339) tdf#92379: sw: unit test for frame style background color (cherry picked from commit 982537d77c2db463cc053cfdcd522530a3834c9e) Change-Id: Ia987fe586ec819a1f3cd85acdbfb03c74ca0ec2c Reviewed-on: https://gerrit.libreoffice.org/18037 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29sw: Flat ODF import: set the InReading and InXMLImport flagsMichael Stahl1-0/+12
Flat ODF Import does not use SwReader but uses SwXMLImport::startDocument() and SwXMLImport::endDocument() to set up the document, so make sure those set the import relevant SwDoc flags. Change-Id: Ife3e58eeebd73ad895fe328662822b847cf9bfec (cherry picked from commit 27a02d1708be7812668a84ea956edc8ecb312246) Reviewed-on: https://gerrit.libreoffice.org/18036 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29vcl: fix resource management issue in WinSalLayoutMichael Stahl4-2/+16
Since commit 65a66d41fd0e13d0aad9df935091b731b4af650a the sd_exports_test crashes on Windows in UniscribeLayout because it uses a ImplFontEntry that has been removed from the font cache. Tweak the refcount in WinLayout so it will be valid. Change-Id: Ic4bf984ea9fd70de9fa95ca964ae12d95d47d5bf (cherry picked from commit 34700400247e378e074ce4164ab2809edb092201) Reviewed-on: https://gerrit.libreoffice.org/18121 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29vcl: fix drmemory warning in UniscribeLayout::DropGlyph()Michael Stahl1-1/+1
It says there's access to uninitialized variable on that line, so propbably the loop is running over. Change-Id: I0226f82b20a6fbbc79af5bbb46af09830c3bc25a (cherry picked from commit eba9a6c4b32220dcc729c71e440234f90af5bdcc) Reviewed-on: https://gerrit.libreoffice.org/18107 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-29check stream statusCaolán McNamara2-9/+25
Change-Id: I609c8c4f4e843601361b61f55e0325ad99db3c23 (cherry picked from commit dc1be62d75e654e17c2f4c02804b7fd48d5a2515) Reviewed-on: https://gerrit.libreoffice.org/18115 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-29eof isn't a Error, so use good not GetErrorCaolán McNamara2-14/+14
Change-Id: Ie1df87c7eb9d391d0fa4a579f744051a1f1b2ae1 (cherry picked from commit 078235028a8c4ea36b6b366348016e19759c456a) Reviewed-on: https://gerrit.libreoffice.org/18114 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-29guard against 0 item sizeCaolán McNamara2-2/+9
Change-Id: I9c4c2f0fe2d892615b3c70e08da0cab6da13338a (cherry picked from commit 2aadad1e89e96cb80c15fe1069cb6365f0cade1d) Reviewed-on: https://gerrit.libreoffice.org/18113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-29check seeks and readsCaolán McNamara6-36/+76
Change-Id: I0c5c4784713376e0762bfbd197640f8d31b65562 (cherry picked from commit 1847753ab135f522df6a293a8539155437f0129f) Reviewed-on: https://gerrit.libreoffice.org/18112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-29Avoid unintended unconditional std::cerr debug outputTor Lillqvist1-22/+21
Can't call a function that as a side effect prints to std::cerr in SAL_INFO. It will be called even if the log area doesn't match $SAL_LOG. Just use only SAL_INFO and no plain std::cerr output. It's fine to output a string with embedded newlines in SAL_INFO. Also drop the debug output line with the glyph start positions, it was less than useful. Change-Id: I9fb5ed068aae1b835e20cf1ec1097bcd55deb05d (cherry picked from commit 15943416240e29a052e3a6e4d338932e8c1ffb06)
2015-08-29Avoid accidental leftover unconditional debug printoutTor Lillqvist1-2/+3
Change-Id: I67d2430aec782efa7916856584028f469d39355c
2015-08-28tdf#93353: fix copy fluy in flyBjoern Michaelsen1-7/+10
- prevents flys in inlcuded docs in a master doc from disappearing - fixes a regression from 3fcb0c3aa8d58a819aa21eb9743eaa6da7394819 Change-Id: If211d8dbf423e2a33a258b43ab7092e1a010206f Reviewed-on: https://gerrit.libreoffice.org/18106 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-08-28tdf#93736 need to create trapezoid from input polygonTomaž Vajngerl1-14/+18
Currently we draw the polyline from the input polygon, but we should first create a trapezoid and draw its polygons when drawing the hairline. Change-Id: Idd850d18d05410c75a8a2c922338caf46158bfd4 (cherry picked from commit c9d39c37b2c186e2b9d9841b18ecc6aed4684f62) Reviewed-on: https://gerrit.libreoffice.org/18105 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28Updated coreAndras Timar1-0/+0
Project: translations dc9a76191fa5ada84099b6724025e306b6a6102c Updated Slovenian translation Change-Id: Ibf74d8f7e5417dc1f843e6248b6b04247ca564f7
2015-08-28bump gtk check to gtk+-3.0 >= 3.8Rene Engelhard1-1/+1
Needed since 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2 Conflicts: configure.ac Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94
2015-08-28check stream state after read attemptCaolán McNamara2-1/+5
Change-Id: Ie3836f2e95acab963634181a07565343501f00f8 (cherry picked from commit 9a695e071020639926f8b038aba64eb016a1801a) Reviewed-on: https://gerrit.libreoffice.org/18092 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check for stream status after a read, not after a seekCaolán McNamara2-10/+15
Change-Id: I984e99c1a1484547aa4d60bf301167f3cbc9f716 (cherry picked from commit eea399ddd52a0de368321963bb828bc15632dd0b) Reviewed-on: https://gerrit.libreoffice.org/18088 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check seek for successCaolán McNamara2-1/+5
Change-Id: I02420ffb3af009d08ce54a0932e2c7a287703a72 (cherry picked from commit 1830b4f2e324090962a993315ce76752d24d4088) Reviewed-on: https://gerrit.libreoffice.org/18091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check status of SeekToCaolán McNamara2-2/+4
(cherry picked from commit 932f6de91904f86f38d2914b9ce07b94dfadac0c) Change-Id: Ia2bb397c3fdd783cab77a6b0dbc31c9e3d19326b Reviewed-on: https://gerrit.libreoffice.org/18094 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check SeekToEndOfRecord for successCaolán McNamara2-1/+3
Change-Id: I7413a4e9e491b65122eaadb38ad574161f1aa943 (cherry picked from commit d417ffb7dd93306be7c89526a75acab53dbd8831) Reviewed-on: https://gerrit.libreoffice.org/18090 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28tdf#93529 - use debug messages while rendering to break up the trace.Michael Meeks2-27/+27
Change-Id: I56629a721202d7a04bd493d4604278dea85b4212 Reviewed-on: https://gerrit.libreoffice.org/18104 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>