summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-19Read/write 'encrypt to self' bitKatarina Behrens
use some template functions to avoid duplicate code Change-Id: Ia178ea3a0561e34e0431749262f5f8f1f49b4fe7 Reviewed-on: https://gerrit.libreoffice.org/46693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-19Read/write preferred GPG signing/encryption keysKatarina Behrens
Change-Id: I3e21469c5f4c4f199407bbe9faba2e2ddca531b3 Reviewed-on: https://gerrit.libreoffice.org/46692 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-19Do things with preferred GPG keysKatarina Behrens
For signing, preselect the key in the list of available keys. For encryption, when 'encrypt to self' bit is set, add user's key to the list of keys to encryption. Change-Id: I5bbfd0e2cc97b76c1304a2a345a51cf83bc5949e Reviewed-on: https://gerrit.libreoffice.org/46694 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-19List private GPG keys in crypto config dialogKatarina Behrens
Change-Id: I7cb6a14adcc5424b432589120c66deeddf86b652 Reviewed-on: https://gerrit.libreoffice.org/46691 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-19Pick up sheet-local named expressions as well.Kohei Yoshida
Change-Id: I8a081b5f81740fa91f43ac152a950d73d031ed10 Reviewed-on: https://gerrit.libreoffice.org/46666 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-19tdf#113538 New font order for hebrew fontsYousuf Philips
Change-Id: I6e820886204a53de3b29f30b42bb6503cfcc8e35 Reviewed-on: https://gerrit.libreoffice.org/45065 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
2017-12-19coverity#1426314 silence Resource leakCaolán McNamara
Change-Id: I266463184f902df11943a23fa4129086c6441783 Reviewed-on: https://gerrit.libreoffice.org/46703 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-18Defer cell value insertion until later.Kohei Yoshida
Because Calc's formula engine expects all named expressions to be present at the time of re-calculations, we need to delay insertion of cell values until after the named expressions are inserted into the document. Change-Id: I54c7d3dc86b3e2c5c192337b1cebfbdfb901ab1f Reviewed-on: https://gerrit.libreoffice.org/46665 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Pick up global named expressions.Kohei Yoshida
Formulas with named expressions don't work yet since they get imported before the named expressions do. We need to insert formula cells after the named expressions. Change-Id: Id2d7c59194ce7c07a3580cc8d9afd9fdda660b24 Reviewed-on: https://gerrit.libreoffice.org/46664 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18tdf#103080 October 2017 update to Noto fontsYousuf Philips
In addition to updates to the already bundled fonts, Condensed and Light weights of English Noto Sans and Noto Serif have been added, as well as the addition of the Noto Sans Arabic Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e Reviewed-on: https://gerrit.libreoffice.org/46596 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
2017-12-18tdf#114212 sw: fix layout of as-char anchored text-frame of shapeMichael Stahl
Commit c79467ba954987f1d239c594c1e1b3af3f5515f6 changed the vertical orientation of the shape, and the effect on shapes with text-frames (or TextBox) is surprising: the shape itself, as imported from DOCX, now has the "top" vertical orientation, where it previously had "from-bottom", which was wrong, because it was different from Word. However the associated text-frame now is positioned wrongly, stacked on top of the shape; the problem is in SwFlyCntPortion::SetBase() where the text-frame is manually positioned depending on the shape's position; using "top" there does not actually result in the correct position because it disables the use of the computed vertical offset; fix the offset so it looks right. Change-Id: I2ff38577d0cae2e9f796402545503cc6351a9d2b
2017-12-18coverity#1426163 Improper use of negative valueCaolán McNamara
started life as sal_uIntPtr and the various checks are typically nPos < thing.size() just checking one bound, so sal_uInt32 looks safer after all Change-Id: Ibac839fc45b10d96ce4d4c8002fd26b20f70ae1c Reviewed-on: https://gerrit.libreoffice.org/46697 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-18sw: prefix members of SwAccessibleChildMapKeyMiklos Vajna
Change-Id: I1cf45ca8b0ea10645be30f0a832ea42c763a7c3c Reviewed-on: https://gerrit.libreoffice.org/46690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-18sal_uLong->sal_uInt32Caolán McNamara
the position here is cast to sal_uInt32 so begin as sal_uInt32 initially Change-Id: I221d97961292988e90a23091ffc9324d42fc366e Reviewed-on: https://gerrit.libreoffice.org/46698 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-18ofz: reject graphics with bad anchorsCaolán McNamara
Change-Id: I9fc514f50843408981b53bdfb3131895b95e15eb Reviewed-on: https://gerrit.libreoffice.org/46712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-18tdf#113590 Unify labels between both special character controlsYousuf Philips
Change-Id: I40a3d53b6d7052d4c09b4906022d5d142e1dd298 Reviewed-on: https://gerrit.libreoffice.org/46422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
2017-12-18oox: fix Android buildMiklos Vajna
Change-Id: Iad0d51311ba0e74e1fbc33ee3fb09c8c9a89b0c0
2017-12-18sal_uIntPtr->sal_uInt32 in ConfigNoel Grandin
Change-Id: Ifca1e69c0b9f1def49b4b1973e7582fb3e8b8826 Reviewed-on: https://gerrit.libreoffice.org/46706 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18Handle per-cell settings of cell formats.Kohei Yoshida
Change-Id: I500d01921d436643499a24d375d40a607d8fd576 Reviewed-on: https://gerrit.libreoffice.org/46663 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Implement a reference resolver for orcus.Kohei Yoshida
Orcus uses this to resolve cell addresses for some ops. Change-Id: I6ee9667ad994fb830e545ba3368004866a048c25 Reviewed-on: https://gerrit.libreoffice.org/46662 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Remove almost duplicate code blocks.Kohei Yoshida
Change-Id: Ib75d0caa41876908091bed374d3afd802928acf7 Reviewed-on: https://gerrit.libreoffice.org/46661 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18convert SVX_GRAPHICFILTER constants to scoped enumNoel Grandin
Change-Id: I220a2cfe9ea9ef2aa85e4ad8278be70c338891a5 Reviewed-on: https://gerrit.libreoffice.org/46705 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18oox: try to fix Android build, no std::lround thereMichael Stahl
Change-Id: I47e1df5d27e788ef5aa48c3a09daf9888c33f920
2017-12-18tdf#114303 writerfilter: RTF import: fix default vert orient of shapesMichael Stahl
The bugdoc is affected by the change of default vertical alignment, it doesn't contain anything that would set the VertOrient property. (regression from c79467ba954987f1d239c594c1e1b3af3f5515f6) Setting the AnchorType property before adding the shape is actually not as effective as expected: it does cause the old default vertical alignment to be used, but does not actually set the anchor type because there is no anchor position and so SwXDrawPage::add resets the anchor type to FLY_AT_PAGE; it's less confusing to set the VertOrient property instead. Change-Id: Ib0a71d20d479776ab5e4c21c3dd13c0c307a045e
2017-12-18Mark external/mdds/c++17.patch upstreamedStephan Bergmann
Change-Id: I5cce6fd2438323149c723408f0f599ca7c688eab
2017-12-18tdf#90626 PPTX: Fix image bullet sizePaul Trojahn
This solution comes with a few limitations. The bullet isn't centered in Powerpoint and has to be between 25% and 400% of the size of the first character in the paragraph. This isn't optimal, but should produce acceptable results under most circumstances. Change-Id: I6c37169282aa351b81d78e06678424203b78f6d7 Reviewed-on: https://gerrit.libreoffice.org/44911 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-12-18tdf#108580: integrate vc_redist.exe into MSIMike Kaganski
... in InstallUISequense. Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe and/or vc_redist.x86.exe. Use --without-vcredist-dir (or --with-vcredist-dir=no) if you don't want to ship it as part of installer and want to silence the configure warning. VCRedist 2015 version 14.0.24215.1 is available at https://www.microsoft.com/en-us/download/details.aspx?id=53840 Since VisualStudio 2015, VC redist merge module that we used before started to work differently: it installs the UCRT only on WinXP, but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10 has it out of the box). The merge module only installs VCRuntime on those systems, which still leaves us with "api-ms-*.dll is missing" problem. (https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/ gives more information on VCRedist refactoring background.) Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a workaround described at the page mentioned above as "App-local deployment of the Universal CRT". We just copy all UCRT DLLs to LibreOffice/program. This has a drawback though, that our UCRT is not updated by Windows Update, so users would rely on LibreOffice updates in case of some vulnerabilities in UCRT (and they could even not realize they have that problem). MS recommends to install UCRT using EXEs they provide from their site. The EXEs install both VCRuntimes and UCRTs, along with required patches, for all Windows versions (Windows XP through Windows 10, where they only install VCRuntimes); the installed libraries are managed by system's update mechanism. But those EXEs cannot be used in MSI custom actions inside InstallExecuteSequence, because they use MSI themselves. So this patch integrates the vc_redist.xXX.exe into MSI binary table, and uses custom action to run the EXE after ExecuteAction in InstallUISequence. This will show the user a VCRedist install window after the main LibreOffice installation finishes; no user interaction is required (except for one additional UAC request), and errors are ignored. Since this installation takes care of both VCRuntime and UCRT, we can ultimately drop both the app-local workaround, and vcredist merge module (so VCRuntime would also be updated by system). The former is done here: this reverts commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a. This approach has its drawback: if one wants to use unattended installation (without UI; one example is deployment using ActiveDirectory GPO), then InstallUISequence is not run, and so VCRedist isn't installed. In this case, one should install VCRedist separately. Supposedly this should not be huge problem, because this is the case for many existing applications that need separate VCRedist deployment in these scenarios, and unattended installation is advanced stuff that requires prepared user. A notice would be required in release notes and FAQ, though. Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006 Reviewed-on: https://gerrit.libreoffice.org/46356 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-12-18chart2: When creating objects prevent setting object rects dirtyTomaž Vajngerl
3D objects using a E3dScene are traversing all object in the tree when setting rects dirty. When we are creating objects, setting properties and adding them to the tree we trigger setting rects dirty which slows down considerably - more are added objects, bigger the slowdown gets. So the solution here is to temporary disable setting object rects dirty during creation of objects. Change-Id: Id068cda9cb798d49b75bf4228cf6460f7e98c033 Reviewed-on: https://gerrit.libreoffice.org/46446 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-12-18chart2: Batch changes to properties when creating 3D objectsTomaž Vajngerl
MultiPropertySet doesn't broadcast ItemSets as often as setting each property separately. This can help when we create a lot of 3D objects. Change-Id: I4eb842a5d8c43963bdceee84468593f5f6b47336 Reviewed-on: https://gerrit.libreoffice.org/46445 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-12-18Updated coreChristian Lohmaier
Project: translations 9a856d562ebae5d1ae691ec623cf4ebb23299930 update translations for 6.0/master and force-fix errors using pocheck Change-Id: Ie978deb62c62ea4ad661ea45d155bdd4b0d1f811
2017-12-18loplugin:unnecessaryvirtualNoel Grandin
Change-Id: Icf42fdd40a2cf6cda82254f81a7e389c7bac8558 Reviewed-on: https://gerrit.libreoffice.org/46683 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18partially revert "Use for range loop in sdrhhcwrap (sw)"Noel Grandin
commit 01b64e5f5e3658810c7e66c6577705764ef7e288 managed to drop a fairly important assignment to a class field. Change-Id: I3fc28fd8b6a47e2ed6a363f42876ce57c9f2e5c2 Reviewed-on: https://gerrit.libreoffice.org/46682 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18coverity#1426312 Unchecked return valueCaolán McNamara
Change-Id: I59c65a2fc43e55c445efde351e7bd959f6dfbd04
2017-12-18coverity#1426315 Logically dead codeCaolán McNamara
Change-Id: I61368c5fa5675ac6a9e43642700ae3ea03d2fda9
2017-12-18ofz: Null-derefCaolán McNamara
Change-Id: Ice265d7c868b44c6673f3960dffc227d8352ccd0
2017-12-18clear the data provider cache after import, tdf#111960Markus Mohrhard
This might also fix some problems with normal ODS files and not just with FODS files when we recompile formulas after the whole import. Change-Id: Iec05d2052ca5ce3bdf03abf02d502e4537fd3082 Reviewed-on: https://gerrit.libreoffice.org/46672 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-12-18tdf#113928 More handling of SID_READONLYDOCMaxim Monastirsky
At least the second change makes a difference when attempting to switch to read only mode, when there are unsaved changes (by either choosing "Save" or "Don't Save"). Change-Id: Ic46b7f9b18900dd7ce83144be0319d6062cef6c8 Reviewed-on: https://gerrit.libreoffice.org/46671 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2017-12-18loplugin:unusedindexMike Kaganski
Change-Id: I256a807dd2a4c81126b5a76f3d472e31b8224146 Reviewed-on: https://gerrit.libreoffice.org/46652 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18convert EEHorizontalTextDirection to scoped enumNoel Grandin
Change-Id: Icb7298742ae80fa17d5e6f6a3a09a6bb30892b6d Reviewed-on: https://gerrit.libreoffice.org/46590 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18convert HyperLinkPageType to scoped enumNoel Grandin
Change-Id: I9554cdee56c7079ed8633ffb16074c99d5ab144e Reviewed-on: https://gerrit.libreoffice.org/46588 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18convert ColorPickerMode to scoped enumNoel Grandin
and drop unused Add constant Change-Id: I4e4f0d35e4d081883b78e0205ffd7086c9cadf04 Reviewed-on: https://gerrit.libreoffice.org/46587 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18sal_uIntPtr->size_t in ObjOrderChangedNoel Grandin
to match the other position parameters used in SdrObject Change-Id: I100f4fb99f902bb6261b5470dd6b5553aefd764d Reviewed-on: https://gerrit.libreoffice.org/46586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-18Handle merged cells.Kohei Yoshida
Change-Id: Iaa7194d4226300e495982bb1f90f72c31d748955 Reviewed-on: https://gerrit.libreoffice.org/46660 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Remove unused method.Kohei Yoshida
Change-Id: Idc7919f04898b0298d6448d2dd84222b211cf5db Reviewed-on: https://gerrit.libreoffice.org/46659 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Take into account the fact that ScDocument already has one sheet.Kohei Yoshida
ScDocument already has one sheet upon creation, so we need to avoid appending sheet when the request is for the first sheet. Change-Id: Ie5526d6791e545f5faa0bf3f16988351c09e94c8 Reviewed-on: https://gerrit.libreoffice.org/46658 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18All the other orcus-based filters should take the same code path.Kohei Yoshida
Change-Id: Iac96c6eb842a769d70c3f39830cbdb0e1ee93dc8 Reviewed-on: https://gerrit.libreoffice.org/46657 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Remove code duplicates.Kohei Yoshida
Change-Id: I424e5999ef2ec6e71f6b6361ed91079b8d949555 Reviewed-on: https://gerrit.libreoffice.org/46656 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Initial step on enabling the orcus-based Excel 2003 XML filter.Kohei Yoshida
Still some work remains in the orcus interface implementation code in sc. Change-Id: Idc4d95b489e8e55fbe3593557399610abe6c4ae0 Reviewed-on: https://gerrit.libreoffice.org/46655 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-12-18Unit test for implicit intersection with shared formulas, tdf#114251 relatedEike Rathke
Change-Id: I8c11c2719b9496fd33194a7a9906e53f23f38f66 Reviewed-on: https://gerrit.libreoffice.org/46648 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-12-17tdf#113928 Add uno:ReadOnlyDoc command.Gulsah Kose
That uno command is opposition to uno:EditDoc command. Change-Id: I34977a46c274574e8e44097a16c0fa8972d68559 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/45005 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>