diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 15:50:51 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 15:52:05 +0200 |
| commit | 35a65baefe99181685aea8e630d27c5e2a7c6bc4 (patch) | |
| tree | c856875ba27b7fa1305c47ed3c6c736948395158 /svtools | |
| parent | 47cc957c36eceb4ae035006137223b5afb652696 (diff) | |
Slowly, but surely going on compiling for mingw64
Change-Id: I590aa6a854a040281bf73d5be768c05d4906a984
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 0dc2350fad82..8d7b8fa3f4a9 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -484,7 +484,7 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - return (long)(CloneEntry((SvTreeListEntry*)pEntry)); + return (sal_IntPtr)(CloneEntry((SvTreeListEntry*)pEntry)); } IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry ) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 37cf88741fac..556840f36085 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1849,7 +1849,7 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) for( sal_uLong i = 0; i < nCount; i++ ) { String aSizeName = aFontSizeNames.GetIndexName( i ); - long nSize = aFontSizeNames.GetIndexSize( i ); + sal_IntPtr nSize = aFontSizeNames.GetIndexSize( i ); ComboBox::InsertEntry( aSizeName, nPos ); ComboBox::SetEntryData( nPos, (void*)(-nSize) ); // mark as special nPos++; @@ -2020,7 +2020,7 @@ sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const { if ( !bRelative ) { - sal_Int64 nComboVal = static_cast<sal_Int64>(reinterpret_cast<long>(ComboBox::GetEntryData( nPos ))); + sal_Int64 nComboVal = static_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(ComboBox::GetEntryData( nPos ))); if ( nComboVal < 0 ) // marked as special? { return MetricField::ConvertValue( -nComboVal, mnBaseValue, GetDecimalDigits(), |