diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-04 15:23:52 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-04 15:48:48 +0100 |
| commit | 4e6c62be03b4eb370db3cac115c0e4bb8a698891 (patch) | |
| tree | d1b5499d57097959f7544a6bd04d12551cd241cc | |
| parent | 25315bd25fdc2d64996bdd099fd79e4dd3a263f2 (diff) | |
Convert all Query/Put Value() to bool
52 files changed, 465 insertions, 466 deletions
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index de3a149e15..e8d57e46d9 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -97,8 +97,8 @@ public: virtual SwFieldType* Copy() const; virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } SwDoc* GetDoc(){ return m_pDoc; } @@ -178,8 +178,8 @@ public: virtual void SetPar1(const String& rStr); virtual SwFieldType* ChgTyp( SwFieldType* ); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); long GetHandle() const { return m_nHandle; } diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 8c9784e147..ae94350a57 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -90,8 +90,8 @@ public: inline const String& GetNumber() const; inline const String& GetTitle() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline BYTE SwChapterField::GetLevel() const { return nLevel; } diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index ae287f7954..06851c0df2 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -60,8 +60,8 @@ public: const String& GetColumnName() const {return sColumn;} const SwDBData& GetDBData() const {return aDBData;} - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -124,8 +124,8 @@ public: // DBName inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline void SwDBField::SetExpansion(const String& rStr) @@ -159,8 +159,8 @@ public: // Name oder Inhalt virtual String GetCntnt(BOOL bName = FALSE) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); virtual USHORT GetSubType() const; virtual void SetSubType(USHORT nType); }; @@ -202,8 +202,8 @@ public: // Condition virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline BOOL SwDBNextSetField::IsCondValid() const @@ -256,8 +256,8 @@ public: virtual void SetPar2(const String& rStr); // Die Datensatznummer steht in nFormat !! - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline BOOL SwDBNumSetField::IsCondValid() const @@ -291,8 +291,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -324,8 +324,8 @@ public: inline long GetSetNumber() const; inline void SetSetNumber(long nNum); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline long SwDBSetNumberField::GetSetNumber() const diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 52a9af6285..c270e5c39e 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -63,8 +63,8 @@ public: virtual SwFieldType* Copy() const; virtual const String& GetName() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); String GetCmd() const; void SetCmd( const String& rStr ); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 4b3986243e..7659bffb49 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -184,8 +184,8 @@ public: virtual USHORT GetSubType() const; // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); const String& GetUserString() const { return sUserStr; } void SetUserString( const String& rS ) { sUserStr = rS; } @@ -221,8 +221,8 @@ public: inline void SetExpansion(const String& rStr) { aContent = rStr; } inline const String& GetContent() const { return aContent; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -256,8 +256,8 @@ public: inline void SetExpansion(const String& rStr) { aContent = rStr; } inline const String& GetContent() const { return aContent; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -285,8 +285,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; @@ -326,8 +326,8 @@ public: virtual USHORT GetSubType() const; virtual void SetSubType(USHORT nSub); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -398,8 +398,8 @@ public: virtual USHORT GetSubType() const; // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -435,8 +435,8 @@ public: // Bedingung erfragen/setzen virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -484,8 +484,8 @@ public: // Macrotext virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); static void CreateMacroString( String& rMacro, const String& rMacroName, @@ -547,8 +547,8 @@ public: sal_uInt32 GetNumberOfParagraphs() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); virtual String GetDescription() const; }; @@ -584,8 +584,8 @@ public: String GetName() const { return aName; } void SetName( const String& rName ) { aName = rName; } inline void SetExpansion(const String& rStr) { aContent = rStr; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -621,8 +621,8 @@ public: inline void SetExpansion(const String& rStr) { aContent = rStr; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; @@ -663,8 +663,8 @@ public: short GetOffset() const { return nOffset; } void SetOffset( short nOff ) { nOffset = nOff; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -705,8 +705,8 @@ public: void SetText( const String& rTxt ) { sTxt = rTxt; } void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld ); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -745,8 +745,8 @@ public: SwCharFmt* GetCharFmt() const { return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -792,8 +792,8 @@ public: BOOL IsCodeURL() const { return bCodeURL; } void SetCodeURL( BOOL bURL ) { bCodeURL = bURL; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -828,8 +828,8 @@ public: virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 46fd26cf77..ed0f342e86 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -127,8 +127,8 @@ public: virtual USHORT GetSubType() const; virtual void SetSubType(USHORT nType); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); static USHORT GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc); // #i82544# @@ -204,8 +204,8 @@ public: const SwNode* GetOutlineChgNd() const { return pOutlChgNd; } void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline void SwSetExpFieldType::SetType( USHORT nTyp ) @@ -268,8 +268,8 @@ public: // Die Formel virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; inline const String& SwSetExpField::GetExpStr() const @@ -347,8 +347,8 @@ public: virtual USHORT GetSubType() const; virtual void SetSubType(USHORT nSub); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; /*-------------------------------------------------------------------- @@ -428,8 +428,8 @@ public: // Die Formel virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 73766c6e97..06c2a745f2 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -69,8 +69,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // an das SwTxtCharFmt weiterleiten (vom SwClient) virtual void Modify( SfxPoolItem*, SfxPoolItem* ); diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 500a4f1b80..54094826c1 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -283,8 +283,8 @@ public: // nur in abgeleiteten Klassen virtual const String& GetName() const; virtual SwFieldType* Copy() const = 0; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); USHORT Which() const { return nWhich; } @@ -369,8 +369,8 @@ public: virtual void SetPar1(const String& rStr); virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); // hat das Feld eine Action auf dem ClickHandler ? (z.B. INetFelder,..) BOOL HasClickHdl() const; // ist es ein Fix-Feld? diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 6bc30d8c2d..64ceaaeb54 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -141,8 +141,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); }; #endif // _FLDDAT_HXX diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index 4a7bcf0d8a..938d8253fa 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -261,7 +261,7 @@ public: - FIELD_PROP_PAR3 Get the help text of the field. - FIELD_PROP_PAR4 Get the tool tip of the field. */ - virtual BOOL QueryValue(com::sun::star::uno::Any &rVal, USHORT nWhichId) const; + virtual bool QueryValue(com::sun::star::uno::Any &rVal, USHORT nWhichId) const; /** API: Sets a property value on the dropdown field. @@ -273,7 +273,7 @@ public: - FIELD_PROP_PAR3 Set the help text of the field. - FIELD_PROP_PAR4 Set the tool tip of the field. */ - virtual BOOL PutValue(const com::sun::star::uno::Any &rVal, USHORT nWhichId); + virtual bool PutValue(const com::sun::star::uno::Any &rVal, USHORT nWhichId); }; #endif diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 569a80e530..794e50ba60 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -68,8 +68,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); RndStdIds GetAnchorId() const { return nAnchorId; } USHORT GetPageNum() const { return nPageNum; } diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 4e6bb26d41..caf03afe12 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -63,8 +63,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; } const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; } diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index b3da5b8c34..dd0bfe7ce3 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -115,8 +115,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); const SwColumns &GetColumns() const { return aColumns; } SwColumns &GetColumns() { return aColumns; } diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 93e45c2879..68b8025d2b 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -59,7 +59,7 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); } SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); } diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index e781191064..bef2e4f197 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -80,8 +80,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SwFrmSize GetHeightSizeType() const { return eFrmHeightType; } void SetHeightSizeType( SwFrmSize eSize ) { eFrmHeightType = eSize; } diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index dd55cfa7fe..e8f6979227 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -65,8 +65,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // will be used at time?? // void FillVariable( SbxVariable &rVar, diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 0a6d5fc996..183eba93d3 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -68,9 +68,9 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index f9aa5a450a..1c7345558d 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -54,8 +54,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); ULONG GetStartValue() const { return nStartValue; } BOOL IsCount() const { return bCountLines != 0; } diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index cce80a7acd..9f5bb0c4d6 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -60,8 +60,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); sal_Int16 GetVertOrient() const { return eOrient; } sal_Int16 GetRelationOrient() const { return eRelation; } @@ -98,8 +98,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); sal_Int16 GetHoriOrient() const { return eOrient; } sal_Int16 GetRelationOrient() const { return eRelation; } diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 1577b3a5fe..b5c0397d27 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -72,8 +72,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 7324f44c91..a5c49da7eb 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -61,9 +61,9 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 3f12c5c630..062a255bc0 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -60,8 +60,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SwSurround GetSurround()const { return SwSurround( GetValue() ); } diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index f28f33f9bd..4a5162c8de 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -64,8 +64,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; } void SetURL( const String &rURL, BOOL bServerMap ); diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 6616f92bd3..2480473fc4 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -56,8 +56,8 @@ public: virtual int operator==( const SfxPoolItem& _rAttr ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 943e4ef372..d071584c2e 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -75,9 +75,9 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) @@ -127,9 +127,9 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; } @@ -236,9 +236,9 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); @@ -276,9 +276,9 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; @@ -300,9 +300,9 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index f6dcfaa891..de229488d0 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -79,8 +79,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); inline BYTE GetLines() const { return nLines; } inline BYTE &GetLines() { return nLines; } @@ -165,8 +165,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); }; class SwParaConnectBorderItem : public SfxBoolItem diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 581933917e..0649d23bf6 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -149,8 +149,8 @@ public: virtual void SetPar1(const String& rStr); virtual String GetPar2() const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); void ConvertProgrammaticToUIName(); diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 3b8240c660..f575b518ba 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -63,8 +63,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SwTextGridItem& operator=( const SwTextGridItem& ); diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 0af250bf61..f40dbe5095 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -73,8 +73,8 @@ public: BOOL IsDeleted() const { return bDeleted; } void SetDeleted( BOOL b ) { bDeleted = b; } - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); }; inline BOOL SwUserFieldType::IsValid() const @@ -125,8 +125,8 @@ public: // Inhalt virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId ); }; #endif // _USRFLD_HXX diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index f7383f1758..f3037addbb 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -77,10 +77,10 @@ SfxPoolItem* SwFmtWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const return new SwFmtWrapInfluenceOnObjPos(*this); } -BOOL SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const +bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_WRAP_INFLUENCE: @@ -90,16 +90,16 @@ BOOL SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const break; default: ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId ) +bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId ) { nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { @@ -119,13 +119,13 @@ BOOL SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId ) else { ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" ); - bRet = sal_False; + bRet = false; } } break; default: ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 7e32e2f09b..92dd8a5d62 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -442,7 +442,7 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) /* -----------------------------15.11.00 17:33-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const +bool SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const { switch( nWhichId ) { @@ -494,14 +494,14 @@ BOOL SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /* -----------------------------15.11.00 17:33-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId ) +bool SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId ) { - sal_Bool bRet = TRUE; + bool bRet = true; String sTmp; switch( nWhichId ) { @@ -554,7 +554,7 @@ BOOL SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId ) if(nVal >= 0 && nVal < AUTH_FIELD_END) pSortKey->eField = (ToxAuthorityField) nVal; else - bRet = FALSE; + bRet = false; } else if(pValue[j].Name.equalsAsciiL(SW_PROP_NAME(UNO_NAME_IS_SORT_ASCENDING))) { @@ -742,13 +742,13 @@ const char* aFieldNames[] = /* -----------------------------16.11.00 12:27-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const +bool SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const { if(!GetTyp()) - return FALSE; + return false; const SwAuthEntry* pAuthEntry = ((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(m_nHandle); if(!pAuthEntry) - return FALSE; + return false; Sequence <PropertyValue> aRet(AUTH_FIELD_END); PropertyValue* pValues = aRet.getArray(); for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++) @@ -761,7 +761,8 @@ BOOL SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const pValues[i].Value <<= OUString(rField); } rAny <<= aRet; - return FALSE; + /* FIXME: it is weird that we always return false here */ + return false; } /* -----------------------------15.11.00 17:33-------------------------------- @@ -774,14 +775,14 @@ sal_Int16 lcl_Find(const OUString& rFieldName) return -1; } //---------------------------------------------------------------------------- -BOOL SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ ) +bool SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ ) { if(!GetTyp() || !((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(m_nHandle)) - return FALSE; + return false; Sequence <PropertyValue> aParam; if(!(rAny >>= aParam)) - return FALSE; + return false; String sToSet; sToSet.Fill(AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER); @@ -807,7 +808,8 @@ BOOL SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ ) ((SwAuthorityFieldType*)GetTyp())->RemoveField(m_nHandle); m_nHandle = ((SwAuthorityFieldType*)GetTyp())->AddField(sToSet); - return FALSE; + /* FIXME: it is weird that we always return false here */ + return false; } /* -----------------11.10.99 09:43------------------- diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index 693d7ce324..b673a8e6c1 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -229,7 +229,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum) /*-----------------05.03.98 16:19------------------- --------------------------------------------------*/ -BOOL SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -260,12 +260,12 @@ BOOL SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 16:19------------------- --------------------------------------------------*/ -BOOL SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { BOOL bRet = TRUE; switch( nWhichId ) @@ -277,7 +277,7 @@ BOOL SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId ) if(nTmp >= 0 && nTmp < MAXLEVEL) nLevel = nTmp; else - bRet = FALSE; + bRet = false; break; } @@ -303,7 +303,7 @@ BOOL SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); - bRet = FALSE; + bRet = false; } return bRet; } diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 92ad0ed940..da19af7786 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -131,7 +131,7 @@ void SwDBFieldType::ReleaseRef() /* -----------------24.02.99 14:51------------------- * * --------------------------------------------------*/ -BOOL SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -150,12 +150,12 @@ BOOL SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /* -----------------24.02.99 14:51------------------- * * --------------------------------------------------*/ -BOOL SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -195,7 +195,7 @@ BOOL SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-------------------------------------------------------------------- Beschreibung: SwDBField @@ -423,7 +423,7 @@ void SwDBField::SetSubType(USHORT nType) /*-----------------06.03.98 16:15------------------- --------------------------------------------------*/ -BOOL SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -451,13 +451,13 @@ BOOL SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-----------------06.03.98 16:15------------------- --------------------------------------------------*/ -BOOL SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -513,7 +513,7 @@ BOOL SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-------------------------------------------------------------------- @@ -567,7 +567,7 @@ String SwDBNameInfField::GetCntnt(BOOL bName) const /*-----------------06.03.98 16:55------------------- --------------------------------------------------*/ -BOOL SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -589,12 +589,12 @@ BOOL SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-----------------06.03.98 16:55------------------- --------------------------------------------------*/ -BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -612,7 +612,7 @@ BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId ) USHORT nSubTyp = GetSubType(); sal_Bool bVisible = sal_False; if(!(rAny >>= bVisible)) - return FALSE; + return false; if(bVisible) nSubTyp &= ~nsSwExtendedSubType::SUB_INVISIBLE; else @@ -623,7 +623,7 @@ BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /* -----------------4/10/2003 15:03------------------ @@ -712,9 +712,9 @@ void SwDBNextSetField::SetPar1(const String& rStr) /*-----------------06.03.98 16:16------------------- --------------------------------------------------*/ -BOOL SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { - BOOL bRet = TRUE; + bool bRet = true; switch( nWhichId ) { case FIELD_PROP_PAR3: @@ -728,9 +728,9 @@ BOOL SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const /*-----------------06.03.98 16:16------------------- --------------------------------------------------*/ -BOOL SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - BOOL bRet = TRUE; + bool bRet = true; switch( nWhichId ) { case FIELD_PROP_PAR3: @@ -848,9 +848,9 @@ void SwDBNumSetField::SetPar2(const String& rStr) /*-----------------06.03.98 16:16------------------- --------------------------------------------------*/ -BOOL SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { - BOOL bRet = TRUE; + bool bRet = true; switch( nWhichId ) { case FIELD_PROP_PAR3: @@ -867,9 +867,9 @@ BOOL SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const /*-----------------06.03.98 16:16------------------- --------------------------------------------------*/ -BOOL SwDBNumSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBNumSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - BOOL bRet = TRUE; + bool bRet = true; switch( nWhichId ) { case FIELD_PROP_PAR3: @@ -949,14 +949,14 @@ SwField* SwDBNameField::Copy() const /*-----------------06.03.98 16:16------------------- --------------------------------------------------*/ -BOOL SwDBNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { return SwDBNameInfField::QueryValue(rAny, nWhichId ); } /*-----------------06.03.98 16:16------------------- --------------------------------------------------*/ -BOOL SwDBNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { return SwDBNameInfField::PutValue(rAny, nWhichId ); } @@ -1028,9 +1028,9 @@ SwField* SwDBSetNumberField::Copy() const /*-----------------06.03.98 16:15------------------- --------------------------------------------------*/ -BOOL SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { - BOOL bRet = TRUE; + bool bRet = true; switch( nWhichId ) { case FIELD_PROP_USHORT1: @@ -1047,9 +1047,9 @@ BOOL SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const /*-----------------06.03.98 16:15------------------- --------------------------------------------------*/ -BOOL SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - BOOL bRet = TRUE; + bool bRet = true; switch( nWhichId ) { case FIELD_PROP_USHORT1: diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 7979d332d5..6eb7211994 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -331,7 +331,7 @@ void SwDDEFieldType::_RefCntChgd() /* -----------------------------28.08.00 16:23-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const +bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const { BYTE nPart = 0; switch( nWhichId ) @@ -353,12 +353,12 @@ BOOL SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const } if( nPart ) rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeperator)); - return TRUE; + return true; } /* -----------------------------28.08.00 16:23-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId ) +bool SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId ) { BYTE nPart = 0; switch( nWhichId ) @@ -389,7 +389,7 @@ BOOL SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId ) sCmd.SetToken( nPart-1, sfx2::cTokenSeperator, ::GetString( rVal, sTmp ) ); SetCmd( sCmd ); } - return TRUE; + return true; } /* --------------------------------------------------------------------------- diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 66245b33b3..4478286a77 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -252,7 +252,7 @@ sal_uInt16 SwPageNumberField::GetSubType() const /*-----------------05.03.98 10:25------------------- --------------------------------------------------*/ -BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -280,14 +280,14 @@ BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 10:25------------------- --------------------------------------------------*/ -BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - BOOL bRet = TRUE; + bool bRet = true; sal_Int16 nSet = 0; switch( nWhichId ) { @@ -319,7 +319,7 @@ BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) nSubType = PG_NEXT; break; default: - bRet = FALSE; + bRet = false; } break; case FIELD_PROP_PAR1: @@ -386,9 +386,9 @@ SwField* SwAuthorField::Copy() const /*-----------------05.03.98 11:15------------------- --------------------------------------------------*/ -BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { - sal_Bool bVal; + bool bVal; switch( nWhichId ) { case FIELD_PROP_BOOL1: @@ -408,12 +408,12 @@ BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 11:15------------------- --------------------------------------------------*/ -BOOL SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -435,7 +435,7 @@ BOOL SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -532,7 +532,7 @@ SwField* SwFileNameField::Copy() const /*-----------------05.03.98 08:59------------------- --------------------------------------------------*/ -BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -569,12 +569,12 @@ BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 09:01------------------- --------------------------------------------------*/ -BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -619,7 +619,7 @@ BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- Beschreibung: SwTemplNameFieldType @@ -708,7 +708,7 @@ SwField* SwTemplNameField::Copy() const /*-----------------05.03.98 08:59------------------- --------------------------------------------------*/ -BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch ( nWhichId ) { @@ -731,12 +731,12 @@ BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 09:01------------------- --------------------------------------------------*/ -BOOL SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch ( nWhichId ) { @@ -771,7 +771,7 @@ BOOL SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- Beschreibung: SwDocStatFieldType @@ -863,7 +863,7 @@ void SwDocStatField::ChangeExpansion( const SwFrm* pFrm ) /*-----------------05.03.98 11:38------------------- --------------------------------------------------*/ -BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch ( nWhichId ) { @@ -873,14 +873,14 @@ BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 11:38------------------- --------------------------------------------------*/ -BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - BOOL bRet = FALSE; + bool bRet = false; switch ( nWhichId ) { case FIELD_PROP_USHORT2: @@ -892,7 +892,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId ) nSet != SVX_NUM_BITMAP) { SetFormat(nSet); - bRet = TRUE; + bRet = true; } } break; @@ -1261,7 +1261,7 @@ void SwDocInfoField::SetLanguage(sal_uInt16 nLng) /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -1306,12 +1306,12 @@ BOOL SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: return SwField::QueryValue(rAny, nWhichId); } - return sal_True; + return true; } /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { sal_Int32 nValue = 0; switch( nWhichId ) @@ -1356,7 +1356,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: return SwField::PutValue(rAny, nWhichId); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -1611,7 +1611,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { const String* pOut = 0; switch( nWhichId ) @@ -1639,12 +1639,12 @@ BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const } if( pOut ) rAny <<= OUString( *pOut ); - return sal_True; + return true; } /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -1670,7 +1670,7 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } //------------------------------------------------------------------------------ @@ -1751,7 +1751,7 @@ SwField* SwHiddenParaField::Copy() const /*-----------------05.03.98 13:25------------------- --------------------------------------------------*/ -BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch ( nWhichId ) { @@ -1768,12 +1768,12 @@ BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 13:25------------------- --------------------------------------------------*/ -BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch ( nWhichId ) { @@ -1787,7 +1787,7 @@ BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -1916,7 +1916,7 @@ sal_uInt32 SwPostItField::GetNumberOfParagraphs() const /*-----------------05.03.98 13:42------------------- --------------------------------------------------*/ -BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -1973,14 +1973,14 @@ BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 13:42------------------- --------------------------------------------------*/ -BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -2024,7 +2024,7 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- Beschreibung: DokumentinfoFields @@ -2124,7 +2124,7 @@ void SwExtUserField::SetSubType(sal_uInt16 nSub) /*-----------------05.03.98 14:14------------------- --------------------------------------------------*/ -BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -2147,12 +2147,12 @@ BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 14:14------------------- --------------------------------------------------*/ -BOOL SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -2176,7 +2176,7 @@ BOOL SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } //------------------------------------------------------------------------- @@ -2244,7 +2244,7 @@ void SwRefPageSetField::SetPar2(const String& rStr) /*-----------------05.03.98 14:52------------------- --------------------------------------------------*/ -BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -2257,12 +2257,12 @@ BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 14:52------------------- --------------------------------------------------*/ -BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -2275,7 +2275,7 @@ BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- Beschreibung: relatives Seitennummern - Abfrage Feld @@ -2515,7 +2515,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm, /*-----------------05.03.98 14:52------------------- --------------------------------------------------*/ -BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -2528,12 +2528,12 @@ BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 14:52------------------- --------------------------------------------------*/ -BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -2559,7 +2559,7 @@ BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -2651,7 +2651,7 @@ void SwJumpEditField::SetPar2(const String& rStr) /*-----------------05.03.98 15:00------------------- --------------------------------------------------*/ -BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -2680,12 +2680,12 @@ BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------05.03.98 15:00------------------- --------------------------------------------------*/ -BOOL SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -2715,7 +2715,7 @@ BOOL SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } @@ -2763,7 +2763,7 @@ void SwCombinedCharField::SetPar1(const String& rStr) sCharacters = rStr.Copy( 0, MAX_COMBINED_CHARACTERS ); } -BOOL SwCombinedCharField::QueryValue( uno::Any& rAny, +bool SwCombinedCharField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) @@ -2774,10 +2774,10 @@ BOOL SwCombinedCharField::QueryValue( uno::Any& rAny, default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } -BOOL SwCombinedCharField::PutValue( const uno::Any& rAny, +bool SwCombinedCharField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) @@ -2788,6 +2788,6 @@ BOOL SwCombinedCharField::PutValue( const uno::Any& rAny, default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 07c8839898..f8aa7dbff8 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -423,7 +423,7 @@ void SwGetExpField::SetLanguage(USHORT nLng) /*-----------------07.03.98 16:08------------------- --------------------------------------------------*/ -BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -457,12 +457,12 @@ BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: return SwField::QueryValue(rAny, nWhichId); } - return TRUE; + return true; } /*-----------------07.03.98 16:08------------------- --------------------------------------------------*/ -BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { sal_Int32 nTmp = 0; String sTmp; @@ -499,7 +499,7 @@ BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: return SwField::PutValue(rAny, nWhichId); } - return TRUE; + return true; } /*-----------------JP: 17.06.93 ------------------- @@ -655,7 +655,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd ) /* -----------------24.03.99 09:44------------------- * * --------------------------------------------------*/ -BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -677,10 +677,10 @@ BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } -BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -714,7 +714,7 @@ BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } BOOL SwSeqFldList::InsertSort( _SeqFldLstElem* pNew ) @@ -1069,7 +1069,7 @@ String SwInputField::Expand() const /*-----------------06.03.98 11:12------------------- --------------------------------------------------*/ -BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -1088,12 +1088,12 @@ BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-----------------06.03.98 11:12------------------- --------------------------------------------------*/ -BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -1112,7 +1112,7 @@ BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-------------------------------------------------------------------- Beschreibung: Bedingung setzen @@ -1179,7 +1179,7 @@ void SwInputField::SetSubType(USHORT nSub) /*-----------------05.03.98 17:22------------------- --------------------------------------------------*/ -BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -1241,12 +1241,12 @@ BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: return SwField::QueryValue(rAny, nWhichId); } - return TRUE; + return true; } /*-----------------05.03.98 17:22------------------- --------------------------------------------------*/ -BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { sal_Int32 nTmp32 = 0; sal_Int16 nTmp16 = 0; @@ -1323,7 +1323,7 @@ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: return SwField::PutValue(rAny, nWhichId); } - return TRUE; + return true; } diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 7abd94ebf5..6e79643e4e 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -178,13 +178,13 @@ const String& SwFieldType::GetName() const return aEmptyStr; } -BOOL SwFieldType::QueryValue( uno::Any&, USHORT ) const +bool SwFieldType::QueryValue( uno::Any&, USHORT ) const { - return FALSE; + return false; } -BOOL SwFieldType::PutValue( const uno::Any& , USHORT ) +bool SwFieldType::PutValue( const uno::Any& , USHORT ) { - return FALSE; + return false; } /*-------------------------------------------------------------------- @@ -326,7 +326,7 @@ void SwField::SetSubType(USHORT ) // ASSERT(0, "Sorry Not implemented"); } -BOOL SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const +bool SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const { switch( nWhichId ) { @@ -339,9 +339,9 @@ BOOL SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } -BOOL SwField::PutValue( const uno::Any& rVal, USHORT nWhichId ) +bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId ) { switch( nWhichId ) { @@ -355,7 +355,7 @@ BOOL SwField::PutValue( const uno::Any& rVal, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index 321b0b5120..281a676913 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -229,7 +229,7 @@ Time SwDateTimeField::GetTime(BOOL bUseOffset) const /*-----------------04.03.98 11:05------------------- --------------------------------------------------*/ -BOOL SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const +bool SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const { switch( nWhichId ) { @@ -269,12 +269,12 @@ BOOL SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const default: return SwField::QueryValue(rVal, nWhichId); } - return TRUE; + return true; } /*-----------------04.03.98 11:05------------------- --------------------------------------------------*/ -BOOL SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId ) +bool SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId ) { sal_Int32 nTmp = 0; switch( nWhichId ) @@ -316,6 +316,6 @@ BOOL SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId ) default: return SwField::PutValue(rVal, nWhichId); } - return TRUE; + return true; } diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 25f7fbf722..83cfcfc5bf 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -200,7 +200,7 @@ void SwDropDownField::SetToolTip(const String & rToolTip) aToolTip = rToolTip; } -BOOL SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const +bool SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const { nWhich &= ~CONVERT_TWIPS; switch( nWhich ) @@ -225,10 +225,10 @@ BOOL SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } -BOOL SwDropDownField::PutValue(const uno::Any &rVal, +bool SwDropDownField::PutValue(const uno::Any &rVal, USHORT nWhich) { switch( nWhich ) @@ -280,5 +280,5 @@ BOOL SwDropDownField::PutValue(const uno::Any &rVal, default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index 1471d46b29..86f9546e7d 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -180,7 +180,7 @@ String SwMacroField::GetPar2() const /*-----------------05.03.98 13:38------------------- --------------------------------------------------*/ -BOOL SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -199,12 +199,12 @@ BOOL SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-----------------05.03.98 13:38------------------- --------------------------------------------------*/ -BOOL SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { String sTmp; switch( nWhichId ) @@ -226,7 +226,7 @@ BOOL SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId ) DBG_ERROR("illegal property"); } - return TRUE; + return true; } // create an internally used macro name from the library and macro name parts diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index d0c39fbd91..12475e3528 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -589,7 +589,7 @@ String SwGetRefField::GetPar2() const /*-----------------06.03.98 13:34------------------- --------------------------------------------------*/ -BOOL SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -658,12 +658,12 @@ BOOL SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-----------------06.03.98 13:34------------------- --------------------------------------------------*/ -BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { String sTmp; switch( nWhichId ) @@ -687,7 +687,7 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId ) case ReferenceFieldPart::NUMBER_NO_CONTEXT: nPart = REF_NUMBER_NO_CONTEXT; break; case ReferenceFieldPart::NUMBER_FULL_CONTEXT: nPart = REF_NUMBER_FULL_CONTEXT; break; // <-- - default: return FALSE; + default: return false; } SetFormat(nPart); } @@ -735,7 +735,7 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /* -----------------------------11.01.2002 12:50------------------------------ diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index b9e64b2d70..aa3cb8ee89 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -111,7 +111,7 @@ String SwScriptField::GetPar2() const /*-----------------05.03.98 15:00------------------- --------------------------------------------------*/ -BOOL SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -127,12 +127,12 @@ BOOL SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } /*-----------------05.03.98 15:00------------------- --------------------------------------------------*/ -BOOL SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -148,6 +148,6 @@ BOOL SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return true; } diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 5b43ea2627..8fb12bb089 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -194,9 +194,9 @@ void SwTblField::SetPar2(const String& rStr) /*-----------------04.03.98 10:33------------------- --------------------------------------------------*/ -BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { - BOOL bRet = TRUE; + bool bRet = true; switch ( nWhichId ) { case FIELD_PROP_PAR2: @@ -221,16 +221,16 @@ BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const rAny <<= (sal_Int32)GetFormat(); break; default: - bRet = sal_False; + bRet = false; } return bRet; } /*-----------------04.03.98 10:33------------------- --------------------------------------------------*/ -BOOL SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - BOOL bRet = TRUE; + bool bRet = true; String sTmp; switch ( nWhichId ) { @@ -254,11 +254,8 @@ BOOL SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId ) } break; default: - bRet = sal_False; + bRet = false; } return bRet; } - - - diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index aff0e3801d..a5e9b37b33 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -132,7 +132,7 @@ void SwUserField::SetSubType(sal_uInt16 nSub) /*-----------------09.03.98 08:04------------------- --------------------------------------------------*/ -BOOL SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -154,12 +154,12 @@ BOOL SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: return SwField::QueryValue(rAny, nWhichId); } - return sal_True; + return true; } /*-----------------09.03.98 08:04------------------- --------------------------------------------------*/ -sal_Bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -185,7 +185,7 @@ sal_Bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: return SwField::PutValue(rAny, nWhichId); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -312,7 +312,7 @@ void SwUserFieldType::SetContent( const String& rStr, sal_uInt32 nFmt ) /*-----------------04.03.98 17:05------------------- --------------------------------------------------*/ -BOOL SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +bool SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const { switch( nWhichId ) { @@ -331,12 +331,12 @@ BOOL SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } /*-----------------04.03.98 17:05------------------- --------------------------------------------------*/ -BOOL SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) +bool SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) { switch( nWhichId ) { @@ -371,7 +371,7 @@ BOOL SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return sal_True; + return true; } diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 43e9ba0eeb..1540098437 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -91,10 +91,10 @@ BOOL lcl_IsHoriOnOddPages(int nEnum) nEnum == RES_MIRROR_GRAPH_BOTH; return bEnum; } -BOOL SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { - sal_Bool bRet = sal_True, - bVal; + bool bRet = true; + sal_Bool bVal; // Vertikal und Horizontal sind mal getauscht worden! nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -111,15 +111,15 @@ BOOL SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } rVal.setValue( &bVal, ::getBooleanCppuType() ); return bRet; } -BOOL SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId ) { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bVal = *(sal_Bool*)rVal.getValue(); // Vertikal und Horizontal sind mal getauscht worden! nMemberId &= ~CONVERT_TWIPS; @@ -160,7 +160,7 @@ BOOL SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -198,15 +198,15 @@ int SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const } -BOOL SwRotationGrf::QueryValue( uno::Any& rVal, BYTE ) const +bool SwRotationGrf::QueryValue( uno::Any& rVal, BYTE ) const { // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) // where we still want this to be a sal_Int16 rVal <<= (sal_Int16)GetValue(); - return TRUE; + return true; } -BOOL SwRotationGrf::PutValue( const uno::Any& rVal, BYTE ) +bool SwRotationGrf::PutValue( const uno::Any& rVal, BYTE ) { // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) // where we still want this to be a sal_Int16 @@ -215,11 +215,11 @@ BOOL SwRotationGrf::PutValue( const uno::Any& rVal, BYTE ) { // UINT16 argument needed SetValue( (UINT16) nValue ); - return TRUE; + return true; } DBG_ERROR( "SwRotationGrf::PutValue - Wrong type!" ); - return FALSE; + return false; } // ------------------------------------------------------------------ @@ -270,13 +270,13 @@ int SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const nValue == ((SwGammaGrf&)rCmp).GetValue(); } -BOOL SwGammaGrf::QueryValue( uno::Any& rVal, BYTE ) const +bool SwGammaGrf::QueryValue( uno::Any& rVal, BYTE ) const { rVal <<= nValue; - return sal_True; + return true; } -BOOL SwGammaGrf::PutValue( const uno::Any& rVal, BYTE ) +bool SwGammaGrf::PutValue( const uno::Any& rVal, BYTE ) { return rVal >>= nValue; } @@ -295,24 +295,24 @@ SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool * ) const return new SwTransparencyGrf( *this ); } // ------------------------------------------------------------------ -BOOL SwTransparencyGrf::QueryValue( uno::Any& rVal, +bool SwTransparencyGrf::QueryValue( uno::Any& rVal, BYTE ) const { DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!"); sal_Int16 nRet = GetValue(); DBG_ASSERT( 0 <= nRet && nRet <= 100, "value out of range" ); rVal <<= nRet; - return TRUE; + return true; } // ------------------------------------------------------------------ -BOOL SwTransparencyGrf::PutValue( const uno::Any& rVal, +bool SwTransparencyGrf::PutValue( const uno::Any& rVal, BYTE ) { //temporary conversion until this is a SfxInt16Item! DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!"); sal_Int16 nVal = 0; if(!(rVal >>= nVal) || nVal < -100 || nVal > 100) - return FALSE; + return false; if(nVal < 0) { // for compatibility with old documents @@ -323,7 +323,7 @@ BOOL SwTransparencyGrf::PutValue( const uno::Any& rVal, } DBG_ASSERT( 0 <= nVal && nVal <= 100, "value out of range" ); SetValue(static_cast<BYTE>(nVal)); - return TRUE; + return true; } // ------------------------------------------------------------------ @@ -342,24 +342,24 @@ USHORT SwDrawModeGrf::GetValueCount() const return GRAPHICDRAWMODE_WATERMARK + 1; } -BOOL SwDrawModeGrf::QueryValue( uno::Any& rVal, +bool SwDrawModeGrf::QueryValue( uno::Any& rVal, BYTE ) const { drawing::ColorMode eRet = (drawing::ColorMode)GetEnumValue(); rVal <<= eRet; - return TRUE; + return true; } -BOOL SwDrawModeGrf::PutValue( const uno::Any& rVal, +bool SwDrawModeGrf::PutValue( const uno::Any& rVal, BYTE ) { sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal ); if(eVal >= 0 && eVal <= GRAPHICDRAWMODE_WATERMARK) { SetEnumValue((USHORT)eVal); - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 3118e73c14..7e02d111f7 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -298,7 +298,7 @@ SfxPoolItem* SwFmtFrmSize::Clone( SfxItemPool* ) const /* -----------------24.04.98 11:36------------------- * * --------------------------------------------------*/ -BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -353,24 +353,24 @@ BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const rVal <<= (sal_Int16)GetWidthSizeType(); break; } - return sal_True; + return true; } /* -----------------24.04.98 11:36------------------- * * --------------------------------------------------*/ -BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_FRMSIZE_SIZE: { awt::Size aVal; if(!(rVal >>= aVal)) - bRet = sal_False; + bRet = false; else { Size aTmp(aVal.Width, aVal.Height); @@ -382,7 +382,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(aTmp.Height() && aTmp.Width()) aSize = aTmp; else - bRet = sal_False; + bRet = false; } } break; @@ -393,7 +393,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(nSet >= 0 && nSet <= 0xfe) SetHeightPercent((BYTE)nSet); else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_REL_WIDTH: @@ -403,7 +403,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(nSet >= 0 && nSet <= 0xfe) SetWidthPercent((BYTE)nSet); else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH: @@ -451,7 +451,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) aSize.Height() = nHg; } else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_SIZE_TYPE: @@ -462,7 +462,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) SetHeightSizeType((SwFrmSize)nType); } else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_IS_AUTO_HEIGHT: @@ -479,11 +479,11 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) SetWidthSizeType((SwFrmSize)nType); } else - bRet = sal_False; + bRet = false; } break; default: - bRet = sal_False; + bRet = false; } return bRet; } @@ -704,11 +704,11 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) } } -BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_PAGEDESC_PAGENUMOFFSET: @@ -730,12 +730,12 @@ BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -748,7 +748,7 @@ BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(rVal >>= nOffset) SetNumOffset( nOffset ); else - bRet = sal_False; + bRet = false; } break; @@ -759,7 +759,7 @@ BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId ) */ default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -1010,7 +1010,7 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ) } } -BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1023,14 +1023,14 @@ BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const uno::Reference< text::XTextColumns > xCols = new SwXTextColumns(*this); rVal.setValue(&xCols, ::getCppuType((uno::Reference< text::XTextColumns>*)0)); } - return sal_True; + return true; } -BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_False; + bool bRet = false; if(MID_COLUMN_SEPARATOR_LINE == nMemberId) { DBG_ERROR("not implemented"); @@ -1060,7 +1060,7 @@ BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId ) pCol->SetRight( static_cast<USHORT>(MM100_TO_TWIP(pArray[i].RightMargin)) ); aColumns.Insert(pCol, i); } - bRet = sal_True; + bRet = true; nWidth = nWidthSum; bOrtho = sal_False; @@ -1131,11 +1131,11 @@ sal_uInt16 SwFmtSurround::GetValueCount() const } -BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_SURROUND_SURROUNDTYPE: @@ -1161,16 +1161,16 @@ BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_SURROUND_SURROUNDTYPE: @@ -1196,7 +1196,7 @@ BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -1225,11 +1225,11 @@ SfxPoolItem* SwFmtVertOrient::Clone( SfxItemPool* ) const return new SwFmtVertOrient( nYPos, eOrient, eRelation ); } -BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_VERTORIENT_ORIENT: @@ -1259,16 +1259,16 @@ BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_VERTORIENT_ORIENT: @@ -1306,7 +1306,7 @@ BOOL SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -1339,11 +1339,11 @@ SfxPoolItem* SwFmtHoriOrient::Clone( SfxItemPool* ) const return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle ); } -BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_HORIORIENT_ORIENT: @@ -1381,16 +1381,16 @@ BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_HORIORIENT_ORIENT: @@ -1421,7 +1421,7 @@ BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Int32 nVal = 0; if(!(rVal >>= nVal)) - bRet = sal_False; + bRet = false; if(bConvert) nVal = MM100_TO_TWIP(nVal); SetPos( nVal ); @@ -1432,7 +1432,7 @@ BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -1524,11 +1524,11 @@ sal_uInt32 SwFmtAnchor::GetOrder() const /*-----------------16.02.98 15:21------------------- --------------------------------------------------*/ -BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_ANCHOR_ANCHORTYPE: @@ -1573,16 +1573,16 @@ BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_ANCHOR_ANCHORTYPE: @@ -1636,14 +1636,14 @@ BOOL SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId ) } } else - bRet = sal_False; + bRet = false; } break; case MID_ANCHOR_ANCHORFRAME: //no break here!; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -1711,11 +1711,11 @@ void SwFmtURL::SetMap( const ImageMap *pM ) } extern const SvEventDescription* lcl_GetSupportedMacroItems(); -BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_URL_URL: @@ -1757,16 +1757,16 @@ BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_URL_URL: @@ -1802,7 +1802,7 @@ BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) bRet = SvUnoImageMap_fillImageMap( xCont, *pMap ); } else - bRet = FALSE; + bRet = false; } break; case MID_URL_SERVERMAP: @@ -1810,7 +1810,7 @@ BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -1873,7 +1873,7 @@ int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const sSuffix == rAttr.sSuffix; } -BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) @@ -1902,12 +1902,12 @@ BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const case MID_SUFFIX : rVal <<= OUString(sSuffix); break; default: return FALSE; } - return TRUE; + return true; } -BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) { - BOOL bRet = TRUE; + bool bRet = true; nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) { @@ -1936,7 +1936,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(nVal >= 0) nOffset = nVal; else - bRet = FALSE; + bRet = false; } break; case MID_OWN_NUM : @@ -1958,7 +1958,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) SVX_NUM_CHARS_LOWER_LETTER_N == nVal )) aFmt.SetNumberingType(nVal); else - bRet = FALSE; + bRet = false; } break; case MID_PREFIX : @@ -1973,7 +1973,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) sSuffix = sVal; } break; - default: bRet = FALSE; + default: bRet = false; } return bRet; } @@ -2039,11 +2039,11 @@ void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt ) ((SwModify*)aNext.GetRegisteredIn())->Remove( &aNext ); } -BOOL SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; XubString aRet; switch ( nMemberId ) { @@ -2057,7 +2057,7 @@ BOOL SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } rVal <<= OUString(aRet); return bRet; @@ -2092,11 +2092,11 @@ SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const return new SwFmtLineNumber( *this ); } -BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_LINENUMBER_COUNT: @@ -2110,16 +2110,16 @@ BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } -BOOL SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_True; + bool bRet = true; switch ( nMemberId ) { case MID_LINENUMBER_COUNT: @@ -2131,12 +2131,12 @@ BOOL SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(rVal >>= nVal) SetStartValue( nVal ); else - bRet = sal_False; + bRet = false; } break; default: ASSERT( !this, "unknown MemberId" ); - bRet = sal_False; + bRet = false; } return bRet; } @@ -2195,9 +2195,9 @@ SwTextGridItem& SwTextGridItem::operator=( const SwTextGridItem& rCpy ) return *this; } -BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { - BOOL bRet = TRUE; + bool bRet = true; switch( nMemberId & ~CONVERT_TWIPS ) { @@ -2245,7 +2245,7 @@ BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: DBG_ERROR("unknown SwTextGrid value"); - bRet = FALSE; + bRet = false; break; } break; @@ -2260,16 +2260,16 @@ BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: DBG_ERROR("Unknown SwTextGridItem member"); - bRet = FALSE; + bRet = false; break; } return bRet; } -BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { - BOOL bRet = TRUE; + bool bRet = true; switch( nMemberId & ~CONVERT_TWIPS ) { case MID_GRID_COLOR: @@ -2287,7 +2287,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if( bRet && (nTmp >= 0) ) SetLines( (sal_uInt16)nTmp ); else - bRet = FALSE; + bRet = false; } break; case MID_GRID_RUBY_BELOW: @@ -2316,7 +2316,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) else SetRubyHeight( (USHORT)nTmp ); else - bRet = FALSE; + bRet = false; } break; case MID_GRID_TYPE: @@ -2337,7 +2337,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) SetGridType( GRID_LINES_CHARS ); break; default: - bRet = FALSE; + bRet = false; break; } } @@ -2354,7 +2354,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) } default: DBG_ERROR("Unknown SwTextGridItem member"); - bRet = FALSE; + bRet = false; } return bRet; diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index e29c02eb6e..a836575a34 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -158,7 +158,7 @@ SfxPoolItem* SwFmtDrop::Clone( SfxItemPool* ) const return new SwFmtDrop( *this ); } -sal_Bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { switch(nMemberId&~CONVERT_TWIPS) { @@ -187,10 +187,10 @@ sal_Bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; } - return sal_True; + return true; } -sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { switch(nMemberId&~CONVERT_TWIPS) { @@ -216,7 +216,7 @@ sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if ( rVal >>= nVal ) nDistance = (sal_Int16) MM100_TO_TWIP((sal_Int32)nVal); else - return sal_False; + return false; break; } case MID_DROPCAP_FORMAT: @@ -241,7 +241,7 @@ sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) DBG_ERROR("char format cannot be set in PutValue()!"); break; } - return sal_True; + return true; } // class SwRegisterItem ------------------------------------------------- @@ -267,21 +267,21 @@ int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const /* -----------------------------27.06.00 11:05-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwNumRuleItem::QueryValue( uno::Any& rVal, BYTE ) const +bool SwNumRuleItem::QueryValue( uno::Any& rVal, BYTE ) const { rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE ); rVal <<= sRet; - return TRUE; + return true; } /* -----------------------------27.06.00 11:05-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwNumRuleItem::PutValue( const uno::Any& rVal, BYTE ) +bool SwNumRuleItem::PutValue( const uno::Any& rVal, BYTE ) { rtl::OUString uName; rVal >>= uName; SetValue(SwStyleNameMapper::GetUIName(uName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE)); - return TRUE; + return true; } /* -----------------19.05.2003 10:44----------------- diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 3833ede9ef..f2973ea88f 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -127,18 +127,18 @@ BOOL SwFmtCharFmt::GetInfo( SfxPoolItem& rInfo ) const { return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : FALSE; } -BOOL SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE ) const +bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE ) const { String sCharFmtName; if(GetCharFmt()) SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); rVal <<= OUString( sCharFmtName ); - return TRUE; + return true; } -BOOL SwFmtCharFmt::PutValue( const uno::Any& , BYTE ) +bool SwFmtCharFmt::PutValue( const uno::Any& , BYTE ) { DBG_ERROR("Zeichenvorlage kann mit PutValue nicht gesetzt werden!"); - return FALSE; + return false; } /************************************************************************* @@ -175,17 +175,17 @@ SfxPoolItem* SwFmtAutoFmt::Clone( SfxItemPool* ) const return new SwFmtAutoFmt( *this ); } -BOOL SwFmtAutoFmt::QueryValue( uno::Any& rVal, BYTE ) const +bool SwFmtAutoFmt::QueryValue( uno::Any& rVal, BYTE ) const { String sCharFmtName = StylePool::nameOf( mpHandle ); rVal <<= OUString( sCharFmtName ); - return TRUE; + return true; } -BOOL SwFmtAutoFmt::PutValue( const uno::Any& , BYTE ) +bool SwFmtAutoFmt::PutValue( const uno::Any& , BYTE ) { //the format is not renameable via API - return FALSE; + return false; } /************************************************************************* @@ -331,9 +331,9 @@ const SvxMacro* SwFmtINetFmt::GetMacro( USHORT nEvent ) const -BOOL SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { - BOOL bRet = TRUE; + bool bRet = true; XubString sVal; nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) @@ -379,9 +379,9 @@ BOOL SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const rVal <<= OUString(sVal); return bRet; } -BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId ) { - BOOL bRet = TRUE; + bool bRet = true; nMemberId &= ~CONVERT_TWIPS; // all properties except HyperlinkEvents are of type string, hence @@ -403,14 +403,14 @@ BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId ) else { // wrong type! - bRet = FALSE; + bRet = false; } } else { // all string properties: if(rVal.getValueType() != ::getCppuType((rtl::OUString*)0)) - return FALSE; + return false; XubString sVal = *(rtl::OUString*)rVal.getValue(); switch(nMemberId) { @@ -441,7 +441,7 @@ BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId ) } break; default: - bRet = FALSE; + bRet = false; } } return bRet; @@ -503,10 +503,10 @@ SfxPoolItem* SwFmtRuby::Clone( SfxItemPool* ) const return new SwFmtRuby( *this ); } -BOOL SwFmtRuby::QueryValue( uno::Any& rVal, +bool SwFmtRuby::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { - BOOL bRet = TRUE; + bool bRet = true; nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { @@ -526,14 +526,14 @@ BOOL SwFmtRuby::QueryValue( uno::Any& rVal, } break; default: - bRet = FALSE; + bRet = false; } return bRet; } -BOOL SwFmtRuby::PutValue( const uno::Any& rVal, +bool SwFmtRuby::PutValue( const uno::Any& rVal, BYTE nMemberId ) { - BOOL bRet = TRUE; + bool bRet = true; nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { @@ -551,7 +551,7 @@ BOOL SwFmtRuby::PutValue( const uno::Any& rVal, if(nSet >= 0 && nSet <= text::RubyAdjust_INDENT_BLOCK) nAdjustment = nSet; else - bRet = sal_False; + bRet = false; } break; case MID_RUBY_ABOVE: @@ -573,7 +573,7 @@ BOOL SwFmtRuby::PutValue( const uno::Any& rVal, } break; default: - bRet = FALSE; + bRet = false; } return bRet; } diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 2bf989f833..46b56f7f5a 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -322,9 +322,9 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames() return aNames; } -BOOL SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const +bool SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const { - sal_Bool bRet = sal_True; + sal_Bool bRet = true; switch(nMemberId & ~CONVERT_TWIPS) { case MID_ENV_ADDR_TEXT : rVal <<= aAddrText; break; @@ -342,16 +342,16 @@ BOOL SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const case MID_ENV_SHIFT_DOWN : rVal <<= lShiftDown; break; default: DBG_ERROR("Wrong memberId"); - bRet = sal_False; + bRet = false; } return bRet; } /* -----------------------------26.04.01 12:26-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId) +bool SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId) { - BOOL bRet = FALSE; + bool bRet = false; switch(nMemberId & ~CONVERT_TWIPS) { case MID_ENV_ADDR_TEXT : bRet = (rVal >>= aAddrText); break; diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index ed767d2552..ec280a0a67 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -77,8 +77,8 @@ public: virtual int operator ==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; // class SwEnvCfgItem ------------------------------------------------------- diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index d430abb712..9b3dea0133 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -56,8 +56,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } @@ -95,8 +95,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); const SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 311c731040..664b49f546 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -125,9 +125,9 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation /* -----------------------------26.04.01 12:25-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const +bool SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const { - sal_Bool bRet = sal_True; + bool bRet = true; switch(nMemberId & ~CONVERT_TWIPS) { case MID_FTN_HEIGHT : rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetHeight());break; @@ -144,17 +144,17 @@ BOOL SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const case MID_LINE_TEXT_DIST : rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetTopDist());break; case MID_LINE_FOOTNOTE_DIST: rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetBottomDist());break; default: - bRet = sal_False; + bRet = false; } return bRet; } /* -----------------------------26.04.01 12:26-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) +bool SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) { sal_Int32 nSet32 = 0; - sal_Bool bRet = sal_True; + bool bRet = true; switch(nMemberId & ~CONVERT_TWIPS) { case MID_LINE_COLOR : @@ -166,7 +166,7 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) case MID_LINE_FOOTNOTE_DIST: rVal >>= nSet32; if(nSet32 < 0) - bRet = sal_False; + bRet = false; else { nSet32 = MM100_TO_TWIP(nSet32); @@ -185,7 +185,7 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) if(nSet >= 0) aFtnInfo.SetLineWidth(MM100_TO_TWIP(nSet)); else - bRet = sal_False; + bRet = false; } break; case MID_LINE_RELWIDTH : @@ -193,7 +193,7 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) sal_Int8 nSet = 0; rVal >>= nSet; if(nSet < 0) - bRet = sal_False; + bRet = false; else aFtnInfo.SetWidth(Fraction(nSet, 100)); } @@ -205,11 +205,11 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust aFtnInfo.SetAdj((SwFtnAdj)nSet); else - bRet = sal_False; + bRet = false; } break; default: - bRet = sal_False; + bRet = false; } return bRet; } @@ -284,13 +284,13 @@ int SwUINumRuleItem::operator==( const SfxPoolItem& rAttr ) const return *pRule == *((SwUINumRuleItem&)rAttr).pRule; } -BOOL SwUINumRuleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SwUINumRuleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const { uno::Reference< container::XIndexReplace >xRules = new SwXNumberingRules(*pRule); rVal.setValue(&xRules, ::getCppuType((uno::Reference< container::XIndexReplace>*)0)); - return TRUE; + return true; } -BOOL SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) { uno::Reference< container::XIndexReplace> xRulesRef; if(rVal >>= xRulesRef) @@ -303,7 +303,7 @@ BOOL SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) *pRule = *pSwXRules->GetNumRule(); } } - return TRUE; + return true; } /* -----------------17.06.98 17:43------------------- * |