diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-08 12:07:48 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-18 11:51:52 +0200 |
| commit | c2e6a068c112f4c5866b6371d02362bd71f903a3 (patch) | |
| tree | fcfdccb4ded2c743a39ed466d825326743d2f165 /toolkit | |
| parent | 9c289cfde6891eebac46270774ac5c16af093622 (diff) | |
vcl: create FontMetric from PhysicalFontFace
A FontMetric can be created from a PhysicalFontFace, so setup a
constructor that takes a PhysicalFontFace object to instantiate the
FontMetric.
The OutputDevice functions GetDevFont() and GetDevFontCount() don't
necessarily make much sense, so have changed GetDevFont() to
GetFontMetricFromCollection() and GetDevFontCount() to
GetFontFaceCollectionCount().
Change-Id: I1577679b949a49a7cf1248838786d0f5e84a5245
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121796
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxdevice.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index d82e1a6ec905..72b0618d5a2a 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -98,13 +98,13 @@ css::uno::Sequence< css::awt::FontDescriptor > VCLXDevice::getFontDescriptors( css::uno::Sequence< css::awt::FontDescriptor> aFonts; if( mpOutputDevice ) { - int nFonts = mpOutputDevice->GetDevFontCount(); + int nFonts = mpOutputDevice->GetFontFaceCollectionCount(); if ( nFonts ) { aFonts = css::uno::Sequence< css::awt::FontDescriptor>( nFonts ); css::awt::FontDescriptor* pFonts = aFonts.getArray(); for ( int n = 0; n < nFonts; n++ ) - pFonts[n] = VCLUnoHelper::CreateFontDescriptor( mpOutputDevice->GetDevFont( n ) ); + pFonts[n] = VCLUnoHelper::CreateFontDescriptor( mpOutputDevice->GetFontMetricFromCollection( n ) ); } } return aFonts; |