Commit graph

38 commits

Author SHA1 Message Date
Norbert Thiebaud
e4610ffd2d remove PCH support in dmake-module 2011-11-27 12:26:12 -06:00
Stephan Bergmann
2ff63bcdea Undo basis/brand split: merge basis share/ into brand share/. 2011-10-07 22:06:28 +02:00
Fridrich Štrba
f35848e9f5 package the dummy visio importer 2011-06-06 12:53:38 +02:00
Michael Meeks
b846e8e650 fix scp2 errors, re-factor, accelerate, and add error detection to parser 2011-03-18 17:35:01 +01:00
Thorsten Behrens
bce1f07cac Fix ppt and wpg import
There's no STD_UNO_LIB_FILE_PATCH anymore
2011-03-18 17:35:00 +01:00
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
Fridrich Štrba
5c9ac81fbc wpgimporter.diff: WPG Import filter 2010-09-14 11:29:54 +02:00
sb
c096e86385 sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
sb
dffd8ec02a sb111: merged in DEV300_m72 2010-02-25 13:53:42 +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
Vladimir Glazounov
5cbdc9a934 INTEGRATION: CWS native140 (1.11.676); FILE MERGED
2008/03/31 15:12:25 is 1.11.676.1: #i87653# removing all PATCH flags
2008-04-15 09:42:29 +00:00
Rüdiger Timm
d5e0c2e550 INTEGRATION: CWS changefileheader (1.5.408); FILE MERGED
2008/03/31 16:07:08 rt 1.5.408.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:21:10 +00:00
Rüdiger Timm
1116e769f8 INTEGRATION: CWS changefileheader (1.5.196); FILE MERGED
2008/03/31 16:07:08 rt 1.5.196.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:20:52 +00:00
Rüdiger Timm
00a0f9106f INTEGRATION: CWS changefileheader (1.4.1022); FILE MERGED
2008/03/31 16:07:08 rt 1.4.1022.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:20:27 +00:00
Rüdiger Timm
807e4aea04 INTEGRATION: CWS changefileheader (1.11.674); FILE MERGED
2008/03/31 16:07:08 rt 1.11.674.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:19:46 +00:00
Kurt Zenker
3a8fc679e1 INTEGRATION: CWS native100 (1.4.800); FILE MERGED
2007/08/23 14:49:55 is 1.4.800.1: #i80937# introducing module order
2007-09-06 09:05:32 +00:00
Ivo Hinkelmann
a3c13b141b INTEGRATION: CWS mergede01 (1.4.574); FILE MERGED
2007/03/19 15:23:58 ihi 1.4.574.1: #i72301# Remove German
2007-04-19 14:25:41 +00:00
Jens-Heiner Rechtien
0f2b7a23d3 INTEGRATION: CWS warnings01 (1.10.264); FILE MERGED
2006/05/30 11:16:18 sb 1.10.264.1: #i64541# More PATCH flags.
2006-06-20 03:52:21 +00:00
Rüdiger Timm
01503dcb2c INTEGRATION: CWS ka004 (1.9.46); FILE MERGED
2005/10/12 14:51:39 ka 1.9.46.1: #i42827#: added svgfilter to patch set
2005-11-11 10:04:31 +00:00
Rüdiger Timm
e4380ac60b INTEGRATION: CWS ooo19126 (1.3.490); FILE MERGED
2005/09/05 17:48:55 rt 1.3.490.1: #i54170# Change license header: remove SISSL
2005-09-09 00:28:43 +00:00
Rüdiger Timm
668ec21947 INTEGRATION: CWS ooo19126 (1.3.380); FILE MERGED
2005/09/05 17:48:55 rt 1.3.380.1: #i54170# Change license header: remove SISSL
2005-09-09 00:28:30 +00:00
Rüdiger Timm
aff36ae64b INTEGRATION: CWS ooo19126 (1.3.546); FILE MERGED
2005/09/05 17:48:54 rt 1.3.546.1: #i54170# Change license header: remove SISSL
2005-09-09 00:28:11 +00:00
Rüdiger Timm
5984273054 INTEGRATION: CWS ooo19126 (1.8.60); FILE MERGED
2005/09/05 17:48:53 rt 1.8.60.1: #i54170# Change license header: remove SISSL
2005-09-09 00:27:36 +00:00
Oliver Bolte
2d15fa63b2 INTEGRATION: CWS fwk18 (1.7.232); FILE MERGED
2005/07/18 18:51:53 as 1.7.232.1: #124346# add filter packages to patch
2005-07-20 11:30:01 +00:00
Kurt Zenker
4edb3d9973 INTEGRATION: CWS svg03 (1.3.158); FILE MERGED
2005/01/14 23:17:19 ka 1.3.158.3: RESYNC: (1.5-1.6); FILE MERGED
2004/12/10 16:32:37 ka 1.3.158.2: RESYNC: (1.3-1.5); FILE MERGED
2004/11/05 14:18:38 ka 1.3.158.1: #i14557#: using new svg filter
2005-01-21 14:33:17 +00:00
Rüdiger Timm
bee23d1b51 INTEGRATION: CWS cfgimpex (1.4.18); FILE MERGED
2004/12/10 16:54:24 jb 1.4.18.1: #118253# Install spool files into new module configuration directory structure. Use package directory structure for spool files.
2005-01-07 09:23:26 +00:00
Kurt Zenker
2a1a629724 INTEGRATION: CWS impress22 (1.2.22); FILE MERGED
2004/12/08 11:43:06 thb 1.2.22.1: #i38517# Also removed filter entries from graphic filter module
2004-12-09 15:16:06 +00:00
Kurt Zenker
5dfcf0f0f6 INTEGRATION: CWS impress22 (1.4.22); FILE MERGED
2004/12/08 10:10:17 thb 1.4.22.2: #i38517# Moved graphic filter dlls back to OOo core (could theoretically keep _some_ of them in optional filters, but then, filter/source/config would have to be adapted, too, which I deem too risky now. Should somebody rework this: please be aware that e.g. PICT is a REQUIRED filter, as certain MSO documents contain them)
2004/12/07 14:22:45 thb 1.4.22.1: #i38517# Moved internal graphic filter from _optional_ graphic filter branch to _mandatory_ office root
2004-12-09 15:15:52 +00:00
Oliver Bolte
ca277d699d INTEGRATION: CWS fwkbugfix03 (1.1.232); FILE MERGED
2004/10/19 05:48:53 as 1.1.232.1: #i35537# register filter directly as xcu files instead of using pkgchk
2004-11-17 11:58:44 +00:00
Oliver Bolte
afb91bc5ba INTEGRATION: CWS fwkbugfix03 (1.3.130); FILE MERGED
2004/10/19 05:48:53 as 1.3.130.1: #i35537# register filter directly as xcu files instead of using pkgchk
2004-11-17 11:58:31 +00:00
Rüdiger Timm
a23e5f81fe INTEGRATION: CWS cnpsdk (1.2.32); FILE MERGED
2004/07/27 08:08:00 is 1.2.32.1: #i31043# new module descriptions
2004-08-12 07:14:16 +00:00
Kurt Zenker
99bfa67f01 #i10000# no more epn resource 2004-07-01 12:11:11 +00:00
Kurt Zenker
fcce5c0eb9 INTEGRATION: CWS impress14ea (1.1.114); FILE MERGED
2004/06/11 16:09:52 sj 1.1.114.1: #i30102# png export filter is no longer a external component
2004-06-28 15:14:00 +00:00
Hans-Joachim Lankenau
fa64ec3b3a INTEGRATION: CWS mergebuild (1.2.66); FILE MERGED
2004/05/10 18:33:28 hjs 1.2.66.1: #i8252# lngfiles to ulffiles
2004-06-25 15:20:14 +00:00
Hans-Joachim Lankenau
c3bdce2d75 INTEGRATION: CWS mergebuild (1.1.2); FILE ADDED
2004/05/10 16:28:21 hjs 1.1.2.2: #i8252# convert to UTF8
2004/05/05 15:14:52 hjs 1.1.2.1: #i8252# switch to iso codes and ulf format
2004-06-25 15:19:33 +00:00
Rüdiger Timm
bb5c9d1e34 INTEGRATION: CWS scp2fix2 (1.1.24); FILE MERGED
2004/03/03 15:44:18 is 1.1.24.1: #i26080# only settings.mk in makefiles
2004-03-04 13:09:15 +00:00
Ingo Schmidt
687560ff77 #115269# new scp2 project 2004-02-05 17:10:37 +00:00
sb
d6d81df3a1 #i101955# consolidating xcs/xcu files in xcd files (for now in new postprocess/packregistry); extended configmgr2 to search for multiple xcd files per layer; removed some (relative, wrong) DOCTYPE SYSTEM paths from xcu files to avoid xsltproc warnings; extended scp2 EXTRA_ALL_LANG to work with extensions other than zip (i.e., xcd) 2009-08-04 10:36:31 +02:00