diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /include/toolkit | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxfont.hxx | 6 | ||||
| -rw-r--r-- | include/toolkit/awt/vclxgraphics.hxx | 4 | ||||
| -rw-r--r-- | include/toolkit/helper/vclunohelper.hxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index fda8de9e2de1..90516dfe17dc 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -41,7 +41,7 @@ class TOOLKIT_DLLPUBLIC VCLXFont : public ::com::sun::star::awt::XFont2, private: ::osl::Mutex maMutex; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; - Font maFont; + vcl::Font maFont; FontMetric* mpFontMetric; protected: @@ -52,8 +52,8 @@ public: VCLXFont(); virtual ~VCLXFont(); - void Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont ); - const Font& GetFont() const { return maFont; } + void Init( ::com::sun::star::awt::XDevice& rxDev, const vcl::Font& rFont ); + const vcl::Font& GetFont() const { return maFont; } // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index a9e302023c61..77c31790c51c 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -57,7 +57,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; OutputDevice* mpOutputDevice; - Font maFont; + vcl::Font maFont; Color maTextColor; Color maTextFillColor; Color maLineColor; @@ -77,7 +77,7 @@ public: void SetOutputDevice( OutputDevice* pOutDev ); OutputDevice* GetOutputDevice() const { return mpOutputDevice; } - const Font& GetFont() const { return maFont; } + const vcl::Font& GetFont() const { return maFont; } // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index d4a96e9d4062..42e7856842d7 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -98,9 +98,9 @@ public: @param rFont Font to be converted @return the new FontDescriptor */ - static ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& rFont ); - static Font CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont ); - static Font CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ); + static ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const vcl::Font& rFont ); + static vcl::Font CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const vcl::Font& rInitFont ); + static vcl::Font CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ); static ::com::sun::star::awt::SimpleFontMetric CreateFontMetric( const FontMetric& rFontMetric ); static float ConvertFontWidth( FontWidth eWidth ); static FontWidth ConvertFontWidth( float f ); |