summaryrefslogtreecommitdiff
path: root/xmerge
AgeCommit message (Collapse)Author
2022-09-15cid#1509209 DCN: Don't Catch NullPointer ExceptionCaolán McNamara
Change-Id: I8e2cb9c71793a05db4f08662ee497a5f95759d67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139995 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-10Generally determine Rdb content from gb_*_set_componentfile callsStephan Bergmann
...instead of by listing the content somewhat redundantly in the Rdb_*.mk files, to avoid duplication of logic for components that are only built conditionally (and thus should only be included conditionally in the corresponding Rdb). To achieve that, add an "rdb" parameter to gb_ComponentTarget_ComponentTarget (and to the gb_*_set_componentfile macros that internally call gb_ComponentTarget_ComponentTarget), which is used to make the appropriate gb_Rdb_add_component call internally from within gb_ComponentTarget_ComponentTarget. (As a special case, gb_CppunitTest_set_componentfile shall not call gb_Rdb_add_component, as that has already been done by the corresponding gb_Library_set_componentfile call, so allow the gb_ComponentTarget_ComponentTarget "rdb" parameter to be empty to support that special case.) Most Rdb_*.mk files are thus mostly empty now. One exception is i18npool/Rdb_saxparser.mk, which duplicates some of the Rdb_services content as needed during the build in CustomTarget_i18npool/localedata. 1c9a40299d328c78c035ca63ccdf22c5c669a03b "gbuild: create services.rdb from built components" had already tried to do something similar (in addition to other things) under a new --enable-services-rdb-from-build option. However, that approach had four drawbacks that this approach here addresses (and which thus partly reverts 1c9a40299d328c78c035ca63ccdf22c5c669a03b): 1 Rdb_services shall not contain the component files of all libraries that are built. While that commit filtered out the component files that go into Rdb_ure/services (ure/Rdb_ure.mk), it failed to filter out the component files that go into others like Rdb_postgresql-sdbc (connectivity/Rdb_postgresql-sdbc.mk). 2 The code added by that commit to Makefile.gbuild codified the knowledge that there is an Rdb_services, which is brittle. 3 The code added by that commit to solenv/gbuild/Rdb.mk codified the knowledge (for gb_Rdb__URECOMPONENTS) that there is an Rdb_ure/services, which is brittle. 4 Introducing an --enable-services-rdb-from-build option needlessly provided two different ways how the content of Rdb_services is assembled. The changes done here would leave --enable-services-rdb-from-build as a misnomer, as it no longer controls how Rdb_services is assembled. I thus renamed it to --enable-customtarget-components, as that is apparently what it still does now. Change-Id: Ia5e8df4b640146c77421fcec6daa11a9cd260265 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126577 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-09dtd files are not xml files and shouldn't have xml headersCaolán McNamara
so rpminspect is correct in complaining that they are not valid xml on inspecting files claiming to be xml Change-Id: I70379989326c2ea63e6a54b3658ebea4684fa5df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116887 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-07Updated README.md files to represent current code / use Markdown formatHossein
Previously, all of the README files have been renamed to README.md and now, the contents of these files were changed to use Markdown format. Other than format inconsistency, some README.md files lacked information about modules, or were out of date. By using LibreOffice / OpenOffice wiki and other documentation websites, these files were updated. Now every README.md file has a title, and some description. The top-level README.md file is changed to add links to the modules. The result of processing the Markdown format README.md files can be seen at: https://docs.libreoffice.org/ Change-Id: Ic3b0c3c064a2498d6a435253b041df010cd7797a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113424 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-24Using .md extension/Markdown syntax for modules READMEHossein
Renaming all README files for all top level modules to README.md, applying no content change at this stage to be able to track history of the files. These files should be edited to use correct Markdown syntax later. Change-Id: I542fa3f3d32072156f16eaad2211a397cc212665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112977 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.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-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt
jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-05Fix typoAndrea Gelmini
Change-Id: I2edcb779a31f5e9a968222ed1d08bde9401e1a27 Reviewed-on: https://gerrit.libreoffice.org/84499 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-12-05Fix typoAndrea Gelmini
Change-Id: If61ec79ef2953a708aa786b78eeaac0e19676910 Reviewed-on: https://gerrit.libreoffice.org/84498 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-20Fix typosAndrea Gelmini
Change-Id: I62577ca57b90d6575bfcf722ac2487e057a95715 Reviewed-on: https://gerrit.libreoffice.org/77767 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-16Fix typosAndrea Gelmini
Change-Id: I8ab75eb5cd54d14fda42bcdb1a251e9e2b6fefdf Reviewed-on: https://gerrit.libreoffice.org/77612 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-02Fix typosAndrea Gelmini
Change-Id: I8e2f3104f3ae9d20e520d357e61c02afde0cedf4 Reviewed-on: https://gerrit.libreoffice.org/76858 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-07-24Fix typosAndrea Gelmini
Change-Id: Ib778a6598f3797fe871a25b56b7b4b7761889296 Reviewed-on: https://gerrit.libreoffice.org/76269 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-05-04Fix typoAndrea Gelmini
Change-Id: Ib04fe75d60647c938225700dd25a3e7e031437dd Reviewed-on: https://gerrit.libreoffice.org/71781 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-07-22Fix typosAndrea Gelmini
Change-Id: I326827c394347cbe9fad242e9da5702cba7a4d95 Reviewed-on: https://gerrit.libreoffice.org/57761 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-04-16Fix typosAndrea Gelmini
Change-Id: Ife28cd9399cfcb375bad764dac7424eda50d430d Reviewed-on: https://gerrit.libreoffice.org/52198 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-04-02use https links for api.libreoffice.org and opengrokdennisroczek
Change-Id: I74dd0142562cb8698f19b2715fa1d514f82bd749 Reviewed-on: https://gerrit.libreoffice.org/52262 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2017-05-18Revert "Fix typos"Stephan Bergmann
This reverts commit 26a67002fcb9381b54de6cae1aaa37120d49066a. "Iff" is not a typo, see 2a65bf32ec270484dcea4d22d3c93552dc0c24dd "Revert 'Typo: iff->if'".
2017-05-18Fix typosAndrea Gelmini
Only replaced "iff" with "if" Change-Id: Ib9dfa5c12b05500043147fe3b65f923b1b12a581 Reviewed-on: https://gerrit.libreoffice.org/37782 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-03-25Fix typosAndrea Gelmini
Change-Id: I901ff35ad2e0aa43a421f0996865130514a819bc Reviewed-on: https://gerrit.libreoffice.org/35663 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2016-08-28coverity#1326473 Resource leak on an exceptional pathCaolán McNamara
Change-Id: I22edbc104164cfd598cfa52e89a112415e63b2c7
2016-03-14remove some unused Java codeNoel Grandin
found by UCDetector Change-Id: Ic0295a24b26e206eb53eda2da540755477df86df
2016-03-04coverity#1326474 Resource leak on an exceptional pathCaolán McNamara
Change-Id: I13047e59fc10ab169072f84c75ba88c569d16bd6
2016-03-04coverity#1326516 Resource leak on an exceptional pathCaolán McNamara
Change-Id: I91cc5614fb0db76eabd46cbe7e39ae33227728b7
2016-03-04coverity#1326237 Dereference after null checkCaolán McNamara
Change-Id: Iac84adff096c5b847b2a63ac57ddf5b2f5e34e11
2016-03-04coverity#1326460 Dereference null return valueCaolán McNamara
Change-Id: I18a80d7695f081c6f274dd7de68bd4dee1054be4
2016-03-01coverity#1326444 Dereference null return valueCaolán McNamara
Change-Id: I0163b298a3c3359b0f035515408f2a81ef405377
2016-03-01coverity#1326460 Dereference null return valueCaolán McNamara
Change-Id: I15e41410064ad6957237e8e79fceb48e152681af
2016-03-01coverity#1326847 DP: Use doPrivilegedCaolán McNamara
and coverity#1326848 DP: Use doPrivileged Change-Id: Ida9706055ade82cdf901f2f78687ee0270b499c4
2016-02-18coverity#1326443 Dereference null return valueCaolán McNamara
Change-Id: Ic5f9290c5f8d9ce46b6f5bb7120b9da85d395d40
2016-02-16coverity#1326425 Dereference null return valueCaolán McNamara
Change-Id: I034a110457d1fa20c392e6660874077def125edd
2016-02-16coverity#1326257 Dereference after null checkCaolán McNamara
Change-Id: I6159d6a9be17ceaffaa3e3a905abf87a8cf434ed
2016-02-16coverity#1326280 Explicit null dereferencedCaolán McNamara
Change-Id: I68b88accb5518292af0b3c3418609c93371bf9cf
2016-02-06coverity#1326525 Resource leak on an exceptional pathCaolán McNamara
Change-Id: I391367ec055372cc82ddb21d19e53041da91b4f6
2016-02-06coverity#1326516 Resource leak on an exceptional pathCaolán McNamara
Change-Id: Ia46ec73bd3dcaef1ec0c9a977f3fc472d94ed390
2016-02-05Fix typosAndrea Gelmini
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3 Reviewed-on: https://gerrit.libreoffice.org/21797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-02-04coverity#1326425 Dereference null return valueCaolán McNamara
Change-Id: I3fda64e652310463e5a634341713562830babb87
2016-02-04coverity#1326426 Dereference null return valueCaolán McNamara
Change-Id: I8ac0a0df5e111b72db181ee1b8043e6f65fbaf25
2016-02-04coverity#1326427 Dereference null return valueCaolán McNamara
Change-Id: Id4ff5ab007e9ddbc28018570fe38abe9e5acb54b
2016-01-29cid#1326176, 1326270, 1326271, 1326272, 1326273, 1326274, 1326275jan iversen
null pointer used to dereference, add "if" Change-Id: I37173f252a3b3da44976581ccefd0ed54aa8aa0d Reviewed-on: https://gerrit.libreoffice.org/21735 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-29cid#1326280, 1326295, 1326303jan iversen
null pointer dereference, made test Change-Id: I2bd820a2eb04499ab3b518d5b5e5ccccf3ffe531 Reviewed-on: https://gerrit.libreoffice.org/21771 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-10Fix typosAndrea Gelmini
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-30coverity#1327008 SBSC: String concatenation in loop using + operatorCaolán McNamara
Change-Id: I2e205bd87760740e1b57647a9a3bdd928be09dfd
2015-12-30coverity#1327009 SBSC: String concatenation in loop using + operatorCaolán McNamara
Change-Id: I22eddb72ffa63549ce4361ec4e691ba2ba2bff96
2015-12-30coverity#1326717 DLS: Dead local storeCaolán McNamara
Change-Id: I3467c9cdd39c8de4d3a10e4bb19c488ae4a6b9f2
2015-11-27CID#1326472, CID#1326473, CID#1326474 use try/finalizejan iversen
Coverity requires that closeable objects (use of new) call .close(), git commit 5a29db7a9945c4cd095799451a6c563d5aeeed57 implemented a series of .close etc calls, update to use a single try{}finalize{} instead. Change-Id: Iadc9de13d6a0af4b0aaca2dfdd0e2d0940a5223d Reviewed-on: https://gerrit.libreoffice.org/19807 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-11-05java: remove ((unnecessary)) parenthesesNoel Grandin
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
2015-11-05java: combine nested if statementsNoel Grandin
Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
2015-11-04Solved CID 1326472, 1326473, 1326474jan iversen
Coverity requires that allocated objects (use of new) are directly release, by foo = null; The gc will do this automatically at some point in time, so this will simply release the resource a bit earlier, which can save problems if the function is called in a tight loop. Updated to add close() before clearing the variable, this would normally be done by gc, but now a bit earlier. The assignment to null is not needed specifically, but Coverity calls it a leak if not assigned. Forgot .close(); Change-Id: Id273e7f36778c1691b260d28e741c6e32148c9d9
2015-11-04Mechanically sanitize indentationStephan Bergmann
Change-Id: Ide8817aff3a6b5d07b56b54cecb36f7dc1407743
generated by cgit (git 2.34.1) at 2024-04-28 15:24:04 +0000