diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 13:30:23 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 08:46:17 +0200 |
commit | d5ed07d2a249e61937dd42a4b2efb7e7fbef02d6 (patch) | |
tree | bdba1a2775fc89ef333c39f0e52f4af147d41d7f /include/toolkit/controls | |
parent | b0a2ab4c68fa11b0a713583946718a60fda19c0c (diff) |
make ControlModelContainerBase::Clone return by rtl::Reference
Change-Id: Ie5d80688293dea42bea8b38fb1699e93980dd668
Reviewed-on: https://gerrit.libreoffice.org/52747
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/toolkit/controls')
-rw-r--r-- | include/toolkit/controls/animatedimages.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/controlmodelcontainerbase.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/dialogcontrol.hxx | 6 | ||||
-rw-r--r-- | include/toolkit/controls/formattedcontrol.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/roadmapcontrol.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/tabpagecontainer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/tkscrollbar.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolcontainermodel.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 3 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrols.hxx | 36 |
10 files changed, 30 insertions, 29 deletions
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index 28b323398039..c4820ce86f69 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -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; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index aba3ff1362a0..eb8068e40f8e 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -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; diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index e1bc04f1e63f..970226416253 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -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" ) diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index f600702b3027..8bacfa35b6bf 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -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; diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index 47feb933ddd6..c5a51a709476 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -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 diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index 8174acb203b6..baba7498c71f 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -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; diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index a0bbd0e2ddd3..3682a4e57551 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -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; diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index 08ff38dac388..b541f275976e 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -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; diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index aa5edc5cb65e..b736e6db49f1 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -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); } diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index e758cf6e01a8..e794147f9f2d 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -86,7 +86,7 @@ public: UnoControlEditModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlEditModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlEditModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -192,7 +192,7 @@ public: UnoControlFileControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlFileControlModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlFileControlModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -262,7 +262,7 @@ public: UnoControlButtonModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlButtonModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlButtonModel( *this ); } // css::beans::XMultiPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; @@ -344,7 +344,7 @@ public: UnoControlImageControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { } - UnoControlModel* Clone() const override { return new UnoControlImageControlModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlImageControlModel( *this ); } // css::beans::XMultiPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; @@ -407,7 +407,7 @@ public: UnoControlRadioButtonModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlRadioButtonModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlRadioButtonModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -488,7 +488,7 @@ public: UnoControlCheckBoxModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlCheckBoxModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlCheckBoxModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -571,7 +571,7 @@ public: UnoControlFixedHyperlinkModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFixedHyperlinkModel( const UnoControlFixedHyperlinkModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlFixedHyperlinkModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlFixedHyperlinkModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -645,7 +645,7 @@ public: UnoControlFixedTextModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFixedTextModel( const UnoControlFixedTextModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlFixedTextModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlFixedTextModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -712,7 +712,7 @@ public: UnoControlGroupBoxModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlGroupBoxModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlGroupBoxModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -767,7 +767,7 @@ public: UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ); virtual ~UnoControlListBoxModel() override; - UnoControlModel* Clone() const override { return new UnoControlListBoxModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlListBoxModel( *this ); } virtual void ImplNormalizePropertySequence( const sal_Int32 _nCount, /// the number of entries in the arrays @@ -939,7 +939,7 @@ public: UnoControlComboBoxModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlComboBoxModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlComboBoxModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -1073,7 +1073,7 @@ public: UnoControlDateFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlDateFieldModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlDateFieldModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -1152,7 +1152,7 @@ public: UnoControlTimeFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlTimeFieldModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlTimeFieldModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -1229,7 +1229,7 @@ public: UnoControlNumericFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlNumericFieldModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlNumericFieldModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -1308,7 +1308,7 @@ public: UnoControlCurrencyFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlCurrencyFieldModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlCurrencyFieldModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -1387,7 +1387,7 @@ public: UnoControlPatternFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlPatternFieldModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlPatternFieldModel( *this ); } // css::io::XPersistObject OUString SAL_CALL getServiceName() override; @@ -1450,7 +1450,7 @@ public: UnoControlProgressBarModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlProgressBarModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlProgressBarModel( *this ); } // css::beans::XMultiPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; @@ -1509,7 +1509,7 @@ public: UnoControlFixedLineModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const override { return new UnoControlFixedLineModel( *this ); } + rtl::Reference<UnoControlModel> Clone() const override { return new UnoControlFixedLineModel( *this ); } // css::beans::XMultiPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; |