[Libreoffice-commits] core.git: forms/source
Stephan Bergmann
sbergman at redhat.com
Mon Sep 15 06:07:12 PDT 2014
forms/source/component/Button.cxx | 6 +++---
forms/source/component/Button.hxx | 4 ++--
forms/source/component/DatabaseForm.cxx | 4 ++--
forms/source/component/EventThread.hxx | 2 +-
forms/source/component/FormComponent.cxx | 2 +-
forms/source/component/ImageButton.cxx | 2 +-
forms/source/component/clickableimage.cxx | 6 +++---
forms/source/component/clickableimage.hxx | 4 ++--
forms/source/helper/formnavigation.cxx | 4 ++--
forms/source/inc/FormComponent.hxx | 2 +-
forms/source/inc/formnavigation.hxx | 2 +-
forms/source/solar/component/navbarcontrol.cxx | 2 +-
forms/source/solar/component/navbarcontrol.hxx | 2 +-
13 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit f5e617a6e455fdf68afd2122dde90a111cbd5ebe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 15 15:06:45 2014 +0200
forms: sal_Bool -> bool
Change-Id: If69785c37c6c9cd175e149f10bd5497de26a120c
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 8d45fae..3ede9e4 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -483,13 +483,13 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
}
}
else
- actionPerformed_Impl( sal_False, ::com::sun::star::awt::MouseEvent() );
+ actionPerformed_Impl( false, ::com::sun::star::awt::MouseEvent() );
}
return 0L;
}
-void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt )
+void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt )
{
{
sal_Int16 nFeatureId = -1;
@@ -706,7 +706,7 @@ void OButtonControl::getSupportedFeatures( ::std::vector< sal_Int16 >& /* [out]
}
-void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled )
+void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled )
{
if ( _nFeatureId == m_nTargetUrlFeatureId )
{
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index 0e10752..8289de1 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -163,7 +163,7 @@ public:
protected:
// OFormNavigationHelper overriables
virtual void getSupportedFeatures( ::std::vector< sal_Int16 >& /* [out] */ _rFeatureIds ) SAL_OVERRIDE;
- virtual void featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled ) SAL_OVERRIDE;
+ virtual void featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled ) SAL_OVERRIDE;
virtual void allFeatureStatesChanged( ) SAL_OVERRIDE;
virtual bool isEnabled( sal_Int16 _nFeatureId ) const SAL_OVERRIDE;
@@ -172,7 +172,7 @@ protected:
virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// OImageControl overridables
- virtual void actionPerformed_Impl( sal_Bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) SAL_OVERRIDE;
+ virtual void actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) SAL_OVERRIDE;
private:
DECL_LINK( OnClick, void* );
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 2da9bcb..6689959 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -172,7 +172,7 @@ protected:
virtual void processEvent( ::cppu::OComponentHelper* _pCompImpl,
const EventObject* _pEvt,
const Reference<XControl>& _rControl,
- sal_Bool _bSubmit) SAL_OVERRIDE;
+ bool _bSubmit) SAL_OVERRIDE;
public:
@@ -191,7 +191,7 @@ void OFormSubmitResetThread::processEvent(
::cppu::OComponentHelper* pCompImpl,
const EventObject *_pEvt,
const Reference<XControl>& _rControl,
- sal_Bool _bSubmit)
+ bool _bSubmit)
{
if (_bSubmit)
((ODatabaseForm *)pCompImpl)->submit_impl(_rControl, *static_cast<const ::com::sun::star::awt::MouseEvent*>(_pEvt), true);
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 151e309..9a5f353 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -79,7 +79,7 @@ protected:
virtual void processEvent( ::cppu::OComponentHelper* _pCompImpl,
const ::com::sun::star::lang::EventObject* _pEvt,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rControl,
- sal_Bool _bFlag) = 0;
+ bool _bFlag) = 0;
public:
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 96ce237..f2d26f3 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -387,7 +387,7 @@ void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException, st
m_bLocked = _bLock;
}
-void OBoundControl::_setLock(sal_Bool _bLock)
+void OBoundControl::_setLock(bool _bLock)
{
// try to set the text component to readonly
Reference< XWindowPeer > xPeer = getPeer();
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 36f7c66..868c41d 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -211,7 +211,7 @@ void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::
// Sonst nicht. Dann darf man aber auf keinen Fal die Listener
// benachrichtigen, auch dann nicht, wenn er spaeter hinzukommt.
aGuard.clear();
- actionPerformed_Impl( sal_False, e );
+ actionPerformed_Impl( false, e );
}
}
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 6e3aa8f..35f8245 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -189,7 +189,7 @@ namespace frm
// Diese Methode wird auch aus einem Thread gerufen und muss deshalb
// thread-safe sein.
- void OClickableImageBaseControl::actionPerformed_Impl(sal_Bool bNotifyListener, const MouseEvent& rEvt)
+ void OClickableImageBaseControl::actionPerformed_Impl(bool bNotifyListener, const MouseEvent& rEvt)
{
if( bNotifyListener )
{
@@ -870,9 +870,9 @@ namespace frm
void OImageProducerThread_Impl::processEvent( ::cppu::OComponentHelper *pCompImpl,
const EventObject* pEvt,
const Reference<XControl>&,
- sal_Bool )
+ bool )
{
- ((OClickableImageBaseControl *)pCompImpl)->actionPerformed_Impl( sal_True, *(MouseEvent *)pEvt );
+ ((OClickableImageBaseControl *)pCompImpl)->actionPerformed_Impl( true, *(MouseEvent *)pEvt );
}
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index e2c8ec1..a70f081 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -223,7 +223,7 @@ namespace frm
virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- virtual void actionPerformed_Impl( sal_Bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& rEvt );
+ virtual void actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& rEvt );
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _getTypes() SAL_OVERRIDE;
@@ -258,7 +258,7 @@ namespace frm
virtual void processEvent( ::cppu::OComponentHelper *pCompImpl,
const ::com::sun::star::lang::EventObject*,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>&,
- sal_Bool ) SAL_OVERRIDE;
+ bool ) SAL_OVERRIDE;
public:
OImageProducerThread_Impl( OClickableImageBaseControl *pControl ) :
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index dd5f9d9..1d647d7 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -65,7 +65,7 @@ namespace frm
}
- void OFormNavigationHelper::featureStateChanged( sal_Int16 /*_nFeatureId*/, sal_Bool /*_bEnabled*/ )
+ void OFormNavigationHelper::featureStateChanged( sal_Int16 /*_nFeatureId*/, bool /*_bEnabled*/ )
{
// not interested in
}
@@ -137,7 +137,7 @@ namespace frm
aFeature->second.aCachedAdditionalState.clear();
--m_nConnectedFeatures;
- featureStateChanged( aFeature->first, sal_False );
+ featureStateChanged( aFeature->first, false );
break;
}
}
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index deef763..da1ef25 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -315,7 +315,7 @@ public:
protected:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
// implement the lock setting
- virtual void _setLock(sal_Bool _bLock);
+ virtual void _setLock(bool _bLock);
};
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index e496812..c323c2b 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -126,7 +126,7 @@ namespace frm
determines if the features is enabled or disabled
@see getBooleanState
*/
- virtual void featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled );
+ virtual void featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled );
/** notification for (potential) changes in the state of all features
<p>The base class implementation does nothing. Derived classes could force
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 12016eb..274851f 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -422,7 +422,7 @@ namespace frm
}
- void ONavigationBarPeer::featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled )
+ void ONavigationBarPeer::featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled )
{
// enable this button on the toolbox
NavigationToolBar* pNavBar = static_cast< NavigationToolBar* >( GetWindow() );
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index c043682..57e5af6 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -127,7 +127,7 @@ namespace frm
// OFormNavigationHelper overriables
virtual void interceptorsChanged( ) SAL_OVERRIDE;
- virtual void featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled ) SAL_OVERRIDE;
+ virtual void featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled ) SAL_OVERRIDE;
virtual void allFeatureStatesChanged( ) SAL_OVERRIDE;
virtual void getSupportedFeatures( ::std::vector< sal_Int16 >& /* [out] */ _rFeatureIds ) SAL_OVERRIDE;
More information about the Libreoffice-commits
mailing list