diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 11:13:09 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 11:13:42 +0100 |
commit | 146c7c5c89d9ce26c3de951ff049d36df1b5857b (patch) | |
tree | d66d72cb77002c96f528790f88012617243ccbf3 /include/toolkit/controls | |
parent | 569756aaf4606313297eace88b3ad5a6f57d8329 (diff) |
toolkit: sal_Bool -> bool
Change-Id: I5153c4413004d1b50cc503b3e70657bc831a5793
Diffstat (limited to 'include/toolkit/controls')
-rw-r--r-- | include/toolkit/controls/controlmodelcontainerbase.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/controls/eventcontainer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/geometrycontrolmodel.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/roadmapentry.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/controls/stdtabcontroller.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/controls/stdtabcontrollermodel.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrol.hxx | 22 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolbase.hxx | 10 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrols.hxx | 11 |
10 files changed, 33 insertions, 32 deletions
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index ed4eddb48be7..3204861ecfa9 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -82,9 +82,9 @@ protected: UnoControlModelHolderList maModels; AllGroups maGroups; - sal_Bool mbGroupsUpToDate; + bool mbGroupsUpToDate; - sal_Bool m_bEnabled; + bool m_bEnabled; OUString m_sImageURL; OUString m_sTooltip; sal_Int16 m_nTabPageId; diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index 800ccdf35646..f036e481d9fb 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -44,7 +44,7 @@ struct hashName_Impl struct eqName_Impl { - sal_Bool operator()(const OUString Str1, const OUString Str2) const + bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index e6b7bfe21bda..b093ee58050a 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -80,7 +80,7 @@ namespace com { namespace sun { namespace star { ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xStrResolver; // </properties> - sal_Bool m_bCloneable; + bool m_bCloneable; protected: virtual ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const; diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx index da66948d11e6..5e1968ae706d 100644 --- a/include/toolkit/controls/roadmapentry.hxx +++ b/include/toolkit/controls/roadmapentry.hxx @@ -72,8 +72,8 @@ protected: // <properties> OUString m_sLabel; sal_Int32 m_nID; - sal_Bool m_bEnabled; - sal_Bool m_bInteractive; + bool m_bEnabled; + bool m_bInteractive; // </properties> }; diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index 9c790c9d5af2..b24161835bab 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -44,9 +44,9 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } - sal_Bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const; + bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent ) const; // if sequence length of rModels is less than rControls, return only the matching elements in rModels sequence and remove corresponding elements from rControls - void ImplActivateControl( sal_Bool bFirst ) const; + void ImplActivateControl( bool bFirst ) const; public: StdTabController(); diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index dc34e43dedbb..6700cd23baea 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -61,7 +61,7 @@ public: struct UnoControlModelEntry { - sal_Bool bGroup; + bool bGroup; union { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >* pxControl; @@ -88,7 +88,7 @@ class StdTabControllerModel : public ::com::sun::star::awt::XTabControllerMode private: ::osl::Mutex maMutex; UnoControlModelEntryList maControls; - sal_Bool mbGroupControl; + bool mbGroupControl; protected: ::osl::Mutex& GetMutex() { return maMutex; } diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index d32ba99362b5..baccf575490f 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -45,16 +45,16 @@ struct UnoControlComponentInfos { - sal_Bool bVisible; - sal_Bool bEnable; + bool bVisible; + bool bEnable; long nX, nY, nWidth, nHeight; sal_uInt16 nFlags; float nZoomX, nZoomY; UnoControlComponentInfos() { - bVisible = sal_True; - bEnable = sal_True; + bVisible = true; + bEnable = true; nX = nY = nWidth = nHeight = 0; nFlags = 0; // POSSIZE_POSSIZE; nZoomX = nZoomY = 1.0f; @@ -101,11 +101,11 @@ protected: ::com::sun::star::uno::WeakReferenceHelper maAccessibleContext; /// our most recent XAccessibleContext instance - sal_Bool mbDisposePeer; - sal_Bool mbRefeshingPeer; - sal_Bool mbCreatingPeer; - sal_Bool mbCreatingCompatiblePeer; - sal_Bool mbDesignMode; + bool mbDisposePeer; + bool mbRefeshingPeer; + bool mbCreatingPeer; + bool mbCreatingCompatiblePeer; + bool mbDesignMode; UnoControlComponentInfos maComponentInfos; UnoControl_Data* mpData; @@ -116,7 +116,7 @@ protected: virtual void updateFromModel(); void peerCreated(); bool ImplCheckLocalize( OUString& _rPossiblyLocalizable ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( bool bAcceptExistingPeer ); virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ); @@ -133,7 +133,7 @@ protected: mxVclWindowPeer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >(mxPeer,::com::sun::star::uno::UNO_QUERY); // just to avoid the query_interface thing } - virtual sal_Bool requiresNewPeer( const OUString& _rPropertyName ) const; + virtual bool requiresNewPeer( const OUString& _rPropertyName ) const; public: UnoControl(); diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index c097ffc26f1c..124671e7c181 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -35,15 +35,15 @@ class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl protected: UnoControlBase() :UnoControl() {} - sal_Bool ImplHasProperty( sal_uInt16 nProp ); - sal_Bool ImplHasProperty( const OUString& aPropertyName ); - void ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ); - void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); + bool ImplHasProperty( sal_uInt16 nProp ); + bool ImplHasProperty( const OUString& aPropertyName ); + void ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, bool bUpdateThis ); + void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, bool bUpdateThis ); ::com::sun::star::uno::Any ImplGetPropertyValue( const OUString& aPropertyName ); template <typename T> T ImplGetPropertyValuePOD( sal_uInt16 nProp ); template <typename T> T ImplGetPropertyValueClass( sal_uInt16 nProp ); - sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); + bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 1495db02e554..555f5456604b 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -75,7 +75,7 @@ protected: void ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault ); ::com::sun::star::uno::Sequence<sal_Int32> ImplGetPropertyIds() const; virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const; + bool ImplHasProperty( sal_uInt16 nPropId ) const; /** called before setting multiple properties, allows to care for property dependencies diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 71f3e76f8e80..85bc0fddf879 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -48,6 +48,7 @@ #include <toolkit/helper/macros.hxx> #include <toolkit/helper/servicenames.hxx> #include <vcl/bitmapex.hxx> +#include <vcl/settings.hxx> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase2.hxx> @@ -121,9 +122,9 @@ private: OUString maText; sal_uInt16 mnMaxTextLen; - sal_Bool mbSetTextInPeer; - sal_Bool mbSetMaxTextLenInPeer; - sal_Bool mbHasTextProperty; + bool mbSetTextInPeer; + bool mbSetMaxTextLenInPeer; + bool mbHasTextProperty; public: @@ -1016,7 +1017,7 @@ class UnoSpinFieldControl : public UnoEditControl, { private: SpinListenerMultiplexer maSpinListeners; - sal_Bool mbRepeat; + bool mbRepeat; public: UnoSpinFieldControl(); @@ -1082,7 +1083,7 @@ class UnoDateFieldControl : public UnoSpinFieldControl, private: ::com::sun::star::util::Date mnFirst; ::com::sun::star::util::Date mnLast; - sal_Bool mbLongFormat; + AutoState mbLongFormat; public: UnoDateFieldControl(); OUString GetComponentServiceName(); |