diff options
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 2 | ||||
| -rw-r--r-- | include/svl/svdde.hxx | 10 | ||||
| -rw-r--r-- | include/tools/link.hxx | 4 | ||||
| -rw-r--r-- | svl/source/svdde/ddeimp.hxx | 2 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index d7616d1fe093..e5f45e70ae40 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -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 ) { diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 66ec9f0b6a5a..0a1d22bd7de1 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -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* ); diff --git a/include/tools/link.hxx b/include/tools/link.hxx index c325b67bae76..a06e8b9cdc08 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -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; } diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index aea1b892887a..21307ff08f6e 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -119,7 +119,7 @@ public: sal_uInt16 nRefCount; std::vector<DdeConnection*> aConnections; // Server - long hCurConvSvr; + sal_IntPtr hCurConvSvr; DWORD hDdeInstSvr; short nInstanceSvr; DdeServices* pServicesSvr; diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index d4b8aeed43a2..eaafebb0afb0 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -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 ); |