Commit Graph

521 Commits

Author SHA1 Message Date
Rüdiger Timm
9acac2c8ce INTEGRATION: CWS aw035 (1.35.44); FILE MERGED
2006/07/12 15:29:56 aw 1.35.44.1: #126320# SdrMark::GetObj() -> SdrMark::GetSdrObjectFromSdrMark() for unique identification
2006-07-25 11:58:52 +00:00
Oliver Bolte
15e45d56e6 INTEGRATION: CWS impress96 (1.53.16); FILE MERGED
2006/06/27 15:50:21 af 1.53.16.2: RESYNC: (1.53-1.54); FILE MERGED
2006/05/30 15:25:40 af 1.53.16.1: #i65308# SvxViewHint now derived directly from SfxHint.
2006-07-13 09:36:03 +00:00
Oliver Bolte
c67771ac28 INTEGRATION: CWS cowfixes01 (1.25.272); FILE MERGED
2006/03/20 10:53:40 thb 1.25.272.1: #128078# Adapted to now-private MetaAct dtor
2006-07-13 09:07:41 +00:00
Oliver Bolte
bb3a7fedd7 INTEGRATION: CWS impress98 (1.52.128); FILE MERGED
2006/06/27 13:59:30 cl 1.52.128.5: fixed merge issue
2006/06/27 13:36:08 cl 1.52.128.4: #i66688# improved xml load/save performance so that it works
2006/06/27 10:12:34 sj 1.52.128.3: #i66688# improved xml load/save performance
2006/06/26 22:57:36 cl 1.52.128.2: RESYNC: (1.52-1.53); FILE MERGED
2006/06/23 13:53:34 sj 1.52.128.1: #i66688# moved header file
2006-07-10 10:27:43 +00:00
Kurt Zenker
f2c18e0e68 INTEGRATION: CWS impresssavegraphic (1.51.338); FILE MERGED
2006/06/27 10:59:28 cl 1.51.338.5: fixed merge problem
2006/06/26 22:28:42 cl 1.51.338.4: RESYNC: (1.52-1.53); FILE MERGED
2006/05/30 16:49:51 cl 1.51.338.3: fixed merge problem
2006/05/29 09:49:09 cl 1.51.338.2: RESYNC: (1.51-1.52); FILE MERGED
2006/04/03 15:32:40 cl 1.51.338.1: #i13816# added GraphicStream property
2006-07-05 21:18:29 +00:00
Jens-Heiner Rechtien
f041b2b753 INTEGRATION: CWS warnings01 (1.52.68); FILE MERGED
2006/05/23 18:49:53 sb 1.52.68.2: RESYNC: (1.52-1.53); FILE MERGED
2006/02/17 15:22:34 cl 1.52.68.1: warning free code changes
2006-06-19 15:57:39 +00:00
Jens-Heiner Rechtien
b43131a6e7 INTEGRATION: CWS warnings01 (1.6.222); FILE MERGED
2006/02/17 15:22:33 cl 1.6.222.1: warning free code changes
2006-06-19 15:57:25 +00:00
Jens-Heiner Rechtien
8dbd5a5505 INTEGRATION: CWS warnings01 (1.140.8); FILE MERGED
2006/05/29 09:57:40 sb 1.140.8.5: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
2006/05/23 18:49:41 sb 1.140.8.4: RESYNC: (1.144-1.145); FILE MERGED
2006/04/19 18:00:17 cl 1.140.8.3: warning free code changes
2006/04/07 18:21:03 sb 1.140.8.2: RESYNC: (1.140-1.144); FILE MERGED
2006/02/17 15:22:32 cl 1.140.8.1: warning free code changes
2006-06-19 15:57:12 +00:00
Jens-Heiner Rechtien
6d83ab990f INTEGRATION: CWS warnings01 (1.23.220); FILE MERGED
2006/04/19 18:00:17 cl 1.23.220.3: warning free code changes
2006/04/07 18:20:53 sb 1.23.220.2: RESYNC: (1.23-1.24); FILE MERGED
2006/02/17 15:22:31 cl 1.23.220.1: warning free code changes
2006-06-19 15:56:56 +00:00
Jens-Heiner Rechtien
4887133b63 INTEGRATION: CWS warnings01 (1.23.218); FILE MERGED
2006/06/12 14:39:59 cl 1.23.218.3: #i66355# fixed type while adding 3d shape
2006/04/07 18:20:45 sb 1.23.218.2: RESYNC: (1.23-1.24); FILE MERGED
2006/02/17 15:22:31 cl 1.23.218.1: warning free code changes
2006-06-19 15:56:43 +00:00
Jens-Heiner Rechtien
1e2565f709 INTEGRATION: CWS warnings01 (1.51.218); FILE MERGED
2006/06/15 14:47:09 sb 1.51.218.4: #i66416# Fixed typos in previous fix.
2006/04/19 18:00:17 cl 1.51.218.3: warning free code changes
2006/04/07 18:20:37 sb 1.51.218.2: RESYNC: (1.51-1.52); FILE MERGED
2006/02/17 15:22:30 cl 1.51.218.1: warning free code changes
2006-06-19 15:56:30 +00:00
Jens-Heiner Rechtien
8b77e2790c INTEGRATION: CWS warnings01 (1.61.218); FILE MERGED
2006/02/17 15:22:29 cl 1.61.218.1: warning free code changes
2006-06-19 15:56:16 +00:00
Jens-Heiner Rechtien
27fad8988e INTEGRATION: CWS warnings01 (1.13.220); FILE MERGED
2006/02/17 15:22:29 cl 1.13.220.1: warning free code changes
2006-06-19 15:56:01 +00:00
Jens-Heiner Rechtien
ecb1bc028f INTEGRATION: CWS warnings01 (1.33.146); FILE MERGED
2006/04/19 18:00:17 cl 1.33.146.3: warning free code changes
2006/04/07 18:20:30 sb 1.33.146.2: RESYNC: (1.33-1.34); FILE MERGED
2006/02/17 15:22:28 cl 1.33.146.1: warning free code changes
2006-06-19 15:55:49 +00:00
Jens-Heiner Rechtien
5ee60e9c53 INTEGRATION: CWS warnings01 (1.18.220); FILE MERGED
2006/02/17 15:22:27 cl 1.18.220.1: warning free code changes
2006-06-19 15:55:37 +00:00
Jens-Heiner Rechtien
874a38d502 INTEGRATION: CWS warnings01 (1.16.220); FILE MERGED
2006/02/17 15:22:27 cl 1.16.220.1: warning free code changes
2006-06-19 15:55:25 +00:00
Jens-Heiner Rechtien
65aaee9607 INTEGRATION: CWS warnings01 (1.3.222); FILE MERGED
2006/02/17 15:22:26 cl 1.3.222.1: warning free code changes
2006-06-19 15:55:13 +00:00
Jens-Heiner Rechtien
dde1ed11dd INTEGRATION: CWS warnings01 (1.20.220); FILE MERGED
2006/02/17 15:22:26 cl 1.20.220.1: warning free code changes
2006-06-19 15:55:01 +00:00
Jens-Heiner Rechtien
eabcae191f INTEGRATION: CWS warnings01 (1.13.222); FILE MERGED
2006/04/19 18:00:17 cl 1.13.222.2: warning free code changes
2006/02/17 15:22:25 cl 1.13.222.1: warning free code changes
2006-06-19 15:54:49 +00:00
Jens-Heiner Rechtien
4af6584d48 INTEGRATION: CWS warnings01 (1.15.222); FILE MERGED
2006/04/19 15:12:13 cl 1.15.222.1: fixing BitmapItem access
2006-06-19 15:54:38 +00:00
Jens-Heiner Rechtien
835556dd24 INTEGRATION: CWS warnings01 (1.5.132); FILE MERGED
2006/04/07 18:20:21 sb 1.5.132.2: RESYNC: (1.5-1.6); FILE MERGED
2006/02/17 15:22:24 cl 1.5.132.1: warning free code changes
2006-06-19 15:54:24 +00:00
Jens-Heiner Rechtien
18a0ab1a0c INTEGRATION: CWS warnings01 (1.14.220); FILE MERGED
2006/04/19 15:11:03 cl 1.14.220.2: casting SdrGluePointList to non const
2006/02/17 15:22:24 cl 1.14.220.1: warning free code changes
2006-06-19 15:54:07 +00:00
Jens-Heiner Rechtien
5c18b81fae INTEGRATION: CWS warnings01 (1.5.216); FILE MERGED
2006/02/17 15:22:23 cl 1.5.216.1: warning free code changes
2006-06-19 15:53:54 +00:00
Jens-Heiner Rechtien
4c4f6a8877 INTEGRATION: CWS warnings01 (1.4.222); FILE MERGED
2006/02/17 15:22:23 cl 1.4.222.1: warning free code changes
2006-06-19 15:53:42 +00:00
Jens-Heiner Rechtien
c93555effe INTEGRATION: CWS warnings01 (1.12.220); FILE MERGED
2006/02/17 15:22:22 cl 1.12.220.1: warning free code changes
2006-06-19 15:53:30 +00:00
Jens-Heiner Rechtien
6dc3400fc0 INTEGRATION: CWS warnings01 (1.25.158); FILE MERGED
2006/02/17 15:22:21 cl 1.25.158.1: warning free code changes
2006-06-19 15:53:16 +00:00
Rüdiger Timm
3174205567 INTEGRATION: CWS tl18 (1.140.90); FILE MERGED
2006/04/11 08:21:11 tl 1.140.90.3: RESYNC: (1.140-1.144); FILE MERGED
2006/03/08 14:14:58 mav 1.140.90.2: #i59205# create the client correctly
2006/03/07 16:57:05 mav 1.140.90.1: #i59205# create the client when the object is provided outside
2006-05-05 07:12:32 +00:00
Rüdiger Timm
9b39037b63 INTEGRATION: CWS sfxcleanup (1.18.300); FILE MERGED
2006/03/22 14:11:37 mba 1.18.300.1: #i132394#: move Adjustment conversion to the only place where it is needed
2006-05-02 14:36:05 +00:00
Rüdiger Timm
d716307444 INTEGRATION: CWS impress93 (1.52.230); FILE MERGED
2006/04/20 12:40:08 cl 1.52.230.1: #133468# removeObjectUser befor setting mpObject to 0 in dispose()
2006-04-28 14:01:25 +00:00
Oliver Bolte
75e66f2500 #i10000# changed pObj into mpObj.get() 2006-03-29 14:58:10 +00:00
Oliver Bolte
2eec7ba2cf INTEGRATION: CWS dba203a (1.140.56); FILE MERGED
2006/03/20 08:35:37 fs 1.140.56.7: RESYNC: (1.140-1.141); FILE MERGED
2006/03/08 09:37:24 fs 1.140.56.6: #i61771# SvxShape now holds the SdrObject weak, which requires different (and SolarMutex-guarded) access to it
2006/03/08 09:29:35 fs 1.140.56.5: reverting previous patch for #i61771#, CL had a better idea ...
2006/02/15 09:04:41 fs 1.140.56.4: #i61771# don't reset pObj in ~SvxShape too earliy / SvxShape::relase: make some weird things to prevent duplicate deletions when SvxShape methods are called bypassing UNO
2006/02/13 10:57:08 fs 1.140.56.3: #i61771# SvxShape::Notify: care for race conditions with the object just being deleted in another thread
2006/02/13 10:23:59 fs 1.140.56.2: #i61771# +SvxShape::onSdrObjectDying / +SvxShape::release: make releasing the last reference and deleting |this| a transaction
2006/02/09 15:35:47 fs 1.140.56.1: #i61771# SdrObject holds SvxShape by direct pointer, not by weak reference. See checkin comment for svdobj.cxx for a reason
2006-03-29 11:31:19 +00:00
Oliver Bolte
89a454127d INTEGRATION: CWS dba203a (1.23.276); FILE MERGED
2006/03/08 09:37:23 fs 1.23.276.1: #i61771# SvxShape now holds the SdrObject weak, which requires different (and SolarMutex-guarded) access to it
2006-03-29 11:31:06 +00:00
Oliver Bolte
d8f30b2308 INTEGRATION: CWS dba203a (1.23.274); FILE MERGED
2006/03/08 09:37:23 fs 1.23.274.1: #i61771# SvxShape now holds the SdrObject weak, which requires different (and SolarMutex-guarded) access to it
2006-03-29 11:30:54 +00:00
Oliver Bolte
8bee89ee07 INTEGRATION: CWS dba203a (1.51.274); FILE MERGED
2006/03/08 09:37:23 fs 1.51.274.1: #i61771# SvxShape now holds the SdrObject weak, which requires different (and SolarMutex-guarded) access to it
2006-03-29 11:30:42 +00:00
Oliver Bolte
e73c039aae INTEGRATION: CWS dba203a (1.33.206); FILE MERGED
2006/03/08 09:37:22 fs 1.33.206.1: #i61771# SvxShape now holds the SdrObject weak, which requires different (and SolarMutex-guarded) access to it
2006-03-29 11:30:30 +00:00
Oliver Bolte
be3101e461 INTEGRATION: CWS calcperf02 (1.137.32); FILE MERGED
2006/02/01 16:21:25 nn 1.137.32.2: RESYNC: (1.137-1.140); FILE MERGED
2005/10/13 13:42:09 nn 1.137.32.1: #i55919# Notify: HINT_OBJCHG is only interesting if it's for this object
2006-03-27 08:39:35 +00:00
Rüdiger Timm
b991fdd57a INTEGRATION: CWS impress87 (1.140.78); FILE MERGED
2006/03/01 11:57:03 cl 1.140.78.1: #i62670# make loop variables exception safe for multi property access
2006-03-10 15:21:13 +00:00
Kurt Zenker
4d05aa1e31 INTEGRATION: CWS pngmagic_SRC680 (1.5.188); FILE MERGED
2006/02/23 15:02:20 hro 1.5.188.1: #i49284# Test for crash data availability before showing error report wizard pages
2006-02-27 15:37:26 +00:00
Oliver Bolte
12d70e9b56 INTEGRATION: CWS impress79 (1.139.34); FILE MERGED
2006/01/06 12:27:46 cl 1.139.34.1: #130018# make SvxShape::setPropertyValues() exception safe
2006-01-20 08:30:20 +00:00
Rüdiger Timm
b543ece525 INTEGRATION: CWS sj31 (1.51.74); FILE MERGED
2005/11/25 12:12:43 cl 1.51.74.1: #125797# invalidate members belonging to old model if model changes
2005-12-14 14:55:56 +00:00
Rüdiger Timm
c11dd0fef4 INTEGRATION: CWS c06 (1.3.382); FILE MERGED
2005/09/19 08:53:00 cd 1.3.382.1: #i53531# Make crash reporter optional
2005-11-11 10:51:59 +00:00
Rüdiger Timm
173c45f64a INTEGRATION: CWS impress77 (1.138.54); FILE MERGED
2005/11/09 12:23:27 cl 1.138.54.1: #127720# do not throw UnknownPropertyException in get&setPropertyValues()
2005-11-10 15:58:52 +00:00
Rüdiger Timm
6b107f6e03 INTEGRATION: CWS cov2src (1.50.80); FILE MERGED
2005/10/18 14:14:32 rt 1.50.80.1: #126234# Join MWS COV680 m4 into SRC680
2005-10-19 11:12:50 +00:00
Rüdiger Timm
6c993c206b INTEGRATION: CWS cov2src (1.137.48); FILE MERGED
2005/10/18 14:14:31 rt 1.137.48.1: #126234# Join MWS COV680 m4 into SRC680
2005-10-19 11:12:38 +00:00
Rüdiger Timm
6d314cc428 INTEGRATION: CWS cov2src (1.32.80); FILE MERGED
2005/10/18 14:14:30 rt 1.32.80.1: #126234# Join MWS COV680 m4 into SRC680
2005-10-19 11:12:25 +00:00
Oliver Bolte
7df4c2a26d INTEGRATION: CWS presfixes08 (1.22.164); FILE MERGED
2005/07/11 16:50:42 dbo 1.22.164.1: #i37786# scroll text comments XTEXT_SCROLLRECT, XTEXT_PAINTRECT
2005-10-11 07:24:42 +00:00
Jens-Heiner Rechtien
65e65c5f74 INTEGRATION: CWS sj22 (1.133.114); FILE MERGED
2005/08/08 12:25:28 sj 1.133.114.2: RESYNC: (1.133-1.135); FILE MERGED
2005/06/30 02:30:27 sj 1.133.114.1: #120406# now ole objects may contain also bitmap graphics
2005-09-23 12:52:43 +00:00
Jens-Heiner Rechtien
271a05ca73 INTEGRATION: CWS impress49 (1.22.94); FILE MERGED
2005/04/26 11:45:29 cl 1.22.94.1: #i38575# fixed return value of filter() method
2005-09-23 09:49:34 +00:00
Rüdiger Timm
d5c608f27f INTEGRATION: CWS ooo19126 (1.7.430); FILE MERGED
2005/09/05 14:28:14 rt 1.7.430.1: #i54170# Change license header: remove SISSL
2005-09-09 00:09:16 +00:00
Rüdiger Timm
eea0e3761d INTEGRATION: CWS ooo19126 (1.49.130); FILE MERGED
2005/09/05 14:28:14 rt 1.49.130.1: #i54170# Change license header: remove SISSL
2005-09-09 00:09:00 +00:00