From 6e70103da07ec67b1c1f106a8fcd064e3df97271 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 4 May 2016 11:59:23 +0200 Subject: While at it, delete Any functions on sal_Bool* (at least for LIBO_INTERNAL_ONLY), to help further reduce the occurrences of sal_Bool across the code base Change-Id: I70654a0cb56655984c717b7b894f26c9ab47536e --- svx/source/dialog/rubydialog.cxx | 5 ++--- svx/source/form/fmshimp.cxx | 12 ++++-------- svx/source/xoutdev/xattr.cxx | 8 ++++---- 3 files changed, 10 insertions(+), 15 deletions(-) (limited to 'svx/source') diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 6c088737152f..5cfac694d78f 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -628,8 +628,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) IMPL_LINK_TYPED(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); - sal_Bool bAbove = !rBox.GetSelectEntryPos(); - const Type& rType = cppu::UnoType::get(); + bool bAbove = !rBox.GetSelectEntryPos(); Sequence& aRubyValues = pImpl->GetRubyValues(); for (sal_Int32 nRuby = 0; nRuby < aRubyValues.getLength(); nRuby++) { @@ -638,7 +637,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) for (sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) { if (pProps[nProp].Name == cRubyIsAbove) - pProps[nProp].Value.setValue(&bAbove, rType); + pProps[nProp].Value <<= bAbove; } SetModified(true); } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 0dca9bff4a88..8cf9565d4be4 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1357,30 +1357,26 @@ void FmXFormShell::LoopGrids(LoopGridsSync nSync, LoopGridsFlags nFlags) { case LoopGridsSync::DISABLE_SYNC: { - sal_Bool bB(false); - xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType::get())); + xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(false)); } break; case LoopGridsSync::FORCE_SYNC: { Any aOldVal( xModelSet->getPropertyValue(FM_PROP_DISPLAYSYNCHRON) ); - sal_Bool bB(true); - xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType::get())); + xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(true)); xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, aOldVal); } break; case LoopGridsSync::ENABLE_SYNC: { - sal_Bool bB(true); - xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType::get())); + xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(true)); } break; } if (nFlags & LoopGridsFlags::DISABLE_ROCTRLR) { - sal_Bool bB(false); - xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(&bB,cppu::UnoType::get())); + xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(false)); Reference< XPropertyState> xModelPropState(xModelSet, UNO_QUERY); if (xModelPropState.is()) xModelPropState->setPropertyToDefault(FM_PROP_CURSORCOLOR); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 486a3f60be7f..bd44214921a5 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -2038,8 +2038,8 @@ bool XLineStartCenterItem::GetPresentation bool XLineStartCenterItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { - sal_Bool bValue = GetValue(); - rVal.setValue( &bValue, cppu::UnoType::get() ); + bool bValue = GetValue(); + rVal <<= bValue; return true; } @@ -2089,8 +2089,8 @@ bool XLineEndCenterItem::GetPresentation bool XLineEndCenterItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { - sal_Bool bValue = GetValue(); - rVal.setValue( &bValue, cppu::UnoType::get() ); + bool bValue = GetValue(); + rVal <<= bValue; return true; } -- cgit