summaryrefslogtreecommitdiff
path: root/UnoControls
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-15 17:23:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-15 17:23:23 +0200
commit15652daf08fae35caff2e0cb0520644c7eb1f7ef (patch)
treeea8afe00cadef731bc71d6c0aa2c2a997a9b7192 /UnoControls
parent8dccc4d9b768d5a337a512e52cab8bb347bbff7e (diff)
UnoControls: sal_False/True -> false/true
Change-Id: If30d43a2693c6df2d483ec135efa54ccb643fdb0
Diffstat (limited to 'UnoControls')
-rw-r--r--UnoControls/source/base/basecontainercontrol.cxx2
-rw-r--r--UnoControls/source/base/basecontrol.cxx2
-rw-r--r--UnoControls/source/controls/framecontrol.cxx10
-rw-r--r--UnoControls/source/controls/progressbar.cxx2
-rw-r--r--UnoControls/source/controls/progressmonitor.cxx12
-rw-r--r--UnoControls/source/controls/statusindicator.cxx6
-rw-r--r--UnoControls/source/inc/progressmonitor.hxx4
7 files changed, 19 insertions, 19 deletions
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 5663cd5939b0..4c7a7bccd139 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -154,7 +154,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >&
sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception )
{
// This object has NO model.
- return sal_False;
+ return false;
}
// XControl
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 0a6cb89f05f4..b4693e86322d 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -377,7 +377,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exce
sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception )
{
- return sal_False;
+ return false;
}
// XWindow
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 2be1c04fe019..246dc8967d64 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -181,7 +181,7 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo
sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception )
{
// We have no model.
- return sal_False;
+ return false;
}
// XControl
@@ -205,7 +205,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception )
sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception )
{
// it is not possible to print this control
- return sal_False;
+ return false;
}
// XView
@@ -356,7 +356,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
if (!pInfo)
{
- pInfo = new OPropertyArrayHelper( impl_getStaticPropertyDescriptor(), sal_True );
+ pInfo = new OPropertyArrayHelper( impl_getStaticPropertyDescriptor(), true );
}
}
@@ -447,7 +447,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee
Any aNewFrame ( &xNewFrame, cppu::UnoType<XFrame>::get());
Any aOldFrame ( &xOldFrame, cppu::UnoType<XFrame>::get());
- fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False );
+ fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, false );
if (xOldFrame.is())
{
@@ -473,7 +473,7 @@ void FrameControl::impl_deleteFrame()
sal_Int32 nFrameId = PROPERTYHANDLE_FRAME;
Any aNewFrame( &xNullFrame, cppu::UnoType<XFrame2>::get());
Any aOldFrame( &xOldFrame, cppu::UnoType<XFrame2>::get());
- fire( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False );
+ fire( &nFrameId, &aNewFrame, &aOldFrame, 1, false );
// dispose the frame
if( xOldFrame.is() )
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 18ac7e5e72e4..57eeae816897 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -294,7 +294,7 @@ void SAL_CALL ProgressBar::setPosSize (
sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception )
{
// A model is not possible for this control.
- return sal_False;
+ return false;
}
// XControl
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 908687c9efdd..cad9388bc928 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -84,7 +84,7 @@ ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >
// FixedText make it automatically visible by himself ... but not the progressbar !!!
// it must be set explicitly
- m_xProgressBar->setVisible( sal_True );
+ m_xProgressBar->setVisible( true );
// Reset to defaults !!!
// (progressbar take automatically its own defaults)
@@ -227,7 +227,7 @@ void SAL_CALL ProgressMonitor::addText(
MutexGuard aGuard ( m_aMutex );
// ... and insert it in right list.
- if ( bbeforeProgress == sal_True )
+ if ( bbeforeProgress )
{
maTextlist_Top.push_back( pTextItem );
}
@@ -258,7 +258,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
MutexGuard aGuard ( m_aMutex );
// ... delete item from right list ...
- if ( bbeforeProgress == sal_True )
+ if ( bbeforeProgress )
{
vector< IMPL_TextlistItem* >::iterator
itr = find( maTextlist_Top.begin(), maTextlist_Top.end(), pSearchItem );
@@ -477,7 +477,7 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit
sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception )
{
// We have no model.
- return sal_False;
+ return false;
}
// XControl
@@ -890,7 +890,7 @@ bool ProgressMonitor::impl_debug_checkParameter (
// "bbeforeProgress" is valid in everyway!
- // Parameter OK ... return sal_True.
+ // Parameter OK ... return true.
return true;
}
@@ -901,7 +901,7 @@ bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, bool /
// "bbeforeProgress" is valid in everyway!
- // Parameter OK ... return sal_True.
+ // Parameter OK ... return true.
return true;
}
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index b34b273bfb36..b9d3f9602731 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -57,7 +57,7 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >
addControl( CONTROLNAME_PROGRESSBAR, m_xProgressBar.get() );
// FixedText make it automatically visible by himself ... but not the progressbar !!!
// it must be set explicitly
- m_xProgressBar->setVisible( sal_True );
+ m_xProgressBar->setVisible( true );
// Reset to defaults !!!
// (progressbar take automatically its own defaults)
m_xText->setText( STATUSINDICATOR_DEFAULT_TEXT );
@@ -188,7 +188,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception )
// Clear values of status controls.
m_xText->setText( OUString() );
m_xProgressBar->setValue( 0 );
- setVisible( sal_False );
+ setVisible( false );
}
// XStatusIndicator
@@ -295,7 +295,7 @@ void SAL_CALL StatusIndicator::createPeer (
sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception )
{
// We have no model.
- return sal_False;
+ return false;
}
// XControl
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index a37a9367d952..172545519293 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -413,11 +413,11 @@ private:
private:
::std::vector < IMPL_TextlistItem* > maTextlist_Top; // Elements before progress
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Top; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Top; // (used, if parameter "beforeProgress"=true in "addText, updateText, removeText")
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Top;
::std::vector < IMPL_TextlistItem* > maTextlist_Bottom; // Elements below of progress
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Bottom; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Bottom; // (used, if parameter "beforeProgress"=false in "addText, updateText, removeText")
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Bottom;
rtl::Reference<ProgressBar> m_xProgressBar;