Slowly, but surely going on compiling for mingw64

Change-Id: I590aa6a854a040281bf73d5be768c05d4906a984

4 files changed, 14 insertions, 14 deletions

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 24e8a08166f0..54ae41ab44bc 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -253,7 +253,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
 
     if ( aODFVersionLB->GetSelectEntryPos() != aODFVersionLB->GetSavedValue() )
     {
-        long nVersion = long( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
+        sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
         aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) );
     }
 
@@ -408,7 +408,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
             {
                 for(sal_uInt16 n = 0; n < aDocTypeLB->GetEntryCount(); n++)
                 {
-                    long nData = (long) aDocTypeLB->GetEntryData(n);
+                    sal_IntPtr nData = (sal_IntPtr) aDocTypeLB->GetEntryData(n);
                     OUString sCommand;
                     sCommand = "matchByDocumentService=%1:iflags=" +
                                OUString::number(SFX_FILTER_IMPORT|SFX_FILTER_EXPORT) +
@@ -489,7 +489,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
 
     aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
 
-    void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() );
+    void* pDefaultVersion = (void*)sal_IntPtr( aSaveOpt.GetODFDefaultVersion() );
     aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion ) );
 
     AutoClickHdl_Impl( aAutoSaveCB );
@@ -554,9 +554,9 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 {
     sal_uInt16 nCurPos = aDocTypeLB->GetSelectEntryPos();
 
-    long nData = -1;
+    sal_IntPtr nData = -1;
     if(nCurPos < APP_COUNT)
-        nData = (long) aDocTypeLB->GetEntryData(nCurPos);
+        nData = (sal_IntPtr) aDocTypeLB->GetEntryData(nCurPos);
 
     if ( nData >= 0 && nData < APP_COUNT )
     {
@@ -616,7 +616,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 
 IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
 {
-    long nVersion = long( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
+    sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
     bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST;
     if ( bShown )
     {
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2e11890298bb..5a97a91e012f 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -123,7 +123,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet )
         eLastDialogLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
 
     LanguageType nSelectLang = LANGUAGE_UNDETERMINED;
-    nPos = m_pLanguageLB->GetEntryPos( (void*)(long) eLastDialogLanguage );
+    nPos = m_pLanguageLB->GetEntryPos( (void*)(sal_IntPtr) eLastDialogLanguage );
     if (LISTBOX_ENTRY_NOTFOUND != nPos)
         nSelectLang = eLastDialogLanguage;
     m_pLanguageLB->SelectLanguage( nSelectLang );
@@ -162,7 +162,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
 {
     sal_uInt16 nPos = pBox->GetSelectEntryPos();
     void* pVoid = pBox->GetEntryData(nPos);
-    LanguageType eNewLang = (LanguageType)(long)pVoid;
+    LanguageType eNewLang = (LanguageType)(sal_IntPtr)pVoid;
     // save old settings and fill anew
     if(eNewLang != eLastDialogLanguage)
     {
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index e5f67e7bd794..9575041e4d15 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -321,7 +321,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs )
 
         for( sal_uInt16 i = 0; i < aLbUnit.GetEntryCount(); ++i )
         {
-            if ( (long)aLbUnit.GetEntryData( i ) == nFieldUnit )
+            if ( (sal_IntPtr)aLbUnit.GetEntryData( i ) == nFieldUnit )
             {
                 aLbUnit.SelectEntryPos( i );
                 break;
@@ -506,7 +506,7 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
     {
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
-            sal_uInt16 nFieldUnit = (sal_uInt16)(long)aLbUnit.GetEntryData( nPos );
+            sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)aLbUnit.GetEntryData( nPos );
             FieldUnit _eUnit = (FieldUnit) nFieldUnit;
             rAttrs.Put( SdrMeasureUnitItem( _eUnit ) );
             bModified = sal_True;
@@ -736,7 +736,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
         sal_uInt16 nPos = aLbUnit.GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
-            sal_uInt16 nFieldUnit = (sal_uInt16)(long)aLbUnit.GetEntryData( nPos );
+            sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)aLbUnit.GetEntryData( nPos );
             FieldUnit _eUnit = (FieldUnit) nFieldUnit;
             aAttrSet.Put( SdrMeasureUnitItem( _eUnit ) );
         }
@@ -806,7 +806,7 @@ void SvxMeasurePage::FillUnitLB()
     // fill ListBox with metrics
     SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) );
 
-    long nUnit = FUNIT_NONE;
+    sal_IntPtr nUnit = FUNIT_NONE;
     String aStrMetric( CUI_RES( STR_MEASURE_AUTOMATIC ) );
     sal_uInt16 nPos = aLbUnit.InsertEntry( aStrMetric );
     aLbUnit.SetEntryData( nPos, (void*)nUnit );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 1f69db81a509..bf3ba14c258d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1363,14 +1363,14 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     //one must be enabled
     if(!pActNum->IsFeatureSupported(NUM_ENABLE_LINKED_BMP))
     {
-        long nData = SVX_NUM_BITMAP|LINK_TOKEN;
+        sal_IntPtr nData = SVX_NUM_BITMAP|LINK_TOKEN;
         sal_uInt16 nPos = m_pFmtLB->GetEntryPos((void*)nData);
         if(LISTBOX_ENTRY_NOTFOUND != nPos)
             m_pFmtLB->RemoveEntry(nPos);
     }
     else if(!pActNum->IsFeatureSupported(NUM_ENABLE_EMBEDDED_BMP))
     {
-        long nData = SVX_NUM_BITMAP;
+        sal_IntPtr nData = SVX_NUM_BITMAP;
         sal_uInt16 nPos = m_pFmtLB->GetEntryPos((void*)nData);
         if(LISTBOX_ENTRY_NOTFOUND != nPos)
             m_pFmtLB->RemoveEntry(nPos);