diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-18 10:51:50 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-18 17:02:40 +0100 |
commit | 73eca35b0a8e01a7be2ce1775d1937154b5efb9e (patch) | |
tree | f0a3cf3ccdf3283b06ac068d464acde29a31257d /svtools | |
parent | 42fc427d047a263185d89528953f980019ef815f (diff) |
Unify ctor functions for component implementations.
There is no need to use different styles for writing the same thing.
It also makes it easier in future to use search & replace.
But of course, there are also some more complicated functions.
Change-Id: I773da20378af0e0d5a27689d3903df7063fb8ac0
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/graphic/provider.cxx | 10 | ||||
-rw-r--r-- | svtools/source/graphic/renderer.cxx | 10 | ||||
-rw-r--r-- | svtools/source/hatchwindow/hatchwindowfactory.cxx | 10 | ||||
-rw-r--r-- | svtools/source/inc/renderer.hxx | 6 |
4 files changed, 17 insertions, 19 deletions
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 00250e838eda..b2ea034b8fd6 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -38,6 +38,7 @@ #include "descriptor.hxx" #include "graphic.hxx" +#include <rtl/ref.hxx> #include <svtools/grfmgr.hxx> #include "provider.hxx" #include <vcl/dibtools.hxx> @@ -857,13 +858,12 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_graphic_GraphicProvider_get_implementation( - SAL_UNUSED_PARAMETER css::uno::XComponentContext *, - css::uno::Sequence<css::uno::Any> const &) + css::uno::XComponentContext *, + css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new GraphicProvider)); + rtl::Reference<GraphicProvider> x(new GraphicProvider); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 2b3fc31e52ee..0621e570a467 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -26,6 +26,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/supportsservice.hxx> +#include <rtl/ref.hxx> #include <svl/itemprop.hxx> #include <svtools/grfmgr.hxx> #include <comphelper/servicehelper.hxx> @@ -293,13 +294,12 @@ void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphi extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_graphic_GraphicRendererVCL_get_implementation( - SAL_UNUSED_PARAMETER css::uno::XComponentContext *, - css::uno::Sequence<css::uno::Any> const &) + css::uno::XComponentContext *, + css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new GraphicRendererVCL)); + rtl::Reference<GraphicRendererVCL> x(new GraphicRendererVCL); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 17c05840dafa..afa3f3322533 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> +#include <rtl/ref.hxx> #include <vcl/svapp.hxx> #include <hatchwindow.hxx> @@ -85,13 +86,12 @@ uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_embed_HatchWindowFactory_get_implementation( - SAL_UNUSED_PARAMETER css::uno::XComponentContext *, - css::uno::Sequence<css::uno::Any> const &) + css::uno::XComponentContext *, + css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new OHatchWindowFactory)); + rtl::Reference<OHatchWindowFactory> x(new OHatchWindowFactory); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx index a69bac71f7e5..397ba033525e 100644 --- a/svtools/source/inc/renderer.hxx +++ b/svtools/source/inc/renderer.hxx @@ -37,15 +37,13 @@ class GraphicRendererVCL : public ::cppu::OWeakAggObject, public ::comphelper::PropertySetHelper, public ::com::sun::star::graphic::XGraphicRenderer { + static ::comphelper::PropertySetInfo* createPropertySetInfo(); + public: GraphicRendererVCL(); ~GraphicRendererVCL() throw(); -protected: - - static ::comphelper::PropertySetInfo* createPropertySetInfo(); - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); |