summaryrefslogtreecommitdiff
path: root/javaunohelper
AgeCommit message (Collapse)AuthorFilesLines
2013-04-18Let juhx.dll export undecorated symbols on WindowsStephan Bergmann5-22/+122
...otherwise preload.cxx in juh.dll will not be able to find them via osl_getFunctionSymbol. What apparently happens is that JNICALL expanding to __stdcall decorates symbol names with _...@NN. This likely was hidden in pre-gbuild times thanks to the use of def files. (On a side note, the JVM appears to contain special code to find syms for native methods in both decorated and undecorated form; that explains why it picks up the decorated symbols from juh.dll just fine.) There is no need for the functions in juhx.dll (called from the juh.dll wrapper) to adhere to JNICALL (in fact, things would likely be easier to maintain if the juhx.dll functions also used different names than their juh.dll wrappers). However, what complicates this patch is that for DISABLE_DYNLOADING, the juh wrapper and its preload.cxx is elided, and the code that would normally go into the juhx library goes into the juh library (and thus needs to stick to JNICALL, and also needs to use the right function names). (cherry picked from commit 96488510c006785bba22c1039885c03e95ac4832) Conflicts: javaunohelper/source/bootstrap.cxx javaunohelper/source/javaunohelper.cxx javaunohelper/source/preload.cxx Change-Id: I66611648f1f79f57f0c1b23fb7a801da2d7b86c5 Reviewed-on: https://gerrit.libreoffice.org/3455 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-11-30c++ API: use css alias in generated headers, adds global css declThorsten Behrens1-2/+0
This changes all generated API headers (.hpp and .hdl) to use a namespace alias 'css' instead of the pointlessly long com::sun::star Makes the change in cppumaker & associated tools, adds a global namespace alias definition in sal/types.h, and removes a kiloton of local, now pointless-to-harmful versions of that alias from all over the code. Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f
2012-11-09Introdude SAL_JNI_EXPORT and use that instead of JNIEXPORTTor Lillqvist2-4/+4
Use it in the cases where I yesterday changed SAL_DLLPUBLIC_EXPORT to JNIEXPORT. It turns out that on Linux JNIEXPORT does not enforce "default" visibility, but expands to empty. Change-Id: I033b3cf538715fb596e965e17f3da12fb987df63
2012-11-09Use JNIEXPORT to really export these for AndroidTor Lillqvist2-4/+4
Now with DISABLE_DYNLOADING, SAL_DLLPUBLIC_EXPORT actually means hidden visibilty. Which is OK in general as with a single DSO (or a single executable, for iOS), none of our "normal" entry points need to be visible froom the outside. So for the JNI entry points use JNIEXPORT. On "normal" platforms it should be equivalent to SAL_DLLPUBLIC_EXPORT. Change-Id: Iad634950e635ac03a0e90cae6d00afd9fb4eeb64
2012-10-07DISABLE_DYNLOADING tentative fixTor Lillqvist1-2/+20
Change-Id: Ic23dcc0b45a90e845fc4fba1861bcee03354da01
2012-10-01fdo#51304: Remove the author of some java source filesAnurag Jain5-16/+0
This patch remove some '@author' for Java souce files, and removes some commented code founded when removing the '@author'. Change-Id: Ic4fcd028a9cdbd85c693d93bcd48e41f36386d22
2012-09-28gbuild: invert handling of standard system libraries:Michael Stahl2-4/+0
Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
2012-09-28gbuild: replace direct gb_STDLIBS use with ...Michael Stahl2-2/+4
... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
2012-09-28gbuild: split uwinapi out of gb_STDLIBSMichael Stahl2-0/+2
Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7
2012-09-21No juh library to load in the disable-dynloading case (on Android)Tor Lillqvist2-2/+36
Change-Id: I6a5eefe86e23499b555b34c6ba2ebe131e109304
2012-09-20No need for the juh/juhx dance when DISABLE_DYNLOADINGTor Lillqvist3-2/+50
Change-Id: Ifc2bfb278947344d14b855ebf5527b603e333f15
2012-09-17Keep null service manager throw a DeploymentExceptionStephan Bergmann1-1/+2
...rather than a general RuntimeException, for consistency with existing service ctor code. Change-Id: Ia9ac14a1b5bcecb24394e7b9cade369f3f9303f0
2012-09-17Require XComponentContext.getServiceManager to throw instead of returning nullStephan Bergmann1-0/+5
This is such a fatal error that there is probably no point in trying to handle it, so allow to simplify client code by removing the requirement to check for a null return value. Simplified some client code accordingly (modules configmgr and ure, and the code generated by cppumaker and javamaker). Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
2012-09-06Java cleanup, remove unnecessary importsNoel Grandin7-59/+0
Change-Id: Iacfcb2e16cb0e3c25a4cd0678a374fe5111284f7
2012-08-20Java5 updates - convert to genericsNoel Grandin9-62/+62
Change-Id: I039e51958865a7ea000034e7bf765f64d49689cd
2012-08-20Remove dead java code, fields and local variablesNoel Grandin3-7/+0
Change-Id: If777dcb0e0142229df737c2f1e3e6ecb61f64168
2012-08-20Java update - fix various javadoc issuesNoel Grandin2-3/+3
Along the way, remove some javadoc comments that are completely incorrect. Change-Id: I02f96b6cbe665d2c10bd6ee245a7d8e2eef0f755
2012-08-17gbuild: register all jarsMichael Stahl1-3/+3
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
2012-08-15gbuild: remove most uses of gb_Jar_set_jarclasspath:Michael Stahl1-1/+1
With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest classpath automatically it is no longer necessary to call gb_Jar_set_jarclasspath manually except for the URE jars, which are apparently not supposed to be added automatically. Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29
2012-08-08Export JNI functions from juh, juhx libsStephan Bergmann4-34/+8
...this had been broken with gbuild'ification of javaunohelper and caused java.lang.UnsatisfiedLinkError from com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap, as could be witnessed by test-javanative in ure/source/uretest/Makefile failing. Change-Id: I8a76e1195c713895bfb8eae5070b0f73beb2b897
2012-08-06Static method sleep from Thread should be accessed in a static wayJulien Nabet3-4/+4
Change-Id: I7d875dd74f8eff05f7a291100841779abbf5fd1c
2012-06-29revert changes to public URE APIs in previous commitMichael Stahl2-9/+7
Change-Id: I8f5309ee5fbda34ad1bb9e724c26e04692253649
2012-06-29Java5 updates - update code to use genericsNoel Grandin9-128/+126
This is all of the code I missed in my first set of patches. Change-Id: I8c7c9e5ac28dc3c2f3ac062c806fbf0787c997bd
2012-06-27re-base on ALv2 code.Michael Meeks11-256/+157
2012-06-21re-base on ALv2 code.Michael Meeks6-141/+87
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21re-base on ALv2 code.Michael Meeks27-604/+387
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
2012-04-29make gbuild the default assumption of build.plBjoern Michaelsen1-1/+0
this removes dmake completely out of the build for migrated modules build.pl now assumes modules to be gbuild, unless there is a prj/dmake file Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
2012-04-09javaunohelper: use InternalUnoApiMatúš Kukan5-116/+3
2012-04-08LinkTarget.mk: remove gb_LinkTarget_add_package_headersMichael Stahl2-2/+2
2012-04-08gbuild: "use" vs. "add":Michael Stahl3-4/+4
Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target)
2012-03-22Fix URE jar manifests after gbuild'ificationStephan Bergmann1-0/+2
2012-03-21javaunohelper: missing dependecy on udkapi.rdbMichael Stahl1-1/+1
2012-03-14Enable -Wnon-virtual-dtor for GCC 4.6Stephan Bergmann1-1/+1
...which has the necessary features to support it. Change a lot of classes to either contain a protected non-virtual dtor (which is backwards compatible, so even works for cppumaker-generated UNO headers) or a public virtual one. cppuhelper/propertysetmixin.hxx still needs to disable the warning, as the relevant class has a non-virtual dtor but friends, which would still cause GCC to warn. Includes a patch for libcmis, intended to be upstreamed.
2012-02-17update makefilesDavid Tardon1-35/+2
2012-02-17merge feature/gbuild_javaDavid Tardon22-620/+382
2012-02-16add gb_Helper_abbreviate_dirs_nativeMatus Kukan1-1/+2
2012-02-06Added READMEs for modules related to URE, with content from the wikiJosh Heidenreich1-0/+2
2012-01-21Removed some unused parameters; added SAL_UNUSED_PARAMETER.Stephan Bergmann2-4/+4
SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC) is used to annotate legitimately unused parameters, so that static analysis tools can tell legitimately unused parameters from truly unnecessary ones. To that end, some patches for external modules are also added, that are only applied when compiling with GCC and add necessary __attribute__ ((unused)) in headers.
2012-01-11fix prefix of command line switches (-- instead of -)Andras Timar1-6/+6
2012-01-05chmod -x on java filesTomas Hlavaty2-0/+0
2011-12-30Fix for fdo43460 Part XXI getLength() to isEmpty()Olivier Hallot1-1/+1
Part XXI Modules i18npool, idl, idlc, io, javaunohelper, jvmaccess
2011-12-25remove stray makefilesDavid Tardon10-596/+0
2011-12-25remove stray delzip filesDavid Tardon1-0/+0
2011-12-25fix deps on executablesDavid Tardon1-1/+1
2011-12-24gbuildize javaunohelperDavid Tardon11-24/+381
2011-12-15catch exception by constant referenceTakeshi Abe1-2/+2
2011-12-02Added comment.Stephan Bergmann1-0/+4
2011-11-27remove precompiled_xxx.hxx/cxxNorbert Thiebaud2-63/+0
2011-11-27reove include of pch header from javaunohelperNorbert Thiebaud6-10/+0
2011-11-27remove PCH support in dmake-moduleNorbert Thiebaud1-8/+0