summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2020-05-13Include the language code in the volume name of a langpack dmgTor Lillqvist
Makes it easier to see which is which in Finder if you have several mounted. Change-Id: I6e1f5cfc4db3ed6595ba14e515080b5ecc0ad688 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94120 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-13ENABLE_DBGUTIL=TRUE implies ENABLE_DEBUG=TRUEStephan Bergmann
Change-Id: I709561ba910ff2274a40e578412ecd7040886959 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94144 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-13The dmg needs more space also in the ENABLE_DEBUG caseTor Lillqvist
(Not something that is used when actually building for distribution, sure, but when testing.) Change-Id: I67410a8cd9627c5a2c19f58df4529a44e488c961 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94119 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-13Remove some code that was commented-out ten years agoTor Lillqvist
Change-Id: Iead0a7e770a5533e3fe4585f76e343f0039328fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94105 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-13external: update pdfium to 4137Miklos Vajna
Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94078 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-12weld help browserCaolán McNamara
Change-Id: Ibd8dcc10c4403731953e2e46db4ae8f89ebc7e4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93216 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-12Rename attributes to reflect that they represent different effectsMike Kaganski
... not only shadow. In preparation to add soft edge effect (tdf#49247). Change-Id: Ia5b17fff00e1c2d7f717179687dbd44410795a71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94007 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-05-12fix shebangRene Engelhard
$ ./solenv/bin/version.py 7.0.0 File "./solenv/bin/version.py", line 39 print('error updating %s: %s' % (filename, err), file=sys.stderr) ^ SyntaxError: invalid syntax Change-Id: I034e5b9abab1a555d8749eb5dd2349bfe90e4092 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93839 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-05-10new loplugin:simplifypointertoboolNoel Grandin
Change-Id: Iff68e8f379614a6ab6a6e0d1bad18e70bc76d76a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91907 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-09remove vclmetafileprocessor2d.{cxx,hxx} from clang-format blacklistTomaž Vajngerl
Change-Id: I53f7660a22ed66ab7d50370d871f9d10d1bedc10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93825 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-09dl: move {Eps,FillHatch,PointArray}Primitive2D to global includeTomaž Vajngerl
Change-Id: I85c10cb957f5065d964863360ca03355c87b7980 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93821 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-08split button.hxx into toolkit-only pieceCaolán McNamara
Change-Id: I792efb417504a3b55043ff4fc3fd3597a9b953f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93678 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-08sw: remove now unused SwBlinkPortionMiklos Vajna
Change-Id: If2ae13219f7907eb2b2a66a38bcd636dd64dfe3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93676 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-07fix macOS codesigning when using a separate builddirChristian Lohmaier
88453fd13a653963b394b8f865ff104b5545f137 changed the hardened_runtime.xcent to a generated file Change-Id: I54b927d1990835bb902f62e03d51b0e70735269c
2020-05-07no longer force -arch:SSE on WindowsLuboš Luňák
SSE2 has been pretty much a requirement for running Windows since about 2018, so there should be ~nobody needing this. https://lists.freedesktop.org/archives/libreoffice/2020-May/085029.html Change-Id: I579eb92c18e42c57aa1421b889cfa7997b84915f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93558 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-05Disable -Wstringop-overflow in --enable-optimized builds with GCCStephan Bergmann
This reverts commit e287fde52fb9de5bdf1d00c8a3fbfcca7db9892c "Silence bogus -Wstringop-overflow with GCC trunk towards GCC 10", as that workaround, which happened to work for some revisions of GCC trunk towards GCC 10, no longer works for GCC 10 release candidates, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92893#c9> "[10 Regression] Unhelpful -Wstringop-overflow warning for a trailing one-element array". (Using -Wstringop-overflow=1 instead of the -Wstringop-overflow=2 default would have still caused bogus warnings, requiring -Wno-stringop-overflow.) Change-Id: I9b7342748c18da32f509b4a0e0653aede8447657 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93499 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-04remove helperwrongspellrenderer.{cxx,hxx} from clang-format blacklistTomaž Vajngerl
Change-Id: Ib0b1f389189012ab27dd061481737ac6a6a1a84e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93388 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-04remove vclhelperbufferdevice.{cxx,hxx} from clang-format blacklistTomaž Vajngerl
Change-Id: I0ab6572ab700756322f96b982f7faeb6d8dc9fb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93362 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-02remove vclpixelprocessor2d.cxx from clang-format blacklistTomaž Vajngerl
Change-Id: I03ad72d0754cb8c180f4eab0e8040c3dab533ef9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93321 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-02remove vclprocessor2d.cxx from clang-format blacklistTomaž Vajngerl
Change-Id: I359dfb0fe6fdf88e9c8141186a770c4cde777161 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93320 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-01Restructure solenv/bin/assemble-flatpak.shStephan Bergmann
...so that parts of it can be reused by the Flatpak build done from Fedora RPMs (see <https://src.fedoraproject.org/flatpaks/libreoffice>). The reused parts are split out into solenv/bin/assemble-flatpak-*.sh files. (I can't remember any specific reason why I added the <releases> section to the Flathub org.libreoffice.LibreOffice.appdata.xml; maybe just because the file format allows for it and it appeared easy to generate the section when writing the file. For the Fedora LO RPMs, none of the existing appdata.xml files contained such a section, and generating one for the Fedora Flatpak case would require obtaining values for those LIBO_VERSION_* variables, so I just added a switch to solenv/bin/assemble-flatpak-appdata-step1.sh allowing not to write that section at all. Splitting solenv/bin/assemble-flatpak-appdata.sh in two steps is necessary because the Fedora Flatpak case wants to replace the screenshots in the first part of the generated org.libreoffice.LibreOffice.appdata.xml, but not in the appended original appdata.xml files, so needs to hook in between those two steps.) Change-Id: Ic527f3d88ccbee85e86dad3569b8e73776adf273 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93260 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-01Adapt solenv/flatpak-manifest.in to 8b9c26218cb2c9526f69b40ff6f72ce757a464c2Stephan Bergmann
..."external: update libxmlsec to 1.2.30" Change-Id: I53eb2b0a2e83b081e273d73ca785afdb6af4bd19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93259 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-01move some headers inside their respective modulesNoel Grandin
Change-Id: I6b463724e301989a60e423bbfc25aa1bf146ff5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93267 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-29weld SfxTemplatePanelControlCaolán McNamara
Change-Id: Ib3f6d01ddec37afc3987423dc15ab84ad6475f37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92942 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-27solenv: handle copying empty directories in the installerMiklos Vajna
'make test-install -o build' fails without this when --enable-macosx-sandbox is used. It is harmless in other cases. Change-Id: Ic62a2c7729402cf45172ccc12fa83b46bee31e78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92985 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-26move PanelLayout to sfx2Caolán McNamara
Change-Id: If29ccb67835adba3ff6cf2eb53f348bbe71d6463 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92933 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-26remove GraphicNative{Metadata,Transform} from clang-f. blacklistTomaž Vajngerl
Change-Id: Ib60485e5d35e9d3ec2b0028d38fb8d5eaa72421c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92905 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-04-25controllayout.hxx can be a toolkit-only headerCaolán McNamara
Change-Id: I4ad08decf432a890cdf7acf475d15210ba813f76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92903 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-24weld StylesPropertyPanelCaolán McNamara
and SvxStyleToolBoxControl, etc. use a GtkOverlay to support the submenu hackery in the Style wysiwyg combobox dropdown Change-Id: I17baa56f382243070ee49e6d707e97324e4f4d67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85720 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-24Properly escape desktop file string valuesStephan Bergmann
<https://git.libreoffice.org/translations/+/ 781673fea7346b0d148bf85984826c0556fdf1b9%5E!/> "update translations for 4.4.0.0alpha1" had introduced > msgstr "" > "ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot \n" > " asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट \n" > " प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला." into translations/source/kok/sysui/desktop/share.po, which for one is a concatenation of multiple strings spread over multiple lines, and for another contains encoded newlines ("\n"). The resulting > kok = "ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot > asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट > प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला." in workdir/CustomTarget/sysui/share/launcher_comment.ulf combined the multiple strings into a single one, while at the same time expanding the encoded newlines ("\n") into actual line breaks, resulting in a multi-line string. Prior to d2c23609083d7b3e5267b1e4c923476cbc509d00 "tdf#130911: convert desktop-translate from Perl to Python", solenv/bin/desktop-translate.pl mis-translated that to a cut > Comment[kok]=ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot in instdir/share/xdg/startcenter.desktop, silently dropping all but the first line of the multi-line string from the ulf file. But the resulting desktop file was at least syntactially correct, so the broken content apparently went unnoticed (or at least unfixed). Then, d2c23609083d7b3e5267b1e4c923476cbc509d00 "tdf#130911: convert desktop-translate from Perl to Python" caused solenv/bin/desktop-translate.py to fail with an AssertionError upon multi-line strings in ulf files (see <https://bugs.documentfoundation.org/show_bug.cgi?id=130911#c6> "Policy on converting Perl scripts to Python"). f516f6753d87d963c06953c60e6ad56112c191be "Handle desktop files with multiline entries" was meant to address that, but it caused solenv/bin/desktop-translate.py to now mis-translate the given multi-line ulf string to the broken lines > Comment[kok]=ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot > asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट > प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला. in instdir/share/xdg/startcenter.desktop violating the desktop file syntax (failing to escape the line breaks; see <https://specifications.freedesktop.org/ desktop-entry-spec/desktop-entry-spec-1.1.html>). That broken desktop file apparently still went unnoticed for a while until I now tried to build a flatpak, which failed with [...] > echo "custom cmd" && ( /run/build/libreoffice/solenv/bin/assemble-flatpak.sh ) > custom cmd > Error on file "/app/share/applications/org.libreoffice.LibreOffice.desktop": Key file contains line “ asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट ” which is not a key-value pair, group, or comment > make: *** [Makefile:228: cmd] Error 1 > Error: module libreoffice: Child process exited with code 2 While trying to make our code generate well-formed desktop files (see the newly added comments in solenv/bin/desktop-translate.py), I also added code to escape leading spaces as "\s" (with a line > foo= bar in a desktop file, any space around the "=" is ignored, so if the value shall actually start with a space, it must be escaped as > foo=\sbar ). For all the desktop files generated with solenv/bin/desktop-translate.py in sysui/CustomTarget_share.mk, the difference of what is generated with this commit is > --- workdir/CustomTarget/sysui/share/libreofficedev/impress.desktop > +++ workdir/CustomTarget/sysui/share/libreofficedev/impress.desktop > @@ -201,7 +201,7 @@ > Comment[kn]=ಇಂಪ್ರೆಸ್ ಬಳಸಿ ಜಾರುಫಲಕ ಪ್ರದರ್ಶನಗಳಿಗಾಗಿ, ಸಭೆಗಳಲ್ಲಿ ಬಳಸಲು, ಮತ್ತು ಜಾಲ ಪುಟಗಳನ್ನು ಪ್ರಸ್ತುತಿಗಳನ್ನು ಸೃಷ್ಟಿಸಿ ಮತ್ತು ಸಂಪಾದಿಸಿ. > Comment[ko]=임프레스를 사용하여 슬라이드 쇼, 회의 및 웹 페이지에 대한 프레젠테이션을 만들고 편집합니다. > Comment[kok]=स्लायड शो, बसका आनिक वेब पानांखातीर इंप्रेस वापरून सादरीकरण तयार करात आनिक सम्पादन करात. > -Comment[ks]= ایمپریس کے ذریعہ سے پریزینٹیشنس کے لئےسلائیڈشوز،میٹینگ اورویب پیجیزکوتخلیق اورمرتب کرو۔ > +Comment[ks]=\sایمپریس کے ذریعہ سے پریزینٹیشنس کے لئےسلائیڈشوز،میٹینگ اورویب پیجیزکوتخلیق اورمرتب کرو۔ > Comment[lb]=Create and edit presentations for slideshows, meeting and Web pages by using Impress. > Comment[lo]=ສ້າງແລະແກ້ໄຂພາບເລື່ອນສຳລັບການບັນຍາຍ, ການປະຊຸມແລະໜ້າເວັບດ້ວຍການໃຊ້ອີມເຟສ. > Comment[lt]=Pateikčių rengykle rengiamos pateiktys pranešimams, pateiktis galima įkelti į tinklalapį. > @@ -231,7 +231,7 @@ > Comment[rw]=Kurema no guhindura amayerekana y'amagaragazabice, inama n'impapuro Rubuga ukoresheje Impress. > Comment[sa_IN]=इम्प्रेस् उपयुज्य स्लैड्शोस्, सम्मेलनम् तथा जालपृष्ठानि इत्येषां कृते प्रस्तुतीः उत्पादय तथा सम्पदाय च। > Comment[sat]=सालइड उदुक् ला़गित् तेयार आर उनुदुक् सासापड़ाव, दुपुडुप आर वेब साहटा दाराय ते पोरभाव रेयाक् बेभार .सालइड उदुक् लागित तेयार आर उनुदुक् सापड़ाव, दुपुडुप आर वेब साहटा दाराय ते पोरभाव रेयाक् बेभार . > -Comment[sd]= ٺپي جو اِستعمال ڪندي سلائڊشوز، ميٽنگن ۽ ويب صفحن لاءِ پيشڪشون خلقيو ۽ سمپادت ڪريو > +Comment[sd]=\sٺپي جو اِستعمال ڪندي سلائڊشوز، ميٽنگن ۽ ويب صفحن لاءِ پيشڪشون خلقيو ۽ سمپادت ڪريو > Comment[si]=Impress භාවිතා කරමින් ඉදිරිපත් කිරීම් සඳහා තිරපෙන්නුම්, හමුවීම් සහ වියුණු පිටු සාදන්න සහ වෙනස් කරන්න. > Comment[sid]=Xiiwatenni isilaadi-leellishote, xaadohonna Diru qoollara shiqishsha kalaqqe mucceessi. > Comment[sk]=Vytvárajte a upravujte prezentácie pre porady s stretnutia s použitím Impress. > --- workdir/CustomTarget/sysui/share/libreofficedev/startcenter.desktop > +++ workdir/CustomTarget/sysui/share/libreofficedev/startcenter.desktop > @@ -82,7 +82,7 @@ > GenericName[kmr_Latn]=Nivîsgeh > GenericName[kn]=ಕಛೇರಿ > GenericName[ko]=오피스 > -GenericName[kok]= कार्यालय > +GenericName[kok]=\sकार्यालय > GenericName[ks]=آفس > GenericName[lb]=Office > GenericName[lo]=ຫ້ອງການ > @@ -201,7 +201,9 @@ > Comment[kmr_Latn]=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > Comment[kn]=ಮುಕ್ತ ಹಾಗು ಶಿಷ್ಟ ಎಂದು ಪರಿಗಣಿಸಲಾದ ODF ದಸ್ತಾವೇಜು ವಿನ್ಯಾಸಕ್ಕೆ ಹೊಂದಿಕೆಯಾಗುವ ಒಂದು ಆಫೀಸ್ ಪ್ರೊಡಕ್ಟೀವ್ ಸೂಟ್ ಆಗಿದೆ. ಡಾಕ್ಯುಮೆಂಟ್ ಫೌಂಡೇಶನ್‌ನಿಂದ ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ. > Comment[ko]=개방 및 표준화된 ODF 문서 형식에 적합한 오피스 생산성 제품군입니다. 문서재단(The Document Foundation)에서 지원합니다. > -Comment[kok]=ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot > - asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट > - प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला. > +Comment[kok]=ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot \n asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट \n प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला. > Comment[ks]=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > Comment[lb]=Die produktive Bürosoftware ist kompatibel zu dem offenen und standardisierten OpenDocument Format (ODF). Unterstützt von The Document Foundation. > Comment[lo]=ຊຸດໂປຣແກຣມຜະລິດຕະພັນສຳລັບສຳນັກງານທີ່ເຂົ້າກັນໄດ້ກັບຮູບແບບເອກະສານ ODF ທີ່ເປີດກ້ວາງ ແລະ ເປັນມາດຕະຖານ. ສະໜັບສະໜູນໂດຍ The Document Foundation. > --- workdir/CustomTarget/sysui/share/libreofficedev/base.desktop > +++ workdir/CustomTarget/sysui/share/libreofficedev/base.desktop > @@ -221,7 +221,7 @@ > Comment[nso]=Laola didathapeisi, hlama dipotšišo le dipego bakeng sa go latedišiša le go laola tshedimošo ya gago o diriša Base. > Comment[oc]=Base - Gestion de basas de donadas, creacion de requèstas e rapòrts. > Comment[om]=Base fayyadamuun kuusaa deetaa taligi, gaafataa fi gabaasota odeeffannoo kee hordofuu fi taliguuf oolan uumi. > -Comment[or]= ଆଧାର ଉପୟୋଗ କରି ତଥ୍ଯ ସଞ୍ଚଯଗୁଡିକ ପରିଚାଳନା ,ପ୍ରଶ୍ନଗୁଡିକୁ ସୃଷ୍ଟି ଏବଂ ରିପୋର୍ଟଗୁଡିକୁ ଚିହ୍ନଟ କର ଏବଂ ତୁମ ସୂଚନାକୁ ପରିଚାଳନା କର। > +Comment[or]=\sଆଧାର ଉପୟୋଗ କରି ତଥ୍ଯ ସଞ୍ଚଯଗୁଡିକ ପରିଚାଳନା ,ପ୍ରଶ୍ନଗୁଡିକୁ ସୃଷ୍ଟି ଏବଂ ରିପୋର୍ଟଗୁଡିକୁ ଚିହ୍ନଟ କର ଏବଂ ତୁମ ସୂଚନାକୁ ପରିଚାଳନା କର। > Comment[pa_IN]=ਬੇਸ (Base) ਨਾਲ ਆਪਣਾ ਡਾਟਾਬੇਸ ਸੰਭਾਲੋ, ਸਵਾਲ ਬਣਾਓ ਅਤੇ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਜਾਂਚਿਆ ਅਤੇ ਪ੍ਰਬੰਧ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। > Comment[pl]=Administruj bazami danych, twórz kwerendy i raporty, aby efektywnie zarządzać informacją za pomocą programu Base. > Comment[pt]=Gerir bases de dados, criar consultas e relatórios para monitorizar e editar as informações das bases de dados com o Base. > --- workdir/CustomTarget/sysui/share/libreoffice/impress.desktop 2020-04-23 15:48:13.806086032 +0200 > +++ TMP/libreoffice/impress.desktop 2020-04-23 15:42:44.515404783 +0200 > @@ -201,7 +201,7 @@ > Comment[kn]=ಇಂಪ್ರೆಸ್ ಬಳಸಿ ಜಾರುಫಲಕ ಪ್ರದರ್ಶನಗಳಿಗಾಗಿ, ಸಭೆಗಳಲ್ಲಿ ಬಳಸಲು, ಮತ್ತು ಜಾಲ ಪುಟಗಳನ್ನು ಪ್ರಸ್ತುತಿಗಳನ್ನು ಸೃಷ್ಟಿಸಿ ಮತ್ತು ಸಂಪಾದಿಸಿ. > Comment[ko]=임프레스를 사용하여 슬라이드 쇼, 회의 및 웹 페이지에 대한 프레젠테이션을 만들고 편집합니다. > Comment[kok]=स्लायड शो, बसका आनिक वेब पानांखातीर इंप्रेस वापरून सादरीकरण तयार करात आनिक सम्पादन करात. > -Comment[ks]= ایمپریس کے ذریعہ سے پریزینٹیشنس کے لئےسلائیڈشوز،میٹینگ اورویب پیجیزکوتخلیق اورمرتب کرو۔ > +Comment[ks]=\sایمپریس کے ذریعہ سے پریزینٹیشنس کے لئےسلائیڈشوز،میٹینگ اورویب پیجیزکوتخلیق اورمرتب کرو۔ > Comment[lb]=Create and edit presentations for slideshows, meeting and Web pages by using Impress. > Comment[lo]=ສ້າງແລະແກ້ໄຂພາບເລື່ອນສຳລັບການບັນຍາຍ, ການປະຊຸມແລະໜ້າເວັບດ້ວຍການໃຊ້ອີມເຟສ. > Comment[lt]=Pateikčių rengykle rengiamos pateiktys pranešimams, pateiktis galima įkelti į tinklalapį. > @@ -231,7 +231,7 @@ > Comment[rw]=Kurema no guhindura amayerekana y'amagaragazabice, inama n'impapuro Rubuga ukoresheje Impress. > Comment[sa_IN]=इम्प्रेस् उपयुज्य स्लैड्शोस्, सम्मेलनम् तथा जालपृष्ठानि इत्येषां कृते प्रस्तुतीः उत्पादय तथा सम्पदाय च। > Comment[sat]=सालइड उदुक् ला़गित् तेयार आर उनुदुक् सासापड़ाव, दुपुडुप आर वेब साहटा दाराय ते पोरभाव रेयाक् बेभार .सालइड उदुक् लागित तेयार आर उनुदुक् सापड़ाव, दुपुडुप आर वेब साहटा दाराय ते पोरभाव रेयाक् बेभार . > -Comment[sd]= ٺپي جو اِستعمال ڪندي سلائڊشوز، ميٽنگن ۽ ويب صفحن لاءِ پيشڪشون خلقيو ۽ سمپادت ڪريو > +Comment[sd]=\sٺپي جو اِستعمال ڪندي سلائڊشوز، ميٽنگن ۽ ويب صفحن لاءِ پيشڪشون خلقيو ۽ سمپادت ڪريو > Comment[si]=Impress භාවිතා කරමින් ඉදිරිපත් කිරීම් සඳහා තිරපෙන්නුම්, හමුවීම් සහ වියුණු පිටු සාදන්න සහ වෙනස් කරන්න. > Comment[sid]=Xiiwatenni isilaadi-leellishote, xaadohonna Diru qoollara shiqishsha kalaqqe mucceessi. > Comment[sk]=Vytvárajte a upravujte prezentácie pre porady s stretnutia s použitím Impress. > --- workdir/CustomTarget/sysui/share/libreoffice/startcenter.desktop > +++ workdir/CustomTarget/sysui/share/libreoffice/startcenter.desktop > @@ -82,7 +82,7 @@ > GenericName[kmr_Latn]=Nivîsgeh > GenericName[kn]=ಕಛೇರಿ > GenericName[ko]=오피스 > -GenericName[kok]= कार्यालय > +GenericName[kok]=\sकार्यालय > GenericName[ks]=آفس > GenericName[lb]=Office > GenericName[lo]=ຫ້ອງການ > @@ -201,7 +201,9 @@ > Comment[kmr_Latn]=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > Comment[kn]=ಮುಕ್ತ ಹಾಗು ಶಿಷ್ಟ ಎಂದು ಪರಿಗಣಿಸಲಾದ ODF ದಸ್ತಾವೇಜು ವಿನ್ಯಾಸಕ್ಕೆ ಹೊಂದಿಕೆಯಾಗುವ ಒಂದು ಆಫೀಸ್ ಪ್ರೊಡಕ್ಟೀವ್ ಸೂಟ್ ಆಗಿದೆ. ಡಾಕ್ಯುಮೆಂಟ್ ಫೌಂಡೇಶನ್‌ನಿಂದ ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ. > Comment[ko]=개방 및 표준화된 ODF 문서 형식에 적합한 오피스 생산성 제품군입니다. 문서재단(The Document Foundation)에서 지원합니다. > -Comment[kok]=ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot > - asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट > - प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला. > +Comment[kok]=ओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला.doftor utopodok suite ugtem ani promannit ODF dostavez pod'dotek susangot \n asa. Dostavez protixtana thavn pattimbo lablaओफीस प्रोडक्टिवीटी सुट उगडपाक अनुरुप जाला आनी ओडीएफ दस्तावेज फोरमेट \n प्रमाणभूत केला. डोक्युमेंट फाउंडेशनान आदारभूत केला. > Comment[ks]=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > Comment[lb]=Die produktive Bürosoftware ist kompatibel zu dem offenen und standardisierten OpenDocument Format (ODF). Unterstützt von The Document Foundation. > Comment[lo]=ຊຸດໂປຣແກຣມຜະລິດຕະພັນສຳລັບສຳນັກງານທີ່ເຂົ້າກັນໄດ້ກັບຮູບແບບເອກະສານ ODF ທີ່ເປີດກ້ວາງ ແລະ ເປັນມາດຕະຖານ. ສະໜັບສະໜູນໂດຍ The Document Foundation. > --- workdir/CustomTarget/sysui/share/libreoffice/base.desktop 2020-04-23 15:48:13.870086197 +0200 > +++ TMP/libreoffice/base.desktop 2020-04-23 15:42:44.552404881 +0200 > @@ -221,7 +221,7 @@ > Comment[nso]=Laola didathapeisi, hlama dipotšišo le dipego bakeng sa go latedišiša le go laola tshedimošo ya gago o diriša Base. > Comment[oc]=Base - Gestion de basas de donadas, creacion de requèstas e rapòrts. > Comment[om]=Base fayyadamuun kuusaa deetaa taligi, gaafataa fi gabaasota odeeffannoo kee hordofuu fi taliguuf oolan uumi. > -Comment[or]= ଆଧାର ଉପୟୋଗ କରି ତଥ୍ଯ ସଞ୍ଚଯଗୁଡିକ ପରିଚାଳନା ,ପ୍ରଶ୍ନଗୁଡିକୁ ସୃଷ୍ଟି ଏବଂ ରିପୋର୍ଟଗୁଡିକୁ ଚିହ୍ନଟ କର ଏବଂ ତୁମ ସୂଚନାକୁ ପରିଚାଳନା କର। > +Comment[or]=\sଆଧାର ଉପୟୋଗ କରି ତଥ୍ଯ ସଞ୍ଚଯଗୁଡିକ ପରିଚାଳନା ,ପ୍ରଶ୍ନଗୁଡିକୁ ସୃଷ୍ଟି ଏବଂ ରିପୋର୍ଟଗୁଡିକୁ ଚିହ୍ନଟ କର ଏବଂ ତୁମ ସୂଚନାକୁ ପରିଚାଳନା କର। > Comment[pa_IN]=ਬੇਸ (Base) ਨਾਲ ਆਪਣਾ ਡਾਟਾਬੇਸ ਸੰਭਾਲੋ, ਸਵਾਲ ਬਣਾਓ ਅਤੇ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਜਾਂਚਿਆ ਅਤੇ ਪ੍ਰਬੰਧ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। > Comment[pl]=Administruj bazami danych, twórz kwerendy i raporty, aby efektywnie zarządzać informacją za pomocą programu Base. > Comment[pt]=Gerir bases de dados, criar consultas e relatórios para monitorizar e editar as informações das bases de dados com o Base. That is, besides the fix for that one multi-line Comment[kok], there are various cases where the original translations/ *.po file contains a leading space that is now properly preserved, instead of silently getting lost. However, all those leading spaces, as well as the embedded "\n" newlines in that multi-line translations/source/kok/sysui/desktop/share.po string, were probably added by accident by the po file authors, rather than being meant to be preserved in the resulting desktop files. Thus, translators should revist those po file sources and make any relevant fixes there. Change-Id: I0aee8d064cb1430558ec32984253652a0bd6db3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92838 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-24Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
Change-Id: I274b7454262a0993e0cf728f9838f6b17bfdb3e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92836 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-24Flatpak: Add /app/bin/libreoffice -> /app/libreoffice/program/soffice symlinkStephan Bergmann
Which removes the need to rewrite the Exec=${UNIXBASISROOTNAME} lines from sysui/desktop/menus/*.desktop, and helps to harmonize the plain Flatpak build with the one done from Fedora RPMs (see <https://src.fedoraproject.org/flatpaks/libreoffice>). (Also change the manifest command from an absolute path to a filename relative to PATH. It is not clear to me which one would be better or more conventional, but at least <https://docs.flatpak.org/en/latest/manifests.html> also uses just a filename in its example.) Change-Id: I69c380b84503bf3d85801093fb92567852ceb00b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92837 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-24xmloff: create SchXMLExport_Styles instances with an uno constructorMiklos Vajna
See tdf#74608 for motivation. Change-Id: Ib15016bf08323936818bd9a26049772d3d6922c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92824 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-23Drop Macromedia Flash export filterGabor Kelemen
Flash technology is going to be retired by the end of 2020 by Adobe: https://theblog.adobe.com/adobe-flash-update/ With this ahead doesn't make much sense for LO 7.0 to support exporting presentations and drawings to swf anymore. Change-Id: Ic2c6e95db2f56bcd4eb25abdd0a6748aee9b0e4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92507 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-23tdf#131992 liblo-native-code: Add two more ctorsMichael Weghorn
Those are required for the PPTX attached to tdf#131992. Otherwise e.g. Android Viewer crashes when trying to open the bug doc. Change-Id: I5a936a2fe60fe6f6ce1d21f94aedc47686329dbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92711 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2020-04-22weld EditControlCaolán McNamara
as used by the LibreLogo toolbar Change-Id: Ice60d1f5146a58cab5bab44a12a2bdcf4dbd77ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92703 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22Fix desktop-translate.pyStephan Bergmann
...to not generate broken files relative to pre- d2c23609083d7b3e5267b1e4c923476cbc509d00 "tdf#130911: convert desktop-translate from Perl to Python", e.g. > --- workdir/CustomTarget/sysui/share/libreoffice/startcenter.desktop > +++ workdir/CustomTarget/sysui/share/libreoffice/startcenter.desktop > @@ -25,13 +25,13 @@ > Exec=${UNIXBASISROOTNAME} %U > MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis; > Name=${PRODUCTNAME} ${PRODUCTVERSION} > -GenericName=Office > -GenericName[de]=Office > +=Office > +GenericNameGenericName[de]=Office > GenericName[en]=Office > GenericName[fi]=Toimisto > GenericName[hu]=Iroda > -Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > -Comment[de]=Die produktive Bürosoftware ist kompatibel zu dem offenen und standardisierten OpenDocument-Format (ODF). Unterstützt von The Document Foundation. > +=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > +CommentComment[de]=Die produktive Bürosoftware ist kompatibel zu dem offenen und standardisierten OpenDocument-Format (ODF). Unterstützt von The Document Foundation. > Comment[en]=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. > Comment[fi]=Avoimen ODF-asiakirjastandardin kanssa yhteensopiva, The Document Foundationin tukema toimisto-ohjelmisto. > Comment[hu]=Az irodai programcsomag kompatibilis a nyílt és a szabványosított ODF dokumentumformátummal. A The Document Foundation támogatja. (as captured with a `--with-lang=de en-US fi hu` build). (The original solenv/bin/desktop-translate.pl had > $keyline =~ s/^$key/$outkey/; to replace key with outkey in keyline.) Change-Id: I006e2a9cba5f91d41d925bc93949a4a975891008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92669 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-21CLANG_C -> CLANG_CCLuboš Luňák
Change-Id: I50ed05116df3f295af6406f0ee45610d9e1e031e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92619 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-21don't try to use -fno-enforce-eh-specs with ClangLuboš Luňák
The use can be triggered when using gb_LinkTarget_use_clang, but Clang unlike GCC doesn't know the option. Change-Id: Idd109a09127061a72940de9229f0dd34b221375d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92611 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-20prefer building Skia with Clang if possible (tdf#131697)Luboš Luňák
I.e. try to find and use Clang even if the default compiler is something else. Skia is optimized to be built with Clang(-cl) and in CPU-based raster mode some operations are several times slower if built with something else (e.g. fmax/fmin do not get optimized to inline assembly). It is enough to select Clang to be installed in the MSVS installer. At this point it unclear how to handle release binaries, if it should work this way and enforced, or maybe Clang could be used for building everything, or maybe some other way. Change-Id: I6b95a0f2d5cbf176942d9e01136990b14be6dba8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92415 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-20Translate German variable namesJohnny_M
Ende -> End Change-Id: I2d63ddfeb1fa59ed1b0e3bbf2d39d5221cd5425f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92026 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2020-04-18upload libwps 0.4.11David Tardon
Change-Id: I068c7fe1ecf28755b095c5502d4c2dd42a54489c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92473 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
2020-04-18upload libmwaw 0.3.16David Tardon
Change-Id: Idc7ed6bbcd3298138fb92c81ddf7dd6278d201dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92472 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
2020-04-18upload libstaroffice 0.0.7David Tardon
Change-Id: I3a12e75c61671a17653b7feb2147dfe4aff47613 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92471 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
2020-04-17move LIBO_LANG=C setting to gb_TEST_ENV_VARSRene Engelhard
... since it is an environment variable after all (and without it timeout $(gb_UITest_COMMAND) doesn't work). Change-Id: I898e4b90070f3f4883a707fc88c99e98bc039d9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92060 Tested-by: Jenkins Tested-by: Rene Engelhard <rene@debian.org> Reviewed-by: Rene Engelhard <rene@debian.org>
2020-04-17xmloff: create SchXMLExport (flat OOoXML) instances with an uno constructorMiklos Vajna
See tdf#74608 for motivation. Change-Id: I67138b848411d91172ceec7af6826841b017cfdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92390 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-16tdf#131120 use a replacement for GtkComboBoxCaolán McNamara
the problems with GtkComboBox we have are: 1) https://gitlab.gnome.org/GNOME/gtk/issues/1910 has_entry long menus take forever to appear (tdf#125388) on measuring each row, the GtkComboBox GtkTreeMenu will call its area_apply_attributes_cb function on the row, but that calls gtk_tree_menu_get_path_item which then loops through each child of the menu looking for the widget of the row, so performance drops to useless. All area_apply_attributes_cb does it set menu item sensitivity, so block it from running with fragile hackery which assumes that the unwanted callback is the only one with a 2) https://gitlab.gnome.org/GNOME/gtk/issues/94 when a super tall combobox menu is activated, and the selected entry is sufficiently far down the list, then the menu doesn't appear under wayland 3) https://gitlab.gnome.org/GNOME/gtk/issues/310 no typeahead support 4) we want to be able to control the width of the button, but have a drop down menu which is not limited to the width of the button 5) https://bugs.documentfoundation.org/show_bug.cgi?id=131120 super tall menu doesn't appear under X sometimes In general we often pack a lot into the comboboxes and the default ones don't like that. Overlay scrolling is turned off for the GtkTreeView replacement because otherwise there are null-derefs in gtk on indicator->scrollbar on repeated reopenings Change-Id: I1b6164020996377341b5992d593a027b76021f65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91990 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-15Related tdf#130778: New About dialogHeiko Tietze
More flexible dialog logo & about images as SVGs Change-Id: Icefa035893e241a7dee6aa28236e6b89b38477de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91908 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-04-15Handle desktop files with multiline entries.Jussi Pakkanen
This fixes a regression mentioned e.g. here: https://bugs.documentfoundation.org/show_bug.cgi?id=130911#c6 Change-Id: Ic1a826ba933b8387d39aa25245095f27b0237801 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92050 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>