diff options
18 files changed, 36 insertions, 36 deletions
diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index d72200771350..7e1b5f3b75b6 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -87,8 +87,8 @@ public: const OUString* pEnd = pStart + sServices.getLength(); for ( ; pStart != pEnd ; ++pStart ) if ( (*pStart).equals( ServiceName ) ) - return sal_True; - return sal_False; + return true; + return false; } virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override { diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index a7f167226a6c..cfae8b095f58 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -64,7 +64,7 @@ void SAL_CALL VbaButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeExcept sal_Bool SAL_CALL VbaButton::getCancel() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException, std::exception) @@ -75,7 +75,7 @@ void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeEx sal_Bool SAL_CALL VbaButton::getDefault() throw (uno::RuntimeException, std::exception) { // #STUB - return sal_False; + return false; } void SAL_CALL VbaButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException, std::exception) diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index 38effb8ecddf..19d3ce26129a 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -41,7 +41,7 @@ ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExceptio sal_Int32 nIndex = 0; _value >>= nIndex; uno::Reference< XPropValue > xPropVal( Selected( nIndex ), uno::UNO_QUERY_THROW ); - xPropVal->setValue( uno::makeAny( sal_True ) ); + xPropVal->setValue( uno::makeAny( true ) ); } uno::Any SAL_CALL @@ -247,10 +247,10 @@ ScVbaListBox::getValueEvent() for( sal_Int32 i = 0; i < nLength; i++ ) { if( nList[i] == nIndex ) - return uno::makeAny( sal_True ); + return uno::makeAny( true ); } - return uno::makeAny( sal_False ); + return uno::makeAny( false ); } void SAL_CALL diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index 6a34fd709b4c..6c92648c36b0 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -26,7 +26,7 @@ using namespace ooo::vba; ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ) { SAL_INFO("vbahelper", "ScVbaToggleButton(ctor)"); - m_xProps->setPropertyValue( "Toggle", uno::makeAny( sal_True ) ); + m_xProps->setPropertyValue( "Toggle", uno::makeAny( true ) ); } ScVbaToggleButton::~ScVbaToggleButton() @@ -88,7 +88,7 @@ void SAL_CALL ScVbaToggleButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::R sal_Bool SAL_CALL ScVbaToggleButton::getCancel() throw (uno::RuntimeException, std::exception) { // #STUB - return sal_False; + return false; } void SAL_CALL ScVbaToggleButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException, std::exception) @@ -99,7 +99,7 @@ void SAL_CALL ScVbaToggleButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::R sal_Bool SAL_CALL ScVbaToggleButton::getDefault() throw (uno::RuntimeException, std::exception) { // #STUB - return sal_False; + return false; } void SAL_CALL ScVbaToggleButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException, std::exception) diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 5de371fb0b2d..e80106b0dc29 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -275,7 +275,7 @@ ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr sal_Bool SAL_CALL ScVbaUserForm::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } uno::Any SAL_CALL ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException, std::exception) @@ -306,7 +306,7 @@ ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException return bRes; } } - return sal_False; + return false; } namespace userform diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 0c8798daa93b..352caea646b9 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -128,7 +128,7 @@ IMPL_LINK_NOARG_TYPED(VbaTimer, MacroCallHdl, Timer *, void) // mast be the last call in the method since it deletes the timer try { - m_xBase->OnTime( uno::makeAny( m_aTimerInfo.second.first ), m_aTimerInfo.first, uno::makeAny( m_aTimerInfo.second.second ), uno::makeAny( sal_False ) ); + m_xBase->OnTime( uno::makeAny( m_aTimerInfo.second.first ), m_aTimerInfo.first, uno::makeAny( m_aTimerInfo.second.second ), uno::makeAny( false ) ); } catch( uno::Exception& ) {} } @@ -205,10 +205,10 @@ VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException, std::exc uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( "LayoutManager"), uno::UNO_QUERY_THROW ); OUString url( "private:resource/statusbar/statusbar" ); if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){ - return sal_True; + return true; } } - return sal_False; + return false; } void SAL_CALL diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index 6739f36667d5..a43cdb334ff1 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -83,7 +83,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception) { // menu bar is always visible in OOo if( m_bIsMenu ) - return sal_True; + return true; bool bVisible = false; try @@ -217,7 +217,7 @@ void SAL_CALL VbaDummyCommandBar::setName( const OUString& _name ) throw (uno::R sal_Bool SAL_CALL VbaDummyCommandBar::getVisible() throw (uno::RuntimeException, std::exception) { // #STUB - return sal_True; + return true; } void SAL_CALL VbaDummyCommandBar::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception) diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index eb798ac7995a..bbdf4af1c152 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -134,7 +134,7 @@ ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException, std:: { // TODO: need to check if the item before this item is of type 'separator' //#STUB - return sal_False; + return false; } void SAL_CALL diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index e9986efaf454..ae45972e310a 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -32,8 +32,8 @@ public: virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override { if( m_nCurrentPosition < m_pCommandBarControls->getCount() ) - return sal_True; - return sal_False; + return true; + return false; } virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override { diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index 671cb344a522..ac684da32a2c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -124,9 +124,9 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException) css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException) { if( m_xDocCfgMgr->hasSettings( sResourceUrl ) ) - return m_xDocCfgMgr->getSettings( sResourceUrl, sal_True ); + return m_xDocCfgMgr->getSettings( sResourceUrl, true ); else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) ) - return m_xAppCfgMgr->getSettings( sResourceUrl, sal_True ); + return m_xAppCfgMgr->getSettings( sResourceUrl, true ); else { css::uno::Reference< css::container::XIndexAccess > xSettings( m_xAppCfgMgr->createSettings( ), uno::UNO_QUERY_THROW ); @@ -178,7 +178,7 @@ bool VbaCommandBarHelper::hasToolbar( const OUString& sResourceUrl, const OUStri if( m_xDocCfgMgr->hasSettings( sResourceUrl ) ) { OUString sUIName; - uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, false ), uno::UNO_QUERY_THROW ); xPropertySet->getPropertyValue( ITEM_DESCRIPTOR_UINAME ) >>= sUIName; if( sName.equalsIgnoreAsciiCase( sUIName ) ) return true; diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 87d033b7c396..3eca6d6f4066 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -49,8 +49,8 @@ public: virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override { if( m_nCurrentPosition < m_sNames.getLength() ) - return sal_True; - return sal_False; + return true; + return false; } virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override { diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 21b5b05d1cba..6814e67f056c 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -165,7 +165,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, if ( xCloseable.is() ) { bCloseable = true; - xCloseable->close(sal_True); + xCloseable->close(true); } } catch (const uno::Exception &) diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 054b60036bbc..ca8aa5e41b12 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -216,7 +216,7 @@ void lclSetupComponent( const uno::Reference< lang::XComponent >& rxComponent, b uno::Reference< frame::XModel > xModel( rxComponent, uno::UNO_QUERY_THROW ); uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW ); uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW ); - uno::Reference< awt::XWindow >( xFrame->getContainerWindow(), uno::UNO_SET_THROW )->setEnable( sal_False ); + uno::Reference< awt::XWindow >( xFrame->getContainerWindow(), uno::UNO_SET_THROW )->setEnable( false ); } catch( uno::Exception& ) { diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index fb1db5bdcc14..974afc533c58 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -242,7 +242,7 @@ sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, c { EventHandlerInfoMap::const_iterator aIt = maEventInfos.find( nEventId ); if( aIt == maEventInfos.end() ) - return sal_False; // throwing a lot of exceptions is slow. + return false; // throwing a lot of exceptions is slow. else // getEventHandlerPath() searches for the macro in the document return !getEventHandlerPath( aIt->second, rArgs ).isEmpty(); } diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx index 31f77ddee679..ab3bfdea19e9 100644 --- a/vbahelper/source/vbahelper/vbafillformat.cxx +++ b/vbahelper/source/vbahelper/vbafillformat.cxx @@ -80,8 +80,8 @@ ScVbaFillFormat::getVisible() throw (uno::RuntimeException, std::exception) drawing::FillStyle nFillStyle; m_xPropertySet->getPropertyValue( "FillStyle" ) >>= nFillStyle; if( nFillStyle == drawing::FillStyle_NONE ) - return sal_False; - return sal_True; + return false; + return true; } void SAL_CALL diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index f0229e472faa..9d83d7059e6c 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -229,9 +229,9 @@ ScVbaLineFormat::getVisible() throw (uno::RuntimeException, std::exception) m_xPropertySet->getPropertyValue( "LineStyle" ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_NONE ) { - return sal_False; + return false; } - return sal_True; + return true; } void SAL_CALL diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 96eb92b63363..d6cce93b7c0d 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -281,7 +281,7 @@ ScVbaShape::getVisible() throw (uno::RuntimeException, std::exception) { // #STUB //UNO Shapes are always visible - return sal_True; + return true; } void SAL_CALL @@ -516,7 +516,7 @@ sal_Bool SAL_CALL ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException, std::exception) { // #STUB - return sal_False; + return false; } void SAL_CALL @@ -529,7 +529,7 @@ sal_Bool SAL_CALL ScVbaShape::getLockAnchor() throw (uno::RuntimeException, std::exception) { // #STUB - return sal_True; + return true; } void SAL_CALL diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index 21b4abca77a3..d86d2635bbcc 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -35,7 +35,7 @@ VbaTextFrame::setAsMSObehavior() //set property TextWordWrap default as False. // TextFitToSize control the text content. it seems we should set the default as False. // com.sun.star.drawing.TextFitToSizeType.NONE - m_xPropertySet->setPropertyValue( "TextWordWrap", uno::makeAny( sal_False ) ); + m_xPropertySet->setPropertyValue( "TextWordWrap", uno::makeAny( false ) ); m_xPropertySet->setPropertyValue( "TextFitToSize", uno::makeAny( drawing::TextFitToSizeType_NONE ) ); } |