Commit Graph

70 Commits

Author SHA1 Message Date
Jan Holesovsky
c939070f70 Merge commit 'libreoffice-3.3.0.2'
Conflicts:
	sfx2/source/appl/sfxhelp.cxx
	sfx2/source/appl/shutdowniconunx.cxx
	sfx2/source/menu/virtmenu.cxx
	sysui/desktop/share/create_tree.sh
2010-12-20 01:29:39 +01:00
Petr Mladek
52fdce9f61 use BrOffice also in the help content when enabled (fdo#31770)
use ::utl::ConfigManager::GetDirectConfigProperty to get
the product name; it returns BrOffice in pt_BR locales
when BrOffice branding enabled

Signed off by Michael Meeks <michael.meeks@novell.com>
2010-12-14 16:36:20 +01:00
Andy Holder
c0bc502f55 Change unnamespace file.hxx macros 2010-12-12 21:16:57 +00:00
Petr Mladek
6c3199bfcb xmlhelp-work-with-symlinks.diff: migrated to git
i#81138
display help correctly even when the files are symlinks
2010-11-26 15:09:17 +01:00
Gert Faller
06beaacf3d use RTL_CONSTASCII_USTRINGPARAM 2010-11-05 14:38:22 +00:00
Caolán McNamara
758c8774fb add modelines to .hxx files as well 2010-10-28 15:51:43 +01:00
Sebastian Spaeth
8694d2bc19 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-13 10:57:58 +02:00
Norbert Thiebaud
88e1f3d8f8 merge vosremoval-diagnoses patch 2010-10-10 19:46:48 -05:00
Petr Mladek
facd86ef9c remove include guards using fixguard.py 2010-10-05 18:11:20 +02:00
Joachim Lingner
86e2dc0dcb jl152 import 263452 from native0jl:#i77196# fixed bundled extension help tree view, scripts in shared extensions... 2010-05-03 11:51:05 +02:00
sb
c79b576a3d merged in re/DEV300_next towards DEV300_m74 2010-03-04 23:05:27 +01:00
sb
5bdd72d815 sb111: merged in DEV300_m72 2010-02-25 13:53:42 +01:00
sb
2951cc3ad8 sb118: merged in DEV300_m72 2010-02-25 12:46:45 +01:00
Jens-Heiner Rechtien
82b1d381cd 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
sb
ec0ee57607 sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates 2010-01-29 17:01:54 +01:00
sb
a44418ec30 sb111: merged in DEV300_m68 2010-01-05 13:09:26 +01:00
Vladimir Glazunov
e7f2e7c26b CWS-TOOLING: integrate CWS expat201_DEV300 2009-12-11 17:45:42 +01:00
Caolán McNamara
4903e0098d #i106889# upgrade expat to 2.0.1 2009-11-13 11:06:34 +00:00
sb
3a944e4ebd sb111: #i101955# removed obsolete servertype argument from ConfigurationProvider request 2009-11-10 10:33:11 +01:00
mathias
e0f96e1041 forgot to remove unotoolslib in makefile 2009-09-23 18:32:33 +02:00
Mathias Bauer
578685396a #i103496#: remove dependency on unotools 2009-09-17 10:46:21 +02:00
sb
e3a4f6bf33 merged in DEV300_m49 2009-05-27 10:40:46 +02:00
sb
9f69e2a317 #i101955# removed dead Webtop code (this can be further improved by completely dropping the vendor variables if they are truly unused; for now, they continue to expand to empty strings, and just the computation of those empty strings got simplified in the code) 2009-05-18 15:01:59 +02:00
Jens-Heiner Rechtien
7950f402d6 CWS-TOOLING: integrate CWS ab68
2009-03-26 11:37:32 +0100 ab  r270063 : #i98680# Handle missing lucene
2009-03-16 12:23:38 +0100 ab  r269520 : #i100228# Introduced own file format instead of using berkeley db
2009-02-27 11:48:05 +0100 ab  r268572 : #i86003# Redesigned language fallback behavior
2009-05-15 12:21:35 +00:00
Ivo Hinkelmann
f88817b11e CWS-TOOLING: integrate CWS sb107
2009-04-14 13:09:13 +0200 sb  r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb  r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb  r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb  r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb  r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb  r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb  r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb  r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb  r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb  r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb  r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb  r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb  r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb  r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb  r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb  r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb  r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb  r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb  r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb  r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb  r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb  r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb  r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb  r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb  r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
2009-04-27 11:24:10 +00:00
Vladimir Glazounov
b6c066e383 INTEGRATION: CWS sb90 (1.14.10); FILE MERGED
2008/06/25 12:23:03 sb 1.14.10.1: #157787# macros PRODUCTNAME and PRODUCTVERSION conflicted with enum members in untoools/inc/unotools/configmgr.hxx:1.22
2008-07-02 08:36:59 +00:00
Vladimir Glazounov
a82b0f10de INTEGRATION: CWS sb90 (1.24.10); FILE MERGED
2008/06/25 12:24:47 sb 1.24.10.1: #157787# replaced direct access to ooSetupExtension configuration data with utl::ConfigManager::PRODUCTEXTENSION (which transparently does the EDITIONNAME hack; see there)
2008-07-02 08:36:35 +00:00
Vladimir Glazounov
1ff713b531 INTEGRATION: CWS sb90 (1.8.10); FILE MERGED
2008/06/25 12:24:47 sb 1.8.10.1: #157787# replaced direct access to ooSetupExtension configuration data with utl::ConfigManager::PRODUCTEXTENSION (which transparently does the EDITIONNAME hack; see there)
2008-07-02 08:36:00 +00:00
Kurt Zenker
a5ca15fc07 INTEGRATION: CWS ab52 (1.14.6); FILE MERGED
2008/06/18 09:12:41 ab 1.14.6.1: #i90029# Removed unused code
2008-06-24 15:24:27 +00:00
Kurt Zenker
52ea393a52 INTEGRATION: CWS ab52 (1.24.6); FILE MERGED
2008/06/18 09:12:41 ab 1.24.6.1: #i90029# Removed unused code
2008-06-24 15:24:11 +00:00
Rüdiger Timm
68c3cb00e9 INTEGRATION: CWS changefileheader (1.13.8); FILE MERGED
2008/04/01 16:07:47 thb 1.13.8.3: #i85898# Stripping all external header guards
2008/04/01 13:03:01 thb 1.13.8.2: #i85898# Stripping all external header guards
2008/03/31 13:04:27 rt 1.13.8.1: #i87441# Change license header to LPGL v3.
2008-04-11 13:06:13 +00:00
Rüdiger Timm
074391c3e8 INTEGRATION: CWS changefileheader (1.23.8); FILE MERGED
2008/04/01 16:07:47 thb 1.23.8.3: #i85898# Stripping all external header guards
2008/04/01 13:03:01 thb 1.23.8.2: #i85898# Stripping all external header guards
2008/03/31 13:04:27 rt 1.23.8.1: #i87441# Change license header to LPGL v3.
2008-04-11 13:05:56 +00:00
Rüdiger Timm
8fa2c638f2 INTEGRATION: CWS changefileheader (1.2.302); FILE MERGED
2008/04/01 16:07:46 thb 1.2.302.3: #i85898# Stripping all external header guards
2008/04/01 13:03:01 thb 1.2.302.2: #i85898# Stripping all external header guards
2008/03/31 13:04:27 rt 1.2.302.1: #i87441# Change license header to LPGL v3.
2008-04-11 13:05:40 +00:00
Rüdiger Timm
f7ee1e23d4 INTEGRATION: CWS changefileheader (1.6.82); FILE MERGED
2008/04/01 13:03:01 thb 1.6.82.2: #i85898# Stripping all external header guards
2008/03/31 13:04:27 rt 1.6.82.1: #i87441# Change license header to LPGL v3.
2008-04-11 13:05:22 +00:00
Rüdiger Timm
9e5cdcf5aa INTEGRATION: CWS changefileheader (1.7.8); FILE MERGED
2008/03/31 13:04:27 rt 1.7.8.1: #i87441# Change license header to LPGL v3.
2008-04-11 13:05:04 +00:00
Oliver Bolte
878ab5b5f7 INTEGRATION: CWS ab45_DEV300 (1.12.82); FILE MERGED
2008/02/18 09:41:07 ab 1.12.82.1: #i83624# TreeFileIterator
2008-02-26 06:47:11 +00:00
Oliver Bolte
112831aeb8 INTEGRATION: CWS ab45_DEV300 (1.22.64); FILE MERGED
2008/02/18 09:57:10 ab 1.22.64.1: #i83624# TreeFileIterator
2008-02-26 06:46:59 +00:00
Oliver Bolte
92f4850fa7 INTEGRATION: CWS ab45_DEV300 (1.6.114); FILE MERGED
2008/02/18 09:22:42 ab 1.6.114.1: #i83624# Added comphelper lib
2008-02-26 06:46:49 +00:00
Vladimir Glazounov
44c4e28525 INTEGRATION: CWS native69 (1.19.4); FILE MERGED
2006/10/19 13:52:46 is 1.19.4.2: RESYNC: (1.19-1.20); FILE MERGED
2006/10/19 12:28:41 is 1.19.4.1: #i66224# poor help files patch
2006-11-01 12:50:18 +00:00
Rüdiger Timm
bdcc44932b INTEGRATION: CWS ause060 (1.19.2); FILE MERGED
2006/09/26 10:47:26 hjs 1.19.2.1: #i69234# fix automated pch include; add license header
2006-10-30 07:35:42 +00:00
Oliver Bolte
71323ffaa7 INTEGRATION: CWS sb59 (1.18.12); FILE MERGED
2006/08/30 11:10:28 sb 1.18.12.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:28:52 +00:00
Oliver Bolte
22f0f4b398 INTEGRATION: CWS pchfix02 (1.18.8); FILE MERGED
2006/09/01 17:58:36 kaib 1.18.8.1: #i68856# Added header markers and pch files
2006-09-17 00:21:39 +00:00
Oliver Bolte
d5539b235d INTEGRATION: CWS pchfix02 (1.5.8); FILE MERGED
2006/09/01 17:58:35 kaib 1.5.8.1: #i68856# Added header markers and pch files
2006-09-17 00:21:25 +00:00
Jens-Heiner Rechtien
9b414dd6ef INTEGRATION: CWS warnings01 (1.10.166); FILE MERGED
2006/01/25 20:43:33 sb 1.10.166.2: RESYNC: (1.10-1.11); FILE MERGED
2005/12/15 16:36:48 ab 1.10.166.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:55 +00:00
Jens-Heiner Rechtien
e06620b8c8 INTEGRATION: CWS warnings01 (1.16.10); FILE MERGED
2006/04/06 14:48:34 ab 1.16.10.3: #i55991# warning-free code
2006/01/25 20:43:22 sb 1.16.10.2: RESYNC: (1.16-1.17); FILE MERGED
2005/12/15 16:36:48 ab 1.16.10.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:44 +00:00
Jens-Heiner Rechtien
c586e23159 INTEGRATION: CWS warnings01 (1.4.192); FILE MERGED
2005/12/15 16:36:48 ab 1.4.192.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:32 +00:00
Rüdiger Timm
b4977fc4a9 INTEGRATION: CWS c06 (1.10.170); FILE MERGED
2005/08/24 14:59:54 abi 1.10.170.1: #i53539# no basic help, if org.openoffice.Office.Common/Help/ShowBasic is set to false
2005-11-11 11:17:44 +00:00
Rüdiger Timm
21725aecb2 INTEGRATION: CWS c06 (1.16.14); FILE MERGED
2005/08/24 14:59:54 abi 1.16.14.1: #i53539# no basic help, if org.openoffice.Office.Common/Help/ShowBasic is set to false
2005-11-11 11:17:25 +00:00
Rüdiger Timm
d39906d35e INTEGRATION: CWS ooo19126 (1.5.52); FILE MERGED
2005/09/05 17:19:38 rt 1.5.52.1: #i54170# Change license header: remove SISSL
2005-09-09 11:27:15 +00:00
Vladimir Glazounov
93e6f897c4 INTEGRATION: CWS hc680pb3 (1.15.30); FILE MERGED
2005/03/04 10:40:17 abi 1.15.30.1: #i38426# adding events to get the title
2005-03-23 12:04:52 +00:00