diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-18 10:20:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-18 11:26:32 +0200 |
| commit | 0b978f24c7d2fcbd0e777ec26b1cb7492845a30c (patch) | |
| tree | ca59a2beb7381f38d850efe36818c13d4e0e364b /canvas/source/vcl | |
| parent | f512114970d42acce9a403ef68a1fd0cd35512ff (diff) | |
rtl::Reference fits just fine here
Change-Id: I268f6d2577b727c6aa072ee766b3f5f41bdb131b
Diffstat (limited to 'canvas/source/vcl')
| -rw-r--r-- | canvas/source/vcl/canvasfont.hxx | 6 | ||||
| -rw-r--r-- | canvas/source/vcl/textlayout.cxx | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index cb84b91af955..6285e93efe28 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX #define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX -#include <comphelper/implementationreference.hxx> - #include <cppuhelper/compbase2.hxx> #include <comphelper/broadcasthelper.hxx> @@ -53,9 +51,7 @@ namespace vclcanvas private ::boost::noncopyable { public: - typedef ::comphelper::ImplementationReference< - CanvasFont, - ::com::sun::star::rendering::XCanvasFont > Reference; + typedef rtl::Reference<CanvasFont> Reference; CanvasFont( const ::com::sun::star::rendering::FontRequest& fontRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 9b0f89853f23..6cbb3d58df37 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -97,7 +97,7 @@ namespace vclcanvas mpOutDevProvider.reset(); mxDevice.clear(); - mpFont.reset(); + mpFont.clear(); } // XTextLayout @@ -364,7 +364,7 @@ namespace vclcanvas { SolarMutexGuard aGuard; - return mpFont.getRef(); + return mpFont.get(); } rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) |