From 5babf1b9037eb283798322eecd8334e6ff1db655 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 3 Apr 2014 13:52:06 +0200 Subject: remove unnecessary scope qualifier from sal_Bool uses i.e. convert "::sal_Bool" to "sal_Bool" Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067 --- fpicker/source/win32/filepicker/VistaFilePicker.cxx | 8 ++++---- fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 8 ++++---- fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 4 ++-- fpicker/source/win32/filepicker/asyncrequests.cxx | 2 +- fpicker/source/win32/filepicker/asyncrequests.hxx | 2 +- fpicker/source/win32/filepicker/comptr.hxx | 6 +++--- fpicker/source/win32/filepicker/shared.hxx | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 9cbec92c750a..40eeb06518d5 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -130,7 +130,7 @@ void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent* } -void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode) +void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(css::uno::RuntimeException) { RequestRef rRequest(new Request()); @@ -304,7 +304,7 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles() // if we want to show a modal window, the calling thread needs to process messages m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::PROCESS_MESSAGES); - const ::sal_Bool bOK = rRequest->getArgumentOrDefault(PROP_DIALOG_SHOW_RESULT, (::sal_Bool)sal_False ); + const sal_Bool bOK = rRequest->getArgumentOrDefault(PROP_DIALOG_SHOW_RESULT, (sal_Bool)sal_False ); m_lLastFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES , css::uno::Sequence< OUString >()); ::sal_Int16 nResult = css::ui::dialogs::ExecutableDialogResults::CANCEL; @@ -354,7 +354,7 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, - ::sal_Bool bEnable ) + sal_Bool bEnable ) throw(css::uno::RuntimeException) { RequestRef rRequest(new Request()); @@ -485,7 +485,7 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An sal_Int32 nTemplate = -1; lArguments[0] >>= nTemplate; - ::sal_Bool bFileOpenDialog = sal_True; + sal_Bool bFileOpenDialog = sal_True; ::sal_Int32 nFeatures = 0; switch(nTemplate) diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index e892523a3ec2..37e3cfdd5878 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -613,7 +613,7 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequest) { - const ::sal_Bool bMultiSelection = rRequest->getArgumentOrDefault(PROP_MULTISELECTION_MODE, (::sal_Bool)sal_True); + const sal_Bool bMultiSelection = rRequest->getArgumentOrDefault(PROP_MULTISELECTION_MODE, (sal_Bool)sal_True); // SYNCHRONIZED-> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -782,7 +782,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest) TFileOpenDialog iOpen = m_iDialogOpen; TFileSaveDialog iSave = m_iDialogSave; - ::sal_Bool bInExecute = m_bInExecute; + sal_Bool bInExecute = m_bInExecute; aLock.clear(); // <- SYNCHRONIZED @@ -1046,7 +1046,7 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(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 : { - ::sal_Bool bValue = sal_False; + sal_Bool bValue = sal_False; aValue >>= bValue; iCustom->SetCheckButtonState(nId, bValue); } @@ -1157,7 +1157,7 @@ void VistaFilePickerImpl::impl_sta_GetControlLabel(const RequestRef& /*rRequest* void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest) { ::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID ); - ::sal_Bool bEnabled = rRequest->getArgumentOrDefault(PROP_CONTROL_ENABLE, (::sal_Bool)sal_True); + sal_Bool bEnabled = rRequest->getArgumentOrDefault(PROP_CONTROL_ENABLE, (sal_Bool)sal_True); // dont check for right values here ... // most parameters are optional ! diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 875e074c62bd..6a01e0ee7541 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -319,9 +319,9 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex /// @todo document me - ::sal_Bool m_bInExecute; + sal_Bool m_bInExecute; - ::sal_Bool m_bWasExecuted; + sal_Bool m_bWasExecuted; // handle to parent window HWND m_hParentWindow; diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx index e3b43cb65dec..228c9ea98a50 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.cxx +++ b/fpicker/source/win32/filepicker/asyncrequests.cxx @@ -157,7 +157,7 @@ void SAL_CALL AsyncRequests::run() // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); RequestHandlerRef rHandler = m_rHandler; - ::sal_Bool bFinished = m_bFinish; + sal_Bool bFinished = m_bFinish; aLock.clear(); // <- SYNCHRONIZED diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index e67dcfa4bdbe..887a696cb400 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -194,7 +194,7 @@ class AsyncRequests : private ::cppu::BaseMutex private: - ::sal_Bool m_bFinish; + sal_Bool m_bFinish; RequestHandlerRef m_rHandler; RequestQueue m_lRequests; osl::Condition maWait; diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx index 38e9f12d5415..a9ed6a60c07a 100644 --- a/fpicker/source/win32/filepicker/comptr.hxx +++ b/fpicker/source/win32/filepicker/comptr.hxx @@ -184,7 +184,7 @@ class ComPtr #endif - ::sal_Bool equals(IUnknown* pCheck) + sal_Bool equals(IUnknown* pCheck) { if ( ( ! m_pInterface ) && @@ -195,14 +195,14 @@ class ComPtr IUnknown* pCurrent = NULL; m_pInterface->QueryInterface(IID_IUnknown, (void**)&pCurrent); - ::sal_Bool bEquals = (pCheck == pCurrent); + sal_Bool bEquals = (pCheck == pCurrent); pCurrent->Release(); return bEquals; } - ::sal_Bool is() + sal_Bool is() { return (m_pInterface != 0); } diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx index 06c83efefd98..3966e1e4055e 100644 --- a/fpicker/source/win32/filepicker/shared.hxx +++ b/fpicker/source/win32/filepicker/shared.hxx @@ -25,7 +25,7 @@ const OUString BACKSLASH( "\\" ); const OUString FILTER_SEPARATOR( "------------------------------------------" ); const OUString ALL_FILES_WILDCARD( "*.*" ); -const ::sal_Bool ALLOW_DUPLICATES = sal_True; +const sal_Bool ALLOW_DUPLICATES = sal_True; #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit