summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-05-02bump product versionto 6.1.6.3.0+libreoffice-6-1-6Christian Lohmaier1-1/+1
Change-Id: Ia3540373c2e364f5819845d6c323d94e4c8840c8
2019-05-02libpng: upgrade to release 1.6.37Michael Stahl1-2/+2
Fixes CVE-2019-7317. Change-Id: I3374f5cbd6552e2c1569d63ee680d0c1d9389621 Reviewed-on: https://gerrit.libreoffice.org/71663 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e2abbc0062398ea67cb13cb5b0b7bfdce78e652c) Reviewed-on: https://gerrit.libreoffice.org/71670 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-05-02Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-1-6' - update translations for 6.1.6 rc3 and force-fix errors using pocheck Change-Id: I360802d2255a94fe829e15b72f8f388445e8b740 (cherry picked from commit e1047f2e97de220159c6f82ee927dbc0e0b63021)
2019-04-30ofz#14469 null derefCaolán McNamara1-1/+3
since... commit af84fc9d906626255aaf136eefc5e55236e0e8a6 Date: Tue Apr 23 15:48:41 2019 +0200 lazy image loading shouldn't read the entire .xls file (tdf#124828) nLength is just an unchecked value in the dff stream, it might not be sane so limit it to the max len of the stream Change-Id: Ia8a2830478952afe1317b5cd795f35059d9b380a Reviewed-on: https://gerrit.libreoffice.org/71415 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-04-25bump product version to 6.1.6.2.0+Christian Lohmaier1-1/+1
Change-Id: I86d97d3baa4d4372ef6c6807c024b8de591ca0e6
2019-04-25update creditsChristian Lohmaier1-1267/+1293
Change-Id: I28e8d8e4ab940ae838fc555702b5580dc76931dd (cherry picked from commit 982137545d5263bfcc28e896708ec851b8bcce99) (cherry picked from commit d907fdc4e8170ac393f79ab2f4958e7a4cad27fa)
2019-04-25lazy image loading shouldn't read the entire .xls file (tdf#124828)Luboš Luňák3-4/+9
b11188835d3b87cd changed msfilter to use GraphicFilter::ImportUnloadedGraphic() to lazy-load images from the document. However, that function in some cases simply reads the entire rest of the passed SvStream, which in this case is the entire .xls file. And the document from tdf#124828 is ~50MiB and contains ~4000 images => 100+ GiB memory required. Reviewed-on: https://gerrit.libreoffice.org/71136 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit af84fc9d906626255aaf136eefc5e55236e0e8a6) Reviewed-on: https://gerrit.libreoffice.org/71221 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: I74926383204ec642eabb28b62e2cf2e1ff8054a9 Reviewed-on: https://gerrit.libreoffice.org/71225 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit cf01389718fb2ef84697542d69a7ee2c25e544fc) Reviewed-on: https://gerrit.libreoffice.org/71239 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-04-24Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-1-6' - update translations for 6.1.6 rc2 and force-fix errors using pocheck Change-Id: I7c4591cb55c5fcb546a66c128a0027b807f76a47 (cherry picked from commit 0826186d866cf27a320914b2fe01090aa0647477)
2019-04-23libxslt: add patch for CVE-2019-11068Michael Stahl2-0/+121
Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4 Reviewed-on: https://gerrit.libreoffice.org/70879 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e) Reviewed-on: https://gerrit.libreoffice.org/70894 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d) Reviewed-on: https://gerrit.libreoffice.org/71024 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-12bump product version to 6.1.6.1.0+Christian Lohmaier1-1/+1
Change-Id: I710a3d5395f7e61fa3ba7bb416047488eccd2151
2019-04-12Branch libreoffice-6-1-6Christian Lohmaier4-1/+1
This is 'libreoffice-6-1-6' - the stable branch for the 6.1.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.1.x release, please use the 'libreoffice-6-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I268d0c5fbf983130a8e469366985236c8b744a05
2019-04-12Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-1' - update translations for 6.1.6 rc1 and force-fix errors using pocheck Change-Id: I93b2e74257e8cc187e118c7be8bcab53d61db5c4
2019-04-12tdf#124503: Support JRE installations with unknown java.vendor propertyStephan Bergmann12-358/+192
After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon Corretto" to our hard-coded list, there is now reports that at least Debian and Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety set to string like "Debian" or "Ubuntu". Instead of trying to catch up with an ever-growing hard-coded list, it is probably better to stop relying exclusively on such a hard-coded list, and for unknown vendor values, try out whether the SunInfo backend (which supports the "generic" OpenJDK) would be able to handle the given JRE. (For simplicity, assume that any versions of such JREs are supported. Our baseline is Java 6, and there are unlikely any older versions of JREs from unknown vendors out there. If this turns out to be problematic, we could include information about problematic vendors after all, or add a general check that JREs from unknown vendors are at least Java 6.) Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to take a vendorSettings parameter instead, and VendorSettings::getVersionInformation has been changed to return a boost::optional, so that unknown vendors can be handled gracefully. Reviewed-on: https://gerrit.libreoffice.org/70460 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3d27b2fa9c5a03f78e5145377402f8a88e3da1be) Conflicts: jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx jvmfwk/source/framework.cxx Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9 Reviewed-on: https://gerrit.libreoffice.org/70587 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-10Resolves: tdf#120754 on undoing an obj insert use its current ordinalCaolán McNamara1-4/+4
there may have been changes not caught by undo to the object's ordinal, so on use of RemoveObject (or ReplaceObject) call GetOrdNum on the object to get its current position within its parent. We can keep nOrdNum for the desired dest position within the parent for InsertObject Change-Id: I3bdabf387dd630fc1fadaaa1f3d8c05e93865e4f Reviewed-on: https://gerrit.libreoffice.org/70409 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-04-09update creditsChristian Lohmaier1-1830/+1888
Change-Id: Ib1d4c660ff8578d86dc2dddb1aeb55b95f127cb8 (cherry picked from commit 9575aa3bba055258977d9a013889aa3acbaecb6a)
2019-04-09update creditsChristian Lohmaier1-1498/+1572
Change-Id: Ia47dbe8d0b8caf835fef50bc8e046d5a05f30b7d (cherry picked from commit a0f3e3b2bf46d99abd0c98327d4e4e2e82c12445)
2019-04-09update creditsChristian Lohmaier1-1573/+1603
Change-Id: Ib5e07977b6dd15b533e94185ecb80d0d6587b7c7 (cherry picked from commit 2a4cba62438de7f3dc2ccc79cd2ee013a99bb990)
2019-04-09Filter out problematic file URLsStephan Bergmann2-0/+155
(cherry picked from commit 7e50e885ebbe130debcd4278a10a4e288655fdfc) Conflicts: shell/source/win32/SysShExec.cxx Change-Id: I87fd37e56326bef4888354b923407530c6f70760 Reviewed-on: https://gerrit.libreoffice.org/70188 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-04-08Related tdf#124329 Handle shapes resizing with the cellSamuel Mehrbrodt1-4/+10
The same as shapes just anchored to the cell. Change-Id: I0ce03e4c650dd10bd89cee87aa26775c32703d06 Reviewed-on: https://gerrit.libreoffice.org/70065 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e587645f551c6c684f9f36606f8fa5e1b06004a1) Reviewed-on: https://gerrit.libreoffice.org/70402 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-08Upgrade to language-subtag-registry-2019-04-03Eike Rathke1-2/+2
Change-Id: I4713b15061e831e1dfeccf8d59e46c0aa2ac4a18 Reviewed-on: https://gerrit.libreoffice.org/70351 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 86015855a98795d00a28f1bb65c41df947563d66) Reviewed-on: https://gerrit.libreoffice.org/70355 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-04-05tdf#123502: Make sure to hold the mutex before releasing itMike Kaganski1-0/+5
Fixes a regression after commit 5b2f1243bd44b450da26c8344b3ee459f8e88f6c The destruction of the dialog is initiated by a callback executed from VCLXButton::ProcessWindowEvent, which notifies listeners, using a call to VCLXWindow::ImplExecuteAsyncWithoutSolarLock. The stack looks like this: ucrtbased.dll!issue_debug_notification(const wchar_t * const message) Line 28 at minkernel\crts\ucrt\src\appcrt\internal\report_runtime_error.cpp(28) ucrtbased.dll!__acrt_report_runtime_error(const wchar_t * message) Line 154 at minkernel\crts\ucrt\src\appcrt\internal\report_runtime_error.cpp(154) ucrtbased.dll!abort() Line 51 at minkernel\crts\ucrt\src\appcrt\startup\abort.cpp(51) comphelper.dll!comphelper::SolarMutex::doRelease(bool bUnlockAll) Line 65 at c:\lo\src\core2\comphelper\source\misc\solarmutex.cxx(65) vclplug_winlo.dll!SalYieldMutex::doRelease(bool bUnlockAll) Line 169 at c:\lo\src\core2\vcl\win\app\salinst.cxx(169) comphelper.dll!comphelper::SolarMutex::release(bool bUnlockAll) Line 89 at c:\lo\src\core2\include\comphelper\solarmutex.hxx(89) vcllo.dll!SalInstance::ReleaseYieldMutexAll() Line 114 at c:\lo\src\core2\vcl\source\app\salvtables.cxx(114) vcllo.dll!Application::ReleaseSolarMutex() Line 548 at c:\lo\src\core2\vcl\source\app\svapp.cxx(548) fps.dll!SolarMutexReleaser::SolarMutexReleaser() Line 1479 at c:\lo\src\core2\include\vcl\svapp.hxx(1479) fps.dll!fpicker::win32::vista::AsyncRequests::~AsyncRequests() Line 84 at c:\lo\src\core2\fpicker\source\win32\asyncrequests.cxx(84) fps.dll!fpicker::win32::vista::VistaFilePicker::~VistaFilePicker() Line 72 at c:\lo\src\core2\fpicker\source\win32\vistafilepicker.cxx(72) fps.dll!fpicker::win32::vista::VistaFilePicker::`scalar deleting destructor'(unsigned int) cppuhelper3MSC.dll!cppu::OWeakObject::release() Line 233 at c:\lo\src\core2\cppuhelper\source\weak.cxx(233) cppuhelper3MSC.dll!cppu::WeakComponentImplHelperBase::release() Line 84 at c:\lo\src\core2\cppuhelper\source\implbase.cxx(84) fps.dll!cppu::PartialWeakComponentImplHelper<com::sun::star::ui::dialogs::XFilePicker3,com::sun::star::ui::dialogs::XFilePickerControlAccess,com::sun::star::ui::dialogs::XFilePreview,com::sun::star::ui::dialogs::XFolderPicker2,com::sun::star::lang::XInitialization,com::sun::star::lang::XServiceInfo>::release() Line 86 at c:\lo\src\core2\include\cppuhelper\compbase.hxx(86) invocationlo.dll!com::sun::star::uno::cpp_release(void * pCppI) Line 48 at c:\lo\src\core2\include\com\sun\star\uno\genfunc.hxx(48) cppu3.dll!cppu::_release(void * p, void(*)(void *) release) Line 86 at c:\lo\src\core2\cppu\source\uno\prim.hxx(86) cppu3.dll!cppu::_destructAny(_uno_Any * pAny, void(*)(void *) release) Line 130 at c:\lo\src\core2\cppu\source\uno\destr.hxx(130) cppu3.dll!uno_any_destruct(_uno_Any * pValue, void(*)(void *) release) Line 131 at c:\lo\src\core2\cppu\source\uno\any.cxx(131) invocationlo.dll!com::sun::star::uno::Any::~Any() Line 111 at c:\lo\src\core2\include\com\sun\star\uno\any.hxx(111) invocationlo.dll!stoc_inv::Invocation_Impl::~Invocation_Impl() invocationlo.dll!stoc_inv::Invocation_Impl::`scalar deleting destructor'(unsigned int) cppuhelper3MSC.dll!cppu::OWeakObject::release() Line 233 at c:\lo\src\core2\cppuhelper\source\weak.cxx(233) invocationlo.dll!stoc_inv::Invocation_Impl::release() Line 110 at c:\lo\src\core2\stoc\source\invocation\invocation.cxx(110) pyuno_d.pyd!com::sun::star::uno::Reference<com::sun::star::script::XInvocation2>::~Reference<com::sun::star::script::XInvocation2>() Line 110 at c:\lo\src\core2\include\com\sun\star\uno\reference.hxx(110) pyuno_d.pyd!pyuno::PyUNOInternals::~PyUNOInternals() pyuno_d.pyd!pyuno::PyUNOInternals::`scalar deleting destructor'(unsigned int) pyuno_d.pyd!pyuno::PyUNO_del(_object * self) Line 81 at c:\lo\src\core2\pyuno\source\module\pyuno.cxx(81) python35_d.dll!_Py_Dealloc(_object * op) Line 1795 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\object.c(1795) python35_d.dll!dict_dealloc(PyDictObject * mp) Line 1646 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\dictobject.c(1646) python35_d.dll!_Py_Dealloc(_object * op) Line 1795 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\object.c(1795) python35_d.dll!subtype_dealloc(_object * self) Line 1194 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\typeobject.c(1194) python35_d.dll!_Py_Dealloc(_object * op) Line 1795 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\object.c(1795) python35_d.dll!frame_dealloc(_frame * f) Line 431 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\frameobject.c(431) python35_d.dll!_Py_Dealloc(_object * op) Line 1795 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\object.c(1795) python35_d.dll!fast_function(_object * func, _object * * * pp_stack, int n, int na, int nk) Line 4858 at c:\lo\src\core2\workdir\unpackedtarball\python3\python\ceval.c(4858) python35_d.dll!call_function(_object * * * pp_stack, int oparg) Line 4783 at c:\lo\src\core2\workdir\unpackedtarball\python3\python\ceval.c(4783) python35_d.dll!PyEval_EvalFrameEx(_frame * f, int throwflag) Line 3291 at c:\lo\src\core2\workdir\unpackedtarball\python3\python\ceval.c(3291) python35_d.dll!_PyEval_EvalCodeWithName(_object * _co, _object * globals, _object * locals, _object * * args, int argcount, _object * * kws, int kwcount, _object * * defs, int defcount, _object * kwdefs, _object * closure, _object * name, _object * qualname) Line 4080 at c:\lo\src\core2\workdir\unpackedtarball\python3\python\ceval.c(4080) python35_d.dll!PyEval_EvalCodeEx(_object * _co, _object * globals, _object * locals, _object * * args, int argcount, _object * * kws, int kwcount, _object * * defs, int defcount, _object * kwdefs, _object * closure) Line 4092 at c:\lo\src\core2\workdir\unpackedtarball\python3\python\ceval.c(4092) python35_d.dll!function_call(_object * func, _object * arg, _object * kw) Line 627 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\funcobject.c(627) python35_d.dll!PyObject_Call(_object * func, _object * arg, _object * kw) Line 2166 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\abstract.c(2166) python35_d.dll!method_call(_object * func, _object * arg, _object * kw) Line 330 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\classobject.c(330) python35_d.dll!PyObject_Call(_object * func, _object * arg, _object * kw) Line 2166 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\abstract.c(2166) python35_d.dll!PyEval_CallObjectWithKeywords(_object * func, _object * arg, _object * kw) Line 4634 at c:\lo\src\core2\workdir\unpackedtarball\python3\python\ceval.c(4634) python35_d.dll!PyObject_CallObject(_object * o, _object * a) Line 2092 at c:\lo\src\core2\workdir\unpackedtarball\python3\objects\abstract.c(2092) pyuno_d.pyd!pyuno::Adapter::invoke(const rtl::OUString & aFunctionName, const com::sun::star::uno::Sequence<com::sun::star::uno::Any> & aParams, com::sun::star::uno::Sequence<short> & aOutParamIndex, com::sun::star::uno::Sequence<com::sun::star::uno::Any> & aOutParam) Line 251 at c:\lo\src\core2\pyuno\source\module\pyuno_adapter.cxx(251) msci_uno.dll!`anonymous namespace'::callVirtualMethod(void * pAdjustedThisPtr, long nVtableIndex, void * pRegisterReturn, _typelib_TypeClass eReturnTypeClass, long * pStackLongs, long nStackLongs) Line 74 at c:\lo\src\core2\bridges\source\cpp_uno\msvc_win32_intel\uno2cpp.cxx(74) msci_uno.dll!`anonymous namespace'::cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, bridges::cpp_uno::shared::VtableSlot aVtableSlot, _typelib_TypeDescriptionReference * pReturnTypeRef, long nParams, _typelib_MethodParameter * pParams, void * pUnoReturn, void * * pUnoArgs, _uno_Any * * ppUnoExc) Line 249 at c:\lo\src\core2\bridges\source\cpp_uno\msvc_win32_intel\uno2cpp.cxx(249) msci_uno.dll!unoInterfaceProxyDispatch(_uno_Interface * pUnoI, const _typelib_TypeDescription * pMemberDescr, void * pReturn, void * * pArgs, _uno_Any * * ppException) Line 430 at c:\lo\src\core2\bridges\source\cpp_uno\msvc_win32_intel\uno2cpp.cxx(430) invocadaptlo.dll!stoc_invadp::AdapterImpl::invoke(const _typelib_TypeDescription * pMemberType, void * pReturn, void * * pArgs, _uno_Any * * ppException) Line 467 at c:\lo\src\core2\stoc\source\invocation_adapterfactory\iafactory.cxx(467) invocadaptlo.dll!adapter_dispatch(_uno_Interface * pUnoI, const _typelib_TypeDescription * pMemberType, void * pReturn, void * * pArgs, _uno_Any * * ppException) Line 617 at c:\lo\src\core2\stoc\source\invocation_adapterfactory\iafactory.cxx(617) msci_uno.dll!`anonymous namespace'::cpp2uno_call(bridges::cpp_uno::shared::CppInterfaceProxy * pThis, const _typelib_TypeDescription * pMemberTypeDescr, _typelib_TypeDescriptionReference * pReturnTypeRef, long nParams, _typelib_MethodParameter * pParams, void * * pCallStack, __int64 * pRegisterReturn) Line 155 at c:\lo\src\core2\bridges\source\cpp_uno\msvc_win32_intel\cpp2uno.cxx(155) msci_uno.dll!`anonymous namespace'::cpp_mediate(void * * pCallStack, long nFunctionIndex, long nVtableOffset, __int64 * pRegisterReturn) Line 345 at c:\lo\src\core2\bridges\source\cpp_uno\msvc_win32_intel\cpp2uno.cxx(345) msci_uno.dll!`anonymous namespace'::cpp_vtable_call() Line 380 at c:\lo\src\core2\bridges\source\cpp_uno\msvc_win32_intel\cpp2uno.cxx(380) tklo.dll!ActionListenerMultiplexer::actionPerformed(const com::sun::star::awt::ActionEvent & evt) Line 146 at c:\lo\src\core2\toolkit\source\helper\listenermultiplexer.cxx(146) tklo.dll!ActionListenerMultiplexer::actionPerformed(const com::sun::star::awt::ActionEvent & evt) Line 146 at c:\lo\src\core2\toolkit\source\helper\listenermultiplexer.cxx(146) tklo.dll!VCLXButton::ProcessWindowEvent::__l8::<lambda>() Line 593 at c:\lo\src\core2\toolkit\source\awt\vclxwindows.cxx(593) tklo.dll!std::_Invoker_functor::_Call<void <lambda>(void) &>(VCLXButton::ProcessWindowEvent::__l8::void <lambda>(void) & _Obj) tklo.dll!std::invoke<void <lambda>(void) &>(VCLXButton::ProcessWindowEvent::__l8::void <lambda>(void) & _Obj) tklo.dll!std::_Invoker_ret<void,1>::_Call<void <lambda>(void) &>(VCLXButton::ProcessWindowEvent::__l8::void <lambda>(void) & <_Vals_0>) tklo.dll!std::_Func_impl_no_alloc<void <lambda>(void),void>::_Do_call() tklo.dll!std::_Func_class<void>::operator()() tklo.dll!VCLXWindowImpl::OnProcessCallbacks(void * __formal) Line 300 at c:\lo\src\core2\toolkit\source\awt\vclxwindow.cxx(300) ... So it seems like the only place where we could guarantee the invariant to hold solar mutex for GUI protection before releasing it is right before the releaser itself. Co-authored-by: Jan-Marek Glogowski <glogow@fbihome.de> Change-Id: Ie95bd3423a25f210f0bbb2a88288c7c60a528ea0 Reviewed-on: https://gerrit.libreoffice.org/70301 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/70319 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-04-05tdf#114306: Revert commits fixing this issue ( 6.1 only )Xisco Fauli6-91/+21
Revert "tdf#114306 fix crash caused by special document 2" This reverts commit d30eefb677b446886f7b5bab6de93d489ba63529. Revert "tdf#114306 fix crash caused by special document" This reverts commit e4400f4c4e267f8528df3a7d5a09623c888bd10c. Revert "tdf#114306 fix unexpected page break in row-spanned table" This reverts commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50 Change-Id: Ifff799616f12ee428a3f923f6510b20059f5bc71 Reviewed-on: https://gerrit.libreoffice.org/69848 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-04-04basic: fix for UnoControlTabPageModel get/set propertiesVasily Melenchuk1-2/+3
The userformscontainers is required property to pass checks in getter/setter, but returning true instead of actual type is not a best idea. So let's return actually expected dummy empty container. Change-Id: I5cc3e5462ed82f6f2f8e5a45d9fc2d9f9ce1c76f Reviewed-on: https://gerrit.libreoffice.org/67431 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 24e7d98219191ccdab3673ac96fa866c449cac5f) Reviewed-on: https://gerrit.libreoffice.org/70235 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-04python3: upgrade to release 3.5.7Michael Stahl4-3/+66
Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647 Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5 Reviewed-on: https://gerrit.libreoffice.org/70182 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c) Reviewed-on: https://gerrit.libreoffice.org/70194 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-03Introduce next Japanese gengou era 'Reiwa'Eike Rathke3-4/+13
Prepare for "Japan's Y2K" Gengou calendar era switch after 2019-04-30 The emperor Akihito will abdicate on 2019-04-30. The next emperor will be Naruhito, but so far neither the new era name (Heisei for Akihito) nor its abbreviation or a Unicode character are determined. At least introduce the new era with some dummy names (Naruhito,Na,N). Change-Id: I8c0af390ca0408ac259e47e7eaf2e49b5889c9ba Reviewed-on: https://gerrit.libreoffice.org/58142 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins Introduce next Japanese gengou era 'Reiwa' starting from 2019-05-01, which has been announced officially. This fills the provisional slot acknowledged at cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb. Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87 Reviewed-on: https://gerrit.libreoffice.org/70157 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/70185
2019-04-03tdf#124272 use ClipRegion's geometry if not a rectangleArmin Le Grand1-2/+27
By error the ClipRegion's geometry was replaced by it's BoundRect expanded to PixelBounds. If the ClipRegion is not a rectangle, this will create wrong results. To do both - extend to PixelBounds and have the original geometry included - use the PolyPolygon topology as needed (see comment in code for details) Reviewed-on: https://gerrit.libreoffice.org/70146 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 362c1cf2bd580f6dc8bf27bdcd79174111bc1b5c) Conflicts: sw/source/core/doc/notxtfrm.cxx Change-Id: If3f75223144eba8eb23909a7c701ad544346099b Reviewed-on: https://gerrit.libreoffice.org/70158 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-03tdf#121103 ANOVA sum of squares formula correctionJaromir Wysoglad1-2/+1
The ANOVA sum of squares is now hardcoded to use '$Sheet?' in the source cell addless every time. Change-Id: I215b719be11ecfc2ae20c5df8e86876bc22d50f0 Reviewed-on: https://gerrit.libreoffice.org/69899 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 66c08a0d308fd6119460546a906434bbc9d23c2e) Reviewed-on: https://gerrit.libreoffice.org/70155 Reviewed-by: vyzigold <jaromirwysoglad@gmail.com>
2019-04-02tdf#123705: avoid duplicate themeColorJulien Nabet3-0/+7
See http://bugs.documentfoundation.org/attachment.cgi?id=149585 + https://bugs.documentfoundation.org/show_bug.cgi?id=123705#c4 Change-Id: I3c6fb0a1ac46a62c75bb9daeaded1633889416eb Reviewed-on: https://gerrit.libreoffice.org/68398 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 42398e3860aafd6468688eda6c0da942323b7f82) Reviewed-on: https://gerrit.libreoffice.org/68614 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-01Resolves: tdf#124440 nospin has no subeditCaolán McNamara1-1/+6
Change-Id: I4e801ec234e86be935a79c9e29f0e5091904f12e Reviewed-on: https://gerrit.libreoffice.org/70055 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-04-01tdf#124413 Crash on undo / redo in Basic IDENoel Grandin1-3/+8
regression from commit 3a9d3f271c445641bebd057c4c91279f9b3cd7d5 Date: Mon Apr 23 09:38:41 2018 +0200 loplugin:useuniqueptr in TextDoc Change-Id: I51ab5de7571e4ec358442e54d590adf88fbeb12d Reviewed-on: https://gerrit.libreoffice.org/70061 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 3ebdb97a305ada182af045ea6438432adfe74e80) Reviewed-on: https://gerrit.libreoffice.org/70072 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-29tdf#121456 sw: DOCX: fix loading of empty TOC titleSerge Krot3-0/+13
Change-Id: Ib241edd07e4c6781d80db274f73146bda310d8c0 Reviewed-on: https://gerrit.libreoffice.org/69827 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit e47a5543f4b8c9e317d1e43af8c0e5a732e461fd) Reviewed-on: https://gerrit.libreoffice.org/69903
2019-03-28fix grayscale jpeg writing in pdfexport (tdf#121615)Luboš Luňák3-1/+62
If the bitmap to be written is non-8bit, e.g. in case of using OpenGL (on Linux the test requires "SAL_FORCEGL=1 SAL_USE_VCLPLUGIN=gen", on Windows it's probably the default case), then the bitmap is not in native format for 8bit. This was done correctly by 45e8e0fbee40f that introduced it but somehow it got lost later (I can't even find where). Reviewed-on: https://gerrit.libreoffice.org/69213 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 4b48f5c2fd2d0d6de1e1df4c13ceba47b1da7b5e) Change-Id: Ib1810cb9cf12e373c1cb41da40fa28e96ad7db28 Reviewed-on: https://gerrit.libreoffice.org/69851 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-03-28fix transparency handling in BitmapEx::GetPixelColor()Luboš Luňák1-1/+1
Apparently the Color class uses transparency as the opposite of the normally used meaning of opacity, so transparency 255 means transparent. Change-Id: I3a76c2c93d98ad3c850017d3fd569b04dc6c19c8 Reviewed-on: https://gerrit.libreoffice.org/69211 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/69884 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-03-27Resolves: tdf#124142 don't deref nullptrCaolán McNamara1-1/+2
Change-Id: Ie14600e9f9a1e1c4e99c7a872f5d677453481888 Reviewed-on: https://gerrit.libreoffice.org/69666 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ac7ce7a64ef903bad1476f5635a7b2a1e951a7a3) Reviewed-on: https://gerrit.libreoffice.org/69694 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-03-26Assign [kmr-Latn-TR] TRY|₺ currency, TRY|YTL and TRL|TL are legacyOnlyEike Rathke1-3/+10
This was done long ago for the tr-TR locale as well. Change-Id: I5bf8595f6d49adb7fd76b3c4924c4d72b3b8ea5e Reviewed-on: https://gerrit.libreoffice.org/69717 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 4ca9db953d59d93ce8e3a54a36d23ed52b9c62a9) Reviewed-on: https://gerrit.libreoffice.org/69723 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-03-22tdf#124109: Revert "Only do kashida insertion with fonts that have non-zero ↵Khaled Hosny3-12/+11
width kashidas" This reverts commit c45b23377bb2fe44c26f1287ff38495344e4ca50. This commit breaks Kashida justification when a document is first opened (the kashida justification will be disabled and spaces will be used untill the text is changed). Probably it is checking for width of Kashida glyph too early. Also I'm not sure what the reverted commit was trying to fix since we already do kashida justification in fonts that has non-zero width Kashida and it has been the case for a long time. This does not fix the original issue in the document attched with the bug report, but if fixes kashida not being applied when opening the document. Change-Id: Ic95859bca94fa792793e3223d2adb465bc6d880f Reviewed-on: https://gerrit.libreoffice.org/69509 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 0a8e9cc5c1782f1cd50ef338ec2aa4f6776a4c0e) Reviewed-on: https://gerrit.libreoffice.org/69519 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
2019-03-21pUnoReturn should be null when UNO methode is VOIDJuergen Funk1-1/+1
the problem is that at least the msvc_win32_x86-64 bridge's unoInterfaceProxyDispatch (bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx) requires pUnoReturn to be a nullptr when the UNO method has VOID return type (see computation of retKind in cpp_call in the same file), but that IdlInterfaceMethodImpl::invoke doesn't set up the arguments according to that expectation. Change-Id: I187a997300571cd9822de2eeacf7ad887ad00a4f Reviewed-on: https://gerrit.libreoffice.org/69495 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 14a11ab5dfa2ea34049866517ee78170922aee4e) Reviewed-on: https://gerrit.libreoffice.org/69502 Tested-by: Jenkins
2019-03-20tdf#120161 sc: pdf export unit testSerge Krot3-0/+382
Change-Id: I42579d4d61be43318f7e2b06b3465890dd624a12 Reviewed-on: https://gerrit.libreoffice.org/69035 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 87bf5a930a72a12f88a21b450da0dd86348c3077) Reviewed-on: https://gerrit.libreoffice.org/69412
2019-03-19tdf#120161 sc: use selection to set required printed areaSerge Krot1-1/+2
Change-Id: Id0798cbff2d327e2bb955fbbc530a201975f6003 Reviewed-on: https://gerrit.libreoffice.org/68833 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 03b6c20c66047af41ed2f78fe5dd229cd06392e8) Reviewed-on: https://gerrit.libreoffice.org/69118 Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de> Tested-by: Serge Krot (CIB) <Serge.Krot@cib.de> (cherry picked from commit f0b71fafd3a2fd6158c5952d601092179cba21e5) Reviewed-on: https://gerrit.libreoffice.org/69263
2019-03-14do not access uninitialized values when printing (tdf#121439)Luboš Luňák2-7/+21
The assert in the bugreport is triggered by ScPrintFunc::CalcPages() passing uninitialized values of nEndRow (and others). These variables apparently get initialized only by constructors that take ScPrintState. These ctors also set (the somewhat poorly named) bState and the call to CalcPages() is guarded by this. However, GetPrintState() will simply create ScPrintState filled with these uninitialized values and later on this will be used with these ctors, so bState will be set, but nEndRow will be bogus. Although 5217a2a0bf27e496cc429ee45dff7c239b466ae6 introduced tdf#121439, this strange bState logic and unitialized variables has been these since the initial commit, and the code doesn't take any precautions to check whether the values are valid or not, so I assume this always was just lucky enough to work and 5217a2a0bf finally triggered a problem. Given that it's rather unclear to me how this is supposed to work properly, just add an extra flag to both ScPrintFunc and ScPrintState marking whether the values are set or not and make CalcPages() depends on this flag instead. Change-Id: I0620de6562865c24f5a0edca2566b01546bf2e2b Reviewed-on: https://gerrit.libreoffice.org/68739 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Jenkins (cherry picked from commit 9432bab9f8f4a246d205ff2a460f60aeedba8ce1) Reviewed-on: https://gerrit.libreoffice.org/69262 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-03-13tdf#123547: do the same as in lcl_DrawBullet from cui/numpages.cxxJulien Nabet1-5/+22
See bt https://bugs.documentfoundation.org/attachment.cgi?id=149389 It seems the method from cui/numpages.cxx takes more things into account At least, it doesn't crash for the attachment of this tracker Change-Id: I05ca0b019ac483890bea4acdbb695d73b660e638 Reviewed-on: https://gerrit.libreoffice.org/68033 Tested-by: Jenkins (cherry picked from commit 684fcf2fce915f3e3e553c67fb57bdbfc8f159d5) Reviewed-on: https://gerrit.libreoffice.org/68843 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 7f2322afea3b25bc45f438b8ae9d4977ac378c1c) Reviewed-on: https://gerrit.libreoffice.org/69172 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-13poppler: upgrade to release 0.74.0Michael Stahl4-8/+36
Fixes CVE-2019-7310. Add patch to fix CVE-2019-9200 too. CVE-2018-20662 looks irrelevant because we don't build pdfunite tool. Reviewed-on: https://gerrit.libreoffice.org/69094 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit f9b354784faf65ecc8024cf6d7d7aaf589f6d91f) Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906 Reviewed-on: https://gerrit.libreoffice.org/69119 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-12tdf#116195 sw: remove DisableOffPagePositioning handling from ODF importMichael Stahl1-7/+0
SwXMLImport::SetConfigurationSettings() needs to handle only those settings for which the default is different vs. old OOo/LO versions; DisableOffPagePositioning however defaults to false, so we can just rely on that default. The inverted bDisableOffPagePositioning check is wrong. (regression from fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48) Change-Id: I300fa597f58b586b49089bb555a00a6923862abe Reviewed-on: https://gerrit.libreoffice.org/68801 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8f3df3a5a1570eea4d931f737c474df8601377ec) Reviewed-on: https://gerrit.libreoffice.org/69037 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-11tdf#123772 Add testSamuel Mehrbrodt2-0/+87
Reviewed-on: https://gerrit.libreoffice.org/68701 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9c2cf30333a3d1434c4184ed7a1e824c9fa3abb5) Change-Id: Id46bf2b293c4465f5c58f503c75904639d59f168 Reviewed-on: https://gerrit.libreoffice.org/68900 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-10Check svg URLs before exportingSamuel Mehrbrodt3-7/+28
Reviewed-on: https://gerrit.libreoffice.org/68668 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 34ec46571701d639d9bc542b2d19f87a21a83648) Change-Id: I3b86b6b82318b0d201c3d7db516664520eb47bed Reviewed-on: https://gerrit.libreoffice.org/68733 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-08tdf#121686: fix assert in SvxAutoCorrect::FnChgToEnEmDash (editeng)Julien Nabet1-1/+2
See https://bugs.documentfoundation.org/attachment.cgi?id=149773 Change-Id: I1696984a8df1b38a359a8177a5f3670526d2696e Reviewed-on: https://gerrit.libreoffice.org/68832 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 67d170868401335434772f1be23d565d23c1fbea) Reviewed-on: https://gerrit.libreoffice.org/68882
2019-03-07tdf#123452 EMF Re-enable compression for image/x-emf filesBartosz Kosiorek1-0/+1
Change-Id: I9fd801d5eef6c65f8e68e30723415da7b493d767 Reviewed-on: https://gerrit.libreoffice.org/68716 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit df22e97db5b7608b6d53b15b86b5a83610f9c87b) Reviewed-on: https://gerrit.libreoffice.org/68729 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 36f027769ea6aaabb5e993a321d7a56775d4bee1) Reviewed-on: https://gerrit.libreoffice.org/68730
2019-03-06tdf#123829 Respect CollapseEmptyCellPara setting when reading odf docsSamuel Mehrbrodt3-0/+17
Commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c introduced a "feature" which would hide an empty line after a table and only make it visible when the cursor is in it. So when loading an ODF doc, only enable this feature for which have the CollapseEmptyCellPara setting set. Change-Id: Ib4dfbbe8d45eb57547c51c7eee2f81331fc5300e Reviewed-on: https://gerrit.libreoffice.org/68742 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 0d2da0acfaa610c690bce552c0ed5df62d4c35cb) Reviewed-on: https://gerrit.libreoffice.org/68790 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-06Resolves: tdf#123815 null terminator included in stringCaolán McNamara1-1/+3
regression from... commit 18d636063fd7be165e7888af49372a6e2b851776 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Jun 19 09:46:31 2017 +0100 ofz: use OString instead of bare char* this is no use to the reporter though, as the document format is 10 and 11 is the oldest the filter will open Change-Id: I4cdfe92e37f047493a6eab95f0e8e9f5dced1a35 Reviewed-on: https://gerrit.libreoffice.org/68747 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-04Related: tdf#117761 oox smartart: backport fixes related to picture stripMiklos Vajna9-27/+250
This is a combination of 7 commits. This is the 1st commit: oox smartart, picture strip: handle bitmap fill of pres nodes There were two problems here: 1) We did not import bitmap fill from presentation nodes. 2) Presentation nodes contained properties with reference semantics, so if you set a bitmap fill for a first and a second shape, then at the end both shapes contained the second bitmap. With this, both bitmaps are imported exactly once. (cherry picked from commit 333e9ea15bb57cf1c87ac2ea150de1e3fd79cfcb) This is the commit #2: oox smartart, picture strip: fetch # of children only once in snake algo No functional changes intended. (cherry picked from commit 90372d52fdcc378473b89f4e6f2de0e206c110ef) This is the commit #3: oox smartart, picture strip: expose aspect ratio of children for snake algo The aspect ratio request of the Shape is not yet used in AlgAtom::layoutShape(), though. The heavy-lifting is needed, because the number of cols/rows in the snake algorithm depends on the aspect ratio request from the child algorithm, so need to transfer the aspect ratio from child algorithm -> layout node -> shape -> parent algorithm. Still no functional changes intended. (cherry picked from commit a1e10b7968fbf4dba962349be8a6dfb0cb1d3176) This is the commit #4: oox smartart, picture strip: fix too many columns with aspect ratio request The bugdoc has 3 items in the picture strip and PowerPoint laid this out as a single column with 3 rows (as a snake algorithm). We used to put the first two items to the first row and the third item to the second row. Improve out layout by taking into account what aspect ratio the child algorithms request: this way it's obvious that we should use a single column in case we have a large enough aspect ratio and few enough items. (PowerPoint also uses multiple columns without the aspect ratio request.) (cherry picked from commit 159e33ec661b2ce038b2642b2f30600ce7901d1b) This is the commit #5: oox smartart, picture strip: fix lack of spacing around the picture list The snake algorithm in PowerPoint seem to interpret spacing as follows: if you have N elements, then there should be the requested amount of spacing between the elements, and also double amount of spacing around the actual list of elements. With this, the SmartArt and the title shape in the bugdoc no longer overlaps. (cherry picked from commit 0a29c928afa74123bca05dc089c751603d368467) This is the commit #6: oox smartart, picture strip: fix lack of margin in text shapes Shape text has two kind of spacing inside the shape's bounding box: the shape-level margin and the paragraph-level one. Only the second was handled in the tx algorithm so far, add support for the first. The margins taken from constraints were way large by default: the only explanation I found for that is that SmartArt layout sometimes calculates in MMs, sometimes in Points, and the ratio between the two is exactly the Impress / PowerPoint margin. So assume that indeed that unit difference is the reason for the smaller in-PowerPoint margin values and do the same on our side. (cherry picked from commit 279c7f83a57c4d3991930ee80e9d9c287c21270a) This is the commit #7: oox smartart, picture strip: fix too wide child shapes Once the constraints determine the size, the aspect ratio may shrink one dimension to achieve the requested ratio. Implement the case where a >1 ratio shrinks the width, so the container of the image-text shape pair has correct aspect ratio. (cherry picked from commit f4fbb127897ea6afe27055d3b6cfcb0441080902) Change-Id: I7bac764c031e80bac532c4f97ebd5b5096401096 Reviewed-on: https://gerrit.libreoffice.org/68687 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 12:19:20 +0000