summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-27add import test file for Pocket WordDavid Tardon
Change-Id: Idbd2ddb113f77a6dc3966110757c4037d993bd4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103515 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
2020-09-27restore PocketWord filter, this time backed by libwpsDavid Tardon
Change-Id: If9843ae717f58e683252c8ea55360a567978395e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103514 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
2020-09-27upload libwps 0.4.12David Tardon
Change-Id: Ib787098b98f68185c1b3f6b414efbec36cad02dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102332 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2020-09-27never null ScViewData*Caolán McNamara
and so remove some never called code Change-Id: Ia5a6501f9a5214a4069623832508a6f884cfa6ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103494 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-27Remove unused include list in hwpfilterJulien Nabet
Change-Id: I7cac4483173e7c75413a6b17a468659ee2790768 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103508 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Replace list by vector in vcl/Qt5VirtualDeviceJulien Nabet
Change-Id: I137019c15d3ee2886ad1bd53e671a89990891481 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103506 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Resolves: tdf#67007 display sheet-local range name in Name Box for selectionEike Rathke
Change-Id: Ia9980b13ed5c93cc72231ead532e3916e6234f56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103509 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2020-09-27tdf#136946 Add Shapes sidebar from LO Draw into Impressandreas kainz
Change-Id: I188347935f3bdc7ee2bc5b4998f4b95807e2051d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103471 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-09-27Remove unused include list in ucb/cmis_contentJulien Nabet
Change-Id: I7c554e883691e2f97e2f48b2a0353dfa9d4d84d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103507 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Remove unused include <list> in vcl/SalGtkFolderPickerJulien Nabet
Change-Id: Ic411ba2c8068616d54cb448c3eb73aa5a45d8a52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103503 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27ofz#25983 build failureCaolán McNamara
Change-Id: I639a569f9b4f88ff8a3bf7742bde042829f1433b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103510 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-27Restrict odk/examples to non-parallel makeStephan Bergmann
At least odk/examples/DevelopersGuide/Spreadsheet/Makefile contains two independent invocations of unopkg (i.e., $(DEPLOYTOOL)) and CustomTarget_odk/build-examples_java had once failed for me with > "~/lo/core/instdir/program/unopkg" add -f "~/lo/core/workdir/CustomTarget/odk/build-examples_java/out/sdk/LINUXexample.out/bin/ExampleDataPilotSource.oxt" > ERROR: unopkg cannot be started. The lock file indicates it is already running. If this does not apply, delete the lock file at: > ~/lo/core/workdir/CustomTarget/odk/build-examples_java/user/.lock ~/lo/core/desktop/source/pkgchk/unopkg/unopkg_shared.h:44 > make[2]: *** [Makefile:227: ~/lo/core/workdir/CustomTarget/odk/build-examples_java/out/sdk/LINUXexample.out/misc/DevGuideSpreadsheetExamples/devguide_ExampleDataPilotSource_register_component.flag] Error 1 So make sure the `make` invoked from those CustomTarget_odk/build_exmaple* does not inherit any -j flag from the outer `make`. (I had observed this with an explicit `make -j4` and --without-parallelism, but this should also be an issue for the implicit parallelism from the default --with-parallelism.) Change-Id: Iff368dbbcad01d3841d63c2985639ba6a3dec1f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103504 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-09-27Fix typoAndrea Gelmini
Change-Id: I27c2f4377b85436a675602aade85ae69964fff74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103491 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
2020-09-27Sidebar: add FormatPaintbrush to SidebarStylesPanelandreas kainz
Change-Id: I265f803432c12f39ca0025d602c2d032c549a6c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103469 Tested-by: Jenkins Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2020-09-27Fix an odk/examples dependencyStephan Bergmann
ImageShrink.oxt is created in the org/openoffice/comp/test sub-make, and CustomTarget_odk/build-examples_java had once failed for me with > make[2]: *** No rule to make target '~/lo/core/workdir/CustomTarget/odk/build-examples_java/out/sdk/LINUXexample.out/bin/ImageShrink.oxt', needed by 'ComponentsThumbsExample'. Stop. Change-Id: I926d0691e7eee3506d4afe2eda1a2fc873422e18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103502 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-09-27Replace list by vector in package/ohierarchyholderJulien Nabet
+ rename OWeakStorRefList_Impl to OWeakStorRefVector_Impl to make it more explicit Change-Id: I231c9e582cbfb4670835fe1ef0ce41692ad8dcb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103501 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Remove unused std::list in package/xstorageJulien Nabet
Change-Id: I4ac4176d60c29645bd8bc5922154cd3b83dac73e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103500 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Fix typo in codeAndrea Gelmini
Tested before split here: https://gerrit.libreoffice.org/c/core/+/103464 Change-Id: Iadc9dd49762ec63bd8b3edba322bcbf5d0f862a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103487 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I95f8fcdbfb2344624a2ec4cf0780b0af3bc7ba16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103498 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27Fix typoAndrea Gelmini
Change-Id: I3792328b8e768d069e1a5a593cd811764bf7b5b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103492 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27improve some exception messagesNoel Grandin
Change-Id: Ifc5d940fbf77ae13071c299fb6168bdc55dc5c95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103493 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-09-27Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: Idd33e9f70c9552c341b4d312bc33135f758715b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103449 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-27tdf#45705 Integrate zoom UI commands into Writer text edit viewJim Raykowski
Change-Id: I71481e018175086a1a1711db22cea03b13eda490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102830 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2020-09-26never null ScViewData*Caolán McNamara
Change-Id: Ie2c870ef1291b951a68ed4bb9344238d81c23762 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103472 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-26Related: tdf#136985 SfxStringListItem::GetString() crash in empty caseCaolán McNamara
probably since... commit a573b8b21688d9681f4fa129ec37cf89954e9d1c Date: Sat May 21 16:14:56 2011 -0430 Replace List for std::vector in SfxStringListItem. Change-Id: I7060b5693ba08fa5f70cc5cb3ae1b7a4722a31a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103408 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-26sc: move FilterFloatingWindow and FilterListBox out of gridwin.cxxTomaž Vajngerl
Change-Id: Ic6e4bb2be86f8c89ac1e5386eb78fe17036b4cc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103404 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-09-26Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to c3a22ded0e03d1629ccfa0b3e025d1bf01c2e452 - Refactor Navigation Help page Change-Id: I9e5f141400468aa3ef02b8a0d75129f944243145 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103486 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-09-26revert recent Polygon commitsNoel Grandin
This reverts commit 0cabffc05f3b40f5ee897df73475e09a3c05fc7 tools::PolyPolygon -> basegfx in canvas and commit 2c5d5a6d55a1ebd153f05523972a2c625484bde2 tools::PolyPolygon -> basegfx in filter Comment from quikee: The interpretation of integer polygons and floating point polygons (or any other float vs. int drawing primitives) are different, so you have to be really careful when changing, that the result after the change is still the same. A big problem is that we still have the metafile in OutputDevice, which is completely integer based - so there will be conversions that go from int representation to float representation to int again and to float (because backend is in floating point) and I really fear that because of this there will be regressions and even if not, it could make changing later more painful. This is the reason I wouldn't change these things without having tests that would show when there is a difference in rendering. Change-Id: I54addca4e5a72196b5f77f6c7689eb716451c1dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103483 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-09-26tdf#112279 Change the error message to more clearRoman Kuznetsov
Change-Id: Ib166e66b9a9cbf5cd29811dc1d0715a45ee920b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102934 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
2020-09-26Avoid -Werror=deprecated-declarationsStephan Bergmann
...with qt5-qtbase-devel-5.15.1-1.fc33.x86_64 on Fedora 33: > ~/lo/core/vcl/qt5/Qt5Widget.cxx: In member function ‘virtual void Qt5Widget::wheelEvent(QWheelEvent*)’: > ~/lo/core/vcl/qt5/Qt5Widget.cxx:144:59: error: ‘QPoint QWheelEvent::pos() const’ is deprecated: Use position() [-Werror=deprecated-declarations] > 144 | fillSalAbstractMouseEvent(rFrame, pEvent, pEvent->pos(), pEvent->buttons(), nWidth, aEvent) > | ^ > ~/lo/core/vcl/qt5/Qt5Widget.cxx:196:5: note: in expansion of macro ‘FILL_SAME’ > 196 | FILL_SAME(m_rFrame, width()); > | ^~~~~~~~~ > In file included from /usr/include/qt5/QtGui/QFocusEvent:1, > from ~/lo/core/vcl/qt5/Qt5Widget.cxx:32: > /usr/include/qt5/QtGui/qevent.h:225:19: note: declared here > 225 | inline QPoint pos() const { return p.toPoint(); } > | ^~~ But for one the types used by the other calls of the FILL_SAME macro do not have a position member function, so stop using the macro and spell it out explicitly here. And for another, QWheelEvent::position returns a QPointF instead of a QPoint, so need to convert that with toPoint. And for a third, QWheelEvent::position is only available since Qt 5.14 according to <https://doc.qt.io/qt-5/qwheelevent.html#position>. Change-Id: I6e64fc9717a9f5a85303f070c6a1b66ed21ec458 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103475 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-09-26Avoid -Werror=deprecated-declarationsStephan Bergmann
...with qt5-qtbase-devel-5.15.1-1.fc33.x86_64 on Fedora 33: > ~/lo/core/vcl/qt5/Qt5AccessibleWidget.cxx: In function ‘QAccessible::Relation {anonymous}::lcl_matchUnoRelation(short int)’: > ~/lo/core/vcl/qt5/Qt5AccessibleWidget.cxx:138:20: error: ‘constexpr QFlags<T>::QFlags(QFlags<T>::Zero) [with Enum = QAccessible::RelationFlag; QFlags<T>::Zero = int QFlags<QAccessible::RelationFlag>::Private::*]’ is deprecated: Use default constructor instead [-Werror=deprecated-declarations] > 138 | return nullptr; > | ^~~~~~~ > In file included from /usr/include/qt5/QtCore/qglobal.h:1304, > from /usr/include/qt5/QtCore/qnamespace.h:43, > from /usr/include/qt5/QtCore/qobjectdefs.h:48, > from /usr/include/qt5/QtCore/qobject.h:46, > from /usr/include/qt5/QtCore/QObject:1, > from ~/lo/core/vcl/inc/qt5/Qt5AccessibleWidget.hxx:14, > from ~/lo/core/vcl/qt5/Qt5AccessibleWidget.cxx:20: > /usr/include/qt5/QtCore/qflags.h:123:80: note: declared here > 123 | QT_DEPRECATED_X("Use default constructor instead") Q_DECL_CONSTEXPR inline QFlags(Zero) noexcept : i(0) {} > | ^~~~~~ Change-Id: Ic0c113fe208764e8bc0b9c3fbf7358d6af4000ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103474 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-09-26Avoid -Werror=nonnull with glibc-headers-x86-2.32-1.fc33.noarchStephan Bergmann
...on Fedora 33: > ~/lo/core/vcl/unx/generic/app/i18n_cb.cxx: In function ‘void Preedit_InsertText(preedit_text_t*, XIMText*, int)’: > ~/lo/core/vcl/unx/generic/app/i18n_cb.cxx:149:34: error: argument 1 is null but the corresponding size argument 3 value is 1024 [-Werror=nonnull] > 149 | size_t nBytes = wcstombs ( nullptr, pWCString, 1024 /* don't care */); > | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from ~/gcc/trunk/inst/include/c++/11.0.0/cstdlib:75, > from ~/lo/core/include/sal/log.hxx:15, > from ~/lo/core/vcl/unx/generic/app/i18n_cb.cxx:25: > /usr/include/stdlib.h:937:15: note: in a call to function ‘size_t wcstombs(char*, const wchar_t*, size_t)’ declared with attribute ‘access (write_only, 1, 3)’ > 937 | extern size_t wcstombs (char *__restrict __s, > | ^~~~~~~~ (Allowing the first argument to wcstombs to be null, and in which case the third argument is ignored, is a POSIX extension.) Change-Id: Ic078623643010b7539bc5bc1b498f18977ae77ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103473 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I16853a42b0f80fd09dce42971f6d165edbf2a5be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103461 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-09-26Update git submodulesJohnny_M
* Update helpcontent2 from branch 'master' to 8b0a2c4d66e11ec6f186b5eaf2166adb67cb2bc1 - tdf#132643 Translate German section IDs Change-Id: Iaec59772e78095a10c4c28e246e77c0469723cbc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103480 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-09-26Update git submodulesJohnny_M
* Update helpcontent2 from branch 'master' to a46f935b2d00c823e30c21b4cb02967fff86bc89 - tdf#132643 Translate German section IDs Change-Id: Ie8e1f394075477c73c70e5e7c01b0142f13888b7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103479 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-09-26Update git submodulesJohnny_M
* Update helpcontent2 from branch 'master' to 07b4bae30ce73c71223a270e3cb6facb84cfeaf1 - tdf#132643 Translate German section IDs Change-Id: I32e37d573903af82bd14e353df9611b2e2125489 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103478 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-09-26Update git submodulesJohnny_M
* Update helpcontent2 from branch 'master' to be7f9b6a251b2cbcd24aa1f2b97b8e095593b2bf - tdf#132643 Translate German section IDs Change-Id: Ifb561c069a27e71c66652289ffa4099ba4ec7e68 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103477 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-09-26Update git submodulesJohnny_M
* Update helpcontent2 from branch 'master' to 21d65441845c1265e3efb8fe9dade212fee70240 - tdf#132643 Translate German section IDs Change-Id: Ic553ccd8293161d20554df24884ca164fd59b76d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103476 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I9906dc44e8398abfad83c947659d82a8fac66bd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103457 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I3fb2bb8cfe22fd905a3badd2a90a9aef497bfcf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103448 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26tools::PolyPolygon -> basegfx in canvasNoel Grandin
Change-Id: I7b5ac7b434932515895bf60acfa0109e6a2ebd18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103417 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I5bc56a0dea4a157b276a59bd1050b08120b948ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103455 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I8945fc73085afb6e4cdfe5083f3732191341a1d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103459 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I823a0ae998addb620b490b649e1369106f8f4e8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103462 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Fix typoAndrea Gelmini
Change-Id: I2c5ea93645161eb4acb7bbfba21fdf30462c2635 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103465 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: Ib1b92b38f3eeb37d659b79572cafc1e3b79fcf29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103458 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I5e2b4f37296b521b5e942a8e9f9caf2137e39172 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103456 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Consolidate, factor out common duplicated code, tdf#128797 follow-upEike Rathke
Change-Id: I939c9f88a6cf09e1caa87131562ad67e389c2710 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103470 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I183c7fb15b37cfe6f691c6c75196958e6148ffac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103450 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-26Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I6a2f61934673756d45a83f49f0e7d9391995cda5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103422 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>