diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-28 09:47:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-03 08:59:36 +0200 |
commit | 0786a72308f7c3a47e052b00616f28ab03bc6b32 (patch) | |
tree | c6c027ed60dc464f429d05f017504e4176ec0460 /include/editeng | |
parent | remove unused code oox::AttributeConversion::decodeDouble (diff) | |
download | core-0786a72308f7c3a47e052b00616f28ab03bc6b32.tar.gz core-0786a72308f7c3a47e052b00616f28ab03bc6b32.zip |
editeng: sal_Bool->bool
this had to be done in conjunction with changing
include/svx/unoshtxt.hxx
because there are two virtual methods "bool IsValid" in two different
base classes and some subclasses are overriding both base-class
methods at once.
Change-Id: Ib43fc5000b443057caaa513b4efeaa6fd16e4260
Diffstat (limited to 'include/editeng')
-rw-r--r-- | include/editeng/unoedprx.hxx | 30 | ||||
-rw-r--r-- | include/editeng/unoedsrc.hxx | 38 | ||||
-rw-r--r-- | include/editeng/unofored.hxx | 16 | ||||
-rw-r--r-- | include/editeng/unoforou.hxx | 18 | ||||
-rw-r--r-- | include/editeng/unotext.hxx | 16 | ||||
-rw-r--r-- | include/editeng/unoviwou.hxx | 2 |
6 files changed, 60 insertions, 60 deletions
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 95624bd8d136..e716dc92c952 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -39,7 +39,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); @@ -57,7 +57,7 @@ public: virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; @@ -67,21 +67,21 @@ public: virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; - virtual void SetUpdateModeForAcc( sal_Bool bUp); - virtual sal_Bool GetUpdateModeForAcc() const; + virtual void SetUpdateModeForAcc( bool bUp); + virtual bool GetUpdateModeForAcc() const; virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const OUString&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); + virtual bool Delete( const ESelection& ); + virtual bool InsertText( const OUString&, const ESelection& ); + virtual bool QuickFormatDoc( bool bFull = false ); virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); virtual const SfxItemSet* GetEmptyItemSetPtr(); @@ -93,9 +93,9 @@ public: //XTextCopy virtual void CopyText(const SvxTextForwarder& rSource); - void SetForwarder( SvxTextForwarder& ); - sal_Bool HaveImageBullet( sal_Int32 nPara ) const; - sal_Bool HaveTextBullet( sal_Int32 nPara ) const; + void SetForwarder( SvxTextForwarder& ); + bool HaveImageBullet( sal_Int32 nPara ) const; + bool HaveTextBullet( sal_Int32 nPara ) const; /** Query whether all text in given selection is editable @@ -103,7 +103,7 @@ public: be changed, and sal_False if e.g. a field or a bullet is contained therein. */ - sal_Bool IsEditable( const ESelection& rSelection ); + bool IsEditable( const ESelection& rSelection ); private: SvxTextForwarder* mpTextForwarder; @@ -117,7 +117,7 @@ public: virtual ~SvxAccessibleTextEditViewAdapter(); // SvxViewForwarder interface - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index e8bccfc3c39e..8f117169b7ee 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -144,7 +144,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const = 0; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0; - virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0; + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const = 0; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0; @@ -164,16 +164,16 @@ public: // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph() = 0; - virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0; // XTextCopy virtual void CopyText(const SvxTextForwarder& rSource) = 0; /** Query state of forwarder - @return sal_False, if no longer valid + @return false, if no longer valid */ - virtual sal_Bool IsValid() const = 0; + virtual bool IsValid() const = 0; /** Query language of character at given position on the underlying edit engine @@ -210,8 +210,8 @@ public: virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const = 0; virtual OUString GetNumStr(sal_uInt16) const { return OUString(); } - virtual void SetUpdateModeForAcc(sal_Bool) {} - virtual sal_Bool GetUpdateModeForAcc() const { return sal_True; } + virtual void SetUpdateModeForAcc(bool) {} + virtual bool GetUpdateModeForAcc() const { return true; } /** Query the bounding rectangle of the given character @@ -279,10 +279,10 @@ public: @param rIndex[0 .. m-1] Index of character the point is over - @return sal_True, if the point is over any text and both rPara and rIndex are valid + @return true, if the point is over any text and both rPara and rIndex are valid */ - virtual sal_Bool GetIndexAtPoint( const Point& rPoint, sal_Int32& rPara, sal_Int32& rIndex ) const = 0; + virtual bool GetIndexAtPoint( const Point& rPoint, sal_Int32& rPara, sal_Int32& rIndex ) const = 0; /** Get the start and the end index of the word at the given index @@ -305,9 +305,9 @@ public: End index (in the same paragraph), this point to the last character still contained in the query - @return sal_True, if the result is non-empty + @return true, if the result is non-empty */ - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& rStart, sal_Int32& rEnd ) const = 0; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& rStart, sal_Int32& rEnd ) const = 0; /** Query range of similar attributes @@ -382,9 +382,9 @@ public: @param rSelection The text range to be deleted - @return sal_True if text has been successfully deleted + @return true if text has been successfully deleted */ - virtual sal_Bool Delete( const ESelection& rSelection ) = 0; + virtual bool Delete( const ESelection& rSelection ) = 0; /** Insert/Replace given text in given range and reformat text @@ -394,17 +394,17 @@ public: @param rSel Selection where text should be replaced. The empty selection inserts - @return sal_True if text has been successfully inserted + @return true if text has been successfully inserted */ - virtual sal_Bool InsertText( const OUString& rText, const ESelection& rSel ) = 0; + virtual bool InsertText( const OUString& rText, const ESelection& rSel ) = 0; /** Updates the formatting @see EditEngine::QuickFormatDoc() for details - @return sal_True if text have been successfully reformatted + @return true if text have been successfully reformatted */ - virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ) = 0; + virtual bool QuickFormatDoc( bool bFull = false ) = 0; /** Get the outline depth of given paragraph @@ -425,11 +425,11 @@ public: The depth to set on the given paragraph. The range is [0,n), where n is the maximal outline level. - @return sal_True, if depth could be successfully set. Reasons for + @return true, if depth could be successfully set. Reasons for failure are e.g. the text does not support outline level (EditEngine), or the depth range is exceeded. */ - virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) = 0; + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) = 0; virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ); virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue ); @@ -453,7 +453,7 @@ public: @return sal_False, if no longer valid */ - virtual sal_Bool IsValid() const = 0; + virtual bool IsValid() const = 0; /** Query visible area of the view containing the text diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index 95b16188ace8..ea8a9cc99b8a 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -41,7 +41,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; @@ -56,7 +56,7 @@ public: virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; @@ -66,18 +66,18 @@ public: virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const OUString&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); + virtual bool Delete( const ESelection& ); + virtual bool InsertText( const OUString&, const ESelection& ); + virtual bool QuickFormatDoc( bool bFull = false ); virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); virtual const SfxItemSet* GetEmptyItemSetPtr(); diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index 1ea7f61f830b..5b9c719b1607 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -59,7 +59,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; @@ -73,9 +73,9 @@ public: virtual SfxItemPool* GetPool() const; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; Outliner& GetOutliner() const { return rOutliner; } @@ -87,18 +87,18 @@ public: virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nPara, sal_Int32 nLine ) const; virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const OUString&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); + virtual bool Delete( const ESelection& ); + virtual bool InsertText( const OUString&, const ESelection& ); + virtual bool QuickFormatDoc( bool bFull = false ); virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ); virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue ); diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index d43478d0c6bf..72f7523221f6 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -178,7 +178,7 @@ public: virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; @@ -194,7 +194,7 @@ public: virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual void SetNotifyHdl( const Link& ); virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; @@ -205,18 +205,18 @@ public: virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const OUString&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); + virtual bool Delete( const ESelection& ); + virtual bool InsertText( const OUString&, const ESelection& ); + virtual bool QuickFormatDoc( bool bFull = false ); virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); virtual const SfxItemSet* GetEmptyItemSetPtr(); diff --git a/include/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx index ff3e8dec86e8..3c6ebe927d1c 100644 --- a/include/editeng/unoviwou.hxx +++ b/include/editeng/unoviwou.hxx @@ -39,7 +39,7 @@ public: SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft ); virtual ~SvxDrawOutlinerViewForwarder(); - virtual sal_Bool IsValid() const; + virtual bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; |