Commit graph

178 commits

Author SHA1 Message Date
Stephan Bergmann
16aa2c1dd6 Removed obsolete OOOBASEVERSION, OOOPACKAGEVERSION.
With the basis/brand split undone, they are always the same as
PRODUCTVERSION and ABOUTBOXPRODUCTVERSION, respectively.
2011-11-15 18:29:47 +01:00
Michael Stahl
7a080d0f46 setup_native: add 64 bit provides to fake-db.rpm 2011-11-08 13:02:47 +01:00
Tor Lillqvist
6b8e02c741 Kill Sun-specific stclient_wrapper 2011-04-26 18:33:13 +03: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
Alexander Thurgood
8b9003a4d5 Fix window focus for langpack installation on Mac fdo# 33056
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
2011-01-26 18:10:16 +01:00
Joachim Lingner
c2ccafd7a2 jl160 merge with DEV300m96 2011-01-04 12:01:53 +01:00
Hans-Joachim Lankenau
a1e857c6b1 CWS-TOOLING: integrate CWS native347 2010-12-17 17:11:10 +01:00
Ingo Schmidt
7c653e79b4 native347 #i115537# mac langpack offers no longer mounted volumes 2010-11-16 17:54:07 +01:00
Vladimir Glazunov
700fe28014 CWS-TOOLING: integrate CWS sb132 2010-11-08 17:34:27 +01:00
Caolán McNamara
b77940e5af add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
Joachim Lingner
7f2d39227e jl160 #i114794 adapting admin.pl to use unopg sync without further parameter 2010-10-28 12:57:47 +02:00
Ingo Schmidt
6ca52de786 native334 #i113163# trivial fix 2010-10-19 17:49:20 +02:00
Ingo Schmidt
21d56ddc57 native334 #163388# no more change of DS_Store file 2010-10-19 17:42:55 +02:00
Thomas Klausner
b8c819c04a Use standard '=' comparison operator for test(1). 2010-10-09 10:39:27 +02:00
Jan Holesovsky
7e73a8842b Merge commit 'ooo/OOO330_m9' 2010-10-06 13:31:28 +02:00
sb
a77fe39fbb sb132: merged in DEV300_m89 2010-10-04 17:07:14 +02:00
Fridrich Štrba
d8f2145392 LibreOffice Branding: first cut 2010-09-28 08:44:08 +02:00
sb
974a58a3f7 sb132: #i114422# adapted install_solaris.sh 2010-09-23 16:30:04 +02:00
Ingo Schmidt
811df1cfc3 native330 #i113835# fix 2010-09-17 14:48:05 +02:00
Kurt Zenker
356027851e CWS-TOOLING: integrate CWS native324 2010-08-18 13:32:26 +02:00
Ingo Schmidt
969f4032e8 native324 #i113835# preparing rpm installation on debian systems 2010-08-13 11:15:11 +02:00
Ingo Schmidt
a13422099b jl154 #162868# bundled folder in prereg folder 2010-07-23 10:37:24 +02:00
Ingo Schmidt
d60b211a12 jl154 #162868# unopkg in shell script with several quotes 2010-07-22 17:43:35 +02:00
Ingo Schmidt
66cb95ef2a jl154 #162868# new share/prereg folder 2010-07-21 12:04:31 +02:00
Joachim Lingner
ca2b860c30 jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder 2010-07-15 16:28:33 +02:00
Ingo Schmidt
ecde3e0e68 jl154 #162868# unopkg is back in packaging and installation 2010-07-13 18:57:19 +02:00
Ingo Schmidt
00d5cdc080 jl154 #162868# unopkg is back in packaging and installation 2010-07-12 18:02:39 +02:00
Ingo Schmidt
70943ed84a jl154 #162868# unopkg is back in packaging and installation 2010-07-12 16:20:39 +02:00
Ingo Schmidt
5908513b96 native317 #i112444# directories below optional components 2010-07-02 15:42:56 +02:00
Jens-Heiner Rechtien
4f2def4221 CWS-TOOLING: integrate CWS sb118 2010-04-16 10:09:51 +02:00
sb
55d474d853 sb118: merged in re/DEV300_next towards DEV300_m76 2010-04-07 13:14:23 +02:00
sb
d11e7c65af merged in re/DEV300_next towards DEV300_m74 2010-03-04 23:05:27 +01:00
Ivo Hinkelmann
60c0e59fd4 CWS-TOOLING: integrate CWS native278 2010-03-03 13:22:40 +01:00
Jens-Heiner Rechtien
af1645d6a2 CWS-TOOLING: integrate CWS ause117 2010-04-13 13:27:41 +02:00
Hans-Joachim Lankenau
f573d06ba6 ause117: #i110262# more targets that require rpm 2010-03-24 15:22:15 +01:00
Hans-Joachim Lankenau
23de218d3a ause117: #i110262# just call rpm if you want/have rpm 2010-03-24 11:36:05 +01:00
Hans-Joachim Lankenau
910f5353a9 ause117: #i110262# make noarch group writeable 2010-03-22 14:35:33 +01:00
sb
87ec9c993b sb118: merged in DEV300_m72 2010-02-25 12:46:45 +01:00
Ingo Schmidt
19c60d1cd5 native0: #161646# new parameter for unopkg 2010-02-23 16:00:32 +01: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
Ingo Schmidt
7af39a112d native278: #i107880# white spaces in pathes 2010-01-13 12:44:09 +01:00
sb
55ec111502 sb118: #i108269# first step of removing tcsh support 2010-01-12 18:49:59 +01:00
Jens-Heiner Rechtien
8a5b599890 DEV300 masterfix: get_sis_time_string(): correct calculation of month 2010-01-07 13:02:32 +01:00
Ingo Schmidt
34cf5372d0 #i10633# admin.pl support for msidb.exe next to admin.pl 2009-10-29 11:33:58 +00:00
Ingo Schmidt
faf0b92ddb #i106333# using local msidb.exe 2009-10-29 10:49:03 +00:00
Ingo Schmidt
231a6f0044 #i10633# admin.pl support for included cabinet files 2009-10-27 10:52:43 +00:00
Vladimir Glazounov
5904262c70 #100000# define temp directory for rpm from environment 2009-10-05 13:00:17 +00:00
Ivo Hinkelmann
a408bb529f CWS-TOOLING: integrate CWS l10nframework01 2009-09-16 11:45:54 +00:00
Release Engineers
59e13df0d2 CWS-TOOLING: integrate CWS sysui311_DEV300
2009-08-11 18:30:31 +0200 ihi  r274874 : #104116# use __lxstat wrapper for X86_64 Linux
2009-08-27 13:01:32 +00:00
Release Engineers
b84d6fb52b CWS-TOOLING: integrate CWS native262
2009-08-18 16:35:06 +0200 is  r275118 : #i102939# differ between ok-label and install-label
2009-08-13 17:24:47 +0200 is  r274960 : #i102939# mac languagepacks
2009-08-13 17:22:22 +0200 is  r274959 : #i102939# mac languagepacks
2009-08-13 17:15:01 +0200 is  r274958 : #i102939# mac languagepacks
2009-08-13 17:13:36 +0200 is  r274957 : #i102939# mac languagepacks
2009-08-13 17:12:57 +0200 is  r274956 : #i102939# mac languagepacks
2009-08-13 17:12:20 +0200 is  r274955 : #i102939# mac languagepacks
2009-08-13 17:11:41 +0200 is  r274954 : #i102939# mac languagepacks
2009-08-13 17:10:52 +0200 is  r274953 : #i102939# mac languagepacks
2009-08-26 06:41:14 +00:00