AgeCommit message (Collapse)AuthorFilesLines
2018-05-22Open template read-onlydistro/collabora/lov-6.0.4Tor Lillqvist1-1/+3
Otherwise when creating a new docuent based on a template, the template document file is opened read-write eventually (after first being opened read-only five times, and closed again...). Sure, LibreOffice probably doesn't actually write anything to it, but still, just opening read-write when you are going to only read is silly. Stack trace from the read-write opening: #0 0x00007f063dea0047 in openFilePath(char const*, void**, unsigned int, unsigned int) (cpFilePath=0x7ffeacc7d610 "/ssd1/lo/fedora/instdir/share/template/common/officorr/", pHandle=0x342af78, uFlags=3, mode=438) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1039 #1 0x00007f063dea027b in openFile(_rtl_uString*, void**, unsigned int, unsigned int) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3, mode=4294967295) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1071 #2 0x00007f063dea01a8 in osl_openFile(rtl_uString*, oslFileHandle*, sal_uInt32) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1050 #3 0x00007f060aec5f1a in osl::File::open(unsigned int) (this=0x342af78, uFlags=3) at /ssd1/lo/fedora/include/osl/file.hxx:975 #4 0x00007f060aec5a8f in fileaccess::ReconnectingFile::open(unsigned int) (this=0x342af78, uFlags=3) at /ssd1/lo/fedora/ucb/source/ucp/file/filrec.cxx:50 #5 0x00007f060aee0324 in fileaccess::XStream_impl::XStream_impl(rtl::OUString const&, bool) (this=0x342af10, aUncPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/", bLock=true) at /ssd1/lo/fedora/ucb/source/ucp/file/filstr.cxx:58 #6 0x00007f060aee8bac in fileaccess::TaskManager::open_rw(int, rtl::OUString const&, bool) (this=0x2c5ded0, CommandId=231, aUnqPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/", bLock=true) at /ssd1/lo/fedora/ucb/source/ucp/file/filtask.cxx:766 #7 0x00007f060ae9ba9b in fileaccess::BaseContent::open(int, com::sun::star::ucb::OpenCommandArgument2 const&) (this=0x3428810, nMyCommandIdentifier=231, aCommandArgument=...) at /ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:937 #8 0x00007f060ae99dfa in fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&) (this=0x3428810, aCommand=..., CommandId=231, Environment=uno::Reference to (ucbhelper::CommandEnvironment *) 0x341d088) at /ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:331 #9 0x00007f060ae9d001 in non-virtual thunk to fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&) () at /ssd1/lo/fedora/instdir/program/../program/ #10 0x00007f06337395da in ucbhelper::Content_Impl::executeCommand(com::sun::star::ucb::Command const&) (this=0x3427f70, rCommand=...) at /ssd1/lo/fedora/ucbhelper/source/client/content.cxx:1258 #11 0x00007f063373be55 in ucbhelper::Content::openWriteableStream() (this=0x7ffeacc7f030) at /ssd1/lo/fedora/ucbhelper/source/client/content.cxx:751 #12 0x00007f06333f56c0 in utl::MediaDescriptor::impl_openStreamWithURL(rtl::OUString const&, bool) (this=0x7ffeacc801d0, sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/", bLockFile=true) at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:666 #13 0x00007f06333f3e01 in utl::MediaDescriptor::impl_addInputStream(bool) (this=0x7ffeacc801d0, bLockFile=true) at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:521 #14 0x00007f06333f4051 in utl::MediaDescriptor::addInputStreamOwnLock() (this=0x7ffeacc801d0) at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:490 #15 0x00007f05b132f0bf in filter::config::TypeDetection::impl_openStream(utl::MediaDescriptor&) (this=0x33caa10, rDescriptor=...) at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:1127 #16 0x00007f05b132e9ac in filter::config::TypeDetection::impl_askDetectService(rtl::OUString const&, utl::MediaDescriptor&) (this=0x33caa10, sDetectService="", rDescriptor=...) at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:981 #17 0x00007f05b132b7a4 in filter::config::TypeDetection::impl_detectTypeFlatAndDeep(utl::MediaDescriptor&, std::__debug::vector<filter::config::FlatDetectionInfo, std::allocator<filter::config::FlatDetectionInfo> > const&, bool, std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> >&, rtl::OUString&) (this=0x33caa10, rDescriptor=..., lFlatTypes=std::__debug::vector of length 168, capacity 256 = {...}, bAllowDeep=true, rUsedDetectors=std::__debug::vector of length 1, capacity 1 = {...}, rLastChance="") at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:934 #18 0x00007f05b1329b7c in filter::config::TypeDetection::queryTypeByDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, unsigned char) (this=0x33caa10, lDescriptor=uno::Sequence of length 6 = {...}, bAllowDeep=1 '\001') at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:429 #19 0x00007f05b132d321 in non-virtual thunk to filter::config::TypeDetection::queryTypeByDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, unsigned char) () at /usr/bin/../lib/gcc/x86_64-redhat-linux/8/../../../../include/c++/8/bits/stl_pair.h:331 #20 0x00007f060df5acdd in framework::LoadEnv::impl_detectTypeAndFilter() (this=0x7ffeacc80c48) at /ssd1/lo/fedora/framework/source/loadenv/loadenv.cxx:739 #21 0x00007f060df58796 in framework::LoadEnv::startLoading() (this=0x7ffeacc80c48) at /ssd1/lo/fedora/framework/source/loadenv/loadenv.cxx:357 #22 0x00007f060df57280 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (xLoader=uno::Reference to (framework::Desktop *) 0x282bf98, xContext=uno::Reference to (cppu::ComponentContext *) 0x145b790, sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/", sTarget="_default", nFlags=0, lArgs=uno::Sequence of length 4 = {...}) at /ssd1/lo/fedora/framework/source/loadenv/loadenv.cxx:160 #23 0x00007f060dfaef40 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (this=0x282bf20, sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/", sTargetFrameName="_default", nSearchFlags=0, lArguments=uno::Sequence of length 4 = {...}) at /ssd1/lo/fedora/framework/source/services/desktop.cxx:617 #24 0x00007f060dfaeffb in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) () at /ssd1/lo/fedora/include/rtl/stringutils.hxx:170 #25 0x00007f06381ee762 in SfxTemplateManagerDlg::OpenTemplateHdl(ThumbnailViewItem*) (this=0x310e160, pItem=0x33925d0) at /ssd1/lo/fedora/sfx2/source/doc/templatedlg.cxx:690 Change-Id: Iaa5cc2bd4c80bc239b8f1bf7ed8aa62d89151d62
2018-05-18Use Tango as default icon theme when Breeze is not includedTor Lillqvist1-0/+6
Change-Id: Id81c2355abfbdf29599842f06ad8b3c754db708b
2018-05-04Version, tag libreoffice- Lohmaier3-0/+0
Change-Id: Ib4fa2dcb0456449c96ddd0beacc65d872cb27905
2018-05-04bump product version to Lohmaier1-1/+1
Change-Id: If98bb41789a59d20eb382dd26730a0a58e481861
2018-05-04update creditsChristian Lohmaier1-765/+779
Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51 (cherry picked from commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce) (cherry picked from commit 46b49b0f3f539d9a8645c6447a8c4b2e0b463cac)
2018-05-04update creditsChristian Lohmaier1-1978/+2026
Change-Id: Ibed24e2bc2d246bc1f54bd42a354c3aced1adbb6 (cherry picked from commit e70343cd26b5d56e20e77118fe2f576e8eaa9cec) (cherry picked from commit b87bb66ae30cf99b57408939a1523bbe61963300)
2018-05-04Updated coreChristian Lohmaier1-0/+0
Project: translations 04deccf23ffd036da3c85079d34aa41749f5a801 update translations for 6.0.4 rc2 and force-fix errors using pocheck Change-Id: I07ccad5e9307bdbc75778efe4cba01a5e82f84d4 (cherry picked from commit adb3b92c5d9fff53ba638017eda2a2536ff8beb4)
2018-05-02Resolves: tdf#116939 cater for the last cols col incremented by ExcelEike Rathke1-0/+7
Change-Id: I48c4b9afb4cf2cb826ae2bb52067256e7fcb2c83 (cherry picked from commit b78ab482911356ef282f7fd40a4509320608a203) Reviewed-on: Reviewed-by: Markus Mohrhard <> Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>
2018-05-02fix build with poppler 0.64Rene Engelhard2-0/+14
GooString became const... Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 Reviewed-on: Reviewed-by: Adolfo Jayme Barrientos <> Reviewed-by: Michael Stahl <> Reviewed-by: Christian Lohmaier <> Tested-by: Christian Lohmaier <>
2018-05-02Merge in Flatpak improvementsStephan Bergmann1-1/+3
...from <>: commit 715fbcfb4e5c51d40387998932984e54639476a1 Author: Robert McQueen <> Date: Tue Apr 17 10:26:32 2018 +0100 edit .desktop files to add X-Endless-Alias with original names Endless OS uses this to update icon grids & taskbar pins if the original files have been removed. (Happy to update this to a more standardised key if a consensus emerges.) Change-Id: I646350090c38d84d1930c5afbec0ee500b60d0fb (cherry picked from commit a161e41439fc6f9093c212a523154e5146bb1502) Reviewed-on: Reviewed-by: Michael Stahl <> Reviewed-by: Adolfo Jayme Barrientos <> Reviewed-by: Christian Lohmaier <> Tested-by: Christian Lohmaier <>
2018-04-26tdf#117129 ww8import: prevent divide-by-zeroJustin Luth2-1/+2
Before commit ffc3358515799057e72379b76a1165c6ea5a9bd1 for tdf#75539, the divisor was hard-coded at 1000. The preceeding code also notes that an undefined relativeWidth is forced to 1000. So, on an invalid divisor, revert to previous behaviour. Change-Id: I40210194eec39682d9ab3ce68268d343af16e2b1 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 9b55701b88c42cac491587072f1f09522207de77) Reviewed-on: Reviewed-by: Justin Luth <> Tested-by: Justin Luth <>
2018-04-26tdf#113377 cui personalization: fix calling into VCL without necessary lockingMiklos Vajna1-2/+4
We assume the SolarMutex is always taken when doing GL calls, but putting DBG_TESTSOLARMUTEX() into WinOpenGLContext::makeCurrent() pointed out two places in the persona code where this invariant wasn't hold, fix those. Opening the dialog and downloading previews of one category, then clicking on an other button to download previews of an other category no longer results in a crash while calling glBindFramebuffer() with this. (cherry picked from commit 336d91a6f2bc12ff0342f984cdbb2cf64abd0b56) Change-Id: Ib8148a709f89c2dc44da102e2023cc61ba890744 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 980e19ddddaf46dae68c800d55582e8f6b2c7fdd) Reviewed-on: Reviewed-by: Michael Meeks <>
2018-04-24Related: tdf#116274 ignore the one excess cols definition's last columnEike Rathke1-0/+7
<cols> ... <col min="5" max="16384" width="31.75" style="3"/> </cols> may be present even if there isn't any content. Apparently used with pageBreakPreview to grey out the area. Change-Id: I6a79f9ec692ec07b02f4b4205ccd0cf3cf9f363f (cherry picked from commit 16265dcdb21d7cf69c65c2a84f1d21a5d8574dd4) Reviewed-on: Reviewed-by: Markus Mohrhard <> Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>
2018-04-17bump product version to Lohmaier1-1/+1
Change-Id: I1f2fdf570ea3eef61bf62341d8014c50f8bb9834
2018-04-17Branch libreoffice-6-0-4Christian Lohmaier4-1/+1
This is 'libreoffice-6-0-4' - the stable branch for the 6.0.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.0.x release, please use the 'libreoffice-6-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ie6e4b00627fc29c246ef0044b7e9f3b8b8dc658e
2018-04-17Updated coreChristian Lohmaier1-0/+0
Project: translations d42511d49b23ede170624557f8674303b7ab116b update translations for 6.0.4 rc1 and force-fix errors using pocheck Change-Id: Ib90d986cfad20954583a265574abe54c9b8a50bf
2018-04-17tdf#117033 - Tooltips show the wrong symbol for MOD3 combinationsheiko tietze1-6/+6
Symbol for MOD3 added Change-Id: Idb76199fbff240fe39c96ed837db098a4283d70b Reviewed-on: Reviewed-by: Tor Lillqvist <> Tested-by: Tor Lillqvist <> Tested-by: Jenkins <> (cherry picked from commit e422efcaff1bf789343a73a16e46b00f303e3032) Reviewed-on: Reviewed-by: Heiko Tietze <>
2018-04-17Resolves: tdf#116003 check presence of subtotal in group, tdf#107267 follow-upEike Rathke1-3/+11
Change-Id: Ifed6e28926c689dd17914b8b1cbf47b58e2ffcdc (cherry picked from commit f50e370db8f7ae20b12e312ad89a0f9961b7ee7a) Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <>
2018-04-17tdf#116486 Consider upper margin in paragraph positioning with flysPatrick Jaap3-0/+18
The problem was the following: There is a paragraph with an upper margin defined. Also, there is a flyframe intersecting this upper margin. The desired behavior is to reposition the parapgraph, such that it (including it's upper margin) is located below the flyframe. This patch increases the bounding rectangle of the paragraph by the upper margin. For compatibility, there is a compat-flag query. I re-used a related one. Change-Id: I9dbc75e07e2ba0658fdbbfa9989be24a68660713 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <> (cherry picked from commit d07fc485d46f431405a3f6a002f951a08c559677) Reviewed-on:
2018-04-17Revert "sw-table-join-fix-i99267.diff:"Michael Stahl1-4/+0
This reverts commit 6b1204329ad365a46214472bcff335e63c51bdf4. The comment has nothing to do with the code around it, and it turns out the commit is utter nonsense: The actual intended change was done in CWS sw32bf02 at a different place in SwTabFrame::MakeAll(), see commit 4439427aadeaa0cb611011b46f0fa14bfa196f33. This was then apparently extracted as a patch and added to ooo-build: And then there was a rebase on top of a DEV300 that includes the CWS and that moved the patch to apply in this incorrect location: Change-Id: I89db4ea0d1b06450c8fd8618cc824612e225fffe Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <> (cherry picked from commit 8885ffd9702f72047d9fc94c82ee57221e4e927c) Reviewed-on: Reviewed-by: Miklos Vajna <>
2018-04-16Resolves: tdf#116138 insert special char problem in chapter numberingCaolán McNamara1-1/+1
Change-Id: If79d23d7c5e99a88d0026295db002c25c1b07ff3 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <>
2018-04-16ofz#7648 Bad-castCaolán McNamara1-1/+1
Change-Id: I21aaf36f3d6b6c3054649208de809b99aa384c01 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <>
2018-04-16Resolves: tdf#116865 trigger pending sizing timers before arrangingCaolán McNamara2-1/+24
trigger pending sizing timers now so we arrange with the final size of the client area Otherwise calling GetSizePixel in the Arranging loop will trigger the timers anyway, causing reentry into Arrange_Impl again where the inner Arrange_Impl arranges with the final size, and then returns to this outer Arrange_Impl which would rearrange with the old client area size. Change-Id: Ibc2b97f679ceaa0a825cee015576f403703a5f9e Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <>
2018-04-13tdf#108580 related: Check for SP level of the minimal supported OSMike Kaganski4-3/+6
Currently we support Win7 SP1 and later; so let installer fail on lower SP levels. Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Mike Kaganski <> (cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2018-04-13Related: tdf#100925 background not getting set under X sometimesCaolán McNamara1-1/+6
not sure why this is the case, but it is reminiscent of rhbz#1283420 which results in missing glyphs in some circumstances X11CairoTextRender::getCairoContext has a hack in it for that problem, whic forces a read from the underlying X Drawable before writing to it which seems to have the effect of syncing it up. So, just before drawing the bg, draw a glyph on it to get it synced, and then overwrite it. Change-Id: I2ffff7e8e989b91821869d8b75a59728ac513d1b Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Eike Rathke <>
2018-04-13Resolves: tdf#116813 Height/Width swappedCaolán McNamara1-2/+2
Change-Id: I9b41a4b65fda895ed73fa346fb0b8e13df010706 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Eike Rathke <>
2018-04-13tdf#116925 sw: consider fill styles of shape for in-textbox auto colorMiklos Vajna3-1/+47
Automatic color is determined in SwDrawTextInfo::ApplyAutoColor(), but it uses this function to determine the background color. Be consistent and consider the same background in both the shape-with-editeng-text and shape-with-sw-text cases. (cherry picked from commit f966767e1ccfa432da33e1a0fd6de69e17a36bc3) Change-Id: I52249a908193765bc128789d96187af334c1017c Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-13After Java settings have changed, restart LibO for realKatarina Behrens5-12/+49
Previously restart LibO dialog was shown, but did nothing. I haven't found an easy way to close all frames with 3 modal dialogs opened, so now restart dialog simply pops up later (after user bonks OK button on Tools > Options dialog) Change-Id: I6e61fa1fc41199c2f16cb80da771202c255f3810 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Katarina Behrens <> (cherry picked from commit 683a68cb5106e99db0fbe892b5784d837cf8cb27) Reviewed-on: Reviewed-by: Noel Grandin <> Reviewed-by: Thorsten Behrens <>
2018-04-12tdf#115806: Remember last active deck also on context switchKatarina Behrens3-1/+11
within 1 application Change-Id: Icab6dea9f9a7895732c41e6d96b9d4546cf0001f Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Katarina Behrens <> (cherry picked from commit 10e4528e8cb9818e7b8fcef8b1e96985f8b28640) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2018-04-12tdf#116563: floating windows must get input focus at some pointKatarina Behrens1-9/+5
This partially reverts commit bb6a8dce405bd0f and means we need a different solution for tdf#48300 on X11-based Linux frontends. Send _NET_ACTIVE_WINDOW signal only if we want to activate window that has been minimized (ToTopFlags::RestoreWhenMin) or covered by other windows (ToTopFlags::ForegroundTask). Change-Id: I529baf6cc1174728b54bae4c658cf95631da19d6 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Katarina Behrens <> (cherry picked from commit 0db4e7f60c92313327ae5b1e4307ed4fedfaa6f5) Reviewed-on: Tested-by: Xisco Faulí <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2018-04-12tdf#50057 sw: fix duplication of at-paragraph anchored flysMichael Stahl6-9/+644
The problem is that the flys that are anchored to the first paragraph of a SwRedline do get copied by SwRangeRedline::CopyToSection(), but they don't get deleted by DelCopyOfSection(). Copying is enabled because the setting of the SetRedlineMove() was made conditional in commit 65de5382a389cc7edf1cdf506da4fb43a4d33a9f "#100619# fixed problem with hiding deleted graphics", which isn't justified in any way and which i can't imaginge a good reason for, given that the flys anchored in the first paragraph are all skipped in DelFlyInRange(), so why would you want to copy them; hence this reverts that commit. The interesting check for the redline_fly_duplication_at_para_end_inside case is actually the one that was added in commit 23e52c207760c596cc2f841ef59f3100c110d591 Change-Id: I96fb294a5456e7f1172a5f408ebcb21cf211c276 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <> (cherry picked from commit 7db137e87177dbe381186491ca36e3e8fd62ddc2) Reviewed-on: Reviewed-by: Miklos Vajna <>
2018-04-11tdf#116830 sw: handle cell background for BACKGROUND_PARA_OVER_DRAWINGSMiklos Vajna5-1/+144
Commit 18b3feb8bef06bf7b126fd0bc743e19479cb8026 (n#778133 sw: add BackgroundParaOverDrawings compat flag, 2012-09-12) added a layout compat flag that is meant to make Writer behave the same as Word when it comes to the order of various backgrounds. The original fix was that in case there are background shapes and also paragraph backgrounds, then this flag can opt in to have the paragraph backgrounds on top of background shapes. Cell backgrounds behave the same way in Word, so extend the behavior of the compat flag to cover not only the background of text frames but also of cell frames. (The test could be hacked into CppunitTest_sw_uiwriter, but 1) this is layout, not UI and 2) that one started to get rather large.) (cherry picked from commit 09954c381895f340c9b73af64b0833d8b4689c06) Change-Id: Ifca1851217000f6daac50e6c9562c042aca6ff7d Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-11tdf#116555 filter: make sure default extension for HTML is not .xhtmlMiklos Vajna1-1/+2
Since by default we don't write XHTML markup in the sw HTML export. (cherry picked from commit 87e7fd163bc587b5c7cbb59ba40a9856f8bb225d) Change-Id: Ifbf9850652d7838582725be391b2fd1a062495e5 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-11tdf#116890: make unique column names in prepared statementJulien Nabet1-0/+7 we do resultset. Thanks to Lionel for this solution Reviewed-on: (cherry picked from commit dc823f5fa4a5d2eca56297b9045e5962536c00f9) Change-Id: I44f307cd6bddf76716d7c73b8783070abe43bdf3 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Lionel Elie Mamane <>
2018-04-10tdf#116772 adapt handling of LIKE conditions to cleaned up StructuredFilterLionel Elie Mamane2-2/+73
Change-Id: Ifc60da9a95833ee7820a0e03354fa1a8c006e136 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <>
2018-04-10SQL string quoting: escape "'" character also at beginning of stringLionel Elie Mamane1-1/+1
Change-Id: I51db43c1a3b6d3c93a04a3419238ea286cab987e Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Miklos Vajna <>
2018-04-10tdf#116536 Fix bullet position with linespacing > 100Szymon Kłos2-8/+5
Change-Id: I862246d9c69e754bdd883787fe42c7d61a1a53d3 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Szymon Kłos <> (cherry picked from commit 596fd41b9b19e28bab0c84e3821f79cb5d468f24) Reviewed-on: Reviewed-by: Miklos Vajna <>
2018-04-10tdf#116410 DOCX import: restrict increased object spacing to multiple shapesMiklos Vajna5-0/+16
This anchored object handling is just there to be bug-compatible with Word, it's not needed for the case when there is a single shape in the paragraph. (cherry picked from commit 2c4d84e93901571ead79c85aa3894ef4e10bf5af) Also: Related: tdf#115719 DOCX import: fix ignore of increased anchored obj spacing If there is only a single anchored object, then ignore only the current paragraph, not all paragraphs of the section. (cherry picked from commit 599ff05300599d4e4ce818092f18e76e738b921e) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx Change-Id: I5e3dc4ba9a4a6f459ec6217e8974ebc2d7303bcc Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2018-04-10tdf#115407: preselect sound file savedJulien Nabet1-3/+5
To display the sound in the dropbox, the complete filename (eg: file:///home/julien/lo/libreoffice/instdir/share/gallery/sounds/pluck.wav) was compared with items of the sound list formed like this: file:///home/julien/lo/libreoffice/instdir/program/../share/gallery/sounds/pluck.wav See Since listbox displays only basename, let's just compare basenames Change-Id: I5fb49990322423fa7818e5d6e1cafd828e3500ec Reviewed-on: (cherry picked from commit 23c82e1a377ea6fce65d71277ec59b3ca150b98a) Reviewed-on: Reviewed-by: Noel Grandin <> Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2018-04-10Merge in Flatpak improvementsStephan Bergmann3-15/+56
...from <>: commit 7a2393f5fcab8c6938180c4718f2c61acd495528 Author: Robert McQueen <> Date: Tue Apr 3 10:41:22 2018 +0100 port to 1.6 runtime Gtk+3/GIO/etc dependencies used by LO in "GNOME" mode are actually included in the runtime. Try to build against fd.o by downgrading gst-libav (fd.o has gst 1.10 rather than gnome's 1.12), bundling dbus-glib and disable Gtk+ 2. commit 42650da01f270e86bfb40035a9194b23ccf24c4c Author: Robert McQueen <> Date: Tue Apr 3 11:23:27 2018 +0100 fix up LD_LIBRARY_PATH with gcc7 Append to library path rather than resetting it (causes build failures due to overriding /app/lib). commit 3e4c655294c8124cb54e1c651ec4dc1230b8151e Author: Robert McQueen <> Date: Tue Apr 3 11:25:02 2018 +0100 fixup solenv/bin/ Use mkdir -p to be robust to other modules (ie dbus-glib) creating some of the paths before we do. commit d1d449ffa837b1de876f524494dbce09ec92ce73 Author: Robert McQueen <> Date: Wed Apr 4 15:50:49 2018 +0100 split resource/registry data into Locales extension Move the language-specific data into the /app/share/runtime path which flatpak-builder splits into the Locale extension if we re-enable separate-locales. We symlink the original locations back to these paths, which means we have dangling symlinks depending on which Locale sutpaths are installed. Include Stephan Bergmann's patch from to make the configmgr robust to such dangling links. commit ad6674f166c68fb79e19d80950a104a0a33f81dc Author: Robert McQueen <> Date: Wed Apr 4 16:05:28 2018 +0100 make locale split glob more specific This loop will fail if the share/registry/res folder gains any .xcd files which are not named fcfg_langpack_* or registry_* so just to be safe, only glob these files. Change-Id: Icd41d7077b9f308dbb196927715b210328709662 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Stephan Bergmann <> (cherry picked from commit 727bfa2c87db170483c1e4ae895174295b070c77) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2018-04-10forcepoint#37 revert tdf#108572 let remove storage elementCaolán McNamara2-2/+0
reverts commit 26957fc325c27cf61e8ef5555b380d627def4931 Date: Wed Sep 6 10:54:50 2017 +0200 tdf#108572 let remove storage element void OStorage_Impl::RemoveElement( SotElement_Impl* pElement ) expects that m_pAntiImpl will be nullptr, if not throws an exception. This caused that in case of deleting embedded database used for mail merge it wasn't fully removed and The problem is that by allowing the removal of the element, existing readonly accessors are left pointing to the deleted element which causes quite some problems as seen in this sample document Change-Id: Ie6ac36e6dea771b02637d77b78eb8026e3bb7ae8 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-10ofz#7109 infinite regressCaolán McNamara4-6/+17
Change-Id: Iac0bd81c9b0e3ac6b005bb0065895ca1b4ca4233 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-10fix global-buffer-overflow found through UI testing on UBSAN jenkins jobMarkus Mohrhard1-1/+1
Change-Id: Ie4d81561057bb4d67fe050ca7fb82861d5d207a2 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Markus Mohrhard <> (cherry picked from commit c442ac8c20cfceb8c87e96c494dcd8372dc6e206) Reviewed-on: Reviewed-by: Michael Stahl <>
2018-04-10Related: tdf#77919 GetPosPixel() is relative to parent, not grandparentCaolán McNamara1-1/+1
so the tooltip rectangle is wrong and doesn't shown under mutter we could use pCtrl->OutputToScreenPixel(Point(0, 0)) here too Change-Id: I75a717127ad75a4aac2cb9c22e526419f798ea99 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-09tdf#116706 fix for AGGREGATE with hidden rows and single references.Winfried Donkers2-4/+42
Change-Id: I6ac88f26b46a17e1857b7b40d2034fb321973625 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Jenkins <> (cherry picked from commit 0a4c1fb68c3619e61099a7c548f550b0d3fd7a53) Reviewed-on:
2018-04-09Return correct length for Authority tokenMatteo Casalin1-17/+16
Regression from f4fd558ac9d61fe06aa0f56d829916ef9e5ee7b9 Take the chance to calculate token prefix just once. Change-Id: I19ce5cb037198cb918e79c760a92b285f9b725f1 (cherry picked from commit 34b98af8e5a4e568d8316700bea1ce604d825ce8) Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <>
2018-04-08Fix regressions from d727476cff29382a34103b137542e15e1aeeb4b9Julien Nabet1-3/+12
Calls to statusChanged may call addStatusListener or removeStatusListener so copy m_aStatusListenerVector on stack and iterate on the copy Thank you Michael for having pointed these Change-Id: I8399db84874d7f68e24c57891a9ab408e7ebef78 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Noel Grandin <> (cherry picked from commit 8fced3ec9ff6f55a6e0b939183cf33b6c3c4a1db) Reviewed-on: Reviewed-by: Michael Stahl <>
2018-04-07Add export of the side wall for 3D chart, during .xlsx exportBartosz Kosiorek1-6/+12
LibreOffice doens't distinguish between sideWall and backWall. It is controlled by the same Wall property. Change-Id: If1919cf0a9bad3e80544cc5b2ae0f40f606febeb Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Bartosz Kosiorek <> (cherry picked from commit ff63bae0133e3b90b32af88a4307fb4f5dafd95f) Reviewed-on: Reviewed-by: Markus Mohrhard <>
2018-04-07tdf#114168 If minor axis unit is automatic, then set it to 5Bartosz Kosiorek4-16/+39
Based on OOXML implementation in MS Excel, if Minor axis Unit is set to automatic, then during chart import, LibreOffice should set Interval Count to 5, to mimic behaviour of MS Excel. Becaues default Interval Count for LibreOffice is 2, we need to override it to 5. With that solution, the Minor axis unit is preserved also after saving to .ods file format. During .xlsx export, if Interval Count is set to 5, then treat is as automatic axis unit. Change-Id: Iab9209fb3950ef73e79229329606363b528d35fe Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Bartosz Kosiorek <> (cherry picked from commit 274825b4180c81540cd0d1b22c5243f1b39fe4db) Reviewed-on: Reviewed-by: Markus Mohrhard <>
2018-04-07tdf#114139 Don't export Plot Area shape property fot 3D chartsBartosz Kosiorek1-1/+5
For 2D charts Plot Area equivalent is Chart Wall. Unfortunately LibreOffice doesn't have Plot Area equivalent for 3D chart. It means that Plot Area couldn't be displayed and changed for 3D chars in LibreOffice. We cannot write Wall attributes into Plot Area for 3D charts, because Wall us used as background wall. Change-Id: I16d3b326571c1e411a094ec799e20c7aeeb2c1d4 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Markus Mohrhard <> (cherry picked from commit 5b9e76557d2b5c835a5873de1ce530f36ea98d2d) Reviewed-on: