Commit graph

158 commits

Author SHA1 Message Date
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
Release Engineers
dd47ba944b CWS-TOOLING: integrate CWS cmcfixes58
2009-05-04 13:51:10 +0200 cmc  r271450 : #i101533# latest sw warnings
2009-05-04 00:02:46 +0200 cmc  r271436 : #i101517# silence new warnings
2009-05-03 23:13:53 +0200 cmc  r271435 : #i101305# add that one back in
2009-05-02 16:30:42 +0200 cmc  r271431 : #i101493# get it to build, and remove some warnings
2009-05-02 16:12:37 +0200 cmc  r271430 : CWS-TOOLING: rebase CWS cmcfixes58 to trunk@271427 (milestone: DEV300:m47)
2009-04-23 13:19:33 +0200 cmc  r271163 : #i101305# remove annoying import foo is unused warnings
2009-04-21 17:10:34 +0200 cmc  r271048 : #i101246# remove AVMEDIA_MANAGER_SERVICE_NAME defines again
2009-04-21 17:07:41 +0200 cmc  r271047 : #i86323# remove xml2cmp unused methods
2009-05-07 06:54:56 +00:00
Oliver Bolte
d7cfa3d873 CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb  r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb  r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb  r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb  r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb  r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb  r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb  r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb  r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb  r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
2009-02-19 11:42:47 +00:00
Vladimir Glazounov
93d89bfbc1 CWS-TOOLING: integrate CWS sb93 2008-10-01 09:04:58 +00:00
Vladimir Glazounov
57a8051720 CWS-TOOLING: integrate CWS jsc311 2008-10-01 08:05:58 +00:00
Rüdiger Timm
fe260a91e7 INTEGRATION: CWS oobeanfix_DEV300 (1.11.12); FILE MERGED
2008/08/26 13:29:45 jsc 1.11.12.1: #i93126# read UNO_PATH variable to get path to soffice binary
2008-08-27 14:22:37 +00:00
Rüdiger Timm
c415890019 INTEGRATION: CWS changefileheader (1.3.50); FILE MERGED
2008/03/28 16:08:24 rt 1.3.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:25:09 +00:00
Rüdiger Timm
60938a92ef INTEGRATION: CWS changefileheader (1.2.12); FILE MERGED
2008/03/28 16:08:24 rt 1.2.12.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:24:50 +00:00
Rüdiger Timm
f31246cfad INTEGRATION: CWS changefileheader (1.4.16); FILE MERGED
2008/03/28 16:08:24 rt 1.4.16.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:24:12 +00:00
Rüdiger Timm
bd3a008202 INTEGRATION: CWS changefileheader (1.3.46); FILE MERGED
2008/03/28 16:08:24 rt 1.3.46.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:23:55 +00:00
Rüdiger Timm
35a42bdd32 INTEGRATION: CWS changefileheader (1.4.16); FILE MERGED
2008/03/28 16:08:23 rt 1.4.16.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:23:39 +00:00
Rüdiger Timm
32315904de INTEGRATION: CWS changefileheader (1.3.46); FILE MERGED
2008/03/28 16:08:23 rt 1.3.46.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:23:23 +00:00
Rüdiger Timm
d19b971ee0 INTEGRATION: CWS changefileheader (1.4.36); FILE MERGED
2008/03/28 16:08:23 rt 1.4.36.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:22:31 +00:00
Rüdiger Timm
685b75dfa3 INTEGRATION: CWS changefileheader (1.6.8); FILE MERGED
2008/03/28 16:08:23 rt 1.6.8.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:21:59 +00:00
Rüdiger Timm
dbd7fe14d6 INTEGRATION: CWS changefileheader (1.6.8); FILE MERGED
2008/03/28 16:08:22 rt 1.6.8.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:21:42 +00:00
Rüdiger Timm
bea55402ac INTEGRATION: CWS changefileheader (1.6.50); FILE MERGED
2008/03/28 16:08:22 rt 1.6.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:21:28 +00:00
Rüdiger Timm
63a07f1e60 INTEGRATION: CWS changefileheader (1.5.48); FILE MERGED
2008/03/28 16:08:22 rt 1.5.48.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:21:13 +00:00
Rüdiger Timm
5281170dcb INTEGRATION: CWS changefileheader (1.3.50); FILE MERGED
2008/03/28 16:08:21 rt 1.3.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:20:57 +00:00
Rüdiger Timm
d38adb948b INTEGRATION: CWS changefileheader (1.4.50); FILE MERGED
2008/03/28 16:08:21 rt 1.4.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:20:41 +00:00
Rüdiger Timm
b31e70d860 INTEGRATION: CWS changefileheader (1.14.34); FILE MERGED
2008/03/28 16:08:21 rt 1.14.34.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:19:46 +00:00
Rüdiger Timm
6f65b7ef52 INTEGRATION: CWS changefileheader (1.3.50); FILE MERGED
2008/03/28 16:08:20 rt 1.3.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:19:15 +00:00
Rüdiger Timm
fd9b64675f INTEGRATION: CWS changefileheader (1.4.50); FILE MERGED
2008/03/28 16:08:20 rt 1.4.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:18:56 +00:00
Rüdiger Timm
b70ce39cfb INTEGRATION: CWS changefileheader (1.7.10); FILE MERGED
2008/03/28 16:08:20 rt 1.7.10.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:18:21 +00:00
Rüdiger Timm
f3c2f1beb1 INTEGRATION: CWS changefileheader (1.10.34); FILE MERGED
2008/03/28 16:08:20 rt 1.10.34.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:17:59 +00:00
Rüdiger Timm
baca4ddcf5 INTEGRATION: CWS changefileheader (1.4.10); FILE MERGED
2008/03/28 16:08:20 rt 1.4.10.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:17:05 +00:00
Rüdiger Timm
6465a3772a INTEGRATION: CWS changefileheader (1.3.50); FILE MERGED
2008/03/28 16:08:19 rt 1.3.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:16:29 +00:00
Rüdiger Timm
9c575e5144 INTEGRATION: CWS changefileheader (1.4.50); FILE MERGED
2008/03/28 16:08:19 rt 1.4.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:15:31 +00:00
Rüdiger Timm
266ffb43cb INTEGRATION: CWS changefileheader (1.5.50); FILE MERGED
2008/03/28 16:08:19 rt 1.5.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:15:15 +00:00
Rüdiger Timm
1630eb995e INTEGRATION: CWS changefileheader (1.3.50); FILE MERGED
2008/03/28 16:08:18 rt 1.3.50.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:14:53 +00:00