diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index d737aae..b6c27c6 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -130,7 +130,7 @@ namespace drawinglayer { scoped_timed_RefDev& rStdRefDevice = the_scoped_timed_RefDev::get(); - if(!rStdRefDevice()) + if(!rStdRefDevice.get()) rStdRefDevice.reset(new ImpTimedRefDev(rStdRefDevice)); return rStdRefDevice->acquireVirtualDevice(); diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index e9cfd31..0983780 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -195,7 +195,7 @@ uno::Reference< linguistic2::XLanguageGuessing > GlobalEditData::GetLanguageGues OutputDevice* GlobalEditData::GetStdRefDevice() { - if ( !m_aStdRefDevice() ) + if ( !m_aStdRefDevice.get() ) { m_aStdRefDevice.reset(new VirtualDevice); m_aStdRefDevice->SetMapMode( MAP_TWIP ); diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index bc0bcc7..4ab778b 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -682,7 +682,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT bool XclExpChEscherFormat::IsValid() const { - return maData.mxEscherSet; + return maData.mxEscherSet.get(); } void XclExpChEscherFormat::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index c493560..60fdabb 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlFie if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 { // there was/is already a HLINK record - mbMultipleUrls = mxLinkRec; + mbMultipleUrls = mxLinkRec.get(); mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) ); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 8310deb..2aced52 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2688,7 +2688,7 @@ void XclImpChTypeGroup::Finalize() maType.Finalize( bStockChart ); // extended type info - maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false ); + maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d.get(), false ); // reverse series order for some unstacked 2D chart types if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() ) diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 57538f0..d501cdd 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1230,9 +1230,9 @@ public: /** 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 mxMajorGrid.get(); } /** Returns true, if the axis shows its minor grid lines. */ - inline bool HasMinorGrid() const { return mxMinorGrid; } + inline bool HasMinorGrid() const { return mxMinorGrid.get(); } /** Creates an API axis object. */ XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index e63d600..c6ae6f5 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -151,7 +151,7 @@ namespace slideshow } } - return mpSprite; + return mpSprite.get(); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index bdb6b90..d1795ac 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -97,7 +97,7 @@ protected: // TODO(Q1): This yields circular references, which, it seems, is // unavoidable here - if( pChild ) + if( pChild.get() ) mrParent->appendChildNode( pChild ); } diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 20c73de..060ed92 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 io_rCacheEntry.mpRenderer.get(); } bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index c5636cc..ce92ca2 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -104,7 +104,7 @@ namespace slideshow maTreeNode ); } - return mpSubsetShape; + return mpSubsetShape.get(); } void ShapeSubset::disableSubsetShape() diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 5f5e9f5..d12f29d 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -74,12 +74,12 @@ namespace slideshow SHOW_NODE_TREE( mpRootNode ); - return mpRootNode; + return mpRootNode.get(); } bool SlideAnimations::isAnimated() const { - if( !mpRootNode ) + if( !mpRootNode.get() ) return false; // no animations there // query root node about pending animations diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index 88405f8..b8ea7d1 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 mpChild.get(); } void updateStateIds(); template< typename T > T calcValue( const T& rCurrValue, diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 6937a19..09dc159 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -75,7 +75,7 @@ namespace sw { virtual bool IsCoveringPosition(const SwPosition& rPos) const; virtual bool IsExpanded() const - { return m_pPos2; } + { return m_pPos2.get(); } virtual void SetName(const ::rtl::OUString& rName) { m_aName = rName; } diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index f98abcd..4d15ec3 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -166,7 +166,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng ////////////////////////////////////////////////////////////////////////////// SvgData::SvgData(const OUString& rPath): - maSvgDataArray(NULL), + maSvgDataArray(), mnSvgDataArrayLength(0), maPath(rPath), maRange(),