Mikhail Voytenko
a388c0c2cc
fwk139: #i10000# avoid warnings on solaris
2010-06-03 16:40:59 +02:00
Carsten Driesner
f8248dec84
fwk139: Rebase to DEV300m77
2010-05-11 14:09:54 +02:00
Jens-Heiner Rechtien
b316ddbb7c
DEV300: merge masterfix ea9085d6db4c@DEV300
2010-04-16 13:29:10 +02:00
Jens-Heiner Rechtien
5090f357a1
CWS-TOOLING: integrate CWS sb118
2010-04-16 10:09:51 +02:00
sb
10b1f93995
sb118: merged in backout
2010-04-14 17:21:13 +02:00
sb
17d0f112ef
sb118: merged in re/DEV300_next towards DEV300_m76
2010-04-07 13:14:23 +02:00
Martin Hollmichel
a3c3cc75ca
nativea: #i110249# chg copyright
2010-04-06 14:40:41 +02:00
Jens-Heiner Rechtien
73ce03d206
CWS-TOOLING: integrate CWS dtardon02
2010-04-13 13:18:39 +02:00
Jens-Heiner Rechtien
758d8ecc9f
CWS-TOOLING: integrate CWS writerfilter07
2010-04-12 19:56:14 +02:00
Jens-Heiner Rechtien
34156adc12
CWS-TOOLING: integrate CWS thbfixes10
2010-04-12 18:31:33 +02:00
Jens-Heiner Rechtien
5c6d983cf6
CWS-TOOLING: integrate CWS ppp02
2010-04-12 18:21:12 +02:00
thb
68c8d9e269
Merged DEV300_m76
2010-04-12 18:17:01 +02:00
thb
da8e718e08
Merge DEV300_m75
...
* resolved two conflicts caused by lineend changes in
canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws
version, which uses new texture fill semantics, and fixes clipping
bug
* binned file header changes from head for deleted files
2010-03-31 14:57:58 +02:00
Henning Brinkmann
baa42aa729
writerfilter07: merged DEV300_m75
2010-03-23 17:33:11 +01:00
David Tardon
4a8e9c4d08
dtardon02: #i108503# #i108505# #i108507# #i108508# #i110035# clean up makefiles and #includes
2010-03-12 13:16:09 +01:00
Christian Lippka
e725e31539
#i109909# fixed broken button sets for html export
2010-03-12 12:59:13 +01:00
Christian Lippka
730aeac396
#i110010# disable undo while importing ppt
2010-03-12 12:04:51 +01:00
Vladimir Glazunov
5c37cad1cd
#i108917# fixed confusing behaviour of context menu and meta drop down menu in impress comments window - transplanted from 263351@impresscomments1
2010-03-24 15:36:04 +01:00
David Tardon
b6f0318bda
dtardon02: #i108505# remove empty files in sd
2010-03-11 07:45:36 +01:00
sb
81835b80ab
merged in re/DEV300_next towards DEV300_m74
2010-03-04 23:05:27 +01:00
Ivo Hinkelmann
2b80072351
CWS-TOOLING: integrate CWS chartshapes
2010-03-03 14:30:52 +01:00
Thomas Benisch
64539591df
chartshapes: merge with DEV300_m72
2010-03-01 12:22:02 +01:00
sb
13ae9dea8a
sb118: merged in DEV300_m72
2010-02-25 12:46:45 +01:00
sb
9e3b989ddd
sb118: #i109518# disabled unoapi tests affected by that issue
2010-02-22 16:09:02 +01:00
thb
542222f04c
Merged with dev300_m71
2010-02-19 12:46:18 +01:00
Vladimir Glazunov
bcdb702df7
CWS-TOOLING: integrate CWS changefileheader2
2010-02-17 10:32:35 +01:00
sb
7c63faa1e8
sb118: adapted remaining */qa/unoapi tests to new framework
2010-02-16 11:53:58 +01:00
Christian Lippka
50ca0f989c
#i109010# fix view comment settings
2010-02-15 16:09:39 +01:00
Vladimir Glazunov
e7fd3a40ed
CWS-TOOLING: integrate CWS autorecovery
2010-03-23 11:58:14 +01:00
Vladimir Glazunov
82c3cb8127
CWS-TOOLING: integrate CWS aw079
2010-03-22 14:39:41 +01:00
Armin Le Grand
c7ea93ac73
aw079: rebase to m75
2010-03-18 18:44:00 +01:00
Frank Schoenheit [fs]
2ee0a0a806
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
2010-03-11 11:26:05 +01:00
Frank Schoenheit [fs]
ea73702eb1
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33e
2010-02-19 13:52:10 +01:00
Vladimir Glazunov
3ff4a8877d
CWS-TOOLING: integrate CWS cmcfixes71
2010-02-15 15:55:35 +01:00
Jens-Heiner Rechtien
e095da0ff0
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
2010-02-12 16:56:44 +01:00
Jens-Heiner Rechtien
41578d9fd1
#i10000#: remove obsolete empty files; trim duplicated header content
2010-02-12 15:34:51 +01:00
Jens-Heiner Rechtien
9e19ff00c7
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
Henning Brinkmann
94391742c3
writefilter07: merged DEV300_m71
2010-02-12 10:37:33 +01:00
Armin Le Grand
c44386b26b
aw079 #i99386# cleanup of define and last change from CL
2010-02-11 17:35:16 +01:00
Armin Le Grand
320a65cdff
aw079: correction linux build
2010-02-10 14:12:37 +01:00
Armin Le Grand
60529f64bb
aw069 changes after resync to m71#
2010-02-09 12:13:51 +01:00
Armin Le Grand
86cabb65ec
aw079 #i99386# finer granular changes for MPBGO removal
2010-02-09 11:33:08 +01:00
sb
42ddf8a346
sb118: merged in DEV300_m71
2010-02-08 09:18:14 +01:00
Vladimir Glazunov
4d712b9a9d
CWS-TOOLING: integrate CWS svxsplit
2010-02-05 11:53:09 +01:00
Mathias Bauer
1d4717f0d6
cws svxsplit: some corrections after merge
2010-02-05 00:10:48 +01:00
Philipp Lohmann [pl]
58e46eace4
merge with DEV300_m71
2010-02-04 18:25:45 +01:00
Mathias Bauer
024d7f23b4
CWS svxsplit: merge with m71
2010-02-04 17:59:58 +01:00
Frank Schoenheit [fs]
c96b2fdb50
autorecovery: commit resolved merge (after rebase to m71)
2010-02-04 10:38:39 +01:00
Caolán McNamara
c6e715eac6
cmcfixes71: merge with DEV300 m71
2010-02-03 15:42:20 +00:00
Mathias Bauer
08c5eaf360
#i107450#: some fixes for problems found in CAT0 test
2010-02-02 23:59:20 +01:00
