summaryrefslogtreecommitdiff
path: root/vcl/ios
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-06-19 06:24:37 -0500
committerMiklos Vajna <vmiklos@suse.cz>2012-06-20 11:00:22 +0200
commit2bbebea59de3e2e22817ed4fbe0ce7b7df7c0342 (patch)
tree9f8271e3b701c2161cee29d1418d26b7b235a6c6 /vcl/ios
parentbb6fec1bd39be9f6d660623abd2b25400a34b9ac (diff)
Rename the class ImplFontData into PhysicalFontFace
Change-Id: I402481e7c6ea605c8ccfdf6cb08166859b37e8de
Diffstat (limited to 'vcl/ios')
-rw-r--r--vcl/ios/source/gdi/salcoretextfontutils.cxx4
-rw-r--r--vcl/ios/source/gdi/salgdi.cxx10
-rw-r--r--vcl/ios/source/gdi/salgdicommon.cxx2
3 files changed, 8 insertions, 8 deletions
diff --git a/vcl/ios/source/gdi/salcoretextfontutils.cxx b/vcl/ios/source/gdi/salcoretextfontutils.cxx
index 2d88c8d1f017..5f6c23d34f36 100644
--- a/vcl/ios/source/gdi/salcoretextfontutils.cxx
+++ b/vcl/ios/source/gdi/salcoretextfontutils.cxx
@@ -257,7 +257,7 @@ void SystemFontList::AnnounceFonts( ImplDevFontList& rFontList ) const
}
ImplCoreTextFontData::ImplCoreTextFontData( const ImplDevFontAttributes& rDFA, CTFontRef font )
-: ImplFontData( rDFA, 0 )
+: PhysicalFontFace( rDFA, 0 )
, m_CTFontRef((CTFontRef)CFRetain(font))
, m_pCharMap( NULL )
, m_bHasOs2Table( false )
@@ -280,7 +280,7 @@ ImplCoreTextFontData::~ImplCoreTextFontData()
}
}
-ImplFontData* ImplCoreTextFontData::Clone() const
+PhysicalFontFace* ImplCoreTextFontData::Clone() const
{
ImplCoreTextFontData* pClone = new ImplCoreTextFontData(*this);
if ( m_pCharMap )
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index 32cc9fbbf89f..252508677448 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -100,7 +100,7 @@ void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
{
pSalData->mpFontList = new SystemFontList();
}
- // Copy all ImplFontData objects contained in the SystemFontList
+ // Copy all PhysicalFontFace objects contained in the SystemFontList
pSalData->mpFontList->AnnounceFonts( *pFontList );
}
@@ -109,7 +109,7 @@ void IosSalGraphics::GetDevFontSubstList( OutputDevice* )
// nothing to do since there are no device-specific fonts on Ios
}
-const void* IosSalGraphics::GetEmbedFontData( const ImplFontData*,
+const void* IosSalGraphics::GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* /*pUnicodes*/,
sal_Int32* /*pWidths*/,
FontSubsetInfo&,
@@ -118,7 +118,7 @@ const void* IosSalGraphics::GetEmbedFontData( const ImplFontData*,
return NULL;
}
-const Ucs2SIntMap* IosSalGraphics::GetFontEncodingVector(const ImplFontData*,
+const Ucs2SIntMap* IosSalGraphics::GetFontEncodingVector(const PhysicalFontFace*,
const Ucs2OStrMap** /*ppNonEncoded*/ )
{
return NULL;
@@ -159,7 +159,7 @@ sal_Bool IosSalGraphics::GetGlyphOutline( sal_GlyphId /*nGlyphId*/, basegfx::B2D
return false;
}
-void IosSalGraphics::GetGlyphWidths( const ImplFontData* /*pFontData*/, bool /*bVertical*/,
+void IosSalGraphics::GetGlyphWidths( const PhysicalFontFace* /*pFontData*/, bool /*bVertical*/,
Int32Vector& /*rGlyphWidths*/, Ucs2UIntMap& /*rUnicodeEnc*/ )
{
}
@@ -187,7 +187,7 @@ const ImplFontCharMap* IosSalGraphics::GetImplFontCharMap() const
return m_pCoreTextFontData->GetImplFontCharMap();
}
-bool IosSalGraphics::GetRawFontData( const ImplFontData* pFontData,
+bool IosSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData,
std::vector<unsigned char>& rBuffer, bool* pJustCFF )
{
const ImplCoreTextFontData* font_data = static_cast<const ImplCoreTextFontData*>(pFontData);
diff --git a/vcl/ios/source/gdi/salgdicommon.cxx b/vcl/ios/source/gdi/salgdicommon.cxx
index 9ceefb2d606b..0d5e85599a6d 100644
--- a/vcl/ios/source/gdi/salgdicommon.cxx
+++ b/vcl/ios/source/gdi/salgdicommon.cxx
@@ -144,7 +144,7 @@ static void AddPolyPolygonToPath( CGMutablePathRef xPath,
}
sal_Bool IosSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFontData,
+ const PhysicalFontFace* pFontData,
long* pGlyphIDs, sal_uInt8* pEncoding,
sal_Int32* pGlyphWidths, int nGlyphCount,
FontSubsetInfo& rInfo )