summaryrefslogtreecommitdiff
path: root/accessibility/inc/accessibility/standard
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-14 16:38:33 +0200
committerNoel Grandin <noel@peralex.com>2014-04-15 09:02:33 +0200
commitaf047fc242c51d97477c109653a98749d2af335d (patch)
treee4ce6a7cb223b08ea4fd625e6f23e42329fa70b9 /accessibility/inc/accessibility/standard
parentbe88947bac607013c6b7a3c923a2eccd09e50942 (diff)
accessibility: sal_Bool->bool
Change-Id: Id44e7a88ba4118259c990a2c6997230586d378bb
Diffstat (limited to 'accessibility/inc/accessibility/standard')
-rw-r--r--accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx48
-rw-r--r--accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx6
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx8
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx10
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx8
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx6
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx2
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx12
13 files changed, 57 insertions, 57 deletions
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; }