/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * This file incorporates work covered by the following license notice: * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed * with this work for additional information regarding copyright * ownership. The ASF licenses this file to you under the Apache * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #ifndef INCLUDED_SVX_SDPRCITM_HXX #define INCLUDED_SVX_SDPRCITM_HXX #include #include #include // class SdrPercentItem // Integer percents of 0 class SVXCORE_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: SdrPercentItem(TypedWhichId nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {} virtual SdrPercentItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; // class SdrSignedPercentItem // Integer percents of +/- class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrSignedPercentItem : public SfxInt16Item { public: SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal ) : SfxInt16Item( nId,nVal ) {} virtual SdrSignedPercentItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /cd-5.3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/ridljar
AgeCommit message (Collapse)Author
2020-05-27tdf#131572 Add java 9 module info for unoloader.jarSamuel Mehrbrodt
Add a java module named "org.libreoffice.unoloader" for this jar. Require this module from org.libreoffice.uno (libreoffice.jar has unoloader.jar in its classpath, so add the same dependency to the modules) Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-27tdf#131572 Add java 9 module info for libreoffice.jarSamuel Mehrbrodt
Add a java module named "org.libreoffice.uno" for this jar. This needs to be compiled with Java 9. But since we want to keep b/c with Java 8, the rest of the jar has to be compiled with Java 8. This bumps the *build* requirement to Java 9 while keeping the *runtime* requirement at Java 8. The gbuild JavaClassSet class is changed to invoke javac twice, where the 2nd invocation compiles with --release 9 and a --patch-modules argument so that it finds the results of the first invocation and also the javamaker generated files in CustomTargets. Change-Id: I888f5dbe097cc37136e68db5919939877c981862 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91105 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-07add pom for libreoffice.jarRene Engelhard
was missed in 35518c92365cc183ba6cce2a4d284a130c0ca13f Change-Id: I574707f6a891109ff1a7db3c915dd652fa644972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93606 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
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-16GBUILD_TRACE, support for finding out where the build time is spentLuboš Luňák
See instructions in solenv/gbuild/Trace.mk . This generates a file than can be viewed e.g. in the Chromium tracing view. Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-10Cleanup: Move unit tests to ridljarSamuel Mehrbrodt
Follow-up cleanup for ae855bf48163ff64d94cfc34aff8e37abdb5518d Change-Id: Ibec2fe89d70d6001af7d75c5eb4081b5b2af30e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88073 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-02-10Cleanup: Move files to ridljarSamuel Mehrbrodt
These files are now part of ridl.jar instead of jurt.jar, so move them accordingly. Follow-up cleanup for ae855bf48163ff64d94cfc34aff8e37abdb5518d Change-Id: I01df60d99f5296b6252b260f52160c3e62f4b8dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88007 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-02-06These JunitTests can be plain check, not subsequentcheckStephan Bergmann
For one, JunitTest_typedesc and JunitTest_uno don't use qadevOOo at all. And for another, even for JunitTest_util (which does use qadevOOo), in gbuild it is OK (and frequently used) for a check target in one module to have dependencies on higher modules. Change-Id: I6f6339fa516eb8582d88ada50fabe56784d99dda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88058 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-08-12Fix typosAndrea Gelmini
Change-Id: Ia40e7a9031ae5a8385a84f177a9444f4d4f348b4 Reviewed-on: https://gerrit.libreoffice.org/77302 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-07-26Fix typosAndrea Gelmini
Change-Id: I60261b937215340d2eb6f439234e99a300b0e189 Reviewed-on: https://gerrit.libreoffice.org/76380 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-05-27@deprecated should be with @DeprecatedTomoyuki Kubota
Without this patch, warnings will be given when LibreOffice is built with JDK9 or later. Change-Id: I7aa6e99ace2377fbdb7dd732949ce10d9bd9df58 Reviewed-on: https://gerrit.libreoffice.org/72947 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-07-08Fix typoAndrea Gelmini
Change-Id: I1cc4544e807d7c04aa171358ccd1c204040dff55 Reviewed-on: https://gerrit.libreoffice.org/57078 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-04-16Use https instead of httpGulsah Kose
Use "https://cgit.freedesktop.org/libreoffice/core" instead of "http://cgit.freedesktop.org/libreoffice/core" Change-Id: Ic7248eeb2a9452da7236eeee08414a77714dd234 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/52926 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-01-26Fix typosAndrea Gelmini
Change-Id: I334f0bd5636940ea8105dcf93b95b3af28894aad Reviewed-on: https://gerrit.libreoffice.org/48546 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-08-25i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliablyDamjan Jovanovic
In the Java UNO bridge, UnoRuntime.generateOid() generated the object-specific part of the OID using java.lang.Object.hashCode(), which is only 32 bits long, and is commonly overriden and could thus return values from an even smaller range, so OID collisions were quite likely. This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the object-specific part of the OID, and store these in an object => oid java.util.WeakHashMap, making OID collisions almost impossible. Patch by: me Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at googlemail dot com) (cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118) Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95 Reviewed-on: https://gerrit.libreoffice.org/41576 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-08-17remove UL/L suffixes from integer constants in initialiser/call expressionsNoel Grandin
Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300 Reviewed-on: https://gerrit.libreoffice.org/41214 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-03TyposJulien Nabet
Change-Id: I36f443c266670bd26aa6b813075e18653f372f52 Reviewed-on: https://gerrit.libreoffice.org/33900 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2016-06-07error: unknown tag: internalStephan Bergmann
Change-Id: Ie96b4ed27060498a39bb5fb1ea7a4cb3e17408ff
2016-06-07[API CHANGE] Drop deprecated I*Description interfacesNoel Grandin
And make the fields of com.sun.star.uno.Type private Change-Id: Ied7698b4157460e9726f271092c92b6b382239fd Reviewed-on: https://gerrit.libreoffice.org/25971 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-05-16Fix typosAndrea Gelmini
Change-Id: If7262e114b5b4cd40e9c0a8929940199ea747595 Reviewed-on: https://gerrit.libreoffice.org/25025 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-05-13Related tdf#99272: Prevent bogus com.sun.star.uno.Type(Short[].class) etc.Stephan Bergmann
...so that the JNI UNO bridge will not accidentally reinterpret a Short[] as a short[]. <https://wiki.openoffice.org/wiki/Uno/Java/Specifications/Type_Mapping> makes it clear that the former is not a valid Java representation for UNO type "sequence of short". Needed one fix in bogus test code. Also fixed the two bogus places in odk/examples mentioned in f53e427291321eabe8d060a737e750a94739f911 "Resolves: tdf#99272 new Short[] used instead of new short[]". Change-Id: I8321eb1294ec77b3a9bf73cafb6e7fe337157bb7