Commit Graph

23 Commits

Author SHA1 Message Date
Jan Holesovsky
219458b0d7 Merge commit 'ooo/DEV300_m103'
Conflicts:
	sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
	slideshow/source/engine/debug.cxx
	slideshow/source/engine/transitions/randomwipe.cxx
2011-03-23 16:59:19 +01:00
Jan Holesovsky
a0c13ffcce Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	sd/source/ui/func/fuinsfil.cxx
	sd/source/ui/func/fuprobjs.cxx
	sd/source/ui/slideshow/slideshowimpl.cxx
	sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/view/drawview.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/outlview.cxx
2011-03-18 15:40:35 +01:00
Bjoern Michaelsen
c61cd1a5a2 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
Thomas Arnhold
c64a901829 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:13:33 +01:00
Fridrich Štrba
c71de19e96 Port stuff to our private implementation of SGI extensions 2011-02-08 17:41:39 +01:00
Matthias Huetsch [mhu]
cff21146b0 Update from master repository (DEV300_m98). 2011-01-27 18:16:28 +01:00
Radek Doulik
07e5911774 fix shapes rendering order n#656934
- it was broken for master pages containing group shapes
2011-01-05 22:43:00 +01:00
Caolán McNamara
42b4aaf23b callcatcher: removed uncalled and uncallable methods 2010-12-03 20:57:54 +00:00
Christian Lippka
c5ef576239 impressdefaults1: #i113019# fixes to make changing of user paint settings during slideshow work 2010-12-02 13:34:17 +01:00
Christian Lippka ORACLE
ef238fc511 impressdefaults1: #i113018# use red as default pen color, enable pen context menu 2010-12-01 10:02:17 +01:00
Sebastian Spaeth
80b0861510 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:43 +02:00
Matthias Huetsch [mhu]
5232da202e Update from master repository (DEV300_m82). 2010-06-18 19:00:23 +02: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]
c96b2fdb50 autorecovery: commit resolved merge (after rebase to m71) 2010-02-04 10:38:39 +01:00
Frank Schoenheit [fs]
7ffad11ac2 autorecovery: ENSURE_OR_RETURN => ENSURE_OR_RETURN_FALSE, added new ENSURE_OR_RETURN taking a return value 2010-01-29 08:49:42 +01:00
thb
f9279fa745 #i10000# Another WaE build fix 2010-01-26 17:21:57 +01:00
ericb
7e52f21b6b eraser01: #i103174# cosmetic changes before RfQA 2010-01-06 16:41:04 +01:00
ericb
af5c661b94 #i97972# commit all changes since Thorsten rebase. Thanks to Nelle, Jonathan, Christian and ericb 2009-12-15 23:12:19 +01:00
thb
44d83b68fd #103174# Code from the ecntablet and eraser CWS; optionally improves user paint interactions in slideshow 2009-06-29 15:15:41 +02:00
Kurt Zenker
bae896db02 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED
2008/04/21 07:54:57 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED
2007/10/01 13:49:14 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24 11:13:32 +00:00
Rüdiger Timm
06d9835e95 INTEGRATION: CWS changefileheader (1.2.46); FILE MERGED
2008/03/31 14:00:23 rt 1.2.46.1: #i87441# Change license header to LPGL v3.
2008-04-11 00:00:21 +00:00
Oliver Bolte
4f62fb2324 INTEGRATION: CWS presfixes12 (1.1.2); FILE ADDED
2007/05/14 00:55:29 thb 1.1.2.14: #i77154# Moved intrinsic animation notification from global EventMultiplexer to ShapeManager (which is local to each slide). This is a temporary workaround, the proper fix would demote the EventMultiplexer to each Slide
2007/05/10 20:32:40 thb 1.1.2.13: #i37778# Reworked LayerManager::updateShapeLayers - now much better aligned with general shape update, and avoids superfluous rendering; made unit tests work again; passing down slide background repaint status to LayerManager; relaxed preconditions for Shape::getUpdateArea() - no longer requires views to work; now catching singular view matrix and using sensible default at API border
2007/05/02 21:37:23 thb 1.1.2.12: #i37778# Changed calls to cppcanvas::Canvas::getTransformation() to ViewLayer::getTransformation() where appropriate (because that's more direct); added initial Slide rendering back in (this time optional)
2007/04/30 07:26:33 thb 1.1.2.11: #i37778# Rendering slide bitmap at the end of a slide transition, instead of during Slide::show(), to avoid temporary display of previous slide after transition sprite vanished.
2007/03/11 00:17:59 thb 1.1.2.10: #i37778# Necessary adaptions for cppcanvas clip behaviour (extra setClip()  methods to clear clip, instead of empty polygon, which denotes everything clipped on canvas); removed cyclic references for intrinsically animated shapes (GIF and drawing layer scroll text); fixed a few coding style inconsistencies
2007/03/06 21:54:18 thb 1.1.2.9: #i37778# Added bool property  to disable z order correct animations
2007/02/25 01:10:27 thb 1.1.2.8: #i37778# Cleared up error handling a lot: no longer quenching RuntimeExceptions; reporting assertions in the debug case; ViewLayer  now reports resized sprite (which needs re-render from all shapes); fixed missing subset area reduction for glyph-level animations; added return of resize state from  Layer::commitLayerBounds(); adapted unit tests to corrected behaviour
2007/02/20 22:41:15 thb 1.1.2.7: #i37778# Emulating old sprite behaviour to clear content on getContentCanvas() in AnimatedSprite; corrected handling of full and partial view clears; corrected layer update when shapes are added or removed
2007/02/12 02:14:52 thb 1.1.2.6: #i37778# Added workaround to have ViewLayer always return valid canvas (even if no size has been set); fixed silly reference-instead-of-byvalue bug in SlideAnimations for slide size; fixed member initialization order problem in SlideImpl (also affecting slide size); adapted shape import for new LayerManager (which no longer gracefully ignores addition of NULL shapes); extended unit tests to catch fixed bugs
2007/02/06 17:18:13 thb 1.1.2.5: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/31 14:30:33 thb 1.1.2.4: #i37778# removed View::isContentDestroyed() and mbContentValid distinction on View::clear() - clear() now always clears view the hard way; added explicit screen update to CombTransition, which bypasses SlideChangeBase functionality
2007/01/30 16:43:50 thb 1.1.2.3: #i37778# Made view update/repaint/resize work again; swapped BackgroundShape parameters for correct mtf import
2007/01/29 16:29:30 thb 1.1.2.2: #i37778# Build fixes for msvc; added shapes lib to util link line
2007/01/29 14:02:15 thb 1.1.2.1: Issue number: #i37778#

Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
 - cleaned up ownership/disposable/weak_ptr story. removed hacks and
   explicit Disposable implementations, where workaround were available
 - removed object mutices, where superfluous
 - reworked EventMultiplexer (using templatized listener class now), added
   more events. EventMultiplexer now serves as a true blackboard
 - reworked directory structure: disjunct parts are now physically separated
   into directories, instantiation happens via factories & abstract interfaces
 - added CursorManager, to make setting mouse cursor less hackish
 - reworked DrawShape, to implement SeparateListener pattern
 - reworked IntrinsicAnimationActivity, to avoid cyclic references
 - modified hyperlink & shape cursor handling to communicate via
   EventMultiplexer
 - renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
   etc.)
 - added first version of the z-order fix to layer/layermanager
 - cleaned up include guards and include syntax
2007-07-17 13:57:53 +00:00