diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-19 12:54:33 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-24 08:12:07 +0200 |
commit | 9f12e4a351cdaf7d22bf1699914cd58e3642e808 (patch) | |
tree | 56e5cc1c2bfa0dd2438867bf1eadef055e031e63 | |
parent | 83d807ba78bfc0b1648e0b574af0d490352bc469 (diff) |
svtools: sal_Bool->bool
Change-Id: Ic765d1a28960dbeca9501852b5e84cfdfe6ac47e
25 files changed, 250 insertions, 251 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index 383ea23a4b69..6a892e51bfbe 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -242,7 +242,7 @@ protected: return this; } void dispose(); - virtual sal_Bool isAlive() const + virtual bool isAlive() const { return isContextAlive(); } @@ -265,7 +265,7 @@ protected: return xAccessible; } virtual void commitHeaderBarEvent( sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue, sal_Bool _bColumnHeaderBar ) + const ::com::sun::star::uno::Any& rOldValue, bool _bColumnHeaderBar ) { AccessibleBrowseBox* pContext( getContext() ); if ( pContext ) diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index b94f4ddfb25a..702be9adb45e 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -228,7 +228,7 @@ protected: return this; } void DisposeAccessImpl() SAL_OVERRIDE; - virtual sal_Bool isAlive() const + virtual bool isAlive() const { return isContextAlive(); } diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 0062dc0ee7be..397595be32ea 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -335,12 +335,12 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId( Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBox() { - return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_False); + return mpBrowseBox->calcHeaderRect(isColumnBar(), false); } Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBoxOnScreen() { - return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_True); + return mpBrowseBox->calcHeaderRect(isColumnBar(), true); } sal_Int32 AccessibleBrowseBoxHeaderBar::implGetRowCount() const diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index f8c32a56c7d6..43d7630172cc 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -131,7 +131,7 @@ namespace nCol = 0; } - Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, sal_True, _bOnScreen)); + Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, true, _bOnScreen)); return Rectangle(aRet.TopLeft() - Point(0,aRet.GetHeight()),aRet.GetSize()); } } diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index cc6b36bb0902..a43256f72f42 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -221,7 +221,7 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName() Rectangle AccessibleBrowseBoxTable::implGetBoundingBox() { - return mpBrowseBox->calcTableRect(sal_False); + return mpBrowseBox->calcTableRect(false); } Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen() diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 36b8166d6da1..4ad988e24270 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -267,7 +267,7 @@ sal_Bool AccessibleBrowseBoxTableBase::implIsColumnSelected( sal_Int32 nColumn ) void AccessibleBrowseBoxTableBase::implSelectRow( sal_Int32 nRow, sal_Bool bSelect ) { - mpBrowseBox->SelectRow( nRow, bSelect, sal_True ); + mpBrowseBox->SelectRow( nRow, bSelect, true ); } void AccessibleBrowseBoxTableBase::implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect ) diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index b139b6460b71..7b02cb15ec08 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -55,12 +55,12 @@ namespace accessibility ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox() { - return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False, sal_False ); + return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false, false ); } ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen() { - return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False ); + return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false ); } } // namespace accessibility diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index f59ffe627643..d293b3d768b4 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -197,7 +197,7 @@ inline bool hasFloatingChild(Window *pWindow) sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, - sal_Bool _bIsTriState + bool _bIsTriState ) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -467,7 +467,7 @@ inline bool hasFloatingChild(Window *pWindow) Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, - const TriState& _eState, sal_Bool _bIsTriState ) const + const TriState& _eState, bool _bIsTriState ) const { return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, _eState, _bIsTriState ); diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 12110a62fc2f..e483be94abe9 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -39,28 +39,28 @@ public: virtual ~SvtAccessibilityOptions(); // get & set config entries - sal_Bool GetIsForPagePreviews() const; - sal_Bool GetIsHelpTipsDisappear() const; - sal_Bool GetIsAllowAnimatedGraphics() const; - sal_Bool GetIsAllowAnimatedText() const; - sal_Bool GetIsAutomaticFontColor() const; - bool GetIsSystemFont() const; + bool GetIsForPagePreviews() const; + bool GetIsHelpTipsDisappear() const; + bool GetIsAllowAnimatedGraphics() const; + bool GetIsAllowAnimatedText() const; + bool GetIsAutomaticFontColor() const; + bool GetIsSystemFont() const; sal_Int16 GetHelpTipSeconds() const; - sal_Bool IsSelectionInReadonly() const; - sal_Bool GetAutoDetectSystemHC() const; + bool IsSelectionInReadonly() const; + bool GetAutoDetectSystemHC() const; - void SetIsForPagePreviews(sal_Bool bSet); - void SetIsHelpTipsDisappear(sal_Bool bSet); - void SetIsAllowAnimatedGraphics(sal_Bool bSet); - void SetIsAllowAnimatedText(sal_Bool bSet); - void SetIsAutomaticFontColor(sal_Bool bSet); - void SetIsSystemFont(sal_Bool bSet); + void SetIsForPagePreviews(bool bSet); + void SetIsHelpTipsDisappear(bool bSet); + void SetIsAllowAnimatedGraphics(bool bSet); + void SetIsAllowAnimatedText(bool bSet); + void SetIsAutomaticFontColor(bool bSet); + void SetIsSystemFont(bool bSet); void SetHelpTipSeconds(sal_Int16 nSet); - void SetSelectionInReadonly(sal_Bool bSet); - void SetAutoDetectSystemHC(sal_Bool bSet); + void SetSelectionInReadonly(bool bSet); + void SetAutoDetectSystemHC(bool bSet); - sal_Bool IsModified() const; - void Commit(); + bool IsModified() const; + void Commit(); //SfxListener: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index c09c90562cb4..b13dabde0b08 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -146,7 +146,7 @@ namespace svt sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, - sal_Bool _bIsTriState + bool _bIsTriState ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 7188d3b2ee1b..cdb76f1b1db4 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -191,10 +191,10 @@ protected: virtual void SAL_CALL disposing(); /// @returns true if it's disposed or in disposing - inline sal_Bool IsAlive( void ) const; + inline bool IsAlive( void ) const; /// @returns true if it's not disposed and no in disposing - inline sal_Bool IsNotAlive( void ) const; + inline bool IsNotAlive( void ) const; /// throws the exception DisposedException if it's not alive void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); @@ -222,12 +222,12 @@ private: }; -inline sal_Bool SvtRulerAccessible::IsAlive( void ) const +inline bool SvtRulerAccessible::IsAlive( void ) const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline sal_Bool SvtRulerAccessible::IsNotAlive( void ) const +inline bool SvtRulerAccessible::IsNotAlive( void ) const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index b0b4dbeb48a8..29fb95f6f70a 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -66,9 +66,9 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible()= 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex )= 0; virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0; - virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0; - virtual sal_Bool HasColHeader() = 0; - virtual sal_Bool HasRowHeader() = 0; + virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0; + virtual bool HasColHeader() = 0; + virtual bool HasRowHeader() = 0; /** return the description of the specified object. @param eObjType @@ -88,18 +88,18 @@ public: // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; virtual void GrabFocus()= 0; - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True )= 0; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true )= 0; virtual Window* GetAccessibleParentWindow() const= 0; virtual Window* GetWindowInstance()= 0; virtual sal_Int32 GetAccessibleControlCount() const = 0; - virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0; + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0; virtual long GetRowCount() const= 0; virtual long GetColumnCount() const= 0; - virtual sal_Bool HasRowHeader() const= 0; - virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0; - virtual Rectangle calcHeaderCellRect( sal_Bool _bColHeader, sal_Int32 _nPos ) = 0; - virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0; + virtual bool HasRowHeader() const= 0; + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0; + virtual Rectangle calcHeaderCellRect( bool _bColHeader, sal_Int32 _nPos ) = 0; + virtual Rectangle calcTableRect( bool _bOnScreen = true ) = 0; virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) = 0; virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0; @@ -144,7 +144,7 @@ public: /** checks whether the accessible implementation, and its context, are still alive @return <TRUE/>, if the object is not disposed or disposing. */ - virtual sal_Bool isAlive() const = 0; + virtual bool isAlive() const = 0; /** returns the accessible object for the row or the column header bar */ diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index 0704fec77afc..973ec03f875a 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -68,30 +68,30 @@ public: virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; /** @return <TRUE/>, if the object has a row header. */ - virtual sal_Bool HasRowHeader() const = 0; //GetColumnId + virtual bool HasRowHeader() const = 0; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ - virtual sal_Bool IsCellFocusable() const = 0; - virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; + virtual bool IsCellFocusable() const = 0; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual void SetNoSelection() = 0; virtual void SelectAll() = 0; - virtual void SelectRow( long _nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ) = 0; - virtual void SelectColumn( sal_uInt16 _nColumnPos, sal_Bool _bSelect = sal_True ) = 0; + virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) = 0; + virtual void SelectColumn( sal_uInt16 _nColumnPos, bool _bSelect = true ) = 0; virtual sal_Int32 GetSelectedRowCount() const = 0; virtual sal_Int32 GetSelectedColumnCount() const = 0; /** @return <TRUE/>, if the row is selected. */ virtual bool IsRowSelected( long _nRow ) const = 0; - virtual sal_Bool IsColumnSelected( long _nColumnPos ) const = 0; + virtual bool IsColumnSelected( long _nColumnPos ) const = 0; virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const = 0; virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const = 0; /** @return <TRUE/>, if the cell is visible. */ - virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0; - virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0; - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0; + virtual Rectangle calcTableRect( bool _bOnScreen = true ) = 0; + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen = true ) = 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0; @@ -99,26 +99,26 @@ public: virtual sal_Int32 GetAccessibleControlCount() const = 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) = 0; - virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) = 0; + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) = 0; - virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) = 0; - virtual sal_Bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0; - virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0; + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) = 0; + virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0; + virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0; - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0; virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const = 0; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; virtual void GrabTableFocus() = 0; // OutputDevice - virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; virtual void GrabFocus() = 0; - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ) = 0; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) = 0; virtual Window* GetAccessibleParentWindow() const = 0; virtual Window* GetWindowInstance() = 0; @@ -180,7 +180,7 @@ public: /** checks whether the accessible implementation, and its context, are still alive @return <TRUE/>, if the object is not disposed or disposing. */ - virtual sal_Bool isAlive() const = 0; + virtual bool isAlive() const = 0; /** returns the accessible object for the row or the column header bar */ @@ -204,7 +204,7 @@ public: sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue, - sal_Bool _bColumnHeaderBar + bool _bColumnHeaderBar ) = 0; /** commits the event at all listeners of the table diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 37d8d4fedbcc..db5cd37d92b9 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -506,7 +506,7 @@ public: // selections virtual void SetNoSelection(); virtual void SelectAll(); - virtual void SelectRow( long nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ); + virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ); void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect = sal_True ) { SelectColumnPos( nCol, _bSelect, sal_True); } void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect = sal_True ) @@ -641,7 +641,7 @@ public: @return the Rectangle */ - virtual Rectangle calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen = sal_True); + virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true); /** calculates the Rectangle of the table @param _bOnScreen @@ -649,7 +649,7 @@ public: @return the Rectangle */ - virtual Rectangle calcTableRect(sal_Bool _bOnScreen = sal_True); + virtual Rectangle calcTableRect(bool _bOnScreen = true); /** @param _nRowId @@ -661,7 +661,7 @@ public: @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True); + virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true); /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive sal_Bool isAccessibleAlive( ) const; @@ -713,7 +713,7 @@ public: @param rnColumnId Out-parameter that takes the column ID. @param rPoint The position in pixels relative to the data window. @return <TRUE/>, if the point could be converted to a valid address. */ - virtual sal_Bool ConvertPointToCellAddress( + virtual bool ConvertPointToCellAddress( sal_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ); /** Converts a point relative to the row header bar origin to a row header @@ -721,21 +721,21 @@ public: @param rnRow Out-parameter that takes the row index. @param rPoint The position in pixels relative to the header bar. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual sal_Bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ); + virtual bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ); /** Converts a point relative to the column header bar origin to a column header index. @param rnColumnId Out-parameter that takes the column ID. @param rPoint The position in pixels relative to the header bar. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ); + virtual bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ); /** Converts a point relative to the BrowseBox origin to the index of an existing control. @param rnRow Out-parameter that takes the 0-based control index. @param rPoint The position in pixels relative to the BrowseBox. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual sal_Bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ); + virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ); // Object data and state -------------------------------------------------- @@ -783,21 +783,21 @@ public: // IAccessibleTableProvider virtual sal_Int32 GetCurrRow() const; virtual sal_uInt16 GetCurrColumn() const; - virtual sal_Bool HasRowHeader() const; - virtual sal_Bool IsCellFocusable() const; - virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); - virtual void SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True ); - virtual sal_Bool IsColumnSelected( long _nColumn ) const; + virtual bool HasRowHeader() const; + virtual bool IsCellFocusable() const; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ); + virtual bool IsColumnSelected( long _nColumn ) const; virtual sal_Int32 GetSelectedRowCount() const; virtual sal_Int32 GetSelectedColumnCount() const; virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const; virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const; - virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const; - virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ); + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); virtual Window* GetAccessibleParentWindow() const; virtual Window* GetWindowInstance(); diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index c321e6d35ab3..57c474588e03 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -184,32 +184,32 @@ public: virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; /** @return <TRUE/>, if the object has a row header. */ - virtual sal_Bool HasRowHeader() const; //GetColumnId + virtual bool HasRowHeader() const; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ - virtual sal_Bool IsCellFocusable() const; - virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual bool IsCellFocusable() const; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); virtual void SetNoSelection(); using SvListView::SelectAll; virtual void SelectAll(); virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True ); - virtual void SelectRow( long _nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ); - virtual void SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True ); + virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ); + virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ); virtual sal_Int32 GetSelectedRowCount() const; virtual sal_Int32 GetSelectedColumnCount() const; /** @return <TRUE/>, if the row is selected. */ virtual bool IsRowSelected( long _nRow ) const; - virtual sal_Bool IsColumnSelected( long _nColumn ) const; + virtual bool IsColumnSelected( long _nColumn ) const; virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const; virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const; /** @return <TRUE/>, if the cell is visible. */ - virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ); - virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ); - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ); + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ); + virtual Rectangle calcTableRect( bool _bOnScreen = true ); + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ); virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ); @@ -217,14 +217,14 @@ public: virtual sal_Int32 GetAccessibleControlCount() const; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); - virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ); - virtual sal_Bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ); - virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ); + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ); + virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ); + virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ); - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; virtual Window* GetWindowInstance(); using SvTreeListBox::FillAccessibleStateSet; @@ -233,12 +233,12 @@ public: virtual void GrabTableFocus(); // OutputDevice - virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ); + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); virtual Window* GetAccessibleParentWindow() const; /** Creates and returns the accessible object of the whole BrowseBox. */ diff --git a/include/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx index d8eee465d096..e04ba5bbbc57 100644 --- a/include/svtools/table/tablecontrol.hxx +++ b/include/svtools/table/tablecontrol.hxx @@ -153,7 +153,7 @@ namespace svt { namespace table SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; - SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); + SVT_DLLPRIVATE virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const; @@ -168,18 +168,18 @@ namespace svt { namespace table // IAccessibleTable virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ); + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); virtual Window* GetAccessibleParentWindow() const; virtual Window* GetWindowInstance(); virtual sal_Int32 GetAccessibleControlCount() const; - virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); virtual long GetRowCount() const; virtual long GetColumnCount() const; - virtual sal_Bool HasRowHeader() const; - virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ); - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ); - virtual Rectangle calcHeaderCellRect( sal_Bool _bIsColumnBar, sal_Int32 nPos); - virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ); + virtual bool HasRowHeader() const; + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ); + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ); + virtual Rectangle calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos); + virtual Rectangle calcTableRect( bool _bOnScreen = true ); virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ); virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); @@ -189,8 +189,8 @@ namespace svt { namespace table virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; virtual OUString GetColumnName( sal_Int32 _nIndex ) const; virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - virtual sal_Bool HasRowHeader(); - virtual sal_Bool HasColHeader(); + virtual bool HasRowHeader(); + virtual bool HasColHeader(); virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; virtual sal_Int32 GetSelectedRowCount() const; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index a9ad6baf9c17..90dabe17e69e 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1742,7 +1742,7 @@ void BrowseBox::SelectAll() -void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) +void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) { if ( !bMultiSelection ) diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index c813386717aa..e350e6819dc9 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -494,12 +494,12 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) // down and up while ( rEvt.GetRow() < aSelRange.Max() ) { // ZTC/Mac bug - don't put these statements together! - SelectRow( aSelRange.Max(), bSelectThis, sal_True ); + SelectRow( aSelRange.Max(), bSelectThis, true ); --aSelRange.Max(); } while ( rEvt.GetRow() > aSelRange.Max() ) { // ZTC/Mac bug - don't put these statements together! - SelectRow( aSelRange.Max(), bSelectThis, sal_True ); + SelectRow( aSelRange.Max(), bSelectThis, true ); ++aSelRange.Max(); } } @@ -513,7 +513,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) --aSelRange.Max(); if ( !IsRowSelected( aSelRange.Max() ) ) { - SelectRow( aSelRange.Max(), bSelectThis, sal_True ); + SelectRow( aSelRange.Max(), bSelectThis, true ); bSelect = true; } } @@ -522,7 +522,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) ++aSelRange.Max(); if ( !IsRowSelected( aSelRange.Max() ) ) { - SelectRow( aSelRange.Max(), bSelectThis, sal_True ); + SelectRow( aSelRange.Max(), bSelectThis, true ); bSelect = true; } } @@ -533,7 +533,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) } else if ( !bMultiSelection || !IsRowSelected( rEvt.GetRow() ) ) - SelectRow( rEvt.GetRow(), sal_True ); + SelectRow( rEvt.GetRow(), true ); GoToRow( rEvt.GetRow(), sal_False ); DoShowCursor( "ExpandRowSelection" ); @@ -1577,7 +1577,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) if ( rEvt.GetRow() >= 0 ) { GoToRow( rEvt.GetRow() ); - SelectRow( rEvt.GetRow(), sal_True, sal_False ); + SelectRow( rEvt.GetRow(), true, false ); } else { @@ -1668,7 +1668,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) // select directly SetNoSelection(); GoToRow( rEvt.GetRow() ); - SelectRow( rEvt.GetRow(), sal_True ); + SelectRow( rEvt.GetRow(), true ); aSelRange = Range( rEvt.GetRow(), rEvt.GetRow() ); bSelect = true; } @@ -1727,7 +1727,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) { aSelRange = Range( rEvt.GetRow(), rEvt.GetRow() ); if ( bExtendedMode ) - SelectRow( rEvt.GetRow(), sal_False ); + SelectRow( rEvt.GetRow(), false ); else { SetNoSelection(); @@ -1736,7 +1736,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) else { GoToRow( rEvt.GetRow() ); - SelectRow( rEvt.GetRow(), sal_True ); + SelectRow( rEvt.GetRow(), true ); } } bSelect = true; @@ -1886,10 +1886,10 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) long nRow = GetCurRow(); sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) || GetSelectRowCount() == 1 || IsRowSelected( nRow - 1 ) ); - SelectRow( nRow, bLocalSelect, sal_True ); + SelectRow( nRow, bLocalSelect, true ); bDone = GoToRow( GetCurRow() + 1 , sal_False ); if ( bDone ) - SelectRow( GetCurRow(), sal_True, sal_True ); + SelectRow( GetCurRow(), true, true ); } else bDone = ScrollRows( 1 ) != 0; @@ -1903,10 +1903,10 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) long nRow = GetCurRow(); sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) || GetSelectRowCount() == 1 || IsRowSelected( nRow + 1 ) ); - SelectRow( nCurRow, bLocalSelect, sal_True ); + SelectRow( nCurRow, bLocalSelect, true ); bDone = GoToRow( nRow - 1 , sal_False ); if ( bDone ) - SelectRow( GetCurRow(), sal_True, sal_True ); + SelectRow( GetCurRow(), true, true ); } break; case BROWSER_CURSORPAGEDOWN: @@ -1976,12 +1976,12 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) break; case BROWSER_ENHANCESELECTION: if ( GetRowCount() ) - SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), sal_True ); + SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), true ); bDone = sal_True; break; case BROWSER_SELECT: if ( GetRowCount() ) - SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), sal_False ); + SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), false ); bDone = sal_True; break; case BROWSER_MOVECOLUMNLEFT: @@ -2034,7 +2034,7 @@ void BrowseBox::SetCursorColor(const Color& _rCol) DoShowCursor("SetCursorColor"); } -Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen) +Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) { Window* pParent = NULL; if ( !_bOnScreen ) @@ -2058,14 +2058,14 @@ Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen) return Rectangle(aTopLeft,Size(nWidth,nHeight)); } -Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen) +Rectangle BrowseBox::calcTableRect(bool _bOnScreen) { Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); Rectangle aRect( GetWindowExtentsRelative( pParent ) ); - Rectangle aRowBar = calcHeaderRect(sal_False,pParent == NULL); + Rectangle aRowBar = calcHeaderRect(false, pParent == NULL); long nX = aRowBar.Right() - aRect.Left(); long nY = aRowBar.Top() - aRect.Top(); @@ -2074,7 +2074,7 @@ Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen) return Rectangle(aRowBar.TopRight(), Size(aSize.A() - nX, aSize.B() - nY - aHScroll.GetSizePixel().Height()) ); } -Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool /*_bIsHeader*/, sal_Bool _bOnScreen ) +Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId, sal_uInt16 _nColId, bool /*_bIsHeader*/, bool _bOnScreen ) { Window* pParent = NULL; if ( !_bOnScreen ) diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 91720a3dfdf9..1d7d3d15a9aa 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -168,7 +168,7 @@ Reference< XAccessible > BrowseBox::CreateAccessibleControl( sal_Int32 ) // Conversions ---------------------------------------------------------------- -sal_Bool BrowseBox::ConvertPointToCellAddress( +bool BrowseBox::ConvertPointToCellAddress( sal_Int32& rnRow, sal_uInt16& rnColumnPos, const Point& rPoint ) { //! TODO has to be checked @@ -178,7 +178,7 @@ sal_Bool BrowseBox::ConvertPointToCellAddress( } -sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) +bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) { rnRow = GetRowAtYPosPixel(rPoint.Y()); // sal_uInt16 nColumnId = GetColumnAtXPosPixel(rPoint.X()); @@ -186,19 +186,19 @@ sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoi } -sal_Bool BrowseBox::ConvertPointToColumnHeader( sal_uInt16& _rnColumnPos, const Point& _rPoint ) +bool BrowseBox::ConvertPointToColumnHeader( sal_uInt16& _rnColumnPos, const Point& _rPoint ) { _rnColumnPos = GetColumnAtXPosPixel(_rPoint.X()); return _rnColumnPos != BROWSER_INVALIDID; } -sal_Bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) +bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) { //! TODO has to be checked sal_Int32 nRow = 0; sal_uInt16 nColumn = 0; - sal_Bool bRet = ConvertPointToCellAddress(nRow,nColumn,_rPoint); + bool bRet = ConvertPointToCellAddress(nRow,nColumn,_rPoint); if ( bRet ) _rnIndex = nRow * ColCount() + nColumn; @@ -450,31 +450,30 @@ sal_uInt16 BrowseBox::GetCurrColumn() const return GetColumnPos( GetCurColumnId() ); } -sal_Bool BrowseBox::HasRowHeader() const +bool BrowseBox::HasRowHeader() const { return ( GetColumnId( 0 ) == HandleColumnId ); // HandleColumn == RowHeader } -sal_Bool BrowseBox::IsCellFocusable() const +bool BrowseBox::IsCellFocusable() const { - return sal_True; + return true; } -sal_Bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) +bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { return GoToRowColumnId( _nRow, GetColumnId( _nColumn ) ); } -void BrowseBox::SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect ) +void BrowseBox::SelectColumn( sal_uInt16 _nColumn, bool _bSelect ) { SelectColumnPos( _nColumn, _bSelect ); } -sal_Bool BrowseBox::IsColumnSelected( long _nColumn ) const +bool BrowseBox::IsColumnSelected( long _nColumn ) const { - return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) ? - pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) ) : - sal_False; + return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) && + pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) ); } sal_Int32 BrowseBox::GetSelectedRowCount() const @@ -527,7 +526,7 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3 } } -sal_Bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const +bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const { return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) ); } @@ -538,7 +537,7 @@ OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const } -sal_Bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) +bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } @@ -553,7 +552,7 @@ void BrowseBox::GrabFocus() Control::GrabFocus(); } -Reference< XAccessible > BrowseBox::GetAccessible( sal_Bool bCreate ) +Reference< XAccessible > BrowseBox::GetAccessible( bool bCreate ) { return Control::GetAccessible( bCreate ); } diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 89e2405f0b73..f8fb910d3839 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -49,7 +49,7 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, _nRow, _nColumnPos, eState, - sal_True + true ); } return xReturn; diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 8904a0a36800..45779996415d 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -68,38 +68,38 @@ class SvtAccessibilityOptions_Impl { private: css::uno::Reference< css::container::XNameAccess > m_xCfg; - sal_Bool bIsModified; + bool bIsModified; public: SvtAccessibilityOptions_Impl(); ~SvtAccessibilityOptions_Impl(); void SetVCLSettings(); - sal_Bool GetAutoDetectSystemHC(); - sal_Bool GetIsForPagePreviews() const; - sal_Bool GetIsHelpTipsDisappear() const; - sal_Bool GetIsAllowAnimatedGraphics() const; - sal_Bool GetIsAllowAnimatedText() const; - sal_Bool GetIsAutomaticFontColor() const; - bool GetIsSystemFont() const; + bool GetAutoDetectSystemHC(); + bool GetIsForPagePreviews() const; + bool GetIsHelpTipsDisappear() const; + bool GetIsAllowAnimatedGraphics() const; + bool GetIsAllowAnimatedText() const; + bool GetIsAutomaticFontColor() const; + bool GetIsSystemFont() const; sal_Int16 GetHelpTipSeconds() const; - sal_Bool IsSelectionInReadonly() const; + bool IsSelectionInReadonly() const; sal_Int16 GetEdgeBlending() const; sal_Int16 GetListBoxMaximumLineCount() const; sal_Int16 GetColorValueSetColumnCount() const; - sal_Bool GetPreviewUsesCheckeredBackground() const; - - void SetAutoDetectSystemHC(sal_Bool bSet); - void SetIsForPagePreviews(sal_Bool bSet); - void SetIsHelpTipsDisappear(sal_Bool bSet); - void SetIsAllowAnimatedGraphics(sal_Bool bSet); - void SetIsAllowAnimatedText(sal_Bool bSet); - void SetIsAutomaticFontColor(sal_Bool bSet); - void SetIsSystemFont(sal_Bool bSet); + bool GetPreviewUsesCheckeredBackground() const; + + void SetAutoDetectSystemHC(bool bSet); + void SetIsForPagePreviews(bool bSet); + void SetIsHelpTipsDisappear(bool bSet); + void SetIsAllowAnimatedGraphics(bool bSet); + void SetIsAllowAnimatedText(bool bSet); + void SetIsAutomaticFontColor(bool bSet); + void SetIsSystemFont(bool bSet); void SetHelpTipSeconds(sal_Int16 nSet); - void SetSelectionInReadonly(sal_Bool bSet); + void SetSelectionInReadonly(bool bSet); - sal_Bool IsModified() const { return bIsModified; }; + bool IsModified() const { return bIsModified; }; }; // initialization of static members -------------------------------------- @@ -127,7 +127,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl() ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); - bIsModified = sal_False; + bIsModified = false; } catch(const css::uno::Exception& ex) { @@ -141,7 +141,7 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl() } -sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() +bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_True; @@ -159,7 +159,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() return bRet; } -sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const +bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_True; @@ -176,7 +176,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const return bRet; } -sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const +bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_True; @@ -194,7 +194,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const return bRet; } -sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const +bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_True; @@ -212,7 +212,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const return bRet; } -sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const +bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_True; @@ -230,7 +230,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const return bRet; } -sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const +bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_False; @@ -284,7 +284,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const return nRet; } -sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const +bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_False; @@ -356,7 +356,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const return nRet; } -sal_Bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const +bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); sal_Bool bRet = sal_False; @@ -374,7 +374,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const return bRet; } -void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -385,7 +385,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet) xNode->setPropertyValue(s_sAutoDetectSystemHC, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); svtools::ColorConfig().Reload(); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -394,7 +394,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -405,7 +405,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet) xNode->setPropertyValue(s_sIsForPagePreviews, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -414,7 +414,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -425,7 +425,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet) xNode->setPropertyValue(s_sIsHelpTipsDisappear, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -434,7 +434,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -445,7 +445,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet) xNode->setPropertyValue(s_sIsAllowAnimatedGraphics, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -454,7 +454,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -465,7 +465,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet) xNode->setPropertyValue(s_sIsAllowAnimatedText, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -474,7 +474,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -485,7 +485,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet) xNode->setPropertyValue(s_sIsAutomaticFontColor, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -494,7 +494,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet) } } -void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetIsSystemFont(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -505,7 +505,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet) xNode->setPropertyValue(s_sIsSystemFont, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -525,7 +525,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet) xNode->setPropertyValue(s_sHelpTipSeconds, css::uno::makeAny(nSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -534,7 +534,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet) } } -void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet) +void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -545,7 +545,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet) xNode->setPropertyValue(s_sIsSelectionInReadonly, css::uno::makeAny(bSet)); ::comphelper::ConfigurationHelper::flush(m_xCfg); - bIsModified = sal_True; + bIsModified = true; } } catch(const css::uno::Exception& ex) @@ -661,7 +661,7 @@ void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint ) -sal_Bool SvtAccessibilityOptions::IsModified() const +bool SvtAccessibilityOptions::IsModified() const { return sm_pSingleImplConfig->IsModified(); } @@ -672,27 +672,27 @@ void SvtAccessibilityOptions::Commit() -sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const +bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const { return sm_pSingleImplConfig->GetAutoDetectSystemHC(); } -sal_Bool SvtAccessibilityOptions::GetIsForPagePreviews() const +bool SvtAccessibilityOptions::GetIsForPagePreviews() const { return sm_pSingleImplConfig->GetIsForPagePreviews(); } -sal_Bool SvtAccessibilityOptions::GetIsHelpTipsDisappear() const +bool SvtAccessibilityOptions::GetIsHelpTipsDisappear() const { return sm_pSingleImplConfig->GetIsHelpTipsDisappear(); } -sal_Bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics() const +bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics() const { return sm_pSingleImplConfig->GetIsAllowAnimatedGraphics(); } -sal_Bool SvtAccessibilityOptions::GetIsAllowAnimatedText() const +bool SvtAccessibilityOptions::GetIsAllowAnimatedText() const { return sm_pSingleImplConfig->GetIsAllowAnimatedText(); } -sal_Bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const +bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const { return sm_pSingleImplConfig->GetIsAutomaticFontColor(); } @@ -704,37 +704,37 @@ sal_Int16 SvtAccessibilityOptions::GetHelpTipSeconds() const { return sm_pSingleImplConfig->GetHelpTipSeconds(); } -sal_Bool SvtAccessibilityOptions::IsSelectionInReadonly() const +bool SvtAccessibilityOptions::IsSelectionInReadonly() const { return sm_pSingleImplConfig->IsSelectionInReadonly(); } -void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet) +void SvtAccessibilityOptions::SetAutoDetectSystemHC(bool bSet) { sm_pSingleImplConfig->SetAutoDetectSystemHC(bSet); } -void SvtAccessibilityOptions::SetIsForPagePreviews(sal_Bool bSet) +void SvtAccessibilityOptions::SetIsForPagePreviews(bool bSet) { sm_pSingleImplConfig->SetIsForPagePreviews(bSet); } -void SvtAccessibilityOptions::SetIsHelpTipsDisappear(sal_Bool bSet) +void SvtAccessibilityOptions::SetIsHelpTipsDisappear(bool bSet) { sm_pSingleImplConfig->SetIsHelpTipsDisappear(bSet); } -void SvtAccessibilityOptions::SetIsAllowAnimatedGraphics(sal_Bool bSet) +void SvtAccessibilityOptions::SetIsAllowAnimatedGraphics(bool bSet) { sm_pSingleImplConfig->SetIsAllowAnimatedGraphics(bSet); } -void SvtAccessibilityOptions::SetIsAllowAnimatedText(sal_Bool bSet) +void SvtAccessibilityOptions::SetIsAllowAnimatedText(bool bSet) { sm_pSingleImplConfig->SetIsAllowAnimatedText(bSet); } -void SvtAccessibilityOptions::SetIsAutomaticFontColor(sal_Bool bSet) +void SvtAccessibilityOptions::SetIsAutomaticFontColor(bool bSet) { sm_pSingleImplConfig->SetIsAutomaticFontColor(bSet); } -void SvtAccessibilityOptions::SetIsSystemFont(sal_Bool bSet) +void SvtAccessibilityOptions::SetIsSystemFont(bool bSet) { sm_pSingleImplConfig->SetIsSystemFont(bSet); } @@ -742,7 +742,7 @@ void SvtAccessibilityOptions::SetHelpTipSeconds(sal_Int16 nSet) { sm_pSingleImplConfig->SetHelpTipSeconds(nSet); } -void SvtAccessibilityOptions::SetSelectionInReadonly(sal_Bool bSet) +void SvtAccessibilityOptions::SetSelectionInReadonly(bool bSet) { sm_pSingleImplConfig->SetSelectionInReadonly(bSet); } diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index b707015ecd07..c07ca6ec4d4f 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -756,19 +756,19 @@ OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const return OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) ); } -sal_Bool SvHeaderTabListBox::HasRowHeader() const +bool SvHeaderTabListBox::HasRowHeader() const { - return sal_False; + return false; } -sal_Bool SvHeaderTabListBox::IsCellFocusable() const +bool SvHeaderTabListBox::IsCellFocusable() const { return IsCellFocusEnabled(); } -sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) +bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { - sal_Bool bRet = ( IsCellFocusEnabled() == sal_True ); + bool bRet = ( IsCellFocusEnabled() == sal_True ); if ( bRet ) { // first set cursor to _nRow @@ -796,12 +796,12 @@ void SvHeaderTabListBox::SelectAll( sal_Bool bSelect, sal_Bool bPaint ) } -void SvHeaderTabListBox::SelectRow( long _nRow, sal_Bool _bSelect, sal_Bool ) +void SvHeaderTabListBox::SelectRow( long _nRow, bool _bSelect, bool ) { Select( GetEntry( _nRow ), _bSelect ); } -void SvHeaderTabListBox::SelectColumn( sal_uInt16, sal_Bool ) +void SvHeaderTabListBox::SelectColumn( sal_uInt16, bool ) { } @@ -821,9 +821,9 @@ bool SvHeaderTabListBox::IsRowSelected( long _nRow ) const return ( pEntry && IsSelected( pEntry ) ); } -sal_Bool SvHeaderTabListBox::IsColumnSelected( long ) const +bool SvHeaderTabListBox::IsColumnSelected( long ) const { - return sal_False; + return false; } void SvHeaderTabListBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const @@ -834,9 +834,9 @@ void SvHeaderTabListBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< { } -sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const +bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const { - return sal_True; + return true; } OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const @@ -844,7 +844,7 @@ OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nCol return GetTabEntryText(_nRow, _nColumnPos); } -Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen ) +Rectangle SvHeaderTabListBox::calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen ) { Rectangle aRect; if ( _bIsColumnBar ) @@ -858,7 +858,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _ return aRect; } -Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen ) +Rectangle SvHeaderTabListBox::calcTableRect( bool _bOnScreen ) { Window* pParent = NULL; if ( !_bOnScreen ) @@ -868,14 +868,14 @@ Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen ) return aRect; } -Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen ) +Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen ) { DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" ); Rectangle aRect; SvTreeListEntry* pEntry = GetEntry( _nRow ); if ( pEntry ) { - aRect = _bIsHeader ? calcHeaderRect( sal_True, sal_False ) : GetBoundingRect( pEntry ); + aRect = _bIsHeader ? calcHeaderRect( true, false ) : GetBoundingRect( pEntry ); Point aTopLeft = aRect.TopLeft(); DBG_ASSERT( m_pImpl->m_pHeaderBar->GetItemCount() > _nColumn, "invalid column" ); Rectangle aItemRect = m_pImpl->m_pHeaderBar->GetItemRect( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ); @@ -921,7 +921,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState ); if ( bIsCheckBox ) xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell( - m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, sal_False ); + m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, false ); else xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE ); @@ -980,24 +980,24 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleControl( sal_Int32 return xControl; } -sal_Bool SvHeaderTabListBox::ConvertPointToControlIndex( sal_Int32&, const Point& ) +bool SvHeaderTabListBox::ConvertPointToControlIndex( sal_Int32&, const Point& ) { - return sal_False; + return false; } -sal_Bool SvHeaderTabListBox::ConvertPointToCellAddress( sal_Int32&, sal_uInt16&, const Point& ) +bool SvHeaderTabListBox::ConvertPointToCellAddress( sal_Int32&, sal_uInt16&, const Point& ) { - return sal_False; + return false; } -sal_Bool SvHeaderTabListBox::ConvertPointToRowHeader( sal_Int32&, const Point& ) +bool SvHeaderTabListBox::ConvertPointToRowHeader( sal_Int32&, const Point& ) { - return sal_False; + return false; } -sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& ) +bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& ) { - return sal_False; + return false; } OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const @@ -1158,7 +1158,7 @@ void SvHeaderTabListBox::GrabTableFocus() GrabFocus(); } -sal_Bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) +bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } @@ -1173,7 +1173,7 @@ void SvHeaderTabListBox::GrabFocus() Control::GrabFocus(); } -Reference< XAccessible > SvHeaderTabListBox::GetAccessible( sal_Bool bCreate ) +Reference< XAccessible > SvHeaderTabListBox::GetAccessible( bool bCreate ) { return Control::GetAccessible( bCreate ); } diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 313389b5da73..f24683e49f7a 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -182,7 +182,7 @@ namespace svt sal_Int32 /*_nRowPos*/, sal_uInt16 /*_nColPos*/, const TriState& /*_eState*/, - sal_Bool /*_bIsTriState*/ + bool /*_bIsTriState*/ ) const { return NULL; diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 5f40bad82b1a..b8d845144b26 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -187,7 +187,7 @@ namespace svt { namespace table } - sal_Bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos) + bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos) { return m_pImpl->goTo( _nColPos, _nRowPos ); } @@ -512,7 +512,7 @@ namespace svt { namespace table } - Reference< XAccessible > TableControl::GetAccessible( sal_Bool bCreate ) + Reference< XAccessible > TableControl::GetAccessible( bool bCreate ) { return Control::GetAccessible( bCreate ); } @@ -530,13 +530,13 @@ namespace svt { namespace table } - sal_Bool TableControl::HasRowHeader() + bool TableControl::HasRowHeader() { return GetModel()->hasRowHeaders(); } - sal_Bool TableControl::HasColHeader() + bool TableControl::HasColHeader() { return GetModel()->hasColumnHeaders(); } @@ -554,12 +554,12 @@ namespace svt { namespace table } - sal_Bool TableControl::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) + bool TableControl::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) { sal_Int32 nRow = m_pImpl->getRowAtPoint( _rPoint ); sal_Int32 nCol = m_pImpl->getColAtPoint( _rPoint ); _rnIndex = nRow * GetColumnCount() + nCol; - return nRow >= 0 ? sal_True : sal_False; + return nRow >= 0; } @@ -575,17 +575,17 @@ namespace svt { namespace table } - sal_Bool TableControl::HasRowHeader() const + bool TableControl::HasRowHeader() const { return GetModel()->hasRowHeaders(); } - sal_Bool TableControl::ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ) + bool TableControl::ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ) { _rnRow = m_pImpl->getRowAtPoint( _rPoint ); _rnColPos = m_pImpl->getColAtPoint( _rPoint ); - return _rnRow >= 0 ? sal_True : sal_False; + return _rnRow >= 0; } @@ -624,20 +624,20 @@ namespace svt { namespace table } - Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen) + Rectangle TableControl::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) { (void)_bOnScreen; return m_pImpl->calcHeaderRect( _bIsColumnBar ? false : true ); } - Rectangle TableControl::calcHeaderCellRect( sal_Bool _bIsColumnBar, sal_Int32 nPos ) + Rectangle TableControl::calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos ) { return m_pImpl->calcHeaderCellRect( _bIsColumnBar, nPos ); } - Rectangle TableControl::calcTableRect(sal_Bool _bOnScreen) + Rectangle TableControl::calcTableRect(bool _bOnScreen) { (void)_bOnScreen; return m_pImpl->calcTableRect(); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index b425b7b70b1a..dfb85780b9c8 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1329,7 +1329,7 @@ void FmGridControl::DeleteSelectedRows() { SelectAll(); if (IsInsertionRow(GetRowCount() - 1)) // einfuegeZeile nicht - SelectRow(GetRowCount() - 1, sal_False); + SelectRow(GetRowCount() - 1, false); } else { @@ -1825,7 +1825,7 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() { // leerzeile nicht loeschen aBookmarks.realloc(--nSelectedRows); - SelectRow(nIdx,sal_False); // selection aufheben fuer leerzeile + SelectRow(nIdx, false); // selection aufheben fuer leerzeile break; } |