--- vcl/source/gdi/svgdata.cxx +++ vcl/source/gdi/svgdata.cxx @@ -166,7 +166,7 @@ ////////////////////////////////////////////////////////////////////////////// SvgData::SvgData(const OUString& rPath): - maSvgDataArray(NULL), + maSvgDataArray(), mnSvgDataArrayLength(0), maPath(rPath), maRange(), --- solver/unxlngx6.pro/inc/comphelper/scoped_disposing_ptr.hxx +++ solver/unxlngx6.pro/inc/comphelper/scoped_disposing_ptr.hxx @@ -78,7 +78,7 @@ operator bool () const { - return m_aItem; + return static_cast(m_aItem); } virtual ~scoped_disposing_ptr() --- slideshow/source/inc/shapeattributelayer.hxx +++ slideshow/source/inc/shapeattributelayer.hxx @@ -467,7 +467,7 @@ // ShapeAttributeLayer(const ShapeAttributeLayer&); // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); - bool haveChild() const { return mpChild; } + bool haveChild() const { return static_cast(mpChild); } void updateStateIds(); template< typename T > T calcValue( const T& rCurrValue, --- slideshow/source/engine/animatedsprite.cxx +++ slideshow/source/engine/animatedsprite.cxx @@ -151,7 +151,7 @@ } } - return mpSprite; + return static_cast(mpSprite); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) --- slideshow/source/inc/shapeattributelayerholder.hxx +++ slideshow/source/inc/shapeattributelayerholder.hxx @@ -83,7 +83,7 @@ if( mpShape ) mpAttributeLayer = mpShape->createAttributeLayer(); - return mpAttributeLayer; + return static_cast(mpAttributeLayer); } ShapeAttributeLayerSharedPtr get() const --- slideshow/source/engine/shapesubset.cxx +++ slideshow/source/engine/shapesubset.cxx @@ -104,7 +104,7 @@ maTreeNode ); } - return mpSubsetShape; + return static_cast(mpSubsetShape); } void ShapeSubset::disableSubsetShape() --- slideshow/source/engine/shapes/viewshape.cxx +++ slideshow/source/engine/shapes/viewshape.cxx @@ -178,7 +178,7 @@ } } - return io_rCacheEntry.mpRenderer; + return static_cast(io_rCacheEntry.mpRenderer); } bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, --- slideshow/source/engine/slide/slideanimations.cxx +++ slideshow/source/engine/slide/slideanimations.cxx @@ -74,7 +74,7 @@ SHOW_NODE_TREE( mpRootNode ); - return mpRootNode; + return static_cast(mpRootNode); } bool SlideAnimations::isAnimated() const --- sw/source/core/inc/bookmrk.hxx +++ sw/source/core/inc/bookmrk.hxx @@ -75,7 +75,7 @@ virtual bool IsCoveringPosition(const SwPosition& rPos) const; virtual bool IsExpanded() const - { return m_pPos2; } + { return static_cast(m_pPos2); } virtual void SetName(const ::rtl::OUString& rName) { m_aName = rName; } --- sc/source/filter/excel/xechart.cxx +++ sc/source/filter/excel/xechart.cxx @@ -682,7 +682,7 @@ bool XclExpChEscherFormat::IsValid() const { - return maData.mxEscherSet; + return static_cast(maData.mxEscherSet); } void XclExpChEscherFormat::Save( XclExpStream& rStrm ) --- sc/source/filter/excel/xehelper.cxx +++ sc/source/filter/excel/xehelper.cxx @@ -303,7 +303,7 @@ if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 { // there was/is already a HLINK record - mbMultipleUrls = mxLinkRec; + mbMultipleUrls = static_cast(mxLinkRec); mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) ); --- sc/source/filter/excel/xichart.cxx +++ sc/source/filter/excel/xichart.cxx @@ -2689,7 +2689,7 @@ maType.Finalize( bStockChart ); // extended type info - maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false ); + maTypeInfo.Set( maType.GetTypeInfo(), static_cast(mxChart3d), false ); // reverse series order for some unstacked 2D chart types if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() ) --- sc/source/filter/inc/xichart.hxx +++ sc/source/filter/inc/xichart.hxx @@ -1230,9 +1230,9 @@ /** Returns true, if the axis contains caption labels. */ inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); } /** Returns true, if the axis shows its major grid lines. */ - inline bool HasMajorGrid() const { return mxMajorGrid; } + inline bool HasMajorGrid() const { return static_cast(mxMajorGrid); } /** Returns true, if the axis shows its minor grid lines. */ - inline bool HasMinorGrid() const { return mxMinorGrid; } + inline bool HasMinorGrid() const { return static_cast(mxMinorGrid); } /** Creates an API axis object. */ XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;