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 /sfx2/source | |
| parent | 47cc957c36eceb4ae035006137223b5afb652696 (diff) | |
Slowly, but surely going on compiling for mingw64
Change-Id: I590aa6a854a040281bf73d5be768c05d4906a984
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
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; |