diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-04 04:25:16 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-04 05:16:08 +1100 |
commit | 7eab7f3485e525635f06a505776618c30e442a26 (patch) | |
tree | b02a328084b90e43306589ccf73dddbb757277be /include | |
parent | 6aa4496c789fec271dcdc7995cf62ef2dabf1f96 (diff) |
Cleanup after removing vcl::FontInfo class
Change-Id: I544eac439cb7277e47a23a90c6fbc45496161c3b
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/ctrlbox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ctrltool.hxx | 12 | ||||
-rw-r--r-- | include/svtools/stdmenu.hxx | 2 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 0be5c42bc731..cf38dc3eae75 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -462,7 +462,7 @@ public: void Reformat() override; void Modify() override; - void Fill( const FontMetric* pInfo, const FontList* pList ); + void Fill( const FontMetric* pFontMetric, const FontList* pList ); void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, sal_uInt16 nStep = 5 ); diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 3c5449fb9370..993287f7b401 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -73,14 +73,14 @@ With sal_False vectorized and scalable fonts will be queried. -------------------------------------------------------------------------- -String FontList::GetStyleName( const FontMetric& rInfo ) const; +String FontList::GetStyleName( const FontMetric& rFontMetric ) const; This method returns the StyleName of a FontMetric. If no StyleName is set, a name will be generated from the set attributes. -------------------------------------------------------------------------- -OUString FontList::GetFontMapText( const FontMetric& rInfo ) const; +OUString FontList::GetFontMapText( const FontMetric& rFontMetric ) const; This method returns a Matchstring which indicates the problem that could arise when using a font. This string should be displayed to the user. @@ -116,7 +116,7 @@ FontList::GetStyleName() -------------------------------------------------------------------------- -const sal_IntPtr* FontList::GetSizeAry( const FontMetric& rInfo ) const; +const sal_IntPtr* FontList::GetSizeAry( const FontMetric& rFontMetric ) const; This method returns the available sizes for the given font. If it is a scalable font, standard sizes are returned. @@ -166,14 +166,14 @@ public: FontList* Clone() const; - OUString GetFontMapText( const FontMetric& rInfo ) const; + OUString GetFontMapText( const FontMetric& rFontMetric ) const; const OUString& GetNormalStr() const { return maNormal; } const OUString& GetItalicStr() const { return maNormalItalic; } const OUString& GetBoldStr() const { return maBold; } const OUString& GetBoldItalicStr() const { return maBoldItalic; } const OUString& GetStyleName( FontWeight eWeight, FontItalic eItalic ) const; - OUString GetStyleName( const FontMetric& rInfo ) const; + OUString GetStyleName( const FontMetric& rFontMetric ) const; FontMetric Get( const OUString& rName, const OUString& rStyleName ) const; @@ -191,7 +191,7 @@ public: static sal_Handle GetNextFontMetric( sal_Handle hFontMetric ); static const FontMetric& GetFontMetric( sal_Handle hFontMetric ); - const sal_IntPtr* GetSizeAry( const FontMetric& rInfo ) const; + const sal_IntPtr* GetSizeAry( const FontMetric& rFontMetric ) const; static const sal_IntPtr* GetStdSizeAry() { return aStdSizeAry; } private: diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index 299d2e2c3bd6..993ff955c06b 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -132,7 +132,7 @@ public: virtual void Select() override; virtual void Highlight() override; - void Fill( const FontMetric& rInfo, const FontList* pList ); + void Fill( const FontMetric& rFontMetric, const FontList* pList ); void SetCurHeight( long nHeight ); long GetCurHeight() const { return mnCurHeight; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index cf0b62179fb3..043852373df8 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1249,7 +1249,7 @@ private: public: - FontMetric GetDevFont( int nDevFontIndex ) const; + FontMetric GetDevFont( int nDevFontIndex ) const; int GetDevFontCount() const; bool IsFontAvailable( const OUString& rFontName ) const; |