diff options
66 files changed, 347 insertions, 347 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index a52e48e24906..d70683fe4df3 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -113,7 +113,7 @@ public: */ void commitHeaderBarEvent(sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue,sal_Bool _bColumnHeaderBar = sal_True); + const ::com::sun::star::uno::Any& rOldValue,bool _bColumnHeaderBar = true); // helper functions /** commitTableEvent commit the event at all listeners of the table diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 98c42e306f25..42a211bc7185 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -268,7 +268,7 @@ public: const ::com::sun::star::uno::Any& rOldValue ); /** @return <TRUE/>, if the object is not disposed or disposing. */ - sal_Bool isAlive() const; + bool isAlive() const; protected: // internal virtual methods ----------------------------------------------- @@ -278,7 +278,7 @@ protected: behaviour. @attention This method requires locked mutex's and a living object. @return <TRUE/>, if the object is really showing. */ - virtual sal_Bool implIsShowing(); + virtual bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. @attention This method requires locked mutex's and a living object. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx index c901f2675cb5..01102c38647f 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -38,7 +38,7 @@ namespace accessibility { private: TriState m_eState; - sal_Bool m_bIsTriState; + bool m_bIsTriState; protected: virtual ~AccessibleCheckBoxCell() {} @@ -52,7 +52,7 @@ namespace accessibility sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, - sal_Bool _bIsTriState); + bool _bIsTriState); // XInterface DECLARE_XINTERFACE( ) @@ -76,7 +76,7 @@ namespace accessibility virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // internal - void SetChecked( sal_Bool _bChecked ); + void SetChecked( bool _bChecked ); }; } #endif // ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index 3c2cf4721d9b..375a75e0c665 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -221,9 +221,9 @@ protected: // internal helper methods ------------------------------------------------ /** @return <TRUE/>, if the objects is a header bar for rows. */ - inline sal_Bool isRowBar() const; + inline bool isRowBar() const; /** @return <TRUE/>, if the objects is a header bar for columns. */ - inline sal_Bool isColumnBar() const; + inline bool isColumnBar() const; /** Returns the specified row or column. Uses one of the parameters, depending on object type. @@ -249,12 +249,12 @@ protected: // inlines -------------------------------------------------------------------- -inline sal_Bool AccessibleBrowseBoxHeaderBar::isRowBar() const +inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const { return getType() == ::svt::BBTYPE_ROWHEADERBAR; } -inline sal_Bool AccessibleBrowseBoxHeaderBar::isColumnBar() const +inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const { return getType() == ::svt::BBTYPE_COLUMNHEADERBAR; } diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx index 6b03125a8d97..4f22dfb347e3 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -45,7 +45,7 @@ namespace accessibility /** Grabs the focus to the BrowseBox. */ virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - inline sal_Bool isRowBarCell() const + inline bool isRowBarCell() const { return getType() == ::svt::BBTYPE_ROWHEADERCELL; } diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx index a12d1f30f92f..ff35c97ea0d8 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx @@ -183,7 +183,7 @@ protected: // internal helper methods ------------------------------------------------ /** @return <TRUE/>, if first BrowseBox column is the "handle column". */ - sal_Bool implHasHandleColumn() const; + bool implHasHandleColumn() const; /** @attention This method requires locked mutex's and a living object. @param nColumn @@ -209,19 +209,19 @@ protected: /** @attention This method requires locked mutex's and a living object. @return <TRUE/>, if the specified row is selected. */ - sal_Bool implIsRowSelected( sal_Int32 nRow ) const; + bool implIsRowSelected( sal_Int32 nRow ) const; /** @attention This method requires locked mutex's and a living object. @return <TRUE/>, if the specified column is selected. */ - sal_Bool implIsColumnSelected( sal_Int32 nColumn ) const; + bool implIsColumnSelected( sal_Int32 nColumn ) const; /** Selects/deselects a row (tries to expand selection). @attention This method requires locked mutex's and a living object. @param bSelect <TRUE/> = select, <FALSE/> = deselect */ - void implSelectRow( sal_Int32 nRow, sal_Bool bSelect ); + void implSelectRow( sal_Int32 nRow, bool bSelect ); /** Selects/deselects a column (tries to expand selection). @attention This method requires locked mutex's and a living object. @param bSelect <TRUE/> = select, <FALSE/> = deselect */ - void implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect ); + void implSelectColumn( sal_Int32 nColumnPos, bool bSelect ); /** @attention This method requires locked mutex's and a living object. @return The count of selected rows. */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 50c12a718e4f..0af2d3c612a2 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -233,7 +233,7 @@ public: const ::com::sun::star::uno::Any& rOldValue ); /** @return <TRUE/>, if the object is not disposed or disposing. */ - sal_Bool isAlive() const; + bool isAlive() const; protected: // internal virtual methods ----------------------------------------------- @@ -243,7 +243,7 @@ protected: behaviour. @attention This method requires locked mutex's and a living object. @return <TRUE/>, if the object is really showing. */ - virtual sal_Bool implIsShowing(); + virtual bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. @attention This method requires locked mutex's and a living object. diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 11b710d5a630..d31c39f73717 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -179,19 +179,19 @@ protected: // internal helper methods ------------------------------------------------ /** @return <TRUE/>, if the objects is a header bar for rows. */ - inline sal_Bool isRowBar() const; + inline bool isRowBar() const; /** @return <TRUE/>, if the objects is a header bar for columns. */ - inline sal_Bool isColumnBar() const; + inline bool isColumnBar() const; }; // inlines -------------------------------------------------------------------- -inline sal_Bool AccessibleGridControlHeader::isRowBar() const +inline bool AccessibleGridControlHeader::isRowBar() const { return getType() == ::svt::table::TCTYPE_ROWHEADERBAR; } -inline sal_Bool AccessibleGridControlHeader::isColumnBar() const +inline bool AccessibleGridControlHeader::isColumnBar() const { return getType() == ::svt::table::TCTYPE_COLUMNHEADERBAR; } diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx index c9125a0894ba..7e0ec11d7cc5 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx @@ -64,7 +64,7 @@ namespace accessibility getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - inline sal_Bool isRowBarCell() const + inline bool isRowBarCell() const { return getType() == ::svt::table::TCTYPE_ROWHEADERCELL; } diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index 041aa15fa825..098c8e5d0d43 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -75,8 +75,8 @@ namespace accessibility private: Rectangle GetBoundingBox_Impl() const; Rectangle GetBoundingBoxOnScreen_Impl() const; - sal_Bool IsAlive_Impl() const; - sal_Bool IsShowing_Impl() const; + bool IsAlive_Impl() const; + bool IsShowing_Impl() const; Rectangle GetBoundingBox() throw (css::lang::DisposedException, diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx index 47996d5606c0..231829a5378a 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx @@ -101,8 +101,8 @@ namespace accessibility private: Rectangle GetBoundingBox_Impl() const; Rectangle GetBoundingBoxOnScreen_Impl() const; - sal_Bool IsAlive_Impl() const; - sal_Bool IsShowing_Impl() const; + bool IsAlive_Impl() const; + bool IsShowing_Impl() const; Rectangle GetBoundingBox() throw (css::lang::DisposedException, diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx index 071915d37ead..c16df51bf24c 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx @@ -51,21 +51,21 @@ namespace accessibility private: sal_uInt16 m_nPageId; - sal_Bool m_bEnabled; - sal_Bool m_bShowing; - sal_Bool m_bSelected; + bool m_bEnabled; + bool m_bShowing; + bool m_bSelected; OUString m_sPageText; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xParent; protected: - sal_Bool IsEnabled(); - sal_Bool IsShowing(); - sal_Bool IsSelected(); + bool IsEnabled(); + bool IsShowing(); + bool IsSelected(); - void SetEnabled( sal_Bool bEnabled ); - void SetShowing( sal_Bool bShowing ); - void SetSelected( sal_Bool bSelected ); + void SetEnabled( bool bEnabled ); + void SetShowing( bool bShowing ); + void SetSelected( bool bSelected ); void SetPageText( const OUString& sPageText ); sal_uInt16 GetPageId() const { return m_nPageId; } diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx index 6d273670170f..dede5c0dba01 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx @@ -56,9 +56,9 @@ namespace accessibility sal_Int32 m_nIndexInParent; protected: - void UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ); - void UpdateShowing( sal_Bool bShowing ); - void UpdateSelected( sal_Int32 i, sal_Bool bSelected ); + void UpdateEnabled( sal_Int32 i, bool bEnabled ); + void UpdateShowing( bool bShowing ); + void UpdateSelected( sal_Int32 i, bool bSelected ); void UpdatePageText( sal_Int32 i ); void InsertChild( sal_Int32 i ); diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx index 82c53ef11365..4cbad6c50ad0 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx @@ -51,9 +51,9 @@ private: SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) ); /** Returns true, if the specified row is selected. */ - sal_Bool implIsRowSelected( sal_Int32 _nRow ) const; + bool implIsRowSelected( sal_Int32 _nRow ) const; /** Selects the specified row. */ - void implSelectRow( sal_Int32 _nRow, sal_Bool _bSelect ); + void implSelectRow( sal_Int32 _nRow, bool _bSelect ); /** Returns the count of rows in the table. */ sal_Int32 implGetRowCount() const SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index 715e364dffaf..f03ea17cd259 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -64,31 +64,31 @@ protected: AccessibleChildren m_aAccessibleChildren; Menu* m_pMenu; - sal_Bool m_bEnabled; - sal_Bool m_bFocused; - sal_Bool m_bVisible; - sal_Bool m_bSelected; - sal_Bool m_bChecked; + bool m_bEnabled; + bool m_bFocused; + bool m_bVisible; + bool m_bSelected; + bool m_bChecked; Menu* GetMenu() { return m_pMenu; } - virtual sal_Bool IsEnabled(); - virtual sal_Bool IsFocused(); - virtual sal_Bool IsVisible(); - virtual sal_Bool IsSelected(); - virtual sal_Bool IsChecked(); + virtual bool IsEnabled(); + virtual bool IsFocused(); + virtual bool IsVisible(); + virtual bool IsSelected(); + virtual bool IsChecked(); - void SetEnabled( sal_Bool bEnabled ); - void SetFocused( sal_Bool bFocused ); - void SetVisible( sal_Bool bVisible ); - void SetSelected( sal_Bool bSelected ); - void SetChecked( sal_Bool bChecked ); + void SetEnabled( bool bEnabled ); + void SetFocused( bool bFocused ); + void SetVisible( bool bVisible ); + void SetSelected( bool bSelected ); + void SetChecked( bool bChecked ); - void UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ); - void UpdateFocused( sal_Int32 i, sal_Bool bFocused ); + void UpdateEnabled( sal_Int32 i, bool bEnabled ); + void UpdateFocused( sal_Int32 i, bool bFocused ); void UpdateVisible(); - void UpdateSelected( sal_Int32 i, sal_Bool bSelected ); - void UpdateChecked( sal_Int32 i, sal_Bool bChecked ); + void UpdateSelected( sal_Int32 i, bool bSelected ); + void UpdateChecked( sal_Int32 i, bool bChecked ); void UpdateAccessibleName( sal_Int32 i ); void UpdateItemText( sal_Int32 i ); @@ -100,19 +100,19 @@ protected: void InsertChild( sal_Int32 i ); void RemoveChild( sal_Int32 i ); - virtual sal_Bool IsHighlighted(); - sal_Bool IsChildHighlighted(); + virtual bool IsHighlighted(); + bool IsChildHighlighted(); - virtual sal_Bool IsMenuHideDisabledEntries(); + virtual bool IsMenuHideDisabledEntries(); void SelectChild( sal_Int32 i ); void DeSelectAll(); - sal_Bool IsChildSelected( sal_Int32 i ); + bool IsChildSelected( sal_Int32 i ); virtual void Select(); virtual void DeSelect(); virtual void Click(); - virtual sal_Bool IsPopupMenuOpen(); + virtual bool IsPopupMenuOpen(); DECL_LINK( MenuEventListener, VclSimpleEvent* ); diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx index 2f49ea0641e7..f41ae584b45c 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx @@ -38,8 +38,8 @@ class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent, public OAccessibleMenuComponent_BASE { protected: - virtual sal_Bool IsEnabled() SAL_OVERRIDE; - virtual sal_Bool IsVisible() SAL_OVERRIDE; + virtual bool IsEnabled() SAL_OVERRIDE; + virtual bool IsVisible() SAL_OVERRIDE; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx index d5764bb2029f..fac5abd7af53 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx @@ -37,8 +37,8 @@ protected: OUString m_sAccessibleName; OUString m_sItemText; - virtual sal_Bool IsEnabled() SAL_OVERRIDE; - virtual sal_Bool IsVisible() SAL_OVERRIDE; + virtual bool IsEnabled() SAL_OVERRIDE; + virtual bool IsVisible() SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE; virtual void DeSelect() SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; @@ -49,7 +49,7 @@ protected: void SetItemText( const OUString& sItemText ); OUString GetItemText(); - virtual sal_Bool IsMenuHideDisabledEntries() SAL_OVERRIDE; + virtual bool IsMenuHideDisabledEntries() SAL_OVERRIDE; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index c06e3f4cccb2..34c6a36328d2 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -111,7 +111,7 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual sal_Bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) + virtual bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleAt (const ::com::sun::star::awt::Point& aPoint) @@ -136,7 +136,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool IsInDropDown(); + bool IsInDropDown(); void HandleDropOpen(); virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList); void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList); @@ -211,11 +211,11 @@ private: void UpdateEntryRange_Impl (void); protected: void UpdateSelection_Impl (sal_uInt16 nPos = 0); - sal_Bool checkEntrySelected(sal_uInt16 _nPos, + bool checkEntrySelected(sal_uInt16 _nPos, ::com::sun::star::uno::Any& _rNewValue, ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewAcc); private: - void notifyVisibleStates(sal_Bool _bSetNew ); + void notifyVisibleStates(bool _bSetNew ); void UpdateVisibleLineCount(); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx index 70717b55556a..b3e9cb2a20dd 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx @@ -63,8 +63,8 @@ class VCLXAccessibleListItem : public ::comphelper::OBaseMutex, private: OUString m_sEntryText; sal_Int32 m_nIndexInParent; - sal_Bool m_bSelected; - sal_Bool m_bVisible; + bool m_bSelected; + bool m_bVisible; protected: /// client id in the AccessibleEventNotifier queue @@ -113,9 +113,9 @@ public: void NotifyAccessibleEvent( sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue ); - inline sal_Bool IsSelected() const { return m_bSelected; } - void SetSelected( sal_Bool _bSelected ); - void SetVisible( sal_Bool _bVisible ); + inline bool IsSelected() const { return m_bSelected; } + void SetSelected( bool _bSelected ); + void SetVisible( bool _bVisible ); inline bool DecrementIndexInParent() { OSL_ENSURE(m_nIndexInParent != 0,"Invalid call!");--m_nIndexInParent; return true;} inline bool IncrementIndexInParent() { ++m_nIndexInParent; return true;} diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx index ac31fb8f2bb7..572e341f5784 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx @@ -37,8 +37,8 @@ class VCLXAccessibleMenu : public VCLXAccessibleMenuItem, public VCLXAccessibleMenu_BASE { protected: - virtual sal_Bool IsFocused() SAL_OVERRIDE; - virtual sal_Bool IsPopupMenuOpen() SAL_OVERRIDE; + virtual bool IsFocused() SAL_OVERRIDE; + virtual bool IsPopupMenuOpen() SAL_OVERRIDE; public: VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index c82beda48c8c..6f33253c0766 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -36,7 +36,7 @@ class VCLXAccessibleMenuBar : public OAccessibleMenuComponent protected: Window* m_pWindow; - virtual sal_Bool IsFocused() SAL_OVERRIDE; + virtual bool IsFocused() SAL_OVERRIDE; DECL_LINK( WindowEventListener, VclSimpleEvent* ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx index 583528988959..75683f736ba5 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx @@ -43,11 +43,11 @@ class VCLXAccessibleMenuItem : public OAccessibleMenuItemComponent, public VCLXAccessibleMenuItem_BASE { protected: - virtual sal_Bool IsFocused() SAL_OVERRIDE; - virtual sal_Bool IsSelected() SAL_OVERRIDE; - virtual sal_Bool IsChecked() SAL_OVERRIDE; + virtual bool IsFocused() SAL_OVERRIDE; + virtual bool IsSelected() SAL_OVERRIDE; + virtual bool IsChecked() SAL_OVERRIDE; - virtual sal_Bool IsHighlighted() SAL_OVERRIDE; + virtual bool IsHighlighted() SAL_OVERRIDE; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx index e71dfc3cd9ba..7d457c0345b8 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx @@ -30,7 +30,7 @@ class VCLXAccessiblePopupMenu : public OAccessibleMenuComponent { protected: - virtual sal_Bool IsFocused() SAL_OVERRIDE; + virtual bool IsFocused() SAL_OVERRIDE; public: VCLXAccessiblePopupMenu( Menu* pMenu ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx index 438dd7167b32..467f1eb101c8 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx @@ -39,7 +39,7 @@ private: StatusBar* m_pStatusBar; protected: - void UpdateShowing( sal_Int32 i, sal_Bool bShowing ); + void UpdateShowing( sal_Int32 i, bool bShowing ); void UpdateItemName( sal_Int32 i ); void UpdateItemText( sal_Int32 i ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx index 9f2e839ebf7e..5fc61098d75f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx @@ -55,11 +55,11 @@ private: sal_uInt16 m_nItemId; OUString m_sItemName; OUString m_sItemText; - sal_Bool m_bShowing; + bool m_bShowing; protected: - sal_Bool IsShowing(); - void SetShowing( sal_Bool bShowing ); + bool IsShowing(); + void SetShowing( bool bShowing ); void SetItemName( const OUString& sItemName ); OUString GetItemName(); void SetItemText( const OUString& sItemText ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx index 1e675096eef7..24a09adc7db6 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx @@ -45,7 +45,7 @@ private: void ReleaseFocus_Impl( sal_Int32 _nPos ); void UpdateChecked_Impl( sal_Int32 _nPos ); void UpdateIndeterminate_Impl( sal_Int32 _nPos ); - void UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded ); + void UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded ); void UpdateAllItems_Impl(); void UpdateItemName_Impl( sal_Int32 _nPos ); void UpdateItemEnabled_Impl( sal_Int32 _nPos ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index 3b8fc7c9299b..ed37dd5cd0ff 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -51,8 +51,8 @@ private: sal_Int32 m_nIndexInParent; sal_Int16 m_nRole; sal_uInt16 m_nItemId; - sal_Bool m_bHasFocus; - sal_Bool m_bIsChecked; + bool m_bHasFocus; + bool m_bIsChecked; bool m_bIndeterminate; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xChild; @@ -79,10 +79,10 @@ protected: public: VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ); - void SetFocus( sal_Bool _bFocus ); - inline sal_Bool HasFocus() const { return m_bHasFocus; } - void SetChecked( sal_Bool _bCheck ); - inline sal_Bool IsChecked() const { return m_bIsChecked; } + void SetFocus( bool _bFocus ); + inline bool HasFocus() const { return m_bHasFocus; } + void SetChecked( bool _bCheck ); + inline bool IsChecked() const { return m_bIsChecked; } void SetIndeterminate( bool _bIndeterminate ); inline bool IsIndeterminate() const { return m_bIndeterminate; } inline void ReleaseToolBox() { m_pToolBox = NULL; } diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 4b72551915f1..91af550b5d23 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -301,7 +301,7 @@ void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewV void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, const Any& _rNewValue, - const Any& _rOldValue,sal_Bool _bColumnHeaderBar) + const Any& _rOldValue,bool _bColumnHeaderBar) { Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_pImpl->mxColumnHeaderBar : m_pImpl->mxRowHeaderBar; AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_pImpl->m_pColumnHeaderBar : m_pImpl->m_pRowHeaderBar; diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 2ed652480677..6b7366dd7daf 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -357,9 +357,9 @@ void AccessibleBrowseBoxBase::setAccessibleDescription( const OUString& rDescrip // internal virtual methods --------------------------------------------------- -sal_Bool AccessibleBrowseBoxBase::implIsShowing() +bool AccessibleBrowseBoxBase::implIsShowing() { - sal_Bool bShowing = sal_False; + bool bShowing = false; if( mxParent.is() ) { Reference< XAccessibleComponent > @@ -392,7 +392,7 @@ sal_Bool AccessibleBrowseBoxBase::implIsShowing() // internal helper methods ---------------------------------------------------- -sal_Bool AccessibleBrowseBoxBase::isAlive() const +bool AccessibleBrowseBoxBase::isAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpBrowseBox; } diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 41b42aa05924..685d923272c5 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -34,7 +34,7 @@ namespace accessibility sal_Int32 _nRowPos, sal_uInt16 _nColPos ,const TriState& _eState, - sal_Bool _bIsTriState) + bool _bIsTriState) :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, BBTYPE_CHECKBOXCELL) ,m_eState(_eState) ,m_bIsTriState(_bIsTriState) @@ -137,7 +137,7 @@ namespace accessibility return ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); } - void AccessibleCheckBoxCell::SetChecked( sal_Bool _bChecked ) + void AccessibleCheckBoxCell::SetChecked( bool _bChecked ) { m_eState = _bChecked ? TRISTATE_TRUE : TRISTATE_FALSE; Any aOldValue, aNewValue; diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index f8845996c218..0c9e01e4efe7 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -84,7 +84,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint ) sal_Int32 nRow = 0; sal_uInt16 nColumnPos = 0; - sal_Bool bConverted = isRowBar() ? + bool bConverted = isRowBar() ? mpBrowseBox->ConvertPointToRowHeader( nRow, VCLPoint( rPoint ) ) : mpBrowseBox->ConvertPointToColumnHeader( nColumnPos, VCLPoint( rPoint ) ); @@ -214,9 +214,9 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nCh ensureIsAlive(); ensureIsValidHeaderIndex( nChildIndex ); if( isRowBar() ) - implSelectRow( nChildIndex, sal_True ); + implSelectRow( nChildIndex, true ); else - implSelectColumn( implToVCLColumnPos( nChildIndex ), sal_True ); + implSelectColumn( implToVCLColumnPos( nChildIndex ), true ); } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int32 nChildIndex ) @@ -247,7 +247,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() if( isRowBar() ) mpBrowseBox->SelectAll(); else - implSelectColumn( implToVCLColumnPos( 0 ), sal_True ); + implSelectColumn( implToVCLColumnPos( 0 ), true ); } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount() @@ -284,9 +284,9 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( if ( isAccessibleChildSelected(nSelectedChildIndex) ) { if( isRowBar() ) - implSelectRow( nSelectedChildIndex, sal_False ); + implSelectRow( nSelectedChildIndex, false ); else - implSelectColumn( implToVCLColumnPos( nSelectedChildIndex ), sal_False ); + implSelectColumn( implToVCLColumnPos( nSelectedChildIndex ), false ); } } diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 43d7630172cc..04a09c28f8e5 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -67,7 +67,7 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - sal_Bool bSelected = isRowBarCell() ? mpBrowseBox->IsRowSelected(m_nColumnRowId) : mpBrowseBox->IsColumnSelected(m_nColumnRowId); + bool bSelected = isRowBarCell() ? mpBrowseBox->IsRowSelected(m_nColumnRowId) : mpBrowseBox->IsColumnSelected(m_nColumnRowId); if ( bSelected ) pStateSetHelper->AddState( AccessibleStateType::SELECTED ); } @@ -121,7 +121,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() namespace { - Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, sal_Bool _bOnScreen,sal_Bool _bRowBar) + Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar) { sal_Int32 nRow = 0; sal_uInt16 nCol = (sal_uInt16)_nRowColIndex; @@ -138,13 +138,13 @@ namespace Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox() { - return getRectangle(mpBrowseBox,m_nColumnRowId,sal_False,isRowBarCell()); + return getRectangle(mpBrowseBox,m_nColumnRowId,false,isRowBarCell()); } Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen() { - return getRectangle(mpBrowseBox,m_nColumnRowId,sal_True,isRowBarCell()); + return getRectangle(mpBrowseBox,m_nColumnRowId,true,isRowBarCell()); } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 4ad988e24270..cd03927c1962 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -212,7 +212,7 @@ sal_Int32 AccessibleBrowseBoxTableBase::implGetColumnCount() const // internal helper methods ---------------------------------------------------- -sal_Bool AccessibleBrowseBoxTableBase::implHasHandleColumn() const +bool AccessibleBrowseBoxTableBase::implHasHandleColumn() const { return mpBrowseBox->HasRowHeader(); } @@ -253,24 +253,24 @@ sal_Int32 AccessibleBrowseBoxTableBase::implGetChildIndex( return nRow * implGetColumnCount() + nColumn; } -sal_Bool AccessibleBrowseBoxTableBase::implIsRowSelected( sal_Int32 nRow ) const +bool AccessibleBrowseBoxTableBase::implIsRowSelected( sal_Int32 nRow ) const { return mpBrowseBox->IsRowSelected( nRow ); } -sal_Bool AccessibleBrowseBoxTableBase::implIsColumnSelected( sal_Int32 nColumn ) const +bool AccessibleBrowseBoxTableBase::implIsColumnSelected( sal_Int32 nColumn ) const { if( implHasHandleColumn() ) --nColumn; return mpBrowseBox->IsColumnSelected( nColumn ); } -void AccessibleBrowseBoxTableBase::implSelectRow( sal_Int32 nRow, sal_Bool bSelect ) +void AccessibleBrowseBoxTableBase::implSelectRow( sal_Int32 nRow, bool bSelect ) { mpBrowseBox->SelectRow( nRow, bSelect, true ); } -void AccessibleBrowseBoxTableBase::implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect ) +void AccessibleBrowseBoxTableBase::implSelectColumn( sal_Int32 nColumnPos, bool bSelect ) { mpBrowseBox->SelectColumn( (sal_uInt16)nColumnPos, bSelect ); } diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index ae4dd5b91e9a..f79d64c565c6 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -283,9 +283,9 @@ Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceName } // internal virtual methods --------------------------------------------------- -sal_Bool AccessibleGridControlBase::implIsShowing() +bool AccessibleGridControlBase::implIsShowing() { - sal_Bool bShowing = sal_False; + bool bShowing = false; if( m_xParent.is() ) { Reference< XAccessibleComponent > @@ -317,7 +317,7 @@ sal_Bool AccessibleGridControlBase::implIsShowing() // internal helper methods ---------------------------------------------------- -sal_Bool AccessibleGridControlBase::isAlive() const +bool AccessibleGridControlBase::isAlive() const { ::osl::MutexGuard g(m_aMutex); // guards rBHelper members return !rBHelper.bDisposed && !rBHelper.bInDispose && &m_aTable; diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 50e99fcad540..ebb77cb27987 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -104,7 +104,7 @@ AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint ) sal_Int32 nRow = 0; sal_Int32 nColumnPos = 0; - sal_Bool bConverted = isRowBar() ? + bool bConverted = isRowBar() ? m_aTable.ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) ) : m_aTable.ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) ); diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 15029817d5ad..be67180a179d 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -184,13 +184,13 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 ensureIsAlive(); ensureIsValidRow( nRow ); - sal_Bool bSelected = sal_False; + bool bSelected = false; Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows(); for(int i=0; i<selectedRows.getLength(); i++) { if(nRow == selectedRows[i]) { - bSelected = sal_True; + bSelected = true; continue; } } diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 055cd05e4fa3..935d80a0dd71 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -130,14 +130,14 @@ throw(RuntimeException, std::exception) return aRect; } - sal_Bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const + bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const { return ( !rBHelper.bDisposed && !rBHelper.bInDispose && m_pIconCtrl ); } - sal_Bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const + bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const { - sal_Bool bShowing = sal_False; + bool bShowing = false; Reference< XAccessibleContext > m_xParentContext = m_xParent.is() ? m_xParent->getAccessibleContext() : Reference< XAccessibleContext >(); if( m_xParentContext.is() ) @@ -471,7 +471,7 @@ throw(RuntimeException, std::exception) for ( long i = 0; i < nLen; ++i ) { Rectangle aRect = aLayoutData.GetCharacterBounds(i); - sal_Bool bInside = aRect.IsInside( aPnt ); + bool bInside = aRect.IsInside( aPnt ); if ( bInside ) break; @@ -658,7 +658,7 @@ throw(RuntimeException, std::exception) SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); - sal_Bool bRet = sal_False; + bool bRet = false; checkActionIndex_Impl( nIndex ); EnsureIsAlive(); @@ -667,7 +667,7 @@ throw(RuntimeException, std::exception) { m_pIconCtrl->SetNoSelection(); m_pIconCtrl->SetCursor( pEntry ); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 78359a9f636c..7a4e3d5dc9a7 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -124,7 +124,7 @@ namespace accessibility case VCLEVENT_LISTBOX_TREEFOCUS: { SvTreeListBox* pBox = getListBox(); - sal_Bool bNeedFocus = sal_False; + bool bNeedFocus = false; if (pBox) { Window* pParent = ((Window*)pBox)->GetParent(); @@ -413,7 +413,7 @@ namespace accessibility } } - sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; + bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) ) { if( bHasButtons ) @@ -444,7 +444,7 @@ namespace accessibility } //o is: return AccessibleRole::TREE; - sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; + bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; if(!bHasButtons && (getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN)) return AccessibleRole::LIST; else diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 389c4045f4fe..e2eab617aedd 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -142,16 +142,16 @@ namespace accessibility return aRect; } - sal_Bool AccessibleListBoxEntry::IsAlive_Impl() const + bool AccessibleListBoxEntry::IsAlive_Impl() const { return ( !rBHelper.bDisposed && !rBHelper.bInDispose && isAlive() ); } - sal_Bool AccessibleListBoxEntry::IsShowing_Impl() const + bool AccessibleListBoxEntry::IsShowing_Impl() const { Reference< XAccessible > xParent = implGetParentAccessible( ); - sal_Bool bShowing = sal_False; + bool bShowing = false; Reference< XAccessibleContext > m_xParentContext = xParent.is() ? xParent->getAccessibleContext() : Reference< XAccessibleContext >(); if( m_xParentContext.is() ) @@ -392,7 +392,7 @@ namespace accessibility } } - sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; + bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) ) { if( bHasButtons ) @@ -759,7 +759,7 @@ namespace accessibility // three actions supported SvTreeListBox* pBox = getListBox(); sal_uInt16 treeFlag = pBox->GetTreeFlags(); - sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; + bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; if( (treeFlag & TREEFLAG_CHKBTN) && !bHasButtons) { sal_Int16 role = getAccessibleRole(); @@ -778,7 +778,7 @@ namespace accessibility SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); - sal_Bool bRet = sal_False; + bool bRet = false; checkActionIndex_Impl( nIndex ); EnsureIsAlive(); @@ -804,7 +804,7 @@ namespace accessibility getListBox()->Collapse( pEntry ); else getListBox()->Expand( pEntry ); - bRet = sal_True; + bRet = true; } } @@ -1132,7 +1132,7 @@ namespace accessibility ::osl::MutexGuard aGuard( m_aMutex ); - sal_Bool bReturn = sal_False; + bool bReturn = false; SvTreeListBox* pBox = getListBox(); if(getAccessibleRole() == AccessibleRole::CHECK_BOX) { @@ -1150,7 +1150,7 @@ namespace accessibility nValue = nValueMax; pBox->SetCheckButtonState(pEntry, (SvButtonState) nValue ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 15935d386632..9723d570efc2 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -66,11 +66,11 @@ namespace accessibility - sal_Bool AccessibleTabBarPage::IsEnabled() + bool AccessibleTabBarPage::IsEnabled() { OExternalLockGuard aGuard( this ); - sal_Bool bEnabled = sal_False; + bool bEnabled = false; if ( m_pTabBar ) bEnabled = m_pTabBar->IsPageEnabled( m_nPageId ); @@ -79,31 +79,31 @@ namespace accessibility - sal_Bool AccessibleTabBarPage::IsShowing() + bool AccessibleTabBarPage::IsShowing() { - sal_Bool bShowing = sal_False; + bool bShowing = false; if ( m_pTabBar && m_pTabBar->IsVisible() ) - bShowing = sal_True; + bShowing = true; return bShowing; } - sal_Bool AccessibleTabBarPage::IsSelected() + bool AccessibleTabBarPage::IsSelected() { - sal_Bool bSelected = sal_False; + bool bSelected = false; if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_nPageId ) - bSelected = sal_True; + bSelected = true; return bSelected; } - void AccessibleTabBarPage::SetEnabled( sal_Bool bEnabled ) + void AccessibleTabBarPage::SetEnabled( bool bEnabled ) { if ( m_bEnabled != bEnabled ) { @@ -127,7 +127,7 @@ namespace accessibility - void AccessibleTabBarPage::SetShowing( sal_Bool bShowing ) + void AccessibleTabBarPage::SetShowing( bool bShowing ) { if ( m_bShowing != bShowing ) { @@ -143,7 +143,7 @@ namespace accessibility - void AccessibleTabBarPage::SetSelected( sal_Bool bSelected ) + void AccessibleTabBarPage::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) { diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index ba98af417284..67400bdf95bd 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -62,7 +62,7 @@ namespace accessibility - void AccessibleTabBarPageList::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ) + void AccessibleTabBarPageList::UpdateEnabled( sal_Int32 i, bool bEnabled ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -78,7 +78,7 @@ namespace accessibility - void AccessibleTabBarPageList::UpdateShowing( sal_Bool bShowing ) + void AccessibleTabBarPageList::UpdateShowing( bool bShowing ) { for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i ) { @@ -94,7 +94,7 @@ namespace accessibility - void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, sal_Bool bSelected ) + void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, bool bSelected ) { NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); @@ -228,7 +228,7 @@ namespace accessibility Any aOldValue, aNewValue; aNewValue <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - UpdateShowing( sal_True ); + UpdateShowing( true ); } break; case VCLEVENT_WINDOW_HIDE: @@ -236,7 +236,7 @@ namespace accessibility Any aOldValue, aNewValue; aOldValue <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - UpdateShowing( sal_False ); + UpdateShowing( false ); } break; case VCLEVENT_TABBAR_PAGEENABLED: @@ -245,7 +245,7 @@ namespace accessibility { sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); - UpdateEnabled( nPagePos, sal_True ); + UpdateEnabled( nPagePos, true ); } } break; @@ -255,7 +255,7 @@ namespace accessibility { sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); - UpdateEnabled( nPagePos, sal_False ); + UpdateEnabled( nPagePos, false ); } } break; @@ -270,7 +270,7 @@ namespace accessibility { sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); - UpdateSelected( nPagePos, sal_True ); + UpdateSelected( nPagePos, true ); } } break; @@ -280,7 +280,7 @@ namespace accessibility { sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData(); sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); - UpdateSelected( nPagePos, sal_False ); + UpdateSelected( nPagePos, false ); } } break; @@ -712,9 +712,9 @@ namespace accessibility if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) throw IndexOutOfBoundsException(); - sal_Bool bSelected = sal_False; + bool bSelected = false; if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) ) - bSelected = sal_True; + bSelected = true; return bSelected; } diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index c3f594c54d43..67ffab24a0c3 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -270,12 +270,12 @@ namespace accessibility throw IndexOutOfBoundsException(); } - sal_Bool AccessibleTabListBoxTable::implIsRowSelected( sal_Int32 _nRow ) const + bool AccessibleTabListBoxTable::implIsRowSelected( sal_Int32 _nRow ) const { return m_pTabListBox ? m_pTabListBox->IsSelected( m_pTabListBox->GetEntry( _nRow ) ) : sal_False; } - void AccessibleTabListBoxTable::implSelectRow( sal_Int32 _nRow, sal_Bool _bSelect ) + void AccessibleTabListBoxTable::implSelectRow( sal_Int32 _nRow, bool _bSelect ) { if ( m_pTabListBox ) m_pTabListBox->Select( m_pTabListBox->GetEntry( _nRow ), _bSelect ); @@ -336,7 +336,7 @@ namespace accessibility ensureIsAlive(); ensureValidIndex( nChildIndex ); - implSelectRow( implGetRow( nChildIndex ), sal_True ); + implSelectRow( implGetRow( nChildIndex ), true ); } sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) @@ -404,7 +404,7 @@ namespace accessibility ensureIsAlive(); ensureValidIndex( nSelectedChildIndex ); - implSelectRow( implGetRow( nSelectedChildIndex ), sal_False ); + implSelectRow( implGetRow( nSelectedChildIndex ), false ); } diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 966416982827..c744ffc749ec 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1700,7 +1700,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent) break; //to enable the PARAGRAPH to get focus for multiline edit ::sal_Int32 count = getAccessibleChildCount(); - sal_Bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1; + bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1; if ((m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd) || bEmpty) { Paragraphs::iterator m_aTemp = bEmpty ? m_aVisibleBegin : m_aFocused; @@ -1737,7 +1737,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent) break; //to enable the PARAGRAPH to get focus for multiline edit ::sal_Int32 count = getAccessibleChildCount(); - sal_Bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1; + bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1; if ((m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd) || bEmpty) { Paragraphs::iterator m_aTemp = bEmpty ? m_aVisibleBegin : m_aFocused; @@ -2282,7 +2282,7 @@ void Document::handleSelectionChangeNotification() { //disable the first event when user types in empty field. ::sal_Int32 count = getAccessibleChildCount(); - sal_Bool bEmpty = count > 1; + bool bEmpty = count > 1; //if (aIt != m_aFocused) if (aIt != m_aFocused && bEmpty) xParagraph->notifyEvent( diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 5719f7b3496b..1bbaa622ed65 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -279,7 +279,7 @@ inline bool hasFloatingChild(Window *pWindow) Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXListBox* _pXWindow ) { - sal_Bool bIsDropDownBox = sal_False; + bool bIsDropDownBox = false; ListBox* pBox = static_cast< ListBox* >( _pXWindow->GetWindow() ); if ( pBox ) bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN ); @@ -312,7 +312,7 @@ inline bool hasFloatingChild(Window *pWindow) Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXComboBox* _pXWindow ) { - sal_Bool bIsDropDownBox = sal_False; + bool bIsDropDownBox = false; ComboBox* pBox = static_cast< ComboBox* >( _pXWindow->GetWindow() ); if ( pBox ) bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN ); diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 4fff31c5f5c4..945758e27572 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -47,11 +47,11 @@ using namespace ::comphelper; OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu ) :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) ,m_pMenu( pMenu ) - ,m_bEnabled( sal_False ) - ,m_bFocused( sal_False ) - ,m_bVisible( sal_False ) - ,m_bSelected( sal_False ) - ,m_bChecked( sal_False ) + ,m_bEnabled( false ) + ,m_bFocused( false ) + ,m_bVisible( false ) + ,m_bSelected( false ) + ,m_bChecked( false ) { m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); @@ -75,37 +75,37 @@ OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent() -sal_Bool OAccessibleMenuBaseComponent::IsEnabled() +bool OAccessibleMenuBaseComponent::IsEnabled() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsFocused() +bool OAccessibleMenuBaseComponent::IsFocused() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsVisible() +bool OAccessibleMenuBaseComponent::IsVisible() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsSelected() +bool OAccessibleMenuBaseComponent::IsSelected() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsChecked() +bool OAccessibleMenuBaseComponent::IsChecked() { - return sal_False; + return false; } @@ -121,7 +121,7 @@ void OAccessibleMenuBaseComponent::SetStates() -void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled ) +void OAccessibleMenuBaseComponent::SetEnabled( bool bEnabled ) { if ( m_bEnabled != bEnabled ) { @@ -149,7 +149,7 @@ void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled ) -void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused ) +void OAccessibleMenuBaseComponent::SetFocused( bool bFocused ) { if ( m_bFocused != bFocused ) { @@ -165,7 +165,7 @@ void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused ) -void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible ) +void OAccessibleMenuBaseComponent::SetVisible( bool bVisible ) { if ( m_bVisible != bVisible ) { @@ -181,7 +181,7 @@ void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible ) -void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected ) +void OAccessibleMenuBaseComponent::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) { @@ -197,7 +197,7 @@ void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected ) -void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked ) +void OAccessibleMenuBaseComponent::SetChecked( bool bChecked ) { if ( m_bChecked != bChecked ) { @@ -213,7 +213,7 @@ void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked ) -void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ) +void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, bool bEnabled ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -229,7 +229,7 @@ void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled -void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused ) +void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, bool bFocused ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -262,7 +262,7 @@ void OAccessibleMenuBaseComponent::UpdateVisible() -void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelected ) +void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, bool bSelected ) { NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); @@ -280,7 +280,7 @@ void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelect -void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked ) +void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, bool bChecked ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -478,16 +478,16 @@ void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) -sal_Bool OAccessibleMenuBaseComponent::IsHighlighted() +bool OAccessibleMenuBaseComponent::IsHighlighted() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted() +bool OAccessibleMenuBaseComponent::IsChildHighlighted() { - sal_Bool bChildHighlighted = sal_False; + bool bChildHighlighted = false; for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i ) { @@ -497,7 +497,7 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted() OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() ); if ( pComp && pComp->IsHighlighted() ) { - bChildHighlighted = sal_True; + bChildHighlighted = true; break; } } @@ -529,12 +529,12 @@ void OAccessibleMenuBaseComponent::DeSelectAll() -sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) +bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) { - sal_Bool bSelected = sal_False; + bool bSelected = false; if ( m_pMenu && m_pMenu->IsHighlighted( (sal_uInt16)i ) ) - bSelected = sal_True; + bSelected = true; return bSelected; } @@ -559,9 +559,9 @@ void OAccessibleMenuBaseComponent::Click() -sal_Bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() +bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() { - return sal_False; + return false; } @@ -593,15 +593,15 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen break; case VCLEVENT_MENU_HIGHLIGHT: { - SetFocused( sal_False ); - UpdateFocused( nItemPos, sal_True ); - UpdateSelected( nItemPos, sal_True ); + SetFocused( false ); + UpdateFocused( nItemPos, true ); + UpdateSelected( nItemPos, true ); } break; case VCLEVENT_MENU_DEHIGHLIGHT: { - UpdateFocused( nItemPos, sal_False ); - UpdateSelected( nItemPos, sal_False ); + UpdateFocused( nItemPos, false ); + UpdateSelected( nItemPos, false ); } break; case VCLEVENT_MENU_SUBMENUACTIVATE: @@ -610,17 +610,17 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen break; case VCLEVENT_MENU_SUBMENUDEACTIVATE: { - UpdateFocused( nItemPos, sal_True ); + UpdateFocused( nItemPos, true ); } break; case VCLEVENT_MENU_ENABLE: { - UpdateEnabled( nItemPos, sal_True ); + UpdateEnabled( nItemPos, true ); } break; case VCLEVENT_MENU_DISABLE: { - UpdateEnabled( nItemPos, sal_False ); + UpdateEnabled( nItemPos, false ); } break; case VCLEVENT_MENU_SUBMENUCHANGED: @@ -652,12 +652,12 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen break; case VCLEVENT_MENU_ITEMCHECKED: { - UpdateChecked( nItemPos, sal_True ); + UpdateChecked( nItemPos, true ); } break; case VCLEVENT_MENU_ITEMUNCHECKED: { - UpdateChecked( nItemPos, sal_False ); + UpdateChecked( nItemPos, false ); } break; case VCLEVENT_OBJECT_DYING: @@ -768,9 +768,9 @@ Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStat -sal_Bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries() +bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries() { - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 43b388c73162..0824882917ec 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -60,16 +60,16 @@ OAccessibleMenuComponent::~OAccessibleMenuComponent() -sal_Bool OAccessibleMenuComponent::IsEnabled() +bool OAccessibleMenuComponent::IsEnabled() { - return sal_True; + return true; } -sal_Bool OAccessibleMenuComponent::IsVisible() +bool OAccessibleMenuComponent::IsVisible() { - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( m_pMenu ) bVisible = m_pMenu->IsMenuVisible(); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 19cbe7aaf778..79fbcbc43aba 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -72,11 +72,11 @@ OAccessibleMenuItemComponent::~OAccessibleMenuItemComponent() -sal_Bool OAccessibleMenuItemComponent::IsEnabled() +bool OAccessibleMenuItemComponent::IsEnabled() { OExternalLockGuard aGuard( this ); - sal_Bool bEnabled = sal_False; + bool bEnabled = false; if ( m_pParent ) bEnabled = m_pParent->IsItemEnabled( m_pParent->GetItemId( m_nItemPos ) ); @@ -85,9 +85,9 @@ sal_Bool OAccessibleMenuItemComponent::IsEnabled() -sal_Bool OAccessibleMenuItemComponent::IsVisible() +bool OAccessibleMenuItemComponent::IsVisible() { - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( m_pParent ) bVisible = m_pParent->IsItemPosVisible( m_nItemPos ); @@ -234,7 +234,7 @@ OUString OAccessibleMenuItemComponent::GetItemText() void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { - sal_Bool bEnabled = IsEnabled(); + bool bEnabled = IsEnabled(); if ( bEnabled ) { rStateSet.AddState( AccessibleStateType::ENABLED ); @@ -493,16 +493,16 @@ OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeExceptio -sal_Bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries() +bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries() { if (m_pParent ) { if( m_pParent->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES) { - return sal_True; + return true; } } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 898a8c9c7c91..a1281db2489c 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -416,7 +416,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -435,7 +435,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) if (pComboBox != NULL) { pComboBox->ToggleDropDown(); - bNotify = sal_True; + bNotify = true; } } else if (m_aBoxType == LISTBOX) @@ -444,7 +444,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) if (pListBox != NULL) { pListBox->ToggleDropDown(); - bNotify = sal_True; + bNotify = true; } } } @@ -534,7 +534,7 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); ::rtl::OUString fValue; - sal_Bool bValid = (aNumber >>= fValue); + bool bValid = (aNumber >>= fValue); if( bValid ) { diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 63267f9f70a7..ba057d5cddcc 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -277,7 +277,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; PushButton* pButton = (PushButton*) GetWindow(); if ( pButton ) @@ -290,8 +290,8 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt else if ( nValue > 1 ) nValue = 1; - pButton->SetPressed( (sal_Bool) nValue ); - bReturn = sal_True; + pButton->SetPressed( nValue == 1 ); + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 6780d6810361..2ce86d579b22 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -298,7 +298,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() ); if ( pVCLXCheckBox ) @@ -314,7 +314,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru nValue = nValueMax; pVCLXCheckBox->setState( (sal_Int16) nValue ); - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index b51f09eee22d..9d74931638af 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -255,12 +255,12 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - sal_Bool bDoAction = sal_False; + bool bDoAction = false; Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->GrabFocus(); - bDoAction = sal_True; + bDoAction = true; } return bDoAction; @@ -419,7 +419,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; OUString sText( implGetText() ); if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) @@ -430,7 +430,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd if ( pVCLXEdit && pEdit && pEdit->IsEnabled() ) { pVCLXEdit->setSelection( awt::Selection( nStartIndex, nEndIndex ) ); - bReturn = sal_True; + bReturn = true; } return bReturn; @@ -507,7 +507,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( GetWindow() ) { @@ -559,7 +559,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; OUString sText( implGetText() ); if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) @@ -574,7 +574,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI pVCLXEdit->setText( sText.replaceAt( nMinIndex, nMaxIndex - nMinIndex, sReplacement ) ); sal_Int32 nIndex = nMinIndex + sReplacement.getLength(); setSelection( nIndex, nIndex ); - bReturn = sal_True; + bReturn = true; } return bReturn; @@ -598,7 +598,7 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeExce { OExternalLockGuard aGuard( this ); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; try { bSuccess = replaceText( 0, implGetText().getLength(), sText ); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index a998032f6e31..6d3ba7e55a0d 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -41,7 +41,7 @@ using namespace ::accessibility; namespace { - void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, sal_Bool bSelected ) + void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected ) throw (::com::sun::star::lang::IndexOutOfBoundsException) { sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount() @@ -155,7 +155,7 @@ void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& } } -void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) +void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) { m_bVisible = _bSetNew ? true : false; Any aOldValue, aNewValue; @@ -178,7 +178,7 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) if ( m_pListBoxHelper ) nTopEntry = m_pListBoxHelper->GetTopEntry(); sal_uInt16 nPos = (sal_uInt16)(aIter - m_aAccessibleChildren.begin()); - sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); + bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); pItem->SetVisible( m_bVisible && bVisible ); } @@ -225,7 +225,7 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList) { VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() ); // Retrieve the item's index from the list entry. - sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); + bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); if (bNowSelected) m_nCurSelectedPos = i; @@ -402,10 +402,10 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve switch ( rVclWindowEvent.GetId() ) { case VCLEVENT_DROPDOWN_OPEN: - notifyVisibleStates(sal_True); + notifyVisibleStates(true); break; case VCLEVENT_DROPDOWN_CLOSE: - notifyVisibleStates(sal_False); + notifyVisibleStates(false); break; case VCLEVENT_LISTBOX_SCROLLED: case VCLEVENT_COMBOBOX_SCROLLED: @@ -440,7 +440,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve { VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent); // Added by IBM Symphony Acc team to handle the list item focus when List control get focus - sal_Bool b_IsDropDownList = sal_True; + bool b_IsDropDownList = true; if (m_pListBoxHelper) b_IsDropDownList = ((m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN); if ( m_aBoxType == LISTBOX && !b_IsDropDownList ) @@ -648,12 +648,12 @@ sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException) +bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - sal_Bool bInside = sal_False; + bool bInside = false; Window* pListBox = GetWindow(); if ( pListBox ) @@ -748,7 +748,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl() sal_Int32 nEnd = std::max( m_nLastTopEntry + m_nVisibleLineCount, nTop + m_nVisibleLineCount ); for (sal_uInt16 i = static_cast<sal_uInt16>(nBegin); (i <= static_cast<sal_uInt16>(nEnd)); ++i) { - sal_Bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) ); + bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) ); Reference< XAccessible > xHold; if ( i < m_aAccessibleChildren.size() ) xHold = m_aAccessibleChildren[i]; @@ -763,10 +763,10 @@ void VCLXAccessibleList::UpdateEntryRange_Impl() m_nLastTopEntry = nTop; } -sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) +bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) { OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!"); - sal_Bool bNowSelected = sal_False; + bool bNowSelected = false; if ( m_pListBoxHelper ) { bNowSelected = m_pListBoxHelper->IsEntryPosSelected (_nPos); @@ -801,7 +801,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) { VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() ); // Retrieve the item's index from the list entry. - sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); + bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); if (bNowSelected) m_nCurSelectedPos = i; @@ -851,7 +851,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -859,14 +859,14 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) if ( m_pListBoxHelper ) { - checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False); + checkSelection_Impl(nChildIndex,*m_pListBoxHelper,false); m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nChildIndex, true ); // call the select handler, don't handle events in this time m_bDisableProcessEvent = true; m_pListBoxHelper->Select(); m_bDisableProcessEvent = false; - bNotify = sal_True; + bNotify = true; } } @@ -879,10 +879,10 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_pListBoxHelper ) { - checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False); + checkSelection_Impl(nChildIndex,*m_pListBoxHelper,false); bRet = m_pListBoxHelper->IsEntryPosSelected( (sal_uInt16)nChildIndex ); } @@ -891,7 +891,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -900,7 +900,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc if ( m_pListBoxHelper ) { m_pListBoxHelper->SetNoSelection(); - bNotify = sal_True; + bNotify = true; } } @@ -910,7 +910,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -925,7 +925,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime m_bDisableProcessEvent = true; m_pListBoxHelper->Select(); m_bDisableProcessEvent = false; - bNotify = sal_True; + bNotify = true; } } @@ -951,7 +951,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild if ( m_pListBoxHelper ) { - checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_True); + checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,true); return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) ); } @@ -960,7 +960,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -968,14 +968,14 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh if ( m_pListBoxHelper ) { - checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_False); + checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,false); m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nSelectedChildIndex, false ); // call the select handler, don't handle events in this time m_bDisableProcessEvent = true; m_pListBoxHelper->Select(); m_bDisableProcessEvent = false; - bNotify = sal_True; + bNotify = true; } } @@ -1042,7 +1042,7 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeExcept -sal_Bool VCLXAccessibleList::IsInDropDown() +bool VCLXAccessibleList::IsInDropDown() { return m_pListBoxHelper->IsInDropDown(); } diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 9396b826bd2e..4a6606a4866b 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -66,8 +66,8 @@ VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHe VCLXAccessibleListItem_BASE ( m_aMutex ), m_nIndexInParent( _nIndexInParent ), - m_bSelected ( sal_False ), - m_bVisible ( sal_False ), + m_bSelected ( false ), + m_bVisible ( false ), m_nClientId ( 0 ), m_pListBoxHelper( _pListBoxHelper ), m_xParent ( _xParent ) @@ -84,7 +84,7 @@ VCLXAccessibleListItem::~VCLXAccessibleListItem() { } -void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected ) +void VCLXAccessibleListItem::SetSelected( bool _bSelected ) { if ( m_bSelected != _bSelected ) { @@ -99,7 +99,7 @@ void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected ) } } -void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible ) +void VCLXAccessibleListItem::SetVisible( bool _bVisible ) { if ( m_bVisible != _bVisible ) { @@ -326,7 +326,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); - sal_Bool bInside = sal_False; + bool bInside = false; if ( m_pListBoxHelper ) { Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) ); @@ -568,7 +568,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I checkIndex_Impl( nStartIndex, m_sEntryText ); checkIndex_Impl( nEndIndex, m_sEntryText ); - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_pListBoxHelper ) { Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pListBoxHelper->GetClipboard(); @@ -584,7 +584,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I xFlushableClipboard->flushClipboard(); Application::AcquireSolarMutex( nRef ); - bRet = sal_True; + bRet = true; } } diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index 95d0a9550c24..80758f805a6e 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -47,27 +47,27 @@ VCLXAccessibleMenu::~VCLXAccessibleMenu() -sal_Bool VCLXAccessibleMenu::IsFocused() +bool VCLXAccessibleMenu::IsFocused() { - sal_Bool bFocused = sal_False; + bool bFocused = false; if ( IsHighlighted() && !IsChildHighlighted() ) - bFocused = sal_True; + bFocused = true; return bFocused; } -sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen() +bool VCLXAccessibleMenu::IsPopupMenuOpen() { - sal_Bool bPopupMenuOpen = sal_False; + bool bPopupMenuOpen = false; if ( m_pParent ) { PopupMenu* pPopupMenu = m_pParent->GetPopupMenu( m_pParent->GetItemId( m_nItemPos ) ); if ( pPopupMenu && pPopupMenu->IsMenuVisible() ) - bPopupMenuOpen = sal_True; + bPopupMenuOpen = true; } return bPopupMenuOpen; diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index a72b60d9b5ec..2cb4cc4c353d 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -61,12 +61,12 @@ VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar() -sal_Bool VCLXAccessibleMenuBar::IsFocused() +bool VCLXAccessibleMenuBar::IsFocused() { - sal_Bool bFocused = sal_False; + bool bFocused = false; if ( m_pWindow && m_pWindow->HasFocus() && !IsChildHighlighted() ) - bFocused = sal_True; + bFocused = true; return bFocused; } diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 2cb5fa054535..6daadb440ee5 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -62,29 +62,29 @@ VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem() -sal_Bool VCLXAccessibleMenuItem::IsFocused() +bool VCLXAccessibleMenuItem::IsFocused() { return IsHighlighted(); } -sal_Bool VCLXAccessibleMenuItem::IsSelected() +bool VCLXAccessibleMenuItem::IsSelected() { return IsHighlighted(); } -sal_Bool VCLXAccessibleMenuItem::IsChecked() +bool VCLXAccessibleMenuItem::IsChecked() { - sal_Bool bChecked = sal_False; + bool bChecked = false; if ( m_pParent ) { sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos ); if ( m_pParent->IsItemChecked( nItemId ) ) - bChecked = sal_True; + bChecked = true; } return bChecked; @@ -92,12 +92,12 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked() -sal_Bool VCLXAccessibleMenuItem::IsHighlighted() +bool VCLXAccessibleMenuItem::IsHighlighted() { - sal_Bool bHighlighted = sal_False; + bool bHighlighted = false; if ( m_pParent && m_pParent->IsHighlighted( m_nItemPos ) ) - bHighlighted = sal_True; + bHighlighted = true; return bHighlighted; } @@ -391,7 +391,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pParent ) { @@ -413,7 +413,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } } @@ -558,19 +558,19 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; sal_Int32 nValue = 0; OSL_VERIFY( aNumber >>= nValue ); if ( nValue <= 0 ) { DeSelect(); - bReturn = sal_True; + bReturn = true; } else if ( nValue >= 1 ) { Select(); - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 16ed7167ee4a..b0b394151ae5 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -45,7 +45,7 @@ VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu() -sal_Bool VCLXAccessiblePopupMenu::IsFocused() +bool VCLXAccessiblePopupMenu::IsFocused() { return !IsChildHighlighted(); } diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index d9ae06a00fde..331075bb4e6e 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -254,7 +254,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() ); if ( pVCLXRadioButton ) @@ -267,8 +267,8 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw else if ( nValue > 1 ) nValue = 1; - pVCLXRadioButton->setState( (sal_Bool) nValue ); - bReturn = sal_True; + pVCLXRadioButton->setState( nValue == 1 ); + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 3c772b4fe6fc..44faa7ed8ba9 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -138,7 +138,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - sal_Bool bReturn = sal_False; + bool bReturn = false; ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() ); if ( pScrollBar ) { @@ -152,7 +152,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw default: eScrollType = SCROLL_DONTKNOW; break; } if ( pScrollBar->DoScrollAction( eScrollType ) ) - bReturn = sal_True; + bReturn = true; } return bReturn; @@ -216,7 +216,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() ); if ( pVCLXScrollBar ) @@ -232,7 +232,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R nValue = nValueMax; pVCLXScrollBar->setValue( nValue ); - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 5579a4ce122f..31f800450b28 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -52,7 +52,7 @@ VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar() -void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing ) +void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 4a99f692efd4..99c58a280ab6 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -70,9 +70,9 @@ VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem() -sal_Bool VCLXAccessibleStatusBarItem::IsShowing() +bool VCLXAccessibleStatusBarItem::IsShowing() { - sal_Bool bShowing = sal_False; + bool bShowing = false; if ( m_pStatusBar ) bShowing = m_pStatusBar->IsItemVisible( m_nItemId ); @@ -82,7 +82,7 @@ sal_Bool VCLXAccessibleStatusBarItem::IsShowing() -void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing ) +void VCLXAccessibleStatusBarItem::SetShowing( bool bShowing ) { if ( m_bShowing != bShowing ) { @@ -582,7 +582,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pStatusBar ) { @@ -601,7 +601,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index f161f400ab44..f71f561700f9 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -433,9 +433,9 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) throw IndexOutOfBoundsException(); - sal_Bool bSelected = sal_False; + bool bSelected = false; if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) ) - bSelected = sal_True; + bSelected = true; return bSelected; } diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 2fc80195a799..84a689d7088b 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -655,7 +655,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pTabControl ) { @@ -674,7 +674,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 8d7a26165bbe..7ed497a75529 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -374,7 +374,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( GetWindow() ) { @@ -393,7 +393,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 6edd6048524c..106574f38c84 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -89,7 +89,7 @@ namespace inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; } inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; } - static sal_Bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL ); + static bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL ); public: OToolBoxWindowItem(sal_Int32 _nIndexInParent, @@ -128,7 +128,7 @@ namespace return new OToolBoxWindowItemContext( m_nIndexInParent, getComponentContext(), _rxInnerContext, this, getParent() ); } - sal_Bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation ) + bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation ) { OToolBoxWindowItem* pImplementation = NULL; @@ -203,16 +203,16 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl() return; // submit events only if toolbox has the focus to avoid sending events due to mouse move - sal_Bool bHasFocus = sal_False; + bool bHasFocus = false; if ( pToolBox->HasFocus() ) - bHasFocus = sal_True; + bHasFocus = true; else { // check for subtoolbar, i.e. check if our parent is a toolbar ToolBox* pToolBoxParent = dynamic_cast< ToolBox* >( pToolBox->GetParent() ); // subtoolbars never get the focus as key input is just forwarded, so check if the parent toolbar has it if ( pToolBoxParent && pToolBoxParent->HasFocus() ) - bHasFocus = sal_True; + bHasFocus = true; } if ( bHasFocus ) @@ -231,13 +231,13 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl() if ( pItem->HasFocus() && nItemId != nHighlightItemId ) { // reset the old focused item - pItem->SetFocus( sal_False ); + pItem->SetFocus( false ); nFocusCount++; } if ( nItemId == nHighlightItemId ) { // set the new focused item - pItem->SetFocus( sal_True ); + pItem->SetFocus( true ); nFocusCount++; } } @@ -259,7 +259,7 @@ void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos ) VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() ); if ( pItem->HasFocus() ) - pItem->SetFocus( sal_False ); + pItem->SetFocus( false ); } } } @@ -285,7 +285,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos ) } //Solution:If the position is not a child item,the focus should not be called if ( pFocusItem && (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND ) - pFocusItem->SetFocus( sal_True ); + pFocusItem->SetFocus( true ); } } @@ -339,7 +339,7 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _ } } -void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded ) +void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded ) { if ( _nPos < sal_Int32( m_aAccessibleChildren.size() ) ) { @@ -566,7 +566,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow break; case VCLEVENT_TOOLBOX_ITEMADDED : - UpdateItem_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData(), sal_True ); + UpdateItem_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData(), true ); break; case VCLEVENT_TOOLBOX_ITEMREMOVED : @@ -735,9 +735,9 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal } xChild = pChild; if ( nHighlightItemId > 0 && nItemId == nHighlightItemId ) - pChild->SetFocus( sal_True ); + pChild->SetFocus( true ); if ( pToolBox->IsItemChecked( nItemId ) ) - pChild->SetChecked( sal_True ); + pChild->SetChecked( true ); if ( pToolBox->GetItemState( nItemId ) == TRISTATE_INDET ) pChild->SetIndeterminate( true ); m_aAccessibleChildren.insert( ToolBoxItemsMap::value_type( i, xChild ) ); diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 293e546253e1..ff903d166c02 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -65,8 +65,8 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In m_nIndexInParent( _nPos ), m_nRole ( AccessibleRole::PUSH_BUTTON ), m_nItemId ( 0 ), - m_bHasFocus ( sal_False ), - m_bIsChecked ( sal_False ), + m_bHasFocus ( false ), + m_bIsChecked ( false ), m_bIndeterminate( false ) { @@ -144,7 +144,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) return sRet; } -void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus ) +void VCLXAccessibleToolBoxItem::SetFocus( bool _bFocus ) { if ( m_bHasFocus != _bFocus ) { @@ -159,7 +159,7 @@ void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus ) } } -void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck ) +void VCLXAccessibleToolBoxItem::SetChecked( bool _bCheck ) { if( m_nRole == AccessibleRole::PANEL) return; @@ -509,7 +509,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) ) throw IndexOutOfBoundsException(); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pToolBox ) { @@ -528,7 +528,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } @@ -680,7 +680,7 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pToolBox ) { @@ -692,8 +692,8 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw else if ( nValue > 1 ) nValue = 1; - m_pToolBox->CheckItem( m_nItemId, (sal_Bool) nValue ); - bReturn = sal_True; + m_pToolBox->CheckItem( m_nItemId, nValue == 1 ); + bReturn = true; } return bReturn; |