From ed467869d8010b51d1f76c86b3628e23ec434655 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Apr 2016 17:17:17 +0200 Subject: loplugin:salbool: Automatic rewrite of sal_False/True Change-Id: Idf27ee5370f1fa24adf22908d9e801c7d40db935 --- .../accelerators/acceleratorconfiguration.cxx | 8 +++--- framework/source/classes/taskcreator.cxx | 4 +-- framework/source/dispatch/closedispatcher.cxx | 6 ++--- .../source/dispatch/startmoduledispatcher.cxx | 2 +- framework/source/dispatch/systemexec.cxx | 2 +- .../fwe/classes/actiontriggerpropertyset.cxx | 2 +- .../classes/actiontriggerseparatorpropertyset.cxx | 2 +- .../fwe/classes/rootactiontriggercontainer.cxx | 2 +- .../source/fwi/uielement/constitemcontainer.cxx | 2 +- .../source/fwi/uielement/rootitemcontainer.cxx | 2 +- .../source/helper/dockingareadefaultacceptor.cxx | 6 ++--- .../source/helper/uiconfigelementwrapperbase.cxx | 2 +- framework/source/helper/uielementwrapperbase.cxx | 4 +-- framework/source/jobs/job.cxx | 6 ++--- framework/source/jobs/shelljob.cxx | 2 +- framework/source/layoutmanager/helpers.cxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 26 +++++++++---------- .../source/layoutmanager/toolbarlayoutmanager.cxx | 24 ++++++++--------- framework/source/loadenv/loadenv.cxx | 10 ++++---- framework/source/recording/dispatchrecorder.cxx | 4 +-- framework/source/services/autorecovery.cxx | 24 ++++++++--------- framework/source/services/desktop.cxx | 18 ++++++------- framework/source/services/dispatchhelper.cxx | 2 +- framework/source/services/frame.cxx | 16 ++++++------ framework/source/services/pathsettings.cxx | 8 +++--- framework/source/services/sessionlistener.cxx | 2 +- framework/source/services/urltransformer.cxx | 30 +++++++++++----------- framework/source/tabwin/tabwindow.cxx | 2 +- .../source/uiconfiguration/globalsettings.cxx | 2 +- .../source/uiconfiguration/imagemanagerimpl.cxx | 6 ++--- .../moduleuiconfigurationmanager.cxx | 8 +++--- .../uiconfiguration/uicategorydescription.cxx | 2 +- .../uiconfiguration/uiconfigurationmanager.cxx | 4 +-- .../uiconfiguration/windowstateconfiguration.cxx | 12 ++++----- framework/source/uielement/fontmenucontroller.cxx | 6 ++--- .../source/uielement/fontsizemenucontroller.cxx | 4 +-- .../uielement/langselectionstatusbarcontroller.cxx | 4 +-- framework/source/uielement/menubarwrapper.cxx | 8 +++--- .../source/uielement/popuptoolbarcontroller.cxx | 2 +- .../source/uielement/recentfilesmenucontroller.cxx | 2 +- .../source/uielement/resourcemenucontroller.cxx | 4 +-- framework/source/uielement/statusbaritem.cxx | 2 +- framework/source/uielement/statusbarmanager.cxx | 2 +- framework/source/uielement/statusbarwrapper.cxx | 4 +-- .../source/uielement/subtoolbarcontroller.cxx | 4 +-- framework/source/uielement/toolbarmanager.cxx | 8 +++--- .../source/uielement/toolbarsmenucontroller.cxx | 8 +++--- framework/source/uielement/toolbarwrapper.cxx | 4 +-- .../source/uielement/uicommanddescription.cxx | 4 +-- 49 files changed, 160 insertions(+), 160 deletions(-) (limited to 'framework') diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 347cfb02b2bc..ae62a7a789dc 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -348,7 +348,7 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); - return sal_False; + return false; } void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) @@ -930,13 +930,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException, std::exception) { - return sal_False; + return false; } sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) @@ -949,7 +949,7 @@ sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); - return sal_False; + return false; } void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index b5c4a9df82f8..3bc3b1e4ce3b 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -94,7 +94,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin lArgs[0] <<= aArg; aArg.Name = ARGUMENT_CREATETOPWINDOW; - aArg.Value <<= sal_True; + aArg.Value <<= true; lArgs[1] <<= aArg; aArg.Name = ARGUMENT_MAKEVISIBLE; @@ -102,7 +102,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin lArgs[2] <<= aArg; aArg.Name = ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE; - aArg.Value <<= sal_True; + aArg.Value <<= true; lArgs[3] <<= aArg; aArg.Name = ARGUMENT_FRAMENAME; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index f2de64773fa6..ae891805552d 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -395,7 +395,7 @@ IMPL_LINK_NOARG_TYPED(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) { css::uno::Reference< css::frame::XController > xController = xCloseFrame->getController(); if (xController.is()) - xController->suspend(sal_False); + xController->suspend(false); } // inform listener @@ -459,7 +459,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c css::uno::Reference< css::frame::XController > xController = xFrame->getController(); if (xController.is()) // some views don't uses a controller .-( (e.g. the help window) { - bControllerSuspended = xController->suspend(sal_True); + bControllerSuspended = xController->suspend(true); if (! bControllerSuspended) return false; } @@ -523,7 +523,7 @@ bool CloseDispatcher::implts_establishBackingMode() css::uno::Reference< css::awt::XWindow > xBackingWin(xStartModule, css::uno::UNO_QUERY); xFrame->setComponent(xBackingWin, xStartModule); xStartModule->attachFrame(xFrame); - xContainerWindow->setVisible(sal_True); + xContainerWindow->setVisible(true); return true; } diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 96d40fdd77e4..06e81a7aaf43 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -141,7 +141,7 @@ bool StartModuleDispatcher::implts_establishBackingMode() css::uno::Reference< css::awt::XWindow > xComponentWindow(xStartModule, css::uno::UNO_QUERY); xFrame->setComponent(xComponentWindow, xStartModule); xStartModule->attachFrame(xFrame); - xContainerWindow->setVisible(sal_True); + xContainerWindow->setVisible(true); return true; } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 98d60fd06bce..91e058b9c7bb 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -110,7 +110,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& { css::uno::Reference< css::util::XStringSubstitution > xPathSubst( css::util::PathSubstitution::create(m_xContext) ); - OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists ! + OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, true); // sal_True force an exception if unknown variables exists ! css::uno::Reference< css::system::XSystemShellExecute > xShell = css::system::SystemShellExecute::create( m_xContext ); diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index fb217fd46286..158429eef129 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -271,7 +271,7 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue( // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 20cf8aabdf7f..63c3ed4bb3c3 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -216,7 +216,7 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue( // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 8c2d94ea4b3a..f58cdcc5c500 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -210,7 +210,7 @@ throw (css::uno::RuntimeException, std::exception) return ( m_pMenu->GetItemCount() > 0 ); } - return sal_False; + return false; } // XServiceInfo diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index dfdeb6eeca5c..ad41b0f15437 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -308,7 +308,7 @@ throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 1ce57fb0d02d..5974fd94c376 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -320,7 +320,7 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( css::uno::Any& aValue , // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 3199b12011cf..f8fef01a228d 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -84,13 +84,13 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css // Check if request border space would decrease component window size below minimum size if ((( aSize.Width - RequestedSpace.X - RequestedSpace.Width ) < aMinSize.Width ) || (( aSize.Height - RequestedSpace.Y - RequestedSpace.Height ) < aMinSize.Height ) ) - return sal_False; + return false; - return sal_True; + return true; } } - return sal_False; + return false; } void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 0952b3161cfa..a1ea8de92693 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -391,7 +391,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( css::uno::Any& a // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 055a405caf2c..e3def0119a1d 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -141,7 +141,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a { // Initialize state with sal_False !!! // (Handle can be invalid) - return sal_False; + return false; } void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ , @@ -185,7 +185,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( css::uno::Any& aValue // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 527c4545c5da..b2e3ab30dcc7 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -240,7 +240,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD { try { - xClose->close(sal_True); + xClose->close(true); } catch(const css::util::CloseVetoException&) {} } @@ -254,7 +254,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD { try { - xClose->close(sal_True); + xClose->close(true); } catch(const css::util::CloseVetoException&) {} } @@ -668,7 +668,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro { try { - xClose->close(sal_False); + xClose->close(false); m_eRunState = E_STOPPED_OR_FINISHED; } catch(const css::util::CloseVetoException&) {} diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index b415cedef409..a3394e0ce1c9 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -117,7 +117,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N css::uno::Any ShellJob::impl_generateAnswer4Deactivation() { - css::uno::Sequence< css::beans::NamedValue > aAnswer { { JobConst::ANSWER_DEACTIVATE_JOB(), css::uno::makeAny(sal_True) } }; + css::uno::Sequence< css::beans::NamedValue > aAnswer { { JobConst::ANSWER_DEACTIVATE_JOB(), css::uno::makeAny(true) } }; return css::uno::makeAny(aAnswer); } diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 90e495644c7a..e7f1d0dba93b 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -340,7 +340,7 @@ void impl_addWindowListeners( xWindow->addWindowListener( css::uno::Reference< css::awt::XWindowListener >( xThis, css::uno::UNO_QUERY )); - xDockWindow->enableDocking( sal_True ); + xDockWindow->enableDocking( true ); } catch ( const css::uno::Exception& ) { diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 4dede28936c1..2ade77ecb980 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -134,7 +134,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : , m_xToolbarManager( nullptr ) { // Initialize statusbar member - const sal_Bool bRefreshVisibility = sal_False; + const sal_Bool bRefreshVisibility = false; m_aStatusBarElement.m_aType = "statusbar"; m_aStatusBarElement.m_aName = STATUS_BAR_ALIAS; @@ -725,7 +725,7 @@ Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aNa aPropSeq[0].Name = "Frame"; aPropSeq[0].Value <<= m_xFrame; aPropSeq[1].Name = "Persistent"; - aPropSeq[1].Value <<= sal_True; + aPropSeq[1].Value <<= true; try { @@ -1248,7 +1248,7 @@ throw (uno::RuntimeException, std::exception) uno::Any a; implts_notifyListeners( frame::LayoutManagerEvents::MERGEDMENUBAR, a ); - return sal_True; + return true; } void SAL_CALL LayoutManager::removeMergedMenuBar() @@ -1924,7 +1924,7 @@ throw (RuntimeException, std::exception) if ( bNotify ) implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) ); - return sal_False; + return false; } sal_Bool SAL_CALL LayoutManager::dockWindow( const OUString& aName, DockingArea DockingArea, const awt::Point& Pos ) @@ -1947,7 +1947,7 @@ throw (RuntimeException, std::exception) doLayout(); } } - return sal_False; + return false; } sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ ) throw (uno::RuntimeException, std::exception) @@ -2101,7 +2101,7 @@ throw (RuntimeException, std::exception) { MenuBar* pMenuBar = pSysWindow->GetMenuBar(); if ( pMenuBar && pMenuBar->IsDisplayable() ) - return sal_True; + return true; } else { @@ -2122,9 +2122,9 @@ throw (RuntimeException, std::exception) SolarMutexGuard g; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) - return sal_True; + return true; else - return sal_False; + return false; } } } @@ -2152,7 +2152,7 @@ throw (RuntimeException, std::exception) return IsDockingWindowVisible( xFrame, aElementName ); } - return sal_False; + return false; } sal_Bool SAL_CALL LayoutManager::isElementFloating( const OUString& aName ) @@ -2168,7 +2168,7 @@ throw (RuntimeException, std::exception) return pToolbarManager->isToolbarFloating( aName ); } - return sal_False; + return false; } sal_Bool SAL_CALL LayoutManager::isElementDocked( const OUString& aName ) @@ -2184,7 +2184,7 @@ throw (RuntimeException, std::exception) return pToolbarManager->isToolbarDocked( aName ); } - return sal_False; + return false; } sal_Bool SAL_CALL LayoutManager::isElementLocked( const OUString& aName ) @@ -2200,7 +2200,7 @@ throw (uno::RuntimeException, std::exception) return pToolbarManager->isToolbarLocked( aName ); } - return sal_False; + return false; } awt::Size SAL_CALL LayoutManager::getElementSize( const OUString& aName ) @@ -3172,7 +3172,7 @@ namespace detail { uno::Sequence< beans::Property > aProperties; rManager.describeProperties(aProperties); - m_pInfoHelper = new ::cppu::OPropertyArrayHelper(aProperties, sal_True); + m_pInfoHelper = new ::cppu::OPropertyArrayHelper(aProperties, true); } ~InfoHelperBuilder() { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 785ca6f9ca81..e264e97db947 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -163,7 +163,7 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl { // Top docking area window xTopDockAreaWindow->setPosSize( 0, 0, aContainerClientSize.Width, rBorderSpace.Y, awt::PosSize::POSSIZE ); - xTopDockAreaWindow->setVisible( sal_True ); + xTopDockAreaWindow->setVisible( true ); nLeftRightDockingAreaHeight -= rBorderSpace.Y; } @@ -174,7 +174,7 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl sal_Int32 nHeight = ( nBottomPos == 0 ) ? 0 : rBorderSpace.Height; xBottomDockAreaWindow->setPosSize( 0, nBottomPos, aContainerClientSize.Width, nHeight, awt::PosSize::POSSIZE ); - xBottomDockAreaWindow->setVisible( sal_True ); + xBottomDockAreaWindow->setVisible( true ); nLeftRightDockingAreaHeight -= nHeight - 1; } @@ -186,7 +186,7 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl sal_Int32 nHeight = std::max( sal_Int32( 0 ), sal_Int32( nLeftRightDockingAreaHeight )); xLeftDockAreaWindow->setPosSize( 0, rBorderSpace.Y, rBorderSpace.X, nHeight, awt::PosSize::POSSIZE ); - xLeftDockAreaWindow->setVisible( sal_True ); + xLeftDockAreaWindow->setVisible( true ); } if ( rBorderSpace.Width >= 0 || nLeftRightDockingAreaHeight > 0 ) { @@ -197,7 +197,7 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl sal_Int32 nWidth = ( nLeftPos == 0 ) ? 0 : rBorderSpace.Width; xRightDockAreaWindow->setPosSize( nLeftPos, rBorderSpace.Y, nWidth, nHeight, awt::PosSize::POSSIZE ); - xRightDockAreaWindow->setVisible( sal_True ); + xRightDockAreaWindow->setVisible( true ); } } @@ -493,7 +493,7 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL ) static_cast< OWeakObject * >( this ), uno::UNO_QUERY )); xWindow->addWindowListener( uno::Reference< awt::XWindowListener >( static_cast< OWeakObject * >( this ), uno::UNO_QUERY )); - xDockWindow->enableDocking( sal_True ); + xDockWindow->enableDocking( true ); } catch (const uno::Exception&) { @@ -611,7 +611,7 @@ bool ToolbarLayoutManager::destroyToolbar( const OUString& rResourceURL ) else { if ( xWindow.is() ) - xWindow->setVisible( sal_False ); + xWindow->setVisible( false ); bNotify = true; } @@ -860,7 +860,7 @@ bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::Dockin { // ATTENTION: This will call toggleFloatingMode() via notifications which // sets the floating member of the UIElement correctly! - xDockWindow->setFloatingMode( sal_False ); + xDockWindow->setFloatingMode( false ); } else { @@ -1118,7 +1118,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars() try { xDockWindow->addDockableWindowListener( uno::Reference< awt::XDockableWindowListener >( static_cast< OWeakObject * >( this ), uno::UNO_QUERY )); - xDockWindow->enableDocking( sal_True ); + xDockWindow->enableDocking( true ); uno::Reference< awt::XWindow > xWindow( xDockWindow, uno::UNO_QUERY ); if ( xWindow.is() ) xWindow->addWindowListener( uno::Reference< awt::XWindowListener >( static_cast< OWeakObject * >( this ), uno::UNO_QUERY )); @@ -1449,7 +1449,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno bool bUndefPos = hasDefaultPosValue( rElement.m_aFloatingData.m_aPos ); bool bSetSize = ( rElement.m_aFloatingData.m_aSize.Width != 0 && rElement.m_aFloatingData.m_aSize.Height != 0 ); - rDockWindow->setFloatingMode( sal_True ); + rDockWindow->setFloatingMode( true ); if ( bUndefPos ) { aPos = implts_findNextCascadeFloatingPos(); @@ -1500,7 +1500,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno SolarMutexGuard aGuard; pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); pToolBox->SetLineCount( 1 ); - rDockWindow->setFloatingMode( sal_False ); + rDockWindow->setFloatingMode( false ); if ( rElement.m_aDockedData.m_bLocked ) rDockWindow->lock(); aSize = pToolBox->CalcWindowSizePixel(); @@ -3612,7 +3612,7 @@ throw (uno::RuntimeException, std::exception) } } - return sal_True; + return true; } void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e ) @@ -3836,7 +3836,7 @@ throw (uno::RuntimeException, std::exception) try { xCfgMgr.set( rEvent.Source, uno::UNO_QUERY ); - xPropSet.set( xCfgMgr->getSettings( rEvent.ResourceURL, sal_False ), uno::UNO_QUERY ); + xPropSet.set( xCfgMgr->getSettings( rEvent.ResourceURL, false ), uno::UNO_QUERY ); if ( xPropSet.is() ) xPropSet->getPropertyValue("UIName") >>= aUIName; diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 5daa22367e63..4c3c8b1d8646 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -771,7 +771,7 @@ void LoadEnv::impl_detectTypeAndFilter() xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", xContext), css::uno::UNO_QUERY_THROW); - sType = xDetect->queryTypeByDescriptor(lDescriptor, sal_True); /*TODO should deep detection be able for enable/disable it from outside? */ + sType = xDetect->queryTypeByDescriptor(lDescriptor, true); /*TODO should deep detection be able for enable/disable it from outside? */ // no valid content -> loading not possible if (sType.isEmpty()) @@ -848,7 +848,7 @@ void LoadEnv::impl_detectTypeAndFilter() // Don't overwrite external decisions! See comments before ... utl::MediaDescriptor::const_iterator pAsTemplateItem = m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_ASTEMPLATE()); if (pAsTemplateItem == m_lMediaDescriptor.end()) - m_lMediaDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True; + m_lMediaDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= true; aWriteLock.clear(); // <- SAFE } @@ -1485,7 +1485,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() css::uno::Reference< css::frame::XController > xOldDoc = xTask->getController(); if (xOldDoc.is()) { - bReactivateOldControllerOnError = xOldDoc->suspend(sal_True); + bReactivateOldControllerOnError = xOldDoc->suspend(true); if (! bReactivateOldControllerOnError) return css::uno::Reference< css::frame::XFrame >(); } @@ -1563,7 +1563,7 @@ void LoadEnv::impl_reactForLoadingState() m_xTargetFrame.clear(); if (xOldDoc.is()) { - bool bReactivated = xOldDoc->suspend(sal_False); + bool bReactivated = xOldDoc->suspend(false); if (!bReactivated) throw LoadEnvException(LoadEnvException::ID_COULD_NOT_REACTIVATE_CONTROLLER); m_bReactivateControllerOnError = false; @@ -1578,7 +1578,7 @@ void LoadEnv::impl_reactForLoadingState() try { if (xCloseable.is()) - xCloseable->close(sal_True); + xCloseable->close(true); else if (xDisposable.is()) xDisposable->dispose(); diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 78c73175037d..c1bf64606c33 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -110,7 +110,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, { OUString aTarget; - css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_False ); + css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, false ); m_aStatements.push_back( aStatement ); } @@ -120,7 +120,7 @@ void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& OUString aTarget; // last parameter must be set to true -> it's a comment - css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_True ); + css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, true ); m_aStatements.push_back( aStatement ); } diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 427203a84e3f..0a1655be7e6a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2815,7 +2815,7 @@ void AutoRecovery::implts_prepareSessionShutdown() { css::uno::Reference< css::util::XModifiable > xModify(rInfo.Document, css::uno::UNO_QUERY); if (xModify.is()) - xModify->setModified(sal_False); + xModify->setModified(false); // close the model. css::uno::Reference< css::util::XCloseable > xClose(rInfo.Document, css::uno::UNO_QUERY); @@ -2823,7 +2823,7 @@ void AutoRecovery::implts_prepareSessionShutdown() { try { - xClose->close(sal_False); + xClose->close(false); } catch(const css::uno::Exception&) { @@ -3266,13 +3266,13 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa else if (!rInfo.TemplateURL.isEmpty()) { sLoadOriginalURL = rInfo.TemplateURL; - lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True; + lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= true; lDescriptor[utl::MediaDescriptor::PROP_TEMPLATENAME()] <<= rInfo.TemplateURL; } else if (!rInfo.FactoryURL.isEmpty()) { sLoadOriginalURL = rInfo.FactoryURL; - lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True; + lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= true; } // A "Salvaged" item must exists every time. The core can make something special then for recovery. @@ -3475,7 +3475,7 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL , { css::uno::Reference< css::util::XCloseable > xClose( *component, css::uno::UNO_QUERY ); if ( xClose.is() ) - xClose->close( sal_True ); + xClose->close( true ); else (*component)->dispose(); } @@ -3694,7 +3694,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) CFG_PACKAGE_RECOVERY, CFG_PATH_RECOVERYINFO, CFG_ENTRY_CRASHED, - css::uno::makeAny(sal_True), + css::uno::makeAny(true), ::comphelper::EConfigurationModes::Standard); // for all docs, store their current view/names in the configurtion @@ -3754,7 +3754,7 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) CFG_PACKAGE_RECOVERY, CFG_PATH_RECOVERYINFO, CFG_ENTRY_CRASHED, - css::uno::makeAny(sal_False), + css::uno::makeAny(false), ::comphelper::EConfigurationModes::Standard); } @@ -3819,7 +3819,7 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) CFG_PACKAGE_RECOVERY, CFG_PATH_RECOVERYINFO, CFG_ENTRY_SESSIONDATA, - css::uno::makeAny(sal_True), + css::uno::makeAny(true), ::comphelper::EConfigurationModes::Standard); // flush config cached back to disc. @@ -3854,7 +3854,7 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) CFG_PACKAGE_RECOVERY, CFG_PATH_RECOVERYINFO, CFG_ENTRY_SESSIONDATA, - css::uno::makeAny(sal_False), + css::uno::makeAny(false), ::comphelper::EConfigurationModes::Standard); SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_doSessionRestore()"); @@ -3964,7 +3964,7 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /* throw(css::lang::IllegalArgumentException) { // not needed currently - return sal_False; + return false; } void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, @@ -4040,7 +4040,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto SolarMutexGuard g; if(!pInfoHelper) { - static ::cppu::OPropertyArrayHelper aInfoHelper(impl_getStaticPropertyDescriptor(), sal_True); + static ::cppu::OPropertyArrayHelper aInfoHelper(impl_getStaticPropertyDescriptor(), true); pInfoHelper = &aInfoHelper; } } @@ -4314,7 +4314,7 @@ void AutoRecovery::st_impl_removeFile(const OUString& sURL) try { ::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), m_xContext); - aContent.executeCommand("delete", css::uno::makeAny(sal_True)); + aContent.executeCommand("delete", css::uno::makeAny(true)); } catch(const css::uno::Exception&) { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 53c49c1ad9a7..64e7e645f3d7 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -229,7 +229,7 @@ sal_Bool SAL_CALL Desktop::terminate() if ( bVeto ) { impl_sendCancelTerminationEvent(lCalledTerminationListener); - return sal_False; + return false; } // try to close all open frames. @@ -244,7 +244,7 @@ sal_Bool SAL_CALL Desktop::terminate() if ( ! bFramesClosed ) { impl_sendCancelTerminationEvent(lCalledTerminationListener); - return sal_False; + return false; } // Normal listener had no problem ... @@ -816,7 +816,7 @@ void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::Runtime sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception ) { - return sal_True; + return true; } void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception ) @@ -835,13 +835,13 @@ void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exce sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception ) { - return sal_True; + return true; } sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >& /*xComponentWindow*/ , const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception ) { - return sal_False; + return false; } css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception ) @@ -1399,7 +1399,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , { case PropHandle::ActiveFrame : aValue <<= m_aChildTaskContainer.getActive(); break; - case PropHandle::IsPlugged : aValue <<= sal_False; + case PropHandle::IsPlugged : aValue <<= false; break; case PropHandle::SuspendQuickstartVeto: aValue <<= m_bSuspendQuickstartVeto; break; @@ -1655,7 +1655,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI) ( xController.is() ) ) { - bSuspended = xController->suspend( sal_True ); + bSuspended = xController->suspend( true ); if ( ! bSuspended ) { ++nNonClosedFrames; @@ -1671,7 +1671,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI) { try { - xClose->close(sal_False); + xClose->close(false); } catch(const css::util::CloseVetoException&) { @@ -1687,7 +1687,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI) (bSuspended ) && (xController.is()) ) - xController->suspend(sal_False); + xController->suspend(false); } // If interface XClosable interface exists and was used ... diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 1c0b9d163bbe..5700e2cf5eb5 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -110,7 +110,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( sal_Int32 nLength = lArguments.getLength(); aArguments.realloc( nLength + 1 ); aArguments[ nLength ].Name = "SynchronMode"; - aArguments[ nLength ].Value <<= sal_True; + aArguments[ nLength ].Value <<= true; css::uno::Any aResult; if (xNotifyDispatch.is()) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 4cc239c75e09..279e2616979c 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -793,7 +793,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& // create progress helper css::uno::Reference< css::frame::XFrame > xThis (static_cast< css::frame::XFrame* >(this) , css::uno::UNO_QUERY_THROW); css::uno::Reference< css::task::XStatusIndicatorFactory > xIndicatorFactory = - css::task::StatusIndicatorFactory::createWithFrame(m_xContext, xThis, sal_False/*DisableReschedule*/, sal_True/*AllowParentShow*/ ); + css::task::StatusIndicatorFactory::createWithFrame(m_xContext, xThis, false/*DisableReschedule*/, true/*AllowParentShow*/ ); // SAFE -> ---------------------------------- aWriteLock.reset(); @@ -1422,7 +1422,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X // Ignore this HACK of sfx2! // He call us with an valid controller without a valid window ... Thats not allowed! if ( xController.is() && ! xComponentWindow.is() ) - return sal_True; + return true; checkDisposed(); @@ -1554,7 +1554,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aWriteLock.clear(); /* } SAFE */ - return sal_True; + return true; } /*-**************************************************************************************************** @@ -1868,7 +1868,7 @@ void SAL_CALL Frame::setPropertyValue(const OUString& sProperty, css::beans::PropertyChangeEvent aEvent; aEvent.PropertyName = aPropInfo.Name; - aEvent.Further = sal_False; + aEvent.Further = false; aEvent.PropertyHandle = aPropInfo.Handle; aEvent.OldValue = aCurrentValue; aEvent.NewValue = aValue; @@ -2182,7 +2182,7 @@ void SAL_CALL Frame::disposing() } if( contWin.is() ) { - contWin->setVisible( sal_False ); + contWin->setVisible( false ); // All VclComponents are XComponents; so call dispose before discarding // a css::uno::Reference< XVclComponent >, because this frame is the owner of the window contWin->dispose(); @@ -3116,7 +3116,7 @@ void Frame::implts_startWindowListening() if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xDragDropListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } } } @@ -3152,7 +3152,7 @@ void Frame::implts_stopWindowListening() if( xDropTarget.is() ) { xDropTarget->removeDropTargetListener( xDragDropListener ); - xDropTarget->setActive( sal_False ); + xDropTarget->setActive( false ); } } } @@ -3188,7 +3188,7 @@ void Frame::implts_checkSuicide() try { if (bSuicide) - close(sal_True); + close(true); } catch(const css::util::CloseVetoException&) {} diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 8172e015f907..68dda4effb78 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -953,7 +953,7 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ lNewVals.getArray(), lOldVals.getArray(), 1, - sal_False); + false); } } @@ -972,7 +972,7 @@ void PathSettings::impl_subst(std::vector& lVals , if (bReSubst) sNew = xSubst->reSubstituteVariables(sOld); else - sNew = xSubst->substituteVariables(sOld, sal_False); + sNew = xSubst->substituteVariables(sOld, false); *pIt = sNew; } @@ -988,7 +988,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , if (bReSubst) aPath.sWritePath = xSubst->reSubstituteVariables(aPath.sWritePath); else - aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, sal_False); + aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, false); } OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const @@ -1150,7 +1150,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() } delete m_pPropHelp; - m_pPropHelp = new ::cppu::OPropertyArrayHelper(m_lPropDesc, sal_False); // false => not sorted ... must be done inside helper + m_pPropHelp = new ::cppu::OPropertyArrayHelper(m_lPropDesc, false); // false => not sorted ... must be done inside helper // <- SAFE } diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 851a6572f2ca..8f0f4c738604 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -224,7 +224,7 @@ void SessionListener::QuitSessionQuietly() xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args(1); - args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE); + args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(false),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); } catch (const css::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index bdccdb4d3e25..e3075df9262d 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -129,7 +129,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css // Safe impossible cases. if ( aURL.Complete.isEmpty() ) { - return sal_False; + return false; } // Try to extract the protocol sal_Int32 nURLIndex = aURL.Complete.indexOf( ':' ); @@ -148,13 +148,13 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css INetProtocol eINetProt = aParser.GetProtocol(); if ( eINetProt == INetProtocol::NotValid ) { - return sal_False; + return false; } else if ( !aParser.HasError() ) { lcl_ParserHelper(aParser,aURL,false); // Return "URL is parsed". - return sal_True; + return true; } } else @@ -166,11 +166,11 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css aURL.Path = aURL.Complete.copy( nURLIndex+1 ); // Return "URL is parsed". - return sal_True; + return true; } } - return sal_False; + return false; } // XURLTransformer @@ -181,7 +181,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, // Safe impossible cases. if ( aURL.Complete.isEmpty() ) { - return sal_False; + return false; } // Initialize parser with given URL. @@ -193,7 +193,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, { lcl_ParserHelper(aParser,aURL,true); // Return "URL is parsed". - return sal_True; + return true; } else { @@ -211,19 +211,19 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, // If INetURLObject knows this protocol something is wrong as detected before => // give up and return false! if ( INetURLObject::CompareProtocolScheme( aProtocol ) != INetProtocol::NotValid ) - return sal_False; + return false; else aURL.Protocol = aProtocol; } else - return sal_False; + return false; aURL.Main = aURL.Complete; aURL.Path = aURL.Complete.copy( nIndex+1 ); - return sal_True; + return true; } else - return sal_False; + return false; } } @@ -259,7 +259,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u aCompletePath.makeStringAndClear() ); if ( !bResult ) - return sal_False; + return false; // First parse URL WITHOUT ... aURL.Main = aParser.GetMainURL( INetURLObject::NO_DECODE ); @@ -269,7 +269,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u aURL.Complete = aParser.GetMainURL( INetURLObject::NO_DECODE ); // Return "URL is assembled". - return sal_True; + return true; } else if ( !aURL.Protocol.isEmpty() ) { @@ -278,10 +278,10 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u aBuffer.append( aURL.Path ); aURL.Complete = aBuffer.makeStringAndClear(); aURL.Main = aURL.Complete; - return sal_True; + return true; } - return sal_False; + return false; } // XURLTransformer diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 1c055743a670..15153599fc48 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -859,7 +859,7 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), true ); pInfoHelper = &aInfoHelper; } } diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 2c72ab6c3b8a..51e319287e53 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -228,7 +228,7 @@ void GlobalSettings_Access::impl_initConfigAccess() aPropValue.Value = css::uno::makeAny( OUString( GLOBALSETTINGS_ROOT_ACCESS )); aArgs[0] = css::uno::makeAny( aPropValue ); aPropValue.Name = "lazywrite"; - aPropValue.Value = css::uno::makeAny( sal_True ); + aPropValue.Value = css::uno::makeAny( true ); aArgs[1] = css::uno::makeAny( aPropValue ); m_xConfigAccess.set(xConfigProvider->createInstanceWithArguments( diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index bcddfa354a19..139e015d35d8 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -666,12 +666,12 @@ throw (css::uno::RuntimeException) const std::vector< OUString >& rGlobalImageNameVector = rGlobalImageList->getImageCommandNames(); const sal_uInt32 nGlobalCount = rGlobalImageNameVector.size(); for ( i = 0; i < nGlobalCount; i++ ) - aImageCmdNameMap.insert( ImageNameMap::value_type( rGlobalImageNameVector[i], sal_True )); + aImageCmdNameMap.insert( ImageNameMap::value_type( rGlobalImageNameVector[i], true )); const std::vector< OUString >& rModuleImageNameVector = implts_getDefaultImageList()->getImageCommandNames(); const sal_uInt32 nModuleCount = rModuleImageNameVector.size(); for ( i = 0; i < nModuleCount; i++ ) - aImageCmdNameMap.insert( ImageNameMap::value_type( rModuleImageNameVector[i], sal_True )); + aImageCmdNameMap.insert( ImageNameMap::value_type( rModuleImageNameVector[i], true )); } ImageList* pImageList = implts_getUserImageList( ImageType( nIndex )); @@ -679,7 +679,7 @@ throw (css::uno::RuntimeException) pImageList->GetImageNames( rUserImageNames ); const sal_uInt32 nUserCount = rUserImageNames.size(); for ( i = 0; i < nUserCount; i++ ) - aImageCmdNameMap.insert( ImageNameMap::value_type( rUserImageNames[i], sal_True )); + aImageCmdNameMap.insert( ImageNameMap::value_type( rUserImageNames[i], true )); return comphelper::mapKeysToSequence( aImageCmdNameMap ); } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 8764e6af1e02..a3ca2fb3cacd 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1162,10 +1162,10 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings ) - return sal_True; + return true; } - return sal_False; + return false; } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) @@ -1522,10 +1522,10 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings && pDataSettings->bDefaultNode ) - return sal_True; + return true; } - return sal_False; + return false; } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 21793ca52fb3..d97b0fbdf7de 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -181,7 +181,7 @@ sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements() throw ( RuntimeException, std::exception ) { // There must be global categories! - return sal_True; + return true; } void ConfigurationAccess_UICategory::fillCache() diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 54a26adbf8ee..f169282a2e8f 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -918,10 +918,10 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc { UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings && !pDataSettings->bDefault ) - return sal_True; + return true; } - return sal_False; + return false; } Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 873f35309408..aef78238b43b 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -305,14 +305,14 @@ throw (css::uno::RuntimeException, std::exception) ResourceURLToInfoCache::const_iterator pIter = m_aResourceURLToInfoCache.find( rResourceURL ); if ( pIter != m_aResourceURLToInfoCache.end() ) - return sal_True; + return true; else { Any a( impl_getWindowStateFromResourceURL( rResourceURL ) ); if ( a == Any() ) - return sal_False; + return false; else - return sal_True; + return true; } } @@ -338,7 +338,7 @@ throw ( RuntimeException, std::exception ) if ( m_xConfigAccess.is() ) return m_xConfigAccess->hasElements(); else - return sal_False; + return false; } // XNameContainer @@ -1245,7 +1245,7 @@ void ConfigurationAccess_WindowState::impl_initializeConfigAccess() aPropValue.Value <<= m_aConfigWindowAccess; aArgs[0] <<= aPropValue; aPropValue.Name = "lazywrite"; - aPropValue.Value <<= sal_True; + aPropValue.Value <<= true; aArgs[1] <<= aPropValue; m_xConfigAccess.set( m_xConfigProvider->createInstanceWithArguments( @@ -1442,7 +1442,7 @@ sal_Bool SAL_CALL WindowStateConfiguration::hasElements() throw (css::uno::RuntimeException, std::exception) { // We always have at least one module. So it is valid to return true! - return sal_True; + return true; } struct Instance { diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 6ef837dddb62..85711654d147 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -101,7 +101,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq const OUString& rName = aVector[i]; m_xPopupMenu->insertItem( i+1, rName, css::awt::MenuItemStyle::RADIOCHECK | css::awt::MenuItemStyle::AUTOCHECK, i ); if ( rName == m_aFontFamilyName ) - m_xPopupMenu->checkItem( i+1, sal_True ); + m_xPopupMenu->checkItem( i+1, true ); // use VCL popup menu pointer to set vital information that are not part of the awt implementation OUStringBuffer aCommandBuffer( aFontNameCommandPrefix ); aCommandBuffer.append( INetURLObject::encode( rName, INetURLObject::PART_HTTP_QUERY, INetURLObject::ENCODE_ALL )); @@ -173,13 +173,13 @@ void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) th if ( aText == m_aFontFamilyName ) { - m_xPopupMenu->checkItem( nItemId, sal_True ); + m_xPopupMenu->checkItem( nItemId, true ); return; } } if ( nChecked ) - m_xPopupMenu->checkItem( nChecked, sal_False ); + m_xPopupMenu->checkItem( nChecked, false ); } } diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 3fdcbbbbf8bb..75f47e42c53b 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -110,7 +110,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP if ( m_pHeightArray[i] == nHeight ) { - rPopupMenu->checkItem( nItemId, sal_True ); + rPopupMenu->checkItem( nItemId, true ); return; } @@ -119,7 +119,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP } if ( nChecked ) - rPopupMenu->checkItem( nChecked, sal_False ); + rPopupMenu->checkItem( nChecked, false ); } // private function diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 26daaf1c586f..5298d40b253a 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -165,7 +165,7 @@ throw (css::uno::RuntimeException, std::exception) if ( rStr == m_aCurLang ) { //make a sign for the current language - xPopupMenu->checkItem( nItemId, sal_True ); + xPopupMenu->checkItem( nItemId, true ); } aLangMap[ nItemId ] = rStr; ++nItemId; @@ -174,7 +174,7 @@ throw (css::uno::RuntimeException, std::exception) xPopupMenu->insertItem( MID_LANG_SEL_NONE, FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE ); if ( sNone == m_aCurLang ) - xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True ); + xPopupMenu->checkItem( MID_LANG_SEL_NONE, true ); xPopupMenu->insertItem( MID_LANG_SEL_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET ); xPopupMenu->insertItem( MID_LANG_SEL_MORE, FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE ); diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index cc5820c8d59a..1d202720884f 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -147,7 +147,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th try { xTrans.set( URLTransformer::create(m_xContext) ); - m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False ); + m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false ); if ( m_xConfigData.is() ) { // Fill menubar with container contents @@ -214,7 +214,7 @@ void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException, std::ex { MenuBarManager* pMenuBarManager = static_cast< MenuBarManager *>( m_xMenuBarManager.get() ); - m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False ); + m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false ); if ( m_xConfigData.is() ) pMenuBarManager->SetItemContainer( m_xConfigData ); } @@ -319,9 +319,9 @@ throw (css::uno::RuntimeException, std::exception) PopupControllerCache::const_iterator pIter = m_aPopupControllerCache.find( aName ); if ( pIter != m_aPopupControllerCache.end() ) - return sal_True; + return true; else - return sal_False; + return false; } // XUIElement diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index de5143bdfb8e..2bdce6a294ab 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -410,7 +410,7 @@ void SaveToolbarController::update() sal_Bool SaveToolbarController::opensSubToolbar() throw ( css::uno::RuntimeException, std::exception ) { - return sal_True; + return true; } OUString SaveToolbarController::getSubToolbarName() diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index c7faadd89e5a..57574e93b3c4 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -293,7 +293,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) // documents in the picklist will never be opened as templates aArgsList[1].Name = "AsTemplate"; - aArgsList[1].Value = makeAny( sal_False ); + aArgsList[1].Value = makeAny( false ); if (!m_aModuleName.isEmpty()) { diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index 4477516908bd..57674a1f2115 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -165,9 +165,9 @@ void ResourceMenuController::updatePopupMenu() try { if ( m_xConfigManager.is() && m_xConfigManager->hasSettings( m_aMenuURL ) ) - m_xMenuContainer.set( m_xConfigManager->getSettings( m_aMenuURL, sal_False ) ); + m_xMenuContainer.set( m_xConfigManager->getSettings( m_aMenuURL, false ) ); else if ( m_xModuleConfigManager.is() && m_xModuleConfigManager->hasSettings( m_aMenuURL ) ) - m_xMenuContainer.set( m_xModuleConfigManager->getSettings( m_aMenuURL, sal_False ) ); + m_xMenuContainer.set( m_xModuleConfigManager->getSettings( m_aMenuURL, false ) ); } catch ( const css::container::NoSuchElementException& ) { diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index a69baac781dd..a79e0dd387b3 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -226,7 +226,7 @@ throw (RuntimeException, std::exception) if ( m_pStatusBar ) return m_pStatusBar->IsItemVisible( m_nId ); - return sal_False; + return false; } void SAL_CALL StatusbarItem::setVisible( sal_Bool bVisible ) diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index cdc77f7bd09b..0e3f094117cc 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -599,7 +599,7 @@ void StatusBarManager::Command( const CommandEvent& rEvt ) awt::Point aPos; aPos.X = rEvt.GetMousePosPixel().X(); aPos.Y = rEvt.GetMousePosPixel().Y(); - xController->command( aPos, awt::Command::CONTEXTMENU, sal_True, uno::Any() ); + xController->command( aPos, awt::Command::CONTEXTMENU, true, uno::Any() ); } } } diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 6557ee1aa017..d5820858060a 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -120,7 +120,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) try { - m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False ); + m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false ); if ( m_xConfigData.is() && pStatusBar && pStatusBarManager ) { // Fill statusbar with container contents @@ -150,7 +150,7 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std:: { StatusBarManager* pStatusBarManager = static_cast< StatusBarManager *>( m_xStatusBarManager.get() ); - m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False ); + m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false ); if ( m_xConfigData.is() ) pStatusBarManager->FillStatusBar( m_xConfigData ); } diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 5f7abf6a228b..b3585dfe489c 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -234,7 +234,7 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow css::uno::Reference< css::awt::XDockableWindow > xDockWindow( xSubToolBar, css::uno::UNO_QUERY ); xDockWindow->addDockableWindowListener( css::uno::Reference< css::awt::XDockableWindowListener >( static_cast< OWeakObject * >( this ), css::uno::UNO_QUERY ) ); - xDockWindow->enableDocking( sal_True ); + xDockWindow->enableDocking( true ); // keep reference to UIElement to avoid its destruction disposeUIElement(); @@ -317,7 +317,7 @@ void SubToolBarController::endDocking( const css::awt::EndDockingEvent& ) sal_Bool SubToolBarController::prepareToggleFloatingMode( const css::lang::EventObject& ) throw ( css::uno::RuntimeException, std::exception ) { - return sal_False; + return false; } void SubToolBarController::toggleFloatingMode( const css::lang::EventObject& ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f0ae7ef86e4c..1a6eacab14f3 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -816,7 +816,7 @@ void ToolBarManager::CreateControllers() aCommandURL == ".uno:ParaLeftToRight" || aCommandURL == ".uno:ParaRightToLeft" ) - pController->setFastPropertyValue_NoBroadcast(1, makeAny(sal_True)); + pController->setFastPropertyValue_NoBroadcast(1, makeAny(true)); } } @@ -983,11 +983,11 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine Reference< XIndexAccess > xMenuContainer; if ( m_xDocUICfgMgr.is() && m_xDocUICfgMgr->hasSettings( aCommandURL ) ) - xMenuContainer = m_xDocUICfgMgr->getSettings( aCommandURL, sal_False ); + xMenuContainer = m_xDocUICfgMgr->getSettings( aCommandURL, false ); if ( !xMenuContainer.is() && m_xUICfgMgr.is() && m_xUICfgMgr->hasSettings( aCommandURL ) ) - xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, sal_False ); + xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, false ); if ( xMenuContainer.is() && xMenuContainer->getCount() ) { Sequence< PropertyValue > aProps; @@ -1678,7 +1678,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) Reference< XUIElementSettings > xUIElementSettings( xLayoutManager->getElement( m_aResourceName ), UNO_QUERY ); if ( xUIElementSettings.is() ) { - Reference< XIndexContainer > xItemContainer( xUIElementSettings->getSettings( sal_True ), UNO_QUERY ); + Reference< XIndexContainer > xItemContainer( xUIElementSettings->getSettings( true ), UNO_QUERY ); sal_Int32 nCount = xItemContainer->getCount(); for ( sal_Int32 i = 0; i < nCount; i++ ) { diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index f2a514934302..28fc45af1e98 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -166,7 +166,7 @@ void ToolbarsMenuController::addCommand( if ( !bInternal ) { if ( !getDispatchFromCommandURL( rCommandURL ).is() ) - m_xPopupMenu->enableItem( nItemId, sal_False ); + m_xPopupMenu->enableItem( nItemId, false ); } SolarMutexGuard aSolarMutexGuard; @@ -391,7 +391,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r sal_uInt16 nItemCount = m_xPopupMenu->getItemCount(); m_xPopupMenu->insertItem( nIndex, aSortedTbs[i].aUIName, css::awt::MenuItemStyle::CHECKABLE, nItemCount ); if ( aSortedTbs[i].bVisible ) - m_xPopupMenu->checkItem( nIndex, sal_True ); + m_xPopupMenu->checkItem( nIndex, true ); { SolarMutexGuard aGuard; @@ -607,7 +607,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r if ( !bVisible && bContextSensitive && nVisibleIndex >= 0 ) { // Default is: Every context sensitive toolbar is visible - aWindowState[nVisibleIndex].Value <<= sal_True; + aWindowState[nVisibleIndex].Value <<= true; xNameReplace->replaceByName( aElementName, makeAny( aWindowState )); bRefreshToolbars = true; } @@ -628,7 +628,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r { try { - xPropSet->setPropertyValue("RefreshContextToolbarVisibility", makeAny( sal_True )); + xPropSet->setPropertyValue("RefreshContextToolbarVisibility", makeAny( true )); } catch ( const RuntimeException& ) { diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 7b9cbb2d6ba3..c57783e23a68 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -159,7 +159,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th try { - m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False ); + m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false ); if ( m_xConfigData.is() && pToolBar && pToolBarManager ) { // Fill toolbar with container contents @@ -226,7 +226,7 @@ void SAL_CALL ToolBarWrapper::updateSettings() throw (css::uno::RuntimeException { ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>( m_xToolBarManager.get() ); - m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False ); + m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, false ); if ( m_xConfigData.is() ) pToolBarManager->FillToolbar( m_xConfigData ); } diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 9db3051b3147..2dd10988f7a3 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -293,7 +293,7 @@ sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasElements() throw ( RuntimeException, std::exception ) { // There must are global commands! - return sal_True; + return true; } void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ) @@ -739,7 +739,7 @@ sal_Bool SAL_CALL UICommandDescription::hasElements() throw (css::uno::RuntimeException, std::exception) { // generic UI commands are always available! - return sal_True; + return true; } } // namespace framework -- cgit