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/opengl | |
| parent | f512114970d42acce9a403ef68a1fd0cd35512ff (diff) | |
rtl::Reference fits just fine here
Change-Id: I268f6d2577b727c6aa072ee766b3f5f41bdb131b
Diffstat (limited to 'canvas/source/opengl')
| -rw-r--r-- | canvas/source/opengl/ogl_canvasfont.hxx | 6 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_textlayout.cxx | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 7eef59bdbbf6..8946413ba631 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -10,8 +10,6 @@ #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX -#include <comphelper/implementationreference.hxx> - #include <cppuhelper/compbase1.hxx> #include <comphelper/broadcasthelper.hxx> @@ -37,9 +35,7 @@ namespace oglcanvas private ::boost::noncopyable { public: - typedef ::comphelper::ImplementationReference< - CanvasFont, - ::com::sun::star::rendering::XCanvasFont > ImplRef; + typedef rtl::Reference<CanvasFont> ImplRef; 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/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index a155c2c775f7..88e7ebdf37f4 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -35,7 +35,7 @@ namespace oglcanvas void SAL_CALL TextLayout::disposing() { - mpFont.reset(); + mpFont.clear(); } // XTextLayout @@ -190,7 +190,7 @@ namespace oglcanvas { ::osl::MutexGuard aGuard( m_aMutex ); - return mpFont.getRef(); + return mpFont.get(); } rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) |