sal_Bool to bool
Change-Id: I4700455a1f2057ac2cc32da0260c810311c84a4f
This commit is contained in:
+1
-1
@@ -99,7 +99,7 @@ protected:
|
||||
|
||||
String sFormel; ///< current formula
|
||||
NameType eNmType; ///< current display method
|
||||
sal_Bool bValidValue; ///< sal_True: recalculate formula
|
||||
bool bValidValue; ///< true: recalculate formula
|
||||
|
||||
// find the node in which the formula is located
|
||||
// TextFeld -> TextNode,
|
||||
|
||||
+19
-19
@@ -75,9 +75,9 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
|
||||
rtl::OUString aContent;
|
||||
rtl::OUString sFieldCode; ///< contains Word's field code
|
||||
sal_uInt16 nSubType;
|
||||
sal_Bool bIsInBodyTxt : 1;
|
||||
sal_Bool bValidValue : 1;
|
||||
sal_Bool bInitialized : 1;
|
||||
bool bIsInBodyTxt : 1;
|
||||
bool bValidValue : 1;
|
||||
bool bInitialized : 1;
|
||||
|
||||
virtual String Expand() const;
|
||||
virtual SwField* Copy() const;
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
virtual String GetFieldName() const;
|
||||
|
||||
/// For calculations in expressions.
|
||||
void ChgValue( double d, sal_Bool bVal );
|
||||
void ChgValue( double d, bool bVal );
|
||||
|
||||
/// Get the evaluation via DBMgr string.
|
||||
void Evaluate();
|
||||
@@ -107,11 +107,11 @@ public:
|
||||
void InitContent();
|
||||
void InitContent(const String& rExpansion);
|
||||
|
||||
inline void ChgBodyTxtFlag( sal_Bool bIsInBody );
|
||||
inline void ChgBodyTxtFlag( bool bIsInBody );
|
||||
|
||||
inline sal_Bool IsInitialized() const { return bInitialized; }
|
||||
inline void ClearInitialized() { bInitialized = sal_False; }
|
||||
inline void SetInitialized() { bInitialized = sal_True; }
|
||||
inline bool IsInitialized() const { return bInitialized; }
|
||||
inline void ClearInitialized() { bInitialized = false; }
|
||||
inline void SetInitialized() { bInitialized = true; }
|
||||
|
||||
/// Get name.
|
||||
virtual const rtl::OUString& GetPar1() const;
|
||||
@@ -130,7 +130,7 @@ inline void SwDBField::SetExpansion(const String& rStr)
|
||||
{ aContent = rStr; }
|
||||
|
||||
/// set from UpdateExpFlds (the Node-Position is known there)
|
||||
inline void SwDBField::ChgBodyTxtFlag( sal_Bool bIsInBody )
|
||||
inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody )
|
||||
{ bIsInBodyTxt = bIsInBody; }
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -182,7 +182,7 @@ public:
|
||||
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
|
||||
{
|
||||
rtl::OUString aCond;
|
||||
sal_Bool bCondValid;
|
||||
bool bCondValid;
|
||||
|
||||
public:
|
||||
SwDBNextSetField( SwDBNextSetFieldType*,
|
||||
@@ -192,8 +192,8 @@ public:
|
||||
virtual SwField* Copy() const;
|
||||
|
||||
void Evaluate(SwDoc*);
|
||||
inline void SetCondValid(sal_Bool bCond);
|
||||
inline sal_Bool IsCondValid() const;
|
||||
inline void SetCondValid(bool bCond);
|
||||
inline bool IsCondValid() const;
|
||||
|
||||
// Condition
|
||||
virtual const rtl::OUString& GetPar1() const;
|
||||
@@ -202,10 +202,10 @@ public:
|
||||
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
|
||||
};
|
||||
|
||||
inline sal_Bool SwDBNextSetField::IsCondValid() const
|
||||
inline bool SwDBNextSetField::IsCondValid() const
|
||||
{ return bCondValid; }
|
||||
|
||||
inline void SwDBNextSetField::SetCondValid(sal_Bool bCond)
|
||||
inline void SwDBNextSetField::SetCondValid(bool bCond)
|
||||
{ bCondValid = bCond; }
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -229,7 +229,7 @@ class SwDBNumSetField : public SwDBNameInfField
|
||||
{
|
||||
rtl::OUString aCond;
|
||||
String aPar2;
|
||||
sal_Bool bCondValid;
|
||||
bool bCondValid;
|
||||
|
||||
public:
|
||||
SwDBNumSetField(SwDBNumSetFieldType*, const String& rCond, const String& rDBNum, const SwDBData& rDBData);
|
||||
@@ -237,8 +237,8 @@ public:
|
||||
virtual String Expand() const;
|
||||
virtual SwField* Copy() const;
|
||||
|
||||
inline sal_Bool IsCondValid() const;
|
||||
inline void SetCondValid(sal_Bool bCond);
|
||||
inline bool IsCondValid() const;
|
||||
inline void SetCondValid(bool bCond);
|
||||
void Evaluate(SwDoc*);
|
||||
|
||||
// Condition
|
||||
@@ -254,10 +254,10 @@ public:
|
||||
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
|
||||
};
|
||||
|
||||
inline sal_Bool SwDBNumSetField::IsCondValid() const
|
||||
inline bool SwDBNumSetField::IsCondValid() const
|
||||
{ return bCondValid; }
|
||||
|
||||
inline void SwDBNumSetField::SetCondValid(sal_Bool bCond)
|
||||
inline void SwDBNumSetField::SetCondValid(bool bCond)
|
||||
{ bCondValid = bCond; }
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
|
||||
+6
-6
@@ -48,7 +48,7 @@ class SwEditShell;
|
||||
const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
|
||||
const SwFrm& rFrm );
|
||||
|
||||
void ReplacePoint(String& sTmpName, sal_Bool bWithCommandType = sal_False);
|
||||
void ReplacePoint(String& sTmpName, bool bWithCommandType = false);
|
||||
|
||||
struct _SeqFldLstElem
|
||||
{
|
||||
@@ -94,7 +94,7 @@ protected:
|
||||
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
|
||||
{
|
||||
String sExpand;
|
||||
sal_Bool bIsInBodyTxt;
|
||||
bool bIsInBodyTxt;
|
||||
sal_uInt16 nSubType;
|
||||
|
||||
bool bLateInitialization; // #i82544#
|
||||
@@ -113,10 +113,10 @@ public:
|
||||
inline void ChgExpStr(const String& rExpand);
|
||||
|
||||
/// Called by formating.
|
||||
inline sal_Bool IsInBodyTxt() const;
|
||||
inline bool IsInBodyTxt() const;
|
||||
|
||||
/// Set by UpdateExpFlds where node position is known.
|
||||
inline void ChgBodyTxtFlag( sal_Bool bIsInBody );
|
||||
inline void ChgBodyTxtFlag( bool bIsInBody );
|
||||
|
||||
/** For fields in header/footer/footnotes/flys:
|
||||
Only called by formating!! */
|
||||
@@ -145,11 +145,11 @@ inline const String& SwGetExpField::GetExpStr() const
|
||||
{ return sExpand; }
|
||||
|
||||
/// Called by formating.
|
||||
inline sal_Bool SwGetExpField::IsInBodyTxt() const
|
||||
inline bool SwGetExpField::IsInBodyTxt() const
|
||||
{ return bIsInBodyTxt; }
|
||||
|
||||
/// Set by UpdateExpFlds where node position is known.
|
||||
inline void SwGetExpField::ChgBodyTxtFlag( sal_Bool bIsInBody )
|
||||
inline void SwGetExpField::ChgBodyTxtFlag( bool bIsInBody )
|
||||
{ bIsInBodyTxt = bIsInBody; }
|
||||
|
||||
class SwSetExpField;
|
||||
|
||||
+8
-8
@@ -38,8 +38,8 @@ class SwDoc;
|
||||
|
||||
class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType
|
||||
{
|
||||
sal_Bool bValidValue : 1;
|
||||
sal_Bool bDeleted : 1;
|
||||
bool bValidValue : 1;
|
||||
bool bDeleted : 1;
|
||||
double nValue;
|
||||
rtl::OUString aName;
|
||||
String aContent;
|
||||
@@ -56,8 +56,8 @@ public:
|
||||
String GetContent( sal_uInt32 nFmt = 0 );
|
||||
void SetContent( const String& rStr, sal_uInt32 nFmt = 0 );
|
||||
|
||||
inline sal_Bool IsValid() const;
|
||||
inline void ChgValid( sal_Bool bNew );
|
||||
inline bool IsValid() const;
|
||||
inline void ChgValid( bool bNew );
|
||||
|
||||
double GetValue(SwCalc& rCalc); // Recalculate member nValue.
|
||||
inline double GetValue() const;
|
||||
@@ -66,8 +66,8 @@ public:
|
||||
inline sal_uInt16 GetType() const;
|
||||
inline void SetType(sal_uInt16);
|
||||
|
||||
sal_Bool IsDeleted() const { return bDeleted; }
|
||||
void SetDeleted( sal_Bool b ) { bDeleted = b; }
|
||||
bool IsDeleted() const { return bDeleted; }
|
||||
void SetDeleted( bool b ) { bDeleted = b; }
|
||||
|
||||
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const;
|
||||
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId );
|
||||
@@ -76,10 +76,10 @@ protected:
|
||||
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
|
||||
};
|
||||
|
||||
inline sal_Bool SwUserFieldType::IsValid() const
|
||||
inline bool SwUserFieldType::IsValid() const
|
||||
{ return bValidValue; }
|
||||
|
||||
inline void SwUserFieldType::ChgValid( sal_Bool bNew )
|
||||
inline void SwUserFieldType::ChgValid( bool bNew )
|
||||
{ bValidValue = bNew; }
|
||||
|
||||
inline double SwUserFieldType::GetValue() const
|
||||
|
||||
@@ -191,9 +191,9 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
|
||||
SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt)
|
||||
: SwValueField(pTyp, nFmt),
|
||||
nSubType(0),
|
||||
bIsInBodyTxt(sal_True),
|
||||
bValidValue(sal_False),
|
||||
bInitialized(sal_False)
|
||||
bIsInBodyTxt(true),
|
||||
bValidValue(false),
|
||||
bInitialized(false)
|
||||
{
|
||||
if (GetTyp())
|
||||
((SwDBFieldType*)GetTyp())->AddRef();
|
||||
@@ -286,7 +286,7 @@ String SwDBField::GetFieldName() const
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
void SwDBField::ChgValue( double d, sal_Bool bVal )
|
||||
void SwDBField::ChgValue( double d, bool bVal )
|
||||
{
|
||||
bValidValue = bVal;
|
||||
SetValue(d);
|
||||
@@ -314,7 +314,7 @@ void SwDBField::Evaluate()
|
||||
SwNewDBMgr* pMgr = GetDoc()->GetNewDBMgr();
|
||||
|
||||
// erstmal loeschen
|
||||
bValidValue = sal_False;
|
||||
bValidValue = false;
|
||||
double nValue = DBL_MAX;
|
||||
const SwDBData& aTmpData = GetDBData();
|
||||
|
||||
@@ -343,7 +343,7 @@ void SwDBField::Evaluate()
|
||||
if (*pDocFormatter->GetNullDate() != aStandard)
|
||||
nValue += (aStandard - *pDocFormatter->GetNullDate());
|
||||
}
|
||||
bValidValue = sal_True;
|
||||
bValidValue = true;
|
||||
SetValue(nValue);
|
||||
aContent = ((SwValueFieldType*)GetTyp())->ExpandValue(nValue, GetFormat(), GetLanguage());
|
||||
}
|
||||
@@ -358,7 +358,7 @@ void SwDBField::Evaluate()
|
||||
|
||||
SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
|
||||
if (nFmt && nFmt != SAL_MAX_UINT32 && !pFormatter->IsTextFormat(nFmt))
|
||||
bValidValue = sal_True; // Wegen Bug #60339 nicht mehr bei allen Strings
|
||||
bValidValue = true; // Wegen Bug #60339 nicht mehr bei allen Strings
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -366,7 +366,7 @@ void SwDBField::Evaluate()
|
||||
SetValue(aContent.isEmpty() ? 0 : 1);
|
||||
}
|
||||
}
|
||||
bInitialized = sal_True;
|
||||
bInitialized = true;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@@ -613,7 +613,7 @@ SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
|
||||
const String& rCond,
|
||||
const String& ,
|
||||
const SwDBData& rDBData) :
|
||||
SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(sal_True)
|
||||
SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(true)
|
||||
{}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -715,7 +715,7 @@ SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp,
|
||||
SwDBNameInfField(pTyp, rDBData),
|
||||
aCond(rCond),
|
||||
aPar2(rDBNum),
|
||||
bCondValid(sal_True)
|
||||
bCondValid(true)
|
||||
{}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -110,7 +110,7 @@ static sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void ReplacePoint( String& rTmpName, sal_Bool bWithCommandType )
|
||||
void ReplacePoint( String& rTmpName, bool bWithCommandType )
|
||||
{
|
||||
// replace first and last (if bWithCommandType: last two) dot Ersten und letzten Punkt ersetzen, da in Tabellennamen Punkte erlaubt sind
|
||||
// since table names may contain dots
|
||||
|
||||
@@ -188,7 +188,7 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const String& aNam )
|
||||
nValue( 0 ),
|
||||
nType(nsSwGetSetExpType::GSE_STRING)
|
||||
{
|
||||
bValidValue = bDeleted = sal_False;
|
||||
bValidValue = bDeleted = false;
|
||||
aName = aNam;
|
||||
|
||||
if (nType & nsSwGetSetExpType::GSE_STRING)
|
||||
@@ -250,7 +250,7 @@ double SwUserFieldType::GetValue( SwCalc& rCalc )
|
||||
rCalc.Pop();
|
||||
|
||||
if( !rCalc.IsCalcError() )
|
||||
bValidValue = sal_True;
|
||||
bValidValue = true;
|
||||
else
|
||||
nValue = 0;
|
||||
|
||||
|
||||
@@ -524,7 +524,7 @@ public:
|
||||
|
||||
void SetInfFlags();
|
||||
inline void InvalidateInfFlags() { bInfInvalid = sal_True; }
|
||||
inline sal_Bool IsInDocBody() const; // use InfoFlags, determine flags
|
||||
inline bool IsInDocBody() const; // use InfoFlags, determine flags
|
||||
inline sal_Bool IsInFtn() const; // if necessary
|
||||
inline sal_Bool IsInTab() const;
|
||||
inline sal_Bool IsInFly() const;
|
||||
@@ -889,7 +889,7 @@ public:
|
||||
bool IsCollapse() const;
|
||||
};
|
||||
|
||||
inline sal_Bool SwFrm::IsInDocBody() const
|
||||
inline bool SwFrm::IsInDocBody() const
|
||||
{
|
||||
if ( bInfInvalid )
|
||||
((SwFrm*)this)->SetInfFlags();
|
||||
|
||||
@@ -748,7 +748,7 @@ SwFrm *SwFrm::_FindNext()
|
||||
}
|
||||
else
|
||||
{
|
||||
const sal_Bool bBody = pThis->IsInDocBody();
|
||||
const bool bBody = pThis->IsInDocBody();
|
||||
SwFrm *pNxtCnt = lcl_NextFrm( pThis );
|
||||
if ( pNxtCnt )
|
||||
{
|
||||
@@ -847,7 +847,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
|
||||
|
||||
if ( pThis->IsCntntFrm() )
|
||||
{
|
||||
const sal_Bool bBody = pThis->IsInDocBody();
|
||||
const bool bBody = pThis->IsInDocBody();
|
||||
const sal_Bool bFtn = pThis->IsInFtn();
|
||||
SwCntntFrm *pNxtCnt = ((SwCntntFrm*)pThis)->GetNextCntntFrm();
|
||||
if ( pNxtCnt )
|
||||
@@ -1101,7 +1101,7 @@ SwFrm *SwFrm::_FindPrev()
|
||||
else
|
||||
{
|
||||
SwFrm* pRet;
|
||||
const sal_Bool bBody = pThis->IsInDocBody();
|
||||
const bool bBody = pThis->IsInDocBody();
|
||||
const sal_Bool bFtn = bBody ? sal_False : pThis->IsInFtn();
|
||||
if ( bBody || bFtn )
|
||||
{
|
||||
|
||||
@@ -956,7 +956,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
|
||||
OSL_ENSURE( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
|
||||
OSL_ENSURE( !IsInSct(), "GetNextLeaf(), don't call me for Sections." );
|
||||
|
||||
const sal_Bool bBody = IsInDocBody(); // If I'm coming from the DocBody,
|
||||
const bool bBody = IsInDocBody(); // If I'm coming from the DocBody,
|
||||
// I want to end up in the body.
|
||||
|
||||
// It doesn't make sense to insert pages, as we only want to search the
|
||||
@@ -1096,7 +1096,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
|
||||
{
|
||||
OSL_ENSURE( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
|
||||
|
||||
const sal_Bool bBody = IsInDocBody(); // If I'm coming from the DocBody,
|
||||
const bool bBody = IsInDocBody(); // If I'm coming from the DocBody,
|
||||
// I want to end up in the body.
|
||||
const sal_Bool bFly = IsInFly();
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
|
||||
SwCntntFrm *pCntnt = (SwCntntFrm*)GetAnchorFrm();
|
||||
AnchorFrm()->RemoveFly( this );
|
||||
|
||||
const sal_Bool bBodyFtn = (pCntnt->IsInDocBody() || pCntnt->IsInFtn());
|
||||
const bool bBodyFtn = (pCntnt->IsInDocBody() || pCntnt->IsInFtn());
|
||||
|
||||
// Search the new anchor using the NodeIdx; the relation between old
|
||||
// and new NodeIdx determines the search direction
|
||||
@@ -898,7 +898,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
|
||||
|
||||
static sal_uLong lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
|
||||
const SwCntntFrm *& rpCnt,
|
||||
const sal_Bool bBody, const sal_Bool bFtn )
|
||||
const bool bBody, const sal_Bool bFtn )
|
||||
{
|
||||
// Searches below pLay the nearest Cnt to the point. The reference point of
|
||||
//the Cntnts is always the left upper corner.
|
||||
@@ -962,7 +962,7 @@ static sal_uLong lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
|
||||
}
|
||||
|
||||
static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
|
||||
const sal_Bool bBody, const sal_Bool bFtn )
|
||||
const bool bBody, const sal_Bool bFtn )
|
||||
{
|
||||
//Starting from pCnt searches the CntntFrm whose left upper corner is the
|
||||
//nearest to the point.
|
||||
@@ -1083,7 +1083,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
|
||||
|
||||
//Take care to use meaningful ranges during search. This means to not enter
|
||||
//or leave header/footer in this case.
|
||||
const sal_Bool bBody = pCnt->IsInDocBody() || bBodyOnly;
|
||||
const bool bBody = pCnt->IsInDocBody() || bBodyOnly;
|
||||
const sal_Bool bFtn = !bBodyOnly && pCnt->IsInFtn();
|
||||
|
||||
Point aNew( rNew );
|
||||
|
||||
@@ -84,7 +84,7 @@ void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld )
|
||||
bFollow = sal_True;
|
||||
}
|
||||
|
||||
SwFldPortion::SwFldPortion( const XubString &rExpand, SwFont *pFont, sal_Bool bPlaceHold )
|
||||
SwFldPortion::SwFldPortion( const XubString &rExpand, SwFont *pFont, bool bPlaceHold )
|
||||
: aExpand(rExpand), pFnt(pFont), nNextOffset(0), nNextScriptChg(STRING_LEN), nViewWidth(0),
|
||||
bFollow( sal_False ), bHasFollow( sal_False ), bPlaceHolder( bPlaceHold )
|
||||
, m_bNoLength( sal_False )
|
||||
|
||||
@@ -58,7 +58,7 @@ protected:
|
||||
sal_Bool bAnimated : 1; // Used by SwGrfNumPortion
|
||||
sal_Bool bNoPaint : 1; // Used by SwGrfNumPortion
|
||||
sal_Bool bReplace : 1; // Used by SwGrfNumPortion
|
||||
const sal_Bool bPlaceHolder : 1;
|
||||
const bool bPlaceHolder : 1;
|
||||
sal_Bool m_bNoLength : 1; // HACK for meta suffix (no CH_TXTATR)
|
||||
|
||||
inline void SetFont( SwFont *pNew ) { pFnt = pNew; }
|
||||
@@ -67,7 +67,7 @@ protected:
|
||||
|
||||
public:
|
||||
SwFldPortion( const SwFldPortion& rFld );
|
||||
SwFldPortion( const XubString &rExpand, SwFont *pFnt = 0, sal_Bool bPlaceHolder = sal_False );
|
||||
SwFldPortion( const XubString &rExpand, SwFont *pFnt = 0, bool bPlaceHolder = false );
|
||||
~SwFldPortion();
|
||||
|
||||
void TakeNextOffset( const SwFldPortion* pFld );
|
||||
|
||||
@@ -64,10 +64,10 @@
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
static sal_Bool lcl_IsInBody( SwFrm *pFrm )
|
||||
static bool lcl_IsInBody( SwFrm *pFrm )
|
||||
{
|
||||
if ( pFrm->IsInDocBody() )
|
||||
return sal_True;
|
||||
return true;
|
||||
else
|
||||
{
|
||||
const SwFrm *pTmp = pFrm;
|
||||
@@ -88,8 +88,8 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
|
||||
const sal_Bool bName = rInf.GetOpt().IsFldName();
|
||||
|
||||
SwCharFmt* pChFmt = 0;
|
||||
sal_Bool bNewFlyPor = sal_False,
|
||||
bINet = sal_False;
|
||||
bool bNewFlyPor = false,
|
||||
bINet = false;
|
||||
|
||||
// set language
|
||||
((SwTxtFormatter*)this)->SeekAndChg( rInf );
|
||||
@@ -104,7 +104,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
|
||||
ViewShell *pSh = rInf.GetVsh();
|
||||
SwDoc *const pDoc( (pSh) ? pSh->GetDoc() : 0 );
|
||||
bool const bInClipboard( (pDoc) ? pDoc->IsClipBoard() : true );
|
||||
sal_Bool bPlaceHolder = sal_False;
|
||||
sal_Bool bPlaceHolder = false;
|
||||
|
||||
switch( pFld->GetTyp()->Which() )
|
||||
{
|
||||
@@ -197,14 +197,14 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
|
||||
SwGetExpField* pExpFld = (SwGetExpField*)pFld;
|
||||
if( !::lcl_IsInBody( pFrame ) )
|
||||
{
|
||||
pExpFld->ChgBodyTxtFlag( sal_False );
|
||||
pExpFld->ChgBodyTxtFlag( false );
|
||||
pExpFld->ChangeExpansion( *pFrame, *((SwTxtFld*)pHint) );
|
||||
}
|
||||
else if( !pExpFld->IsInBodyTxt() )
|
||||
{
|
||||
// war vorher anders, also erst expandieren, dann umsetzen!!
|
||||
pExpFld->ChangeExpansion( *pFrame, *((SwTxtFld*)pHint) );
|
||||
pExpFld->ChgBodyTxtFlag( sal_True );
|
||||
pExpFld->ChgBodyTxtFlag( true );
|
||||
}
|
||||
}
|
||||
{
|
||||
@@ -246,8 +246,8 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
|
||||
case RES_JUMPEDITFLD:
|
||||
if( !bName )
|
||||
pChFmt = ((SwJumpEditField*)pFld)->GetCharFmt();
|
||||
bNewFlyPor = sal_True;
|
||||
bPlaceHolder = sal_True;
|
||||
bNewFlyPor = true;
|
||||
bPlaceHolder = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
@@ -94,7 +94,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText
|
||||
while ( aLine.Len() )
|
||||
{
|
||||
String sTmpText;
|
||||
sal_Bool bField = sal_False;
|
||||
bool bField = false;
|
||||
|
||||
sal_uInt16 nPos = aLine.Search( '<' );
|
||||
if ( nPos )
|
||||
@@ -120,11 +120,11 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText
|
||||
sal_uInt16 nCnt = comphelper::string::getTokenCount(sDBName, '.');
|
||||
if (nCnt >= 3)
|
||||
{
|
||||
::ReplacePoint(sDBName, sal_True);
|
||||
::ReplacePoint(sDBName, true);
|
||||
SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0, &rSh );
|
||||
rFldMgr.InsertFld( aData );
|
||||
sRet = sDBName;
|
||||
bField = sal_True;
|
||||
bField = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -185,7 +185,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
|
||||
SwEnvCfgItem aEnvCfg;
|
||||
|
||||
// Check if there's already an envelope.
|
||||
sal_Bool bEnvChange = sal_False;
|
||||
bool bEnvChange = false;
|
||||
|
||||
SfxItemSet aSet(GetPool(), FN_ENVELOP, FN_ENVELOP, 0);
|
||||
aSet.Put(aEnvCfg.GetItem());
|
||||
@@ -381,9 +381,9 @@ void SwModule::InsertEnv( SfxRequest& rReq )
|
||||
rFmt.SetFmtAttr(aULMargin);
|
||||
|
||||
// Header and footer
|
||||
rFmt.SetFmtAttr(SwFmtHeader(sal_Bool(sal_False)));
|
||||
rFmt.SetFmtAttr(SwFmtHeader(sal_False));
|
||||
pDesc->ChgHeaderShare(sal_False);
|
||||
rFmt.SetFmtAttr(SwFmtFooter(sal_Bool(sal_False)));
|
||||
rFmt.SetFmtAttr(SwFmtFooter(sal_False));
|
||||
pDesc->ChgFooterShare(sal_False);
|
||||
|
||||
// Page numbering
|
||||
|
||||
@@ -188,7 +188,7 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId,
|
||||
SvTreeListBox (pParent, rResId),
|
||||
aImageList (SW_RES(ILIST_DB_DLG )),
|
||||
sDefDBName (rDefDBName),
|
||||
bInitialized (sal_False),
|
||||
bInitialized (false),
|
||||
bShowColumns (bShowCol),
|
||||
pImpl(new SwDBTreeList_Impl(pSh))
|
||||
{
|
||||
@@ -233,7 +233,7 @@ void SwDBTreeList::InitTreeList()
|
||||
String sColumnName(sDefDBName.GetToken(2, DB_DELIM));
|
||||
Select(sDBName, sTableName, sColumnName);
|
||||
|
||||
bInitialized = sal_True;
|
||||
bInitialized = true;
|
||||
}
|
||||
|
||||
void SwDBTreeList::AddDataSource(const String& rSource)
|
||||
|
||||
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
|
||||
Image aQueryBMP;
|
||||
|
||||
String sDefDBName;
|
||||
sal_Bool bInitialized;
|
||||
bool bInitialized;
|
||||
sal_Bool bShowColumns;
|
||||
|
||||
SwDBTreeList_Impl* pImpl;
|
||||
|
||||
Reference in New Issue
Block a user