summaryrefslogtreecommitdiffstats
path: root/padmin/source/fontentry.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-27 11:24:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-27 12:21:54 +0000
commit890219fa025eaa8037bd04d4539e93d3921207ef (patch)
treedbff1b8a7955a29b963038c0bf023a5137b0a20c /padmin/source/fontentry.cxx
parentDo potentially pointless assertions only if dbglevel > 1 (diff)
downloadcore-890219fa025eaa8037bd04d4539e93d3921207ef.tar.gz
core-890219fa025eaa8037bd04d4539e93d3921207ef.zip
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'padmin/source/fontentry.cxx')
-rw-r--r--padmin/source/fontentry.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index 43abfe3b2bac..3323360aa0e7 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -216,7 +216,7 @@ void FontNameDlg::init()
else
aEntry = fillFontEntry( aInfo, String( ByteString( aFile ), osl_getThreadTextEncoding() ), aFamilies[ aInfo.m_aFamilyName ] > 1 );
USHORT nEntry = m_aFontBox.InsertEntry( aEntry );
- m_aFontBox.SetEntryData( nEntry, (void*)(*font_it) );
+ m_aFontBox.SetEntryData( nEntry, (void*)(sal_IntPtr)(*font_it) );
}
}
}