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

185 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
Andras Timar
5c32afa5af replaced http://www.openoffice.org - fdo#32169 2010-12-07 22:31:09 +01:00
Thorsten Behrens
f419a50ef1 Updated artwork for rc 2010-11-30 00:21:39 +01:00
Vladimir Glazunov
49d963aaa3 #i10000# changes from OOO330 m15 2010-11-16 09:18:45 +01:00
Jan Holesovsky
71a43f77ad Merge commit 'ooo/OOO330_m15' into libreoffice-3-3 
Conflicts:
	instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
	instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
	solenv/inc/minor.mk
 2010-11-16 09:00:32 +01:00
Ingo Schmidt
4045178053 native346 #i115376# making update process more flexible 2010-11-09 13:25:59 +01:00
Ingo Schmidt
0403c11185 native334 #i115113# Windows language files in MISC instead of COMMONMISC 2010-10-19 17:53:47 +02:00
Caolán McNamara
6d5154ef0b AIX uses .a for shared libs 2010-10-13 20:29:37 +01:00
Fridrich Štrba
37f28f6fc5 Allow installing from command-line even on Windows 7 2010-10-04 22:21:36 +02:00
Fridrich Štrba
2f5cf5995c Change Product and Upgrade codes to not mess up with OOo install on Windows 2010-10-01 13:41:52 +02:00
Thorsten Behrens
3fc91c7355 new libreoffice artwork 2010-09-28 08:44:06 +02:00
Fridrich Štrba
0e4c8011b2 LibreOffice Branding: first cut 2010-09-28 08:44:06 +02:00
Ingo Schmidt
850ea2c2fd native317 #i112626# typical instead of complete installation 2010-07-02 15:48:55 +02:00
Ingo Schmidt
a76e94f5f7 native305 #i92977# new Windows INSTALLLOCATION settings 2010-05-27 14:50:25 +02:00
Ingo Schmidt
1e96d7d75a native305 #i92977# new Windows INSTALLLOCATION settings 2010-05-26 14:44:44 +02:00
Ingo Schmidt
00f9e62985 nativea #161863# adjusting string on Welcome page 2010-04-01 11:07:44 +02:00
Jens-Heiner Rechtien
b0de9864cd CWS-TOOLING: integrate CWS installer10 2010-04-13 15:58:42 +02:00
Ingo Schmidt
f4a89a4f47 native0: #161763# new bitmaps for OOo 2010-03-12 18:27:27 +01:00
Ivo Hinkelmann
5148646caf CWS-TOOLING: integrate CWS native278 2010-03-03 13:22:40 +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
Ingo Schmidt
66fcb92b37 native278: #i107237# upgradecodes for all language packs 2010-01-13 12:57:51 +01:00
Jens-Heiner Rechtien
443c59cebf CWS-TOOLING: integrate CWS native273 2010-01-05 13:37:43 +01:00
Dirk Völzke
7c9c561807 #i96594# Allow customization of 'register for Microsoft File Types' in custom setup 2009-12-04 13:06:13 +00:00
Dirk Völzke
f92fb56ceb #i96594# Allow customization of 'register for Microsoft File Types' in custom setup 2009-12-04 09:20:04 +00:00
Ingo Schmidt
0e1fee4e44 native273 #i106809# exchange mergemodules by redistributables 2009-12-03 17:28:42 +01:00
Dirk Völzke
73fe8f59e9 #i96594# Allow customization of 'register for Microsoft File Types' in custom setup 2009-11-26 11:40:15 +00:00
Ingo Schmidt
4fbe0bac30 #i105892# preparing 64 bit Windows registry table 2009-10-23 11:04:07 +00:00
Kurt Zenker
3203935b06 CWS-TOOLING: integrate CWS dv15 
2009-09-10 07:47:47 +0200 dv  r276020 : #i104942# Better renaming algorithmen
2009-09-03 13:42:16 +0200 dv  r275749 : #i104754# New icon for shared extensions
2009-09-03 13:37:58 +0200 dv  r275748 : #i104754# New icon for shared extensions
2009-09-03 10:31:06 +0200 dv  r275746 : #i104745# Reordered controls for better A11Y support
 2009-09-11 17:41:33 +00:00
Ivo Hinkelmann
ed1fe13f59 CWS-TOOLING: integrate CWS dv10 
2009-03-10 11:09:48 +0100 dv  r269257 : #158915# Check msi version before checking patches, better logging
2009-02-27 14:48:58 +0100 dv  r268594 : #i99154# Added missing string, removed wrong svn flags
2009-02-26 16:07:25 +0100 dv  r268531 : Removed superfluous file
2009-02-26 13:49:01 +0100 dv  r268514 : CWS-TOOLING: rebase CWS dv10 to trunk@268395 (milestone: DEV300:m42)
2009-02-26 08:13:32 +0100 dv  r268479 : #i86963# Listen to dispose events for xPackages
2009-02-12 15:40:06 +0100 dv  r267668 : #i99154# Added missing string
2009-02-03 11:47:11 +0100 dv  r267308 : #i73966# Ask for confirmation when removing an extension
2009-01-30 09:27:52 +0100 dv  r267175 : #158915# Check for already installed patches to allow launching the setup in maintainance mode
 2009-04-02 13:31:45 +00:00
Oliver Bolte
9e7d59cf2f CWS-TOOLING: integrate CWS dv07 
2009-02-12 13:22:37 +0100 dv  r267650 : #i94560# Removed string, which needed translation
2009-01-27 16:09:50 +0100 dv  r267004 : #i94560# Allow building without redistributable
2009-01-27 10:56:38 +0100 is  r266965 : #i98509# InstallOrder for extension module
2009-01-26 08:08:16 +0100 dv  r266899 : #i94560# Work around Windows Vista installation problems
2009-01-19 14:28:56 +0100 dv  r266498 : CWS-TOOLING: rebase CWS dv07 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:56:07 +0100 dv  r266477 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:54:30 +0100 dv  r266476 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:13:06 +0100 dv  r266474 : #i94347# Changed LaunchCondition from AdminUser to Privileged
2008-12-18 08:42:04 +0100 dv  r265662 : #i97201# remove old release notes when notified about updates
2008-12-15 14:50:33 +0100 dv  r265501 : #i96844# Use fputs instead of fprintf
 2009-02-18 10:41:06 +00:00
Vladimir Glazounov
2e6e0e46de CWS-TOOLING: integrate CWS native214 
2009-01-05 16:05:30 +0100 is  r265877 : #i97060# version number 3.1 instead of 3.0
2009-01-05 14:02:05 +0100 is  r265868 : #i97060# 3.1 also for slackware packages
2008-12-15 13:47:31 +0100 is  r265482 : #i94714# adding string
2008-12-15 10:40:59 +0100 is  r265464 : #i94746# math.desktop for all products
2008-12-12 14:31:01 +0100 is  r265418 : #i94871# adjust image for dmg file
2008-12-12 13:02:05 +0100 is  r265409 : #i92038# avoiding sending mails to root
2008-12-12 12:43:58 +0100 is  r265408 : #158469# removing registry entries for wps and ichitaro
2008-12-12 12:36:13 +0100 is  r265407 : #i95257# adding Mongolian as nsis language
2008-12-11 15:59:57 +0100 is  r265325 : #89742# fixing typo
2008-12-11 15:54:43 +0100 is  r265324 : #i89732# minor string fixes
2008-12-11 15:35:29 +0100 is  r265320 : #i97060# gnome also for user installation required
2008-12-11 12:34:36 +0100 is  r265283 : #i96575# removing superfluous dependencies
2008-12-10 15:31:04 +0100 is  r265196 : #i96306# adding Gaelic
2008-12-10 14:35:28 +0100 is  r265187 : #i94776# ure version 1.5
2008-12-10 11:40:47 +0100 is  r265161 : #158920# new extension process
2008-12-10 11:38:46 +0100 is  r265160 : #158920# new extension process
2008-12-10 11:37:32 +0100 is  r265159 : #158920# new extension process
2008-12-09 13:05:20 +0100 is  r265077 : #i94453# longer textbox
2008-12-09 12:41:35 +0100 is  r265076 : #i97060# setting version 3.1.0
 2009-01-20 11:48:05 +00:00
Vladimir Glazounov
9c2ff0c645 CWS-TOOLING: integrate CWS native217_DEV300 2009-01-20 10:49:08 +00:00
Rüdiger Timm
f05154c1f2 #i97483# Remove duplicate entries, introduced in r14657 (integration of CWS native209_DEV300). 2008-12-22 11:33:00 +00:00
Rüdiger Timm
0653d8ba55 CWS-TOOLING: integrate CWS native210_DEV300 2008-12-16 09:24:51 +00:00
Rüdiger Timm
2f4d5c35d4 CWS-TOOLING: integrate CWS native209_DEV300 2008-12-16 08:51:36 +00:00
Jens-Heiner Rechtien
0027f2c0dd CWS-TOOLING: integrate CWS native206_DEV300 2008-11-20 13:56:53 +00:00
Vladimir Glazounov
4c25522a6b CWS-TOOLING: integrate CWS native196_DEV300 2008-10-02 08:34:45 +00:00
Rüdiger Timm
0da75d94a3 INTEGRATION: CWS native190_DEV300 (1.5.62); FILE MERGED 
2008/08/29 13:52:08 is 1.5.62.1: #i93251# preparation for msi plus msp installation sets
 2008-09-04 06:06:33 +00:00
Rüdiger Timm
3f5c8f2e0b INTEGRATION: CWS native190_DEV300 (1.1.696); FILE MERGED 
2008/09/01 14:42:02 is 1.1.696.1: #i93251# patchwelcome also for admin installation
 2008-09-04 06:05:22 +00:00
Rüdiger Timm
07678e71f8 INTEGRATION: CWS native188_DEV300 (1.1.4.2.4); FILE MERGED 
2008/08/21 15:14:00 is 1.1.4.2.4.1: #i92952# ooo3 has to remove all older ooo3 products
 2008-08-27 10:49:02 +00:00
Rüdiger Timm
f00779d388 INTEGRATION: CWS native188_DEV300 (1.3.64); FILE MERGED 
2008/08/22 16:49:30 is 1.3.64.1: #i93032# new win registry layers for all products
 2008-08-27 10:48:45 +00:00
Rüdiger Timm
a020949f4a INTEGRATION: CWS native188_DEV300 (1.12.8.1.4); FILE MERGED 
2008/08/21 15:14:00 is 1.12.8.1.4.1: #i92952# ooo3 has to remove all older ooo3 products
 2008-08-27 10:48:29 +00:00
Kurt Zenker
5169edfa4d INTEGRATION: CWS native182_DEV300 (1.1.2); FILE ADDED 
2008/08/07 12:59:11 is 1.1.2.1: #158187# removing also langpacks and updates
 2008-08-15 13:05:23 +00:00
Kurt Zenker
787d6444eb INTEGRATION: CWS native182_DEV300 (1.12.16); FILE MERGED 
2008/08/07 12:58:40 is 1.12.16.1: #158187# removing also langpacks and updates
 2008-08-15 13:05:13 +00:00
Kurt Zenker
7606230d7b INTEGRATION: CWS native182_DEV300 (1.7.16); FILE MERGED 
2008/08/08 12:58:41 is 1.7.16.2: #158399# basis-link always in brandlayer
2008/08/07 12:58:40 is 1.7.16.1: #158187# removing also langpacks and updates
 2008-08-15 13:05:01 +00:00
Kurt Zenker
0a29cd264f INTEGRATION: CWS native182_DEV300 (1.8.16); FILE MERGED 
2008/08/07 12:58:40 is 1.8.16.1: #158187# removing also langpacks and updates
 2008-08-15 13:04:49 +00:00
Rüdiger Timm
6771aaee90 INTEGRATION: CWS rmfreetype (1.5.36); FILE MERGED 
2008/06/04 04:52:53 obr 1.5.36.1: #i52026# faked RPM dependency for libfreetype
 2008-08-01 13:25:49 +00:00
Rüdiger Timm
bf1e0ac6fe INTEGRATION: CWS rmfreetype (1.1.2); FILE ADDED 
2008/06/04 04:52:53 obr 1.1.2.1: #i52026# faked RPM dependency for libfreetype
 2008-08-01 13:25:35 +00:00
Rüdiger Timm
e8d2e87feb INTEGRATION: CWS native177 (1.8.4); FILE MERGED 
2008/07/23 13:42:16 is 1.8.4.1: #i92029# adding events for buttons
 2008-08-01 10:20:56 +00:00
Rüdiger Timm
f1f04dfaff INTEGRATION: CWS ause091 (1.9.62); FILE MERGED 
2008/07/23 14:25:19 hjs 1.9.62.1: #i92044# - do not relay on intermediate files
 2008-07-30 11:49:35 +00:00