strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14183 commits 9 branches 795 tags 2.1 GiB
Commit graph

111 commits

Author SHA1 Message Date
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
 2011-03-08 19:43:29 -06:00
Michael Meeks
eadfd2123e BrOffice branding for windows shortcuts 2011-01-10 09:37:32 +00:00
Fridrich Štrba
d97f774703 Adding LANGUAGEMODULE flag to helppack files 2010-12-16 13:53:35 +01:00
Tor Lillqvist
304e7da4f5 First shot on helppacks 2010-12-16 09:15:54 +01:00
Tor Lillqvist
e238be67e8 win32-activex-disable.diff: add option to disable build of activex component 2010-10-07 15:43:06 +02:00
Fridrich Štrba
a75f1d394c odf-flatxml-import-export.diff: load and save documents in flat xml 
load and save also odf documents in flat xml format as opposed to the compressed ones (conforming to the odf specifications)
 2010-09-30 15:23:01 +02:00
Dirk Voelzke
49c9d54a10 dv19#i112377# Cleaned up 'open with' entries for windows system integration 2010-06-29 12:42:33 +02:00
Ingo Schmidt
2f0e537346 nativea #161792# correct name for old Windows registry entries 2010-03-30 16:27:40 +02:00
Vladimir Glazunov
225b810d0e #i108159# new ODF-Icons in OOo transplanted from 77e2f3138467@odficons01 2010-03-25 15:26:27 +01:00
sb
dffd8ec02a sb111: merged in DEV300_m72 2010-02-25 13:53:42 +01:00
Vladimir Glazunov
2490ad7e0f CWS-TOOLING: integrate CWS changefileheader2 2010-02-17 10:32:35 +01:00
Jens-Heiner Rechtien
f281d77a21 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
Dirk Voelzke
ac0ef24594 dv17: #i70994#: Use own component for property handler 2010-01-29 10:46:14 +01:00
Dirk Voelzke
99b240d2f7 dv17: #i70994#: Proprty handler should work with 64bit, too 2010-01-25 07:08:21 +01:00
Dirk Voelzke
9f132f9385 dv17: merge with DEV300_m69 2010-01-20 14:07:34 +01:00
Dirk Voelzke
cdf426dc56 dv17: #i70994#: Use property handler instead of column info for Windows Vista 2010-01-20 11:33:12 +01:00
sb
822b6695e2 sb111: merged in DEV300_m69 2010-01-08 13:21:39 +01:00
Jens-Heiner Rechtien
ba77594d1d CWS-TOOLING: integrate CWS native275 2010-01-05 15:39:30 +01:00
sb
054ac6a46c sb111: merged in DEV300_m67 2009-12-10 17:46:18 +01:00
Ingo Schmidt
b3e882c13b native275 #i107355# updating to OOo 3.3 2009-12-03 17:27:47 +01:00
Ivo Hinkelmann
f4adf36685 CWS-TOOLING: integrate CWS fwk125 
2009-11-19 08:11:20 +0100 jsk  r277554 : fwk125: #i105760# - removed warnlog, re-enabled autotest e_help.bas
2009-11-16 16:21:49 +0100 tl  r277521 : #i106571# fixed locale list for dictionaries to get rid of duplicate entries
2009-11-12 08:47:31 +0100 hde  r277469 : rework of hyphenation
2009-11-11 15:25:16 +0100 hde  r277462 : rework of hyphenation
2009-11-11 15:24:09 +0100 hde  r277461 : rework of hyphenation
2009-11-11 13:52:02 +0100 hde  r277453 : new include for hyphenation tools
2009-11-10 12:28:51 +0100 tl  r277427 : #i102304# fix for hyphenation dialog
2009-11-10 12:00:10 +0100 mav  r277425 : #i10000# A workaround for pch and windows headers conflict
2009-11-10 11:58:32 +0100 mav  r277424 : #i10000# A workaround for pch and windows headers conflict
2009-11-09 15:47:59 +0100 kso  r277414 : #i16732# fixed url matching.
2009-11-09 11:51:40 +0100 mav  r277406 : #i10000# use precompiled headers
2009-11-08 23:53:03 +0100 mav  r277399 : #i10000# fix warning
2009-11-08 23:50:23 +0100 mav  r277398 : #i10000# adapt for unix
2009-11-08 23:49:52 +0100 mav  r277397 : #i10000# adapt for unix
2009-11-08 21:26:06 +0100 mav  r277396 : CWS-TOOLING: rebase CWS fwk125 to branches/OOO320@277373 (milestone: OOO320:m4)
2009-11-06 16:30:27 +0100 ab  r277394 : #i106100# Hold references to packages to speed up further calls to getDeployedPackages()
2009-11-06 15:58:48 +0100 mav  r277392 : #i102464# check the Windows ACL
2009-11-06 15:58:23 +0100 mav  r277391 : #i102464# check the Windows ACL
2009-11-04 11:54:06 +0100 tl  r277342 : #i106497# incorrectly found 'supported languages' fixed
2009-11-04 10:40:51 +0100 tl  r277335 : #i106571# dictionary updates for Polish and Swedish.
2009-10-28 09:54:41 +0100 tl  r277236 : #i106100# context menu performance
2009-10-27 15:47:05 +0100 tl  r277213 : #i106100# context menu performance
2009-10-23 17:31:56 +0200 mav  r277170 : #i106075# use correct path to inprocserv.dll
2009-10-23 16:07:27 +0200 mav  r277168 : #i105760# seek the temporary file to beginning also for URL case
2009-10-23 11:03:58 +0200 mav  r277134 : CWS-TOOLING: rebase CWS fwk125 to branches/OOO320@276942 (milestone: OOO320:m2)
 2009-11-23 16:33:39 +00:00
Jens-Heiner Rechtien
fe868574cc CWS-TOOLING: integrate CWS dv11 
2009-05-13 16:50:24 +0200 dv  r271863 : #i101829# Use UPGRADINGPRODUCTCODE to detect major upgrade
2009-04-17 15:55:48 +0200 dv  r270953 : CWS-TOOLING: rebase CWS dv11 to trunk@270723 (milestone: DEV300:m46)
2009-04-17 09:14:21 +0200 dv  r270916 : #i100915# Use better product name
2009-04-16 14:41:49 +0200 dv  r270884 : #i101132# Use a waiting thread to defere update check
2009-04-07 15:46:52 +0200 dv  r270599 : #i100915# Use one include file for all version.rc files
2009-04-07 13:49:56 +0200 dv  r270596 : #i100915# Use one include file for all version.rc files
2009-04-03 09:04:08 +0200 dv  r270447 : #100776# Added Microsoft XML file types to 'Default Applications', cleaned up Application name display in 'Default Applications'
2009-04-01 10:13:28 +0200 dv  r270306 : #i100713# Remove instmsia.exe from installation set
2009-03-30 16:35:35 +0200 dv  r270240 : CWS-TOOLING: rebase CWS dv11 to trunk@270033 (milestone: DEV300:m45)
2009-03-27 10:24:40 +0100 dv  r270138 : #i100410# Show survey after deinstalling OpenOffice.org (Windows only)
2009-03-18 15:05:31 +0100 dv  r269679 : #i98780# Use 'Desktop' folder only, if it exists
2009-03-17 11:19:47 +0100 dv  r269581 : #i100082# Ignore updates with failed dependencies for automatic update check
2009-03-13 14:37:27 +0100 dv  r269479 : #i100082# Use 'value' instead of 'name' to create error message
2009-03-13 10:14:48 +0100 dv  r269460 : #i100082# Support better error message when extension manager update finds an incompatible update
 2009-05-15 14:12:42 +00:00
Oliver Bolte
5cfef74383 CWS-TOOLING: integrate CWS fwk102 
2009-02-10 18:30:48 +0100 mav  r267575 : #159157# let the hypterlink be opened in the same browser window in case of ActiveX control
2009-02-10 18:26:06 +0100 mav  r267574 : #159157# let the hypterlink be opened in the same browser window in case of ActiveX control
2009-02-10 18:18:28 +0100 mav  r267573 : #159157# let the hypterlink be opened in the same browser window in case of ActiveX control
2009-02-09 16:51:23 +0100 mav  r267522 : #i98922# the fix from IS from native222
2009-02-09 14:48:19 +0100 os  r267516 : RES_PARATR_OUTLINELEVEL added
2009-02-09 11:07:55 +0100 mav  r267503 : #i97987# handle untitled documen correctly on switching to shared mode
2009-02-06 14:52:48 +0100 mav  r267465 : #i98240# commit the patch
2009-02-06 13:56:09 +0100 mav  r267460 : #i98206# do not get outstream ourself
 2009-02-19 08:26:23 +00:00
Jens-Heiner Rechtien
c7f14cbc3c CWS-TOOLING: integrate CWS buildid301_DEV300 2008-11-20 15:13:11 +00:00
Ivo Hinkelmann
16639f4aca INTEGRATION: CWS sysui26 (1.7.50); FILE MERGED 
2008/06/30 20:21:09 dv 1.7.50.1: #i90335# Moved all binfilter related registry entries to binfilter module
 2008-07-16 15:24:05 +00:00
Ivo Hinkelmann
7300498de7 INTEGRATION: CWS sysui26 (1.15.48); FILE MERGED 
2008/06/30 20:21:09 dv 1.15.48.1: #i90335# Moved all binfilter related registry entries to binfilter module
 2008-07-16 15:23:48 +00:00
Rüdiger Timm
64d921a904 INTEGRATION: CWS native161 (1.19.62); FILE MERGED 
2008/06/27 16:27:33 is 1.19.62.1: #i90919# dependencies to ooobasis packages
 2008-07-07 15:24:55 +00:00
Vladimir Glazounov
24450c67a9 INTEGRATION: CWS native149 (1.18.8); FILE MERGED 
2008/04/28 14:03:56 is 1.18.8.1: #i88801# only one application module left
 2008-05-14 12:09:01 +00:00
Vladimir Glazounov
e12e1c7366 INTEGRATION: CWS native141 (1.16.16); FILE MERGED 
2008/04/09 16:39:49 is 1.16.16.1: #i88109# no packages at nodes in java installer
 2008-04-15 13:55:58 +00:00
Vladimir Glazounov
64bc59aac4 INTEGRATION: CWS native140 (1.13.176); FILE MERGED 
2008/03/31 15:12:24 is 1.13.176.1: #i87653# removing all PATCH flags
 2008-04-15 09:41:55 +00:00
Vladimir Glazounov
115ed834fe INTEGRATION: CWS native140 (1.26.12); FILE MERGED 
2008/03/31 15:12:24 is 1.26.12.1: #i87653# removing all PATCH flags
 2008-04-15 09:40:48 +00:00
Rüdiger Timm
2051595e2a INTEGRATION: CWS changefileheader (1.6.408); FILE MERGED 
2008/03/31 16:07:07 rt 1.6.408.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:18:11 +00:00
Rüdiger Timm
ba0eb7b6d4 INTEGRATION: CWS changefileheader (1.13.174); FILE MERGED 
2008/03/31 16:07:07 rt 1.13.174.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:17:54 +00:00
Rüdiger Timm
658315bf59 INTEGRATION: CWS changefileheader (1.5.408); FILE MERGED 
2008/03/31 16:07:07 rt 1.5.408.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:17:36 +00:00
Rüdiger Timm
39bfc8c59d INTEGRATION: CWS changefileheader (1.16.8); FILE MERGED 
2008/03/31 16:07:07 rt 1.16.8.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:17:20 +00:00
Rüdiger Timm
f914c6bba0 INTEGRATION: CWS changefileheader (1.5.1024); FILE MERGED 
2008/03/31 16:07:07 rt 1.5.1024.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:17:06 +00:00
Rüdiger Timm
21027bc824 INTEGRATION: CWS changefileheader (1.7.272); FILE MERGED 
2008/03/31 16:07:07 rt 1.7.272.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:15:50 +00:00
Rüdiger Timm
328045c16b INTEGRATION: CWS changefileheader (1.26.8); FILE MERGED 
2008/03/31 16:07:07 rt 1.26.8.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:15:35 +00:00
Vladimir Glazounov
e28ad954f5 INTEGRATION: CWS sb83 (1.14.2); FILE MERGED 
2008/02/22 08:50:28 sb 1.14.2.4: RESYNC: (1.14-1.15); FILE MERGED
2008/02/13 16:00:55 is 1.14.2.3: #i86068# brand application modules
2008/01/29 17:08:23 sb 1.14.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:18 sb 1.14.2.1: #i85112# merged in cws_src680_native121
 2008-03-18 12:25:44 +00:00
Vladimir Glazounov
1455d721f6 INTEGRATION: CWS sb83 (1.25.154); FILE MERGED 
2008/02/13 17:04:22 is 1.25.154.2: '#i86068#'
2008/01/29 17:08:23 sb 1.25.154.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
 2008-03-18 12:25:30 +00:00
Ivo Hinkelmann
fbd1797e6c INTEGRATION: CWS native127 (1.14.16); FILE MERGED 
2008/01/28 16:01:47 is 1.14.16.1: #i85474# avoid deselection of all application modules
 2008-02-05 12:40:34 +00:00
Oliver Bolte
1d0c70b0b1 INTEGRATION: CWS native110 (1.13.14); FILE MERGED 
2007/11/12 16:06:56 is 1.13.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:53 is 1.13.14.1: #i82251# repackaging, part 3
 2008-01-04 16:07:14 +00:00
Vladimir Glazounov
e91f0bc908 INTEGRATION: CWS native106 (1.12.238); FILE MERGED 
2007/08/14 14:11:37 is 1.12.238.1: #i78125# starting apps from command line
 2007-10-15 12:36:41 +00:00
Kurt Zenker
ac5d4dcf6b INTEGRATION: CWS native100 (1.12.276); FILE MERGED 
2007/08/23 14:49:54 is 1.12.276.1: #i80937# introducing module order
 2007-09-06 09:05:05 +00:00
Jens-Heiner Rechtien
aa3ec13656 INTEGRATION: CWS fwk69 (1.22.130); FILE MERGED 
2007/07/20 07:51:41 mav 1.22.130.1: #i79778# let the embedded configuration be updated by the patch
 2007-08-02 16:19:12 +00:00
Jens-Heiner Rechtien
64ba61cfb3 INTEGRATION: CWS dba23c (1.22.126); FILE MERGED 
2007/07/18 13:03:33 fs 1.22.126.1: #i79683# #i79689# some PATCH flags for the various particles of org.openoffice.Office.Embedding configuration data
 2007-07-31 13:03:29 +00:00
Jens-Heiner Rechtien
fe666ec3e8 INTEGRATION: CWS configure21 (1.22.106); FILE MERGED 
2007/07/05 20:52:38 rene 1.22.106.1: #i79273# install help files w/o java enabled
 2007-07-31 12:12:04 +00:00
Rüdiger Timm
152ace83eb INTEGRATION: CWS jl67 (1.6.732); FILE MERGED 
2007/07/03 13:04:34 is 1.6.732.1: #i79141# non advertised shortcuts
 2007-07-26 07:51:13 +00:00
Kurt Zenker
d13e20721f INTEGRATION: CWS hro15_SRC680 (1.21.174); FILE MERGED 
2007/05/04 09:24:44 hro 1.21.174.1: #i59251 Enable Unicode support in wrapper executables used for Windows shell integration. Patch flag added
 2007-05-09 12:22:50 +00:00
Ivo Hinkelmann
4da6d1cf5b INTEGRATION: CWS mergede01 (1.5.574); FILE MERGED 
2007/03/19 15:23:57 ihi 1.5.574.1: #i72301# Remove German
 2007-04-19 14:24:24 +00:00