summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-10firebird support accidentally defaulted to disabledCaolán McNamara
since... commit ffc6d564b91692cd9d99a0eb3b1ceaf54f7db89e Date: Tue Jun 1 07:40:12 2021 +0200 configure: Refactor disabling DB drivers Change-Id: I94e5e0aca54e1d6d0355d63b27d8fd73dd433083 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116964 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-10Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to fded06f95f73fd0bfb27d861843c2f317db83d29 - tdf#132906 Update Sampling statistics dialog Change-Id: Ibe4132cfb80455dfc3338b17155bf449aad6e840 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/116925 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
2021-06-10tdf#142713 OOXML: export secondary axis of all chart typesBalazs Varga
where the secondary axis is supported by the chart model and OOXML. Change-Id: Ifbcc905139487965510063aa87991ce6f8df73ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116809 Tested-by: Jenkins Reviewed-by: Balazs Varga <varga.balazs3@nisz.hu>
2021-06-10tdf#142257 Add Word-compatible secondary shortcuts for Grow/ShrinkGabor Kelemen
Only for Hungarian, so we are not clashing with / wasting precious combinations for other languages. This would provide UX-interop with Word, yet the new default which is consistent with Impress is kept so it's the best of both worlds. Change-Id: Ia74c570bb94835d4a173a536f49d5a4f50e23542 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116418 Tested-by: Jenkins Reviewed-by: Balazs Varga <varga.balazs3@nisz.hu>
2021-06-10loplugin:unnecessaryreturn RoadmapWizardNoel Grandin
Change-Id: I269fd92a6076fe9ebe18646e537e7031aec47fef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116976 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-10tdf#142612 Replace Show Formula command shortcut for HungarianGabor Kelemen
Use the Excel-compatible shortcut that can be entered with Hungarian keyboard layout on Windows. Backtick is AltGr+7 which does not work correctly when combined with Ctrl. Change-Id: I9f5da857a041733c63c124b3aff3d1834f8405f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116562 Tested-by: Jenkins Reviewed-by: Balazs Varga <varga.balazs3@nisz.hu>
2021-06-10cid#1485166 silence Uninitialized scalar variable harderCaolán McNamara
Change-Id: Ic9d841109cbcc1201e13cebea423139fd760c680 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116966 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-10tdf#64997: sw_ww8export3: Add unittestXisco Fauli
Change-Id: Iba81551157484274f90fea3e9f9f2c34c1daeaf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116968 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-10loplugin:unnecessaryreturn SvImpLBox::SetMostRightNoel Grandin
Change-Id: Id556d8c86c1229a51bd600da433d564979c1cd40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116975 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-10loplugin:unnecessaryreturn SalX11Display::DispatchNoel Grandin
Change-Id: I270f6538d921ad2116cc29ada3e4543027531764 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116974 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-10loplugin:unnecessaryreturn SalFrame::SetPluginParentNoel Grandin
Change-Id: If927a834f5b5d722fc36cce40e161597af6234ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116972 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-10loplugin:unusedmethodsNoel Grandin
Change-Id: I2890e29b3e18cdf7822bf93ee7c17cd8221497a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116971 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-10update firebird modelinesCaolán McNamara
with solenv/bin/add-modelines -p connectivity/source/drivers/firebird because a bunch are missing the trailing ones Change-Id: I168c22586744cd666e6c18a569e143b6caccd421 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116963 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-10tdf#142629: vcl_filters_test: Add unittestXisco Fauli
Change-Id: Id0397bc8e16eb22853ce3388f8ef3cc8f8558692 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116961 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-10update add-modelines to the TEMPLATE.SOURCECODE.HEADER patternCaolán McNamara
to match commit f75cd22118a58c8a8827723c890885a500562465 Date: Tue Nov 8 14:51:20 2016 +0200 Add fill-column: 100 to the Emacs mode line and commit 6a0081642633eb406059295b90fd0c9b0cd1130f Date: Wed May 18 20:00:00 2016 +0200 add Vim C-indent options to C/C++ template modeline changes to TEMPLATE.SOURCECODE.HEADER Change-Id: Ic323cd7dcce9ece23325a23160b0936819bb634b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116962 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-10avoid possible repeated cairo surface creationLuboš Luňák
Doing the frame size adjustments only after the if condition meant that in headless mode the surface could be destroyed and created again for the same size. Also AcquireGraphics() passed different frame size to SetGraphics() than SetPosSize(). Change-Id: I9d6884a3917dfbd7b2cfe4fcd4e350c8bc9f4305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116272 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-06-10tdf#130428 remove unnecessary usage of SfxItemState::UNKNOWNArmin Le Grand (Allotropia)
In this case, avoid single, re-used local variable. It gets newly processed at locations used anyways. Change-Id: I89463736cbc28925adc304adb4624ab2740bdfbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116936 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
2021-06-10tdf#130428 remove unnecessary usage of SfxItemState::UNKNOWNArmin Le Grand (Allotropia)
No need to check for SfxItemState::UNKNOWN, all states depend on selected SdrObejcts/E3DObjects anyways Change-Id: I13be6494229c18f514da3e0229d0896b237508c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116939 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
2021-06-10external/mdds: Mark patch as upstreamedStephan Bergmann
Change-Id: Id61fbaafb575a8c745e5b3cc5b2ff8ae4526d94c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116960 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-10-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
26ee34d1332e164cf938fcf78902df7d0cc3fe8f "uitest: add logging for UI actions" had added the original > return "Action on element: " + mxWindow->get_id() + " with action : " + aActionName; That commit had stated > The long term goal for this logging is that it generates content in a > DSL for the UI testing. The generated file can then be interpreted by > the UI testing and replay the interaction with the UI. > > For now the plan is to have a readable output of what happens in the UI > layer that allows to quickly transform it to a UI test. Later, 5578bc99542953b6318a117a4e4b99f12964d9d2 "uitest: Some new features in ui_logger project", apparently as part of working on such a Python-from-DSL code generator, commented out the original return statement. The comment at <https://gerrit.libreoffice.org/c/core/+/116811/ 1#message-867650d186ade924cd38240ebbf8603222adac6d> "Lets assume this was commented out in error" has instructions how to test that (the generated test.log is in the UserInstallation rather than in instdir, though), and the comment at <https://gerrit.libreoffice.org/c/core/+/116811/ 1#message-36bf2eab1110bf51ccaaa1014188b841beb32041> suggests returning just aActionName instead of the dressed-up, human-readable "Action on element ..." However, when I tried out those instructions, the dsl_core.py generation failed (with an arpeggio.NoMatch exception) both when just returning aActionName and when returning the full dressed-up, human-readable "Action on element ..." But it also generally failed if WindowUIObject::get_action returns an empty string (i.e., the status quo), with e.g. > AttributeError: 'CloseDialog' object has no attribute 'uno_command_name' apparently due to some > Close Dialog lines in my generated test.log. So it appears that dsl_core.py is unfinished work in progress, which does not work properly regardless of what WindowUIObject::get_action returns. Coming back to the original commit that produced "readable output of what happens in the UI layer", it is thus probably best to leave it at that output for now, and reinstate the original full dressed-up, human-readable "Action on element ..." That addresses the -Werror,-Wunused-but-set-variable. If anybody wants to fix that dsl_core.py generation, that can happen in later commits. Change-Id: Ie1123df53d9505fc5f039405f666977550f967d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116811 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-10tdf#141994 track changes: record insertion of imagesLászló Németh
by adding a SwRangeRedline to the anchoring point of the image inserted with Insert->Image... or "Insert Image" of the Standard toolbar. Note: Only images anchored as characters can be recorded this way, so change the default to-character anchoring at enabled change tracking. (In other office suites, as-character insertion is the default anchoring for inserted images with disabled change tracking, too.) Follow-up to commit d6322bcedc197a654abc7d64bfea8cf570f123bf "tdf#59463 track changes: record deletion of images". Change-Id: I593abbdb6f9f2b1a5265f112103479c1833166af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116924 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-06-10CppunitTest_xmlsecurity_signing: remove not needed direct pdfium dependencyMiklos Vajna
This test only calls pdfium indirectly via vcl. Change-Id: I37ba3f9803d5dd0ead9e3614f3c899d6029107d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116940 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-06-10Simplify Sequences initializations (sot/stock/svl/svtools/svx)Julien Nabet
Change-Id: Iec21851d69f4a8d5f557e9ed2d30e5f680cd62c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116943 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-10sd: ubsan - fix heap-use-after-free in SdOutlinerTomaž Vajngerl
OutlinerView can change (old one deleted and new one create) so we can't store it in a local vairable and need to always fetch it. UBSAN Error log: ==21484==ERROR: AddressSanitizer: heap-use-after-free on address 0x606000af7d28 at pc 0x2ab7c5979405 bp 0x7ffcd1a3d1a0 sp 0x7ffcd1a3d198 READ of size 8 at 0x606000af7d28 thread T0 -0 0x2ab7c5979404 in std::__uniq_ptr_impl<EditView, std::default_delete<EditView> >::_M_ptr() const /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/unique_ptr.h:147:42 -1 0x2ab7c59792ea in std::unique_ptr<EditView, std::default_delete<EditView> >::get() const /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/unique_ptr.h:337:21 -2 0x2ab7c59791d9 in std::unique_ptr<EditView, std::default_delete<EditView> >::operator*() const /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/unique_ptr.h:322:2 -3 0x2ab7c59725da in OutlinerView::GetEditView() const /include/editeng/outliner.hxx:209:46 -4 0x2ab7c70e36bb in SdOutliner::SearchAndReplaceOnce(std::__debug::vector<sd::SearchSelection, std::allocator<sd::SearchSelection> >*) /sd/source/ui/view/Outliner.cxx:903:21 -5 0x2ab7c70dcb32 in SdOutliner::SearchAndReplaceAll() /sd/source/ui/view/Outliner.cxx:622:29 -6 0x2ab7c70da81b in SdOutliner::StartSearchAndReplace(SvxSearchItem const*) /sd/source/ui/view/Outliner.cxx:478:28 -7 0x2ab7c61e4fc5 in sd::FuSearch::SearchAndReplace(SvxSearchItem const*) /sd/source/ui/func/fusearch.cxx:128:44 -8 0x2ab7c5c61fc5 in sd::DrawDocShell::Execute(SfxRequest&) /sd/source/ui/docshell/docshel3.cxx:228:36 -9 0x2ab7c5cac074 in SfxStubDrawDocShellExecute(SfxShell*, SfxRequest&) /workdir/SdiTarget/sd/sdi/sdslots.hxx:18384:1 -10 0x2ab7cd885d8f in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) /sfx2/source/control/dispatch.cxx:253:9 -11 0x2ab7cd89bd8f in SfxDispatcher::Execute_(SfxShell&, SfxSlot const&, SfxRequest&, SfxCallMode) /sfx2/source/control/dispatch.cxx:753:9 -12 0x2ab7cd89ccd6 in SfxDispatcher::Execute(unsigned short, SfxCallMode, SfxItemSet const*, SfxItemSet const*, unsigned short) /sfx2/source/control/dispatch.cxx:811:9 -13 0x2ab7cdd11d76 in SfxDispatchController_Impl::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /sfx2/source/control/unoctitm.cxx:738:46 -14 0x2ab7cdd15135 in SfxOfficeDispatch::dispatchWithNotification(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /sfx2/source/control/unoctitm.cxx:243:16 -15 0x2ab7f54b25d7 in framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> const&, com::sun::star::util::URL const&, bool, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/dispatchhelper.cxx:159:30 -16 0x2ab7f54b1531 in framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/dispatchhelper.cxx:117:16 -17 0x2ab7f54b2d17 in non-virtual thunk to framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/dispatchhelper.cxx -18 0x2ab7e63c546f in unotest::MacrosTest::dispatchCommand(com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /unotest/source/cpp/macros_test.cxx:85:22 -19 0x2ab7b1a9ac2d in testSearchAllInDocumentAndNotes::TestBody() /sd/qa/unit/uiimpress.cxx:715:5 -20 0x2ab7b1b43f84 in void std::__invoke_impl<void, void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&>(std::__invoke_memfun_deref, void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:73:14 -21 0x2ab7b1b43b5e in std::__invoke_result<void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&>::type std::__invoke<void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&>(void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:95:14 -22 0x2ab7b1b439b2 in void std::_Bind<void (testSearchAllInDocumentAndNotes::* (testSearchAllInDocumentAndNotes*))()>::__call<void, 0ul>(std::tuple<>&&, std::_Index_tuple<0ul>) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:467:11 -23 0x2ab7b1b43612 in void std::_Bind<void (testSearchAllInDocumentAndNotes::* (testSearchAllInDocumentAndNotes*))()>::operator()<void>() /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:549:17 -24 0x2ab7b1b426a1 in std::_Function_handler<void (), std::_Bind<void (testSearchAllInDocumentAndNotes::* (testSearchAllInDocumentAndNotes*))()> >::_M_invoke(std::_Any_data const&) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:316:2 -25 0x2ab7b1aec1f1 in std::function<void ()>::operator()() const /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:706:14 -26 0x2ab7b1b41984 in CppUnit::TestCaller<testSearchAllInDocumentAndNotes>::runTest() /workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:175:7 -27 0x2ab765f655ba in CppUnit::TestCaseMethodFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5 -28 0x2ab780dd0937 in (anonymous namespace)::Protector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /test/source/vclbootstrapprotector.cxx:46:14 -29 0x2ab765f36c47 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25 -30 0x2ab775453fd7 in (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx:78:12 -31 0x2ab765f36c47 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25 -32 0x2ab771f47962 in (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx:62:16 -33 0x2ab765f36c47 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25 -34 0x2ab765ecdf84 in CppUnit::DefaultProtector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12 -35 0x2ab765f36c47 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25 -36 0x2ab765f30697 in CppUnit::ProtectorChain::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:86:18 -37 0x2ab765fcfa79 in CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:182:28 -38 0x2ab765f63c21 in CppUnit::TestCase::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:13 -39 0x2ab765f67a52 in CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30 -40 0x2ab765f66c4a in CppUnit::TestComposite::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3 -41 0x2ab765f67a52 in CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30 -42 0x2ab765f66c4a in CppUnit::TestComposite::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3 -43 0x2ab765ffd60e in CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:27 -44 0x2ab765fce4de in CppUnit::TestResult::runTest(CppUnit::Test*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:149:9 -45 0x2ab765ffe56b in CppUnit::TestRunner::run(CppUnit::TestResult&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:96:14 -46 0x4ff42e in (anonymous namespace)::ProtectedFixtureFunctor::run() const /sal/cppunittester/cppunittester.cxx:324:20 -47 0x4fb90c in sal_main() /sal/cppunittester/cppunittester.cxx:474:20 -48 0x4fa40e in main /sal/cppunittester/cppunittester.cxx:381:1 -49 0x2ab767c44554 in __libc_start_main (/lib64/libc.so.6+0x22554) -50 0x425e04 in _start (/workdir/LinkTarget/Executable/cppunittester+0x425e04) 0x606000af7d28 is located 8 bytes inside of 56-byte region [0x606000af7d20,0x606000af7d58) freed by thread T0 here: -0 0x4f75f0 in operator delete(void*) /home/tdf/lode/packages/llvm-llvmorg-9.0.1.src/compiler-rt/lib/asan/asan_new_delete.cc:160 -1 0x2ab7c70c42b1 in SdOutliner::Implementation::ProvideOutlinerView(Outliner&, std::shared_ptr<sd::ViewShell> const&, vcl::Window*) /sd/source/ui/view/Outliner.cxx:1988:17 -2 0x2ab7c70c1302 in SdOutliner::SetViewShell(std::shared_ptr<sd::ViewShell> const&) /sd/source/ui/view/Outliner.cxx:1743:17 -3 0x2ab7c70ed9f4 in SdOutliner::SetViewMode(PageKind) /sd/source/ui/view/Outliner.cxx:1571:5 -4 0x2ab7c70f309e in SdOutliner::SetObject(sd::outliner::IteratorPosition const&) /sd/source/ui/view/Outliner.cxx:1720:5 -5 0x2ab7c70f3db6 in SdOutliner::PrepareSearchAndReplace() /sd/source/ui/view/Outliner.cxx:1507:13 -6 0x2ab7c70d4b3f in SdOutliner::ProvideNextTextObject() /sd/source/ui/view/Outliner.cxx:1302:33 -7 0x2ab7c70e30f0 in SdOutliner::SearchAndReplaceOnce(std::__debug::vector<sd::SearchSelection, std::allocator<sd::SearchSelection> >*) /sd/source/ui/view/Outliner.cxx:892:17 -8 0x2ab7c70dcb32 in SdOutliner::SearchAndReplaceAll() /sd/source/ui/view/Outliner.cxx:622:29 -9 0x2ab7c70da81b in SdOutliner::StartSearchAndReplace(SvxSearchItem const*) /sd/source/ui/view/Outliner.cxx:478:28 -10 0x2ab7c61e4fc5 in sd::FuSearch::SearchAndReplace(SvxSearchItem const*) /sd/source/ui/func/fusearch.cxx:128:44 -11 0x2ab7c5c61fc5 in sd::DrawDocShell::Execute(SfxRequest&) /sd/source/ui/docshell/docshel3.cxx:228:36 -12 0x2ab7c5cac074 in SfxStubDrawDocShellExecute(SfxShell*, SfxRequest&) /workdir/SdiTarget/sd/sdi/sdslots.hxx:18384:1 -13 0x2ab7cd885d8f in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) /sfx2/source/control/dispatch.cxx:253:9 -14 0x2ab7cd89bd8f in SfxDispatcher::Execute_(SfxShell&, SfxSlot const&, SfxRequest&, SfxCallMode) /sfx2/source/control/dispatch.cxx:753:9 -15 0x2ab7cd89ccd6 in SfxDispatcher::Execute(unsigned short, SfxCallMode, SfxItemSet const*, SfxItemSet const*, unsigned short) /sfx2/source/control/dispatch.cxx:811:9 -16 0x2ab7cdd11d76 in SfxDispatchController_Impl::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /sfx2/source/control/unoctitm.cxx:738:46 -17 0x2ab7cdd15135 in SfxOfficeDispatch::dispatchWithNotification(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /sfx2/source/control/unoctitm.cxx:243:16 -18 0x2ab7f54b25d7 in framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> const&, com::sun::star::util::URL const&, bool, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/dispatchhelper.cxx:159:30 -19 0x2ab7f54b1531 in framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/dispatchhelper.cxx:117:16 -20 0x2ab7f54b2d17 in non-virtual thunk to framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /framework/source/services/dispatchhelper.cxx -21 0x2ab7e63c546f in unotest::MacrosTest::dispatchCommand(com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /unotest/source/cpp/macros_test.cxx:85:22 -22 0x2ab7b1a9ac2d in testSearchAllInDocumentAndNotes::TestBody() /sd/qa/unit/uiimpress.cxx:715:5 -23 0x2ab7b1b43f84 in void std::__invoke_impl<void, void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&>(std::__invoke_memfun_deref, void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:73:14 -24 0x2ab7b1b43b5e in std::__invoke_result<void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&>::type std::__invoke<void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&>(void (testSearchAllInDocumentAndNotes::*&)(), testSearchAllInDocumentAndNotes*&) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:95:14 -25 0x2ab7b1b439b2 in void std::_Bind<void (testSearchAllInDocumentAndNotes::* (testSearchAllInDocumentAndNotes*))()>::__call<void, 0ul>(std::tuple<>&&, std::_Index_tuple<0ul>) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:467:11 -26 0x2ab7b1b43612 in void std::_Bind<void (testSearchAllInDocumentAndNotes::* (testSearchAllInDocumentAndNotes*))()>::operator()<void>() /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/functional:549:17 -27 0x2ab7b1b426a1 in std::_Function_handler<void (), std::_Bind<void (testSearchAllInDocumentAndNotes::* (testSearchAllInDocumentAndNotes*))()> >::_M_invoke(std::_Any_data const&) /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:316:2 -28 0x2ab7b1aec1f1 in std::function<void ()>::operator()() const /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/std_function.h:706:14 -29 0x2ab7b1b41984 in CppUnit::TestCaller<testSearchAllInDocumentAndNotes>::runTest() /workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:175:7 Change-Id: I0b4616cd3813565bc58b7a84320cbf52dd654a3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116879 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
For both aRelNullPt local variables in SwFEShell::ImpEndCreate and SwFEShell::CheckUnboundObjects the (only) reads were removed with 5f7d6695ab561758acb27a93f14e08ee960324d5 "INTEGRATION: CWS swdrawpositioning". (And nIdent in SwFEShell::CheckUnboundObjects thus becomes unused, too.) Change-Id: Ifb4851b4e10b7370f2fc2f25bcdba77d532e77a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116845 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09tdf#66553 - Add file/product name to title bar for password managersAndreas Heinisch
Change-Id: I6a16e654edcbc3511ee8cbea0889d858e22f2a2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116782 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
2021-06-09do not draw directly in SwViewShell in LOK modeLuboš Luňák
Online mode draws tiles as necessary, so there's no need to care about flickering, and this drawing is in fact not needed at all for Online. Change-Id: I19d981ad6ab6890ada1f415dc251a3492fd054ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116920 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-06-09Simplify Sequences initializations (sfx2)Julien Nabet
Change-Id: I1384dd80e910ba1c55ec7481ab481bc48740fc5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116937 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-09Simplify Sequences initializations (sdext)Julien Nabet
Change-Id: Ide9a3ddd4f6915f45b02353293236988bff51eba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116935 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-09scale VCL's scale cache according to the number of Online viewsLuboš Luňák
If a document is opened in several Online views, each of them using a different zoom, then the scale cache is used for the scaling, and each view is sent updated tiles, so if there are too many views, the cache is not large enough. (Collabora T28503) Change-Id: I3fa719b0515064773fe4584fedbc8aff98e6e213 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116928 Tested-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-06-09allow altering the max size of o3tl::lru_cacheLuboš Luňák
Change-Id: Id119b70275e1c88a8c57f89d915241427be9dbf5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116927 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
...since the (only) read of sXmlId got removed with c50357ff625972464d1a591afe4198d3f6f42a39 "loplugin:unusedfields in sw" Change-Id: I609eae60eb0e1d440a47f97b6387c833c1404518 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116855 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
Since 20e5f64215853bdd32c5f16394ba7f2f36745904 "loplugin:unused-returns in sw" removed > return bChanged || bTabChanged; from the end of SwLayAction::FormatLayoutFly, bTabChanged is effectively completely unused (and now gets warned about by Clang), and the update of bChanged is apparently no longer used, either. Change-Id: Iab180e83070c45531aecf46d85a030463cf7b22d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116853 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-09NFC compat cleanup: no need to specify default TabOverflowJustin Luth
This really confused me because it lead me to think that this was something done for MS compatibility. Well, that is only true in an off-handed way. LibreOffice itself was changed to work similarly to MS Word. So there is nothing special about how DOC or DOCX/RTF are handled. Since the compat settings are not saved or loaded into MS Formats (i.e. it just takes the default value), and since on an ODT save it also will just save with the proper default value, there is no need to specify "TabOverflow = true" in non-ODT import filters. Only ooxmlexport16 has a unit test that reacts if tabOverflow is false. That one is mine and it indicates that the document would be better if tabOverflow was off, so there are no examples of how tabOverflow improves a doc. Change-Id: I97c25154108bc1ca0fcd3dfcff66fea0ea2bca7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116741 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2021-06-09tdf#142721 restore SwShellTableCursor if the orig selection was a single cellCaolán McNamara
where the previous attempt of commit 4d52d2bc81f9d27472fe368785912a530489d046 tdf#142165 restore a SwShellTableCursor if the orig selection described that so that we are operating on the same selection that existed when the dialog was originally launched wasn't sufficient to restore a single cell selection. we continue to need to avoid the assert of commit 6db71f70a3b200d4074f6cda8ce445e9861d3296 tdf#140977 drop possible table-cursor before setting the new one and support the multi-selection of commit e08b446e46f56e15af58fdd4396afba1a316f9e5 tdf#140257 duplicate entire PaM ring when making copy and support not scrolling to a different location on changing a table page break style of commit 9c61732677d038e32b73fc9fb883aced14c0febf tdf#135916 just set the target table as selection and keep making it possible to remove a page break on a table of commit 81f91196b98af38e29af451b86c26a893a109abc tdf#135636 the selection at dialog-launch time is lost by dialog-apply time all of which is necessitated by commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98 lokdialog: Convert the Table -> Properties... to async exec. Though; since 4d52d2bc81f9d27472fe368785912a530489d046 where we started using rSh.GetTableCrs if IsTableMode() then in practice 6db71f70a3b200d4074f6cda8ce445e9861d3296 probably cannot arise. The scenario of rSh.IsTableMode() changing between launch of the dialog and applying the result of the dialog is presumably maybe theoretically possible in e.g. an online scenario, but not in the normal user case, but handled here anyway. Change-Id: I12f0b6bc7e0e2f5bad45a88007bf6fe2cd3d3b0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116933 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-09WMF tdf#55058 tdf#142722 Add implementation of BitBlt and StretchBltBartosz Kosiorek
With previous implementation, only BitBlt record with 1 bit color depth was supported and StretchBlt was not implemented at all. With this commit the support for 1 bit, 24 bit and 32 bit, for both BitBlt and StretchBlt were added. Change-Id: I061b2beae8c2f143ddff9c8c8bb64bf52f4cf502 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116873 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2021-06-09Simplify Sequences initializations (sd)Julien Nabet
Change-Id: I968f1209961ba30ad0837846ae1ba4a9249663c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116934 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-09Simplify Sequences initializations (sccomp)Julien Nabet
Change-Id: I6316e1318ae1ee68e5d4e4529731bca0d1860b58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116932 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-09tdf#139734 remove redundant asserts after loadFromDesktopsarynasser
Change-Id: Ibabb1775ea86a6dd548ee718ed1dede6ffc60be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113898 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-06-09sw keep aspect ratio: add style UI for this settingMiklos Vajna
It's a per-document setting, but it was only possible to set/get this for a direct formatting dialog. Allow it for styles as well. Change-Id: Iafe1cab37be1eb741b895fe3c6613c21bc63f0d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116931 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-09tdf#142629 import psd image with transparent backgroundNoel Grandin
regression from commit 2168d709805a847ac012ff87b06e081ca139d064 Date: Mon Feb 12 15:29:10 2018 +0200 use RawBitmap in PSDReader Change-Id: I8d547d3cca7fb8fc90a8d9382e054b4d4b2f3519 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116916 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
> svl/source/misc/adrparse.cxx:639:30: error: variable 'aTheRealName' set but not used [-Werror,-Wunused-but-set-variable] > OUString aTheRealName; > ^ since 334644bad9e325d5b23b4416cdc3d22dce5141bf "loplugin:unusedfields in svl", plus removal of further newly dead code Change-Id: I24b4b63a8b625422c898d14ef9a0d304b828d6b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116926 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09drop unnecessary pWin arg to InitAccCaolán McNamara
on the only path InitAcc has a non-null pWin arg the caller ctor has already set mpWindow to pWin which is also all that InitAcc does with its pWin arg Change-Id: I668232117be41fd33bf9ca41db882b5124d61ff0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116923 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-09ScTextWnd is set since the ctor now so drop from InitAccCaolán McNamara
Change-Id: Ia1ccf9393f229d13fde23f2e425ff1cf169ebd9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116922 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
The "INTEGRATION: CWS sheetzoom: #i24372# allow separate zoom per sheet" commits 0846c467a921a27ebd3691e4bc187ece8d0ae7aa (sc/source/ui/inc/viewdata.hxx) and 8d808f64ed32d55adc7af34c3615993ada02f117 (sc/source/ui/view/viewdata.cxx) had moved the aZoomX, aZoomY, aPageZoomX, aPageZoomY data members from ScViewData to ScViewTableData (and added aDefZoomX, aDefZoomY, aDefPageZoomX, aDefPageZoomY data members to ScViewData in their place), and introduced the local variables > Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?) into ScViewData::ReadUserData, so the pre-exisiting assignments to them in that function, which used to assign to the ScViewData data members, now started to do dead assignments to those local variables. (8d808f64ed32d55adc7af34c3615993ada02f117 had similarly added local variables > Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?) to the top of ScViewData::ReadUserDataSequence, but they have already been cleaned away by 305bf19e390aebdf2d20ea052a92f782e8d1185c "loplugin: unused variables".) Change-Id: I0053ba85b3e33fc515cf4724655baa3c5063826d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116818 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
The (only) use of lineColor at > //m_pImpl->bUseGridLines ? _rDevice.SetLineColor( lineColor ) : _rDevice.SetLineColor(); had been commented out in 8578ba4dc736b53c3ca8461516e4024d276b3b05 "gridsort: consolidated and fixed table cell rendering" and then cleaned away completely with f4147a39374c7692728e8506961f23e59a069c45 "refactor TableControl to use RenderContext" Change-Id: I817800b26f4996a73a38fece22149ae87c2f9c01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116824 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
> sd/source/ui/dlg/BulletAndPositionDlg.cxx:707:14: error: variable 'sSelectStyle' set but not used [-Werror,-Wunused-but-set-variable] > OUString sSelectStyle; > ^ ...ever since the code's introduction in e3015d7021e689c71c2ed8e5dd01a74d832c84f0 "Add new customize and position merged dialog", and which means that SvxBulletAndPositionDlg::m_sBulletCharFormatName and second parameter of SvxBulletAndPositionDlg::SetCharFmts, both also introduced in that commit, were equally unused Change-Id: Id07c05777817298073d85719689b391bda533221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116821 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
...after e79e8117dcc7475d8d90afeaaac9eb7050ff244e "loplugin:unusedfields in sfx2" had removed the (only) read of sPattern Change-Id: I2413af34b15dec45c46df0ffabf1d910f92dd695 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116822 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann
...after 096168cacc574a71482520e5c3fbd79f975dc6ad "loplugin:writeonlyvars" had removed the (only) read of sFirstCharFmt Change-Id: I8b59f54b2bb8669c66a14df80c4c74fceb56b1c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116820 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09tdf#130428 remove unnecessary usage of SfxItemState::UNKNOWNArmin Le Grand (Allotropia)
See task, slowly trying to reduce usages of that flag Change-Id: I50dc8e21e2f5e82e21bf335d63d07cee1ee18d01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116913 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> Tested-by: Jenkins