diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-18 10:40:22 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-18 05:24:46 +0000 |
| commit | cb20f46895f0ec759f2bea95e499c6902deb60ca (patch) | |
| tree | e7790f7df9436a29ba8309d0ad99d518fb34d9ad /filter | |
| parent | 3b14cdf7386f41395d1b089c3b9dde7d4429cf38 (diff) | |
vcl: change Font::SetName() to Font::SetFamilyName()
Change-Id: I9b7bd1ec25955981ebcb9085579cbb9fbaa802d5
Reviewed-on: https://gerrit.libreoffice.org/21560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 | ||||
| -rw-r--r-- | filter/source/svg/svgfontexport.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 9ec66e92268c..984f234991c7 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2292,7 +2292,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) OUString aStr( str, strlen(str), osl_getThreadTextEncoding() ); if ( aStr.compareToIgnoreAsciiCase( "Helv" ) == 0 ) aStr = "Helvetica"; - pF->aFont.SetName( aStr ); + pF->aFont.SetFamilyName( aStr ); break; } } diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 00d5392ab385..e7bbf7125b71 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1571,7 +1571,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode) pPict->Read( &sFName, nLen ); sFName[ nLen ] = 0; OUString aString( sFName, strlen(sFName), osl_getThreadTextEncoding() ); - aActFont.SetName( aString ); + aActFont.SetFamilyName( aString ); eActMethod=PDM_UNDEFINED; break; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c34f8dc42968..971b5717b52e 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2150,7 +2150,7 @@ bool SdrPowerPointImport::ReadFontCollection() vcl::Font aFont; aFont.SetCharSet( pFont->eCharSet ); - aFont.SetName( pFont->aName ); + aFont.SetFamilyName( pFont->aName ); aFont.SetFamily( pFont->eFamily ); aFont.SetPitch( pFont->ePitch ); aFont.SetHeight( 100 ); @@ -3631,7 +3631,7 @@ void PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx { vcl::Font aFont; aFont.SetCharSet( pFontEnityAtom->eCharSet ); - aFont.SetName( pFontEnityAtom->aName ); + aFont.SetFamilyName( pFontEnityAtom->aName ); aFont.SetFamily( pFontEnityAtom->eFamily ); aFont.SetPitch( pFontEnityAtom->ePitch ); rNumberFormat.SetBulletFont( &aFont ); @@ -3690,7 +3690,7 @@ bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx { vcl::Font aFont; aFont.SetCharSet( pFontEnityAtom->eCharSet ); - aFont.SetName( pFontEnityAtom->aName ); + aFont.SetFamilyName( pFontEnityAtom->aName ); aFont.SetFamily( pFontEnityAtom->eFamily ); aFont.SetPitch( pFontEnityAtom->ePitch ); rNumberFormat.SetBulletFont( &aFont ); @@ -3710,7 +3710,7 @@ void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager, if ( pAtom ) { rtl_TextEncoding eCharSet( pAtom->eCharSet ); - aFont.SetName( pAtom->aName ); + aFont.SetFamilyName( pAtom->aName ); aFont.SetCharSet( eCharSet ); aFont.SetFamily( pAtom->eFamily ); aFont.SetPitch( pAtom->ePitch ); diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 823f0e9bf6e5..16aa15751712 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -314,7 +314,7 @@ void SVGFontExport::EmbedFonts() { vcl::Font aFont; - aFont.SetName( (*aGlyphTreeIter).first ); + aFont.SetFamilyName( (*aGlyphTreeIter).first ); aFont.SetWeight( (*aFontWeightIter).first ); aFont.SetItalic( (*aFontItalicIter).first ); |