diff options
Diffstat (limited to 'toolkit/inc')
-rw-r--r-- | toolkit/inc/controls/geometrycontrolmodel_impl.hxx | 25 | ||||
-rw-r--r-- | toolkit/inc/helper/tkresmgr.hxx | 3 |
2 files changed, 12 insertions, 16 deletions
diff --git a/toolkit/inc/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx index f19e84327c22..37a3983f6888 100644 --- a/toolkit/inc/controls/geometrycontrolmodel_impl.hxx +++ b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx @@ -19,33 +19,32 @@ // no include protection. This is included from within geometrycontrolmodel.hxx only - //= OGeometryControlModel - template <class CONTROLMODEL> -OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ) - :OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) ) +OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( + const css::uno::Reference<css::uno::XComponentContext>& i_factory) + : OGeometryControlModel_Base(new CONTROLMODEL(i_factory)) { } - template <class CONTROLMODEL> -OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) - :OGeometryControlModel_Base(_rxAggregateInstance) +OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( + css::uno::Reference<css::util::XCloneable>& _rxAggregateInstance) + : OGeometryControlModel_Base(_rxAggregateInstance) { } - template <class CONTROLMODEL> ::cppu::IPropertyArrayHelper& SAL_CALL OGeometryControlModel<CONTROLMODEL>::getInfoHelper() { return *this->getArrayHelper(); } - template <class CONTROLMODEL> -void OGeometryControlModel<CONTROLMODEL>::fillProperties(css::uno::Sequence< css::beans::Property >& _rProps, css::uno::Sequence< css::beans::Property >& _rAggregateProps) const +void OGeometryControlModel<CONTROLMODEL>::fillProperties( + css::uno::Sequence<css::beans::Property>& _rProps, + css::uno::Sequence<css::beans::Property>& _rAggregateProps) const { // our own properties OPropertyContainer::describeProperties(_rProps); @@ -54,17 +53,15 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(css::uno::Sequence< css _rAggregateProps = m_xAggregateSet->getPropertySetInfo()->getProperties(); } - template <class CONTROLMODEL> -css::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) +css::uno::Sequence<sal_Int8> SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } - template <class CONTROLMODEL> OGeometryControlModel_Base* OGeometryControlModel<CONTROLMODEL>::createClone_Impl( - css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) + css::uno::Reference<css::util::XCloneable>& _rxAggregateInstance) { return new OGeometryControlModel<CONTROLMODEL>(_rxAggregateInstance); } diff --git a/toolkit/inc/helper/tkresmgr.hxx b/toolkit/inc/helper/tkresmgr.hxx index 80ac107dd4fd..70cc4118c702 100644 --- a/toolkit/inc/helper/tkresmgr.hxx +++ b/toolkit/inc/helper/tkresmgr.hxx @@ -26,10 +26,9 @@ class Image; namespace TkResMgr { - Image getImageFromURL( const OUString& i_rImageURL ); +Image getImageFromURL(const OUString& i_rImageURL); }; - #endif // INCLUDED_TOOLKIT_INC_HELPER_TKRESMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |