diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
commit | 257a5147b5728c5cdceb640bef473774f677ab0b (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /slideshow/source/engine/shapes/backgroundshape.cxx | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 778c39e45277c821d83039734d1f0d6636870542 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:44 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit a2636e7e8926833cefa3b527dc3a4e3d6d8ffcc7
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:26 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit b2cdf7bfe14ea650e52a4c90aaf5628b193d8509
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:57 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit ed8d7fa8a6f50723b5c2b19e3a9b9df6d014aa68
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:07 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: impress_libreoffice-3.3.1.1
split repo tag: impress_libreoffice-3.3.1.2
Diffstat (limited to 'slideshow/source/engine/shapes/backgroundshape.cxx')
-rw-r--r-- | slideshow/source/engine/shapes/backgroundshape.cxx | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 7d13d9247455..4f46d9172fb2 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,20 +84,20 @@ namespace slideshow peculiarities of the draw API regarding background content. */ - BackgroundShape( const ::com::sun::star::uno::Reference< + BackgroundShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getXShape() const; // View layer methods //------------------------------------------------------------------ - virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ); + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ); virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ); virtual bool clearAllViewLayers(); @@ -110,7 +110,7 @@ namespace slideshow virtual ::basegfx::B2DRectangle getUpdateArea() const; virtual bool isVisible() const; virtual double getPriority() const; - virtual bool isBackgroundDetached() const; + virtual bool isBackgroundDetached() const; // render methods @@ -119,17 +119,17 @@ namespace slideshow virtual bool update() const; virtual bool render() const; virtual bool isContentChanged() const; - + private: /// The metafile actually representing the Shape - GDIMetaFileSharedPtr mpMtf; + GDIMetaFileSharedPtr mpMtf; // The attributes of this Shape - ::basegfx::B2DRectangle maBounds; // always needed for rendering + ::basegfx::B2DRectangle maBounds; // always needed for rendering /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewBackgroundShapeSharedPtr > ViewBackgroundShapeVector; - ViewBackgroundShapeVector maViewShapes; + ViewBackgroundShapeVector maViewShapes; }; @@ -143,7 +143,7 @@ namespace slideshow maBounds(), maViewShapes() { - uno::Reference< beans::XPropertySet > xPropSet( xDrawPage, + uno::Reference< beans::XPropertySet > xPropSet( xDrawPage, uno::UNO_QUERY_THROW ); GDIMetaFileSharedPtr pMtf( new GDIMetaFile() ); @@ -178,15 +178,15 @@ namespace slideshow return uno::Reference< drawing::XShape >(); } - void BackgroundShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) + void BackgroundShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ) { ViewBackgroundShapeVector::iterator aEnd( maViewShapes.end() ); // already added? - if( ::std::find_if( maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( ::std::find_if( maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewBackgroundShape::getViewLayer, _1 ), @@ -196,8 +196,8 @@ namespace slideshow return; } - maViewShapes.push_back( - ViewBackgroundShapeSharedPtr( + maViewShapes.push_back( + ViewBackgroundShapeSharedPtr( new ViewBackgroundShape( rNewLayer, maBounds ) ) ); @@ -210,9 +210,9 @@ namespace slideshow { const ViewBackgroundShapeVector::iterator aEnd( maViewShapes.end() ); - OSL_ENSURE( ::std::count_if(maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + OSL_ENSURE( ::std::count_if(maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewBackgroundShape::getViewLayer, _1 ), @@ -221,9 +221,9 @@ namespace slideshow ViewBackgroundShapeVector::iterator aIter; - if( (aIter=::std::remove_if( maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( (aIter=::std::remove_if( maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewBackgroundShape::getViewLayer, _1 ), @@ -249,7 +249,7 @@ namespace slideshow { return maBounds; } - + ::basegfx::B2DRectangle BackgroundShape::getDomBounds() const { return maBounds; @@ -296,13 +296,13 @@ namespace slideshow // redraw all view shapes, by calling their render() method if( ::std::count_if( maViewShapes.begin(), - maViewShapes.end(), + maViewShapes.end(), ::boost::bind( &ViewBackgroundShape::render, _1, ::boost::cref( mpMtf ) ) ) != static_cast<ViewBackgroundShapeVector::difference_type>(maViewShapes.size()) ) { - // at least one of the ViewBackgroundShape::render() calls did return + // at least one of the ViewBackgroundShape::render() calls did return // false - update failed on at least one ViewLayer return false; } @@ -322,13 +322,13 @@ namespace slideshow ////////////////////////////////////////////////////////// - ShapeSharedPtr createBackgroundShape( + ShapeSharedPtr createBackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ) { return ShapeSharedPtr( - new BackgroundShape( + new BackgroundShape( xDrawPage, xMasterPage, rContext )); |