diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-21 12:16:45 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-22 09:04:57 +0000 |
commit | a60cc5d62a71fd96630739abd3aefaf145e955fd (patch) | |
tree | b169bd4b494dc30b365dd067b1771ab4fbdc087b /canvas/source/directx/dx_canvasfont.hxx | |
parent | ed9d6ef1e647b574f58ba870d71a4291d958c0ad (diff) |
com::sun::star->css in canvas
Change-Id: I23c3f774834bb7e84e2f02fe05fa9d844adadc9d
Reviewed-on: https://gerrit.libreoffice.org/17259
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'canvas/source/directx/dx_canvasfont.hxx')
-rw-r--r-- | canvas/source/directx/dx_canvasfont.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index 3d4165049d77..d6a788046f89 100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx @@ -43,8 +43,8 @@ namespace dxcanvas typedef ::boost::shared_ptr< Gdiplus::Font > FontSharedPtr; typedef ::boost::shared_ptr< Gdiplus::FontFamily > FontFamilySharedPtr; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCanvasFont, - ::com::sun::star::lang::XServiceInfo > CanvasFont_Base; + typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont, + css::lang::XServiceInfo > CanvasFont_Base; class CanvasFont : public ::comphelper::OBaseMutex, public CanvasFont_Base, @@ -53,36 +53,36 @@ namespace dxcanvas public: 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, - const ::com::sun::star::geometry::Matrix2D& fontMatrix ); + CanvasFont( const css::rendering::FontRequest& fontRequest, + const css::uno::Sequence< css::beans::PropertyValue >& extraFontProperties, + const css::geometry::Matrix2D& fontMatrix ); /// Dispose all internal references virtual void SAL_CALL disposing(); // XCanvasFont - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException); + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException); + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); double getCellAscent() const; double getEmHeight() const; FontSharedPtr getFont() const; - const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const; + const css::geometry::Matrix2D& getFontMatrix() const; private: GDIPlusUserSharedPtr mpGdiPlusUser; FontFamilySharedPtr mpFontFamily; FontSharedPtr mpFont; - ::com::sun::star::rendering::FontRequest maFontRequest; - ::com::sun::star::geometry::Matrix2D maFontMatrix; + css::rendering::FontRequest maFontRequest; + css::geometry::Matrix2D maFontMatrix; }; } |