Commit graph

186 commits

Author SHA1 Message Date
Noel Grandin
f9fa0dd66b Java5 updates - update code to use generics
This is all of the code I missed in my first set of patches.

Change-Id: I8c7c9e5ac28dc3c2f3ac062c806fbf0787c997bd
2012-06-29 22:03:05 +02:00
Michael Meeks
6f36747661 re-base on ALv2 code. 2012-06-12 17:31:21 +01:00
Stephan Bergmann
708229dc96 fdo#49580: Fix bean after gbuild'ification
4478b739dd "convert bean to gbuild and add to
tail_build" broke the following:
* The name of the officebean dynamic library must not be changed (by adding the
  "lo" extension), as code in officebean.jar uses it in NativeLibraryLoader.
* With gbuild's per-default hidden visibility, JNIEXPORT functions must instead
  use SAL_DLLPUBLIC_EXPORT.  (Windows-only code in bean/native/win32/ should be
  safe to continue using JNIEXPORT.)

Change-Id: I I3c312dd05c90421ba0c726496b7149a26d155604
2012-05-07 17:03:00 +02:00
Stephan Bergmann
6752930497 LocalOfficeConnection description must end in ServiceManager
...instead of NamingService.  Even though current
<http://wiki.services.openoffice.org/w/index.php?title=Documentation/DevGuide/JavaBean/Customized_Configuration&oldid=127145>
documents using the latter, it leads to NullPointerException, as connect()
expects aInitialObject to be an XPropertySet.

Change-Id: Ia8445bed5307bf440d078a8b96200e3b7fa38706
2012-05-07 17:03:00 +02:00
Bjoern Michaelsen
b1c3e8ae28 make gbuild the default assumption of build.pl
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-29 03:50:46 +02:00
David Tardon
c6ade7266f WaE: cast from pointer to integer of different size 2012-04-18 21:01:18 +02:00
Michael Stahl
c923f7d2c2 gbuild: "use" vs. "add":
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-04-08 01:05:52 +02:00
Stephan Bergmann
fe981519f5 gb_JunitTest_JunitTest takes only one argument 2012-02-20 16:39:59 +01:00
Josh Heidenreich
223cca46ed Added READMEs for modules which used to be in components 2012-02-08 07:46:57 +01:00
Norbert Thiebaud
c857dff7fc switch to include-based build rather than sourced-based build 2012-02-05 19:34:05 -06:00
Andras Timar
aab14cb9fb fix prefix of command line switches (-- instead of -) 2012-01-11 19:25:45 +01:00
Tor Lillqvist
25e10370fe Link most libs and executables with gb_STDLIBS as presumably is intended 2011-12-20 01:12:23 +02:00
Tor Lillqvist
a7058d7bac Bypass bean for Android which has no java.awt 2011-12-12 22:14:57 +02:00
Tor Lillqvist
ee7e362aae Accept also Oracle Corporation as Java vendor here, too 2011-12-12 22:14:56 +02:00
Tor Lillqvist
b1b25a9a1e Kill a bunch of empty lines 2011-12-12 22:14:55 +02:00
Bjoern Michaelsen
2acd8fbac9 in modules, when we have a env we are in stage gbuild 2011-12-07 15:53:06 +01:00
Lior Kaplan
e10fc18fb2 typo fix: explicitely -> explicitly 2011-12-01 23:41:42 +02:00
Bjoern Michaelsen
d73e574d8a move reconfigure into gbuild 2011-11-29 17:25:14 +01:00
Bjoern Michaelsen
f2f0dbd273 make gbuild makefiles run independant of pwd again 2011-11-25 12:04:40 +01:00
Norbert Thiebaud
0ea8c014ef tweak gbuild standart Makefile to allow partial build in unsourced env
This allow to run make in a module wihtout the need to source
Env.Host.sh.
2011-11-16 06:18:54 -06:00
Matúš Kukan
c77a9254dd no need for SRCDIR parameter here 2011-10-23 13:20:29 +02:00
Michael Meeks
9142f9a1a1 WaE: win32 cleanup 2011-10-07 16:30:52 +02:00
Bjoern Michaelsen
e94a19f3e0 simplfy dmake to gbuild bridgefile 2011-10-05 00:31:50 +02:00
Tor Lillqvist
4f3e9f30a0 Always link with user32 2011-09-22 15:46:15 +03:00
Caolán McNamara
5663d30591 get bean linking under windows 2011-09-21 16:59:22 +01:00
Peter Foley
4478b739dd convert bean to gbuild and add to tail_build 2011-09-18 19:17:17 -04:00
Julien Nabet
265a458cda Fix wrong comments which prevent to compile 2011-08-15 02:19:28 +02:00
Julien Nabet
cf4e20ede9 Some PMD cleaning 2011-08-15 01:58:50 +02:00
Tor Lillqvist
db57823374 Don't use the (win32) jawt_md.h as we don't have that when cross-compiling
Just insert the trivial JAWT_GetAWT declaration and
JAWT_Win32DrawingSurfaceInfo struct definition.
2011-06-29 12:42:20 +03:00
Tor Lillqvist
1b13657acf jawt_md.h is not needed in this file 2011-06-29 12:42:20 +03:00
Caolán McNamara
4c7a7590b1 fix comment typo 2011-06-16 09:14:41 +01:00
Tor Lillqvist
d32db65e8f Drop %_EXT% which was always empty 2011-06-03 13:25:56 +03:00
Tor Lillqvist
ea9d29c0bc Drop OS2 2011-05-21 15:49:48 +03:00
Julien Nabet
2be3b8bd88 Change <file>.toURL() to <file>.toURI().toURL() 2011-05-03 22:55:31 +02:00
Caolán McNamara
e76e239b23 we only need the java lib path to link bean 2011-03-31 12:50:26 +01:00
Norbert Thiebaud
cc5db648bc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (185 commits)
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix: #i10000# INT16 -> sal_Int16
  fixed compile errors after resync to m100, part2
  gridsort: post-rebase fixes
  CWS gnumake3: found another tools integer type
  removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
  native359: #i114398# changing mac langpack icon
  native359: #i115669# fixing package description for solaris packages
  gnumake3: remove comphelper version; fix including extract.hxx
  locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
  sb138: #i116659# timely termination of OnLogRotateThread
  accfixes: removed include of obsolete header file
  accfixes: removed obsolete file
  removetooltypes01: #i112600# Fix build problems on non-pro
  accfixes: moved some shared strings to svx part2
  accfixes: moved some shared strings to svx
  accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
  removetooltypes01: #i112600# Remove tools types for Mac specific parts
  fixed tab order in BasicIDE, Library dialog tab page
  added some accessible names in BasicIDE
  ...

Conflicts:
	UnoControls/source/base/registercontrols.cxx
	accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
	automation/inc/automation/communi.hxx
	automation/inc/automation/simplecm.hxx
	automation/source/communi/communi.cxx
	automation/source/inc/rcontrol.hxx
	automation/source/miniapp/servuid.hxx
	automation/source/server/XMLParser.cxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/profiler.hxx
	automation/source/server/recorder.cxx
	automation/source/server/retstrm.hxx
	automation/source/server/server.cxx
	automation/source/server/sta_list.cxx
	automation/source/server/statemnt.cxx
	automation/source/server/statemnt.hxx
	automation/source/simplecm/packethandler.cxx
	automation/source/simplecm/simplecm.cxx
	automation/source/simplecm/tcpio.cxx
	automation/source/simplecm/tcpio.hxx
	automation/source/testtool/comm_bas.hxx
	automation/source/testtool/cretstrm.hxx
	automation/source/testtool/httprequest.cxx
	automation/source/testtool/httprequest.hxx
	automation/source/testtool/objtest.cxx
	automation/source/testtool/objtest.hxx
	basctl/source/basicide/baside2.cxx
	basctl/source/basicide/baside2.hxx
	basctl/source/basicide/baside2b.cxx
	basctl/source/basicide/baside3.cxx
	basctl/source/basicide/basides1.cxx
	basctl/source/basicide/basides2.cxx
	basctl/source/basicide/basidesh.cxx
	basctl/source/basicide/basidesh.src
	basctl/source/basicide/basobj3.cxx
	basctl/source/basicide/bastype2.cxx
	basctl/source/basicide/bastype3.cxx
	basctl/source/basicide/bastypes.cxx
	basctl/source/basicide/brkdlg.cxx
	basctl/source/basicide/iderdll.cxx
	basctl/source/basicide/macrodlg.cxx
	basctl/source/basicide/moduldl2.cxx
	basctl/source/basicide/moduldlg.cxx
	basctl/source/basicide/objdlg.cxx
	basctl/source/basicide/scriptdocument.cxx
	basctl/source/basicide/tbxctl.cxx
	basctl/source/basicide/tbxctl.hxx
	basctl/source/basicide/tbxctl.src
	basctl/source/dlged/dlged.cxx
	basctl/source/dlged/dlgedfunc.cxx
	basctl/source/dlged/dlgedobj.cxx
	basctl/source/inc/basidesh.hxx
	basctl/source/inc/bastypes.hxx
	basctl/source/inc/dlgedmod.hxx
	basctl/source/inc/dlgedpage.hxx
	crashrep/prj/build.lst
	cui/inc/pch/precompiled_cui.hxx
	cui/source/customize/acccfg.cxx
	cui/source/customize/acccfg.hrc
	cui/source/customize/acccfg.src
	cui/source/customize/cfg.cxx
	cui/source/customize/cfgutil.cxx
	cui/source/customize/macropg.cxx
	cui/source/customize/macropg.src
	cui/source/customize/selector.cxx
	cui/source/dialogs/SpellDialog.cxx
	cui/source/dialogs/commonlingui.cxx
	cui/source/dialogs/cuicharmap.cxx
	cui/source/dialogs/cuifmsearch.cxx
	cui/source/dialogs/cuigaldlg.cxx
	cui/source/dialogs/cuigrfflt.cxx
	cui/source/dialogs/hldocntp.cxx
	cui/source/dialogs/hldoctp.cxx
	cui/source/dialogs/hlinettp.cxx
	cui/source/dialogs/hlmailtp.cxx
	cui/source/dialogs/hlmarkwn.cxx
	cui/source/dialogs/hlmarkwn.src
	cui/source/dialogs/hltpbase.cxx
	cui/source/dialogs/iconcdlg.cxx
	cui/source/dialogs/passwdomdlg.cxx
	cui/source/dialogs/pastedlg.cxx
	cui/source/dialogs/scriptdlg.cxx
	cui/source/dialogs/thesdlg.cxx
	cui/source/dialogs/zoom.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/SpellDialog.hxx
	cui/source/inc/autocdlg.hxx
	cui/source/inc/backgrnd.hxx
	cui/source/inc/bbdlg.hxx
	cui/source/inc/cfg.hxx
	cui/source/inc/cfgutil.hxx
	cui/source/inc/cuigaldlg.hxx
	cui/source/inc/cuigrfflt.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/inc/cuitabline.hxx
	cui/source/inc/hldocntp.hxx
	cui/source/inc/hltpbase.hxx
	cui/source/inc/iconcdlg.hxx
	cui/source/inc/numpages.hxx
	cui/source/inc/page.hxx
	cui/source/inc/postdlg.hxx
	cui/source/inc/scriptdlg.hxx
	cui/source/inc/transfrm.hxx
	cui/source/inc/zoom.hxx
	cui/source/options/cfgchart.cxx
	cui/source/options/cuisrchdlg.cxx
	cui/source/options/dbregister.cxx
	cui/source/options/dbregister.src
	cui/source/options/fontsubs.cxx
	cui/source/options/internationaloptions.cxx
	cui/source/options/optasian.cxx
	cui/source/options/optchart.cxx
	cui/source/options/optcolor.cxx
	cui/source/options/optcolor.src
	cui/source/options/optfltr.cxx
	cui/source/options/optfltr.src
	cui/source/options/optgdlg.cxx
	cui/source/options/optgdlg.src
	cui/source/options/optgenrl.cxx
	cui/source/options/opthtml.cxx
	cui/source/options/optimprove.cxx
	cui/source/options/optinet2.cxx
	cui/source/options/optinet2.hxx
	cui/source/options/optjava.cxx
	cui/source/options/optlingu.cxx
	cui/source/options/optsave.cxx
	cui/source/options/optsave.hxx
	cui/source/options/treeopt.cxx
	cui/source/options/webconninfo.cxx
	cui/source/tabpages/autocdlg.cxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/border.cxx
	cui/source/tabpages/chardlg.cxx
	cui/source/tabpages/dstribut.cxx
	cui/source/tabpages/grfpage.cxx
	cui/source/tabpages/macroass.cxx
	cui/source/tabpages/measure.cxx
	cui/source/tabpages/numfmt.cxx
	cui/source/tabpages/numpages.cxx
	cui/source/tabpages/page.cxx
	cui/source/tabpages/paragrph.cxx
	cui/source/tabpages/swpossizetabpage.cxx
	cui/source/tabpages/tabarea.src
	cui/source/tabpages/textanim.cxx
	cui/source/tabpages/textattr.cxx
	cui/source/tabpages/tparea.cxx
	cui/source/tabpages/tpbitmap.cxx
	cui/source/tabpages/tpcolor.cxx
	cui/source/tabpages/tpgradnt.cxx
	cui/source/tabpages/tphatch.cxx
	cui/source/tabpages/tpline.cxx
	cui/source/tabpages/tplnedef.cxx
	cui/source/tabpages/tplneend.cxx
	cui/source/tabpages/tpshadow.cxx
	cui/source/tabpages/transfrm.cxx
	embedserv/source/embed/register.cxx
	extensions/inc/pch/precompiled_extensions.hxx
	extensions/inc/propctrlr.hrc
	extensions/source/abpilot/abpservices.cxx
	extensions/source/bibliography/bibload.cxx
	extensions/source/bibliography/datman.cxx
	extensions/source/bibliography/general.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/inc/componentmodule.cxx
	extensions/source/nsplugin/source/so_env.cxx
	extensions/source/ole/oleobjw.cxx
	extensions/source/ole/oleobjw.hxx
	extensions/source/oooimprovement/invite_job.cxx
	extensions/source/oooimprovement/onlogrotate_job.cxx
	extensions/source/plugin/base/service.cxx
	extensions/source/plugin/inc/plugin/unx/mediator.hxx
	extensions/source/plugin/inc/plugin/unx/plugcon.hxx
	extensions/source/plugin/unx/mediator.cxx
	extensions/source/plugin/unx/nppapi.cxx
	extensions/source/plugin/unx/plugcon.cxx
	extensions/source/preload/services.cxx
	extensions/source/propctrlr/formmetadata.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/resource/resource.cxx
	extensions/source/scanner/sane.hxx
	extensions/source/scanner/sanedlg.cxx
	extensions/source/scanner/scanunx.cxx
	extensions/source/scanner/scanwin.cxx
	extensions/source/scanner/twain.cxx
	extensions/source/scanner/twain.hxx
	extensions/source/update/check/updatecheckconfig.cxx
	extensions/test/stm/datatest.cxx
	extensions/test/stm/marktest.cxx
	extensions/test/stm/pipetest.cxx
	extensions/test/stm/testfactreg.cxx
	extensions/workben/testpgp.cxx
	forms/qa/complex/forms/CheckOGroupBoxModel.java
	forms/qa/makefile.mk
	forms/source/component/Button.cxx
	forms/source/component/Button.hxx
	forms/source/component/ListBox.cxx
	forms/source/inc/forms_module_impl.hxx
	forms/source/misc/services.cxx
	forms/source/solar/control/navtoolbar.cxx
	javainstaller2/prj/build.lst
	javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
	lingucomponent/prj/build.lst
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sreg.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/source/manifest/ManifestExport.cxx
	package/source/manifest/UnoRegister.cxx
	package/source/xstor/owriteablestream.cxx
	package/source/xstor/owriteablestream.hxx
	package/source/xstor/xstorage.hxx
	package/source/zippackage/ZipPackageFolder.cxx
	package/source/zippackage/ZipPackageStream.cxx
	setup_native/source/mac/ooo/DS_Store
	setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
	xmlsecurity/prj/build.lst
	xmlsecurity/source/component/registerservices.cxx
	xmlsecurity/source/dialogs/stbcontrl.cxx
	xmlsecurity/source/framework/xsec_framework.cxx
	xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
	xmlsecurity/tools/demo/util.hxx
	xmlsecurity/workben/signaturetest.cxx
2011-03-09 16:20:50 -06:00
Thomas Arnhold
4327ec0dee Clean up makefiles 2011-02-02 12:06:11 +01:00
Thomas Arnhold
2945b56030 Clean up makefiles 2011-02-01 18:21:17 +01:00
Tor Lillqvist
152ae301d7 Remove superfluous empty lines at end 2011-01-28 20:24:33 +02:00
Tor Lillqvist
422f6dd134 Bypass if no SOLAR_JAVA 2011-01-28 20:24:31 +02:00
Tor Lillqvist
c37747173d Use SetWindowLongPtr 2011-01-26 21:22:06 +02:00
Caolán McNamara
6045d6569d WaE: gcc 4.6.0 various warnings 2011-01-25 10:24:49 +00:00
Caolán McNamara
b77940e5af add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
Lars Langhans
85900d0c1f sb123:#i111449# remove all subdirs in complex tests 2010-08-23 10:38:44 +02:00
Lars Langhans
abce795656 sb123:#i111449# makefile cleanups for qa/complex tests 2010-06-29 13:43:23 +02:00
Lars Langhans
ca1a016c5c sb123:#i111449# cleanups in beans qa/complex tests 2010-06-16 11:34:04 +02:00
Jens-Heiner Rechtien
36de66bdf0 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Mathias Bauer
da0f3ac4ca #i103496#: sandbox removed 2009-11-11 07:25:37 +01:00
Mathias Bauer
b16d453ae7 #i103496#: remove unneccessary sandbox module 2009-11-09 15:06:46 +01:00
Ivo Hinkelmann
a408bb529f CWS-TOOLING: integrate CWS l10nframework01 2009-09-16 11:45:54 +00:00