summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-03 11:46:22 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:13 +0200
commit050d7fc852f1539f16a358c03e4e8ffb57891c4d (patch)
tree1e408d0ed742ea26a7f21e7ebea26f58b9c359d8
parent7ad8e33c0f00af96ae5ee35fb360901803c3863b (diff)
editeng: sal_Bool->bool
Change-Id: I7a7b5e9ae1762cace1f87b379b32398b231745fd
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx18
-rw-r--r--include/editeng/AccessibleContextBase.hxx8
-rw-r--r--include/svx/AccessibleControlShape.hxx2
-rw-r--r--include/svx/AccessibleShape.hxx4
-rw-r--r--include/svx/AccessibleTableShape.hxx4
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx2
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx8
-rw-r--r--svx/source/table/accessiblecell.cxx8
-rw-r--r--svx/source/table/accessiblecell.hxx4
-rw-r--r--svx/source/table/accessibletableshape.cxx8
-rw-r--r--sw/source/core/view/vnew.cxx2
11 files changed, 34 insertions, 34 deletions
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 5a90b6f7dba6..0fb932c24e08 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -94,7 +94,7 @@ AccessibleContextBase::~AccessibleContextBase(void)
-sal_Bool AccessibleContextBase::SetState (sal_Int16 aState)
+bool AccessibleContextBase::SetState (sal_Int16 aState)
{
::osl::ClearableMutexGuard aGuard (maMutex);
::utl::AccessibleStateSetHelper* pStateSet =
@@ -116,16 +116,16 @@ sal_Bool AccessibleContextBase::SetState (sal_Int16 aState)
aNewValue,
uno::Any());
}
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
-sal_Bool AccessibleContextBase::ResetState (sal_Int16 aState)
+bool AccessibleContextBase::ResetState (sal_Int16 aState)
{
::osl::ClearableMutexGuard aGuard (maMutex);
::utl::AccessibleStateSetHelper* pStateSet =
@@ -142,16 +142,16 @@ sal_Bool AccessibleContextBase::ResetState (sal_Int16 aState)
AccessibleEventId::STATE_CHANGED,
uno::Any(),
aOldValue);
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
-sal_Bool AccessibleContextBase::GetState (sal_Int16 aState)
+bool AccessibleContextBase::GetState (sal_Int16 aState)
{
::osl::MutexGuard aGuard (maMutex);
::utl::AccessibleStateSetHelper* pStateSet =
@@ -160,7 +160,7 @@ sal_Bool AccessibleContextBase::GetState (sal_Int16 aState)
return pStateSet->contains(aState);
else
// If there is no state set then return false as a default value.
- return sal_False;
+ return false;
}
@@ -647,7 +647,7 @@ void AccessibleContextBase::ThrowIfDisposed (void)
-sal_Bool AccessibleContextBase::IsDisposed (void)
+bool AccessibleContextBase::IsDisposed (void)
{
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx
index 4051929c4b65..b02c0cf68bd6 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -133,7 +133,7 @@ public:
If the specified state changed its value due to this call
<TRUE/> is returned, otherwise <FALSE/>.
*/
- virtual sal_Bool SetState (sal_Int16 aState);
+ virtual bool SetState (sal_Int16 aState);
/** Reset the specified state (turn it off) and send events to all
listeners to inform them of the change.
@@ -145,7 +145,7 @@ public:
If the specified state changed its value due to this call
<TRUE/> is returned, otherwise <FALSE/>.
*/
- virtual sal_Bool ResetState (sal_Int16 aState);
+ virtual bool ResetState (sal_Int16 aState);
/** Return the state of the specified state.
@@ -156,7 +156,7 @@ public:
A value of <TRUE/> indicates that the state is set. A <FALSE/>
value indicates an unset state.
*/
- sal_Bool GetState (sal_Int16 aState);
+ bool GetState (sal_Int16 aState);
/** Replace the current relation set with the specified one. Send
events for relations that are not in both sets.
@@ -334,7 +334,7 @@ protected:
@return TRUE, if the object is disposed or in the course
of being disposed. Otherwise, FALSE is returned.
*/
- sal_Bool IsDisposed (void);
+ bool IsDisposed (void);
/** sets the role as returned by XaccessibleContext::getAccessibleRole
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 42ffe354fcc5..0df43722b8fe 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -131,7 +131,7 @@ protected:
#ifdef DBG_UTIL
/// Set the specified state
- virtual sal_Bool SetState( sal_Int16 _nState );
+ virtual bool SetState( sal_Int16 _nState );
#endif // DBG_UTIL
/// (safely) reads the given property from the model of the UNO control
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 86d3ca285cfa..46be425a2527 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -181,7 +181,7 @@ public:
The returned flag indicates whether the specified state has been
changed (<TRUE/>), i.e. it has formerly not been set.
*/
- virtual sal_Bool SetState (sal_Int16 aState);
+ virtual bool SetState (sal_Int16 aState);
/** Reset the specified state. If the state is <const>FOCUSED</const>
then, additionally to the inherited functionality, the focus
@@ -195,7 +195,7 @@ public:
The returned flag indicates whether the specified state has been
changed (<TRUE/>), i.e. it has formerly been set.
*/
- virtual sal_Bool ResetState (sal_Int16 aState);
+ virtual bool ResetState (sal_Int16 aState);
/** Return the state of the specified state. Take the
<const>FOCUSED</const> state from the accessible edit engine.
diff --git a/include/svx/AccessibleTableShape.hxx b/include/svx/AccessibleTableShape.hxx
index b4b48020c241..9a9e95664a38 100644
--- a/include/svx/AccessibleTableShape.hxx
+++ b/include/svx/AccessibleTableShape.hxx
@@ -131,8 +131,8 @@ public:
void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException );
// overwrite the SetState & ResetState to do special operation for table cell's internal text
- virtual sal_Bool SetState (sal_Int16 aState);
- virtual sal_Bool ResetState (sal_Int16 aState);
+ 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);
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 31a40ec6fafd..9ccc8b6b44e5 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -790,7 +790,7 @@ void AccessibleControlShape::adjustAccessibleRole( )
#ifdef DBG_UTIL
-sal_Bool AccessibleControlShape::SetState( sal_Int16 _nState )
+bool AccessibleControlShape::SetState( sal_Int16 _nState )
{
OSL_ENSURE( !isAliveMode( m_xUnoControl ) || !isComposedState( _nState ),
"AccessibleControlShape::SetState: a state which should be determined by the control context is set from outside!" );
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index cd3859059c82..d1a7d5ab420b 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -263,9 +263,9 @@ bool AccessibleShape::operator== (const AccessibleShape& rShape)
-sal_Bool AccessibleShape::SetState (sal_Int16 aState)
+bool AccessibleShape::SetState (sal_Int16 aState)
{
- sal_Bool bStateHasChanged = sal_False;
+ bool bStateHasChanged = false;
if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
{
@@ -284,9 +284,9 @@ sal_Bool AccessibleShape::SetState (sal_Int16 aState)
-sal_Bool AccessibleShape::ResetState (sal_Int16 aState)
+bool AccessibleShape::ResetState (sal_Int16 aState)
{
- sal_Bool bStateHasChanged = sal_False;
+ bool bStateHasChanged = false;
if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
{
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 1f9a1d620a5e..56343a83a830 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -97,9 +97,9 @@ void AccessibleCell::Init (void)
-sal_Bool AccessibleCell::SetState (sal_Int16 aState)
+bool AccessibleCell::SetState (sal_Int16 aState)
{
- sal_Bool bStateHasChanged = sal_False;
+ bool bStateHasChanged = false;
if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
{
@@ -117,9 +117,9 @@ sal_Bool AccessibleCell::SetState (sal_Int16 aState)
-sal_Bool AccessibleCell::ResetState (sal_Int16 aState)
+bool AccessibleCell::ResetState (sal_Int16 aState)
{
- sal_Bool bStateHasChanged = sal_False;
+ bool bStateHasChanged = false;
if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
{
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 8a1499bdcc94..795b712a963e 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -58,8 +58,8 @@ public:
virtual bool operator== (const AccessibleCell& rAccessibleCell);
- virtual sal_Bool SetState (sal_Int16 aState);
- virtual sal_Bool ResetState (sal_Int16 aState);
+ virtual bool SetState (sal_Int16 aState);
+ virtual bool ResetState (sal_Int16 aState);
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 18f1481df206..d6a478f0ea6b 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -997,10 +997,10 @@ AccessibleCell* AccessibleTableShape::GetActiveAccessibleCell()
}
//If current active cell is in editing, the focus state should be set to internal text
-sal_Bool AccessibleTableShape::SetState (sal_Int16 aState)
+bool AccessibleTableShape::SetState (sal_Int16 aState)
{
AccessibleCell* pActiveAccessibleCell = GetActiveAccessibleCell();
- sal_Bool bStateHasChanged = sal_False;
+ bool bStateHasChanged = false;
if (aState == AccessibleStateType::FOCUSED && pActiveAccessibleCell != NULL)
{
return pActiveAccessibleCell->SetState(aState);
@@ -1011,10 +1011,10 @@ sal_Bool AccessibleTableShape::SetState (sal_Int16 aState)
}
//If current active cell is in editing, the focus state should be reset to internal text
-sal_Bool AccessibleTableShape::ResetState (sal_Int16 aState)
+bool AccessibleTableShape::ResetState (sal_Int16 aState)
{
AccessibleCell* pActiveAccessibleCell = GetActiveAccessibleCell();
- sal_Bool bStateHasChanged = sal_False;
+ bool bStateHasChanged = false;
if (aState == AccessibleStateType::FOCUSED && pActiveAccessibleCell != NULL)
{
return pActiveAccessibleCell->ResetState(aState);
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index c509b3f29033..4f195b137789 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -362,7 +362,7 @@ SwViewShell::~SwViewShell()
sal_Bool SwViewShell::HasDrawView() const
{
- return Imp() && Imp()->HasDrawView();
+ return (Imp() && Imp()->HasDrawView()) ? 1 : 0;
}
void SwViewShell::MakeDrawView()