summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-03 13:21:09 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:13 +0200
commitea2fb5f8f9ea44d7da5f9d34760e470d696f587d (patch)
tree6d0259df92cab5e4fc6027e3a9cc39269f627c28
parent050d7fc852f1539f16a358c03e4e8ffb57891c4d (diff)
svx: sal_Bool->bool
Change-Id: I360b459102e61562b7cd1987545288d5ce8aed6b
-rw-r--r--include/svx/AccessibleControlShape.hxx2
-rw-r--r--include/svx/AccessibleShape.hxx2
-rw-r--r--include/svx/AccessibleTableShape.hxx10
-rw-r--r--include/svx/AccessibleTextHelper.hxx14
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx4
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx4
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx10
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx10
-rw-r--r--svx/source/table/accessiblecell.cxx8
-rw-r--r--svx/source/table/accessibletableshape.cxx10
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx4
12 files changed, 40 insertions, 40 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 0df43722b8fe..3bebf2ed3b44 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -138,7 +138,7 @@ protected:
OUString getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(( ));
/// ensure that our control model exists(will be retrieved upon need only)
- sal_Bool ensureControlModelAccess( ) SAL_THROW(( ));
+ bool ensureControlModelAccess( ) SAL_THROW(( ));
/// ensures that we're listening for the given property if(and only if!) necessary
bool ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening,
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 46be425a2527..5cf86c0a7154 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -208,7 +208,7 @@ public:
entity that manages the state set.
*/
- sal_Bool GetState (sal_Int16 aState);
+ bool GetState (sal_Int16 aState);
//===== XAccessibleContext ==============================================
diff --git a/include/svx/AccessibleTableShape.hxx b/include/svx/AccessibleTableShape.hxx
index 9a9e95664a38..e7a9d831ce3d 100644
--- a/include/svx/AccessibleTableShape.hxx
+++ b/include/svx/AccessibleTableShape.hxx
@@ -134,8 +134,8 @@ public:
virtual bool SetState (sal_Int16 aState);
virtual bool ResetState (sal_Int16 aState);
// The following two methods are used to set state directly on table object, instread of the internal cell or paragraph.
- sal_Bool SetStateDirectly (sal_Int16 aState);
- sal_Bool ResetStateDirectly (sal_Int16 aState);
+ bool SetStateDirectly (sal_Int16 aState);
+ bool ResetStateDirectly (sal_Int16 aState);
// Get the currently active cell which is text editing
AccessibleCell* GetActiveAccessibleCell();
@@ -164,8 +164,8 @@ class AccessibleTableHeaderShape : boost::noncopyable,
public AccessibleTableHeaderShape_BASE
{
public:
- // bRow, sal_True means rowheader, sal_False means columnheader
- AccessibleTableHeaderShape( AccessibleTableShape* pTable, sal_Bool bRow );
+ // bRow, true means rowheader, false means columnheader
+ AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow );
virtual ~AccessibleTableHeaderShape();
// XAccessible
@@ -227,7 +227,7 @@ public:
private:
SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent );
- sal_Bool mbRow;
+ bool mbRow;
rtl::Reference< AccessibleTableShape > mpTable;
};
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index 9fa2c20e5a4f..c31c0b9bdda7 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -318,24 +318,24 @@ namespace accessibility
from the main office thread.
@param bHaveFocus
- Whether we got or we lost the focus. Set to sal_True if
- focus is gotten, sal_False otherwise.
+ Whether we got or we lost the focus. Set to true if
+ focus is gotten, false otherwise.
@see HaveFocus()
*/
- virtual void SetFocus( sal_Bool bHaveFocus = sal_True ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+ virtual void SetFocus( bool bHaveFocus = true ) SAL_THROW((::com::sun::star::uno::RuntimeException));
/** Query the focus state of the surrounding object
If focus handling is delegated to this class, determine
focus state with this method. Be prepared that even if you
- set the focus with SetFocus(sal_True), this method might
- return sal_False. This is the case if one of the children
+ set the focus with SetFocus(true), this method might
+ return false. This is the case if one of the children
actually got the focus.
@return the state of the focus ownership
*/
- virtual sal_Bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException));
+ virtual bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException));
/** Call this method to invoke all event listeners with the given event
@@ -372,7 +372,7 @@ namespace accessibility
@return sal_True, if the text or parts of it are currently selected
*/
- virtual sal_Bool IsSelected() const;
+ virtual bool IsSelected() const;
// XAccessibleContext child handling methods
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 44e29b6ecb99..fe59b03703d7 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -117,7 +117,7 @@ void ScAccessibleEditObject::GotFocus()
mbHasFocus = true;
CommitFocusGained();
if (mpTextHelper)
- mpTextHelper->SetFocus(sal_True);
+ mpTextHelper->SetFocus(true);
}
//===== XInterface ==========================================================
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index c37ab858f765..0f1cecbbfc62 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -220,7 +220,7 @@ void AccessibleOutlineView::Activated (void)
SolarMutexGuard aGuard;
// delegate listener handling to children manager.
- maTextHelper.SetFocus(sal_True);
+ maTextHelper.SetFocus(true);
}
void AccessibleOutlineView::Deactivated (void)
@@ -228,7 +228,7 @@ void AccessibleOutlineView::Deactivated (void)
SolarMutexGuard aGuard;
// delegate listener handling to children manager.
- maTextHelper.SetFocus(sal_False);
+ maTextHelper.SetFocus(false);
}
void SAL_CALL AccessibleOutlineView::disposing (void)
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 9ccc8b6b44e5..3fd93f5a919f 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -697,10 +697,10 @@ void SAL_CALL AccessibleControlShape::disposing (void)
AccessibleShape::disposing();
}
-sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
+bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
{
if ( m_xControlModel.is() )
- return sal_True;
+ return true;
try
{
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index d1a7d5ab420b..537fe41b2340 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -271,8 +271,8 @@ bool AccessibleShape::SetState (sal_Int16 aState)
{
// Offer FOCUSED state to edit engine and detect whether the state
// changes.
- sal_Bool bIsFocused = mpText->HaveFocus ();
- mpText->SetFocus (sal_True);
+ bool bIsFocused = mpText->HaveFocus ();
+ mpText->SetFocus (true);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
}
else
@@ -292,8 +292,8 @@ bool AccessibleShape::ResetState (sal_Int16 aState)
{
// Try to remove FOCUSED state from the edit engine and detect
// whether the state changes.
- sal_Bool bIsFocused = mpText->HaveFocus ();
- mpText->SetFocus (sal_False);
+ bool bIsFocused = mpText->HaveFocus ();
+ mpText->SetFocus (false);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
}
else
@@ -305,7 +305,7 @@ bool AccessibleShape::ResetState (sal_Int16 aState)
-sal_Bool AccessibleShape::GetState (sal_Int16 aState)
+bool AccessibleShape::GetState (sal_Int16 aState)
{
if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
{
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index e1daab61276b..bc16276c2679 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1777,7 +1777,7 @@ namespace accessibility
#endif
}
- void AccessibleTextHelper::SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+ void AccessibleTextHelper::SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
#ifdef DBG_UTIL
// precondition: solar mutex locked
@@ -1793,12 +1793,12 @@ namespace accessibility
#endif
}
- sal_Bool AccessibleTextHelper::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
+ bool AccessibleTextHelper::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
{
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
- sal_Bool bRet( mpImpl->HaveFocus() );
+ bool bRet( mpImpl->HaveFocus() );
mpImpl->CheckInvariants();
@@ -1938,14 +1938,14 @@ namespace accessibility
#endif
}
- sal_Bool AccessibleTextHelper::IsSelected() const
+ bool AccessibleTextHelper::IsSelected() const
{
SolarMutexGuard aGuard;
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
- sal_Bool aRet = mpImpl->IsSelected();
+ bool aRet = mpImpl->IsSelected();
mpImpl->CheckInvariants();
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 56343a83a830..0b6643ff0fa4 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -105,8 +105,8 @@ bool AccessibleCell::SetState (sal_Int16 aState)
{
// Offer FOCUSED state to edit engine and detect whether the state
// changes.
- sal_Bool bIsFocused = mpText->HaveFocus ();
- mpText->SetFocus (sal_True);
+ bool bIsFocused = mpText->HaveFocus ();
+ mpText->SetFocus (true);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
}
else
@@ -125,8 +125,8 @@ bool AccessibleCell::ResetState (sal_Int16 aState)
{
// Try to remove FOCUSED state from the edit engine and detect
// whether the state changes.
- sal_Bool bIsFocused = mpText->HaveFocus ();
- mpText->SetFocus (sal_False);
+ bool bIsFocused = mpText->HaveFocus ();
+ mpText->SetFocus (false);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
}
else
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index d6a478f0ea6b..5c18091c17de 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -522,7 +522,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea
{
if( pController->isRowHeader() )
{
- AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, sal_True );
+ AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, true );
xRet.set( pTableHeader );
}
}
@@ -539,7 +539,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn
{
if( pController->isColumnHeader() )
{
- AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, sal_False );
+ AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, false );
xRet.set( pTableHeader );
}
}
@@ -1024,12 +1024,12 @@ bool AccessibleTableShape::ResetState (sal_Int16 aState)
return bStateHasChanged;
}
-sal_Bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState)
+bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState)
{
return AccessibleContextBase::SetState (aState);
}
-sal_Bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState)
+bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState)
{
return AccessibleContextBase::ResetState (aState);
}
@@ -1042,7 +1042,7 @@ void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) t
throw IndexOutOfBoundsException();
}
-AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, sal_Bool bRow )
+AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow )
{
mpTable = pTable;
mbRow = bRow;
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
index b833bc708570..0ab0c43a33ae 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -253,13 +253,13 @@ void SidebarTxtControlAccessibleContext::ProcessWindowEvent( const VclWindowEven
case VCLEVENT_WINDOW_GETFOCUS:
case VCLEVENT_CONTROL_GETFOCUS:
{
- mpAccessibleTextHelper->SetFocus( sal_True );
+ mpAccessibleTextHelper->SetFocus( true );
}
break;
case VCLEVENT_WINDOW_LOSEFOCUS:
case VCLEVENT_CONTROL_LOSEFOCUS:
{
- mpAccessibleTextHelper->SetFocus( sal_False );
+ mpAccessibleTextHelper->SetFocus( false );
}
break;
}