sj
|
cfe3fc33b9
|
merged heads
|
2010-07-02 13:41:28 +02:00 |
|
Christian Lippka
|
ff96398147
|
#i112758# changed static BitmapEx to static pointers
|
2010-06-28 17:36:56 +02:00 |
|
obo
|
8c75156a84
|
masterfix: #i10000# resolve merge problems
|
2010-06-17 09:00:57 +02:00 |
|
obo
|
847c992a25
|
masterfix: #i10000# remove conflict marks
|
2010-06-16 13:50:55 +02:00 |
|
obo
|
8b33a0235b
|
CWS-TOOLING: integrate CWS impressbi01
|
2010-06-15 12:54:21 +02:00 |
|
obo
|
07f0c841ca
|
CWS-TOOLING: integrate CWS fwk139
|
2010-06-15 10:26:12 +02:00 |
|
obo
|
b981aef79f
|
CWS-TOOLING: integrate CWS impress190
|
2010-06-15 06:55:41 +02:00 |
|
Christian Lippka
|
defcfcf416
|
cws impress190: rebase m82
|
2010-06-14 18:49:32 +02:00 |
|
obo
|
c60e8e8fe3
|
CWS-TOOLING: integrate CWS tl80
|
2010-06-14 16:22:01 +02:00 |
|
obo
|
0fc1015633
|
CWS-TOOLING: integrate CWS aw081
|
2010-06-14 15:48:08 +02:00 |
|
Thomas Lange [tl]
|
3524dd3cf6
|
CWS tl80: merge with DEV300_m82
|
2010-06-14 14:38:44 +02:00 |
|
obo
|
f3b2db1efb
|
CWS-TOOLING: integrate CWS tl74
|
2010-06-09 16:35:27 +02:00 |
|
obo
|
be83c36947
|
CWS-TOOLING: integrate CWS findbar01
|
2010-06-09 15:49:40 +02:00 |
|
Thomas Lange [tl]
|
75c3845552
|
cws tl74: merge with DEV300_m81
|
2010-06-09 14:50:43 +02:00 |
|
sj
|
f7a274b959
|
removed compiler warnings
|
2010-06-08 12:02:38 +02:00 |
|
Christian Lippka
|
9cc5a08e09
|
cws impress190: merging
|
2010-06-07 16:51:17 +02:00 |
|
sj
|
0cd8711b97
|
merged
|
2010-06-05 19:08:12 +02:00 |
|
sj
|
fee32b2a33
|
impress190: #i89450# fixed makefile
|
2010-06-05 19:04:48 +02:00 |
|
sj
|
d4af876f9c
|
impress190: #i89450# taking back changes in outliner.hxx and outliner.cxx to avoid compiler warning
|
2010-06-05 19:02:55 +02:00 |
|
sj
|
622fd52d85
|
impress190: merge with dev300_m80
|
2010-06-04 22:30:37 +02:00 |
|
Ivo Hinkelmann
|
47b5ec4b0b
|
CWS-TOOLING: integrate CWS slidecopy
|
2010-06-04 11:07:35 +02:00 |
|
ka
|
b50b591c9b
|
impressbi01: latest changes
|
2010-06-03 20:35:47 +02:00 |
|
Frank Schoenheit [fs]
|
f884576207
|
slidecopy: merge after copying in CWS renaissance2
|
2010-06-03 18:53:52 +02:00 |
|
Carsten Driesner
|
81b7db96ce
|
fwk139: Merge changes
|
2010-06-03 17:59:21 +02:00 |
|
Mikhail Voytenko
|
a388c0c2cc
|
fwk139: #i10000# avoid warnings on solaris
|
2010-06-03 16:40:59 +02:00 |
|
Frank Schoenheit [fs]
|
798d48ee77
|
slidecopy: merged latest DEV300.m80 changes
|
2010-06-03 14:33:05 +02:00 |
|
Ivo Hinkelmann
|
bdd37f7758
|
CWS-TOOLING: integrate CWS renaissance2
|
2010-06-03 11:55:10 +02:00 |
|
Christian Lippka
|
c2a240b1d4
|
cws renaissance2: rebase m80
|
2010-06-01 14:04:07 +02:00 |
|
Caolán McNamara
|
9029bc641e
|
cmcfixes74: merge with DEV300 m80
|
2010-05-31 22:58:51 +01:00 |
|
Joerg Skottke [jsk]
|
03dba8e530
|
findbar01: Local merge with remote repo
|
2010-05-31 16:37:05 +02:00 |
|
Christian Lippka
|
73637454a3
|
#i111928# do not crash when there are fields in an annotation
|
2010-05-31 13:10:15 +02:00 |
|
Armin Le Grand
|
927bea431a
|
aw081: rebased to m79
|
2010-05-27 15:51:49 +02:00 |
|
ka
|
1e2630a2fb
|
impressbi01: rebased to DEV300_m79
|
2010-05-27 14:06:57 +02:00 |
|
ka
|
8252b7dba7
|
impressbi01: merged DEV300_m77
|
2010-05-27 12:19:08 +02:00 |
|
Wu Yan
|
5d08b0417d
|
findbar01: #i111848#, #i111852# change title of findbar and show/hide the findbar according to specification
|
2010-05-27 17:22:17 +08:00 |
|
Christian Lippka
|
1663bdaf45
|
merging
|
2010-05-26 15:52:51 +02:00 |
|
Christian Lippka
|
f383c9a98f
|
#i111538# fix high contrast rendering for annotations in impress
|
2010-05-26 15:47:54 +02:00 |
|
Caolán McNamara
|
3aeb392ea0
|
cmcfixes74: merge with DEV300 m79
|
2010-05-26 14:41:36 +01:00 |
|
Carsten Driesner
|
786aad26cd
|
findbar01: Merge changes from m78
|
2010-05-26 11:58:33 +02:00 |
|
Vladimir Glazunov
|
2aecae584f
|
CWS-TOOLING: integrate CWS sdfindall
|
2010-05-20 10:00:35 +02:00 |
|
Carsten Driesner
|
6a538f36e8
|
findbar01: #i111672# Fix crash on searching next/previous on single text object
|
2010-05-19 16:56:19 +02:00 |
|
Frank Schoenheit [fs]
|
afe714cb4a
|
slidecopy: fixed key navigation within titled controls
|
2010-05-19 12:08:26 +02:00 |
|
sj
|
38c1d35d15
|
sdk321: #i111521# ppt export, fixed problem with graphical bullets
|
2010-05-18 17:19:53 +02:00 |
|
Vladimir Glazunov
|
091ac9e41a
|
CWS-TOOLING: integrate CWS fwk138
|
2010-05-27 15:06:45 +02:00 |
|
Vladimir Glazunov
|
45a542cca2
|
CWS-TOOLING: integrate CWS sb120
|
2010-05-27 14:07:06 +02:00 |
|
sb
|
a59ed307dc
|
sb120: merged in DEV300_m78
|
2010-05-20 15:46:46 +02:00 |
|
Carsten Driesner
|
f8248dec84
|
fwk139: Rebase to DEV300m77
|
2010-05-11 14:09:54 +02:00 |
|
Thomas Lange [tl]
|
646ef94d1d
|
cws tl80: merge with DEV300 m77
|
2010-05-11 13:45:11 +02:00 |
|
Ivo Hinkelmann
|
89ba05fa4e
|
CWS-TOOLING: integrate CWS impress188
|
2010-05-11 11:08:58 +02:00 |
|
Ivo Hinkelmann
|
5bfcdccad8
|
CWS-TOOLING: integrate CWS dr73
|
2010-05-10 18:38:52 +02:00 |
|