summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-20 17:19:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-20 17:25:49 +0200
commit0003e99b393e817ff3cd753f3798012d0ab2f8fb (patch)
tree956ca991509534d7ece7b987c089c6dc1ccad55b /sd
parent4b9573ba669173d0d0d7653c9bcef276ec151cec (diff)
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: Iae2e695c26e19275ea02bc6737c311d31a45e1d7
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx2
-rw-r--r--sd/source/core/stlfamily.cxx10
-rw-r--r--sd/source/core/stlpool.cxx12
-rw-r--r--sd/source/core/stlsheet.cxx14
-rw-r--r--sd/source/filter/eppt/pptx-text.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx8
-rw-r--r--sd/source/ui/dlg/dlgass.cxx2
-rw-r--r--sd/source/ui/dlg/filedlg.cxx6
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx8
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx6
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx12
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx2
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx2
-rw-r--r--sd/source/ui/tools/PropertySet.cxx2
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx12
-rw-r--r--sd/source/ui/unoidl/SdUnoOutlineView.cxx2
-rw-r--r--sd/source/ui/unoidl/randomnode.cxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx2
-rw-r--r--sd/source/ui/unoidl/unopage.cxx6
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/PresentationViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx4
-rw-r--r--sd/source/ui/view/sdview3.cxx6
27 files changed, 68 insertions, 68 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index a0bbae746b29..956b8f03af3f 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -333,7 +333,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
{
for( nPos = 0; nPos < nEndPos; nPos++ )
{
- nPos = xBI->getWordBoundary(aText, nPos, aLocale, i18n::WordType::ANY_WORD, sal_True).endPos;
+ nPos = xBI->getWordBoundary(aText, nPos, aLocale, i18n::WordType::ANY_WORD, true).endPos;
nSubItems++;
}
break;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index daca4ac25935..cb2876cde8aa 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -285,14 +285,14 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
{
if (pSdStyle->GetApiName() == aName)
{
- return sal_True;
+ return true;
}
}
}
}
}
- return sal_False;
+ return false;
}
// XElementAccess
@@ -309,18 +309,18 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException, std::exce
if( mnFamily == SD_STYLE_FAMILY_MASTERPAGE )
{
- return sal_True;
+ return true;
}
else
{
SfxStyleSheetIteratorPtr aSSSIterator = std::make_shared<SfxStyleSheetIterator>(mxPool.get(), mnFamily);
if (aSSSIterator->First())
{
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
// XIndexAccess
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 202a10faf212..0374daa494fb 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1298,21 +1298,21 @@ sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(Run
throwIfDisposed();
if( mxGraphicFamily->getName() == aName )
- return sal_True;
+ return true;
if( mxCellFamily->getName() == aName )
- return sal_True;
+ return true;
if( msTableFamilyName == aName )
- return sal_True;
+ return true;
for( SdStyleFamilyMap::iterator iter( maStyleFamilyMap.begin() ); iter != maStyleFamilyMap.end(); ++iter )
{
if( (*iter).second->getName() == aName )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// XElementAccess
@@ -1326,7 +1326,7 @@ Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException, std::ex
sal_Bool SAL_CALL SdStyleSheetPool::hasElements() throw(RuntimeException, std::exception)
{
- return sal_True;
+ return true;
}
// XIndexAccess
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index ee2e2c61f6a6..e326ba8a652e 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -741,7 +741,7 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException, std::exception)
ClearableMutexGuard aGuard( mrBHelper.rMutex );
if (!mrBHelper.bDisposed && !mrBHelper.bInDispose)
{
- mrBHelper.bInDispose = sal_True;
+ mrBHelper.bInDispose = true;
aGuard.clear();
try
{
@@ -756,14 +756,14 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException, std::exception)
{
MutexGuard aGuard2( mrBHelper.rMutex );
// bDisposed and bInDispose must be set in this order:
- mrBHelper.bDisposed = sal_True;
- mrBHelper.bInDispose = sal_False;
+ mrBHelper.bDisposed = true;
+ mrBHelper.bInDispose = false;
throw;
}
MutexGuard aGuard2( mrBHelper.rMutex );
// bDisposed and bInDispose must be set in this order:
- mrBHelper.bDisposed = sal_True;
- mrBHelper.bInDispose = sal_False;
+ mrBHelper.bDisposed = true;
+ mrBHelper.bInDispose = false;
}
catch (RuntimeException &)
{
@@ -1106,7 +1106,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
}
else if( pEntry->nWID == SDRATTR_TEXTDIRECTION )
{
- aAny <<= sal_False;
+ aAny <<= false;
}
else if( pEntry->nWID == OWN_ATTR_FILLBMP_MODE )
{
@@ -1310,7 +1310,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t
}
else if( pEntry->nWID == SDRATTR_TEXTDIRECTION )
{
- aRet <<= sal_False;
+ aRet <<= false;
}
else if( pEntry->nWID == OWN_ATTR_FILLBMP_MODE )
{
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index b1ad83c474a6..f6f533dd5d10 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -508,7 +508,7 @@ sal_uInt32 PortionObj::ImplGetTextField( css::uno::Reference< css::text::XTextRa
css::uno::Reference< css::beans::XPropertySet > xFieldPropSet( aXTextField, css::uno::UNO_QUERY );
if ( xFieldPropSet.is() )
{
- OUString aFieldKind( aXTextField->getPresentation( sal_True ) );
+ OUString aFieldKind( aXTextField->getPresentation( true ) );
if ( aFieldKind == "Date" )
{
if ( GetPropertyValue( aAny, xFieldPropSet, "IsFix", true ) )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index c49b96c60736..7483757f8130 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -608,7 +608,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
}
if (SDXMLMODE_Organizer == meFilterMode)
- xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(sal_True));
+ xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(true));
if( 0 == nRet )
{
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 49e0720571a2..7a9f50f69665 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2298,12 +2298,12 @@ STLPropertySet* CustomAnimationDialog::createDefaultSet()
pSet->setPropertyDefaultValue( nHandleAutoReverse, aEmpty );
pSet->setPropertyDefaultValue( nHandleTrigger, aEmpty );
- pSet->setPropertyDefaultValue( nHandleHasText, makeAny( sal_False ) );
- pSet->setPropertyDefaultValue( nHandleHasVisibleShape, makeAny( sal_False ) );
+ pSet->setPropertyDefaultValue( nHandleHasText, makeAny( false ) );
+ pSet->setPropertyDefaultValue( nHandleHasVisibleShape, makeAny( false ) );
pSet->setPropertyDefaultValue( nHandleTextGrouping, makeAny( (sal_Int32)-1 ) );
- pSet->setPropertyDefaultValue( nHandleAnimateForm, makeAny( sal_True ) );
+ pSet->setPropertyDefaultValue( nHandleAnimateForm, makeAny( true ) );
pSet->setPropertyDefaultValue( nHandleTextGroupingAuto, makeAny( (double)-1.0 ) );
- pSet->setPropertyDefaultValue( nHandleTextReverse, makeAny( sal_False ) );
+ pSet->setPropertyDefaultValue( nHandleTextReverse, makeAny( false ) );
pSet->setPropertyDefaultValue( nHandleCurrentPage, aEmpty );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 75d8f7e45874..56b26bbe80e1 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -678,7 +678,7 @@ void AssistentDlgImpl::CloseDocShell()
uno::Reference< util::XCloseable > xCloseable( xDocShell->GetModel(), uno::UNO_QUERY );
if( xCloseable.is() )
{
- xCloseable->close( sal_True );
+ xCloseable->close( true );
xDocShell = nullptr;
}
else
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 6dce79eb5468..4776b107f96d 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -200,9 +200,9 @@ void SdFileDialog_Imp::CheckSelectionState()
try
{
if( aCurrFilter.isEmpty() || ( aCurrFilter == SD_RESSTR( STR_EXPORT_HTML_NAME ) ) )
- mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False );
+ mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, false );
else
- mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_True );
+ mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, true );
}
catch (const css::lang::IllegalArgumentException&)
{
@@ -247,7 +247,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType ) :
{
try
{
- mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False );
+ mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, false );
}
catch (const css::lang::IllegalArgumentException&)
{
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index ab98530f1e20..4003f0a7ba4a 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -202,7 +202,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas()
aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow));
aArg[1] = Any();
aArg[2] = makeAny(css::awt::Rectangle());
- aArg[3] = makeAny(sal_False);
+ aArg[3] = makeAny(false);
aArg[4] = makeAny(mxWindow);
Reference<lang::XMultiServiceFactory> xFactory (
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 0c197429e22a..cd6fba82ce51 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -468,11 +468,11 @@ sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll)
if (mpUpdateRequester.get() != nullptr)
{
mpUpdateRequester->RequestUpdate(bUpdateAll);
- return sal_True;
+ return true;
}
else
{
- return sal_False;
+ return false;
}
}
@@ -542,7 +542,7 @@ sal_Bool SAL_CALL PresenterCanvas::hasAlpha()
if (xBitmap.is())
return xBitmap->hasAlpha();
else
- return sal_False;
+ return false;
}
Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap(
@@ -758,7 +758,7 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip (
Reference<rendering::XLinePolyPolygon2D> xLinePolygon(
xDevice->createCompatibleLinePolyPolygon(aPoints));
if (xLinePolygon.is())
- xLinePolygon->setClosed(0, sal_True);
+ xLinePolygon->setClosed(0, true);
xPolygon.set(xLinePolygon, UNO_QUERY);
}
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 60ee6db6e452..8d7ffc8e3630 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -158,7 +158,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow));
aArg[1] = Any();
aArg[2] = makeAny(css::awt::Rectangle());
- aArg[3] = makeAny(sal_False);
+ aArg[3] = makeAny(false);
aArg[4] = makeAny(rxWindow);
Reference<lang::XMultiServiceFactory> xFactory (
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index e879ade7672f..ca4c4167a95c 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -561,7 +561,7 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U
case ATTR_PRESENT_ALWAYS_ON_TOP:
return Any( rPresSettings.mbAlwaysOnTop );
case ATTR_PRESENT_NAVIGATOR:
- return Any( sal_False );
+ return Any( false );
case ATTR_PRESENT_PEN:
return Any( rPresSettings.mbMouseAsPen );
case ATTR_PRESENT_PAUSE_TIMEOUT:
@@ -777,7 +777,7 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exceptio
{
Sequence< PropertyValue > aArguments(1);
aArguments[0].Name = "RehearseTimings";
- aArguments[0].Value <<= sal_True;
+ aArguments[0].Value <<= true;
startWithArguments( aArguments );
}
@@ -887,7 +887,7 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref
Sequence< PropertyValue > aArguments(4);
aArguments[0].Name = "Preview";
- aArguments[0].Value <<= sal_True;
+ aArguments[0].Value <<= true;
aArguments[1].Name = "FirstPage";
aArguments[1].Value <<= xDrawPage;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 7adeee200d40..6b7b463f1e52 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -461,12 +461,12 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow
aProperties.push_back(
PropertyValue( "SkipAllMainSequenceEffects",
-1,
- Any(sal_True),
+ Any(true),
PropertyState_DIRECT_VALUE));
aProperties.push_back(
PropertyValue("SkipSlideTransition",
-1,
- Any(sal_True),
+ Any(true),
PropertyState_DIRECT_VALUE));
}
@@ -821,7 +821,7 @@ bool SlideshowImpl::startPreview(
if( mxPreviewAnimationNode.is() )
{
aProperties[1].Name = "NoSlideTransitions";
- aProperties[1].Value = uno::makeAny( sal_True );
+ aProperties[1].Value = uno::makeAny( true );
}
bRet = startShowImpl( aProperties );
@@ -1403,7 +1403,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
mbIsPaused = true;
if( mxShow.is() )
{
- mxShow->pause(sal_True);
+ mxShow->pause(true);
if( mxListenerProxy.is() )
mxListenerProxy->paused();
@@ -1435,7 +1435,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception)
mbIsPaused = false;
if( mxShow.is() )
{
- mxShow->pause(sal_False);
+ mxShow->pause(false);
update();
if( mxListenerProxy.is() )
@@ -2763,7 +2763,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
// for Pen Mode
beans::PropertyValue aPenPropSwitchPenMode;
aPenPropSwitchPenMode.Name = "SwitchPenMode";
- aPenPropSwitchPenMode.Value <<= sal_True;
+ aPenPropSwitchPenMode.Value <<= true;
mxShow->setProperty( aPenPropSwitchPenMode );
}
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index ad5df983f605..129d2fd1c1bb 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -138,7 +138,7 @@ Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId()
sal_Bool SAL_CALL SlideSorterService::isAnchorOnly()
throw (RuntimeException, std::exception)
{
- return sal_False;
+ return false;
}
//----- XWindowListener -------------------------------------------------------
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 07b117bdc0d2..562f018c44d5 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -376,7 +376,7 @@ VCL_BUILDER_DECL_FACTORY(TableValueSet)
void TableDesignWidget::updateControls()
{
- static const sal_Bool gDefaults[CB_COUNT] = { sal_True, sal_False, sal_True, sal_False, sal_False, sal_False };
+ static const sal_Bool gDefaults[CB_COUNT] = { true, false, true, false, false, false };
const bool bHasTable = mxSelectedTable.is();
const OUString* pPropNames = getPropertyNames();
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index 4d1142abce6c..b386f53a5e56 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -66,7 +66,7 @@ void SAL_CALL PropertySet::setPropertyValue (
beans::PropertyChangeEvent aEvent(
static_cast<XWeak*>(this),
rsPropertyName,
- sal_False,
+ false,
-1,
aOldValue,
rsPropertyValue);
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index e660f5ca288b..a7144e07a1d8 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -195,7 +195,7 @@ sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (css::uno::R
// do not allow suspend if a slideshow needs this controller!
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( *pViewShellBase ) );
if( xSlideShow.is() && xSlideShow->dependsOn(pViewShellBase) )
- return sal_False;
+ return false;
}
}
@@ -451,7 +451,7 @@ void DrawController::NotifyAccUpdate()
{
sal_Int32 nHandle = PROPERTY_UPDATEACC;
Any aNewValue, aOldValue;
- fire (&nHandle, &aNewValue, &aOldValue, 1, sal_False);
+ fire (&nHandle, &aNewValue, &aOldValue, 1, false);
}
void DrawController::fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) throw()
@@ -464,7 +464,7 @@ void DrawController::fireChangeLayer( css::uno::Reference< css::drawing::XLayer>
Any aOldValue ;
- fire (&nHandle, &aNewValue, &aOldValue, 1, sal_False);
+ fire (&nHandle, &aNewValue, &aOldValue, 1, false);
mpCurrentLayer = pCurrentLayer;
}
@@ -482,7 +482,7 @@ void DrawController::fireSwitchCurrentPage(sal_Int32 pageIndex ) throw()
// Use new property to handle page change event
sal_Int32 nHandles = PROPERTY_PAGE_CHANGE;
- fire( &nHandles, &aNewValue, &aOldValue, 1, sal_False );
+ fire( &nHandles, &aNewValue, &aOldValue, 1, false );
}
void DrawController::FirePropertyChange (
@@ -492,7 +492,7 @@ void DrawController::FirePropertyChange (
{
try
{
- fire (&nHandle, &rNewValue, &rOldValue, 1, sal_False);
+ fire (&nHandle, &rNewValue, &rOldValue, 1, false);
}
catch (const RuntimeException&)
{
@@ -677,7 +677,7 @@ IPropertyArrayHelper & DrawController::getInfoHelper()
{
::std::vector<beans::Property> aProperties;
FillPropertyTable(aProperties);
- mpPropertyArrayHelper.reset(new OPropertyArrayHelper(comphelper::containerToSequence(aProperties), sal_False));
+ mpPropertyArrayHelper.reset(new OPropertyArrayHelper(comphelper::containerToSequence(aProperties), false));
}
return *mpPropertyArrayHelper.get();
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index a88385d07769..1be0bdbe0a0e 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -57,7 +57,7 @@ sal_Bool SAL_CALL SdUnoOutlineView::select( const Any& )
throw(lang::IllegalArgumentException, RuntimeException, std::exception)
{
// todo: add selections for text ranges
- return sal_False;
+ return false;
}
Any SAL_CALL SdUnoOutlineView::getSelection()
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index ea41432313f5..fe02c933becf 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -452,7 +452,7 @@ Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std
// XElementAccess
sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException, std::exception)
{
- return sal_True;
+ return true;
}
// XEnumerationAccess
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 604d076a40b1..569fca33d207 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2842,10 +2842,10 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(un
continue;
if( aName == SdDrawPage::getPageApiName( pPage ) )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// XElementAccess
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 9267fd83d6f4..57e8614d08aa 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1687,7 +1687,7 @@ uno::Type SAL_CALL SdUnoEventsAccess::getElementType( )
sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) throw(uno::RuntimeException, std::exception)
{
- return sal_True;
+ return true;
}
// XServiceInfo
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 1170d73bda57..e0ad67009158 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1955,11 +1955,11 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
if( aStr.isEmpty() && dynamic_cast< const SdrOle2Obj *>( pObj ) != nullptr )
aStr = static_cast< const SdrOle2Obj* >( pObj )->GetPersistName();
if( !aStr.isEmpty() )
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
// container::XNameAccess
@@ -2850,7 +2850,7 @@ sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException, std::
throwIfDisposed();
if( SvxFmDrawPage::mpPage == nullptr )
- return sal_False;
+ return false;
return SvxFmDrawPage::mpPage->GetObjCount() > 0;
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 6f5fb2416093..f817a6bdf7f6 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1258,7 +1258,7 @@ public:
// FIXME: is this always true ?
aProperties[2].Name = "PageIncludesNonprintableArea";
- aProperties[2].Value = makeAny( sal_True );
+ aProperties[2].Value = makeAny( true );
return aProperties;
}
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index dc52424e9d52..14a134c3f1b8 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -74,7 +74,7 @@ PresentationViewShellBase::PresentationViewShellBase (
Reference<beans::XPropertySet> xLayouterSet(xFrameSet->getPropertyValue("LayoutManager"), UNO_QUERY);
if (xLayouterSet.is())
{
- xLayouterSet->setPropertyValue("AutomaticToolbars", makeAny(sal_False));
+ xLayouterSet->setPropertyValue("AutomaticToolbars", makeAny(false));
}
}
}
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index fe585eed2c7e..36d9519e3cf5 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1507,7 +1507,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText,
xPropSet->setPropertyValue( "ButtonType" , Any( form::FormButtonType_URL ) );
if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) )
{
- xPropSet->setPropertyValue( "DispatchURLInternal" , Any( sal_True ) );
+ xPropSet->setPropertyValue( "DispatchURLInternal" , Any( true ) );
}
}
else
@@ -1541,7 +1541,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText,
xPropSet->setPropertyValue( "ButtonType" , Any( form::FormButtonType_URL ) );
if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) )
- xPropSet->setPropertyValue( "DispatchURLInternal" , Any( sal_True ) );
+ xPropSet->setPropertyValue( "DispatchURLInternal" , Any( true ) );
Point aPos;
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index dce7d92f98f7..37faa89de7a2 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1020,12 +1020,12 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
( xProps->getPropertyValue( "DisableDataTableDialog" ) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
- xProps->setPropertyValue( "DisableDataTableDialog" , uno::makeAny( sal_False ) );
- xProps->setPropertyValue( "DisableComplexChartTypes" , uno::makeAny( sal_False ) );
+ xProps->setPropertyValue( "DisableDataTableDialog" , uno::makeAny( false ) );
+ xProps->setPropertyValue( "DisableComplexChartTypes" , uno::makeAny( false ) );
uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY );
if ( xModifiable.is() )
{
- xModifiable->setModified( sal_True );
+ xModifiable->setModified( true );
}
}
}