diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-01 09:53:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:47 +0200 |
commit | 8d6a99f67edc3be61f1294f963c3bbbd2b7344f6 (patch) | |
tree | 821b205fa3e96d0f6478dbd3c8de6d36cad83a1d /include/dbaccess | |
parent | 0a1cc7826beade023be930ac966a465c11819d55 (diff) |
dbaccess: sal_Bool->bool
Change-Id: Ida8ee14bb6350fad815d741ca7a2b7db04a8ed11
Diffstat (limited to 'include/dbaccess')
-rw-r--r-- | include/dbaccess/IController.hxx | 6 | ||||
-rw-r--r-- | include/dbaccess/dbsubcomponentcontroller.hxx | 18 | ||||
-rw-r--r-- | include/dbaccess/genericcontroller.hxx | 36 |
3 files changed, 30 insertions, 30 deletions
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx index 7d816728d8cb..7b76dee98577 100644 --- a/include/dbaccess/IController.hxx +++ b/include/dbaccess/IController.hxx @@ -73,7 +73,7 @@ namespace dbaui @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ - virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0; + virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0; /** checks if the given Command is enabled @param _rCompleteCommandURL @@ -82,7 +82,7 @@ namespace dbaui @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ - virtual sal_Bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0; + virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0; /** registers a command URL, giving it a unique name @@ -108,7 +108,7 @@ namespace dbaui @return <TRUE/> if read only, otherwise <FALSE/> */ - virtual sal_Bool isDataSourceReadOnly() const = 0; + virtual bool isDataSourceReadOnly() const = 0; /** provides access to the model of the controller diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index fe9087030431..2452b8ad9a09 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -73,19 +73,19 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const SAL_OVERRIDE; - sal_Bool impl_isModified() const; + bool impl_isModified() const; virtual void impl_onModifyChanged(); public: - sal_Bool isReadOnly() const; - sal_Bool isEditable() const; - void setEditable(sal_Bool _bEditable); + bool isReadOnly() const; + bool isEditable() const; + void setEditable(bool _bEditable); // asking for connection-related stuff - sal_Bool isConnected() const; + bool isConnected() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > getMetaData( ) const; @@ -95,7 +95,7 @@ namespace dbaui OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getDataSource() const; - sal_Bool haveDataSource() const; + bool haveDataSource() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getDatabaseDocument() const; @@ -119,7 +119,7 @@ namespace dbaui /** @return <TRUE/> when an error was set otherwise <FALSE/> */ - sal_Bool hasError() const; + bool hasError() const; /** returns the current error */ @@ -167,8 +167,8 @@ namespace dbaui virtual ~DBSubComponentController(); virtual void disconnect(); - virtual void reconnect( sal_Bool _bUI ); - sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } + virtual void reconnect( bool _bUI ); + bool ensureConnected( bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } /** called when our connection is beeing disposed <p>The default implementation does a reconnect</p> diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index f6a4952a75da..43b7546094dd 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -124,14 +124,14 @@ namespace dbaui */ struct FeatureState { - sal_Bool bEnabled; + bool bEnabled; optional< bool > bChecked; optional< bool > bInvisible; ::com::sun::star::uno::Any aValue; optional< OUString > sTitle; - FeatureState() : bEnabled(sal_False) { } + FeatureState() : bEnabled(false) { } }; @@ -166,7 +166,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; sal_Int32 nId; - sal_Bool bForceBroadcast; + bool bForceBroadcast; }; @@ -249,11 +249,11 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > m_xDatabaseContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper; - sal_Bool m_bPreview; - sal_Bool m_bReadOnly; + bool m_bPreview; + bool m_bReadOnly; - sal_Bool m_bCurrentlyModified : 1; - sal_Bool m_bExternalTitle : 1; + bool m_bCurrentlyModified : 1; + bool m_bExternalTitle : 1; @@ -332,7 +332,7 @@ namespace dbaui @param _nId The ID of the feature. */ - sal_Bool isFeatureSupported( sal_Int32 _nId ); + bool isFeatureSupported( sal_Int32 _nId ); // gets the URL which the given id is assigned to ::com::sun::star::util::URL getURLForId(sal_Int32 _nId) const; @@ -395,10 +395,10 @@ namespace dbaui void InvalidateAll_Impl(); void InvalidateFeature_Impl(); - void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, sal_Bool _bForceBroadcast ); + void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, bool _bForceBroadcast ); - sal_Bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState); - void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, sal_Bool _bIgnoreCache); + bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState); + void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, bool _bIgnoreCache); // link methods DECL_LINK(OnAsyncInvalidateAll, void*); @@ -414,17 +414,17 @@ namespace dbaui // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); + virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false); // if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used. // if there is a toolbar slot with the given id it is updated (the new state is determined via GetState) // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); + virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false); /** InvalidateAll invalidates all features currently known */ virtual void InvalidateAll(); // late construction - virtual sal_Bool Construct(Window* pParent); + virtual bool Construct(Window* pParent); /** get the layout manager @param _xFrame @@ -439,16 +439,16 @@ namespace dbaui virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE; - virtual sal_Bool isCommandEnabled(const OUString& _rCompleteCommandURL) const SAL_OVERRIDE; + virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE; + virtual bool isCommandEnabled(const OUString& _rCompleteCommandURL) const SAL_OVERRIDE; virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) SAL_OVERRIDE; virtual void notifyHiContrastChanged() SAL_OVERRIDE; - virtual sal_Bool isDataSourceReadOnly() const SAL_OVERRIDE; + virtual bool isDataSourceReadOnly() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > getXController() throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE; // misc - virtual sal_Bool isCommandChecked(sal_uInt16 _nCommandId) const; + virtual bool isCommandChecked(sal_uInt16 _nCommandId) const; // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; |