summaryrefslogtreecommitdiff
path: root/fpicker/source/win32
diff options
context:
space:
mode:
authorXiaofei Zhang <Zhangxiaofei@openoffice.org>2010-11-10 13:50:33 +0800
committerXiaofei Zhang <Zhangxiaofei@openoffice.org>2010-11-10 13:50:33 +0800
commitfa1f3c352c6126b24ab5af87ea4ebea742c546c2 (patch)
tree5a5240e4969fee626bb060bd386fceb957081f90 /fpicker/source/win32
parentd0097a3f35e5e2c68d293d604a2f6f51b2d822a5 (diff)
parent3c21373571fd0cf89391502aa132c5f420cd75c6 (diff)
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'fpicker/source/win32')
-rw-r--r--fpicker/source/win32/filepicker/FPentry.cxx25
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.cxx10
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx8
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx2
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx6
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.hxx2
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.cxx2
-rw-r--r--fpicker/source/win32/filepicker/dialogcustomcontrols.cxx2
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.cxx6
-rw-r--r--fpicker/source/win32/filepicker/getfilenamewrapper.cxx6
-rw-r--r--fpicker/source/win32/filepicker/previewadapter.cxx4
-rw-r--r--fpicker/source/win32/filepicker/workbench/Test_fps.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/Fopentry.cxx25
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.cxx4
15 files changed, 29 insertions, 79 deletions
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index e93c3bec18ba..79a2cf3b2865 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -104,31 +104,6 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 84627a9f3d82..e387d672fd41 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -393,7 +393,7 @@ void SAL_CALL CFilePreview::enable( sal_Bool bEnable )
m_bEnabled = bEnable;
// force a redraw
- InvalidateRect( m_hwnd, NULL, TRUE );
+ InvalidateRect( m_hwnd, NULL, sal_True );
UpdateWindow( m_hwnd );
}
@@ -435,7 +435,7 @@ sal_Bool SAL_CALL CFilePreview::update( const rtl::OUString& aFileName )
loadFile( aFileName );
// force a complete window redraw
- InvalidateRect( m_hwnd, NULL, TRUE );
+ InvalidateRect( m_hwnd, NULL, sal_True );
UpdateWindow( m_hwnd );
}
}
@@ -548,12 +548,12 @@ sal_Bool CFilePreview::loadFile( const rtl::OUString& aFileName )
goto CLEANUP_AND_EXIT;
hr = CreateStreamOnHGlobal(
- hGlobal, FALSE, &pIStream );
+ hGlobal, sal_False, &pIStream );
if ( SUCCEEDED( hr ) )
{
hr = OleLoadPicture(
- pIStream, fsize, FALSE,
+ pIStream, fsize, sal_False,
__uuidof( IPicture ), (LPVOID*)&m_IPicture );
}
@@ -601,7 +601,7 @@ LRESULT CALLBACK CFilePreview::WndProc(
// a result of handling WM_NCCREATE what
// leads to a failure of CreateWindow[Ex]!!!
case WM_NCCREATE:
- lResult = TRUE;
+ lResult = sal_True;
break;
default:
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 2fadaa6bfdff..4b6ba5d39d49 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
}
//-----------------------------------------------------------------------------------------
-ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()
+sal_uIntPtr STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()
{
return osl_incrementInterlockedCount(&m_nRefCount);
}
//-----------------------------------------------------------------------------------------
-ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
+sal_uIntPtr STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
{
- ULONG nReturn = --m_nRefCount;
+ sal_uIntPtr nReturn = --m_nRefCount;
if ( m_nRefCount == 0 )
delete this;
@@ -332,7 +332,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize*
//-----------------------------------------------------------------------------------------
STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustomize* /*pCustomize*/,
DWORD nIDCtl ,
- BOOL bChecked )
+ sal_Bool bChecked )
{
/*
if (nIDCtl == css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION)
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 4b9434d8c6c2..b058f3b5c077 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 ULONG STDMETHODCALLTYPE AddRef();
- virtual ULONG STDMETHODCALLTYPE Release();
+ virtual sal_uIntPtr STDMETHODCALLTYPE AddRef();
+ virtual sal_uIntPtr STDMETHODCALLTYPE Release();
//------------------------------------------------------------------------------------
// IFileDialogEvents
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index ac59a4f65b99..677c2bdbfa7d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1105,7 +1105,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
//case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : // can be ignored ... preview is supported native now !
case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
{
- BOOL bValue = sal_False;
+ BOOL bValue = FALSE;
HRESULT hResult = iCustom->GetCheckButtonState(nId, &bValue);
if ( SUCCEEDED(hResult) )
aValue = css::uno::makeAny((sal_Bool)bValue);
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index d5bcce4707f4..9fb13c1a2d5e 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -529,7 +529,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc),
hWnd,wMessage,wParam,lParam);
- pImpl->onWMShow((BOOL)wParam);
+ pImpl->onWMShow((sal_Bool)wParam);
break;
case WM_NCDESTROY:
@@ -610,7 +610,7 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)
OSL_ASSERT(pImpl);
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
switch(enumParam->m_action)
{
@@ -843,7 +843,7 @@ void CWinFileOpenImpl::onWMSize()
//
//-----------------------------------------------------------------------------------------
-void CWinFileOpenImpl::onWMShow(BOOL bShow)
+void CWinFileOpenImpl::onWMShow(sal_Bool bShow)
{
m_Preview->notifyParentShow(bShow);
}
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 61d63952f8c7..9429f83cf30c 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -189,7 +189,7 @@ protected:
void onWMSize();
- void onWMShow(BOOL bShow);
+ void onWMShow(sal_Bool bShow);
void onWMWindowPosChanged();
void onCustomControlHelpRequest(LPHELPINFO lphi);
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index 902160f40005..dee52c0ffe2c 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)
{
- ULONG nAcquireCount = Application::ReleaseSolarMutex();
+ sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
if (nMilliSeconds < 1)
aCondition.wait(0);
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
index 11c7a414d63b..13b1354902af 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
@@ -53,7 +53,7 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont)
m_CustomControlHandle,
WM_SETFONT,
(WPARAM)hFont,
- (LPARAM)TRUE);
+ (LPARAM)sal_True);
}
//-----------------------------------
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index fcc369972ff8..aa3a5903002e 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -207,7 +207,7 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
aGuard.clear();
- InvalidateRect(m_Hwnd,NULL,FALSE);
+ InvalidateRect(m_Hwnd,NULL,sal_False);
UpdateWindow(m_Hwnd);
}
@@ -248,7 +248,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
{
BITMAPFILEHEADER* pbmfh;
BITMAPINFO * pbmi;
- BYTE * pBits;
+ sal_uInt8 * pBits;
int cxDib;
int cyDib;
@@ -262,7 +262,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
(pbmfh->bfType == ('B' | ('M' << 8))) )
{
pbmi = reinterpret_cast<BITMAPINFO*>((pbmfh + 1));
- pBits = reinterpret_cast<BYTE*>(((DWORD)pbmfh) + pbmfh->bfOffBits);
+ pBits = reinterpret_cast<sal_uInt8*>(((DWORD)pbmfh) + pbmfh->bfOffBits);
cxDib = pbmi->bmiHeader.biWidth;
cyDib = abs (pbmi->bmiHeader.biHeight);
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 43994393e139..ece582089f6e 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -54,13 +54,13 @@ namespace /* private */
//-----------------------------------------------
class CurDirGuard
{
- BOOL m_bValid;
+ sal_Bool m_bValid;
wchar_t* m_pBuffer;
DWORD m_nBufLen;
public:
CurDirGuard()
- : m_bValid( FALSE )
+ : m_bValid( sal_False )
, m_pBuffer( NULL )
, m_nBufLen( 0 )
{
@@ -74,7 +74,7 @@ namespace /* private */
~CurDirGuard()
{
- BOOL bDirSet = FALSE;
+ sal_Bool bDirSet = sal_False;
if ( m_pBuffer )
{
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index d8fee2044115..d4e4d182316d 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -308,7 +308,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
// style bit of the FileOpen dialog must be set after that
// message
LONG lStyle = GetWindowLong(prvwnd,GWL_STYLE);
- BOOL bIsVisible = (BOOL)(lStyle & WS_VISIBLE);
+ sal_Bool bIsVisible = (sal_Bool)(lStyle & WS_VISIBLE);
int cx = 0;
@@ -318,7 +318,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
// resize the filelistbox to the half of the
// available space
- BOOL bRet = SetWindowPos(flb_new,
+ sal_Bool bRet = SetWindowPos(flb_new,
NULL, 0, 0, cx, height,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 8db37cefd34c..699edc9533a2 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -179,7 +179,7 @@ void SAL_CALL FilePickerListener::fileSelectionChanged( const ::com::sun::star::
Sequence< sal_Int8 > aDIB( dwFileSize );
DWORD dwBytesRead;
- BOOL bSuccess = ReadFile (hFile, aDIB.getArray( ), dwFileSize, &dwBytesRead, NULL) ;
+ sal_Bool bSuccess = ReadFile (hFile, aDIB.getArray( ), dwFileSize, &dwBytesRead, NULL) ;
CloseHandle (hFile);
BITMAPFILEHEADER* pbmfh = (BITMAPFILEHEADER*)aDIB.getConstArray( );
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 717359ba511a..3c861cc67ce3 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -87,31 +87,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
- sal_Bool bRetVal = sal_True;
-
- if ( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
- pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ) );
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "InvalidRegistryException caught");
- bRetVal = sal_False;
- }
- }
-
- return bRetVal;
-}
-
//----------------------------------------------------------------------
// component_getFactory
// returns a factory to create XFilePicker-Services
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 254887a2a0f1..88523848d872 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -279,7 +279,7 @@ sal_Bool CMtaFolderPicker::browseForFolder( )
while ( bContinue )
{
DWORD dwResult = MsgWaitForMultipleObjects(
- 1, &aReqCtx.hEvent, FALSE, INFINITE, QS_ALLEVENTS );
+ 1, &aReqCtx.hEvent, sal_False, INFINITE, QS_ALLEVENTS );
switch ( dwResult )
{
@@ -546,7 +546,7 @@ void SAL_CALL CMtaFolderPicker::onInitialized( )
SendMessageA(
m_hwnd,
BFFM_SETSELECTION,
- (WPARAM)FALSE,
+ (WPARAM)sal_False,
(LPARAM) lpiidDisplayDir );
releaseItemIdList( lpiidDisplayDir );