diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-13 12:55:59 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-13 12:55:59 +0100 |
| commit | cd20da4dda0140c534042785c6c3186a2a7e2a7f (patch) | |
| tree | df2a88a0a69208036e403874d62e9f566f9eb884 /fpicker | |
| parent | 2fa065675fbc6588aa7aafe33031fd83e42ef201 (diff) | |
removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in fpicker
Diffstat (limited to 'fpicker')
4 files changed, 8 insertions, 8 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 3b05e9e8fa..e2503f5545 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1527,7 +1527,7 @@ void SvtFileDialog::OpenMultiSelection_Impl() { String aPath; - sal_uIntPtr nCount = _pFileView->GetSelectionCount(); + sal_uLong nCount = _pFileView->GetSelectionCount(); SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; if ( nCount && pEntry ) @@ -2524,7 +2524,7 @@ void SvtFileDialog::InitSize() SvStringsDtor* SvtFileDialog::GetPathList() const { SvStringsDtor* pList = new SvStringsDtor; - sal_uIntPtr nCount = _pFileView->GetSelectionCount(); + sal_uLong nCount = _pFileView->GetSelectionCount(); SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; if ( ! pEntry ) diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 8d0af5cad1..d7496105c6 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -103,15 +103,15 @@ HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rII } //----------------------------------------------------------------------------------------- -sal_uIntPtr STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef() +ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef() { return osl_incrementInterlockedCount(&m_nRefCount); } //----------------------------------------------------------------------------------------- -sal_uIntPtr STDMETHODCALLTYPE VistaFilePickerEventHandler::Release() +ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release() { - sal_uIntPtr nReturn = --m_nRefCount; + sal_uLong nReturn = --m_nRefCount; if ( m_nRefCount == 0 ) delete this; diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 85dce0501a..de79949092 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -88,8 +88,8 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex //------------------------------------------------------------------------------------ virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID rIID , void** ppObject); - virtual sal_uIntPtr STDMETHODCALLTYPE AddRef(); - virtual sal_uIntPtr STDMETHODCALLTYPE Release(); + virtual ULONG STDMETHODCALLTYPE AddRef(); + virtual ULONG STDMETHODCALLTYPE Release(); //------------------------------------------------------------------------------------ // IFileDialogEvents diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx index 62306078a4..c42c6a2ba4 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.cxx +++ b/fpicker/source/win32/filepicker/asyncrequests.cxx @@ -43,7 +43,7 @@ namespace css = ::com::sun::star; void lcl_sleep(::osl::Condition& aCondition , ::sal_Int32 nMilliSeconds) { - sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex(); + sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); if (nMilliSeconds < 1) aCondition.wait(0); |