diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:20:09 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:27:26 +0200 |
commit | bb34461d280d499d93ef982e9b7391fd791ffa35 (patch) | |
tree | 4f67b05103bc4bbe7069744f05282a42dc29806a | |
parent | a34ded25d61c61c5c25792a1bace4970a754afc6 (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: Iadc107a89e6c489bf5261042ec6853a1354c434d
36 files changed, 167 insertions, 167 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 52a3c22a2e63..55d6688aaf05 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -462,7 +462,7 @@ void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) if(nFocusFlags & GetFocusFlags::UniqueMnemonic) aEvent.FocusFlags |= css::awt::FocusChangeReason::UNIQUEMNEMONIC; } - aEvent.Temporary = sal_False; + aEvent.Temporary = false; Reference < XAccessibleContext > xThis( this ); aEvent.Source = xThis; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 4715e9252de8..b8a1e0c48fb7 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -838,27 +838,27 @@ throw ( IndexOutOfBoundsException, xText(xAcc, uno::UNO_QUERY); if( xText.is() ) { - if( xText->getSelectionStart() >= 0 ) return sal_True; + if( xText->getSelectionStart() >= 0 ) return true; } } else if( xContext->getAccessibleRole() == AccessibleRole::SHAPE ) { Reference< XAccessibleStateSet > pRState = xContext->getAccessibleStateSet(); if( !pRState.is() ) - return sal_False; + return false; uno::Sequence<short> pStates = pRState->getStates(); int nCount = pStates.getLength(); for( int i = 0; i < nCount; i++ ) { if(pStates[i] == AccessibleStateType::SELECTED) - return sal_True; + return true; } - return sal_False; + return false; } } - return sal_False; + return false; } @@ -1536,7 +1536,7 @@ sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ) th OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;} sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} +sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} OUString SAL_CALL AccessibleShape::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();} css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) @@ -1554,7 +1554,7 @@ css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sa css::accessibility::TextSegment aResult; return aResult; } -sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} +sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} } // end of namespace accessibility diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 5e5e6f3d8088..b750b5d49577 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -915,7 +915,7 @@ void ChildrenManagerImpl::UpdateSelection() { if (bDrawShape) { - vecSelect.push_back(std::make_pair(pAccessibleShape,sal_True)); + vecSelect.push_back(std::make_pair(pAccessibleShape,true)); ++nAddSelect; } } @@ -931,7 +931,7 @@ void ChildrenManagerImpl::UpdateSelection() { if(bDrawShape) { - vecSelect.push_back(std::make_pair(pAccessibleShape,sal_False)); + vecSelect.push_back(std::make_pair(pAccessibleShape,false)); ++nRemoveSelect; } } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 002d09c5e18b..422c0af971eb 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -944,7 +944,7 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeE sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ ) throw( RuntimeException, std::exception ) { - return sal_False; + return false; } Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue() throw( RuntimeException, std::exception ) @@ -984,7 +984,7 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex xSelection->selectAccessibleChild(mnIndexInParent); - return sal_True; + return true; } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index d1d997022e74..3866c24b394c 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -120,7 +120,7 @@ void RecoveryCore::saveBrokenTempEntries(const OUString& rPath) css::util::URL aCopyURL = impl_getParsedURL(RECOVERY_CMD_DO_ENTRY_BACKUP); css::uno::Sequence< css::beans::PropertyValue > lCopyArgs(3); lCopyArgs[0].Name = PROP_DISPATCHASYNCHRON; - lCopyArgs[0].Value <<= sal_False; + lCopyArgs[0].Value <<= false; lCopyArgs[1].Name = PROP_SAVEPATH; lCopyArgs[1].Value <<= rPath; lCopyArgs[2].Name = PROP_ENTRYID; @@ -158,7 +158,7 @@ void RecoveryCore::saveAllTempEntries(const OUString& rPath) css::util::URL aCopyURL = impl_getParsedURL(RECOVERY_CMD_DO_ENTRY_BACKUP); css::uno::Sequence< css::beans::PropertyValue > lCopyArgs(3); lCopyArgs[0].Name = PROP_DISPATCHASYNCHRON; - lCopyArgs[0].Value <<= sal_False; + lCopyArgs[0].Value <<= false; lCopyArgs[1].Name = PROP_SAVEPATH; lCopyArgs[1].Value <<= rPath; lCopyArgs[2].Name = PROP_ENTRYID; @@ -192,7 +192,7 @@ void RecoveryCore::forgetBrokenTempEntries() css::util::URL aRemoveURL = impl_getParsedURL(RECOVERY_CMD_DO_ENTRY_CLEANUP); css::uno::Sequence< css::beans::PropertyValue > lRemoveArgs(2); lRemoveArgs[0].Name = PROP_DISPATCHASYNCHRON; - lRemoveArgs[0].Value <<= sal_False; + lRemoveArgs[0].Value <<= false; lRemoveArgs[1].Name = PROP_ENTRYID; // lRemoveArgs[1].Value will be changed during next loop ... @@ -224,7 +224,7 @@ void RecoveryCore::forgetAllRecoveryEntries() css::util::URL aRemoveURL = impl_getParsedURL(RECOVERY_CMD_DO_ENTRY_CLEANUP); css::uno::Sequence< css::beans::PropertyValue > lRemoveArgs(2); lRemoveArgs[0].Name = PROP_DISPATCHASYNCHRON; - lRemoveArgs[0].Value <<= sal_False; + lRemoveArgs[0].Value <<= false; lRemoveArgs[1].Name = PROP_ENTRYID; // lRemoveArgs[1].Value will be changed during next loop ... @@ -253,7 +253,7 @@ void RecoveryCore::forgetBrokenRecoveryEntries() css::util::URL aRemoveURL = impl_getParsedURL(RECOVERY_CMD_DO_ENTRY_CLEANUP); css::uno::Sequence< css::beans::PropertyValue > lRemoveArgs(2); lRemoveArgs[0].Name = PROP_DISPATCHASYNCHRON; - lRemoveArgs[0].Value <<= sal_False; + lRemoveArgs[0].Value <<= false; lRemoveArgs[1].Name = PROP_ENTRYID; // lRemoveArgs[1].Value will be changed during next loop ... @@ -298,7 +298,7 @@ void RecoveryCore::doEmergencySavePrepare() css::uno::Sequence< css::beans::PropertyValue > lArgs(1); lArgs[0].Name = PROP_DISPATCHASYNCHRON; - lArgs[0].Value <<= sal_False; + lArgs[0].Value <<= false; m_xRealCore->dispatch(aURL, lArgs); } @@ -315,7 +315,7 @@ void RecoveryCore::doEmergencySave() lArgs[0].Name = PROP_STATUSINDICATOR; lArgs[0].Value <<= m_xProgress; lArgs[1].Name = PROP_DISPATCHASYNCHRON; - lArgs[1].Value <<= sal_True; + lArgs[1].Value <<= true; m_xRealCore->dispatch(aURL, lArgs); } @@ -332,7 +332,7 @@ void RecoveryCore::doRecovery() lArgs[0].Name = PROP_STATUSINDICATOR; lArgs[0].Value <<= m_xProgress; lArgs[1].Name = PROP_DISPATCHASYNCHRON; - lArgs[1].Value <<= sal_True; + lArgs[1].Value <<= true; m_xRealCore->dispatch(aURL, lArgs); } @@ -553,7 +553,7 @@ PluginProgress::PluginProgress( vcl::Window* { m_pPlugProgressWindow = VclPtr<PluginProgressWindow>::Create(pParent, static_cast< css::lang::XComponent* >(this)); css::uno::Reference< css::awt::XWindow > xProgressWindow = VCLUnoHelper::GetInterface(m_pPlugProgressWindow); - m_xProgressFactory = css::task::StatusIndicatorFactory::createWithWindow(xContext, xProgressWindow, sal_False/*DisableReschedule*/, sal_True/*AllowParentShow*/); + m_xProgressFactory = css::task::StatusIndicatorFactory::createWithWindow(xContext, xProgressWindow, false/*DisableReschedule*/, true/*AllowParentShow*/); m_xProgress = m_xProgressFactory->createStatusIndicator(); } diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 91846cf73e1a..5d85193fe199 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -417,7 +417,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlMo SolarMutexGuard aGuard; if (!UnoControl::setModel(rModel)) - return sal_False; + return false; Reference< XGridPeer > xGridPeer(getPeer(), UNO_QUERY); if (xGridPeer.is()) @@ -425,7 +425,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlMo Reference< XIndexContainer > xCols(mxModel, UNO_QUERY); xGridPeer->setColumns(xCols); } - return sal_True; + return true; } @@ -509,10 +509,10 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& pPeer->setColumns(xColumns); if (maComponentInfos.bVisible) - pPeer->setVisible(sal_True); + pPeer->setVisible(true); if (!maComponentInfos.bEnable) - pPeer->setEnable(sal_False); + pPeer->setEnable(false); if (maWindowListeners.getLength()) pPeer->addWindowListener( &maWindowListeners ); @@ -786,7 +786,7 @@ sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException, std::excepti if (xBound.is()) return xBound->commit(); else - return sal_True; + return true; } // XContainer @@ -1185,25 +1185,25 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType // eine 'Konvertierungstabelle' static const sal_Bool bCanConvert[LAST_KNOWN_TYPE][4] = { - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::CONTROL - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::COMMANDBUTTON - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::RADIOBUTTON - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::IMAGEBUTTON - { sal_False, sal_False, sal_False, sal_True }, // FormComponentType::CHECKBOX - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::LISTBOX - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::COMBOBOX - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::GROUPBOX - { sal_True , sal_False, sal_False, sal_False }, // FormComponentType::TEXTFIELD - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::FIXEDTEXT - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::GRIDCONTROL - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::FILECONTROL - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::HIDDENCONTROL - { sal_False, sal_False, sal_False, sal_False }, // FormComponentType::IMAGECONTROL - { sal_True , sal_True , sal_True , sal_False }, // FormComponentType::DATEFIELD - { sal_True , sal_True , sal_False, sal_False }, // FormComponentType::TIMEFIELD - { sal_True , sal_True , sal_False, sal_False }, // FormComponentType::NUMERICFIELD - { sal_True , sal_True , sal_False, sal_False }, // FormComponentType::CURRENCYFIELD - { sal_True , sal_False, sal_False, sal_False } // FormComponentType::PATTERNFIELD + { false, false, false, false }, // FormComponentType::CONTROL + { false, false, false, false }, // FormComponentType::COMMANDBUTTON + { false, false, false, false }, // FormComponentType::RADIOBUTTON + { false, false, false, false }, // FormComponentType::IMAGEBUTTON + { false, false, false, true }, // FormComponentType::CHECKBOX + { false, false, false, false }, // FormComponentType::LISTBOX + { false, false, false, false }, // FormComponentType::COMBOBOX + { false, false, false, false }, // FormComponentType::GROUPBOX + { true , false, false, false }, // FormComponentType::TEXTFIELD + { false, false, false, false }, // FormComponentType::FIXEDTEXT + { false, false, false, false }, // FormComponentType::GRIDCONTROL + { false, false, false, false }, // FormComponentType::FILECONTROL + { false, false, false, false }, // FormComponentType::HIDDENCONTROL + { false, false, false, false }, // FormComponentType::IMAGECONTROL + { true , true , true , false }, // FormComponentType::DATEFIELD + { true , true , false, false }, // FormComponentType::TIMEFIELD + { true , true , false, false }, // FormComponentType::NUMERICFIELD + { true , true , false, false }, // FormComponentType::CURRENCYFIELD + { true , false, false, false } // FormComponentType::PATTERNFIELD }; @@ -1241,11 +1241,11 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType { if (bRequestedAsAny) { - pReturnArray[i] = sal_True; + pReturnArray[i] = true; continue; } - pReturnArray[i] = sal_False; + pReturnArray[i] = false; sal_uInt16 nModelPos = pGrid->GetModelColumnPos(pGrid->GetColumnIdFromViewPos((sal_uInt16)i)); DBG_ASSERT(nModelPos != (sal_uInt16)-1, "FmXGridPeer::queryFieldDataType : no model pos !"); @@ -1493,7 +1493,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (!m_xCursor.is() || !pGrid) - return sal_True; + return true; EventObject aEvt(static_cast< ::cppu::OWeakObject* >(this)); ::comphelper::OInterfaceIteratorHelper2 aIter(m_aUpdateListeners); @@ -1701,7 +1701,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception ) if (pWin) return static_cast<FmGridControl*>(pWin)->IsDesignMode(); else - return sal_False; + return false; } @@ -2392,9 +2392,9 @@ sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException for (sal_Int32 i = aModes.getLength(); i > 0; ) { if (pModes[--i] == Mode) - return sal_True; + return true; } - return sal_False; + return false; } @@ -2582,7 +2582,7 @@ void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) thro sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) { - return sal_True; + return true; } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 00786110d30e..5d20ae911d25 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3432,7 +3432,7 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& awt::FocusEvent aEvent; aEvent.Source = *this; aEvent.FocusFlags = static_cast<sal_Int16>(_rWindow.GetGetFocusFlags()); - aEvent.Temporary = sal_False; + aEvent.Temporary = false; if ( bFocusGained ) onFocusGained( aEvent ); @@ -4652,7 +4652,7 @@ css::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeExcepti sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception ) { - return sal_True; + return true; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 53b5f50de11c..eab715d0fbd1 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -585,7 +585,7 @@ namespace svxform try { - m_xUIHelper->getBindingForNode( xNewNode, sal_True ); + m_xUIHelper->getBindingForNode( xNewNode, true ); } catch ( Exception& ) { @@ -959,7 +959,7 @@ namespace svxform ScopedVclPtrInstance< MessageDialog > aQBox(this, SVX_RES(nResId), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); OUString sMessText = aQBox->get_primary_text(); sMessText = sMessText.replaceFirst( - sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, sal_False ) ); + sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) ); aQBox->set_primary_text(sMessText); if ( aQBox->Execute() == RET_YES ) { @@ -2574,7 +2574,7 @@ namespace svxform */ Reference< css::xml::dom::XNode > xNode = m_pItemNode->m_xNode; - m_xBinding = m_xUIHelper->getBindingForNode( xNode, sal_True ); + m_xBinding = m_xUIHelper->getBindingForNode( xNode, true ); if ( m_xBinding.is() ) { Reference< css::xforms::XModel > xModel( m_xUIHelper, UNO_QUERY ); @@ -3290,7 +3290,7 @@ namespace svxform Reference<css::xml::dom::XNode>( xModel->getDefaultInstance()->getDocumentElement(), UNO_QUERY_THROW ), - sal_True ); + true ); m_xTempBinding = m_xCreatedBinding; } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 3f017c207b20..70c7aadbda38 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -224,7 +224,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* if ( m_xBrowserComponentWindow.is() ) - m_xBrowserComponentWindow->setVisible( sal_True ); + m_xBrowserComponentWindow->setVisible( true ); if ( _pInfo ) m_sLastActivePage = _pInfo->aExtraString; @@ -341,7 +341,7 @@ bool FmPropBrw::Close() try { Reference< XController > xController( m_xMeAsFrame->getController() ); - if ( xController.is() && !xController->suspend( sal_True ) ) + if ( xController.is() && !xController->suspend( true ) ) return false; } catch( const Exception& ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index a60bdb6894a7..0dca9bff4a88 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1357,21 +1357,21 @@ void FmXFormShell::LoopGrids(LoopGridsSync nSync, LoopGridsFlags nFlags) { case LoopGridsSync::DISABLE_SYNC: { - sal_Bool bB(sal_False); + sal_Bool bB(false); xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType<bool>::get())); } break; case LoopGridsSync::FORCE_SYNC: { Any aOldVal( xModelSet->getPropertyValue(FM_PROP_DISPLAYSYNCHRON) ); - sal_Bool bB(sal_True); + sal_Bool bB(true); xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType<bool>::get())); xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, aOldVal); } break; case LoopGridsSync::ENABLE_SYNC: { - sal_Bool bB(sal_True); + sal_Bool bB(true); xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType<bool>::get())); } break; @@ -1379,7 +1379,7 @@ void FmXFormShell::LoopGrids(LoopGridsSync nSync, LoopGridsFlags nFlags) if (nFlags & LoopGridsFlags::DISABLE_ROCTRLR) { - sal_Bool bB(sal_False); + sal_Bool bB(false); xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(&bB,cppu::UnoType<bool>::get())); Reference< XPropertyState> xModelPropState(xModelSet, UNO_QUERY); if (xModelPropState.is()) @@ -3058,7 +3058,7 @@ void FmXFormShell::stopFiltering(bool bSave) if (aOriginalFilters.size() == aOriginalApplyFlags.size()) // the first getPropertyValue failed -> use two dummies aOriginalFilters.push_back( OUString() ); - aOriginalApplyFlags.push_back( sal_False ); + aOriginalApplyFlags.push_back( false ); } } saveFilter(*j); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 4629ac9fdf22..3072c399e528 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -479,7 +479,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const if (xText.is()) { xText->setText(SVX_RESSTR(RID_STR_AUTOFIELD)); - xText->setEditable(sal_False); + xText->setEditable(false); } } @@ -677,7 +677,7 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( R sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) { - return sal_True; + return true; } @@ -767,7 +767,7 @@ sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, An sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) throw( IllegalArgumentException ) { - return sal_False; + return false; } @@ -2198,7 +2198,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl) { Any aVal = xField->getPropertyValue(FM_PROP_ISREADONLY); if (aVal.hasValue() && ::comphelper::getBOOL(aVal)) - xBound->setLock(sal_True); + xBound->setLock(true); else xBound->setLock(bLocked); } @@ -3500,9 +3500,9 @@ sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( Runt for (sal_Int32 i = aModes.getLength(); i > 0; ) { if (pModes[--i] == Mode) - return sal_True; + return true; } - return sal_False; + return false; } @@ -3689,11 +3689,11 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent // check values on NULL and required flag if ( !lcl_shouldValidateRequiredFields_nothrow( _rEvent.Source ) ) - return sal_True; + return true; OSL_ENSURE( m_pColumnInfoCache.get(), "FormController::approveRowChange: no column infos!" ); if ( !m_pColumnInfoCache.get() ) - return sal_True; + return true; try { @@ -3730,7 +3730,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent aGuard.clear(); displayErrorSetFocus( sMessage, rColInfo.xFirstControlWithInputRequired, getDialogParentWindow() ); - return sal_False; + return false; } } catch( const Exception& ) @@ -3755,7 +3755,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th return static_cast<XRowSetApproveListener*>(aIter.next())->approveCursorMove(aEvt); } - return sal_True; + return true; } @@ -3772,7 +3772,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) return static_cast<XRowSetApproveListener*>(aIter.next())->approveRowSetChange(aEvt); } - return sal_True; + return true; } // XRowSetApproveBroadcaster @@ -3887,7 +3887,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& try { if ( !ensureInteractionHandler() ) - return sal_False; + return false; // two continuations allowed: OK and Cancel OParameterContinuation* pParamValues = new OParameterContinuation; @@ -3907,14 +3907,14 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& if (!pParamValues->wasSelected()) // canceled - return sal_False; + return false; // transfer the values into the parameter supplier Sequence< PropertyValue > aFinalValues = pParamValues->getValues(); if (aFinalValues.getLength() != aRequest.Parameters->getCount()) { OSL_FAIL("FormController::approveParameter: the InteractionHandler returned nonsense!"); - return sal_False; + return false; } const PropertyValue* pFinalValues = aFinalValues.getConstArray(); for (sal_Int32 i=0; i<aFinalValues.getLength(); ++i, ++pFinalValues) @@ -3941,7 +3941,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& DBG_UNHANDLED_EXCEPTION(); } } - return sal_True; + return true; } // XConfirmDeleteBroadcaster @@ -3992,7 +3992,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th try { if ( !ensureInteractionHandler() ) - return sal_False; + return false; // two continuations allowed: Yes and No OInteractionApprove* pApprove = new OInteractionApprove; @@ -4016,14 +4016,14 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th m_xInteractionHandler->handle( xRequest ); if ( pApprove->wasSelected() ) - return sal_True; + return true; } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - return sal_False; + return false; } @@ -4131,7 +4131,7 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene { // send an initial statusChanged event FeatureStateEvent aEvent; aEvent.FeatureURL = _rURL; - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; _rxListener->statusChanged(aEvent); // and don't add the listener at all (the status will never change) } diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index f9016c7d3a8d..e45d21ef1c63 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -56,7 +56,7 @@ namespace svx _rState.FeatureURL = m_aFeatureURL; _rState.IsEnabled = aState.Enabled; - _rState.Requery = sal_False; + _rState.Requery = false; _rState.State = aState.State; } diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 8b6d25c51f10..0b71adc0f7ba 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -308,7 +308,7 @@ bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) ::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aDestPath.executeCommand( "transfer", - uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ), + uno::makeAny( ucb::TransferInfo( false, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ), rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) ); bRet = true; } @@ -381,7 +381,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : else aProgressText = "Gallery"; - xMonitor->addText( "Gallery", aProgressText, sal_False ) ; + xMonitor->addText( "Gallery", aProgressText, false ) ; mxProgressBar->setRange( 0, GALLERY_PROGRESS_RANGE ); } } diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index a460967b4759..a9c0ae74af9f 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -754,12 +754,12 @@ public: virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& /*Toolkit*/, const css::uno::Reference< css::awt::XWindowPeer >& /*Parent*/) throw(css::uno::RuntimeException, std::exception) override {} virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XWindowPeer > ();} - virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) throw (css::uno::RuntimeException, std::exception) override {return sal_False;} + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) throw (css::uno::RuntimeException, std::exception) override {return false;} virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XView > ();} virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) throw (css::uno::RuntimeException, std::exception) override {} - virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override {return sal_False;} - virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override {return sal_False;} + virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override {return false;} + virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override {return false;} // css::form::XBoundControl virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 2ebf0effe434..5763aa183b72 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -91,7 +91,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed aFilterData[ 0 ].Name = "CreateNativeLink"; - aFilterData[ 0 ].Value = Any( sal_True ); + aFilterData[ 0 ].Value = Any( true ); // #i123042# for e.g SVG the path is needed, so hand it over here. I have no real idea // what consequences this may have; maybe this is not handed over by purpose here. Not diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 1eb50e061697..cf50fcf3d002 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -621,7 +621,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow { return pController->isRowSelected( nRow ); } - return sal_False; + return false; } @@ -634,7 +634,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC { return pController->isColumnSelected( nColumn ); } - return sal_False; + return false; } @@ -676,10 +676,10 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa CellPos aFirstPos, aLastPos; pController->getSelectedCells( aFirstPos, aLastPos ); if( (aFirstPos.mnRow <= nRow) && (aFirstPos.mnCol <= nColumn) && (nRow <= aLastPos.mnRow) && (nColumn <= aLastPos.mnCol) ) - return sal_True; + return true; } - return sal_False; + return false; } @@ -842,7 +842,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( !pController ) - return sal_False; + return false; return pController->selectRow( row ); } @@ -852,7 +852,7 @@ sal_Bool SAL_CALL AccessibleTableShape::selectColumn( sal_Int32 column ) SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( !pController ) - return sal_False; + return false; return pController->selectColumn( column ); } @@ -862,7 +862,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( !pController ) - return sal_False; + return false; return pController->deselectRow( row ); } @@ -872,7 +872,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( !pController ) - return sal_False; + return false; return pController->deselectColumn( column ); } @@ -1299,7 +1299,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) mpTable->clearAccessibleSelection(); sal_Int32 nIndex = mpTable->getAccessibleIndex( row, 0 ); mpTable->selectAccessibleChild( nIndex ); - return sal_True; + return true; } } @@ -1313,7 +1313,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) mpTable->clearAccessibleSelection(); sal_Int32 nIndex = mpTable->getAccessibleIndex( 0, column ); mpTable->selectAccessibleChild( nIndex ); - return sal_True; + return true; } } @@ -1326,7 +1326,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) { sal_Int32 nIndex = mpTable->getAccessibleIndex( row, 0 ); mpTable->deselectAccessibleChild( nIndex ); - return sal_True; + return true; } } @@ -1339,7 +1339,7 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) { sal_Int32 nIndex = mpTable->getAccessibleIndex( 0, column ); mpTable->deselectAccessibleChild( nIndex ); - return sal_True; + return true; } } } diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index bd936d8e8572..7af8546cc95e 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -546,7 +546,7 @@ void Cell::copyFormatFrom( const CellRef& xSourceCell ) void Cell::notifyModified() { if( mxTable.is() ) - mxTable->setModified( sal_True ); + mxTable->setModified( true ); } diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index f1fd2570e5de..02427a6770a4 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -250,7 +250,7 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, { mxTable->merge( aStart.mnCol, aStart.mnRow, aEnd.mnCol - aStart.mnCol + 1, aEnd.mnRow - aStart.mnRow + 1 ); mxTable->optimize(); - mxTable->setModified(sal_True); + mxTable->setModified(true); } catch( Exception& ) { @@ -515,7 +515,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No split_vertical( nRows ); if( nColumns > 0 ||nRows > 0 ) - mxTable->setModified(sal_True); + mxTable->setModified(true); } catch( Exception& ) { diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index f10f43b8b103..597da0bb6d3b 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -216,7 +216,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a pModel->AddUndo( pUndo ); pUndo = nullptr; } - mxTableModel->setModified(sal_True); + mxTableModel->setModified(true); } delete pUndo; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 7713071b5e13..d774530e0be0 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -224,7 +224,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw // XStyle sal_Bool SAL_CALL TableDesignStyle::isUserDefined() throw (RuntimeException, std::exception) { - return sal_False; + return false; } sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exception) @@ -241,10 +241,10 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exce { TableDesignUser* pUser = dynamic_cast< TableDesignUser* >( aListener[nIndex].get() ); if( pUser && pUser->isInUse() ) - return sal_True; + return true; } } - return sal_False; + return false; } @@ -321,7 +321,7 @@ Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException, std::ex sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::exception) { - return sal_True; + return true; } @@ -522,9 +522,9 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(Ru for( TableDesignStyleVector::const_iterator iter( maDesigns.begin() ); iter != aEnd; ++iter) if( (*iter)->getName() == aName ) - return sal_True; + return true; - return sal_False; + return false; } diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 6d1f5a793322..b6dd24579eb3 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -222,7 +222,7 @@ void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount ) // remove the rows remove_range<RowVector,RowVector::iterator>( maRows, nIndex, nCount ); updateRows(); - setModified(sal_True); + setModified(true); } @@ -238,7 +238,7 @@ void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) maRows[nIndex+nOffset] = aRows[nOffset]; updateRows(); - setModified(sal_True); + setModified(true); } @@ -253,7 +253,7 @@ void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) maRows[nRows]->removeColumns( nIndex, nCount ); updateColumns(); - setModified(sal_True); + setModified(true); } @@ -281,7 +281,7 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV } updateColumns(); - setModified(sal_True); + setModified(true); } @@ -686,7 +686,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) OSL_FAIL("sdr::table::TableModel::insertColumns(), exception caught!"); } updateColumns(); - setModified(sal_True); + setModified(true); } } @@ -795,7 +795,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } updateColumns(); - setModified(sal_True); + setModified(true); } } @@ -857,7 +857,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) pModel->SetChanged(); updateRows(); - setModified(sal_True); + setModified(true); } } @@ -952,7 +952,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } updateRows(); - setModified(sal_True); + setModified(true); } } @@ -1061,7 +1061,7 @@ void TableModel::optimize() } } if( bWasModified ) - setModified(sal_True); + setModified(true); } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 3226a91b467f..ee95e905554b 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -284,7 +284,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal pModel->AddUndo( pUndo ); pUndo = nullptr; } - mxTableModel->setModified(sal_True); + mxTableModel->setModified(true); } delete pUndo; diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index de176d908742..c30ee0cbf09a 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -139,7 +139,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem { css::beans::PropertyValue aPropValue; aPropValue.Name = sExtrusion; - aPropValue.Value <<= sal_True; + aPropValue.Value <<= true; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); } } @@ -419,11 +419,11 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); aPropValue.Name = sLightFace; - aPropValue.Value <<= sal_True; + aPropValue.Value <<= true; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); aPropValue.Name = sFirstLightHarsh; - aPropValue.Value <<= sal_True; + aPropValue.Value <<= true; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); aPropValue.Name = sSecondLightHarsh; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 6fb476bb6e2d..6caf85a5c0e9 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -497,7 +497,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) ), UNO_QUERY ); } if (xDictionary_To_Simplified.is()) - xDictionary_To_Simplified->setActive( sal_True ); + xDictionary_To_Simplified->setActive( true ); if( xContainer->hasByName( aNameTo_Traditional ) ) @@ -512,7 +512,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) UNO_QUERY ); } if (xDictionary_To_Traditional.is()) - xDictionary_To_Traditional->setActive( sal_True ); + xDictionary_To_Traditional->setActive( true ); } catch(const uno::Exception& ) diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 735c6a5de16e..daa64a7dee59 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1006,10 +1006,10 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes ::SolarMutexGuard aGuard; if( nullptr == mpUnoPage ) - return sal_False; + return false; if( nullptr == mpUnoPage->GetSdrPage() || nullptr == mpDoc ) - return sal_False; + return false; GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); @@ -1225,11 +1225,11 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeNa { if( rMimeTypeName == rFilter.GetExportFormatMediaType( nFilter ) ) { - return sal_True; + return true; } } - return sal_False; + return false; } Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException, std::exception) diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index d69f682b8854..9643a20ea04f 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -258,7 +258,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) OUString aName = SvxUnogetInternalNameForItem(mnWhich, aApiName); if (aName.isEmpty()) - return sal_False; + return false; sal_uInt32 nSurrogate; @@ -268,10 +268,10 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) { const NameOrIndex *pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( mnWhich, nSurrogate )); if (isValid(pItem) && aName.equals(pItem->GetName())) - return sal_True; + return true; } - return sal_False; + return false; } sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) @@ -287,10 +287,10 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) const NameOrIndex *pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( mnWhich, nSurrogate )); if( isValid( pItem ) ) - return sal_True; + return true; } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 6ff4621b2635..1d2b7df82c7d 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -226,10 +226,10 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) { XPropertyEntry* pEntry = get( i ); if (pEntry && aInternalName.equals(pEntry->GetName())) - return sal_True; + return true; } - return sal_False; + return false; } // XElementAccess diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 30e08df4d008..9a812cd9ca23 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -303,7 +303,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default glue point? { SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Identifier ); - aGluePoint.IsUserDefined = sal_False; + aGluePoint.IsUserDefined = false; convert( aTempPoint, aGluePoint ); return uno::makeAny( aGluePoint ); } @@ -321,7 +321,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) // #i38892# if(rTempPoint.IsUserDefined()) { - aGluePoint.IsUserDefined = sal_True; + aGluePoint.IsUserDefined = true; } convert( rTempPoint, aGluePoint ); @@ -479,7 +479,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) if( Index < 4 ) // default glue point? { SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Index ); - aGluePoint.IsUserDefined = sal_False; + aGluePoint.IsUserDefined = false; convert( aTempPoint, aGluePoint ); uno::Any aAny; aAny <<= aGluePoint; @@ -492,7 +492,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) if( pList && Index < pList->GetCount() ) { const SdrGluePoint& rTempPoint = (*pList)[(sal_uInt16)Index]; - aGluePoint.IsUserDefined = sal_True; + aGluePoint.IsUserDefined = true; convert( rTempPoint, aGluePoint ); uno::Any aAny; aAny <<= aGluePoint; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index ef3701b67b38..17b41e9b39d2 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -284,7 +284,7 @@ void RecoveryUI::impl_showAllRecoveredDocs() if (!xWindow.is()) continue; - xWindow->setVisible(sal_True); + xWindow->setVisible(true); } catch(const css::uno::RuntimeException&) { throw; } diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 70997655e0f6..dda1e7c5f9cc 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -362,7 +362,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) SolarMutexGuard aGuard; if( aName.isEmpty() ) - return sal_False; + return false; OUString aSearchName; @@ -375,7 +375,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) { pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate)); if( pItem && pItem->GetName() == aSearchName ) - return sal_True; + return true; } aSearchName = SvxUnogetInternalNameForItem(XATTR_LINEEND, aName); @@ -384,10 +384,10 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) { pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate)); if( pItem && pItem->GetName() == aSearchName ) - return sal_True; + return true; } - return sal_False; + return false; } // XElementAccess @@ -410,7 +410,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) { pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate)); if( pItem && !pItem->GetName().isEmpty() ) - return sal_True; + return true; } const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; @@ -418,10 +418,10 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) { pItem = static_cast<const NameOrIndex*>(mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate)); if( pItem && !pItem->GetName().isEmpty() ) - return sal_True; + return true; } - return sal_False; + return false; } /** diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 9e56776a7715..c7bbd9670827 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -128,7 +128,7 @@ void SvxDrawPage::dispose() if( !mrBHelper.bDisposed && !mrBHelper.bInDispose ) { // only one call go into this section - mrBHelper.bInDispose = sal_True; + mrBHelper.bInDispose = true; bDoDispose = true; } } @@ -153,15 +153,15 @@ void SvxDrawPage::dispose() // catch exception and throw again but signal that // the object was disposed. Dispose should be called // only once. - mrBHelper.bDisposed = sal_True; - mrBHelper.bInDispose = sal_False; + mrBHelper.bDisposed = true; + mrBHelper.bInDispose = false; throw; } // the values bDispose and bInDisposing must set in this order. // No multithread call overcome the "!rBHelper.bDisposed && !rBHelper.bInDispose" guard. - mrBHelper.bDisposed = sal_True; - mrBHelper.bInDispose = sal_False; + mrBHelper.bDisposed = true; + mrBHelper.bInDispose = false; } } diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 45c34631299a..093d72fc5703 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -525,7 +525,7 @@ void SvxOle2Shape::resetModifiedState() uno::Reference < util::XModifiable > xMod( pOle->GetObjRef(), uno::UNO_QUERY ); if( xMod.is() ) // TODO/MBA: what's this?! - xMod->setModified( sal_False ); + xMod->setModified( false ); } } } diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 68c09107b6c8..f95bff014f0f 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -149,7 +149,7 @@ void SvxShapeCollection::dispose() if( !mrBHelper.bDisposed && !mrBHelper.bInDispose ) { // only one call go into this section - mrBHelper.bInDispose = sal_True; + mrBHelper.bInDispose = true; bDoDispose = true; } } @@ -174,15 +174,15 @@ void SvxShapeCollection::dispose() // catch exception and throw again but signal that // the object was disposed. Dispose should be called // only once. - mrBHelper.bDisposed = sal_True; - mrBHelper.bInDispose = sal_False; + mrBHelper.bDisposed = true; + mrBHelper.bInDispose = false; throw; } // the values bDispose and bInDisposing must set in this order. // No multithread call overcome the "!rBHelper.bDisposed && !rBHelper.bInDispose" guard. - mrBHelper.bDisposed = sal_True; - mrBHelper.bInDispose = sal_False; + mrBHelper.bDisposed = true; + mrBHelper.bInDispose = false; } else { diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 6898ebb799f2..c8c7bbe86226 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -741,7 +741,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr MutexGuard aGuard( maMutex ); if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) { - return sal_True; + return true; } else { @@ -749,7 +749,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr if( !ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, true ) ) - return sal_False; + return false; comphelper::EmbeddedObjectContainer& rContainer = mpDocPersist->getEmbeddedObjectContainer(); return !aObjectStorageName.isEmpty() && @@ -774,7 +774,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements() MutexGuard aGuard( maMutex ); if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) { - return sal_True; + return true; } else { diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 7afceb1fe8b2..8aa36cd1be9f 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -451,7 +451,7 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt { OUString aPropName( "UseCommonStoragePasswordEncryption" ); uno::Reference < beans::XPropertySet > xProps( aRet.xStream, uno::UNO_QUERY ); - xProps->setPropertyValue( aPropName, uno::makeAny( sal_True) ); + xProps->setPropertyValue( aPropName, uno::makeAny( true) ); } } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 5c4fbc6a6a16..171e27c36e90 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -179,7 +179,7 @@ static void initializeStreamMetadata( const uno::Reference< uno::XInterface > &x xProps->setPropertyValue("MediaType", uno::makeAny( OUString( "text/xml" ) ) ); // use stock encryption - xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( sal_True ) ); + xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) ); } catch ( const uno::Exception & ) { OSL_FAIL( "exception setting stream metadata" ); |