summaryrefslogtreecommitdiff
path: root/scp2/source/python/module_python_mailmerge.scp
AgeCommit message (Collapse)AuthorFilesLines
2012-01-28replace obsolete "master" branch with README that points at new repoHEADmaster-deletedmasterMichael Stahl1-45/+0
2011-05-06install the new msgbox.py helperMichael Meeks1-0/+6
2011-03-17Merge remote-tracking branch 'origin/integration/dev300_m101'Jan Holesovsky1-2/+1
Conflicts: set_soenv.in
2011-03-14Merge Gentoo patches from old build and downstream repositories.Hanno Meyer-Thurow1-0/+2
1. Do not add compiler default include and library path: potentially build against different version of system library than requested by the user. 2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is available for more than two years. Noone cares, therefore rest in peace. Python2 is going to be ditched at some point. Simply do not fail then. Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it handled nowadays? 3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip 4. Add a configure option to search only in one place for JVMs, which is quite interesting for Linux Distributions. Enforce the user to place JVMs in one base directory. 5. Fix build for libxml-2.7.8 with ICU support. * config_office-XINC-XLIB-defaults.diff: (1) * disable-python.diff: (2) * gentoo-sandbox.diff: (3) * jvm-search-path.diff: (4) * libxmlsec_fix_extern_c.diff: (5)
2011-03-08Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Norbert Thiebaud1-2/+1
* 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
2010-10-13AIX tweaksCaolán McNamara1-0/+2
2010-09-10sb129: #i113189# change UNO components to use passive registrationsb1-2/+1
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien1-4/+1
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2008-07-17INTEGRATION: CWS native168 (1.7.118); FILE MERGEDIvo Hinkelmann1-19/+1
2008/07/10 15:10:35 is 1.7.118.1: #158212# avoid same files at different modules
2008-04-15INTEGRATION: CWS native141 (1.5.16); FILE MERGEDVladimir Glazounov1-2/+3
2008/04/09 16:39:50 is 1.5.16.1: #i88109# no packages at nodes in java installer
2008-04-10INTEGRATION: CWS changefileheader (1.5.8); FILE MERGEDRüdiger Timm1-24/+19
2008/03/31 16:07:32 rt 1.5.8.1: #i87441# Change license header to LPGL v3.
2008-03-18INTEGRATION: CWS sb83 (1.4.86); FILE MERGEDVladimir Glazounov1-2/+17
2008/01/29 16:00:25 sb 1.4.86.2: #i85112# merged in cws_src680_native121 2007/12/10 14:48:11 sb 1.4.86.1: #152274# Include PyUno in StarOffice.
2007-09-06INTEGRATION: CWS native100 (1.3.542); FILE MERGEDKurt Zenker1-2/+3
2007/08/23 14:49:58 is 1.3.542.1: #i80937# introducing module order
2006-03-08INTEGRATION: CWS pj50 (1.2.144); FILE MERGEDRüdiger Timm1-47/+21
2006/02/06 20:25:43 pjanik 1.2.144.1: #i61622#: Remove reference to SISSL.
2005-11-11INTEGRATION: CWS oooemailmerge (1.1.2); FILE ADDEDRüdiger Timm1-0/+71
2005/09/12 12:35:13 cmc 1.1.2.1: #i51638# add python emailmerge backend