summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-09-17don't crash with unknown out color spaceCaolán McNamara2-1/+7
Change-Id: Ib066ff1fad686d611a86510e768b1109ef7a5e75 (cherry picked from commit 7aa2f8c75d7bda103748fa73766a30fd77e50c16) Reviewed-on: https://gerrit.libreoffice.org/18641 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-09-17tdf#79018: Prevent line break as footnote labelOliver Specht1-2/+9
footnote labels must not contain line breaks Reviewed-on: https://gerrit.libreoffice.org/18292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 089d7f53ea232972961c14706a54187f075fa973) Reviewed-on: https://gerrit.libreoffice.org/18297 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit adf39dbade8652ceca9007484bfa20f04c5ebec0) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I00d334197b960c4ed17fdee3ea8a1c734cbfa4c1
2015-09-17tdf#93449 Internal hyperlinks are not exported corectly in HTMLVasily Melenchuk3-2/+4
InetURLObject class does not work correctly with internal document links, containing not full url, but just a fragment. This case added as an exception for HTML link export. Change-Id: I44496a1cf186836d4194fc65ce7bf9aeb2f79b65 Reviewed-on: https://gerrit.libreoffice.org/17993 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit fd3468024e1ac199f4a2f4108321ef8100d58414) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-09-17tdf#83227 oox: reuse RelId in DML/VML export for the same graphicMiklos Vajna8-5/+77
So that large images are written only once to the ZIP container when they are exported using both markups. This affects drawinglayer images, the Writer ones are handled directly in sw and were already deduplicated. (cherry picked from commit b484e9814c66d8d51cea974390963a6944bc9d73) Conflicts: oox/source/export/drawingml.cxx Change-Id: Iff7c769329b42939833056b727b070f6a60da5e3 Reviewed-on: https://gerrit.libreoffice.org/18581 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-17Resolves: rhbz#1261421 crash on mashing hangul korean keyboardCaolán McNamara2-0/+192
(cherry picked from commit 064fd8342111bc62ba646e439c235bd495587a4a) Change-Id: Ie066c7f83ad15bec198f2091a3b084468c502766 Reviewed-on: https://gerrit.libreoffice.org/18500 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-17tdf#92505 vcl: fix substituting missing glyphsMiklos Vajna1-4/+2
Commit a6b00d16eb27a5e7e31c721671001a909ecef960 (Related bnc#822625: Cache FontEntry with the original FontSelectPattern.) and the follow-up 16a62079018aea0e72636bdb00576487b4e830b9 (Oops, this reference can't be const., 2014-05-28) changed the font cache key, so that it's directly what was the argument to ImplFontCache::GetFontEntry(), which leads to missing glyphs in the bugdoc, e.g. the 4 check mark characters are rendered as a check mark only in the DejaVu Sans case on my machine, the other 3 cases result in placeholders. Fix the problem by changing back the key to aFontSelData, which is possibly modified in ImplFontCache::GetFontEntry() before used as a key. Change-Id: I80eb4ba0f986a10100b6ae421d1346f235ce83b7 (cherry picked from commit e047caf4bb461fb168d9fe08228c049938ca1698) Reviewed-on: https://gerrit.libreoffice.org/18561 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-17check stream status more oftenCaolán McNamara2-15/+32
Change-Id: I233c2fff9c06a81117f8114ccee83b53ea4026db (cherry picked from commit b43e03353aeb04ed74a272d98df03dd7c20f3478) Reviewed-on: https://gerrit.libreoffice.org/18506 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-09-17fix size check related hangCaolán McNamara2-9/+10
Change-Id: I3e8aa5c48ba802cd363688502b44e27bfdf67f01 (cherry picked from commit b02f1c58e7bb8b6c9381107431557d3f39794fe0) Reviewed-on: https://gerrit.libreoffice.org/18465 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-09-17Revert "Fix single node CopyRange"Michael Stahl6-37/+139
This reverts commit 9099e21b89184bd4e39def497e483cac4a77ec5a. It causes the problem that frames anchored to the same node where redlines start or end get duplicated during Hide. Jan-Marek said that the original mail-merge related problem this change was fixing is now most likely fixed differently, and the test in testMultiPageAnchoredDraws() still passes. (equivalent master commit e84f0a9b3223f49b0829f2f55dacbf11ae201c1e) sw: add unit test for the redline frame duplication regression (cherry picked from commit d5ffcba07acb4dd5bd68373d40f07af825f07fba) Change-Id: I4c2b425b0dc8d2706cc74ad93a485a501d44c072 Reviewed-on: https://gerrit.libreoffice.org/18510 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-17Resolves: tdf#92995 do not delete caption objects that are held by UndoEike Rathke6-6/+36
Drag&Drop Undo is a special case of ownership.. Change-Id: I2fe7769c4d84efe09d432335d5d8e72d506bf7a1 (cherry picked from commit 44f34c1163882c2e3086282374fee9cd55ee211f) Reviewed-on: https://gerrit.libreoffice.org/18474 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-17tdf#93097 oox: fix import of metadata from non-relative stream pathsMiklos Vajna3-1/+18
Commit ef2668bad976f1fbb70759887cafd35ea7833655 (PPTX import: fix missing document metadata, 2014-08-28) implemented metadata import for the PPTX filter, but in case the metadata stream is not an existing one, then OHierarchyHolder_Impl::GetListPathFromString() invoked by OStorage::openStreamElementByHierarchicalName() throws. The bugdoc is generated by a 3rd-party tool that always starts the stream path with a slash, and MSO seems to just ignore that: so let's do the same to be able to open the document. (cherry picked from commit 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c) Conflicts: sd/qa/unit/import-tests.cxx Reviewed-on: https://gerrit.libreoffice.org/18372 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28
2015-09-17stray debugging linesCaolán McNamara1-2/+0
(cherry picked from commit b95175cc41f96ce669d2a4d4c55034c1f80ac74b) Change-Id: I525009b9d037387b236cb4605fe0b93c94858d89
2015-09-17tdf#91554 OK button should be disabled initiallyMaxim Monastirsky1-0/+1
Regression of eb505c259d0d7bd05d1bb5be5a14ad8613c2a9c7. Change-Id: I4623c41617d92a808513f18154a7531e6dfd5463 (cherry picked from commit fdbad6761f5634982bb7b837bb145b3bd580832b) Reviewed-on: https://gerrit.libreoffice.org/18371 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-09-16cp#1000138 obsolete the kde integration package, which we don't build any moreAndras Timar1-1/+1
Change-Id: Ifab30a0af8b9cca342b3d392c14c30beb4c18b25
2015-09-06scp2: EULA to Resources on OS Xcp-4.4-8Andras Timar1-3/+1
Change-Id: I87bbb61884d77729832e4d3f36aca29d6dada277
2015-09-06put python starter shell script to Resources folder of OS X appAndras Timar1-0/+4
Change-Id: Iaed947b9168fbd1e2d2c79da724426b56bd8a830
2015-09-06hack to fix an MSP creation errorAndras Timar1-0/+2
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c
2015-09-05Bump version to 4.4-8Andras Timar1-1/+1
Change-Id: I0776bcfd878e7943857bf7515e9031f5804c3a18
2015-09-04enable MSP creationAndras Timar3-2/+3
Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43
2015-09-04Fix mis-mergeStephan Bergmann1-6/+6
...where fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f "Resolves: #i121407# Gallery reorganizations..." first cherry-picked the younger 8012fae6cedcf325130d70adf0a486e8918f452f before f7d373d18f965b36f310d44044bdba6476f6eb03 "Added ColorDepth change test with assertion to the Bitmap::Scale method" then cherry-picked the older 4be8cc079667cca2cae91dba9e46c16ccff1537f, leading to the two checks at the top of Bitmap::Scale to not return early as intended. Thanks to clang-tidy clang-analyzer-deadcode.DeadStores for flagging this. Change-Id: Id89cc517a9f7efdff040c70f3b0e640d969cf24d (cherry picked from commit 0aa9cd69598e1c022aa676f81dc7bc2f03e58b2c) Reviewed-on: https://gerrit.libreoffice.org/18311 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04Related: tdf#93676 special 255 Percent Flag should not be exported to docxCaolán McNamara3-8/+12
as a true percentage value. 255 is a special flag that the value is synced to the other dimension. Without this word gives the frame in the attached example a huge height. (cherry picked from commit b2ad33fd5a1ee0cd9a1e657725aedc90da659f24) Change-Id: Ida0c15779d4583ca075428d77b8dc03c32f22edb Reviewed-on: https://gerrit.libreoffice.org/18303 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04doc para property ranges cannot be 0 lengthCaolán McNamara2-0/+13
Change-Id: If946204873343d8bbc0c1d391ca2c65d8b2f8561 (cherry picked from commit ed7d22049596ac91ad75bfad1a5675c13714e203) Reviewed-on: https://gerrit.libreoffice.org/18300 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04tdf#87922 SwDrawTextInfo::ApplyAutoColor: handle fill attributesMiklos Vajna1-0/+10
With this, if page background is set to e.g. black, then automatic color of text is again white, not black. (cherry picked from commit d48d0e81971266ff4625721b0f069a62ec7014e2) Change-Id: I8246fa4b7834f60872b0737f03906ccc86948cc1 Reviewed-on: https://gerrit.libreoffice.org/18293 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-09-04tdf#87924 DOCX import: rot=90 and vert=vert270 means no text rotationMiklos Vajna3-3/+38
If the shape is rotated 90 degrees clockwise and the text is further rotated 270 degrees clockwise that means we shouldn't do anything with the text and the result will be correct. Also: cid#1315264 incorrect expression (cherry picked from commit dbfed66eebde65f5844a0f1a2cfe548ad4eda962 and 1c09657c5c25cf941588610eeab653217399f9b5) Change-Id: I7c65319258136288520bd24fa2bf8e3c598b0878 Reviewed-on: https://gerrit.libreoffice.org/18274 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-04tdf#92612 Right-clicking after applying "paint buckets" leads to multiple UndoAshod Nakashian5-12/+35
In paint bucket mode the user can undo by right-clicking. Undoing, however, is only possible after the first paint op. After undoing is enabled, the user can undo indefinetely by righ-clicking. This is not consistent and can be confusing. This patch tracks the changes done after entering the paint bucket mode, and allows the user to undo them using right-clicking until they reach the first operation before entering this context. Because the user can undo/redo using other means, the patch takes it into account and will reset its tracking to accomodate this. Ultimately, the user is able to make any changes in paint bucket mode and undo them all by right-clicking, but no further than that. Reviewed-on: https://gerrit.libreoffice.org/16951 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d0489d0827fc6cef04d0f3602023d82ceda82480) Change-Id: I93380fb60db83aee37a1d324218ba6ab1700a2e5 Reviewed-on: https://gerrit.libreoffice.org/18256 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-09-04detect if new offsets are the same as the previous ones and avoid loopCaolán McNamara1-0/+9
Change-Id: I4c53d4bce9a69d79e34bdd634c296d9b495e1904 (cherry picked from commit 137cf76573c89ea1b0b1f716a50731419a187473) Reviewed-on: https://gerrit.libreoffice.org/18275 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04check for over long record len and check readsCaolán McNamara2-18/+26
Change-Id: Ib77ce1b95db2dc4396f4fd2fdcff4c0344b20c9e (cherry picked from commit 0c191e2b757555b147ebab1688e72acde28062a1) Reviewed-on: https://gerrit.libreoffice.org/18180 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04check for legal field sizes before readingCaolán McNamara2-6/+19
Change-Id: I3cdb647e1a057be5bb4b32d119ee5bcbbedf7473 (cherry picked from commit ad6d83defb33c414885ce6d4bfa85571d463f3c3) Reviewed-on: https://gerrit.libreoffice.org/18170 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04Resolves: tdf#91060 don't crash on loading certain pptxCaolán McNamara1-1/+1
Change-Id: Ibf32ef644222a59c5fe6a9736ff64739ab24b74f (cherry picked from commit c874bf3f7bd6bbe31416506d9b4213bcbbbac4fa) Reviewed-on: https://gerrit.libreoffice.org/18227 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04check for ridiculous lengths and check stream statusCaolán McNamara2-9/+13
Change-Id: Iefe943794e005f03b2a6ea5fc642b8c3d21b3334 (cherry picked from commit 858257d465b7e7ce54819cc2f631efcb20632863) Reviewed-on: https://gerrit.libreoffice.org/18174 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04check stream statusCaolán McNamara2-1/+1
Change-Id: I27bb289288d319a93201e9c3d703114924ca258c (cherry picked from commit daf1578d752531e2b48d183531d9a4a7cedfc37e) Reviewed-on: https://gerrit.libreoffice.org/18178 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04check stream statusCaolán McNamara2-4/+6
Change-Id: I65ed5979d35d8739367294a71620782b832cfd71 (cherry picked from commit a8fe085f973b4ccf846fe231af0fa25eda59911e) Reviewed-on: https://gerrit.libreoffice.org/18161 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-04tdf#88986 sw: add missing XPropertyList pool items on TextFrame insertionMiklos Vajna4-5/+18
Regression from commit 6e61ecd09679a66060f932835622821d39e92f01 (Merge back branch alg_writerframes to trunk, 2014-03-19), the problem was while SwFrameShell::Execute() was modified to put the various pool items related to fill types (colors, gradients, etc) to the item set of the dialog, the same was missing in SwTextShell::ExecInsert(), so colors were missing on inserting a new frame, but not when editing an existing one. (cherry picked from commit 6c3ca675509101732d3d878d6ceb6226026cd9ac) Conflicts: sw/inc/drawdoc.hxx Change-Id: Id009f914c1c3b6509e31a4887e32a00624678cf4 Reviewed-on: https://gerrit.libreoffice.org/18232 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-04vcl: Improve management of mnRef0Count.Jan Holesovsky3-5/+19
Follow-up to 34700400247e378e074ce4164ab2809edb092201; this fixes sw_ww8export unit test on Windows. Reviewed-on: https://gerrit.libreoffice.org/18175 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 44377b911f9e19e43f14e390b69db4055f423b6a) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: Ic0c3228efb59a182e1562b73117418cd8b5e6017
2015-09-04New version of ConvertTextToNumber extension (1.5)Andras Timar2-2/+2
Change-Id: I6211465920caf1b498a0ba818686014352a4846d
2015-09-02tdf#93830 txXfrm offset workaround works in rounded rectangle case as wellAndras Timar3-1/+27
Reviewed-on: https://gerrit.libreoffice.org/18226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit cc88a88caad591270760d947848ad0a032d32bdb) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I5d8df5c0d55e8dfd7c978b16b2b220c127f3dac9
2015-08-31bnc#930818: allow for EMF+ record padding up to 11 bytesMike Kaganski2-17/+30
When an array of EMF+ has extra bytes in the end, that are less than 12, they should not be treated as another EMF+ record, but simply ignored. Conflicts: cppcanvas/source/mtfrenderer/emfplus.cxx Change-Id: I34701c00916812c8a6a4b69730f602da81719b35
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/18162 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-08-31check stream statusCaolán McNamara2-0/+8
Change-Id: I6b9537cf94ac1c5d996ba64ddf878745dadde254 (cherry picked from commit 452cd9e75de657e996e17510fe5d3539065489d1) Reviewed-on: https://gerrit.libreoffice.org/18129 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-31pClientData can be nullCaolán McNamara2-1/+1
Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc (cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1) Reviewed-on: https://gerrit.libreoffice.org/18150 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-31ODF 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. (cherry picked from commit 68efa6f5128abf4cd097ae81a4cfd7fecbcb2a80) Change-Id: I1c2bea46ba7d9a3f042b875df0ca12c7f6037909 Reviewed-on: https://gerrit.libreoffice.org/18045 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31related: 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/18044 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31tdf#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/18043 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31tdf#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/18042 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31sw: 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. (cherry picked from commit 27a02d1708be7812668a84ea956edc8ecb312246) Change-Id: Ife3e58eeebd73ad895fe328662822b847cf9bfec Reviewed-on: https://gerrit.libreoffice.org/18041 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31vcl: fix resource management issue in WinSalLayoutMichael Stahl4-2/+15
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. (cherry picked from commit 34700400247e378e074ce4164ab2809edb092201) Change-Id: Ic4bf984ea9fd70de9fa95ca964ae12d95d47d5bf Reviewed-on: https://gerrit.libreoffice.org/18120 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-31check stream statusCaolán McNamara2-9/+25
Change-Id: I609c8c4f4e843601361b61f55e0325ad99db3c23 (cherry picked from commit dc1be62d75e654e17c2f4c02804b7fd48d5a2515) Reviewed-on: https://gerrit.libreoffice.org/18119 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-31eof 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/18118 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-31guard against 0 item sizeCaolán McNamara2-2/+9
Change-Id: I9c4c2f0fe2d892615b3c70e08da0cab6da13338a (cherry picked from commit 2aadad1e89e96cb80c15fe1069cb6365f0cade1d) Reviewed-on: https://gerrit.libreoffice.org/18117 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-31check seeks and readsCaolán McNamara6-36/+76
Change-Id: I0c5c4784713376e0762bfbd197640f8d31b65562 (cherry picked from commit 1847753ab135f522df6a293a8539155437f0129f) Reviewed-on: https://gerrit.libreoffice.org/18116 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>