Kaydet (Commit) 8e01acba authored tarafından Noel Grandin's avatar Noel Grandin

sal_Bool->bool

Change-Id: I8d085a23ed47430bbe87b9c79c33a293b1a49eda
üst a69db1b6
...@@ -1441,7 +1441,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces ...@@ -1441,7 +1441,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
if (!mpHeader) if (!mpHeader)
{ {
mpHeader = new ScAccessiblePageHeader( this, mpViewShell, sal_True, aCount.nBackShapes + aCount.nHeaders - 1); mpHeader = new ScAccessiblePageHeader( this, mpViewShell, true, aCount.nBackShapes + aCount.nHeaders - 1);
mpHeader->acquire(); mpHeader->acquire();
} }
if (!mpFooter) if (!mpFooter)
...@@ -1519,7 +1519,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi ...@@ -1519,7 +1519,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
{ {
if ( !mpHeader ) if ( !mpHeader )
{ {
mpHeader = new ScAccessiblePageHeader( this, mpViewShell, sal_True, nIndex ); mpHeader = new ScAccessiblePageHeader( this, mpViewShell, true, nIndex );
mpHeader->acquire(); mpHeader->acquire();
} }
......
...@@ -85,7 +85,7 @@ struct Dispose ...@@ -85,7 +85,7 @@ struct Dispose
ScAccessiblePageHeader::ScAccessiblePageHeader( const ::com::sun::star::uno::Reference< ScAccessiblePageHeader::ScAccessiblePageHeader( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent, ::com::sun::star::accessibility::XAccessible>& rxParent,
ScPreviewShell* pViewShell, sal_Bool bHeader, sal_Int32 nIndex ) : ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex ) :
ScAccessibleContextBase( rxParent, bHeader ? AccessibleRole::HEADER : AccessibleRole::FOOTER ), ScAccessibleContextBase( rxParent, bHeader ? AccessibleRole::HEADER : AccessibleRole::FOOTER ),
mpViewShell( pViewShell ), mpViewShell( pViewShell ),
mnIndex( nIndex ), mnIndex( nIndex ),
...@@ -389,7 +389,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce ...@@ -389,7 +389,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce
return aRect; return aRect;
} }
sal_Bool ScAccessiblePageHeader::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates ) bool ScAccessiblePageHeader::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
{ {
return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() || return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC)); (rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
......
...@@ -34,7 +34,7 @@ class ScAccessiblePageHeader : public ScAccessibleContextBase ...@@ -34,7 +34,7 @@ class ScAccessiblePageHeader : public ScAccessibleContextBase
public: public:
ScAccessiblePageHeader( const ::com::sun::star::uno::Reference< ScAccessiblePageHeader( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent, ::com::sun::star::accessibility::XAccessible>& rxParent,
ScPreviewShell* pViewShell, sal_Bool bHeader, sal_Int32 nIndex ); ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex );
protected: protected:
virtual ~ScAccessiblePageHeader(); virtual ~ScAccessiblePageHeader();
...@@ -87,12 +87,12 @@ protected: ...@@ -87,12 +87,12 @@ protected:
private: private:
ScPreviewShell* mpViewShell; ScPreviewShell* mpViewShell;
sal_Int32 mnIndex; sal_Int32 mnIndex;
sal_Bool mbHeader; bool mbHeader;
typedef std::vector< ScAccessiblePageHeaderArea* > ScHFAreas; typedef std::vector< ScAccessiblePageHeaderArea* > ScHFAreas;
ScHFAreas maAreas; ScHFAreas maAreas;
sal_Int32 mnChildCount; sal_Int32 mnChildCount;
sal_Bool IsDefunc( bool IsDefunc(
const com::sun::star::uno::Reference< const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment