summaryrefslogtreecommitdiff
path: root/canvas/source/cairo/cairo_canvas.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/cairo/cairo_canvas.cxx')
-rw-r--r--canvas/source/cairo/cairo_canvas.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index f8266cffe446..100ee51c0aa2 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <osl/mutex.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/skia/SkiaHelper.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -68,7 +68,6 @@ namespace cairocanvas
sal_Int64 nPtr = 0;
maArguments[0] >>= nPtr;
OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
-
ENSURE_ARG_OR_THROW( pOutDev != nullptr,
"Canvas::initialize: invalid OutDev pointer" );
@@ -111,7 +110,7 @@ namespace cairocanvas
OUString SAL_CALL Canvas::getServiceName( )
{
- return "com.sun.star.rendering.Canvas.Cairo";
+ return u"com.sun.star.rendering.Canvas.Cairo"_ustr;
}
// XServiceInfo
@@ -122,7 +121,7 @@ namespace cairocanvas
}
OUString Canvas::getImplementationName()
{
- return "com.sun.star.comp.rendering.Canvas.Cairo";
+ return u"com.sun.star.comp.rendering.Canvas.Cairo"_ustr;
}
css::uno::Sequence< OUString > Canvas::getSupportedServiceNames()
{
@@ -176,16 +175,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_rendering_Canvas_Cairo_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& args)
{
- auto p = new cairocanvas::Canvas(args, context);
- p->acquire();
+ rtl::Reference<cairocanvas::Canvas> p = new cairocanvas::Canvas(args, context);
try {
p->initialize();
} catch (css::uno::Exception&) {
p->dispose();
- p->release();
throw;
}
- return static_cast<cppu::OWeakObject*>(p);
+ return cppu::acquire(p.get());
}