From f30f646e1e132fb3e5019669657ebc1a33ccb1fc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 13 Feb 2014 14:29:17 +0200 Subject: [PATCH] sal_Bool->bool Change-Id: Ib0f6699e994f5a71603779b8227bf081b71a5dd6 --- .../accessibility/AccessibleViewForwarder.cxx | 4 +-- .../accessibility/AccessibleViewForwarder.hxx | 2 +- include/svx/IAccessibleViewForwarder.hxx | 2 +- .../ui/Accessibility/AccessibleDocument.cxx | 28 +++++++++---------- .../AccessibleDocumentPagePreview.cxx | 4 +-- sc/source/ui/inc/AccessibleDocument.hxx | 14 +++++----- .../accessibility/AccessibleViewForwarder.cxx | 4 +-- sd/source/ui/inc/AccessibleViewForwarder.hxx | 2 +- .../GraphCtlAccessibleContext.cxx | 4 +-- svx/source/inc/GraphCtlAccessibleContext.hxx | 2 +- sw/inc/accmap.hxx | 2 +- sw/source/core/access/accmap.cxx | 4 +-- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index d5570ad9883c..ff0b68354b4a 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -40,9 +40,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder() // ________ IAccessibleViewforwarder ________ -sal_Bool AccessibleViewForwarder::IsValid() const +bool AccessibleViewForwarder::IsValid() const { - return sal_True; + return true; } Rectangle AccessibleViewForwarder::GetVisibleArea() const diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index 14524e22dbed..694e40dc1a8f 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -36,7 +36,7 @@ public: virtual ~AccessibleViewForwarder(); // ________ IAccessibleViewforwarder ________ - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual Rectangle GetVisibleArea() const; virtual Point LogicToPixel( const Point& rPoint ) const; virtual Size LogicToPixel( const Size& rSize ) const; diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index f3e61650facb..cbf9f87a68b9 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -60,7 +60,7 @@ public: @return Return if the view forwarder is valid and else. */ - virtual sal_Bool IsValid (void) const = 0; + virtual bool IsValid (void) const = 0; /** Returns the area of the underlying document that is visible in the * corresponding window. diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index fc2a0ca452a9..eaaf6f7bebf5 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1496,7 +1496,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { - AddChild( pChildWin->GetAccessible(), sal_True ); + AddChild( pChildWin->GetAccessible(), true ); } } break; @@ -1505,7 +1505,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { - RemoveChild( pChildWin->GetAccessible(), sal_True ); + RemoveChild( pChildWin->GetAccessible(), true ); } } break; @@ -1605,7 +1605,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::CellInEditMode); uno::Reference xAcc = mpTempAccEdit; - AddChild(xAcc, sal_True); + AddChild(xAcc, true); if (mpAccessibleSpreadsheet) mpAccessibleSpreadsheet->LostFocus(); @@ -1624,7 +1624,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) mpTempAccEdit->LostFocus(); mpTempAccEdit = NULL; - RemoveChild(mxTempAcc, sal_True); + RemoveChild(mxTempAcc, true); if (mpAccessibleSpreadsheet && mpViewShell->IsActive()) mpAccessibleSpreadsheet->GotFocus(); else if( mpViewShell->IsActive()) @@ -1668,7 +1668,7 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& / sal_Bool bSelectionChanged(false); if (mpAccessibleSpreadsheet) { - sal_Bool bOldSelected(mbCompleteSheetSelected); + bool bOldSelected(mbCompleteSheetSelected); mbCompleteSheetSelected = IsTableSelected(); if (bOldSelected != mbCompleteSheetSelected) { @@ -2112,7 +2112,7 @@ uno::Sequence SAL_CALL ///===== IAccessibleViewForwarder ======================================== -sal_Bool ScAccessibleDocument::IsValid (void) const +bool ScAccessibleDocument::IsValid (void) const { SolarMutexGuard aGuard; IsObjectValid(); @@ -2280,9 +2280,9 @@ void ScAccessibleDocument::FreeAccessibleSpreadsheet() } } -sal_Bool ScAccessibleDocument::IsTableSelected() const +bool ScAccessibleDocument::IsTableSelected() const { - sal_Bool bResult (false); + bool bResult (false); if(mpViewShell) { SCTAB nTab(getVisibleTable()); @@ -2290,26 +2290,26 @@ sal_Bool ScAccessibleDocument::IsTableSelected() const ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData()); aMarkData.MarkToMulti(); if (aMarkData.IsAllMarked(ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab)))) - bResult = sal_True; + bResult = true; } return bResult; } -sal_Bool ScAccessibleDocument::IsDefunc( +bool ScAccessibleDocument::IsDefunc( const uno::Reference& rxParentStates) { return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() || (rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC)); } -sal_Bool ScAccessibleDocument::IsEditable( +bool ScAccessibleDocument::IsEditable( const uno::Reference& /* rxParentStates */) { // what is with document protection or readonly documents? - return sal_True; + return true; } -void ScAccessibleDocument::AddChild(const uno::Reference& xAcc, sal_Bool bFireEvent) +void ScAccessibleDocument::AddChild(const uno::Reference& xAcc, bool bFireEvent) { OSL_ENSURE(!mxTempAcc.is(), "this object should be removed before"); if (xAcc.is()) @@ -2326,7 +2326,7 @@ void ScAccessibleDocument::AddChild(const uno::Reference& xAcc, sal } } -void ScAccessibleDocument::RemoveChild(const uno::Reference& xAcc, sal_Bool bFireEvent) +void ScAccessibleDocument::RemoveChild(const uno::Reference& xAcc, bool bFireEvent) { OSL_ENSURE(mxTempAcc.is(), "this object should be added before"); if (xAcc.is()) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 305ce15318d6..4b90eaa0640a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -512,7 +512,7 @@ public: ///===== IAccessibleViewForwarder ======================================== - virtual sal_Bool IsValid (void) const; + virtual bool IsValid (void) const; virtual Rectangle GetVisibleArea() const; virtual Point LogicToPixel (const Point& rPoint) const; virtual Size LogicToPixel (const Size& rSize) const; @@ -547,7 +547,7 @@ ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder() ///===== IAccessibleViewForwarder ======================================== -sal_Bool ScIAccessibleViewForwarder::IsValid (void) const +bool ScIAccessibleViewForwarder::IsValid (void) const { SolarMutexGuard aGuard; return mbValid; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 46441a6a70af..7f96300e0f50 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -204,7 +204,7 @@ public: @return Return if the view forwarder is valid and else. */ - virtual sal_Bool IsValid (void) const; + virtual bool IsValid (void) const; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -296,7 +296,7 @@ private: ScAccessibleEditObject* mpTempAccEdit; com::sun::star::uno::Reference mxTempAcc; Rectangle maVisArea; - sal_Bool mbCompleteSheetSelected; + bool mbCompleteSheetSelected; public: SCTAB getVisibleTable() const; // use it in ScChildrenShapes @@ -304,17 +304,17 @@ public: private: void FreeAccessibleSpreadsheet(); - sal_Bool IsTableSelected() const; + bool IsTableSelected() const; - sal_Bool IsDefunc( + bool IsDefunc( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); - sal_Bool IsEditable( + bool IsEditable( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); - void AddChild(const com::sun::star::uno::Reference& xAcc, sal_Bool bFireEvent); - void RemoveChild(const com::sun::star::uno::Reference& xAcc, sal_Bool bFireEvent); + void AddChild(const com::sun::star::uno::Reference& xAcc, bool bFireEvent); + void RemoveChild(const com::sun::star::uno::Reference& xAcc, bool bFireEvent); OUString GetCurrentCellName() const; OUString GetCurrentCellDescription() const; diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index 2b7dd5326925..b4a2815a5d9f 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -62,9 +62,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder (void) -sal_Bool AccessibleViewForwarder::IsValid (void) const +bool AccessibleViewForwarder::IsValid (void) const { - return sal_True; + return true; } diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 6a2c8ca4d03a..45ee9d16767e 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -57,7 +57,7 @@ public: @return Return if the view forwarder is valid and else. */ - virtual sal_Bool IsValid (void) const; + virtual bool IsValid (void) const; /** Returns the area of the underlying document that is visible in the * corresponding window. diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0b230a6faf61..7b94a734de18 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -898,9 +898,9 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi //===== IAccessibleViewforwarder ======================================== -sal_Bool SvxGraphCtrlAccessibleContext::IsValid (void) const +bool SvxGraphCtrlAccessibleContext::IsValid (void) const { - return sal_True; + return true; } //----------------------------------------------------------------------------- diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index c1f7b94b9a3a..8619254b2995 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -166,7 +166,7 @@ public: //===== IAccessibleViewforwarder ======================================== - virtual sal_Bool IsValid (void) const; + virtual bool IsValid (void) const; virtual Rectangle GetVisibleArea() const; virtual Point LogicToPixel (const Point& rPoint) const; virtual Size LogicToPixel (const Size& rSize) const; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 0329cf77ee22..13a609a205aa 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -264,7 +264,7 @@ public: // IAccessibleViewForwarder - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual Rectangle GetVisibleArea() const; virtual Point LogicToPixel (const Point& rPoint) const; virtual Size LogicToPixel (const Size& rSize) const; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 99a43f2f3843..0b40ef6a8aa9 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -3137,9 +3137,9 @@ void SwAccessibleMap::FireEvents() } -sal_Bool SwAccessibleMap::IsValid() const +bool SwAccessibleMap::IsValid() const { - return sal_True; + return true; } Rectangle SwAccessibleMap::GetVisibleArea() const