strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12670 commits 9 branches 795 tags 2.1 GiB
Commit graph

96 commits

Author SHA1 Message Date
obo
f3b2db1efb CWS-TOOLING: integrate CWS tl74 2010-06-09 16:35:27 +02:00
Thomas Lange [tl]
ab76732221 cws tl74: merge with DEV300 m76 2010-04-14 10:26:31 +02:00
Thomas Lange [tl]
00bcd5f6fb cws tl74: merge with DEV300_m72 2010-02-26 08:13:29 +01:00
Vladimir Glazunov
bcdb702df7 CWS-TOOLING: integrate CWS changefileheader2 2010-02-17 10:32:35 +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
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
Frank Schoenheit [fs]
5f05cb55bc autorecovery: merge after rebase to m69 2010-01-08 22:50:33 +01:00
Mathias Bauer
7244b6bb5d #i107450#: build all other modules with new editeng lib 2010-01-08 18:32:51 +01:00
Thomas Lange [tl]
7370cddb8e cws tl74: merge with DEV300_m68; AND Unix LF conversion for some files! 2010-01-06 12:22:41 +01:00
Mathias Bauer
315c7c2f87 merge to m67 2009-12-05 19:29:07 +01:00
Frank Schoenheit [fs]
34c77ff57d [CWS autorecovery] forgot to remove some includes 2009-11-30 12:56:04 +01:00
Christian Lippka
a7d2dd5d5d #i57928# reworked formatpaintbrush feature to support more shapes and text selection 2009-10-23 11:25:33 +00:00
Mathias Bauer
0cc66aaf75 #i103496#: split svtools; improve ConfitItems 2009-10-16 00:05:16 +02:00
Thomas Lange
f351e9aa30 #i1601# Sentence case, Title case, and Toggle case transliteration added 2009-09-17 07:30:11 +00:00
Thomas Lange
c4137a7db5 undoing r273933 which was accidently commited on master m51 2009-07-13 12:48:12 +00:00
Thomas Lange
e3aa4b58f6 #i1601# sentence case transliteration 2009-07-13 11:08:01 +00:00
Kurt Zenker
ef7c5c7534 CWS-TOOLING: integrate CWS clnoundo 
2009-05-18 09:40:22 +0200 wg  r271998 : i102011
2009-04-28 12:20:24 +0200 cl  r271318 : CWS-TOOLING: rebase CWS clnoundo to trunk@270723 (milestone: DEV300:m46)
2009-04-02 11:37:14 +0200 cl  r270388 : #i100371# check valid positions all the time to avoid crashes during model lock
2009-03-30 13:02:27 +0200 cl  r270219 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:59:41 +0200 cl  r270218 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:55:06 +0200 cl  r270217 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:53:27 +0200 cl  r270216 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:49:28 +0200 cl  r270215 : #i100371# added EnableUndo() and IsUndoEnabled()
 2009-06-04 16:21:29 +00:00
Jens-Heiner Rechtien
615772fb62 CWS-TOOLING: integrate CWS impress169 
2009-05-13 17:37:21 +0200 sj  r271865 : #i100942# applied patch, removed oversafe buffer check (now without warnings on 64 bit platform)
2009-05-13 12:27:18 +0200 sj  r271855 : #i101769# fixed line/fill attributes for graphic objects
2009-05-12 10:25:17 +0200 cl  r271799 : report correct minimum cell hight for empty cells
2009-04-28 17:29:46 +0200 cl  r271334 : fixed merge error
2009-04-28 16:18:01 +0200 cl  r271330 : fixed build error
2009-04-28 12:38:09 +0200 cl  r271320 : #i100129# images for new layouts
2009-04-27 19:12:06 +0200 cl  r271302 : CWS-TOOLING: rebase CWS impress169 to trunk@270723 (milestone: DEV300:m46)
2009-04-20 19:13:28 +0200 sj  r271012 : #i100942# applied patch, removed oversafe buffer check
2009-04-09 18:00:01 +0200 sj  r270719 : #158488# added rectangular gradient support
2009-04-09 17:49:52 +0200 sj  r270718 : #158488# added rectangular gradient support
2009-04-09 17:46:24 +0200 sj  r270717 : #158488# added rectangular gradient support
2009-03-26 18:16:34 +0100 cl  r270098 : #i99867# applied patch from jlcheng to correctly register table design pane
2009-03-26 18:12:11 +0100 cl  r270097 : #i100220# leave some items default so they are not overridden if a new table style is set
2009-03-26 18:11:10 +0100 cl  r270096 : #i100220# clear only those items that are also in the style when assigning a new table layout
2009-03-26 15:56:24 +0100 cl  r270085 : #i99977# listen to outliner and dispose if outliner dies
2009-03-26 15:47:29 +0100 cl  r270084 : #i99977# made the Outliner a SfxBroadcaster so others can listen for its death
2009-03-24 19:10:05 +0100 sj  r269991 : #i100490# fixed text resize problem
2009-03-23 14:31:11 +0100 sj  r269872 : #i96083# added patch, (dubious && and ||)
2009-03-19 17:55:11 +0100 sj  r269764 : #i100275# applied patch, row height is now correct even for rows containing no text
2009-03-18 18:10:52 +0100 sj  r269701 : #i93616# solved performance problem when loading document
2009-03-18 16:20:40 +0100 sj  r269688 : removing unused code
2009-03-18 16:19:22 +0100 sj  r269687 : removing unused code
2009-03-18 16:17:54 +0100 sj  r269686 : removing unused code
2009-03-18 10:28:07 +0100 cl  r269643 : #i100029# let cells be disposed as soon as the table model is disposed
2009-03-17 15:56:50 +0100 cl  r269614 : #i99984# new impress photo layouts 3x2 and 2x2
2009-03-17 15:36:35 +0100 cl  r269611 : #i99984# adding new impress photo layouts 3x2 and 2x2
2009-03-16 18:43:48 +0100 cl  r269564 : #i55224# correct internal links if pages are changed
2009-03-16 16:40:38 +0100 cl  r269559 : #i55224# correct internal hyperlinks if slides are changed/renamed
2009-03-16 15:34:12 +0100 cl  r269553 : #i99427# invalidate slots after promote/demote
2009-03-13 18:18:20 +0100 sj  r269492 : #i92421# fixed loop if loading encrypted ppt file
2009-03-13 14:51:58 +0100 sj  r269481 : #i93002# fixed crash if saving presentation without master title placeholder
2009-03-13 12:26:21 +0100 sj  r269468 : #i100147# do not exceed the max point count if creating simple polygon via ::GetSimple
2009-03-12 17:00:45 +0100 sj  r269427 : #i82518# justifying rectangles for arc/pie and chord actions, fixed round rectangle problem
 2009-05-19 09:32:45 +00:00
Rüdiger Timm
34d877e2d9 CWS-TOOLING: integrate CWS impressfontsize 
2008-12-11 14:15:16 +0100 wg  r265298 : i97125
2008-12-11 12:54:53 +0100 wg  r265288 : i97125
2008-12-11 12:53:03 +0100 wg  r265287 : i97125
2008-12-11 11:25:42 +0100 wg  r265270 : i97125
2008-12-11 10:22:13 +0100 wg  r265253 : i97125
2008-12-11 09:22:47 +0100 wg  r265247 : i97125
2008-12-09 15:28:51 +0100 cl  r265097 : added missing toolbar buttons for inc/dec font size
2008-12-08 17:39:46 +0100 cl  r265012 : #i80257# added autolayout text only
2008-12-08 17:32:07 +0100 cl  r265011 : #i80257# added autolayout text only
2008-12-08 16:42:19 +0100 cl  r265008 : #i94459# fixed a bug in insertByName and replaceByName
2008-12-08 16:25:26 +0100 cl  r265007 : #i80257# new image for text only auto layout in impress
2008-12-08 16:24:01 +0100 cl  r265006 : #i80257# new image for text only auto layout in impress
2008-12-08 16:01:46 +0100 cl  r265003 : #i88855# changed wording from Monitor to Display
2008-12-08 15:57:24 +0100 cl  r265002 : #i91904# applied patch to fix a wrong index access
2008-12-05 12:51:47 +0100 cl  r264900 : #i8824# allow setting of text properties at shape without reformating text
2008-12-05 11:09:21 +0100 cl  r264895 : fixed build problem
2008-12-04 12:04:09 +0100 cl  r264829 : fixed build issue
2008-12-04 11:03:58 +0100 cl  r264823 : #i8824# set new fontsize at shape
2008-12-02 22:39:22 +0100 cl  r264732 : fixed build problem
2008-12-02 22:38:42 +0100 cl  r264731 : fixed build problem
2008-12-01 17:44:29 +0100 cl  r264623 : CWS-TOOLING: rebase CWS impressfontsize to trunk@264325 (milestone: DEV300:m36)
2008-11-07 11:38:13 +0100 cl  r263418 : #i95920# fixed an OpenSolaris build breaker
2008-11-06 14:56:04 +0100 cl  r263386 : #i40730# added support to supress export of hidden slides to html
2008-11-06 14:55:41 +0100 cl  r263385 : #i40730# added support to supress export of hidden slides to html
2008-11-06 14:03:59 +0100 cl  r263384 : #158530# allow editing of interaction links with hyperlink editor
2008-10-20 15:34:13 +0200 cl  r262322 : #i8824# migrate cws impressfontsize to subversion.
 2008-12-11 15:25:59 +00:00
Rüdiger Timm
9fb6dc8355 INTEGRATION: CWS changefileheader (1.75.14); FILE MERGED 
2008/04/01 15:36:31 thb 1.75.14.3: #i85898# Stripping all external header guards
2008/04/01 12:39:39 thb 1.75.14.2: #i85898# Stripping all external header guards
2008/03/31 13:59:13 rt 1.75.14.1: #i87441# Change license header to LPGL v3.
 2008-04-11 08:18:37 +00:00
Kurt Zenker
5b0f1c1659 INTEGRATION: CWS presenterview (1.64.52); FILE MERGED 
2008/03/26 10:47:16 cl 1.64.52.10: RESYNC: (1.72-1.75); FILE MERGED
2008/02/26 09:04:01 af 1.64.52.9: RESYNC: (1.71-1.72); FILE MERGED
2008/01/09 18:28:27 cl 1.64.52.8: #i15900# slideshow api consolidation
2007/10/17 15:16:42 af 1.64.52.7: RESYNC: (1.70-1.71); FILE MERGED
2007/09/11 15:32:16 af 1.64.52.6: RESYNC: (1.68-1.70); FILE MERGED
2007/07/24 12:00:26 af 1.64.52.5: RESYNC: (1.67-1.68); FILE MERGED
2007/07/11 09:12:25 af 1.64.52.4: RESYNC: (1.65-1.67); FILE MERGED
2007/07/10 13:40:50 af 1.64.52.3: #i18486# Converted several members of ViewShellBase to shared_ptrs.
2007/04/19 16:10:07 af 1.64.52.2: RESYNC: (1.64-1.65); FILE MERGED
2007/03/12 14:13:15 af 1.64.52.1: #i75320# Moved code for starting a presentation to PresentationStarter.
 2008-04-03 14:18:24 +00:00
Rüdiger Timm
4134b0ab1d INTEGRATION: CWS impresstables2 (1.65.6); FILE MERGED 
2008/03/11 18:45:43 cl 1.65.6.7: RESYNC: (1.72-1.74); FILE MERGED
2008/01/24 17:14:07 cl 1.65.6.6: #i68103# clear undo stack after xml import
2007/12/01 19:20:00 cl 1.65.6.5: RESYNC: (1.70-1.71); FILE MERGED
2007/10/11 21:44:05 cl 1.65.6.4: RESYNC: (1.68-1.70); FILE MERGED
2007/08/01 15:22:30 cl 1.65.6.3: RESYNC: (1.66-1.68); FILE MERGED
2007/06/27 15:19:20 cl 1.65.6.2: RESYNC: (1.65-1.66); FILE MERGED
2007/04/18 15:18:05 cl 1.65.6.1: #i72702# reworked SdrBeginTextEdit to be virtual at last!
 2008-03-12 10:57:35 +00:00
Kurt Zenker
082298c4a9 INTEGRATION: CWS unifysound01_DEV300 (1.69.34); FILE MERGED 
2007/10/16 08:44:30 cmc 1.69.34.3: RESYNC: (1.70-1.71); FILE MERGED
2007/10/04 11:11:05 cmc 1.69.34.2: RESYNC: (1.69-1.70); FILE MERGED
2007/08/30 08:34:56 cmc 1.69.34.1: #i81145# move from Sound::IsSoundFile to ::avmedia::MediaWindow::isMediaURL
 2008-03-07 15:28:52 +00:00
Oliver Bolte
cd17cbfc23 INTEGRATION: CWS cropmaster2000_DEV300 (1.70.10); FILE MERGED 
2008/02/11 13:35:11 cl 1.70.10.3: RESYNC: (1.71-1.72); FILE MERGED
2007/11/24 19:38:55 cl 1.70.10.2: RESYNC: (1.70-1.71); FILE MERGED
2007/11/24 19:00:15 cl 1.70.10.1: #i83933# added interactive graphic cropping
 2008-02-26 06:27:28 +00:00
Vladimir Glazounov
e2c0c3121b INTEGRATION: CWS impress136_SRC680 (1.71.26); FILE MERGED 
2007/11/28 16:21:59 cl 1.71.26.1: #i79757# consolidate clear undo code to DrawDocShell::ClearUndoBuffer()
 2008-01-28 13:57:28 +00:00
Kurt Zenker
15c4851fe0 INTEGRATION: CWS pppopt02 (1.69.18); FILE MERGED 
2007/09/28 14:52:07 sj 1.69.18.1: added slot to be able to clear the undomanager
 2007-10-10 14:32:44 +00:00
Kurt Zenker
96f6226d95 INTEGRATION: CWS mingwport06 (1.69.24); FILE MERGED 
2007/08/24 13:11:36 vg 1.69.24.1: #i75499# pragma is for MSVC
 2007-09-06 12:56:42 +00:00
Jens-Heiner Rechtien
5ada76f95a INTEGRATION: CWS impress123 (1.66.54); FILE MERGED 
2007/07/12 12:59:47 cl 1.66.54.2: RESYNC: (1.66-1.68); FILE MERGED
2007/07/04 12:26:08 cl 1.66.54.1: #i79195# applied patch to create correct undo action for inserting hyperlink
 2007-08-02 17:24:03 +00:00
Rüdiger Timm
188999ce53 INTEGRATION: CWS pathfinder01 (1.66.40); FILE MERGED 
2007/07/03 13:02:33 cl 1.66.40.1: #i41800# implemented support for path animation editing for custom animations
 2007-07-06 12:14:44 +00:00
Jens-Heiner Rechtien
f08b4ffd2d INTEGRATION: CWS impress122 (1.66.30); FILE MERGED 
2007/06/13 07:53:00 af 1.66.30.1: #141146# Made ToolBarManager a shared_ptr member of ViewShellBase.
 2007-06-27 14:47:33 +00:00
Kurt Zenker
e1a99d8056 INTEGRATION: CWS pchfix04 (1.64.6); FILE MERGED 
2007/04/25 22:37:37 hjs 1.64.6.2: RESYNC: (1.64-1.65); FILE MERGED
2007/02/05 08:39:03 os 1.64.6.1: #i73604# usage of ITEMID_* removed
 2007-05-10 14:35:18 +00:00
Rüdiger Timm
06df9cb7a0 INTEGRATION: CWS components1 (1.58.94); FILE MERGED 
2007/01/25 15:39:04 af 1.58.94.8: RESYNC: (1.63-1.64); FILE MERGED
2007/01/22 17:20:06 af 1.58.94.7: #i68075 Introduction of XResourceId interface.
2006/11/21 16:29:30 af 1.58.94.6: RESYNC: (1.62-1.63); FILE MERGED
2006/11/21 09:41:22 af 1.58.94.5: RESYNC: (1.61-1.62); FILE MERGED
2006/09/25 17:46:19 af 1.58.94.4: RESYNC: (1.58-1.61); FILE MERGED
2006/09/15 09:43:56 af 1.58.94.3: #i68075# Added parent window argument to SlideShow constructor.  Calling Resize() when the rulers are turned on or off.
2006/09/07 14:51:56 af 1.58.94.2: #i68075# Transition from URL to ResourceId.
2006/08/22 12:55:02 af 1.58.94.1: #i68075# Transition to new drawing framework.
 2007-04-03 15:30:36 +00:00
Kurt Zenker
1122f5446d INTEGRATION: CWS sdwarningsbegone (1.61.34); FILE MERGED 
2006/11/27 13:48:19 cl 1.61.34.3: #i69285# warning free code changes for sd project
2006/11/22 15:15:26 cl 1.61.34.2: RESYNC: (1.61-1.63); FILE MERGED
2006/11/22 12:42:28 cl 1.61.34.1: #i69285# warning free code changes for unxlngi6.pro
 2006-12-12 18:15:58 +00:00
Ivo Hinkelmann
8b6c35ce52 INTEGRATION: CWS aw024 (1.53.28); FILE MERGED 
2006/11/10 05:11:52 aw 1.53.28.11: RESYNC: (1.61-1.62); FILE MERGED
2006/09/21 23:47:26 aw 1.53.28.10: RESYNC: (1.60-1.61); FILE MERGED
2006/08/03 16:40:55 aw 1.53.28.9: RESYNC: (1.58-1.60); FILE MERGED
2006/05/12 20:56:45 aw 1.53.28.8: RESYNC: (1.57-1.58); FILE MERGED
2006/01/26 20:21:12 aw 1.53.28.7: RESYNC: (1.55-1.57); FILE MERGED
2005/09/17 14:12:52 aw 1.53.28.6: RESYNC: (1.54-1.55); FILE MERGED
2005/07/22 09:44:10 aw 1.53.28.5: RESYNC: (1.53-1.54); FILE MERGED
2005/05/26 11:24:49 aw 1.53.28.4: #i39531#
2005/05/19 12:11:43 aw 1.53.28.3: #i39529#
2005/05/12 16:46:30 aw 1.53.28.2: #i39529#
2005/04/26 14:58:43 aw 1.53.28.1: #i39528#
 2006-11-14 13:44:32 +00:00
Vladimir Glazounov
c16b502a36 INTEGRATION: CWS impress109 (1.61.20); FILE MERGED 
2006/10/10 15:06:22 cl 1.61.20.1: #134177# check if draw view is 0 before using it
 2006-11-01 13:17:47 +00:00
Oliver Bolte
08d1adfda3 INTEGRATION: CWS pchfix02 (1.60.24); FILE MERGED 
2006/09/01 17:37:38 kaib 1.60.24.1: #i68856# Added header markers and pch files
 2006-09-16 18:39:08 +00:00
Ivo Hinkelmann
3be6f6be1e INTEGRATION: CWS impress99 (1.58.102); FILE MERGED 
2006/07/06 14:56:00 cl 1.58.102.1: #i66670# removed unused code
 2006-08-01 08:25:18 +00:00
Rüdiger Timm
85260e16d8 INTEGRATION: CWS aw035 (1.58.112); FILE MERGED 
2006/07/13 16:05:19 aw 1.58.112.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
 2006-07-25 10:50:27 +00:00
Oliver Bolte
9b1ccaadab INTEGRATION: CWS viewswitch (1.55.70); FILE MERGED 
2006/01/19 17:57:52 af 1.55.70.2: RESYNC: (1.55-1.57); FILE MERGED
2005/11/17 15:23:25 af 1.55.70.1: #i57551# Replaced ObjectBarManager with ToolBarManager.
 2006-03-21 16:45:15 +00:00
Rüdiger Timm
fd5084e321 INTEGRATION: CWS impresspresobjs (1.55.54); FILE MERGED 
2005/12/30 10:53:20 cl 1.55.54.4: #i59838# first set FuText as actual function, then call DoExecute
2005/12/27 13:34:24 cl 1.55.54.3: RESYNC: (1.55-1.56); FILE MERGED
2005/12/01 11:07:18 cl 1.55.54.2: #i58649# removed unused function
2005/11/24 12:38:35 cl 1.55.54.1: #123595# reworked presobj list and undo
 2006-01-10 13:37:11 +00:00
Rüdiger Timm
dc5479dcc3 INTEGRATION: CWS impressfunctions (1.55.38); FILE MERGED 
2005/10/28 10:58:28 cl 1.55.38.1: #125341# reworked FuPoor classes to use refcounting
 2005-12-14 16:29:11 +00:00
Rüdiger Timm
c6817f8a5b INTEGRATION: CWS ooo19126 (1.54.66); FILE MERGED 
2005/09/05 13:25:48 rt 1.54.66.1: #i54170# Change license header: remove SISSL
 2005-09-09 06:12:08 +00:00
Oliver Bolte
9b37f3863c INTEGRATION: CWS impress62 (1.53.118); FILE MERGED 
2005/06/29 09:30:29 af 1.53.118.1: #i43497# Fixed the handling of the SID_PRESENTATION_END slot.
 2005-07-07 12:39:29 +00:00
Vladimir Glazounov
aa3c5987c7 INTEGRATION: CWS iha07 (1.50.18); FILE MERGED 
2005/03/01 16:29:50 iha 1.50.18.4: RESYNC: (1.51-1.52); FILE MERGED
2005/02/18 14:14:54 iha 1.50.18.3: #i41753# custom shapes toolboxes are not highlighted in action mode
2005/01/31 14:12:49 iha 1.50.18.2: RESYNC: (1.50-1.51); FILE MERGED
2005/01/21 22:23:55 iha 1.50.18.1: #i39638# don't hide 'Line and Filling' toolbar' while showing 'Edit Points' toolbar
 2005-03-08 13:43:41 +00:00
Vladimir Glazounov
eaad95d904 INTEGRATION: CWS impress34 (1.51.16); FILE MERGED 
2005/02/11 12:28:59 bm 1.51.16.3: #i41824# delete mpSlideShow before setting to 0
2005/02/11 11:18:19 bm 1.51.16.2: i41824# apply new slideshow to mpSlideShow before calling startShow, for resizes being properly forwarded
2005/02/07 18:05:33 af 1.51.16.1: #i42156# Not using the LayoutDialogChildWindow anymore.
 2005-02-24 14:09:26 +00:00
Kurt Zenker
8f22bf3e07 INTEGRATION: CWS impress23 (1.49.8); FILE MERGED 
2005/01/11 14:48:13 dbo 1.49.8.2: #i39098# making slideshow creation/startShow()/startPreview() more robust
2004/12/30 12:50:28 dbo 1.49.8.1: #i34155# mind rehearse timings slot
 2005-01-21 15:38:04 +00:00
Rüdiger Timm
44838a2bb3 INTEGRATION: CWS sb19 (1.43.4); FILE MERGED 
2004/12/08 15:01:36 sb 1.43.4.3: RESYNC: (1.44-1.49); FILE MERGED
2004/10/28 13:48:40 sb 1.43.4.2: RESYNC: (1.43-1.44); FILE MERGED
2004/10/27 07:32:37 mba 1.43.4.1: #110407#: remove static BaseURL
 2005-01-11 11:13:05 +00:00
Rüdiger Timm
127ee948e1 #i10000# Fixes (?) by AF and THB 2004-11-30 09:14:52 +00:00
Kurt Zenker
e0ea0a29b5 INTEGRATION: CWS presentationengine01 (1.36.10); FILE MERGED 
2004/11/17 19:38:54 thb 1.36.10.12: RESYNC: (1.43-1.45); FILE MERGED
2004/10/12 23:26:27 thb 1.36.10.11: RESYNC: (1.42-1.43); FILE MERGED
2004/09/12 18:21:51 cl 1.36.10.10: removed animation mode
2004/08/28 22:56:57 cl 1.36.10.9: removed old presentation code
2004/08/26 14:38:51 cl 1.36.10.8: reworked new Slideshow integration
2004/08/25 16:32:48 cl 1.36.10.7: replaced old FuSlideShow with new SlideShow
2004/08/23 12:37:13 thb 1.36.10.6: RESYNC: (1.41-1.42); FILE MERGED
2004/08/03 19:50:34 thb 1.36.10.5: #110496# Added preliminary XSlideShow integration
2004/07/26 20:18:24 thb 1.36.10.4: #i10000# Removed merge fault
2004/07/23 15:09:30 thb 1.36.10.3: RESYNC: (1.38-1.41); FILE MERGED
2004/07/07 01:37:40 thb 1.36.10.2: RESYNC: (1.36-1.38); FILE MERGED
2004/04/12 15:17:05 thb 1.36.10.1: #110496# Adaptions after canvas01 merge
 2004-11-27 13:41:03 +00:00
Jens-Heiner Rechtien
6faee579a4 INTEGRATION: CWS impress16 (1.44.8); FILE MERGED 
2004/11/02 13:25:18 af 1.44.8.2: RESYNC: (1.44-1.45); FILE MERGED
2004/10/21 13:48:53 bm 1.44.8.1: #i34116# SID_SIZE_OPTIMAL: member aMarkRect is used without update -> refresh before using
 2004-11-26 14:04:28 +00:00