diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 19:48:48 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 19:49:56 +0200 |
| commit | 9eb4e4dc51a4448d59ee80f39144387c7b3cffaf (patch) | |
| tree | ca154ba2b8c61f87e7d772a4ed58134f6d73375b /sc | |
| parent | 44c133ef996e32ebdfc9560bcf14b0cd77196a9e (diff) | |
Some more modules at least building with mingw64
Change-Id: I3ea039655aecb7885bb310b1f2c29d66f9f7bb4f
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/documen9.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 0177c783522d..50195aee77f4 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -223,7 +223,7 @@ bool ScDocument::IsChart( const SdrObject* pObject ) IMPL_LINK_INLINE_START( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) { - return (long) &((GetColorList()->GetColor(*pColorIndex))->GetColor()); + return (sal_IntPtr) &((GetColorList()->GetColor(*pColorIndex))->GetColor()); } IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index cb7b49c787ce..7f0130f847a8 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -424,7 +424,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, { // nur diese Metriken benutzen sal_uInt16 nPos = aUnitLB.InsertEntry( sMetric ); - aUnitLB.SetEntryData( nPos, (void*)(long)eFUnit ); + aUnitLB.SetEntryData( nPos, (void*)(sal_IntPtr)eFUnit ); } break; default: @@ -457,7 +457,7 @@ sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos(); if ( nMPos != aUnitLB.GetSavedValue() ) { - sal_uInt16 nFieldUnit = (sal_uInt16)(long)aUnitLB.GetEntryData( nMPos ); + sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)aUnitLB.GetEntryData( nMPos ); rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nFieldUnit ) ); bRet = sal_True; @@ -553,7 +553,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) for ( sal_uInt16 i = 0; i < aUnitLB.GetEntryCount(); ++i ) { - if ( (FieldUnit)(long)aUnitLB.GetEntryData( i ) == eFieldUnit ) + if ( (FieldUnit)(sal_IntPtr)aUnitLB.GetEntryData( i ) == eFieldUnit ) { aUnitLB.SelectEntryPos( i ); break; @@ -651,7 +651,7 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl) const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos(); if(nMPos != USHRT_MAX) { - FieldUnit eFieldUnit = (FieldUnit)(long)aUnitLB.GetEntryData( nMPos ); + FieldUnit eFieldUnit = (FieldUnit)(sal_IntPtr)aUnitLB.GetEntryData( nMPos ); sal_Int64 nVal = aTabMF.Denormalize( aTabMF.GetValue( FUNIT_TWIP ) ); ::SetFieldUnit( aTabMF, eFieldUnit ); |