Skip to content

C
core
Kaydet (Commit) d5ed07d2 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

make ControlModelContainerBase::Clone return by rtl::Reference 

Change-Id: Ie5d80688293dea42bea8b38fb1699e93980dd668
Reviewed-on: https://gerrit.libreoffice.org/52747Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst b0a2ab4c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 31 deletions
include/toolkit/controls/animatedimages.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -42,7 +42,7 @@ namespace toolkit
AnimatedImagesControlModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory );
AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource );
virtual UnoControlModel* Clone() const override;
virtual rtl::Reference<UnoControlModel> Clone() const override;
// XPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......
include/toolkit/controls/controlmodelcontainerbase.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -108,7 +108,7 @@ public:
ControlModelContainerBase( const ControlModelContainerBase& rModel );
virtual ~ControlModelContainerBase() override;
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
// css::container::XContainer
void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
......
include/toolkit/controls/dialogcontrol.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -170,7 +170,7 @@ public:
UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~UnoMultiPageModel() override;
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" )
......@@ -244,7 +244,7 @@ public:
UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~UnoPageModel() override;
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoPageModel" )
......@@ -277,7 +277,7 @@ public:
UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~UnoFrameModel() override;
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, "com.sun.star.awt.UnoFrameModel" )
......
include/toolkit/controls/formattedcontrol.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -44,7 +44,7 @@ namespace toolkit
{
}
UnoControlModel* Clone() const override { return new UnoControlFormattedFieldModel( *this ); }
rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlFormattedFieldModel( *this ); }
// css::io::XPersistObject
OUString SAL_CALL getServiceName() override;
......
include/toolkit/controls/roadmapcontrol.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -96,7 +96,7 @@ namespace toolkit
UnoControlRoadmapModel_Base( rModel ),
UnoControlRoadmapModel_IBase( rModel ),
maContainerListeners( *this ) {}
UnoControlModel* Clone() const override { return new UnoControlRoadmapModel( *this ); }
rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlRoadmapModel( *this ); }
// XTypeProvider
......
include/toolkit/controls/tabpagecontainer.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -54,7 +54,7 @@ public:
UnoControlTabPageContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
UnoControlTabPageContainerModel( const UnoControlTabPageContainerModel& rModel ) : UnoControlTabPageContainerModel_Base( rModel ),maContainerListeners( *this ) {}
UnoControlModel* Clone() const override { return new UnoControlTabPageContainerModel( *this ); }
rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlTabPageContainerModel( *this ); }
// css::io::XPersistObject
OUString SAL_CALL getServiceName() override;
......
include/toolkit/controls/tkscrollbar.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -44,7 +44,7 @@ namespace toolkit
UnoControlScrollBarModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {}
UnoControlModel* Clone() const override { return new UnoControlScrollBarModel( *this ); }
rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlScrollBarModel( *this ); }
// css::beans::XMultiPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......
include/toolkit/controls/unocontrolcontainermodel.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -38,7 +38,7 @@ public:
UnoControlContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {}
UnoControlModel* Clone() const override { return new UnoControlContainerModel( *this ); }
rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlContainerModel( *this ); }
// css::beans::XMultiPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......
include/toolkit/controls/unocontrolmodel.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -38,6 +38,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/implbase7.hxx>
#include <comphelper/uno3.hxx>
#include <rtl/ref.hxx>
#include <vector>
#include <map>
......@@ -115,7 +116,7 @@ public:
UnoControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
UnoControlModel( const UnoControlModel& rModel );
virtual UnoControlModel* Clone() const = 0;
virtual rtl::Reference<UnoControlModel> Clone() const = 0;
// css::uno::XInterface
css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return OWeakAggObject::queryInterface(rType); }
......
toolkit/source/controls/animatedimages.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -265,7 +265,7 @@ namespace toolkit {
}
UnoControlModel* AnimatedImagesControlModel::Clone() const
rtl::Reference<UnoControlModel> AnimatedImagesControlModel::Clone() const
{
return new AnimatedImagesControlModel( *this );
}
......
toolkit/source/controls/controlmodelcontainerbase.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -300,7 +300,7 @@ void ControlModelContainerBase::Clone_Impl(ControlModelContainerBase& _rClone) c
CloneControlModel( _rClone.maModels )
);
}
UnoControlModel* ControlModelContainerBase::Clone() const
rtl::Reference<UnoControlModel> ControlModelContainerBase::Clone() const
{
// clone the container itself
ControlModelContainerBase* pClone = new ControlModelContainerBase( *this );
......
toolkit/source/controls/dialogcontrol.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -145,7 +145,7 @@ public:
explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
UnoControlDialogModel( const UnoControlDialogModel& rModel );
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
// css::beans::XMultiPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......@@ -216,7 +216,7 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode
setFastPropertyValue_NoBroadcast( BASEPROPERTY_USERFORMCONTAINEES, makeAny( xNameCont ) );
}
UnoControlModel* UnoControlDialogModel::Clone() const
rtl::Reference<UnoControlModel> UnoControlDialogModel::Clone() const
{
// clone the container itself
UnoControlDialogModel* pClone = new UnoControlDialogModel( *this );
......@@ -860,8 +860,7 @@ UnoMultiPageModel::~UnoMultiPageModel()
{
}
UnoControlModel*
UnoMultiPageModel::Clone() const
rtl::Reference<UnoControlModel> UnoMultiPageModel::Clone() const
{
// clone the container itself
UnoMultiPageModel* pClone = new UnoMultiPageModel( *this );
......@@ -973,8 +972,7 @@ UnoPageModel::~UnoPageModel()
{
}
UnoControlModel*
UnoPageModel::Clone() const
rtl::Reference<UnoControlModel> UnoPageModel::Clone() const
{
// clone the container itself
UnoPageModel* pClone = new UnoPageModel( *this );
......@@ -1127,8 +1125,7 @@ UnoFrameModel::~UnoFrameModel()
{
}
UnoControlModel*
UnoFrameModel::Clone() const
rtl::Reference<UnoControlModel> UnoFrameModel::Clone() const
{
// clone the container itself
UnoFrameModel* pClone = new UnoFrameModel( *this );
......
toolkit/source/controls/grid/gridcontrol.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -157,7 +157,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
}
UnoControlModel* UnoGridModel::Clone() const
rtl::Reference<UnoControlModel> UnoGridModel::Clone() const
{
return new UnoGridModel( *this );
}
......
toolkit/source/controls/grid/gridcontrol.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -50,7 +50,7 @@ public:
explicit UnoGridModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
UnoGridModel( const UnoGridModel& rModel );
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
// css::lang::XComponent
void SAL_CALL dispose( ) override;
......
toolkit/source/controls/spinningprogress.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -34,7 +34,7 @@ class SpinningProgressControlModel : public SpinningProgressControlModel_Base
public:
explicit SpinningProgressControlModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory );
virtual UnoControlModel* Clone() const override;
virtual rtl::Reference<UnoControlModel> Clone() const override;
// XPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......@@ -83,7 +83,7 @@ protected:
}
UnoControlModel* SpinningProgressControlModel::Clone() const
rtl::Reference<UnoControlModel> SpinningProgressControlModel::Clone() const
{
return new SpinningProgressControlModel( *this );
}
......
toolkit/source/controls/tkspinbutton.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -48,7 +48,7 @@ protected:
public:
explicit UnoSpinButtonModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
UnoControlModel* Clone() const override { return new UnoSpinButtonModel( *this ); }
rtl::Reference<UnoControlModel> Clone() const override { return new UnoSpinButtonModel( *this ); }
// XMultiPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......
toolkit/source/controls/tree/treecontrol.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -69,7 +69,7 @@ UnoTreeModel::UnoTreeModel( const css::uno::Reference< css::uno::XComponentConte
ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
}
UnoControlModel* UnoTreeModel::Clone() const
rtl::Reference<UnoControlModel> UnoTreeModel::Clone() const
{
return new UnoTreeModel( *this );
}
......
toolkit/source/controls/tree/treecontrol.hxx
Dosyayı görüntüle @ d5ed07d2
......@@ -39,7 +39,7 @@ protected:
public:
explicit UnoTreeModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
UnoControlModel* Clone() const override;
rtl::Reference<UnoControlModel> Clone() const override;
// css::beans::XMultiPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
......
toolkit/source/controls/unocontrolmodel.cxx
Dosyayı görüntüle @ d5ed07d2
......@@ -436,9 +436,8 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlModel, UnoControlModel_Base, ::cppu:
uno::Reference< util::XCloneable > UnoControlModel::createClone()
{
UnoControlModel* pClone = Clone();
uno::Reference< util::XCloneable > xClone( static_cast<cppu::OWeakObject*>(pClone), uno::UNO_QUERY );
return xClone;
rtl::Reference<UnoControlModel> pClone = Clone();
return pClone.get();
}
// css::lang::XComponent
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment