Some more modules at least building with mingw64

Change-Id: I3ea039655aecb7885bb310b1f2c29d66f9f7bb4f

3 files changed, 6 insertions, 6 deletions

diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index da1321a39ee7..a0b7cba91551 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -268,7 +268,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs  )
     for ( i = 0; i < aMetricArr.Count(); ++i )
     {
         String sMetric = aMetricArr.GetStringByPos( i );
-        long nFieldUnit = aMetricArr.GetValue( i );
+        sal_IntPtr nFieldUnit = aMetricArr.GetValue( i );
         sal_uInt16 nPos = m_pLbMetric->InsertEntry( sMetric );
         m_pLbMetric->SetEntryData( nPos, (void*)nFieldUnit );
     }
@@ -421,7 +421,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
     const sal_uInt16 nMPos = m_pLbMetric->GetSelectEntryPos();
     if ( nMPos != m_pLbMetric->GetSavedValue() )
     {
-        sal_uInt16 nFieldUnit = (sal_uInt16)(long)m_pLbMetric->GetEntryData( nMPos );
+        sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbMetric->GetEntryData( nMPos );
         rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ),
                                      (sal_uInt16)nFieldUnit ) );
         bModified |= sal_True;
@@ -490,7 +490,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
 
         for ( sal_uInt16 i = 0; i < m_pLbMetric->GetEntryCount(); ++i )
         {
-            if ( (long)m_pLbMetric->GetEntryData( i ) == nFieldUnit )
+            if ( (sal_IntPtr)m_pLbMetric->GetEntryData( i ) == nFieldUnit )
             {
                 m_pLbMetric->SelectEntryPos( i );
                 break;
@@ -545,7 +545,7 @@ IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl)
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        FieldUnit eUnit = (FieldUnit)(long)m_pLbMetric->GetEntryData( nPos );
+        FieldUnit eUnit = (FieldUnit)(sal_IntPtr)m_pLbMetric->GetEntryData( nPos );
         sal_Int64 nVal =
             m_pMtrFldTabstop->Denormalize( m_pMtrFldTabstop->GetValue( FUNIT_TWIP ) );
         SetFieldUnit( *m_pMtrFldTabstop, eUnit );
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index e3f34b12c4ce..a495bed4119d 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -530,7 +530,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
                              std::max( aOutOrg.Y() + aOutSize.Height() - aGrfSize.Height() - aOffset.Height(), aOutOrg.Y() ) );
 
         if( maLogo.IsAnimated() )
-            maLogo.StartAnimation( this, aGrfPos, aGrfSize, (long) this );
+            maLogo.StartAnimation( this, aGrfPos, aGrfSize, (sal_IntPtr) this );
         else
             maLogo.Draw( this, aGrfPos, aGrfSize );
     }
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
index a8d9caf50b61..6becbce4f862 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
@@ -80,7 +80,7 @@ private:
 
     struct DrawDocHash {
         size_t operator()(SdDrawDocument* argument) const
-        { return reinterpret_cast<unsigned long>(argument); }
+        { return reinterpret_cast<sal_uIntPtr>(argument); }
     };
     typedef ::boost::unordered_map<SdDrawDocument*,
                             MasterPageObserver::MasterPageNameSet,