mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtl::Reference fits just fine here

Browse Source 
Change-Id: I80fd6b112134ab2b0e4a592f60a21c7c177b4b01
This commit is contained in:
Stephan Bergmann
2014-06-17 08:31:03 +02:00
parent bf376444d9
commit f66eec4623
6 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sd/source/ui/inc/ViewShell.hxx
View File

@@ -26,7 +26,6 @@
#include <sfx2/viewsh.hxx>
#include <vcl/prntypes.hxx>
#include <svtools/transfer.hxx>
#include <comphelper/implementationreference.hxx>
#include "glob.hxx"
#include "pres.hxx"
#include "cfgids.hxx"

11
sd/source/ui/slideshow/slideshowimpl.cxx
View File

@@ -80,7 +80,6 @@
#include <boost/bind.hpp>
using ::cppu::OInterfaceContainerHelper;
using ::comphelper::ImplementationReference;
using ::com::sun::star::animations::XAnimationNode;
using ::com::sun::star::animations::XAnimationListener;
using ::com::sun::star::awt::XWindow;
@@ -630,7 +629,7 @@ void SAL_CALL SlideshowImpl::disposing()
try
{
if( mxView.is() )
mxShow->removeView( mxView.getRef() );
mxShow->removeView( mxView.get() );
Reference< XComponent > xComponent( mxShow, UNO_QUERY );
if( xComponent.is() )
@@ -651,7 +650,7 @@ void SAL_CALL SlideshowImpl::disposing()
}
mxShow.clear();
mxView.reset();
mxView.clear();
mxListenerProxy.clear();
mpSlideController.reset();
@@ -1119,12 +1118,12 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
try
{
mxShow = Reference< XSlideShow >( createSlideShow(), UNO_QUERY_THROW );
mxView = comphelper::ImplementationReference<sd::SlideShowView, css::presentation::XSlideShowView>::createFromQuery( new SlideShowView(
mxView = new SlideShowView(
*mpShowWindow,
mpDoc,
meAnimationMode,
this,
maPresSettings.mbFullScreen) );
maPresSettings.mbFullScreen);
// try add wait symbol to properties:
const Reference<rendering::XSpriteCanvas> xSpriteCanvas(
@@ -1163,7 +1162,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
for( nIndex = 0; nIndex < nCount; nIndex++ )
mxShow->setProperty( aProperties[nIndex] );
mxShow->addView( mxView.getRef() );
mxShow->addView( mxView.get() );
mxListenerProxy.set( new SlideShowListenerProxy( this, mxShow ) );
mxListenerProxy->addAsSlideShowListener();

2
sd/source/ui/slideshow/slideshowimpl.hxx
View File

@@ -332,7 +332,7 @@ private:
sal_Int32 updateSlideShow (void);
css::uno::Reference< css::presentation::XSlideShow > mxShow;
comphelper::ImplementationReference< ::sd::SlideShowView, css::presentation::XSlideShowView > mxView;
rtl::Reference<sd::SlideShowView> mxView;
css::uno::Reference< css::frame::XModel > mxModel;
Timer maUpdateTimer;

1
sd/source/ui/slideshow/slideshowviewimpl.cxx
View File

@@ -43,7 +43,6 @@ using ::com::sun::star::presentation::XSlideShow;
using ::com::sun::star::presentation::XSlideShowView;
using ::com::sun::star::presentation::XShapeEventListener;
using ::com::sun::star::presentation::XSlideShowListener;
using ::comphelper::ImplementationReference;
using namespace ::com::sun::star;

1
sd/source/ui/slideshow/slideshowviewimpl.hxx
View File

@@ -39,7 +39,6 @@
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <comphelper/implementationreference.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <cppcanvas/spritecanvas.hxx>

3
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
View File

@@ -29,7 +29,6 @@
#include <sfx2/viewfac.hxx>
#include <tools/link.hxx>
#include <tools/gen.hxx>
#include <comphelper/implementationreference.hxx>
namespace sd { namespace slidesorter {
class SlideSorter;
@@ -241,8 +240,6 @@ private:
::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager;
// The listener listens to UNO events and thus is a UNO object.
// For proper life time management and at the same time free access to
// the implementation object we use the ImplementationReference class.
::rtl::Reference<controller::Listener> mpListener;
int mnModelChangeLockCount;