diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:09:59 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:08 +0100 |
commit | 5ea58f534b9226ef8f5c9589066ce20e3c64e0d8 (patch) | |
tree | 2a2bbad144a56854b404510a9191845eb7646e40 /include | |
parent | d24134b6a2e6a557bfa17f521e18a01b17e24d98 (diff) |
bool improvements
Change-Id: Ic6488ac278cac2d1d7e240abff545f9ea0b8eafe
Diffstat (limited to 'include')
-rw-r--r-- | include/editeng/flditem.hxx | 28 | ||||
-rw-r--r-- | include/editeng/measfld.hxx | 2 | ||||
-rw-r--r-- | include/editeng/numitem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 6 | ||||
-rw-r--r-- | include/editeng/svxrtf.hxx | 28 |
5 files changed, 33 insertions, 33 deletions
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index d7c8cdc02542..9853474c4dfb 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -56,7 +56,7 @@ public: virtual ~SvxFieldData(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; virtual MetaAction* createEndComment() const; @@ -136,7 +136,7 @@ public: static OUString GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -174,7 +174,7 @@ public: void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -186,7 +186,7 @@ public: SvxPageField(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -198,7 +198,7 @@ public: SvxPagesField(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData @@ -208,7 +208,7 @@ public: SvxTimeField(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -220,7 +220,7 @@ public: SvxFileField(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData @@ -235,7 +235,7 @@ public: int GetTab() const; virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; @@ -283,7 +283,7 @@ public: static OUString GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -324,7 +324,7 @@ public: OUString GetFormatted() const; virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; @@ -372,7 +372,7 @@ public: OUString GetFormatted() const; virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -384,7 +384,7 @@ public: SvxHeaderField(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -395,7 +395,7 @@ public: SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_FOOTER ) SvxFooterField(); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -409,7 +409,7 @@ public: static OUString GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual bool operator==( const SvxFieldData& ) const; }; diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index 882b1eec0a5d..47adc29d1db2 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -45,7 +45,7 @@ public: SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {} virtual ~SdrMeasureField(); virtual SvxFieldData* Clone() const; - virtual int operator==(const SvxFieldData&) const; + virtual bool operator==(const SvxFieldData&) const; SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; } void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; } }; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index cd5e83cde391..2eebd17b9fed 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -258,7 +258,7 @@ public: virtual ~SvxNumRule(); int operator==( const SvxNumRule& ) const; - int operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} + bool operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} SvxNumRule& operator=( const SvxNumRule& ); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 15a781d00cc9..1e34d82b8ca9 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -387,9 +387,9 @@ public: long mnWidthToFill; // bitfield - unsigned mbEndOfLine : 1; - unsigned mbEndOfParagraph : 1; - unsigned mbEndOfBullet : 1; + bool mbEndOfLine : 1; + bool mbEndOfParagraph : 1; + bool mbEndOfBullet : 1; sal_uInt8 GetBiDiLevel() const { return mnBiDiLevel; } sal_Bool IsRTL() const { return mnBiDiLevel % 2 ? sal_True : sal_False; } diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 808305ea02ba..c5f9cc16228d 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -267,7 +267,7 @@ protected: inline SfxItemSet& GetAttrSet(); // no text yet inserted? (SttPos from the top stack entry!) - int IsAttrSttPos(); + bool IsAttrSttPos(); void AttrGroupEnd(); // edit the current, delete from stack void SetAllAttrOfStk(); // end all Attr. and set it into doc @@ -290,18 +290,18 @@ protected: int bReadNewDoc = sal_True ); virtual ~SvxRTFParser(); - int IsNewDoc() const { return bNewDoc; } - void SetNewDoc( int bFlag ) { bNewDoc = bFlag; } - int IsNewGroup() const { return bNewGroup; } - void SetNewGroup( int bFlag ) { bNewGroup = bFlag; } - int IsChkStyleAttr() const { return bChkStyleAttr; } - void SetChkStyleAttr( int bFlag ) { bChkStyleAttr = bFlag; } - int IsCalcValue() const { return bCalcValue; } - void SetCalcValue( int bFlag ) { bCalcValue = bFlag; } - int IsPardTokenRead() const { return bPardTokenRead; } - void SetPardTokenRead( int bFlag ) { bPardTokenRead = bFlag; } - int IsReadDocInfo() const { return bReadDocInfo; } - void SetReadDocInfo( int bFlag ) { bReadDocInfo = bFlag; } + bool IsNewDoc() const { return bNewDoc; } + void SetNewDoc( bool bFlag ) { bNewDoc = bFlag; } + bool IsNewGroup() const { return bNewGroup; } + void SetNewGroup( bool bFlag ) { bNewGroup = bFlag; } + bool IsChkStyleAttr() const { return bChkStyleAttr; } + void SetChkStyleAttr( bool bFlag ) { bChkStyleAttr = bFlag; } + bool IsCalcValue() const { return bCalcValue; } + void SetCalcValue( bool bFlag ) { bCalcValue = bFlag; } + bool IsPardTokenRead() const { return bPardTokenRead; } + void SetPardTokenRead( bool bFlag ) { bPardTokenRead = bFlag; } + bool IsReadDocInfo() const { return bReadDocInfo; } + void SetReadDocInfo( bool bFlag ) { bReadDocInfo = bFlag; } // Query/Set the current insert position SvxPosition& GetInsPos() const { return *pInsPos; } @@ -328,7 +328,7 @@ public: inline const Color& GetColor( size_t nId ) const; const Font& GetFont( sal_uInt16 nId ); // Changes the dflt Font - virtual int IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const = 0; + virtual bool IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const = 0; // to det a different attribute pool. May only be done prior to CallParser! // The maps are not generated anew! |