Commit Graph

27 Commits

Author SHA1 Message Date
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
255677ab5b Trying to remove the stlport mention from the code 2011-02-09 19:56:30 +01:00
e73dde5fb4 Finally, gut the vos module out of the build 2010-10-25 19:55:29 -05:00
312466f9d4 merge vosremoval-timer.diff 2010-10-25 19:55:29 -05:00
sb
5dbc43ead1 sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
sb
87ec9c993b sb118: merged in DEV300_m72 2010-02-25 12:46:45 +01:00
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
sb
27bb69577e sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates 2010-01-29 17:01:54 +01:00
1dabbee147 #103496#: move VCL free ConfigItems to unotools 2009-10-06 07:38:24 +02:00
8520f1cd1b CWS-TOOLING: integrate CWS dtrans2vcl
2009-09-09 19:47:56 +0200 pl  r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl  r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl  r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl  r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl  r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl  r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl  r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl  r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl  r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl  r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl  r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl  r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code
2009-09-18 11:54:06 +00:00
89af656fab INTEGRATION: CWS changefileheader (1.16.24); FILE MERGED
2008/03/31 12:31:37 rt 1.16.24.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:29:58 +00:00
8d9a9bce38 INTEGRATION: CWS supdremove02 (1.15.108); FILE MERGED
2008/01/25 15:58:28 rt 1.15.108.1: #i85482# Remove UPD from library names.
2008-02-25 14:33:28 +00:00
82b175244d INTEGRATION: CWS aquavcl01 (1.12.82); FILE MERGED
2007/04/11 08:04:08 pjanik 1.12.82.4: RESYNC: (1.13-1.14); FILE MERGED
2006/09/22 08:14:13 ericb 1.12.82.3: does complete #i62119# fix mozilla plugin issue on Mac OS X building or not mozilla plugin
2006/03/10 14:26:33 tra 1.12.82.2: RESYNC: (1.12-1.13); FILE MERGED
2006/01/31 00:36:17 fheckl 1.12.82.1: Allowing a full aqua build
2007-07-05 07:52:58 +00:00
ac68919928 INTEGRATION: CWS mingwport03 (1.13.94); FILE MERGED
2006/09/06 14:08:46 vg 1.13.94.1: #i53572# MinGW port
2007-03-26 12:10:14 +00:00
f1ca6b5263 INTEGRATION: CWS pj50 (1.12.98); FILE MERGED
2006/02/17 06:56:05 pjanik 1.12.98.1: #i59729#: Honour WITHOUT_MOZILLA again (patch from thb).
2006-03-08 13:16:55 +00:00
d987a87e07 INTEGRATION: CWS ooo19126 (1.11.66); FILE MERGED
2005/09/05 12:59:51 rt 1.11.66.1: #i54170# Change license header: remove SISSL
2005-09-08 18:57:10 +00:00
400c7fcaf1 INTEGRATION: CWS ause028 (1.10.18); FILE MERGED
2005/05/03 09:39:07 hjs 1.10.18.1: #109143# use generated includes from solver; cleanup
2005-06-09 13:56:45 +00:00
eb7082a698 INTEGRATION: CWS systemmozilla (1.9.70); FILE MERGED
2005/01/06 18:58:34 rene 1.9.70.1: #i17187# use system mozilla ... (patch)
2005-03-30 10:42:44 +00:00
d79d153f3f INTEGRATION: CWS ooo20040704 (1.8.130); FILE MERGED
2004/06/29 09:01:04 cmc 1.8.130.1: #i30801# allow using system stl if possible
2004-09-08 13:04:57 +00:00
4b36b6f62b INTEGRATION: CWS geordi2q01 (1.7.68); FILE MERGED
2003/08/18 12:55:15 hr 1.7.68.1: #i18350#: join changes from CWS ooo11rc3
2003-08-18 13:45:30 +00:00
4012f2418a INTEGRATION: CWS tune01 (1.6.46); FILE MERGED
2003/03/14 11:31:52 mhu 1.6.46.1: #i12151# Added symbol scoping mapfile, fixed dependencies, removed obsolete files.
2003-04-15 12:55:01 +00:00
fe7f4ccfd0 #104771#fix building of hid.lst 2002-11-07 14:14:09 +00:00
90403f4e3e #65293# TARGETTYPE=GUI 2001-09-18 13:24:48 +00:00
e6b472c078 #79029# change datatransfer to use UCB (DataSourceFactory service vanished) 2000-12-07 18:29:03 +00:00
3d510536e5 add: SVLLIB 2000-12-01 05:22:49 +00:00
3c28c05cdf #80561# use SvtPathOptions instead of Settings service 2000-11-28 09:02:59 +00:00
95117e7fef initial import 2000-09-18 15:18:56 +00:00