summaryrefslogtreecommitdiff
path: root/vcl/source/fontsubset
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-08 16:29:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-08 16:29:41 +0200
commitf6ec07a3963a401dc736baa9bdd2ed3c7325bb66 (patch)
tree9cad620eb2cd5846464cf151b10949a8e36e5200 /vcl/source/fontsubset
parent9f356d3e66127bf14fe957962e8451dbd27c8ac8 (diff)
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I07bf1403e6b992807541a499b786d47f835b2f81
Diffstat (limited to 'vcl/source/fontsubset')
-rw-r--r--vcl/source/fontsubset/gsub.cxx2
-rw-r--r--vcl/source/fontsubset/ttcr.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 77706e065583..a716ad719626 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -307,7 +307,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
if( !aSubstVector.empty() )
{
GlyphSubstitution* pGSubstitution = new GlyphSubstitution;
- pTTFile->pGSubstitution = (void*)pGSubstitution;
+ pTTFile->pGSubstitution = static_cast<void*>(pGSubstitution);
for( subst_it = aSubstVector.begin(); subst_it != aSubstVector.end(); ++subst_it )
(*pGSubstitution)[ (*subst_it).first ] = (*subst_it).second;
}
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 6f467b0a0d6e..db3367d6a905 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -925,7 +925,7 @@ TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision,
PutUInt16(fontDirectionHint, ptr, 48, 1);
PutUInt16(0, ptr, 52, 1); /* glyph data format: 0 */
- table->data = (void *) ptr;
+ table->data = static_cast<void *>(ptr);
table->tag = T_head;
table->rawdata = 0;
@@ -954,7 +954,7 @@ TrueTypeTable *TrueTypeTableNew_hhea(sal_Int16 ascender,
PutUInt16(0, ptr, 30, 1); /* reserved 5 */
PutUInt16(0, ptr, 32, 1); /* metricDataFormat */
- table->data = (void *) ptr;
+ table->data = static_cast<void *>(ptr);
table->tag = T_hhea;
table->rawdata = 0;
@@ -997,7 +997,7 @@ TrueTypeTable *TrueTypeTableNew_glyf()
assert(l != 0);
- listSetElementDtor(l, (list_destructor)FreeGlyphData);
+ listSetElementDtor(l, FreeGlyphData);
table->data = l;
table->rawdata = 0;
@@ -1054,7 +1054,7 @@ TrueTypeTable *TrueTypeTableNew_name(int n, NameRecord *nr)
assert(l != 0);
- listSetElementDtor(l, (list_destructor)DisposeNameRecord);
+ listSetElementDtor(l, DisposeNameRecord);
if (n != 0) {
int i;