diff options
| author | Mark Wright <markwright@internode.on.net> | 2013-02-10 02:04:02 +1100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-09 22:41:50 +0000 |
| commit | d4bab97023e3569571a92551040574b20aceca7c (patch) | |
| tree | fb465a0fe21abe9ce6269fb71613cba7caeea90b /slideshow | |
| parent | 020e2b900b017d64a52f494707015a0e2e959d63 (diff) | |
fix compile for change to boost 1.53.0 declaring smart pointer operator bool as explicity for C++11 compilers
Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79
Reviewed-on: https://gerrit.libreoffice.org/2064
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animatedsprite.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewshape.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/shapesubset.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideanimations.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/shapeattributelayer.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/shapeattributelayerholder.hxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index e63d600db8ca..5d421c21bf05 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -151,7 +151,7 @@ namespace slideshow } } - return mpSprite; + return static_cast< bool >(mpSprite); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 20c73de6a5dd..621535f9dbe7 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -178,7 +178,7 @@ namespace slideshow } } - return io_rCacheEntry.mpRenderer; + return static_cast< bool >(io_rCacheEntry.mpRenderer); } bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index c5636cc46c8b..da2815936b50 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -104,7 +104,7 @@ namespace slideshow maTreeNode ); } - return mpSubsetShape; + return static_cast< bool >(mpSubsetShape); } void ShapeSubset::disableSubsetShape() diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 5f5e9f57125e..7d4c788dacd4 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -74,7 +74,7 @@ namespace slideshow SHOW_NODE_TREE( mpRootNode ); - return mpRootNode; + return static_cast< bool >(mpRootNode); } bool SlideAnimations::isAnimated() const diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index 88405f8eea2a..d725255919d7 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -467,7 +467,7 @@ namespace slideshow // ShapeAttributeLayer(const ShapeAttributeLayer&); // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); - bool haveChild() const { return mpChild; } + bool haveChild() const { return static_cast< bool >(mpChild); } void updateStateIds(); template< typename T > T calcValue( const T& rCurrValue, diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx index e53be462cee2..22ce4f3ceec5 100644 --- a/slideshow/source/inc/shapeattributelayerholder.hxx +++ b/slideshow/source/inc/shapeattributelayerholder.hxx @@ -83,7 +83,7 @@ namespace slideshow if( mpShape ) mpAttributeLayer = mpShape->createAttributeLayer(); - return mpAttributeLayer; + return static_cast< bool >(mpAttributeLayer); } ShapeAttributeLayerSharedPtr get() const |