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 | |
parent | Remove RTL_CONSTASCII_(U)STRINGPARAM (sd) (diff) | |
download | core-35a65baefe99181685aea8e630d27c5e2a7c6bc4.tar.gz core-35a65baefe99181685aea8e630d27c5e2a7c6bc4.zip |
Slowly, but surely going on compiling for mingw64
Change-Id: I590aa6a854a040281bf73d5be768c05d4906a984
22 files changed, 49 insertions, 48 deletions
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx index 0595d855d56b..1575226d3be8 100644 --- a/basic/source/runtime/dllmgr-x64.cxx +++ b/basic/source/runtime/dllmgr-x64.cxx @@ -43,7 +43,6 @@ #include "dllmgr.hxx" using namespace css; -using namespace css::uno; /* Open issues: @@ -495,8 +494,8 @@ SbError call( sal_Int32 (*proc_i)(double d, ...) = (sal_Int32 (*)(double, ...)) proc.proc; double (*proc_d)(double d, ...) = (double (*)(double, ...)) proc.proc; - sal_Int64 iRetVal; - double dRetVal; + sal_Int64 iRetVal = 0; + double dRetVal = 0.0; switch (result.GetType()) { case SbxEMPTY: @@ -712,7 +711,7 @@ OUString fullDllName(OUString const & name) { struct SbiDllMgr::Impl: private boost::noncopyable { private: - typedef std::map< OUString, Reference< Dll > > Dlls; + typedef std::map< OUString, ::rtl::Reference< Dll > > Dlls; public: Dll * getDll(OUString const & name); 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); diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index cfc097123843..ccc81d88b73c 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -30,12 +30,13 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) -#include <sehandler.hxx> -#endif #include <vector> +#if defined ( __MINGW32__ ) +#include <sehandler.hxx> +#endif + #define FORMATETC_EXACT_MATCH 1 #define FORMATETC_PARTIAL_MATCH -1 #define FORMATETC_NO_MATCH 0 diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index d74bf91f5862..e9228891d7a5 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -820,7 +820,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, if( lcl_IsInAsciiArr( sImplWordChars, *pStr ) && pWordStt - 1 == pStr && // Installation at beginning of paragraph. Replaced < by <= (#i38971#) - (long)(pStart + 1) <= (long)pStr && + (sal_IntPtr)(pStart + 1) <= (sal_IntPtr)pStr && rCC.isLetter( aText, sal::static_int_cast< xub_StrLen >( pStr-1 - pStart ) ) ) diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index f50bc30ed508..d75c54a87bdb 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -236,8 +236,8 @@ long PluginComm_Impl::doIt() ? (*_NPPfuncs.write)( (NPP)m_aArgs[0], (NPStream*)m_aArgs[1], - (int32_t)m_aArgs[2], - (int32_t)m_aArgs[3], + (sal_IntPtr)m_aArgs[2], + (sal_IntPtr)m_aArgs[3], m_aArgs[4] ) : 0); break; @@ -254,7 +254,7 @@ long PluginComm_Impl::doIt() nRet = (_NPPfuncs.getvalue ? (*_NPPfuncs.getvalue)( (NPP)m_aArgs[0], - (NPPVariable)(int)m_aArgs[1], + (NPPVariable)(sal_IntPtr)m_aArgs[1], m_aArgs[2] ) : NPERR_GENERIC_ERROR); break; @@ -263,7 +263,7 @@ long PluginComm_Impl::doIt() nRet = (_NPPfuncs.setvalue ? (*_NPPfuncs.setvalue)( (NPP)m_aArgs[0], - (NPNVariable)(int)m_aArgs[1], + (NPNVariable)(sal_IntPtr)m_aArgs[1], m_aArgs[2] ) : NPERR_GENERIC_ERROR); break; diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 130cc12a96f1..d8e01600f069 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -423,7 +423,7 @@ void ImpTwain::ImplFallback( ULONG nEvent ) IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) { - const ULONG nEvent = (ULONG) pData; + const sal_uIntPtr nEvent = (sal_uIntPtr) pData; bool bFallback = true; switch( nCurState ) @@ -710,7 +710,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent ) { - switch( (ULONG)(void*) nEvent ) + switch( (sal_uIntPtr)(void*) nEvent ) { case( TWAIN_EVENT_SCANNING ): meState = TWAIN_STATE_SCANNING; @@ -770,7 +770,7 @@ void ScannerManager::ReleaseData() { if( mpData ) { - GlobalFree( (HGLOBAL)(long) mpData ); + GlobalFree( (HGLOBAL)(sal_IntPtr) mpData ); mpData = NULL; } } @@ -778,7 +778,7 @@ void ScannerManager::ReleaseData() awt::Size ScannerManager::getSize() throw() { awt::Size aRet; - HGLOBAL hDIB = (HGLOBAL)(long) mpData; + HGLOBAL hDIB = (HGLOBAL)(sal_IntPtr) mpData; if( hDIB ) { @@ -806,7 +806,7 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw() if( mpData ) { - HGLOBAL hDIB = (HGLOBAL)(long) mpData; + HGLOBAL hDIB = (HGLOBAL)(sal_IntPtr) mpData; const sal_uInt32 nDIBSize = GlobalSize( hDIB ); BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( hDIB ); diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx index 17c81520b33d..d56fa792b6ec 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx @@ -128,7 +128,7 @@ CFileOpenDialog::CFileOpenDialog( } // set a pointer to myself as ofn parameter - m_ofn.lCustData = reinterpret_cast<long>(this); + m_ofn.lCustData = reinterpret_cast<sal_IntPtr>(this); } //------------------------------------------------------------------------ diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index a760f112aeb4..e3b437dbf38c 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -238,7 +238,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) (pbmfh->bfType == ('B' | ('M' << 8))) ) { pbmi = reinterpret_cast<BITMAPINFO*>((pbmfh + 1)); - pBits = reinterpret_cast<sal_uInt8*>(((DWORD)pbmfh) + pbmfh->bfOffBits); + pBits = reinterpret_cast<sal_uInt8*>(((DWORD_PTR)pbmfh) + pbmfh->bfOffBits); cxDib = pbmi->bmiHeader.biWidth; cyDib = abs (pbmi->bmiHeader.biHeight); diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 31b9fd95978c..2d48faf8927e 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -31,6 +31,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \ LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \ + lt_cv_deplibs_check_method=pass_all \ && $(MAKE) \ ) diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 6c374da56556..e2b1618083bb 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -123,7 +123,7 @@ static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text pMyItem->text = text; pMyItem->iconId = iconId; pMyItem->module = module; - mi.dwItemData = (DWORD) pMyItem; + mi.dwItemData = (DWORD_PTR) pMyItem; } else { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index e13e557241cb..60fb441149bb 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1409,7 +1409,7 @@ CustomPropertiesWindow::~CustomPropertiesWindow() IMPL_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox*, pBox ) { - sal_Int64 nType = sal_Int64( (long)pBox->GetEntryData( pBox->GetSelectEntryPos() ) ); + sal_Int64 nType = sal_Int64( (sal_IntPtr)pBox->GetEntryData( pBox->GetSelectEntryPos() ) ); CustomPropertyLine* pLine = pBox->GetLine(); pLine->m_aValueEdit.Show( (CUSTOM_TYPE_TEXT == nType) || (CUSTOM_TYPE_NUMBER == nType) ); pLine->m_aDateField.Show( (CUSTOM_TYPE_DATE == nType) || (CUSTOM_TYPE_DATETIME == nType) ); @@ -1509,7 +1509,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const bool bIsValid = true; pLine->m_bTypeLostFocus = false; sal_Int64 nType = sal_Int64( - (long)pLine->m_aTypeBox.GetEntryData( pLine->m_aTypeBox.GetSelectEntryPos() ) ); + (sal_IntPtr)pLine->m_aTypeBox.GetEntryData( pLine->m_aTypeBox.GetSelectEntryPos() ) ); String sValue = pLine->m_aValueEdit.GetText(); if ( sValue.Len() == 0 ) return true; @@ -1846,7 +1846,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c { aPropertiesSeq[i].Name = sPropertyName; sal_Int64 nType = sal_Int64( - (long)pLine->m_aTypeBox.GetEntryData( pLine->m_aTypeBox.GetSelectEntryPos() ) ); + (sal_IntPtr)pLine->m_aTypeBox.GetEntryData( pLine->m_aTypeBox.GetSelectEntryPos() ) ); if ( CUSTOM_TYPE_NUMBER == nType ) { double nValue = 0; 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(), diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 66c0019f655e..bd804eeee787 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -277,7 +277,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) sal_uInt16 iPos = maVSWidth.GetSelectItemId(); if(iPos >= 1 && iPos <= 8) { - long nVal = LogicToLogic((long)(unsigned long)maVSWidth.GetItemData( iPos ) , MAP_POINT, (MapUnit)meMapUnit); + sal_IntPtr nVal = LogicToLogic((sal_IntPtr)maVSWidth.GetItemData( iPos ) , MAP_POINT, (MapUnit)meMapUnit); nVal = maMFWidth.Denormalize(nVal); XLineWidthItem aWidthItem( nVal ); mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index a153bdd8f7a4..4559e69b4cd6 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1694,7 +1694,7 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) if (nNum1==nNum2) { if (eKind1==eKind2) - return (long)lhs<(long)rhs; // Hack, to always get to the same sorting + return (sal_IntPtr)lhs<(sal_IntPtr)rhs; // Hack, to always get to the same sorting return (sal_uInt16)eKind1<(sal_uInt16)eKind2; } else @@ -1702,12 +1702,12 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) } else { - return (long)pObj1<(long)pObj2; + return (sal_IntPtr)pObj1<(sal_IntPtr)pObj2; } } else { - return (long)pPV1<(long)pPV2; + return (sal_IntPtr)pPV1<(sal_IntPtr)pPV2; } } else diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 2827c4f47f22..40820e7efb66 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -239,7 +239,7 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) } else { - return (long)pOL1 < (long)pOL2; + return (sal_IntPtr)pOL1 < (sal_IntPtr)pOL2; } } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index c968809e20ea..56a8a0203d9a 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1383,7 +1383,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) pRet = GRFMGR_AUTOSWAPSTREAM_TEMP; } - return (long)(void*) pRet; + return (sal_IntPtr)(void*) pRet; } void SdrGrafObj::SetGrafAnimationAllowed(bool bNew) diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 10130643f277..3e55d30ad2c7 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -77,7 +77,7 @@ IMPL_XTYPEPROVIDER_END #if (defined WNT) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 ) { - aRet <<= (sal_Int32)pSysData->hWnd; + aRet <<= (sal_IntPtr)pSysData->hWnd; } #elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index d8580fe6ed63..28211f9b2416 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -89,7 +89,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) #if (defined WNT) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 ) { - aRet <<= (sal_Int32)pSysData->hWnd; + aRet <<= (sal_IntPtr)pSysData->hWnd; } #elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) |