diff options
Diffstat (limited to 'canvas/source/vcl/canvasfont.hxx')
| -rw-r--r-- | canvas/source/vcl/canvasfont.hxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index f9cd2d6d29f3..3e64d3d9f60d 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX +#pragma once -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/geometry/Matrix2D.hpp> @@ -40,11 +38,10 @@ namespace vclcanvas { - typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont, + typedef ::comphelper::WeakComponentImplHelper< css::rendering::XCanvasFont, css::lang::XServiceInfo > CanvasFont_Base; - class CanvasFont : public ::cppu::BaseMutex, - public CanvasFont_Base + class CanvasFont : public CanvasFont_Base { public: typedef rtl::Reference<CanvasFont> Reference; @@ -60,7 +57,7 @@ namespace vclcanvas const OutDevProviderSharedPtr& rOutDevProvider ); /// Dispose all internal references - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>& rGuard) override; // XCanvasFont virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; @@ -76,15 +73,16 @@ namespace vclcanvas vcl::Font const & getVCLFont() const; + const css::geometry::Matrix2D& getFontMatrix() const; + private: ::canvas::vcltools::VCLObject<vcl::Font> maFont; css::rendering::FontRequest maFontRequest; css::uno::Reference< css::rendering::XGraphicDevice> mpRefDevice; OutDevProviderSharedPtr mpOutDevProvider; + css::geometry::Matrix2D maFontMatrix; }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |