diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:16:53 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:40 +0200 |
commit | 2ee796ba49a13c38c1eb1e98c5e8b78d1ce18b64 (patch) | |
tree | dc1c62db36a2824a0e90cd77d4382edaab216ba2 /extensions | |
parent | 4bff11d579dce8e2bb4f35f9218003bb28cf5a01 (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: Ief96e7038461f514d8fe5bf16b7181b122715775
Diffstat (limited to 'extensions')
27 files changed, 97 insertions, 97 deletions
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index af54ed9eb082..006a503873c1 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -129,7 +129,7 @@ namespace abp // User has one chance to accept it or not. // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. - css::uno::Sequence< css::beans::NamedValue > lProtocol { { "Deactivate", css::uno::makeAny( sal_True ) } }; + css::uno::Sequence< css::beans::NamedValue > lProtocol { { "Deactivate", css::uno::makeAny( true ) } }; return makeAny( lProtocol ); } diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index de5a3d513f06..db118bd44b79 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -154,8 +154,8 @@ namespace bib m_xControlContainer->addControl("GridControl", m_xControl); m_xGridWin.set(m_xControl, UNO_QUERY ); m_xDispatchProviderInterception.set(m_xControl, UNO_QUERY ); - m_xGridWin->setVisible( sal_True ); - m_xControl->setDesignMode( sal_True ); + m_xGridWin->setVisible( true ); + m_xControl->setDesignMode( true ); // initially switch on the design mode - switch it off _after_ loading the form ::Size aSize = GetOutputSizePixel(); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index d60e21bf2af2..e0d0ac5568b0 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -296,7 +296,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt if (pParentComponent) { // not earlier because SetFocus() is triggered in setVisible() - pParentComponent->setVisible(sal_True); + pParentComponent->setVisible(true); } m_xDatMan->load(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index d0218c04a60e..418f6b2ffe9c 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -688,7 +688,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) const OUString sType("Type"); sal_Int32 nType = 0; bool bIsFormatted = false; - sal_Bool bFormattedIsNumeric = sal_True; + sal_Bool bFormattedIsNumeric = true; xField->getPropertyValue(sType) >>= nType; switch(nType) { @@ -708,7 +708,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) case DataType::LONGVARCHAR: case DataType::CHAR: case DataType::CLOB: - bFormattedIsNumeric = sal_False; + bFormattedIsNumeric = false; // _NO_ break ! default: sCurrentModelType = "FormattedField"; @@ -884,7 +884,7 @@ void BibDataManager::setFilter(const OUString& rQuery) OUString aQuery = m_xParser->getFilter(); Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW ); xFormProps->setPropertyValue( "Filter", makeAny( aQuery ) ); - xFormProps->setPropertyValue( "ApplyFilter", makeAny( sal_True ) ); + xFormProps->setPropertyValue( "ApplyFilter", makeAny( true ) ); reload(); } catch (const Exception&) @@ -1022,8 +1022,8 @@ void BibDataManager::setActiveDataSource(const OUString& rURL) } FeatureStateEvent aEvent; util::URL aURL; - aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.IsEnabled = true; + aEvent.Requery = false; aEvent.FeatureDescriptor = getActiveDataTable(); aEvent.State = makeAny( getDataSources() ); @@ -1369,7 +1369,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( xPropSet->setPropertyValue("StringItemList", aAny); - sal_Bool bTrue = sal_True; + sal_Bool bTrue = true; aAny.setValue( &bTrue, cppu::UnoType<bool>::get() ); xPropSet->setPropertyValue( "Dropdown", aAny ); } diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index b1222be650df..ad713bd538cb 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -218,7 +218,7 @@ void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ ) throw (css::uno::RuntimeException, std::exception) { - return sal_False; + return false; } sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception) @@ -227,7 +227,7 @@ sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (css::uno:: getFrame()->removeFrameActionListener( pImp ); else getFrame()->addFrameActionListener( pImp ); - return sal_True; + return true; } uno::Any BibFrameController_Impl::getViewData() throw (css::uno::RuntimeException, std::exception) @@ -452,8 +452,8 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; - aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.IsEnabled = true; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); pObj->xListener->statusChanged( aEvent ); //break; because there are more than one @@ -504,7 +504,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = !pDatMan->getParser()->getFilter().isEmpty(); - aEvent.Requery = sal_False; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); pObj->xListener->statusChanged( aEvent ); } @@ -648,22 +648,22 @@ void BibFrameController_Impl::addStatusListener( // send first status synchronously FeatureStateEvent aEvent; aEvent.FeatureURL = aURL; - aEvent.Requery = sal_False; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); if ( aURL.Path == "StatusBarVisible" ) { - aEvent.IsEnabled = sal_False; + aEvent.IsEnabled = false; aEvent.State <<= false; } else if ( aURL.Path == "Bib/hierarchical" ) { - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; const char* pHier = bHierarchical? "" : "*" ; aEvent.State <<= OUString::createFromAscii(pHier); } else if(aURL.Path == "Bib/MenuFilter") { - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; aEvent.FeatureDescriptor=pDatMan->getQueryField(); uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields(); @@ -672,7 +672,7 @@ void BibFrameController_Impl::addStatusListener( } else if ( aURL.Path == "Bib/source") { - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; aEvent.FeatureDescriptor=pDatMan->getActiveDataTable(); uno::Sequence<OUString> aStringSeq=pDatMan->getDataSources(); @@ -683,11 +683,11 @@ void BibFrameController_Impl::addStatusListener( aURL.Path == "Bib/autoFilter" || aURL.Path == "Bib/standardFilter" ) { - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; } else if(aURL.Path == "Bib/query") { - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; aEvent.State <<= pConfig->getQueryText(); } else if (aURL.Path == "Bib/removeFilter" ) @@ -711,7 +711,7 @@ void BibFrameController_Impl::addStatusListener( } else if(aURL.Path == "Paste" ) { - aEvent.IsEnabled = sal_False; + aEvent.IsEnabled = false; vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) { @@ -809,8 +809,8 @@ void BibFrameController_Impl::RemoveFilter() { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; - aEvent.IsEnabled = sal_False; - aEvent.Requery = sal_False; + aEvent.IsEnabled = false; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); pObj->xListener->statusChanged( aEvent ); bRemoveFilter=true; @@ -819,8 +819,8 @@ void BibFrameController_Impl::RemoveFilter() { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; - aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.IsEnabled = true; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); aEvent.State <<= aQuery; pObj->xListener->statusChanged( aEvent ); @@ -869,8 +869,8 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; - aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.IsEnabled = true; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); aEvent.FeatureDescriptor=pDatMan->getQueryField(); @@ -884,8 +884,8 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; - aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.IsEnabled = true; + aEvent.Requery = false; aEvent.Source = static_cast<XDispatch *>(this); BibConfig* pConfig = BibModul::GetConfig(); aEvent.State <<= pConfig->getQueryText(); diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index d8af447efee7..440d59e17eb2 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -499,8 +499,8 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( break; } // initially switch on the design mode - switch it off _after_ loading the form - xCtrWin->setVisible( sal_True ); - xControl->setDesignMode( sal_True ); + xCtrWin->setVisible( true ); + xControl->setDesignMode( true ); vcl::Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer()); pWindow->set_grid_top_attach(rLabel.get_grid_top_attach()); diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 340518d09884..964b6da10674 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -222,14 +222,14 @@ namespace logging OString sEntry; if ( !m_aHandlerHelper.formatForPublishing( _rRecord, sEntry ) ) - return sal_False; + return false; if ( _rRecord.Level >= m_nThreshold ) fprintf( stderr, "%s\n", sEntry.getStr() ); else fprintf( stdout, "%s\n", sEntry.getStr() ); - return sal_True; + return true; } OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException, std::exception) diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 686ccb63692e..ae155fbc544f 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -322,14 +322,14 @@ namespace logging MethodGuard aGuard( *this ); if ( !impl_prepareFile_nothrow() ) - return sal_False; + return false; OString sEntry; if ( !m_aHandlerHelper.formatForPublishing( _rRecord, sEntry ) ) - return sal_False; + return false; impl_writeString_nothrow( sEntry ); - return sal_True; + return true; } OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException, std::exception) diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index e88e939864be..dfce9d77709a 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -614,7 +614,7 @@ namespace pcr OSL_ENSURE( xHelper.is(), "EFormsHelper::getModelElementUIName: invalid element or model!" ); if ( xHelper.is() ) { - OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, true ) : xHelper->getBindingName( _rxElement, true ); Reference< xforms::XModel > xModel( xHelper, UNO_QUERY_THROW ); sUIName = composeModelElementUIName( xModel->getID(), sElementName ); } @@ -686,7 +686,7 @@ namespace pcr xElement->setPropertyValue( PROPERTY_MODEL, makeAny( xModel ) ); } #endif - OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, true ) : xHelper->getBindingName( xElement, true ); OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); OSL_ENSURE( rMapUINameToElement.find( sUIName ) == rMapUINameToElement.end(), "EFormsHelper::getAllElementUINames: duplicate name!" ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index b63e96b0a2b2..d7daaedbc8fd 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -459,7 +459,7 @@ namespace pcr aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false, true ); break; default: - aDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, sal_False ); + aDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, false ); break; } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 8a648169ce2e..ea90ad867275 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -781,21 +781,21 @@ namespace pcr LineDescriptor aDescriptor; - aDescriptor.Control = _rxControlFactory->createPropertyControl( PropertyControlType::TextField, sal_True ); + aDescriptor.Control = _rxControlFactory->createPropertyControl( PropertyControlType::TextField, true ); Reference< XEventListener > xControlExtender = new PropertyControlExtender( aDescriptor.Control ); const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); aDescriptor.PrimaryButtonId = OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); - aDescriptor.HasPrimaryButton = sal_True; + aDescriptor.HasPrimaryButton = true; aDescriptor.Category = "Events"; return aDescriptor; } sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) { - return sal_False; + return false; } InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) @@ -888,7 +888,7 @@ namespace pcr sal_Bool SAL_CALL EventHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception) { - return sal_True; + return true; } Reference< XFrame > EventHandler::impl_getContextFrame_nothrow() const diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index b60e5e5f8d52..35835048d077 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1223,7 +1223,7 @@ namespace pcr } } - Optional< double > aValueNotPresent( sal_False, 0 ); + Optional< double > aValueNotPresent( false, 0 ); aDescriptor.Control = PropertyHandlerHelper::createNumericControl( _rxControlFactory, nDigits, aValueNotPresent, aValueNotPresent, false ); @@ -1312,8 +1312,8 @@ namespace pcr OTimeDurationControl* pControl = new OTimeDurationControl( impl_getDefaultDialogParent_nothrow(), WB_BORDER | WB_TABSTOP ); aDescriptor.Control = pControl; - pControl->setMinValue( Optional< double >( sal_True, 0 ) ); - pControl->setMaxValue( Optional< double >( sal_True, ::std::numeric_limits< double >::max() ) ); + pControl->setMinValue( Optional< double >( true, 0 ) ); + pControl->setMaxValue( Optional< double >( true, ::std::numeric_limits< double >::max() ) ); } break; @@ -1325,8 +1325,8 @@ namespace pcr case PROPERTY_ID_BLOCKINCREMENT: case PROPERTY_ID_SPININCREMENT: { - Optional< double > aMinValue( sal_True, 0 ); - Optional< double > aMaxValue( sal_True, 0x7FFFFFFF ); + Optional< double > aMinValue( true, 0 ); + Optional< double > aMaxValue( true, 0x7FFFFFFF ); if ( nPropId == PROPERTY_ID_MAXTEXTLEN || nPropId == PROPERTY_ID_BOUNDCOLUMN ) aMinValue.Value = -1; @@ -1342,8 +1342,8 @@ namespace pcr case PROPERTY_ID_DECIMAL_ACCURACY: { - Optional< double > aMinValue( sal_True, 0 ); - Optional< double > aMaxValue( sal_True, 20 ); + Optional< double > aMinValue( true, 0 ); + Optional< double > aMaxValue( true, 20 ); aDescriptor.Control = PropertyHandlerHelper::createNumericControl( _rxControlFactory, 0, aMinValue, aMaxValue, false ); @@ -1400,9 +1400,9 @@ namespace pcr } if ( !aDescriptor.PrimaryButtonId.isEmpty() ) - aDescriptor.HasPrimaryButton = sal_True; + aDescriptor.HasPrimaryButton = true; if ( !aDescriptor.SecondaryButtonId.isEmpty() ) - aDescriptor.HasSecondaryButton = sal_True; + aDescriptor.HasSecondaryButton = true; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; aDescriptor.Category = bIsDataProperty ? OUString("Data") : OUString("General"); @@ -2019,7 +2019,7 @@ namespace pcr if ( _bSuspend ) if ( m_xCommandDesigner.is() && m_xCommandDesigner->isActive() ) return m_xCommandDesigner->suspend(); - return sal_True; + return true; } @@ -2475,7 +2475,7 @@ namespace pcr break; default: - _out_rProperty.Control = _rxControlFactory->createPropertyControl( PropertyControlType::MultiLineTextField, sal_False ); + _out_rProperty.Control = _rxControlFactory->createPropertyControl( PropertyControlType::MultiLineTextField, false ); break; } } @@ -2571,7 +2571,7 @@ namespace pcr switch( nListSourceType ) { case ListSourceType_VALUELIST: - _out_rDescriptor.Control = _rxControlFactory->createPropertyControl( PropertyControlType::StringListField, sal_False ); + _out_rDescriptor.Control = _rxControlFactory->createPropertyControl( PropertyControlType::StringListField, false ); break; case ListSourceType_TABLEFIELDS: @@ -3208,12 +3208,12 @@ namespace pcr const OUString* pToDisable = xCommandUI->getPropertiesToDisable(); while ( !pToDisable->isEmpty() ) { - m_xBrowserUI->enablePropertyUIElements( *pToDisable++, PropertyLineElement::All, sal_False ); + m_xBrowserUI->enablePropertyUIElements( *pToDisable++, PropertyLineElement::All, false ); } // but enable the browse button for the property itself - so it can be used to raise the query designer OUString sPropertyName( impl_getPropertyNameFromId_nothrow( _nDesignForProperty ) ); - m_xBrowserUI->enablePropertyUIElements( sPropertyName, PropertyLineElement::PrimaryButton, sal_True ); + m_xBrowserUI->enablePropertyUIElements( sPropertyName, PropertyLineElement::PrimaryButton, true ); } } catch( const Exception& ) @@ -3239,7 +3239,7 @@ namespace pcr const OUString* pToEnable = xCommandUI->getPropertiesToDisable(); while ( !pToEnable->isEmpty() ) { - m_xBrowserUI->enablePropertyUIElements( *pToEnable++, PropertyLineElement::All, sal_True ); + m_xBrowserUI->enablePropertyUIElements( *pToEnable++, PropertyLineElement::All, true ); } } catch( const Exception& ) diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 097db8089589..13c5d8ae713d 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -190,7 +190,7 @@ namespace pcr getFastPropertyValue( rOldValue, nHandle ); rConvertedValue = rValue; - return sal_True; + return true; } diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index c341e591c794..996ec0105987 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -454,8 +454,8 @@ namespace pcr case PROPERTY_ID_POSITIONX: case PROPERTY_ID_POSITIONY: { - Optional< double > aZero( sal_True, 0 ); - Optional< double > aValueNotPresent( sal_False, 0 ); + Optional< double > aZero( true, 0 ); + Optional< double > aValueNotPresent( false, 0 ); aLineDesc.Control = PropertyHandlerHelper::createNumericControl( _rxControlFactory, 2, bIsSize ? aZero : aValueNotPresent, aValueNotPresent, false ); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 53e2879e4b25..4cef8339ae9d 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -597,7 +597,7 @@ namespace pcr sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) { - return sal_False; + return false; } InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) @@ -613,7 +613,7 @@ namespace pcr sal_Bool SAL_CALL GenericPropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception) { - return sal_True; + return true; } void SAL_CALL GenericPropertyHandler::disposing() diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index cb1d20590c22..ee9bce1acc9e 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -244,7 +244,7 @@ namespace pcr try { Reference< XModifiable > xDocumentModifiable( getContextDocument_throw(_rContext), UNO_QUERY_THROW ); - xDocumentModifiable->setModified( sal_True ); + xDocumentModifiable->setModified( true ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 7a478149a8cc..434cfefb8f56 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -472,11 +472,11 @@ namespace pcr { // this means a "suspend" is to be "revoked" suspendPropertyHandlers_nothrow( false ); // we ourself cannot revoke our suspend - return sal_False; + return false; } if ( !suspendAll_nothrow() ) - return sal_False; + return false; // commit the editor's content if ( haveView() ) @@ -486,7 +486,7 @@ namespace pcr stopContainerWindowListening(); // outtahere - return sal_True; + return true; } diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index e0b94cfff3b5..7c1d6fe7e9b1 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -483,7 +483,7 @@ namespace pcr do { --loop; - (*loop)->suspend( sal_False ); + (*loop)->suspend( false ); } while ( loop != m_aSlaveHandlers.begin() ); } diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 972be7e26e5b..d42f0fbb8ec5 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -239,7 +239,7 @@ namespace pcr sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception) { - return sal_True; + return true; } IMPLEMENT_FORWARD_XCOMPONENT( PropertyHandler, PropertyHandler_Base ) @@ -335,7 +335,7 @@ namespace pcr { Reference< XModifiable > xModifiable( impl_getContextDocument_nothrow(), UNO_QUERY ); if ( xModifiable.is() ) - xModifiable->setModified( sal_True ); + xModifiable->setModified( true ); } bool PropertyHandler::impl_componentHasProperty_throw( const OUString& _rPropName ) const diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 6518c30665ac..eda16464844b 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -333,7 +333,7 @@ namespace pcr // fallback: use the XCloseable::close (with all possible disadvantages) Reference< XCloseable > xClose( m_xDesigner->getFrame(), UNO_QUERY ); if ( xClose.is() ) - xClose->close( sal_True ); + xClose->close( true ); } } catch( const Exception& ) @@ -351,7 +351,7 @@ namespace pcr bool bAllow = true; try { - bAllow = m_xDesigner->suspend( sal_True ); + bAllow = m_xDesigner->suspend( true ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 25e4bd45407b..325dba0e46fb 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -500,11 +500,11 @@ namespace pcr Optional< double > SAL_CALL ONumericControl::getMinValue() throw (RuntimeException, std::exception) { - Optional< double > aReturn( sal_True, 0 ); + Optional< double > aReturn( true, 0 ); sal_Int64 minValue = getTypedControlWindow()->GetMin(); if ( minValue == ::std::numeric_limits< sal_Int64 >::min() ) - aReturn.IsPresent = sal_False; + aReturn.IsPresent = false; else aReturn.Value = (double)minValue; @@ -523,11 +523,11 @@ namespace pcr Optional< double > SAL_CALL ONumericControl::getMaxValue() throw (RuntimeException, std::exception) { - Optional< double > aReturn( sal_True, 0 ); + Optional< double > aReturn( true, 0 ); sal_Int64 maxValue = getTypedControlWindow()->GetMax(); if ( maxValue == ::std::numeric_limits< sal_Int64 >::max() ) - aReturn.IsPresent = sal_False; + aReturn.IsPresent = false; else aReturn.Value = (double)maxValue; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 4deb6e46817e..6528ba3c7a11 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -60,7 +60,7 @@ namespace pcr virtual sal_Int32 SAL_CALL getGroupCount() throw( RuntimeException, std::exception ) override {return 0;} virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException, std::exception ) override {} virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException, std::exception ) override {} - virtual sal_Bool SAL_CALL getGroupControl() throw( RuntimeException, std::exception ) override {return sal_False;} ; + virtual sal_Bool SAL_CALL getGroupControl() throw( RuntimeException, std::exception ) override {return false;} ; virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception ) override {}; }; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 55bc53403b2e..15f97a5eef84 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -302,8 +302,8 @@ namespace pcr // collect some information about the to-be-created control sal_Int16 nControlType = PropertyControlType::TextField; ::std::vector< OUString > aListEntries; - Optional< double > aMinValue( sal_False, 0 ); - Optional< double > aMaxValue( sal_False, 0 ); + Optional< double > aMinValue( false, 0 ); + Optional< double > aMaxValue( false, 0 ); switch ( nPropId ) { @@ -314,7 +314,7 @@ namespace pcr aDescriptor.PrimaryButtonId = UID_PROP_ADD_DATA_TYPE; aDescriptor.SecondaryButtonId = UID_PROP_REMOVE_DATA_TYPE; - aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; + aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = true; aDescriptor.PrimaryButtonImageURL = "private:graphicrepository/extensions/res/buttonplus.png"; aDescriptor.SecondaryButtonImageURL = "private:graphicrepository/extensions/res/buttonminus.png"; break; @@ -354,7 +354,7 @@ namespace pcr ::rtl::Reference< XSDDataType > xDataType( m_pHelper->getValidatingDataType() ); sal_Int16 nTypeClass = xDataType.is() ? xDataType->classify() : DataTypeClass::STRING; - aMinValue.IsPresent = aMaxValue.IsPresent = sal_True; + aMinValue.IsPresent = aMaxValue.IsPresent = true; aMinValue.Value = DataTypeClass::gYear == nTypeClass ? 0 : 1; aMaxValue.Value = ::std::numeric_limits< sal_Int32 >::max(); if ( DataTypeClass::gMonth == nTypeClass ) @@ -407,7 +407,7 @@ namespace pcr aDescriptor.Control = PropertyHandlerHelper::createNumericControl( _rxControlFactory, 0, aMinValue, aMaxValue, false ); break; default: - aDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, sal_False ); + aDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, false ); break; } diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index cc41be8f571c..eb7a6c7a6aac 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -290,12 +290,12 @@ namespace extensions { namespace resource ResourceTypePtr resourceType; sal_Int32 resourceId( 0 ); if ( !impl_getResourceTypeAndId_nothrow( _key, resourceType, resourceId ) ) - return sal_False; + return false; if ( !m_pResourceManager->IsAvailable( StringResourceAccess::getResourceType(), resourceId ) ) - return sal_False; + return false; - return sal_True; + return true; } Type SAL_CALL OpenOfficeResourceBundle::getElementType( ) throw (RuntimeException, std::exception) diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index a304b4eb52df..8fe2363ab0e6 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -1330,7 +1330,7 @@ void UpdateCheck::handleMenuBarUI( const rtl::Reference< UpdateHandler >& rUpdat { if( UPDATESTATE_NO_UPDATE_AVAIL == eState ) { - xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::makeAny(sal_False) ); + xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::makeAny(false) ); } else { @@ -1338,10 +1338,10 @@ void UpdateCheck::handleMenuBarUI( const rtl::Reference< UpdateHandler >& rUpdat xMenuBarUI->setPropertyValue( PROPERTY_TEXT, uno::makeAny(rUpdateHandler->getBubbleText(eState)) ); if( ! suppressBubble && ( ! rUpdateHandler->isVisible() || rUpdateHandler->isMinimized() ) ) - xMenuBarUI->setPropertyValue( PROPERTY_SHOW_BUBBLE, uno::makeAny( sal_True ) ); + xMenuBarUI->setPropertyValue( PROPERTY_SHOW_BUBBLE, uno::makeAny( true ) ); if( UPDATESTATE_CHECKING != eState ) - xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::makeAny(sal_True) ); + xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::makeAny(true) ); } } } diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 4392cbf3a391..2d3ba9119941 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -145,7 +145,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const rInfo.Version = getStringValue(UPDATE_VERSION); rInfo.Description = getStringValue(UPDATE_DESCRIPTION); - sal_Bool isDirectDownload = sal_False; + sal_Bool isDirectDownload = false; m_aNameAccess.getValue(IS_DIRECT_DOWNLOAD) >>= isDirectDownload; rInfo.Sources.push_back( DownloadSource( isDirectDownload, getStringValue(DOWNLOAD_URL) ) ); @@ -253,7 +253,7 @@ UpdateCheckConfig::get( bool UpdateCheckConfig::isAutoCheckEnabled() const { - sal_Bool nValue = sal_False; + sal_Bool nValue = false; const_cast < UpdateCheckConfig *> (this)->getByName( AUTOCHECK_ENABLED ) >>= nValue; return nValue; } @@ -261,7 +261,7 @@ UpdateCheckConfig::isAutoCheckEnabled() const bool UpdateCheckConfig::isAutoDownloadEnabled() const { - sal_Bool nValue = sal_False; + sal_Bool nValue = false; const_cast < UpdateCheckConfig *> (this)->getByName( AUTODOWNLOAD_ENABLED ) >>= nValue; return nValue; } @@ -520,7 +520,7 @@ UpdateCheckConfig::commitChanges() aChangesSet[i].Accessor >>= aString; if( aString.endsWith(AUTOCHECK_ENABLED "']") ) { - sal_Bool bEnabled = sal_False; + sal_Bool bEnabled = false; aChangesSet[i].Element >>= bEnabled; m_rListener->autoCheckStatusChanged(bEnabled); } @@ -551,7 +551,7 @@ UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exce if( xChangesBatch.is() ) return xChangesBatch->hasPendingChanges(); - return sal_False; + return false; } uno::Sequence< util::ElementChange > SAL_CALL diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 0cf1e501d9fb..a4dd327f443f 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -489,7 +489,7 @@ UpdateInformationProvider::load(const OUString& rURL) // Disable KeepAlive in webdav - don't want millions of office // instances phone home & clog up servers - uno::Sequence< beans::NamedValue > aProps { { "KeepAlive", uno::makeAny(sal_False) } }; + uno::Sequence< beans::NamedValue > aProps { { "KeepAlive", uno::makeAny(false) } }; ucb::OpenCommandArgument3 aOpenArgument; aOpenArgument.Mode = ucb::OpenMode::DOCUMENT; @@ -565,7 +565,7 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode * seems to evaluate expression always relative to the root node. */ uno::Reference< xml::dom::XDocument > xUpdateXML = m_xDocumentBuilder->newDocument(); - xUpdateXML->appendChild( xUpdateXML->importNode(xChildElement.get(), sal_True ) ); + xUpdateXML->appendChild( xUpdateXML->importNode(xChildElement.get(), true ) ); return xUpdateXML->getDocumentElement(); } } |