Kaydet (Commit) 4e41227d authored tarafından Fridrich Štrba's avatar Fridrich Štrba

mingw64: change Link class to use sal_IntPtr instead of long

Change-Id: I2b78c7b714ff064f2f1b8a8eb161e5e2ae121eee
üst e9289dbd
......@@ -1348,7 +1348,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
nHeight = OutputDevice::LogicToLogic( nHeight * 10, (MapUnit)eUnit, MAP_POINT );
FontInfo aFontInfo = pFontList->Get( pFontItem->GetFamilyName(), pFontItem->GetStyleName() );
const long* pAry = pFontList->GetSizeAry( aFontInfo );
const sal_IntPtr* pAry = pFontList->GetSizeAry( aFontInfo );
if( bGrow )
{
......
......@@ -96,8 +96,8 @@ protected:
DdeData aDdeData;
DdeString* pName;
short nType;
long nId;
long nTime;
sal_IntPtr nId;
sal_IntPtr nTime;
Link aData;
Link aDone;
bool bBusy;
......@@ -285,11 +285,11 @@ public:
class SVL_DLLPUBLIC DdeTopic
{
SVL_DLLPRIVATE void _Disconnect( long );
SVL_DLLPRIVATE void _Disconnect( sal_IntPtr );
public:
virtual void Connect( long );
virtual void Disconnect( long );
virtual void Connect( sal_IntPtr );
virtual void Disconnect( sal_IntPtr );
virtual DdeData* Get( sal_uLong );
virtual sal_Bool Put( const DdeData* );
virtual sal_Bool Execute( const String* );
......
......@@ -94,7 +94,7 @@ public:
Link();
Link( void* pLinkHdl, PSTUB pMemFunc );
long Call( void* pCaller ) const;
sal_IntPtr Call( void* pCaller ) const;
sal_Bool IsSet() const;
sal_Bool operator !() const;
......@@ -118,7 +118,7 @@ inline Link::Link( void* pLinkHdl, PSTUB pMemFunc )
pFunc = pMemFunc;
}
inline long Link::Call(void *pCaller) const
inline sal_IntPtr Link::Call(void *pCaller) const
{
return pFunc ? (*pFunc)(pInst, pCaller) : 0;
}
......
......@@ -119,7 +119,7 @@ public:
sal_uInt16 nRefCount;
std::vector<DdeConnection*> aConnections;
// Server
long hCurConvSvr;
sal_IntPtr hCurConvSvr;
DWORD hDdeInstSvr;
short nInstanceSvr;
DdeServices* pServicesSvr;
......
......@@ -707,21 +707,21 @@ void DdeTopic::NotifyClient( const String& rItem )
// --- DdeTopic::Connect() -----------------------------------------
void DdeTopic::Connect( long nId )
void DdeTopic::Connect( sal_IntPtr nId )
{
aConnectLink.Call( (void*)nId );
}
// --- DdeTopic::Disconnect() --------------------------------------
void DdeTopic::Disconnect( long nId )
void DdeTopic::Disconnect( sal_IntPtr nId )
{
aDisconnectLink.Call( (void*)nId );
}
// --- DdeTopic::_Disconnect() --------------------------------------
void DdeTopic::_Disconnect( long nId )
void DdeTopic::_Disconnect( sal_IntPtr nId )
{
std::vector<DdeItem*>::iterator iter;
for (iter = aItems.begin(); iter != aItems.end(); ++iter)
......@@ -732,7 +732,7 @@ void DdeTopic::_Disconnect( long nId )
// --- DdeTopic::Get() ---------------------------------------------
DdeData* DdeTopic::Get( sal_uLong nFmt )
DdeData* DdeTopic::Get( sal_uIntPtr nFmt )
{
if ( aGetLink.IsSet() )
return (DdeData*)aGetLink.Call( (void*)nFmt );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment