summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-10buildfix: sw ww8 export unit testcp-4.2-19Andras Timar1-2/+2
Change-Id: I011bea4f6da37e180446447dee1b79eee7bbd918
2014-11-10Bump version to 4.2-19Andras Timar1-1/+1
Change-Id: Ie02193db64ea94de1f1df6a2e2aa6d13ddbd72e2
2014-11-05fix bnc#624546 (fdo#83773) slide pane cut/copy/paste in outline viewMarco Cecchetti4-6/+42
Problem: When I'm in outline mode, if I select a slide in the left slide preview pane, ctrl-c, then select another slide I would like it after and hit ctrl-v; it refuses to cut/paste. Analysis: This issue is due to the fact that the outline view always grabs focus when activated and a view is activated whenever is pushed to the sfx shell stack even if it is not the new top-most active view shell (see `ViewShellManager`, `SfxViewShell`, `SfxDispacther`). Solution: Make the `OutlineViewShell` grabs focus only if it is the top-most active view shell. Rationale: When `OutlineViewShell::Activate` is invoked, instead of removing the focus grabbing action completely, we check if the `OutlineViewShell` instance is the the top-most view shell and perform the focus grabbing action only in such a case. This change required to have also the `DrawViewShell` grabbing focus on activation (only when it is the top-most view shell). In order to implement this solution I needed to add a new method (and data member) to the `ViewShellManager` class. I named it `GetTopViewShell`. This method returns a pointer to the top-most active view shell of the internal stack. The returned pointer is updated in the `UpdateShellStack` method, before the sfx shell stack is updated. For more details see : https://gist.github.com/mcecchetti/15b3ebc505d6582ea0db (cherry picked from commit 967a386bccb15b99915a1e878e42450fbe9a2d0e) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/source/ui/view/ViewShellManager.cxx Change-Id: I619a406864f50f0e62dee3fcb9ac5d46e3d48272
2014-11-04bnc#636128 DOC export: handle FFData.cchMiklos Vajna3-0/+20
Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46 (cherry picked from commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb)
2014-11-04bnc#636128 DOC import: handle FFData.cchMiklos Vajna2-2/+6
(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f) Conflicts: sw/source/filter/ww8/ww8par3.cxx Change-Id: I8020ce561a72f10b8f0f517d50407a802049bd48
2014-10-29fdo#37960 fix shift+click to select multiple drawingsAndras Timar1-2/+0
I simply didn't get the logic behind calling GotoNextFly(). It caused not only this bug. For example Ctrl+click on a background text frame did not select the text frame, but an image on the previous page. Change-Id: I85ccbbda2f324de55417d6199b4abe79e59bf295
2014-10-29bnc#893791 XLS export: external sheet references on Linux/OSXAndras Timar3-0/+32
The commit solves two problems. 1. Make sure we save absolute paths on Linux/OSX 2. Make sure we don't save invalid XLS (VirtualPath longer than 255 chars) The first problem has always been there, so after a few load/save cycles an XLS with reference to other XLS on a Unix-like file system became invalid, and only LibreOffice could open it, Excel could not. These broken XLS files can be repaired by saving after this patch, however, the original reference will remain broken. (cherry picked from commit 3f5251675eeeeae56ea282fdeb09dbc53ce4aae6) Conflicts: sc/qa/unit/subsequent_export-test.cxx Conflicts: sc/qa/unit/subsequent_export-test.cxx Change-Id: I8f575acb1d560d539c1da61a1afdaac3f0c13977
2014-10-27fdo#85282: Correct adjustment of range reference on delete & shift.Kohei Yoshida1-6/+61
Change-Id: I6e01c160f77599dfa4a2e55b60e23d256184c822
2014-10-27fdo#85215: Ensure that formula broadcasting works after sort.Kohei Yoshida1-0/+15
When the reference update on sort is turned off. Change-Id: I547dd1525a638dd447fe331e22583af4a7947308 (cherry picked from commit 1eb82c78a223d9a0b2bb5c3f5c129c1ee8bdf303)
2014-10-26fdo#85215: Don't adjust references wrt cell position when disabled.Kohei Yoshida2-4/+6
Change-Id: Ie1a12cc189bcb66fad59ea9901ac0dc95bb68788 (cherry picked from commit 10fc138307afb4b39baddb0d56eb8e986e5d29ea)
2014-10-23Resolves: fdo#62682 crash on second export of svgAndras Timar1-1/+1
because the first export has left "dangling" CalcFieldValueHdl Links in Outliners that got created based on the Drawing Outliner while it had a temporary CalcFieldValueHdl installed, and didn't get the old CalcFieldValueHdl installed when the old Drawing Outliner one was re-installed. (cherry picked from commit 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff) Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883
2014-10-22Bump version to 4.2-18cp-4.2-18Andras Timar1-1/+1
Change-Id: Ib252bb7fbc0e00035165c2033a36f235ecbe43d7
2014-10-22EULA 2014-10-20Andras Timar2-3/+2
Change-Id: If483c8a91ee86b08f1506cac1f0e464b9187a729
2014-10-19fdo#75359 - SIFR: Line Spacing 1.5 icon missing (4.2)Yousuf Philips6-0/+0
Change-Id: Ia0e7cd833bcc5d29fccaf098a043e4990966aa15
2014-10-18fdo#82047: Correctly adjust references in range names on row deletion.Kohei Yoshida1-0/+47
Change-Id: Iac924b0b6932863f7f9cc088f996e0b07c340d2c (cherry picked from commit 281847613bd3ae472523822f4be9c21cc353867e)
2014-10-18fdo#80284: Avoid broadcasting during cell delete & shift.Kohei Yoshida1-5/+2
Broadcasting it here and marking formula cells dirty prevents them from being entered into the formula tree at the end. They get marked "postponed dirty" during reference update, and are supposed to be set dirty at the end. Change-Id: I65977300ee4ee26b6166d170acd2145abcbbf288 (cherry picked from commit 7fef943114b9184e69c8c714bf158116b8d9caf7)
2014-10-18Resolves: fdo#62682 crash on second export of svgCaolán McNamara6-2/+39
because the first export has left "dangling" CalcFieldValueHdl Links in Outliners that got created based on the Drawing Outliner while it had a temporary CalcFieldValueHdl installed, and didn't get the old CalcFieldValueHdl installed when the old Drawing Outliner one was re-installed. Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883
2014-10-17fdo#81633: Add a hidden configuration option to toggle ref update on sort.Kohei Yoshida13-73/+135
This option is defaulted to off for 4.3 for back-compatibility. Reviewed-on: https://gerrit.libreoffice.org/11902 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Conflicts: sc/inc/inputopt.hxx sc/qa/unit/ucalc.cxx sc/source/core/tool/inputopt.cxx Change-Id: I5ac686e96742df40f7d8ba5ffec23806db2988a6
2014-10-17fdo#73080: Fix the single cell reference cases as well.Kohei Yoshida1-22/+32
Conflicts: sc/source/core/tool/interpr1.cxx Change-Id: Ib9a8ae04733c5bcb982ef4d337112eb8249d0ee0
2014-10-17CVE-2014-3566 (etc)Caolán McNamara11-0/+1222
i.e. sync with fedora 20 openssl-1.0.1e security backports Change-Id: I9e07d3aad7f0c7a3fd684d4e52b3b952cfb2f82d
2014-10-15fdo#73080: Correctly count blank cells in COUNTBLANK.Kohei Yoshida1-2/+20
Especially when formula cells are involved. Change-Id: I40950e7108778821c17d08354f01bb157b1551e6 (cherry picked from commit 3e2bd1e4022e25b77bcc8eba5e02c1adc57008a1)
2014-10-14bnc#800714 SwTxtFrm::FormatAdjust: still call SplitFrm if we have columnsMiklos Vajna4-1/+55
Regression from c5a8a2c3cbcee0175127a0662e3d820ea4deea22 (sw34bf05: i#84870 - method <SwTxtFrm::FormatAdjust(..)> - do not split text frame which only contains on as-character anchored object, 2011-03-11), the i#84870 fix was for a document which didn't have columns, and didn't consider that this causes a layout loop in case: 1) There are two paragraphs in a section, having multiple columns. 2) The second paragraph has fo:keep-together="always". In this case originally we tried to call SplitFrm(), realized that it didn't help, and then gave up. But after the change, we kept trying to satisfy the two conflicting requirements (balance content in the 3 columns vs keep the second paragraph with the first one). Fix the problem by not calling SplitFrm() only in case we're not inside columns. (cherry picked from commit 2d35baed5e87ffe7ca371986391cdb3983cdd2b1) Conflicts: sw/CppunitTest_sw_odfimport.mk sw/qa/extras/odfimport/odfimport.cxx Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce
2014-10-13bump nss from 3.15.3 to 3.16.5Caolán McNamara5-165/+173
Reviewed-on: https://gerrit.libreoffice.org/11700 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: external/nss/ExternalProject_nss.mk external/nss/nspr-build-config.patch external/nss/nss_macosx.patch (cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1) Reviewed-on: https://gerrit.libreoffice.org/11898 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Conflicts: download.lst external/nss/nss-linux-x86.patch.0 external/nss/nss-pem.patch Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
2014-10-12fdo#83901: ROW() and COLUMN() to be properly recalculated on cell move.Kohei Yoshida2-1/+7
For cases where ROW or COLUMN references another cell that has shifted. Change-Id: Ic4bef8672dab811ceff6886d9af0388306a66485 (cherry picked from commit 0b29a16d1dcffd75e49bd7ad3da867b0d0ebfa38)
2014-10-12fdo#76565 Allow pasting into input fieldsJan-Marek Glogowski1-4/+2
Reviewed-on: https://gerrit.libreoffice.org/10835 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3f26ab24e0bfd27645c97ff7915fba2db409930a) Conflicts: sw/source/uibase/shells/basesh.cxx Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0 Reviewed-on: https://gerrit.libreoffice.org/11780 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-11fdo#80846: Broadcast changes before EndUndo().Kohei Yoshida1-14/+9
EndUndo() calls PostDataChanged(), which renders the recalculated formula cells. Not broadcasting before EndUndo causes some dependent formula cells to not get recalculated. This one unfortunately is not currently unit-testable as this behavior depends on the presence of ScTabViewShell.... Change-Id: I86288608b7f2627cda7c74be27a18029832775ef (cherry picked from commit 424bfaa773e58d6b609ac7f64907db4b542d1315)
2014-10-08Fix thinko. Thanks to vmiklos for noticingTor Lillqvist1-2/+2
Change-Id: Id4e65908cc73978205bc0858a3a809b882864b62 (cherry picked from commit d61f8185e660a6820351b8cea3ac51d344f0ab3e)
2014-10-08Don't try to create cdefghij.klm inside the app bundle on OS X when sandboxedTor Lillqvist2-1/+31
Actually, we check HAVE_FEATURE_READONLY_INSTALLSET and not HAVE_FEATURE_MACOSX_SANDBOX, but in practice we set the former only for the latter case. We could do this test cross-platform but I didn't bother now. Nobody uses --enable-readonly-installset when building for Linux or Windows anyway, I think. (There must be more places where we could and should check HAVE_FEATURE_READONLY_INSTALLSET.) Change-Id: Ie54f436616a1db3119b0bc0148149784127b156d (cherry picked from commit 96d091d43428472c2c68054ed5dca22f79adc705)
2014-10-06Bump version to 4.2-17cp-4.2-17Andras Timar1-1/+1
Change-Id: If617f1ebf76d20fc79ce5e01b4e293fa3f6c37fd
2014-10-06cp#1000103: Set 3D flag when adjusting reference on cell move.Kohei Yoshida1-0/+4
This is conceptually a backport of 31abf4ce4e18cf2e94c6e598f255ae7cd8f675fa, adjusted to apply to the 4.2 code base. Change-Id: Id2979c7699e2b28cc752d527f4cb328da1529c0d
2014-10-06resolved fdo#82936 do not clear the 3D flag on refupdateEike Rathke1-1/+2
Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862 (cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31)
2014-10-03shared_ptr is too smart to accept NULLChristian Lohmaier1-1/+1
Change-Id: Id1bc223ffe2a8811219cdc47d145cd139199281a Reviewed-on: https://gerrit.libreoffice.org/11767 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-10-03Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommandCaolán McNamara1-1/+1
Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09 (cherry picked from commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af) Reviewed-on: https://gerrit.libreoffice.org/11666 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Related: fdo#73608 don't crash on missing table stylesCaolán McNamara3-1/+15
(cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540 Resolves: fdo#73608 bail out on loop in style sheet hierarchy Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb (cherry picked from commit be18133e84120625734a09380594ee89b23c4322) Reviewed-on: https://gerrit.libreoffice.org/11680 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::GetCaolán McNamara2-1/+1
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f (cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1) Reviewed-on: https://gerrit.libreoffice.org/11704 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03bnc#584721: invisible text because of wrong color (white)Zolnai Tamás3-10/+61
Color::getColor() method uses some caching mechanism which works wrong when the result depend on one of the input parameters. So avoid caching in these cases. (cherry picked from commit cfe658c289de030dc3a8fecd3bac0a0004a18061) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ifa9221e21e685715454de86d5cec09ff6c266307 Reviewed-on: https://gerrit.libreoffice.org/11723 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Resolves: fdo#79129 Crash in oox::drawingml::LayoutNode::setupShapeCaolán McNamara2-1/+9
Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f (cherry picked from commit c84ce79132c674b4c2d31da8997ed77671323dfe) Reviewed-on: https://gerrit.libreoffice.org/11727 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03fdo#53920 Switch back tab at RefButton closure timeLaurent Balland-Poirier2-3/+11
Bug occurs because visible tab is not the initial tab. So, instead of switching back to initial tab at dialog closure time (removed from cellsh2.cxx), this commit proposes that switching back to initial tab is operate when expanding the RefButton shrink dialog. Reviewed-on: https://gerrit.libreoffice.org/11660 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 31432c4469e7e0d05516143533d6b5e0b411dda3) Change-Id: I3cf7ed14054fa69881d4ecbc55c48dfbfc4356aa
2014-10-03bnc#897769: OOXML import: Import border lines using reference too.Matúš Kukan2-22/+45
Do not ignore 'lnRef' element. Also fix typo to apply 'seCell' properties to the right cell (southeast). Change-Id: Ia45f7016f358b70e6db06a232c569335ce9d7051 (cherry picked from commit 18898e13fda25fe6dc85318dd0711355c7b2cc26)
2014-10-03fdo#83848 Add GetAddressConvention to RefButtonLaurent Balland-Poirier1-1/+2
Reviewed-on: https://gerrit.libreoffice.org/11578 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 2c7595a911c3b0102162c2ad9cef4a84538b66f8) Change-Id: I20d633909d3c13bf49998a6cca054ab125b6c991
2014-10-03fdo#65281 Empty/Not empty doesn't work in columns with date formatDavid Ostrovsky1-1/+4
"Empty" and "Not empty" predicates were unconditionally overriden in filter dialog for date format columns. Rectify it by preventing the overriding for these functions. Test Plan: * open calc document * define column with date format * put some data and let some columns empty * apply standard filter on date column with "Not empty" function * verify that rows with non empty columns still visible Change-Id: I2111c5a6b6350cab63173d42419069813d1137b6 Reviewed-on: https://gerrit.libreoffice.org/11613 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 551ee32dfaaddd2aa48efebaefab0730474b656d)
2014-10-03Updated coreAndras Timar1-0/+0
Project: translations 3f6da2afc8cd96d196fab9a9c33f3755f2c38225
2014-10-03bnc#657899: Paragraph vertical spacing differs from PowerPointTor Lillqvist1-0/+22
We need to set the "paragraph summation" flag also for .pptx import. (As is already done for .ppt import.) This is what in the Options (Preferences) UI is called "Add spacing between paragraphs and tables (in current document)", on the LibreOffice Impress:General page. This is a setting that when set becomes local to the document. I actually don't really understand why this needs to be a user-visible option, wouldn't it be enough for it to be an internal flag that is set for documents imported from .ppt and .pptx, and is clear otherwise? (cherry picked from commit 96d210bf9ca0a99fc8256d6e0a4952207cce69e0) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/source/ui/docshell/docshel4.cxx Change-Id: I525178957276e7d587b6ac4be8ae7919fc245a27
2014-09-29map FRAME to VML's textLuboš Luňák1-2/+2
Again, that's what this file does elsewhere, that's what (incomplete) import did before my changes, and it seems to match better the position that such an element gets in Word. Change-Id: Id09150eaaa505e6ddcd4baaf4a833000d52dd71d
2014-09-29map PAGE_PRINT_AREA to VML's marginLuboš Luňák1-2/+2
That's what the code does elsewhere in this file, and also import does it. Change-Id: I30e608f86a9cae66eed48dbb2e719b1455327ae3
2014-09-29proper reading of mso-position-(horizontal|vertical)(-relative)Luboš Luňák3-3/+33
Change-Id: I50f537c697f6e73c1fd150f3f03fc65b85ccbeaf
2014-09-29export in .docx also vml mso-position-(horizontal|vertical)(-relative)Luboš Luňák1-83/+83
Change-Id: I65321bb6244e0e37ef673d726b698c3708711d53
2014-09-29docx ST_VAnchor does not know "column", it should be "text"Luboš Luňák1-1/+1
Change-Id: I3a5ab08e349c5c071373cda2f62e3cea593e263c
2014-09-25make signing depend on slowchecks being donecp-4.2-16Christian Lohmaier3-4/+7
otherwise signing (at least on windows) fails because files are in use Change-Id: Ida6a7d43dc74eb278fd79410b9c0a60f823c5933 Reviewed-on: https://gerrit.libreoffice.org/9176 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-09-25add missing breakLuboš Luňák1-0/+1
Should have been included in 3891ba42a886fa85eb43da24d1badf44e765d54c. Change-Id: I22e5ba931a58c83efdbf996ce701c52dcf0bf9c5