diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-25 14:00:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-30 08:44:42 +0200 |
| commit | 6aa35db39311dcd7965c9c9c21fcf4143a1f9b43 (patch) | |
| tree | 04320eaf8c7481c1b496460624ee20ec11360ac2 /sw/inc | |
| parent | 1417061d1b2c110e7e690523a544b58e7ffd05c0 (diff) | |
sw: sal_Bool->bool
Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8
Diffstat (limited to 'sw/inc')
115 files changed, 2086 insertions, 2086 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 8ab89a501606..0144a394972b 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -123,8 +123,8 @@ class SwSidebarWin : public Window void ResetAttributes(); void SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition); - void SetReadonly(sal_Bool bSet); - sal_Bool IsReadOnly() + void SetReadonly(bool bSet); + bool IsReadOnly() { return mbReadonly; } diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index 2445cdff0ede..dcd5a26cd70d 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -49,15 +49,15 @@ class SwApplet_Impl OUString sAlt; public: - static sal_uInt16 GetOptionType( const OUString& rName, sal_Bool bApplet ); + static sal_uInt16 GetOptionType( const OUString& rName, bool bApplet ); SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {} ~SwApplet_Impl(); void CreateApplet( const OUString& rCode, const OUString& rName, - sal_Bool bMayScript, const OUString& rCodeBase, + bool bMayScript, const OUString& rCodeBase, const OUString& rBaseURL ); #if HAVE_FEATURE_JAVA - sal_Bool CreateApplet( const OUString& rBaseURL ); + bool CreateApplet( const OUString& rBaseURL ); void AppendParam( const OUString& rName, const OUString& rValue ); #endif void FinishApplet(); diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index 9c3b6b6ce0c5..e34dd2c8cdba 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -45,14 +45,14 @@ class SwUndoFieldFromDoc : public SwUndoField { SwField * pOldField, * pNewField; SwMsgPoolItem * pHnt; - sal_Bool bUpdate; + bool bUpdate; void DoImpl(); public: SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField, const SwField & aNewField, - SwMsgPoolItem * pHnt, sal_Bool bUpdate, + SwMsgPoolItem * pHnt, bool bUpdate, SwUndoId nId = UNDO_FIELD ); virtual ~SwUndoFieldFromDoc(); diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx index e80f2685f036..ce3a64564254 100644 --- a/sw/inc/accessibilityoptions.hxx +++ b/sw/inc/accessibilityoptions.hxx @@ -23,23 +23,23 @@ struct SwAccessibilityOptions { - sal_Bool bIsAlwaysAutoColor :1; - sal_Bool bIsStopAnimatedText :1; - sal_Bool bIsStopAnimatedGraphics :1; + bool bIsAlwaysAutoColor :1; + bool bIsStopAnimatedText :1; + bool bIsStopAnimatedGraphics :1; SwAccessibilityOptions() : - bIsAlwaysAutoColor(sal_False), - bIsStopAnimatedText(sal_False), - bIsStopAnimatedGraphics(sal_False) {} + bIsAlwaysAutoColor(false), + bIsStopAnimatedText(false), + bIsStopAnimatedGraphics(false) {} - inline sal_Bool IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; } - inline void SetAlwaysAutoColor( sal_Bool b ) { bIsAlwaysAutoColor = b; } + inline bool IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; } + inline void SetAlwaysAutoColor( bool b ) { bIsAlwaysAutoColor = b; } - inline sal_Bool IsStopAnimatedGraphics() const { return bIsStopAnimatedText;} - inline void SetStopAnimatedGraphics( sal_Bool b ) { bIsStopAnimatedText = b; } + inline bool IsStopAnimatedGraphics() const { return bIsStopAnimatedText;} + inline void SetStopAnimatedGraphics( bool b ) { bIsStopAnimatedText = b; } - inline sal_Bool IsStopAnimatedText() const { return bIsStopAnimatedGraphics; } - inline void SetStopAnimatedText( sal_Bool b ) { bIsStopAnimatedGraphics = b;} + inline bool IsStopAnimatedText() const { return bIsStopAnimatedGraphics; } + inline void SetStopAnimatedText( bool b ) { bIsStopAnimatedGraphics = b;} }; #endif diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 0310234123c4..cafb7511f0b1 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -105,7 +105,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, void InvalidateCursorPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rAcc ); - void DoInvalidateShapeSelection(sal_Bool bInvalidateFocusMode = sal_False); + void DoInvalidateShapeSelection(bool bInvalidateFocusMode = false); void InvalidateShapeSelection(); @@ -146,27 +146,27 @@ public: ::rtl::Reference < SwAccessibleContext > GetContextImpl( const SwFrm *pFrm, - sal_Bool bCreate = sal_True ); + bool bCreate = true ); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetContext( const SwFrm *pFrm, - sal_Bool bCreate = sal_True ); + bool bCreate = true ); ::rtl::Reference < ::accessibility::AccessibleShape > GetContextImpl( const SdrObject *pObj, SwAccessibleContext *pParentImpl, - sal_Bool bCreate = sal_True ); + bool bCreate = true ); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetContext( const SdrObject *pObj, SwAccessibleContext *pParentImpl, - sal_Bool bCreate = sal_True ); + bool bCreate = true ); inline SwViewShell* GetShell() const { return mpVSh; } - sal_Bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh); + bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh); void AddShapeContext(const SdrObject *pObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccShape); @@ -194,7 +194,7 @@ public: void Dispose( const SwFrm* pFrm, const SdrObject* pObj, Window* pWindow, - sal_Bool bRecursive = sal_False ); + bool bRecursive = false ); void InvalidatePosOrSize( const SwFrm* pFrm, const SdrObject* pObj, diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 97e29bee214b..e7f63e7461d9 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -32,7 +32,7 @@ class SwAuthEntry public: SwAuthEntry() : nRefCount(0){} SwAuthEntry( const SwAuthEntry& rCopy ); - sal_Bool operator==(const SwAuthEntry& rComp); + bool operator==(const SwAuthEntry& rComp); inline OUString GetAuthorField(ToxAuthorityField ePos) const; inline void SetAuthorField(ToxAuthorityField ePos, @@ -64,8 +64,8 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType SortKeyArr m_SortKeyArr; sal_Unicode m_cPrefix; sal_Unicode m_cSuffix; - sal_Bool m_bIsSequence :1; - sal_Bool m_bSortByDocument :1; + bool m_bIsSequence :1; + bool m_bSortByDocument :1; LanguageType m_eLanguage; OUString m_sSortAlgorithm; @@ -85,7 +85,7 @@ public: SwDoc* GetDoc(){ return m_pDoc; } void RemoveField(sal_IntPtr nHandle); sal_IntPtr AddField(const OUString& rFieldContents); - sal_Bool AddField(sal_IntPtr nHandle); + bool AddField(sal_IntPtr nHandle); void DelSequenceArray() { m_SequArr.clear(); @@ -103,8 +103,8 @@ public: sal_uInt16 GetSequencePos(sal_IntPtr nHandle); - sal_Bool IsSequence() const {return m_bIsSequence;} - void SetSequence(sal_Bool bSet) + bool IsSequence() const {return m_bIsSequence;} + void SetSequence(bool bSet) { DelSequenceArray(); m_bIsSequence = bSet; @@ -118,8 +118,8 @@ public: sal_Unicode GetPrefix() const { return m_cPrefix;} sal_Unicode GetSuffix() const { return m_cSuffix;} - sal_Bool IsSortByDocument() const {return m_bSortByDocument;} - void SetSortByDocument(sal_Bool bSet) + bool IsSortByDocument() const {return m_bSortByDocument;} + void SetSortByDocument(bool bSet) { DelSequenceArray(); m_bSortByDocument = bSet; diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx index 463e48351948..3bd8bde98858 100644 --- a/sw/inc/authratr.hxx +++ b/sw/inc/authratr.hxx @@ -35,7 +35,7 @@ public: AuthorCharAttr(); - inline sal_Bool operator == ( const AuthorCharAttr& rAttr ) const + inline bool operator == ( const AuthorCharAttr& rAttr ) const { return nItemId == rAttr.nItemId && nAttr == rAttr.nAttr && nColor == rAttr.nColor; diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 0b7f0dd50558..45156acd5266 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -121,10 +121,10 @@ class SW_DLLPUBLIC SwModify: public SwClient { SwClient* pRoot; // the start of the linked list of clients bool bModifyLocked : 1; // don't broadcast changes now - sal_Bool bLockClientList : 1; // may be set when this instance notifies its clients - sal_Bool bInDocDTOR : 1; // workaround for problems when a lot of objects are destroyed - sal_Bool bInCache : 1; - sal_Bool bInSwFntCache : 1; + bool bLockClientList : 1; // may be set when this instance notifies its clients + bool bInDocDTOR : 1; // workaround for problems when a lot of objects are destroyed + bool bInCache : 1; + bool bInSwFntCache : 1; // mba: IMHO this method should be pure virtual virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; @@ -156,13 +156,13 @@ public: void LockModify() { bModifyLocked = true; } void UnlockModify() { bModifyLocked = false; } - void SetInCache( sal_Bool bNew ) { bInCache = bNew; } - void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; } - void SetInDocDTOR() { bInDocDTOR = sal_True; } + void SetInCache( bool bNew ) { bInCache = bNew; } + void SetInSwFntCache( bool bNew ) { bInSwFntCache = bNew; } + void SetInDocDTOR() { bInDocDTOR = true; } bool IsModifyLocked() const { return bModifyLocked; } - sal_Bool IsInDocDTOR() const { return bInDocDTOR; } - sal_Bool IsInCache() const { return bInCache; } - sal_Bool IsInSwFntCache() const { return bInSwFntCache; } + bool IsInDocDTOR() const { return bInDocDTOR; } + bool IsInCache() const { return bInCache; } + bool IsInSwFntCache() const { return bInSwFntCache; } void CheckCaching( const sal_uInt16 nWhich ); bool IsLastDepend() { return pRoot && pRoot->IsLast(); } diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index ead65e624129..007e5371810f 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -114,7 +114,7 @@ public: {} virtual ~SwSbxValue(); - sal_Bool GetBool() const; + bool GetBool() const; double GetDouble() const; SwSbxValue& MakeDouble(); @@ -175,7 +175,7 @@ class SwCalc SwSbxValue Term(); SwSbxValue Prim(); - sal_Bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); + bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); OUString GetColumnName( const OUString& rName ); OUString GetDBName( const OUString& rName ); @@ -189,8 +189,8 @@ public: ~SwCalc(); SwSbxValue Calculate( const OUString &rStr ); - OUString GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True ); - OUString GetStrResult( double, sal_Bool bRound = sal_True ); + OUString GetStrResult( const SwSbxValue& rValue, bool bRound = true ); + OUString GetStrResult( double, bool bRound = true ); SwCalcExp* VarInsert( const OUString& r ); SwCalcExp* VarLook( const OUString &rStr, sal_uInt16 ins = 0 ); @@ -202,7 +202,7 @@ public: void Pop(); void SetCalcError( SwCalcError eErr ) { eError = eErr; } - sal_Bool IsCalcError() const { return 0 != eError; } + bool IsCalcError() const { return 0 != eError; } static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, @@ -210,7 +210,7 @@ public: static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, SwDoc *const pDoc ); - SW_DLLPUBLIC static sal_Bool IsValidVarName( const OUString& rStr, + SW_DLLPUBLIC static bool IsValidVarName( const OUString& rStr, OUString* pValidName = 0 ); }; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 2ecbe6c1453e..8dd73daa3d93 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -30,10 +30,10 @@ namespace rtl { class OUString; } class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item { - sal_Bool bAuto; ///< automatically given flag + bool bAuto; ///< automatically given flag public: SwTblBoxNumFormat( sal_uInt32 nFormat = NUMBERFORMAT_TEXT, - sal_Bool bAuto = sal_False ); + bool bAuto = false ); // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -46,8 +46,8 @@ public: return *this; } - sal_Bool GetAutoFlag() const { return bAuto; } - void SetAutoFlag( sal_Bool bFlag = sal_True ) { bAuto = bFlag; } + bool GetAutoFlag() const { return bAuto; } + void SetAutoFlag( bool bFlag = true ) { bAuto = bFlag; } }; class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula @@ -97,18 +97,18 @@ public: double GetValue() const { return nValue; } }; -inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(sal_Bool bInP) const +inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(bool bInP) const { return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } -inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) const +inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(bool bInP) const { return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); } -inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(sal_Bool bInP) const +inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(bool bInP) const { return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); } -inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(sal_Bool bInP) const +inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(bool bInP) const { return aSet.GetTblBoxNumFmt(bInP); } -inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(sal_Bool bInP) const +inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(bool bInP) const { return aSet.GetTblBoxFormula(bInP); } -inline const SwTblBoxValue &SwFmt::GetTblBoxValue(sal_Bool bInP) const +inline const SwTblBoxValue &SwFmt::GetTblBoxValue(bool bInP) const { return aSet.GetTblBoxValue(bInP); } #endif diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index df656c13641b..9e6523ca4919 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -44,9 +44,9 @@ public: SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable ); ~SwTblCalcPara(); - sal_Bool CalcWithStackOverflow(); - sal_Bool IsStackOverflow() const { return nMaxSize == nStackCnt; } - sal_Bool IncStackCnt() { return nMaxSize == ++nStackCnt; } + bool CalcWithStackOverflow(); + bool IsStackOverflow() const { return nMaxSize == nStackCnt; } + bool IncStackCnt() { return nMaxSize == ++nStackCnt; } void DecStackCnt() { if( nStackCnt ) --nStackCnt; } void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; } }; diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 402a2dbcdf3c..b791a7ceadd2 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -24,152 +24,152 @@ // implementation of the character attribute methods of SwAttrSet -inline const SvxPostureItem &SwAttrSet::GetPosture(sal_Bool bInP) const +inline const SvxPostureItem &SwAttrSet::GetPosture(bool bInP) const { return (const SvxPostureItem&)Get( RES_CHRATR_POSTURE,bInP); } -inline const SvxPostureItem &SwAttrSet::GetCJKPosture(sal_Bool bInP) const +inline const SvxPostureItem &SwAttrSet::GetCJKPosture(bool bInP) const { return (const SvxPostureItem&)Get( RES_CHRATR_CJK_POSTURE,bInP); } -inline const SvxPostureItem &SwAttrSet::GetCTLPosture(sal_Bool bInP) const +inline const SvxPostureItem &SwAttrSet::GetCTLPosture(bool bInP) const { return (const SvxPostureItem&)Get( RES_CHRATR_CTL_POSTURE,bInP); } -inline const SvxWeightItem &SwAttrSet::GetWeight(sal_Bool bInP) const +inline const SvxWeightItem &SwAttrSet::GetWeight(bool bInP) const { return (const SvxWeightItem&)Get( RES_CHRATR_WEIGHT,bInP); } -inline const SvxWeightItem &SwAttrSet::GetCJKWeight(sal_Bool bInP) const +inline const SvxWeightItem &SwAttrSet::GetCJKWeight(bool bInP) const { return (const SvxWeightItem&)Get( RES_CHRATR_CJK_WEIGHT,bInP); } -inline const SvxWeightItem &SwAttrSet::GetCTLWeight(sal_Bool bInP) const +inline const SvxWeightItem &SwAttrSet::GetCTLWeight(bool bInP) const { return (const SvxWeightItem&)Get( RES_CHRATR_CTL_WEIGHT,bInP); } -inline const SvxShadowedItem &SwAttrSet::GetShadowed(sal_Bool bInP) const +inline const SvxShadowedItem &SwAttrSet::GetShadowed(bool bInP) const { return (const SvxShadowedItem&)Get( RES_CHRATR_SHADOWED,bInP); } -inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(sal_Bool bInP) const +inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(bool bInP) const { return (const SvxAutoKernItem&)Get( RES_CHRATR_AUTOKERN,bInP); } -inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(sal_Bool bInP) const +inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(bool bInP) const { return (const SvxWordLineModeItem&)Get( RES_CHRATR_WORDLINEMODE,bInP); } -inline const SvxContourItem &SwAttrSet::GetContour(sal_Bool bInP) const +inline const SvxContourItem &SwAttrSet::GetContour(bool bInP) const { return (const SvxContourItem&)Get( RES_CHRATR_CONTOUR,bInP); } -inline const SvxKerningItem &SwAttrSet::GetKerning(sal_Bool bInP) const +inline const SvxKerningItem &SwAttrSet::GetKerning(bool bInP) const { return (const SvxKerningItem&)Get( RES_CHRATR_KERNING,bInP); } -inline const SvxUnderlineItem &SwAttrSet::GetUnderline(sal_Bool bInP) const +inline const SvxUnderlineItem &SwAttrSet::GetUnderline(bool bInP) const { return (const SvxUnderlineItem&)Get( RES_CHRATR_UNDERLINE,bInP); } -inline const SvxOverlineItem &SwAttrSet::GetOverline(sal_Bool bInP) const +inline const SvxOverlineItem &SwAttrSet::GetOverline(bool bInP) const { return (const SvxOverlineItem&)Get( RES_CHRATR_OVERLINE,bInP); } -inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(sal_Bool bInP) const +inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(bool bInP) const { return (const SvxCrossedOutItem&)Get( RES_CHRATR_CROSSEDOUT,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetSize(sal_Bool bInP) const +inline const SvxFontHeightItem &SwAttrSet::GetSize(bool bInP) const { return (const SvxFontHeightItem&)Get( RES_CHRATR_FONTSIZE,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(sal_Bool bInP) const +inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(bool bInP) const { return (const SvxFontHeightItem&)Get( RES_CHRATR_CJK_FONTSIZE,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(sal_Bool bInP) const +inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(bool bInP) const { return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); } -inline const SvxPropSizeItem &SwAttrSet::GetPropSize(sal_Bool bInP) const +inline const SvxPropSizeItem &SwAttrSet::GetPropSize(bool bInP) const { return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); } -inline const SvxFontItem &SwAttrSet::GetFont(sal_Bool bInP) const +inline const SvxFontItem &SwAttrSet::GetFont(bool bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); } -inline const SvxFontItem &SwAttrSet::GetCJKFont(sal_Bool bInP) const +inline const SvxFontItem &SwAttrSet::GetCJKFont(bool bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); } -inline const SvxFontItem &SwAttrSet::GetCTLFont(sal_Bool bInP) const +inline const SvxFontItem &SwAttrSet::GetCTLFont(bool bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_CTL_FONT,bInP); } -inline const SvxColorItem &SwAttrSet::GetColor(sal_Bool bInP) const +inline const SvxColorItem &SwAttrSet::GetColor(bool bInP) const { return (const SvxColorItem&)Get( RES_CHRATR_COLOR,bInP); } -inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(sal_Bool bInP) const +inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(bool bInP) const { return (const SvxCharSetColorItem&)Get( RES_CHRATR_CHARSETCOLOR,bInP); } -inline const SvxLanguageItem &SwAttrSet::GetLanguage(sal_Bool bInP) const +inline const SvxLanguageItem &SwAttrSet::GetLanguage(bool bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_LANGUAGE,bInP); } -inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(sal_Bool bInP) const +inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(bool bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_CJK_LANGUAGE,bInP); } -inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(sal_Bool bInP) const +inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(bool bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); } -inline const SvxEscapementItem &SwAttrSet::GetEscapement(sal_Bool bInP) const +inline const SvxEscapementItem &SwAttrSet::GetEscapement(bool bInP) const { return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); } -inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(sal_Bool bInP) const +inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(bool bInP) const { return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); } -inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(sal_Bool bInP) const +inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(bool bInP) const { return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); } -inline const SvxBlinkItem &SwAttrSet::GetBlink(sal_Bool bInP) const +inline const SvxBlinkItem &SwAttrSet::GetBlink(bool bInP) const { return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); } -inline const SvxBrushItem &SwAttrSet::GetChrBackground( sal_Bool bInP ) const +inline const SvxBrushItem &SwAttrSet::GetChrBackground( bool bInP ) const { return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); } -inline const SvxBrushItem &SwAttrSet::GetChrHighlight( sal_Bool bInP ) const +inline const SvxBrushItem &SwAttrSet::GetChrHighlight( bool bInP ) const { return (const SvxBrushItem&)Get( RES_CHRATR_HIGHLIGHT, bInP ); } -inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( sal_Bool bInP ) const +inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( bool bInP ) const { return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); } -inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( sal_Bool bInP ) const +inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( bool bInP ) const { return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); } -inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( sal_Bool bInP ) const +inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( bool bInP ) const { return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); } -inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( sal_Bool bInP ) const +inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( bool bInP ) const { return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); } -inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( sal_Bool bInP ) const +inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( bool bInP ) const { return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); } -inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( sal_Bool bInP ) const +inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( bool bInP ) const { return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); } -inline const SvxBoxItem &SwAttrSet::GetCharBorder( sal_Bool bInP ) const +inline const SvxBoxItem &SwAttrSet::GetCharBorder( bool bInP ) const { return (const SvxBoxItem&)Get( RES_CHRATR_BOX, bInP ); } -inline const SvxShadowItem &SwAttrSet::GetCharShadow( sal_Bool bInP ) const +inline const SvxShadowItem &SwAttrSet::GetCharShadow( bool bInP ) const { return (const SvxShadowItem&)Get( RES_CHRATR_SHADOW, bInP ); } // implementation of the character attribute methods of SwFmt -inline const SvxPostureItem &SwFmt::GetPosture(sal_Bool bInP) const +inline const SvxPostureItem &SwFmt::GetPosture(bool bInP) const { return aSet.GetPosture(bInP); } -inline const SvxWeightItem &SwFmt::GetWeight(sal_Bool bInP) const +inline const SvxWeightItem &SwFmt::GetWeight(bool bInP) const { return aSet.GetWeight(bInP); } -inline const SvxShadowedItem &SwFmt::GetShadowed(sal_Bool bInP) const +inline const SvxShadowedItem &SwFmt::GetShadowed(bool bInP) const { return aSet.GetShadowed(bInP); } -inline const SvxAutoKernItem &SwFmt::GetAutoKern(sal_Bool bInP) const +inline const SvxAutoKernItem &SwFmt::GetAutoKern(bool bInP) const { return aSet.GetAutoKern(bInP); } -inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(sal_Bool bInP) const +inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(bool bInP) const { return aSet.GetWordLineMode(bInP); } -inline const SvxContourItem &SwFmt::GetContour(sal_Bool bInP) const +inline const SvxContourItem &SwFmt::GetContour(bool bInP) const { return aSet.GetContour(bInP); } -inline const SvxKerningItem &SwFmt::GetKerning(sal_Bool bInP) const +inline const SvxKerningItem &SwFmt::GetKerning(bool bInP) const { return aSet.GetKerning(bInP); } -inline const SvxUnderlineItem &SwFmt::GetUnderline(sal_Bool bInP) const +inline const SvxUnderlineItem &SwFmt::GetUnderline(bool bInP) const { return aSet.GetUnderline(bInP); } -inline const SvxOverlineItem &SwFmt::GetOverline(sal_Bool bInP) const +inline const SvxOverlineItem &SwFmt::GetOverline(bool bInP) const { return aSet.GetOverline(bInP); } -inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(sal_Bool bInP) const +inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(bool bInP) const { return aSet.GetCrossedOut(bInP); } -inline const SvxFontHeightItem &SwFmt::GetSize(sal_Bool bInP) const +inline const SvxFontHeightItem &SwFmt::GetSize(bool bInP) const { return aSet.GetSize(bInP); } -inline const SvxPropSizeItem &SwFmt::GetPropSize(sal_Bool bInP) const +inline const SvxPropSizeItem &SwFmt::GetPropSize(bool bInP) const { return aSet.GetPropSize(bInP); } -inline const SvxFontItem &SwFmt::GetFont(sal_Bool bInP) const +inline const SvxFontItem &SwFmt::GetFont(bool bInP) const { return aSet.GetFont(bInP); } -inline const SvxFontItem &SwFmt::GetCJKFont(sal_Bool bInP) const +inline const SvxFontItem &SwFmt::GetCJKFont(bool bInP) const { return aSet.GetCJKFont(bInP); } -inline const SvxFontItem &SwFmt::GetCTLFont(sal_Bool bInP) const +inline const SvxFontItem &SwFmt::GetCTLFont(bool bInP) const { return aSet.GetCTLFont(bInP); } -inline const SvxColorItem &SwFmt::GetColor(sal_Bool bInP) const +inline const SvxColorItem &SwFmt::GetColor(bool bInP) const { return aSet.GetColor(bInP); } - inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(sal_Bool bInP) const + inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(bool bInP) const { return aSet.GetCharSetColor(bInP); } -inline const SvxLanguageItem &SwFmt::GetLanguage(sal_Bool bInP) const +inline const SvxLanguageItem &SwFmt::GetLanguage(bool bInP) const { return aSet.GetLanguage(bInP); } -inline const SvxEscapementItem &SwFmt::GetEscapement(sal_Bool bInP) const +inline const SvxEscapementItem &SwFmt::GetEscapement(bool bInP) const { return aSet.GetEscapement(bInP); } -inline const SvxCaseMapItem &SwFmt::GetCaseMap(sal_Bool bInP) const +inline const SvxCaseMapItem &SwFmt::GetCaseMap(bool bInP) const { return aSet.GetCaseMap(bInP); } -inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(sal_Bool bInP) const +inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(bool bInP) const { return aSet.GetNoHyphenHere(bInP); } -inline const SvxBlinkItem &SwFmt::GetBlink(sal_Bool bInP) const +inline const SvxBlinkItem &SwFmt::GetBlink(bool bInP) const { return aSet.GetBlink(bInP); } -inline const SvxBrushItem &SwFmt::GetChrBackground(sal_Bool bInP) const +inline const SvxBrushItem &SwFmt::GetChrBackground(bool bInP) const { return aSet.GetChrBackground(bInP); } -inline const SvxBrushItem &SwFmt::GetChrHighlight(sal_Bool bInP) const +inline const SvxBrushItem &SwFmt::GetChrHighlight(bool bInP) const { return aSet.GetChrHighlight(bInP); } -inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( sal_Bool bInP ) const +inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( bool bInP ) const { return aSet.GetEmphasisMark(bInP); } -inline const SvxTwoLinesItem &SwFmt::Get2Lines( sal_Bool bInP ) const +inline const SvxTwoLinesItem &SwFmt::Get2Lines( bool bInP ) const { return aSet.Get2Lines(bInP); } -inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( sal_Bool bInP ) const +inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( bool bInP ) const { return aSet.GetCharScaleW(bInP); } -inline const SvxCharRotateItem &SwFmt::GetCharRotate( sal_Bool bInP ) const +inline const SvxCharRotateItem &SwFmt::GetCharRotate( bool bInP ) const { return aSet.GetCharRotate(bInP); } -inline const SvxCharReliefItem &SwFmt::GetCharRelief( sal_Bool bInP ) const +inline const SvxCharReliefItem &SwFmt::GetCharRelief( bool bInP ) const { return aSet.GetCharRelief(bInP); } -inline const SvxCharHiddenItem &SwFmt::GetCharHidden( sal_Bool bInP ) const +inline const SvxCharHiddenItem &SwFmt::GetCharHidden( bool bInP ) const { return aSet.GetCharHidden(bInP); } -inline const SvxBoxItem &SwFmt::GetCharBorder( sal_Bool bInP ) const +inline const SvxBoxItem &SwFmt::GetCharBorder( bool bInP ) const { return aSet.GetCharBorder(bInP); } -inline const SvxShadowItem &SwFmt::GetCharShadow( sal_Bool bInP ) const +inline const SvxShadowItem &SwFmt::GetCharShadow( bool bInP ) const { return aSet.GetCharShadow(bInP); } #endif diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 6faccfcd9c03..452c42cf3249 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -63,8 +63,8 @@ public: // #i53420# void ChangeExpansion( const SwFrm*, const SwCntntNode*, - sal_Bool bSrchNum = sal_False); - void ChangeExpansion(const SwTxtNode &rNd, sal_Bool bSrchNum); + bool bSrchNum = false); + void ChangeExpansion(const SwTxtNode &rNd, bool bSrchNum); inline sal_uInt8 GetLevel() const; inline void SetLevel(sal_uInt8); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index b3386e7d7bbb..bf062bfcfece 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -147,7 +147,7 @@ class SW_DLLPUBLIC SwCrsrShell friend class SwSelPaintRects; // requires the Crsr as InternalCrsr - friend sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); + friend bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); public: @@ -206,27 +206,27 @@ private: OUString m_sMarkedListId; int m_nMarkedListLevel; - sal_Bool m_bHasFocus : 1; ///< Shell is "active" in a window - sal_Bool m_bSVCrsrVis : 1; ///< SV-Cursor visible/invisible - sal_Bool m_bChgCallFlag : 1; ///< attribute change inside Start- and EndAction - sal_Bool m_bVisPortChgd : 1; ///< in VisPortChg-Call + bool m_bHasFocus : 1; ///< Shell is "active" in a window + bool m_bSVCrsrVis : 1; ///< SV-Cursor visible/invisible + bool m_bChgCallFlag : 1; ///< attribute change inside Start- and EndAction + bool m_bVisPortChgd : 1; ///< in VisPortChg-Call // (used in Invalidate by the Cursor) - sal_Bool m_bCallChgLnk : 1; ///< flag for derived classes + bool m_bCallChgLnk : 1; ///< flag for derived classes // TRUE -> call ChgLnk // access only via SwChgLinkFlag - sal_Bool m_bAllProtect : 1; ///< Flag for areas + bool m_bAllProtect : 1; ///< Flag for areas // TRUE -> everything protected / hidden - sal_Bool m_bInCMvVisportChgd : 1; ///< Flag for CrsrMoves + bool m_bInCMvVisportChgd : 1; ///< Flag for CrsrMoves // TRUE -> view was moved - sal_Bool m_bGCAttr : 1; // TRUE -> non expanded attributes exist. - sal_Bool m_bIgnoreReadonly : 1; // TRUE -> make the cursor visible on next + bool m_bGCAttr : 1; // TRUE -> non expanded attributes exist. + bool m_bIgnoreReadonly : 1; // TRUE -> make the cursor visible on next // EndAction in spite of Readonly - sal_Bool m_bSelTblCells : 1; // TRUE -> select cells over the InputWin - sal_Bool m_bAutoUpdateCells : 1; // TRUE -> autoformat cells - sal_Bool m_bBasicHideCrsr : 1; // TRUE -> HideCrsr from Basic - sal_Bool m_bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas - sal_Bool m_bOverwriteCrsr : 1; // sal_True -> show Overwrite Crsr + bool m_bSelTblCells : 1; // TRUE -> select cells over the InputWin + bool m_bAutoUpdateCells : 1; // TRUE -> autoformat cells + bool m_bBasicHideCrsr : 1; // TRUE -> HideCrsr from Basic + bool m_bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas + bool m_bOverwriteCrsr : 1; // sal_True -> show Overwrite Crsr bool m_bMacroExecAllowed : 1; @@ -234,7 +234,7 @@ private: SAL_DLLPRIVATE void UpdateCrsr( sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE, - sal_Bool bIdleEnd = sal_False ); + bool bIdleEnd = false ); SAL_DLLPRIVATE void MoveCrsrToNum(); @@ -253,19 +253,19 @@ private: const int nLevel ); // private method(s) accessed from public inline method(s) must be exported. - sal_Bool LeftRight( sal_Bool, sal_uInt16, sal_uInt16, sal_Bool ); + bool LeftRight( bool, sal_uInt16, sal_uInt16, bool ); SAL_DLLPRIVATE bool UpDown( bool, sal_uInt16 ); - SAL_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False ); - SAL_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const; + SAL_DLLPRIVATE bool LRMargin( bool, bool bAPI = false ); + SAL_DLLPRIVATE bool IsAtLRMargin( bool, bool bAPI = false ) const; SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const; SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr); -typedef sal_Bool (SwCursor:: *FNCrsr)(); - SAL_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr ); +typedef bool (SwCursor:: *FNCrsr)(); + SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr ); - SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect ); + SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, bool bSelect ); protected: @@ -333,8 +333,8 @@ public: /// If document body starts with a table. bool StartsWithTable(); - SwPaM* GetCrsr( sal_Bool bMakeTblCrsr = sal_True ) const; - inline SwCursor* GetSwCrsr( sal_Bool bMakeTblCrsr = sal_True ) const; + SwPaM* GetCrsr( bool bMakeTblCrsr = true ) const; + inline SwCursor* GetSwCrsr( bool bMakeTblCrsr = true ) const; // return only the current cursor SwShellCrsr* _GetCrsr() { return m_pCurCrsr; } const SwShellCrsr* _GetCrsr() const { return m_pCurCrsr; } @@ -352,42 +352,42 @@ public: // start parenthesing, hide SV-Cursor and selected areas void StartAction(); // end parenthesing, show SV-Cursor and selected areas - void EndAction( const sal_Bool bIdleEnd = sal_False ); + void EndAction( const bool bIdleEnd = false ); // basic cursor travelling long GetUpDownX() const { return m_nUpDownX; } - sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False ) - { return LeftRight( sal_True, nCnt, nMode, bAllowVisual ); } - sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False ) - { return LeftRight( sal_False, nCnt, nMode, bAllowVisual ); } + bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual = false ) + { return LeftRight( true, nCnt, nMode, bAllowVisual ); } + bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual = false ) + { return LeftRight( false, nCnt, nMode, bAllowVisual ); } bool Up( sal_uInt16 nCnt = 1 ) { return UpDown( true, nCnt ); } bool Down( sal_uInt16 nCnt = 1 ) { return UpDown( false, nCnt ); } - sal_Bool LeftMargin() { return LRMargin( sal_True ); } - sal_Bool RightMargin(sal_Bool bAPI = sal_False) { return LRMargin( sal_False, bAPI ); } - sal_Bool SttEndDoc( sal_Bool bStt ); + bool LeftMargin() { return LRMargin( true ); } + bool RightMargin(bool bAPI = false) { return LRMargin( false, bAPI ); } + bool SttEndDoc( bool bStt ); - sal_Bool MovePage( SwWhichPage, SwPosPage ); - sal_Bool MovePara( SwWhichPara, SwPosPara ); - sal_Bool MoveSection( SwWhichSection, SwPosSection ); - sal_Bool MoveTable( SwWhichTable, SwPosTable ); - sal_Bool MoveColumn( SwWhichColumn, SwPosColumn ); - sal_Bool MoveRegion( SwWhichRegion, SwPosRegion ); + bool MovePage( SwWhichPage, SwPosPage ); + bool MovePara( SwWhichPara, SwPosPara ); + bool MoveSection( SwWhichSection, SwPosSection ); + bool MoveTable( SwWhichTable, SwPosTable ); + bool MoveColumn( SwWhichColumn, SwPosColumn ); + bool MoveRegion( SwWhichRegion, SwPosRegion ); sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, - sal_Bool bSearchInNotes, + bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnde, - sal_Bool& bCancel, - FindRanges eRng, int bReplace = sal_False ); + bool& bCancel, + FindRanges eRng, bool bReplace = false ); sal_uLong Find( const SwTxtFmtColl& rFmtColl, SwDocPositions eStart, SwDocPositions eEnde, - sal_Bool& bCancel, + bool& bCancel, FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 ); - sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections, + sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions eStart, SwDocPositions eEnde, - sal_Bool& bCancel, + bool& bCancel, FindRanges eRng, const com::sun::star::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); @@ -396,7 +396,7 @@ public: // return values: // CRSR_POSCHG: when cursor was corrected from SPoint by the layout // CRSR_POSOLD: when the cursor was not changed - int SetCrsr( const Point &rPt, sal_Bool bOnlyText = sal_False, bool bBlock = true ); + int SetCrsr( const Point &rPt, bool bOnlyText = false, bool bBlock = true ); /* * Notification that the visible area was changed. m_aVisArea is reset, then @@ -412,7 +412,7 @@ public: // Areas inline void SetMark(); - inline sal_Bool HasMark(); + inline bool HasMark(); void ClearMark(); @@ -423,12 +423,12 @@ public: swap the PaM. FALSE: If the mark is behind the point then swap the PaM. */ - void NormalizePam(sal_Bool bPointFirst = sal_True); + void NormalizePam(bool bPointFirst = true); void SwapPam(); - sal_Bool ChgCurrPam( const Point & rPt, - sal_Bool bTstOnly = sal_True, // test only, don't set - sal_Bool bTstHit = sal_False ); // only exact matches + bool ChgCurrPam( const Point & rPt, + bool bTstOnly = true, // test only, don't set + bool bTstHit = false ); // only exact matches void KillPams(); // story a copy of the cursor in the stack @@ -440,7 +440,7 @@ public: * stack * Return: whether there was one left one the stack */ - sal_Bool Pop( sal_Bool bOldCrsr = sal_True ); + bool Pop( bool bOldCrsr = true ); /* * Combine 2 Cursors. * Delete the topmost from the stack and move its Mark into the current. @@ -449,10 +449,10 @@ public: #ifdef DBG_UTIL void SttCrsrMove(); - void EndCrsrMove( const sal_Bool bIdleEnd = sal_False ); + void EndCrsrMove( const bool bIdleEnd = false ); #else void SttCrsrMove() { ++m_nCrsrMove; StartAction(); } - void EndCrsrMove( const sal_Bool bIdleEnd = sal_False ) + void EndCrsrMove( const bool bIdleEnd = sal_False ) { EndAction( bIdleEnd ); --m_nCrsrMove; } #endif @@ -461,35 +461,35 @@ public: * On the other hand, on receiving the focus all selected ranges are displayed again * (ranges must be recalculated!). */ - sal_Bool HasShFcs() const { return m_bHasFocus; } + bool HasShFcs() const { return m_bHasFocus; } void ShLooseFcs(); - void ShGetFcs( sal_Bool bUpdate = sal_True ); + void ShGetFcs( bool bUpdate = true ); // Methods for displaying or hiding the visible text cursor. void ShowCrsr(); void HideCrsr(); // Methods for displaying or hiding the selected ranges with visible cursor. - void ShowCrsrs( sal_Bool bCrsrVis ); + void ShowCrsrs( bool bCrsrVis ); void HideCrsrs(); - sal_Bool IsOverwriteCrsr() const { return m_bOverwriteCrsr; } - void SetOverwriteCrsr( sal_Bool bFlag ) { m_bOverwriteCrsr = bFlag; } + bool IsOverwriteCrsr() const { return m_bOverwriteCrsr; } + void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; } // Return current frame in which the cursor is placed. - SwCntntFrm *GetCurrFrm( const sal_Bool bCalcFrm = sal_True ) const; + SwCntntFrm *GetCurrFrm( const bool bCalcFrm = true ) const; //TRUE if cursor is hidden because of readonly. //FALSE if it is working despite readonly. - sal_Bool IsCrsrReadonly() const; + bool IsCrsrReadonly() const; // Cursor is placed in something that is protected or selection contains // something that is protected. - sal_Bool HasReadonlySel(bool bAnnotationMode = false) const; + bool HasReadonlySel(bool bAnnotationMode = false) const; // Can the cursor be set to read only ranges? - sal_Bool IsReadOnlyAvailable() const { return m_bSetCrsrInReadOnly; } - void SetReadOnlyAvailable( sal_Bool bFlag ); - sal_Bool IsOverReadOnlyPos( const Point& rPt ) const; + bool IsReadOnlyAvailable() const { return m_bSetCrsrInReadOnly; } + void SetReadOnlyAvailable( bool bFlag ); + bool IsOverReadOnlyPos( const Point& rPt ) const; // Methods for aFlyMacroLnk. void SetFlyMacroLnk( const Link& rLnk ) { m_aFlyMacroLnk = rLnk; } @@ -508,15 +508,15 @@ public: // Check if the current cursor contains a selection, i.e. // if Mark is set and SPoint and Mark are different. - sal_Bool HasSelection() const; + bool HasSelection() const; // Check if a selection exists, i.e. if the current cursor comprises a selection. - inline sal_Bool IsSelection() const; + inline bool IsSelection() const; // returns if multiple cursors are available - inline sal_Bool IsMultiSelection() const; + inline bool IsMultiSelection() const; // Check if a complete paragraph was selected. - sal_Bool IsSelFullPara() const; + bool IsSelFullPara() const; // Check if selection is within one paragraph. @@ -524,7 +524,7 @@ public: bool ShouldWait() const; // Check if selection is within one paragraph. - inline sal_Bool IsSelOnePara() const; + inline bool IsSelOnePara() const; /* * Returns SRectangle, at which the cursor is located. @@ -533,29 +533,29 @@ public: /* * Returns if cursor is wholly or partly within visible range. */ - sal_Bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } + bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } /* * Returns SwRect, at which the character is located. */ - sal_Bool GetCharRectAt(SwRect& rRect, const SwPosition* pPos); + bool GetCharRectAt(SwRect& rRect, const SwPosition* pPos); // Return current page number: // TRUE: in which cursor is located. // FALSE: which is visible at the upper margin. void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, - sal_Bool bAtCrsrPos = sal_True, const sal_Bool bCalcFrm = sal_True ); + bool bAtCrsrPos = true, const bool bCalcFrm = true ); // Determine how "empty pages" are handled // (used in PhyPage). - sal_uInt16 GetNextPrevPageNum( sal_Bool bNext = sal_True ); + sal_uInt16 GetNextPrevPageNum( bool bNext = true ); // Move cursor at the bginning of page "nPage". - sal_Bool GotoPage( sal_uInt16 nPage ); + bool GotoPage( sal_uInt16 nPage ); sal_uInt16 GetPageCnt(); - sal_Bool GoNextCrsr(); + bool GoNextCrsr(); - sal_Bool GoPrevCrsr(); + bool GoPrevCrsr(); // at CurCrsr.SPoint ::sw::mark::IMark* SetBookmark( @@ -586,9 +586,9 @@ public: OUString GetText() const; // Check of SPoint or Mark of current cursor are placed within a table. - inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const; + inline const SwTableNode* IsCrsrInTbl( bool bIsPtInTbl = true ) const; - inline Point& GetCrsrDocPos( sal_Bool bPoint = sal_True ) const; + inline Point& GetCrsrDocPos( bool bPoint = true ) const; inline bool IsCrsrPtAtEnd() const; inline const SwPaM* GetTblCrs() const; @@ -599,17 +599,17 @@ public: OUString GetBoxNms() const; // set Crsr to the next/previous cell - sal_Bool GoNextCell( sal_Bool bAppendLine = sal_True ); - sal_Bool GoPrevCell(); + bool GoNextCell( bool bAppendLine = true ); + bool GoPrevCell(); // go to this box (if available and inside of table) bool GotoTable( const OUString& rName ); // select a table row, column or box (based on the current cursor) - sal_Bool SelTblRow() { return _SelTblRowOrCol( true ); } - sal_Bool SelTblCol() { return _SelTblRowOrCol( false ); } - sal_Bool SelTblBox(); + bool SelTblRow() { return _SelTblRowOrCol( true ); } + bool SelTblCol() { return _SelTblRowOrCol( false ); } + bool SelTblBox(); - sal_Bool SelTbl(); + bool SelTbl(); bool GotoNextNum(); bool GotoPrevNum(); @@ -621,11 +621,11 @@ public: sal_uInt16 GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX ); // select the given range of OutlineNodes. Optionally including the children // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell) - sal_Bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos, - sal_Bool bWithChildren = sal_False ); + bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos, + bool bWithChildren = false ); - sal_Bool GotoNextOutline(); - sal_Bool GotoPrevOutline(); + bool GotoNextOutline(); + bool GotoPrevOutline(); /** Delivers the current shell cursor @@ -650,64 +650,64 @@ public: IBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; } // is the Crsr in a table and is the selection over 2 columns - sal_Bool IsTableMode() const { return 0 != m_pTblCrsr; } + bool IsTableMode() const { return 0 != m_pTblCrsr; } const SwShellTableCrsr* GetTableCrsr() const { return m_pTblCrsr; } SwShellTableCrsr* GetTableCrsr() { return m_pTblCrsr; } size_t UpdateTblSelBoxes(); - sal_Bool GotoFtnTxt(); ///< jump from content to footnote - sal_Bool GotoFtnAnchor(); ///< jump from footnote to anchor - sal_Bool GotoPrevFtnAnchor(); - sal_Bool GotoNextFtnAnchor(); + bool GotoFtnTxt(); ///< jump from content to footnote + bool GotoFtnAnchor(); ///< jump from footnote to anchor + bool GotoPrevFtnAnchor(); + bool GotoNextFtnAnchor(); - sal_Bool GotoFlyAnchor(); ///< jump from the frame to the anchor - sal_Bool GotoHeaderTxt(); ///< jump from the content to the header - sal_Bool GotoFooterTxt(); ///< jump from the content to the footer + bool GotoFlyAnchor(); ///< jump from the frame to the anchor + bool GotoHeaderTxt(); ///< jump from the content to the header + bool GotoFooterTxt(); ///< jump from the content to the footer // jump to the header/footer of the given or current PageDesc - sal_Bool SetCrsrInHdFt( sal_uInt16 nDescNo = USHRT_MAX, - sal_Bool bInHeader = sal_True ); + bool SetCrsrInHdFt( sal_uInt16 nDescNo = USHRT_MAX, + bool bInHeader = true ); // is point of cursor in header/footer. pbInHeader return sal_True if it is // in a headerframe otherwise in a footerframe - bool IsInHeaderFooter( sal_Bool* pbInHeader = 0 ) const; + bool IsInHeaderFooter( bool* pbInHeader = 0 ) const; - sal_Bool GotoNextTOXBase( const OUString* = 0 ); - sal_Bool GotoPrevTOXBase( const OUString* = 0 ); - sal_Bool GotoTOXMarkBase(); + bool GotoNextTOXBase( const OUString* = 0 ); + bool GotoPrevTOXBase( const OUString* = 0 ); + bool GotoTOXMarkBase(); // jump to the next or previous index entry - sal_Bool GotoNxtPrvTOXMark( sal_Bool bNext = sal_True ); + bool GotoNxtPrvTOXMark( bool bNext = true ); // jump to the next/previous index mark of this type const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir ); // jump to the next or previous table formula // optionally only to broken formulas - sal_Bool GotoNxtPrvTblFormula( sal_Bool bNext = sal_True, - sal_Bool bOnlyErrors = sal_False ); + bool GotoNxtPrvTblFormula( bool bNext = true, + bool bOnlyErrors = false ); // jump to the next / previous hyperlink - inside text and also // on graphics bool SelectNxtPrvHyperlink( bool bNext = true ); - sal_Bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0, + bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0, sal_uInt16 nSeqNo = 0 ); // get the nth character from the start or end of the current selection - sal_Unicode GetChar( sal_Bool bEnd = sal_True, long nOffset = 0 ); - sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, sal_Int32 nCount = 1 ); + sal_Unicode GetChar( bool bEnd = true, long nOffset = 0 ); + bool ExtendSelection( bool bEnd = true, sal_Int32 nCount = 1 ); // Place only the visible cursor at the given position in the document. // Return FALSE if SPoint was corrected by layout. // (This is needed for displaying the Drag&Drop/Copy-Cursor.) - sal_Bool SetVisCrsr( const Point &rPt ); + bool SetVisCrsr( const Point &rPt ); inline void UnSetVisCrsr(); // jump to the next or previous field of the corresponding type - sal_Bool MoveFldType( + bool MoveFldType( const SwFieldType* pFldType, const bool bNext, const sal_uInt16 nResType = USHRT_MAX, const bool bAddSetExpressionFldsToInputFlds = true ); - sal_Bool GotoFld( const SwFmtFld& rFld ); + bool GotoFld( const SwFmtFld& rFld ); SwTxtFld* GetTxtFldAtPos( const SwPosition* pPos, @@ -724,49 +724,49 @@ public: // Return number of cursors in ring (The flag indicates whether // only cursors containing selections are requested). - sal_uInt16 GetCrsrCnt( sal_Bool bAll = sal_True ) const; + sal_uInt16 GetCrsrCnt( bool bAll = true ) const; // Char Travelling - methods (in crstrvl1.cxx) - sal_Bool GoStartWord(); - sal_Bool GoEndWord(); - sal_Bool GoNextWord(); - sal_Bool GoPrevWord(); - sal_Bool GoNextSentence(); - sal_Bool GoStartSentence(); - sal_Bool GoEndSentence(); - sal_Bool SelectWord( const Point* pPt = 0 ); - sal_Bool ExpandToSentenceBorders(); + bool GoStartWord(); + bool GoEndWord(); + bool GoNextWord(); + bool GoPrevWord(); + bool GoNextSentence(); + bool GoStartSentence(); + bool GoEndSentence(); + bool SelectWord( const Point* pPt = 0 ); + bool ExpandToSentenceBorders(); // get position from current cursor - sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const; - sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - sal_Bool IsStartSentence() const; - sal_Bool IsEndSentence() const; + bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const; + bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsStartSentence() const; + bool IsEndSentence() const; bool IsSttPara() const; bool IsEndPara() const; bool IsEndOfTable() const; ///< at the very last SwPosition inside a table - sal_Bool IsStartOfDoc() const; - sal_Bool IsEndOfDoc() const; + bool IsStartOfDoc() const; + bool IsEndOfDoc() const; bool IsInFrontOfLabel() const; - sal_Bool IsAtLeftMargin() const { return IsAtLRMargin( sal_True ); } - sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const { return IsAtLRMargin( sal_False, bAPI ); } + bool IsAtLeftMargin() const { return IsAtLRMargin( true ); } + bool IsAtRightMargin(bool bAPI = false) const { return IsAtLRMargin( false, bAPI ); } // delete all created cursors, set the table cursor and the last cursor to // its TextNode (or StartNode?) // They all get created on the next ::GetCrsr again // Used for Drag&Drop/Clipboard-Paste in tables - sal_Bool ParkTblCrsr(); + bool ParkTblCrsr(); // Non expanded attributes? - sal_Bool IsGCAttr() const { return m_bGCAttr; } - void ClearGCAttr() { m_bGCAttr = sal_False; } - void UpdateAttr() { m_bGCAttr = sal_True; } + bool IsGCAttr() const { return m_bGCAttr; } + void ClearGCAttr() { m_bGCAttr = false; } + void UpdateAttr() { m_bGCAttr = true; } // is the whole document protected/hidden (for UI...) - sal_Bool IsAllProtect() const { return m_bAllProtect; } + bool IsAllProtect() const { return m_bAllProtect; } - sal_Bool BasicActionPend() const { return m_nBasicActionCnt != mnStartAction; } + bool BasicActionPend() const { return m_nBasicActionCnt != mnStartAction; } bool GotoRegion( const OUString& rName ); @@ -774,12 +774,12 @@ public: virtual void MakeSelVisible(); // set the cursor to a NOT protected/hidden node - sal_Bool FindValidCntntNode( sal_Bool bOnlyText = sal_False ); + bool FindValidCntntNode( bool bOnlyText = false ); - sal_Bool GetContentAtPos( const Point& rPt, - SwContentAtPos& rCntntAtPos, - sal_Bool bSetCrsr = sal_False, - SwRect* pFldRect = 0 ); + bool GetContentAtPos( const Point& rPt, + SwContentAtPos& rCntntAtPos, + bool bSetCrsr = false, + SwRect* pFldRect = 0 ); const SwPostItField* GetPostItFieldAtCursor() const; @@ -795,38 +795,38 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ) const; - sal_Bool IsPageAtPos( const Point &rPt ) const; + bool IsPageAtPos( const Point &rPt ) const; - sal_Bool SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const SwTxtAttr* pAttr = 0 ); + bool SelectTxtAttr( sal_uInt16 nWhich, bool bExpand, const SwTxtAttr* pAttr = 0 ); bool GotoINetAttr( const SwTxtINetFmt& rAttr ); const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const; - sal_Bool SelectTxt( const sal_Int32 nStart, + bool SelectTxt( const sal_Int32 nStart, const sal_Int32 nEnd ); - sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 ); + bool CheckTblBoxCntnt( const SwPosition* pPos = 0 ); void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); void ClearTblBoxCntnt(); - sal_Bool EndAllTblBoxEdit(); + bool EndAllTblBoxEdit(); - void SetSelTblCells( sal_Bool bFlag ) { m_bSelTblCells = bFlag; } - sal_Bool IsSelTblCells() const { return m_bSelTblCells; } + void SetSelTblCells( bool bFlag ) { m_bSelTblCells = bFlag; } + bool IsSelTblCells() const { return m_bSelTblCells; } - sal_Bool IsAutoUpdateCells() const { return m_bAutoUpdateCells; } - void SetAutoUpdateCells( sal_Bool bFlag ) { m_bAutoUpdateCells = bFlag; } + bool IsAutoUpdateCells() const { return m_bAutoUpdateCells; } + void SetAutoUpdateCells( bool bFlag ) { m_bAutoUpdateCells = bFlag; } - sal_Bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode, + bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode, SwRect& rRect, short& rOrient ); - sal_Bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ); + bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ); const SwRangeRedline* SelNextRedline(); const SwRangeRedline* SelPrevRedline(); - const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False ); + const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false ); // is cursor or the point in/over a vertical formatted text? bool IsInVerticalText( const Point* pPt = 0 ) const; // is cursor or the point in/over a right to left formatted text? - sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const; + bool IsInRightToLeftText( const Point* pPt = 0 ) const; void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); bool bColumnChange(); @@ -867,7 +867,7 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange( return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam ); } -inline SwCursor* SwCrsrShell::GetSwCrsr( sal_Bool bMakeTblCrsr ) const +inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const { return (SwCursor*)GetCrsr( bMakeTblCrsr ); } @@ -876,25 +876,25 @@ inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; } inline void SwCrsrShell::SetMark() { m_pCurCrsr->SetMark(); } -inline sal_Bool SwCrsrShell::HasMark() { return( m_pCurCrsr->HasMark() ); } +inline bool SwCrsrShell::HasMark() { return( m_pCurCrsr->HasMark() ); } -inline sal_Bool SwCrsrShell::IsSelection() const +inline bool SwCrsrShell::IsSelection() const { return IsTableMode() || m_pCurCrsr->HasMark() || m_pCurCrsr->GetNext() != m_pCurCrsr; } -inline sal_Bool SwCrsrShell::IsMultiSelection() const +inline bool SwCrsrShell::IsMultiSelection() const { return m_pCurCrsr->GetNext() != m_pCurCrsr; } -inline sal_Bool SwCrsrShell::IsSelOnePara() const +inline bool SwCrsrShell::IsSelOnePara() const { return m_pCurCrsr == m_pCurCrsr->GetNext() && m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode; } -inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( sal_Bool bIsPtInTbl ) const +inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( bool bIsPtInTbl ) const { return m_pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode(); } @@ -904,7 +904,7 @@ inline bool SwCrsrShell::IsCrsrPtAtEnd() const return m_pCurCrsr->End() == m_pCurCrsr->GetPoint(); } -inline Point& SwCrsrShell::GetCrsrDocPos( sal_Bool bPoint ) const +inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const { return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos(); } diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index 3533c7b8ec4b..53e3db095bae 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -130,30 +130,30 @@ struct SwCrsrMoveState Point aRealHeight; ///< contains then the position/height of the cursor CrsrMoveState eState; sal_uInt8 nCursorBidiLevel; - sal_Bool bStop; - sal_Bool bRealHeight; ///< should the real height be calculated? - sal_Bool bFieldInfo; ///< should be fields recognized? - sal_Bool bPosCorr; ///< Point had to be corrected - sal_Bool bFtnNoInfo; ///< recognized footnote numbering - sal_Bool bExactOnly; /**< let GetCrsrOfst look for exact matches only, + bool bStop; + bool bRealHeight; ///< should the real height be calculated? + bool bFieldInfo; ///< should be fields recognized? + bool bPosCorr; ///< Point had to be corrected + bool bFtnNoInfo; ///< recognized footnote numbering + bool bExactOnly; /**< let GetCrsrOfst look for exact matches only, i.e. never let it run into GetCntntPos */ - sal_Bool bFillRet; ///< only used temporary in FillMode - sal_Bool bSetInReadOnly; ///< ReadOnly areas may be entered - sal_Bool bRealWidth; ///< Calculation of the width required - sal_Bool b2Lines; ///< Check 2line portions and fill p2Lines - sal_Bool bNoScroll; ///< No scrolling of undersized textframes + bool bFillRet; ///< only used temporary in FillMode + bool bSetInReadOnly; ///< ReadOnly areas may be entered + bool bRealWidth; ///< Calculation of the width required + bool b2Lines; ///< Check 2line portions and fill p2Lines + bool bNoScroll; ///< No scrolling of undersized textframes bool bPosMatchesBounds; /**< GetCrsrOfst should not return the next position if screen position is inside second have of bound rect */ - sal_Bool bCntntCheck; // #i43742# Cursor position over content? + bool bCntntCheck; // #i43742# Cursor position over content? // #i27615# /** cursor in front of label */ - sal_Bool bInFrontOfLabel; - sal_Bool bInNumPortion; ///< point is in number portion #i23726# + bool bInFrontOfLabel; + bool bInNumPortion; ///< point is in number portion #i23726# int nInNumPostionOffset; ///< distance from number portion's start SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) : @@ -162,21 +162,21 @@ struct SwCrsrMoveState pSpecialPos( NULL ), eState( eSt ), nCursorBidiLevel( 0 ), - bStop( sal_False ), - bRealHeight( sal_False ), - bFieldInfo( sal_False ), - bPosCorr( sal_False ), - bFtnNoInfo( sal_False ), - bExactOnly( sal_False ), - bFillRet( sal_False ), - bSetInReadOnly( sal_False ), - bRealWidth( sal_False ), - b2Lines( sal_False ), - bNoScroll( sal_False ), + bStop( false ), + bRealHeight( false ), + bFieldInfo( false ), + bPosCorr( false ), + bFtnNoInfo( false ), + bExactOnly( false ), + bFillRet( false ), + bSetInReadOnly( false ), + bRealWidth( false ), + b2Lines( false ), + bNoScroll( false ), bPosMatchesBounds( false ), - bCntntCheck( sal_False ), // #i43742# - bInFrontOfLabel( sal_False ), // #i27615# - bInNumPortion(sal_False), // #i26726# + bCntntCheck( false ), // #i43742# + bInFrontOfLabel( false ), // #i27615# + bInNumPortion(false), // #i26726# nInNumPostionOffset(0) // #i26726# {} SwCrsrMoveState( SwFillCrsrPos *pInitFill ) : @@ -185,21 +185,21 @@ struct SwCrsrMoveState pSpecialPos( NULL ), eState( MV_SETONLYTEXT ), nCursorBidiLevel( 0 ), - bStop( sal_False ), - bRealHeight( sal_False ), - bFieldInfo( sal_False ), - bPosCorr( sal_False ), - bFtnNoInfo( sal_False ), - bExactOnly( sal_False ), - bFillRet( sal_False ), - bSetInReadOnly( sal_False ), - bRealWidth( sal_False ), - b2Lines( sal_False ), - bNoScroll( sal_False ), + bStop( false ), + bRealHeight( false ), + bFieldInfo( false ), + bPosCorr( false ), + bFtnNoInfo( false ), + bExactOnly( false ), + bFillRet( false ), + bSetInReadOnly( false ), + bRealWidth( false ), + b2Lines( false ), + bNoScroll( false ), bPosMatchesBounds( false ), - bCntntCheck( sal_False ), // #i43742# - bInFrontOfLabel( sal_False ), // #i27615# - bInNumPortion(sal_False), // #i23726# + bCntntCheck( false ), // #i43742# + bInFrontOfLabel( false ), // #i27615# + bInNumPortion(false), // #i23726# nInNumPostionOffset(0) // #i23726# {} }; diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx index b28484c58633..0509b9116ee2 100644 --- a/sw/inc/cshtyp.hxx +++ b/sw/inc/cshtyp.hxx @@ -39,19 +39,19 @@ extern SwPosPage fnPageStart, fnPageEnd; // Direction-parameter for MovePara (initialized in SwCntntFrm). typedef SwMoveFnCollection* SwPosPara; -typedef sal_Bool (*SwWhichPara)( SwPaM&, SwPosPara ); +typedef bool (*SwWhichPara)( SwPaM&, SwPosPara ); extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext; extern SwPosPara fnParaStart, fnParaEnd; // Direction-parameter for MoveSection. typedef SwMoveFnCollection* SwPosSection; -typedef sal_Bool (*SwWhichSection)( SwPaM&, SwPosSection ); +typedef bool (*SwWhichSection)( SwPaM&, SwPosSection ); extern SwWhichSection fnSectionPrev, fnSectionCurr, fnSectionNext; extern SwPosSection fnSectionStart, fnSectionEnd; // Direction-parameter for MoveTable typedef SwMoveFnCollection* SwPosTable; -typedef sal_Bool (*SwWhichTable)( SwPaM&, SwPosTable, sal_Bool bInReadOnly ); +typedef bool (*SwWhichTable)( SwPaM&, SwPosTable, bool bInReadOnly ); extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext; extern SwPosTable fnTableStart, fnTableEnd; @@ -63,7 +63,7 @@ extern SwPosColumn fnColumnStart, fnColumnEnd; // Direction-parameter for MoveRegion (ranges!) typedef SwMoveFnCollection* SwPosRegion; -typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly ); +typedef bool (*SwWhichRegion)( SwPaM&, SwPosRegion, bool bInReadOnly ); extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip; extern SwPosRegion fnRegionStart, fnRegionEnd; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 82ffe44ea32d..aed9f6f863c5 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -99,16 +99,16 @@ struct SwDSParam : public SwDBData ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSelection; - sal_Bool bScrollable; - sal_Bool bEndOfDB; - sal_Bool bAfterSelection; + bool bScrollable; + bool bEndOfDB; + bool bAfterSelection; long nSelectionIndex; SwDSParam(const SwDBData& rData) : SwDBData(rData), - bScrollable(sal_False), - bEndOfDB(sal_False), - bAfterSelection(sal_False), + bScrollable(false), + bEndOfDB(false), + bAfterSelection(false), nSelectionIndex(0) {} @@ -118,16 +118,16 @@ struct SwDSParam : public SwDBData SwDBData(rData), xResultSet(xResSet), aSelection(rSelection), - bScrollable(sal_True), - bEndOfDB(sal_False), - bAfterSelection(sal_False), + bScrollable(true), + bEndOfDB(false), + bAfterSelection(false), nSelectionIndex(0) {} void CheckEndOfDB() { if(bEndOfDB) - bAfterSelection = sal_True; + bAfterSelection = true; } }; typedef boost::ptr_vector<SwDSParam> SwDSParamArr; @@ -150,11 +150,11 @@ struct SwMergeDescriptor ::css::uno::Reference< ::css::mail::XSmtpService > xSmtpServer; - sal_Bool bSendAsHTML; - sal_Bool bSendAsAttachment; + bool bSendAsHTML; + bool bSendAsAttachment; - sal_Bool bPrintAsync; - sal_Bool bCreateSingleFile; + bool bPrintAsync; + bool bCreateSingleFile; SwMailMergeConfigItem* pMailMergeConfigItem; @@ -164,10 +164,10 @@ struct SwMergeDescriptor nMergeType(nType), rSh(rShell), rDescriptor(rDesc), - bSendAsHTML( sal_True ), - bSendAsAttachment( sal_False ), - bPrintAsync( sal_False ), - bCreateSingleFile( sal_False ), + bSendAsHTML( true ), + bSendAsAttachment( false ), + bPrintAsync( false ), + bCreateSingleFile( false ), pMailMergeConfigItem(0) {} @@ -186,19 +186,19 @@ friend class SwConnectionDisposedListener_Impl; OUString sEMailAddrFld; ///< Mailing: Column name of email address. OUString sSubject; ///< Mailing: Subject OUString sAttached; ///< Mailing: Attached Files. - sal_Bool bCancel; ///< Mail merge canceled. - sal_Bool bInitDBFields : 1; - sal_Bool bSingleJobs : 1; ///< Printing job when called from Basic. - sal_Bool bInMerge : 1; ///< merge process active - sal_Bool bMergeSilent : 1; ///< suppress display of dialogs/boxes (used when called over API) - sal_Bool bMergeLock : 1; /**< prevent update of database fields while document is + bool bCancel; ///< Mail merge canceled. + bool bInitDBFields : 1; + bool bSingleJobs : 1; ///< Printing job when called from Basic. + bool bInMerge : 1; ///< merge process active + bool bMergeSilent : 1; ///< suppress display of dialogs/boxes (used when called over API) + bool bMergeLock : 1; /**< prevent update of database fields while document is actually printed at the SwViewShell */ SwDSParamArr aDataSourceParams; SwDBMgr_Impl* pImpl; const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send - SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate); - SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate); + SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, bool bCreate); + SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, bool bCreate); SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * ); @@ -209,9 +209,9 @@ friend class SwConnectionDisposedListener_Impl; SAL_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh); /// merge to file _and_ merge to e-Mail - SAL_DLLPRIVATE sal_Bool MergeMailFiles(SwWrtShell* pSh, + SAL_DLLPRIVATE bool MergeMailFiles(SwWrtShell* pSh, const SwMergeDescriptor& rMergeDescriptor ); - SAL_DLLPRIVATE sal_Bool ToNextRecord(SwDSParam* pParam); + SAL_DLLPRIVATE bool ToNextRecord(SwDSParam* pParam); public: SwDBMgr(); @@ -221,21 +221,21 @@ public: const SwXMailMerge * GetMailMergeEvtSrc() const { return pMergeEvtSrc; } void SetMailMergeEvtSrc( const SwXMailMerge *pSrc ) { pMergeEvtSrc = pSrc; } - inline sal_Bool IsMergeSilent() const { return bMergeSilent != 0; } - inline void SetMergeSilent( sal_Bool bVal ) { bMergeSilent = bVal; } + inline bool IsMergeSilent() const { return bMergeSilent; } + inline void SetMergeSilent( bool bVal ) { bMergeSilent = bVal; } /// Merging of data records into fields. - sal_Bool MergeNew( const SwMergeDescriptor& rMergeDesc ); - sal_Bool Merge(SwWrtShell* pSh); - void MergeCancel(); + bool MergeNew( const SwMergeDescriptor& rMergeDesc ); + bool Merge(SwWrtShell* pSh); + void MergeCancel(); /// Initialize data fields that lack name of database. - inline sal_Bool IsInitDBFields() const { return bInitDBFields; } - inline void SetInitDBFields(sal_Bool b) { bInitDBFields = b; } + inline bool IsInitDBFields() const { return bInitDBFields; } + inline void SetInitDBFields(bool b) { bInitDBFields = b; } /// Print / Save mail merge one by one or all together. - sal_Bool IsSingleJobs() const { return bSingleJobs; } - void SetSingleJobs(sal_Bool b) { bSingleJobs = b; } + bool IsSingleJobs() const { return bSingleJobs; } + void SetSingleJobs(bool b) { bSingleJobs = b; } /// Mailing: Set email data. inline void SetEMailColumn(const OUString& sColName) { sEMailAddrFld = sColName; } @@ -243,14 +243,14 @@ public: inline void SetAttachment(const OUString& sAtt) { sAttached = sAtt; } /// Fill listbox with all table names of a database. - sal_Bool GetTableNames(ListBox* pListBox, const OUString& rDBName ); + bool GetTableNames(ListBox* pListBox, const OUString& rDBName ); /// Fill listbox with all column names of a database table. - sal_Bool GetColumnNames(ListBox* pListBox, - const OUString& rDBName, const OUString& rTableName, sal_Bool bAppend = sal_False); - sal_Bool GetColumnNames(ListBox* pListBox, + void GetColumnNames(ListBox* pListBox, + const OUString& rDBName, const OUString& rTableName, bool bAppend = false); + void GetColumnNames(ListBox* pListBox, ::css::uno::Reference< ::css::sdbc::XConnection> xConnection, - const OUString& rTableName, sal_Bool bAppend = sal_False); + const OUString& rTableName, bool bAppend = false); sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, @@ -267,25 +267,25 @@ public: const OUString& rTableName, const OUString& rColNm ); - inline sal_Bool IsInMerge() const { return bInMerge; } + inline bool IsInMerge() const { return bInMerge; } void EndMerge(); void ExecuteFormLetter(SwWrtShell& rSh, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, - sal_Bool bWithDataSourceBrowser = sal_False); + bool bWithDataSourceBrowser = false); void InsertText(SwWrtShell& rSh, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties); /// check if a data source is open - sal_Bool IsDataSourceOpen(const OUString& rDataSource, - const OUString& rTableOrQuery, sal_Bool bMergeOnly); + bool IsDataSourceOpen(const OUString& rDataSource, + const OUString& rTableOrQuery, bool bMergeOnly); /// open the source while fields are updated - for the calculator only! - sal_Bool OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery, + bool OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1, bool bCreate = false); sal_uInt32 GetSelectedRecordId(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1); - sal_Bool GetColumnCnt(const OUString& rSourceName, const OUString& rTableName, + bool GetColumnCnt(const OUString& rSourceName, const OUString& rTableName, const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, OUString& rResult, double* pNumber); /** create and store or find an already stored connection to a data source for use @@ -294,20 +294,20 @@ public: RegisterConnection(OUString& rSource); const SwDSParam* CreateDSData(const SwDBData& rData) - {return FindDSData(rData, sal_True);} + {return FindDSData(rData, true);} const SwDSParamArr& GetDSParamArray() const {return aDataSourceParams;} /// close all data sources - after fields were updated - void CloseAll(sal_Bool bIncludingMerge = sal_True); + void CloseAll(bool bIncludingMerge = true); - sal_Bool GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage, + bool GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage, OUString &rResult, double *pNumber, sal_uInt32 *pFormat); - sal_Bool ToNextMergeRecord(); - sal_Bool ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1); + bool ToNextMergeRecord(); + bool ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1); - sal_Bool ExistsNextRecord()const; + bool ExistsNextRecord()const; sal_uInt32 GetSelectedRecordId(); - sal_Bool ToRecordId(sal_Int32 nSet); + bool ToRecordId(sal_Int32 nSet); const SwDBData& GetAddressDBName(); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 30ffeb1a168c..468eb1c3029c 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -52,7 +52,7 @@ class SdrTextObj; SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj ); inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj ) { return ::FindFrmFmt( (SdrObject*)pObj ); } -sal_Bool HasWrap( const SdrObject* pObj ); +bool HasWrap( const SdrObject* pObj ); void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor ); @@ -67,7 +67,7 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ); SwContact* GetUserCall( const SdrObject* ); /// @return TRUE if the SrdObject is a Marquee object. -sal_Bool IsMarqueeTextObj( const SdrObject& rObj ); +bool IsMarqueeTextObj( const SdrObject& rObj ); /// Base class for the following contact objects (frame + draw objects). class SwContact : public SdrObjUserCall, public SwClient diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 76b8f9647197..b4f5b3d9b7a6 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -38,8 +38,8 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType SwDoc* pDoc; sal_uInt16 nRefCnt; - sal_Bool bCRLFFlag : 1; - sal_Bool bDeleted : 1; + bool bCRLFFlag : 1; + bool bDeleted : 1; SAL_DLLPRIVATE void _RefCntChgd(); @@ -50,7 +50,7 @@ public: OUString GetExpansion() const { return aExpansion; } void SetExpansion( const OUString& rStr ) { aExpansion = rStr; - bCRLFFlag = sal_False; } + bCRLFFlag = false; } virtual SwFieldType* Copy() const SAL_OVERRIDE; virtual OUString GetName() const SAL_OVERRIDE; @@ -64,8 +64,8 @@ public: sal_uInt16 GetType() const { return refLink->GetUpdateMode(); } void SetType( sal_uInt16 nType ) { refLink->SetUpdateMode( nType ); } - sal_Bool IsDeleted() const { return bDeleted; } - void SetDeleted( sal_Bool b ) { bDeleted = b; } + bool IsDeleted() const { return bDeleted; } + void SetDeleted( bool b ) { bDeleted = b; } void UpdateNow() { refLink->Update(); } void Disconnect() { refLink->Disconnect(); } @@ -80,7 +80,7 @@ public: void IncRefCnt() { if( !nRefCnt++ && pDoc ) _RefCntChgd(); } void DecRefCnt() { if( !--nRefCnt && pDoc ) _RefCntChgd(); } - void SetCRLFDelFlag( sal_Bool bFlag = sal_True ) { bCRLFFlag = bFlag; } + void SetCRLFDelFlag( bool bFlag = true ) { bCRLFFlag = bFlag; } }; /*-------------------------------------------------------------------- diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 22a37393c68a..6be9875414a9 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -597,7 +597,7 @@ private: void _CreateNumberFormatter(); - sal_Bool _UnProtectTblCells( SwTable& rTbl ); + bool _UnProtectTblCells( SwTable& rTbl ); /** Create sub-documents according to the given collection. If no collection is given, take chapter style of the 1st level. */ @@ -607,7 +607,7 @@ private: // Update charts of given table. void _UpdateCharts( const SwTable& rTbl, SwViewShell& rVSh ) const; - sal_Bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, + bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, sal_uInt16 nMode ); // Our own 'IdleTimer' calls the following method @@ -621,7 +621,7 @@ private: SwFmt *_MakeTxtFmtColl(const OUString &, SwFmt *, bool, bool ); private: - sal_Bool mbReadOnly; + bool mbReadOnly; OUString msDocAccTitle; void InitTOXTypes(); @@ -948,8 +948,8 @@ public: ::sw::tExternalDataPointer pPayload) SAL_OVERRIDE; virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) SAL_OVERRIDE; - virtual void setDocReadOnly( sal_Bool b) { mbReadOnly = b; } - virtual sal_Bool getDocReadOnly() const { return mbReadOnly; } + virtual void setDocReadOnly( bool b) { mbReadOnly = b; } + virtual bool getDocReadOnly() const { return mbReadOnly; } virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } virtual const OUString getDocAccTitle() const { return msDocAccTitle; } @@ -960,7 +960,7 @@ public: // OLE ??? bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } inline void SetOLEPrtNotifyPending( bool bSet = true ); - void PrtOLENotify( sal_Bool bAll ); //All or only marked + void PrtOLENotify( bool bAll ); //All or only marked #ifdef DBG_UTIL bool InXMLExport() const { return mbXMLExport; } @@ -1021,9 +1021,9 @@ public: const sal_Int32 nEndContentIndex, const SwNodeIndex& rInsPos, const SwPaM* pCopiedPaM = NULL, - sal_Bool bMakeNewFrms = sal_True, - sal_Bool bDelRedlines = sal_True, - sal_Bool bCopyFlyAtFly = sal_False ) const; + bool bMakeNewFrms = true, + bool bDelRedlines = true, + bool bCopyFlyAtFly = false ) const; //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex // and evtl. corrects that items to ensure unique names for that type. This call may @@ -1090,7 +1090,7 @@ public: SwDBMgr* GetDBMgr() const { return mpDBMgr; } void ChangeDBFields( const std::vector<OUString>& rOldNames, const OUString& rNewName ); - void SetInitDBFields(sal_Bool b); + void SetInitDBFields(bool b); // Find out which databases are used by fields. void GetAllUsedDB( std::vector<OUString>& rDBNameList, @@ -1228,7 +1228,7 @@ public: SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const; SwTableFmt* MakeTblFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom); void DelTblFrmFmt( SwTableFmt* pFmt ); - SwTableFmt* FindTblFmtByName( const OUString& rName, sal_Bool bAll = sal_False ) const; + SwTableFmt* FindTblFmtByName( const OUString& rName, bool bAll = false ) const; /** Access to frames. Iterate over Flys - forr Basic-Collections. */ @@ -1331,7 +1331,7 @@ public: sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ) const; void DeleteTOXMark( const SwTOXMark* pTOXMark ); const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark, - SwTOXSearch eDir, sal_Bool bInReadOnly ); + SwTOXSearch eDir, bool bInReadOnly ); // Insert/Renew table/indes const SwTOXBaseSection* InsertTableOf( const SwPosition& rPos, @@ -1349,7 +1349,7 @@ public: const OUString& sChkStr ) const; bool SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName); - void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect); + void SetTOXBaseProtection(const SwTOXBase& rTOXBase, bool bProtect); // After reading file update all tables/indices void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; } @@ -1375,7 +1375,7 @@ public: // Manage types of tables/indices sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const; const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const; - sal_Bool DeleteTOXType( TOXTypes eTyp, sal_uInt16 nId ); + bool DeleteTOXType( TOXTypes eTyp, sal_uInt16 nId ); const SwTOXType* InsertTOXType( const SwTOXType& rTyp ); const SwTOXTypes& GetTOXTypes() const { return *mpTOXTypes; } @@ -1398,27 +1398,27 @@ public: const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset = 0, - sal_Bool bMoveCrsr = sal_False ); + bool bMoveCrsr = false ); // Set everything in the range of [rStartNode, rEndNode] to rNewPos. void CorrAbs( const SwNodeIndex& rStartNode, const SwNodeIndex& rEndNode, const SwPosition& rNewPos, - sal_Bool bMoveCrsr = sal_False ); + bool bMoveCrsr = false ); // Set everything in this range from rRange to rNewPos. void CorrAbs( const SwPaM& rRange, const SwPosition& rNewPos, - sal_Bool bMoveCrsr = sal_False ); + bool bMoveCrsr = false ); // Set everything in rOldNode to relative Pos. void CorrRel( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset = 0, - sal_Bool bMoveCrsr = sal_False ); + bool bMoveCrsr = false ); // Query / set rules for Outline. inline SwNumRule* GetOutlineNumRule() const @@ -1456,7 +1456,7 @@ public: void MakeUniqueNumRules(const SwPaM & rPaM); - void SetNumRuleStart( const SwPosition& rPos, sal_Bool bFlag = sal_True ); + void SetNumRuleStart( const SwPosition& rPos, bool bFlag = true ); void SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt ); SwNumRule* GetNumRuleAtPos( const SwPosition& rPos ) const; @@ -1542,7 +1542,7 @@ public: according to offsets. (if negative: go to doc start). */ bool MoveParagraph( const SwPaM&, long nOffset = 1, bool bIsOutlMv = false ); - bool NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel = sal_False); + bool NumOrNoNum( const SwNodeIndex& rIdx, bool bDel = false); void StopNumRuleAnimations( OutputDevice* ); @@ -1561,8 +1561,8 @@ public: sal_uInt16 nCols, short eAdjust, const SwTableAutoFmt* pTAFmt = 0, const std::vector<sal_uInt16> *pColArr = 0, - sal_Bool bCalledFromShell = sal_False, - sal_Bool bNewModel = sal_True ); + bool bCalledFromShell = false, + bool bNewModel = true ); // If index is in a table, return TableNode, else 0. SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ); @@ -1577,7 +1577,7 @@ public: // text to table conversion - API support const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes ); - sal_Bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh ); + bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh ); // Create columns / rows in table. bool InsertCol( const SwCursor& rCursor, @@ -1590,74 +1590,74 @@ public: sal_uInt16 nCnt = 1, bool bBehind = true ); // Delete Columns/Rows in table. - sal_Bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false ); - sal_Bool DeleteRow( const SwCursor& rCursor ); - sal_Bool DeleteCol( const SwCursor& rCursor ); + bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false ); + bool DeleteRow( const SwCursor& rCursor ); + bool DeleteCol( const SwCursor& rCursor ); // Split / concatenate boxes in table. - sal_Bool SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert = sal_True, - sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False ); + bool SplitTbl( const SwSelBoxes& rBoxes, bool bVert = true, + sal_uInt16 nCnt = 1, bool bSameHeight = false ); // @return enum TableMergeErr. sal_uInt16 MergeTbl( SwPaM& rPam ); OUString GetUniqueTblName() const; - sal_Bool IsInsTblFormatNum() const; - sal_Bool IsInsTblChangeNumFormat() const; - sal_Bool IsInsTblAlignNum() const; + bool IsInsTblFormatNum() const; + bool IsInsTblChangeNumFormat() const; + bool IsInsTblAlignNum() const; // From FEShell (for Undo and BModified). void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ) const; - void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly, + void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ) const; - void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor* pCrsr, + void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); // Direct access for UNO. void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, sal_Bool bCurRowOnly); + const SwTableBox *pStart, bool bCurRowOnly); void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet ); // AutoFormat for table/table selection. - sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ); + bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ); // Query attributes. - sal_Bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ); + bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ); - void AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable ); + void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable ); - sal_Bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType, + bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff ); SwTableBoxFmt* MakeTableBoxFmt(); SwTableLineFmt* MakeTableLineFmt(); // Check if box has numerical valule. Change format of box if required. - void ChkBoxNumFmt( SwTableBox& rAktBox, sal_Bool bCallUpdate ); + void ChkBoxNumFmt( SwTableBox& rAktBox, bool bCallUpdate ); void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ); void ClearBoxNumAttrs( const SwNodeIndex& rNode ); void ClearLineNumAttrs( SwPosition & rPos ); - sal_Bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes, - const SwTable* pCpyTbl = 0, sal_Bool bCpyName = sal_False, - sal_Bool bCorrPos = sal_False ); + bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes, + const SwTable* pCpyTbl = 0, bool bCpyName = false, + bool bCorrPos = false ); - sal_Bool UnProtectCells( const OUString& rTblName ); - sal_Bool UnProtectCells( const SwSelBoxes& rBoxes ); - sal_Bool UnProtectTbls( const SwPaM& rPam ); - sal_Bool HasTblAnyProtection( const SwPosition* pPos, + bool UnProtectCells( const OUString& rTblName ); + bool UnProtectCells( const SwSelBoxes& rBoxes ); + bool UnProtectTbls( const SwPaM& rPam ); + bool HasTblAnyProtection( const SwPosition* pPos, const OUString* pTblName = 0, - sal_Bool* pFullTblProtection = 0 ); + bool* pFullTblProtection = 0 ); // Split table at baseline position, i.e. create a new table. - sal_Bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0, - sal_Bool bCalcNewSize = sal_False ); + bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0, + bool bCalcNewSize = false ); /** And vice versa: rPos must be in the table that remains. The flag indicates whether the current table is merged with the one before or behind it. */ - sal_Bool MergeTable( const SwPosition& rPos, sal_Bool bWithPrev = sal_True, + bool MergeTable( const SwPosition& rPos, bool bWithPrev = true, sal_uInt16 nMode = 0 ); // Make charts of given table update. @@ -1682,9 +1682,9 @@ public: // Insert label. If a FlyFormat is created, return it. SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberingSeparator, - const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx, + const bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx, const OUString& rCharacterStyle, - const sal_Bool bCpyBrd = sal_True ); + const bool bCpyBrd = true ); SwFlyFrmFmt* InsertDrawLabel( const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator, const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj ); @@ -1784,8 +1784,8 @@ public: bool bModulus = true ); // Query NumberFormatter. - inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ); - inline const SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ) const; + inline SvNumberFormatter* GetNumberFormatter( bool bCreate = true ); + inline const SvNumberFormatter* GetNumberFormatter( bool bCreate = true ) const; bool HasInvisibleContent() const; // delete invisible content, like hidden sections and paragraphs @@ -1797,12 +1797,12 @@ public: // Create sub-documents according to given collection. // If no collection is given, use chapter styles for 1st level. - sal_Bool GenerateGlobalDoc( const OUString& rPath, + bool GenerateGlobalDoc( const OUString& rPath, const SwTxtFmtColl* pSplitColl = 0 ); - sal_Bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 ); - sal_Bool GenerateHTMLDoc( const OUString& rPath, + bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 ); + bool GenerateHTMLDoc( const OUString& rPath, const SwTxtFmtColl* pSplitColl = 0 ); - sal_Bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 ); + bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 ); // Compare two documents. long CompareDoc( const SwDoc& rDoc ); @@ -1854,12 +1854,12 @@ public: void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const; void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ); void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ) const; - sal_Bool BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly = sal_True ); + bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true ); void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew ); - sal_Bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const; + bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const; void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ); void SetTabLineStyle( const SwCursor& rCursor, - const Color* pColor, sal_Bool bSetLine, + const Color* pColor, bool bSetLine, const editeng::SvxBorderLine* pBorderLine ); void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const; void SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew ); @@ -1873,10 +1873,10 @@ public: the values of the same property over any other boxes in the selection; if any value is different from that of the first box, the property is unset (and sal_False is returned). */ - sal_Bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill ) const; + bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill ) const; void SetBoxAlign( const SwCursor& rCursor, sal_uInt16 nAlign ); sal_uInt16 GetBoxAlign( const SwCursor& rCursor ) const; - void AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance = sal_False ); + void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false ); int Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest ); int Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest ); @@ -1997,7 +1997,7 @@ public: //Update all the page masters void SetDefaultPageMode(bool bSquaredPageMode); - sal_Bool IsSquaredPageMode() const; + bool IsSquaredPageMode() const; void Setn32DummyCompatabilityOptions1( const sal_uInt32 CompatabilityOptions1 ) { @@ -2058,14 +2058,14 @@ inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const return ((SwDoc*)this)->IsIdxInTbl( rIdx ); } -inline SvNumberFormatter* SwDoc::GetNumberFormatter( sal_Bool bCreate ) +inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) { if( bCreate && !mpNumberFormatter ) _CreateNumberFormatter(); return mpNumberFormatter; } -inline const SvNumberFormatter* SwDoc::GetNumberFormatter( sal_Bool bCreate ) const +inline const SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) const { return ((SwDoc*)this)->GetNumberFormatter( bCreate ); } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 278991c6770c..78ea8a1004e6 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -112,10 +112,10 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener const OUString& rParent, const sal_uInt16 nFamily, sal_uInt16 nMask, - const sal_Bool bNew, + const bool bNew, const OString& sPageId = OString(), SwWrtShell* pActShell = 0, - const sal_Bool bBasic = sal_False ); + const bool bBasic = false ); SAL_DLLPRIVATE sal_uInt16 Delete(const OUString &rName, sal_uInt16 nFamily); SAL_DLLPRIVATE sal_uInt16 Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden); @@ -240,7 +240,7 @@ public: virtual void LoadStyles( SfxObjectShell& rSource ) SAL_OVERRIDE; - void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument ); + void _LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument ); // Show page style format dialog // @param nSlot @@ -265,10 +265,10 @@ public: sal_Int16 GetUpdateDocMode() const {return nUpdateDocMode;} - void ToggleBrowserMode(sal_Bool bOn, SwView* pView); + void ToggleBrowserMode(bool bOn, SwView* pView); sal_uLong LoadStylesFromFile( const OUString& rURL, SwgReaderOption& rOpt, - sal_Bool bUnoCall ); + bool bUnoCall ); void InvalidateModel(); void ReactivateModel(); @@ -289,7 +289,7 @@ public: GetController(); SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef ); - SAL_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; } + SAL_DLLPRIVATE bool IsTemplate() { return bIsATemplate; } SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; } virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const SAL_OVERRIDE; diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx index 98b917c0af5d..4a7a88364ca1 100644 --- a/sw/inc/docstat.hxx +++ b/sw/inc/docstat.hxx @@ -36,7 +36,7 @@ struct SW_DLLPUBLIC SwDocStat sal_uLong nAsianWord; sal_uLong nChar; sal_uLong nCharExcludingSpaces; - sal_Bool bModified; + bool bModified; SwDocStat(); void Reset(); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 881cf4380c04..fe2f411eb24b 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -64,7 +64,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase SwDoc& rDoc; SfxItemSet aCoreSet; - sal_Bool bPhysical; + bool bPhysical; /// Make empty shell a real StyleSheet (Core). SAL_DLLPRIVATE void Create(); @@ -76,7 +76,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase FillPhysical }; - SAL_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType ); + SAL_DLLPRIVATE bool FillStyleSheet( FillStyleType eFType ); protected: virtual ~SwDocStyleSheet(); @@ -95,8 +95,8 @@ public: void SetMask(sal_uInt16 nMsk) { nMask = nMsk; } void SetFamily(SfxStyleFamily eFam) { nFamily = eFam; } - sal_Bool IsPhysical() const { return bPhysical; } - void SetPhysical(sal_Bool bPhys); + bool IsPhysical() const { return bPhysical; } + void SetPhysical(bool bPhys); virtual void SetHidden( bool bHidden ) SAL_OVERRIDE; virtual bool IsHidden( ) const SAL_OVERRIDE; @@ -157,14 +157,14 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener rtl::Reference< SwDocStyleSheet > mxStyleSheet; SwPoolFmtList aLst; sal_uInt16 nLastPos; - sal_Bool bFirstCalled; + bool bFirstCalled; void AppendStyleList(const ::std::vector<OUString>& rLst, - sal_Bool bUsed, - sal_Bool bTestHidden, + bool bUsed, + bool bTestHidden, bool bOnlyHidden, sal_uInt16 nSection, - char cType); + char cType); public: SwStyleSheetIterator( SwDocStyleSheetPool* pBase, @@ -186,7 +186,7 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool { rtl::Reference< SwDocStyleSheet > mxStyleSheet; SwDoc& rDoc; - sal_Bool bOrganizer : 1; ///< Organizer + bool bOrganizer : 1; ///< Organizer virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask) SAL_OVERRIDE; virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ) SAL_OVERRIDE; @@ -194,7 +194,7 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool using SfxStyleSheetBasePool::Find; public: - SwDocStyleSheetPool( SwDoc&, sal_Bool bOrganizer = sal_False ); + SwDocStyleSheetPool( SwDoc&, bool bOrganizer = false ); virtual void Replace( SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ) SAL_OVERRIDE; @@ -209,8 +209,8 @@ public: virtual void Remove( SfxStyleSheetBase* pStyle) SAL_OVERRIDE; - void SetOrganizerMode( sal_Bool bMode ) { bOrganizer = bMode; } - sal_Bool IsOrganizerMode() const { return bOrganizer; } + void SetOrganizerMode( bool bMode ) { bOrganizer = bMode; } + bool IsOrganizerMode() const { return bOrganizer; } virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ) SAL_OVERRIDE; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 74c181e08a35..ad3ea83a11a3 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -147,7 +147,7 @@ public: OUString Expand( sal_uInt32 nFmt, short nOff, sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage, const OUString& ) const; void ChangeExpansion( SwDoc* pDoc, - sal_Bool bVirtPageNum, const sal_Int16* pNumFmt = 0 ); + bool bVirtPageNum, const sal_Int16* pNumFmt = 0 ); virtual SwFieldType* Copy() const SAL_OVERRIDE; }; @@ -331,14 +331,14 @@ public: class SwHiddenTxtFieldType : public SwFieldType { - sal_Bool bHidden; + bool bHidden; public: - SwHiddenTxtFieldType(sal_Bool bSetHidden = sal_True); + SwHiddenTxtFieldType(bool bSetHidden = true); virtual SwFieldType* Copy() const SAL_OVERRIDE; - void SetHiddenFlag( sal_Bool bSetHidden = sal_True ); - inline sal_Bool GetHiddenFlag() const { return bHidden; } + void SetHiddenFlag( bool bSetHidden = true ); + inline bool GetHiddenFlag() const { return bHidden; } }; /*-------------------------------------------------------------------- @@ -354,19 +354,19 @@ class SwHiddenTxtField : public SwField OUString aCond; ///< Condition. sal_uInt16 nSubType; - sal_Bool bCanToggle : 1; ///< Can field be toggled alone? - sal_Bool bIsHidden : 1; ///< Is it not visible? - sal_Bool bValid : 1; ///< Is DB-field evaluated? + bool bCanToggle : 1; ///< Can field be toggled alone? + bool bIsHidden : 1; ///< Is it not visible? + bool bValid : 1; ///< Is DB-field evaluated? virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; public: SwHiddenTxtField( SwHiddenTxtFieldType*, - sal_Bool bConditional, + bool bConditional, const OUString& rCond, const OUString& rTxt, - sal_Bool bHidden = sal_False, + bool bHidden = false, sal_uInt16 nSubType = TYP_HIDDENTXTFLD); SwHiddenTxtField( SwHiddenTxtFieldType*, @@ -379,7 +379,7 @@ public: void Evaluate(SwDoc*); - inline void SetValue(sal_Bool bHidden) { bIsHidden = bHidden; } + inline void SetValue(bool bHidden) { bIsHidden = bHidden; } OUString GetColumnName(const OUString& rName); OUString GetDBName(const OUString& rName, SwDoc *pDoc); @@ -416,7 +416,7 @@ public: class SwHiddenParaField : public SwField { OUString aCond; - sal_Bool bIsHidden:1; + bool bIsHidden:1; public: /// Direct input, delete old value. SwHiddenParaField(SwHiddenParaFieldType*, const OUString& rCond); @@ -424,8 +424,8 @@ public: virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; - void SetHidden(sal_Bool bHidden) { bIsHidden = bHidden; } - sal_Bool IsHidden() const { return bIsHidden; } + void SetHidden(bool bHidden) { bIsHidden = bHidden; } + bool IsHidden() const { return bIsHidden; } /// Query, set condition. virtual OUString GetPar1() const SAL_OVERRIDE; @@ -456,7 +456,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField { OUString aMacro; OUString aText; - sal_Bool bIsScriptURL; + bool bIsScriptURL; virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -487,7 +487,7 @@ public: const OUString& rMacroName, const OUString& rLibraryName ); - static sal_Bool isScriptURL( const OUString& str ); + static bool isScriptURL( const OUString& str ); }; /*-------------------------------------------------------------------- @@ -657,11 +657,11 @@ protected: class SwRefPageSetField : public SwField { short nOffset; - sal_Bool bOn; + bool bOn; public: SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0, - sal_Bool bOn = sal_True ); + bool bOn = true ); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -669,7 +669,7 @@ public: virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - sal_Bool IsOn() const { return bOn; } + bool IsOn() const { return bOn; } short GetOffset() const { return nOffset; } void SetOffset( short nOff ) { nOffset = nOff; } @@ -780,11 +780,11 @@ class SwScriptField : public SwField OUString sCode; /**< Code as text. Code as JavaCode ? */ - sal_Bool bCodeURL; ///< Code contains URL of a script. + bool bCodeURL; ///< Code contains URL of a script. public: SwScriptField( SwScriptFieldType*, const OUString& rType, - const OUString& rCode, sal_Bool bURL=sal_False ); + const OUString& rCode, bool bURL=false ); virtual OUString GetDescription() const SAL_OVERRIDE; @@ -798,8 +798,8 @@ public: virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - sal_Bool IsCodeURL() const { return bCodeURL; } - void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; } + bool IsCodeURL() const { return bCodeURL; } + void SetCodeURL( bool bURL ) { bCodeURL = bURL; } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index d5760b23bebc..38bd63eff62a 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -32,7 +32,7 @@ class SwDPage : public FmFormPage, public SdrObjUserCall SwDoc& rDoc; public: - SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage=sal_False); + SwDPage(SwDrawDocument& rNewModel, bool bMasterPage=false); virtual ~SwDPage(); // #i3694# @@ -43,7 +43,7 @@ public: virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle *pRect) const SAL_OVERRIDE; - sal_Bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); + bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE; }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 31a1b0e0b07d..24a1f6f30150 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -155,7 +155,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell that will be used by GetGraphic() and GetGraphicSize(). */ SAL_DLLPRIVATE SwGrfNode *_GetGrfNode() const ; - SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 ); + SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = 0 ); SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet ); @@ -164,7 +164,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell public: /// Edit (all selected ranges). - void Insert( sal_Unicode, sal_Bool bOnlyCurrCrsr = sal_False ); + void Insert( sal_Unicode, bool bOnlyCurrCrsr = false ); void Insert2( const OUString &, const bool bForceExpandHints = false ); void Overwrite( const OUString & ); @@ -173,14 +173,14 @@ public: bRegExpRplc - replace tabs (\\t) and insert found string (not \&). E.g.: Fnd: "zzz", Repl: "xx\t\\t..&..\&" --> "xx\t<Tab>..zzz..&" */ - sal_Bool Replace( const OUString& rNewStr, sal_Bool bRegExpRplc = sal_False ); + bool Replace( const OUString& rNewStr, bool bRegExpRplc = false ); /** Delete content of all ranges. If whole nodes are selected, these nodes get deleted. */ long Delete(); /// Remove a complete paragraph. - sal_Bool DelFullPara(); + bool DelFullPara(); /// Change text to Upper/Lower/Hiragana/Katagana/... void TransliterateText( sal_uInt32 nType ); @@ -190,7 +190,7 @@ public: /** Delete non-visible content in the document. E.g. hidden ranges, hidden paragraphs. */ - sal_Bool RemoveInvisibleContent(); + bool RemoveInvisibleContent(); /// Replace fields by text - mailmerge support. bool ConvertFieldsToText(); @@ -199,7 +199,7 @@ public: void SetNumberingRestart(); /// Embedds all local links (ranges/graphics). - sal_uInt16 GetLinkUpdMode(sal_Bool bDocSettings = sal_False) const; + sal_uInt16 GetLinkUpdMode(bool bDocSettings = false) const; void SetLinkUpdMode( sal_uInt16 nMode ); /// Copy content of all ranges at current position of cursor to given Shell. @@ -209,15 +209,15 @@ public: If table is copied into table, move all cursors away from it. Copy and Paste must be in FEShell because of FlyFrames! Copy all selections to the document. */ - sal_Bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 ); + bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 ); - long SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True ); - sal_Bool AppendTxtNode(); + long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); + bool AppendTxtNode(); void AutoFmtBySplitNode(); /** If cursor is in a INetAttribute it will be deleted completely including the descriptive text (needed at drag & drop). */ - sal_Bool DelINetAttrWithText(); + bool DelINetAttrWithText(); /** If Cursor is at the end of a character style in which the DontExpand-flag is not yet set, the latter will be set (==> return TRUE). */ @@ -232,9 +232,9 @@ public: the requested item set as a LR-SPACE item, if corresponding node has not its own indent attributes and the position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */ - sal_Bool GetPaMAttr( SwPaM* pPaM, SfxItemSet& , + bool GetPaMAttr( SwPaM* pPaM, SfxItemSet& , const bool bMergeIndentValuesOfNumRule = false ) const; - sal_Bool GetCurAttr( SfxItemSet& , + bool GetCurAttr( SfxItemSet& , const bool bMergeIndentValuesOfNumRule = false ) const; void SetAttrItem( const SfxPoolItem&, sal_uInt16 nFlags = 0 ); void SetAttrSet( const SfxItemSet&, sal_uInt16 nFlags = 0, SwPaM* pCrsr = NULL ); @@ -251,7 +251,7 @@ public: * @return true if the function inspect all the nodes point by the pPaM parameter, * false if the function reach the limit of getMaxLookup number of nodes inspected. */ - sal_Bool GetCurParAttr( SfxItemSet& rSet ) const; + bool GetCurParAttr( SfxItemSet& rSet ) const; /** * Get the paragraph format attribute(s) of the selection(s) described by a SwPaM. * @@ -265,7 +265,7 @@ public: * @return true if the function inspects all the nodes point by the pPaM parameter, * false if the function reaches the limit of getMaxLookup number of nodes inspected. */ - sal_Bool GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const; + bool GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const; /// Set attribute as new default attribute in document. void SetDefault( const SfxPoolItem& ); @@ -291,7 +291,7 @@ public: sal_uInt16 GetCharFmtCount() const; SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const; SwCharFmt* GetCurCharFmt() const; - void FillByEx(SwCharFmt*, sal_Bool bReset = sal_False); + void FillByEx(SwCharFmt*, bool bReset = false); SwCharFmt* MakeCharFmt( const OUString& rName, SwCharFmt* pDerivedFrom = 0 ); SwCharFmt* FindCharFmtByName( const OUString& rName ) const; @@ -336,7 +336,7 @@ public: bool bResetListAttrs = false ); SwTxtFmtColl *MakeTxtFmtColl(const OUString &rFmtCollName, SwTxtFmtColl *pDerivedFrom = 0); - void FillByEx(SwTxtFmtColl*, sal_Bool bReset = sal_False); + void FillByEx(SwTxtFmtColl*, bool bReset = false); SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const; /// @return "Auto-Collection" with given Id. If it does not exist create it. @@ -361,8 +361,8 @@ public: void UpdateFlds( SwField & ); ///< One single field. - sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const; - SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const; + sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; + SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName) const; void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX); @@ -381,15 +381,15 @@ public: void GetAllUsedDB( std::vector<OUString>& rDBNameList, std::vector<OUString>* pAllDBNames = 0 ); - sal_Bool IsAnyDatabaseFieldInDoc()const; + bool IsAnyDatabaseFieldInDoc()const; /// Check whether DB fields point to an available data source and returns it. - sal_Bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const; - void UpdateExpFlds(sal_Bool bCloseDB = sal_False);///< only every expression fields update + bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const; + void UpdateExpFlds(bool bCloseDB = false);///< only every expression fields update void LockExpFlds(); void UnlockExpFlds(); - SwFldUpdateFlags GetFldUpdateFlags(sal_Bool bDocSettings = sal_False) const; + SwFldUpdateFlags GetFldUpdateFlags(bool bDocSettings = false) const; void SetFldUpdateFlags( SwFldUpdateFlags eFlags ); /// For evaluation of DB fields (new DB-manager). @@ -398,7 +398,7 @@ public: SwFieldType* InsertFldType(const SwFieldType &); /// Changes in document? - sal_Bool IsModified() const; + bool IsModified() const; void SetModified(); void ResetModified(); void SetUndoNoResetModified(); @@ -417,22 +417,22 @@ public: /// Insert content table. Renew if required. void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); - sal_Bool UpdateTableOf(const SwTOXBase& rTOX, + bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0); const SwTOXBase* GetCurTOX() const; const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false ); void SetDefaultTOXBase(const SwTOXBase& rBase); - sal_Bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const; - void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, sal_Bool bReadonly); + bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const; + void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly); sal_uInt16 GetTOXCount() const; const SwTOXBase* GetTOX( sal_uInt16 nPos ) const; bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false ); /// After reading file update all content tables. - void SetUpdateTOX( sal_Bool bFlag = sal_True ); - sal_Bool IsUpdateTOX() const; + void SetUpdateTOX( bool bFlag = true ); + bool IsUpdateTOX() const; /// Manage types of content tables. sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const; @@ -454,7 +454,7 @@ public: bool MoveOutlinePara( short nOffset = 1); - sal_Bool IsProtectedOutlinePara() const; + bool IsProtectedOutlinePara() const; const SwNumRule* GetNumRuleAtCurrCrsrPos() const; @@ -498,7 +498,7 @@ public: void SetIndent(short nIndent, const SwPosition & rPos); bool IsFirstOfNumRuleAtCrsrPos() const; - sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const; + bool IsNoNum( bool bChkStart = true ) const; /** @return Num-Level of the node in which point of cursor is. @return values can be: NO_NUMBERING, @@ -512,18 +512,18 @@ public: int GetCurrentParaOutlineLevel( ) const; // i29560 - sal_Bool HasNumber() const; - sal_Bool HasBullet() const; + bool HasNumber() const; + bool HasBullet() const; - sal_Bool SelectionHasNumber() const; - sal_Bool SelectionHasBullet() const; + bool SelectionHasNumber() const; + bool SelectionHasBullet() const; OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const; void ChgNumRuleFmts( const SwNumRule& rRule ); /// Set (and query if) a numbering with StartFlag starts at current PointPos. - void SetNumRuleStart( sal_Bool bFlag = sal_True, SwPaM* pCrsr = NULL ); - sal_Bool IsNumRuleStart( SwPaM* pPaM = NULL ) const; + void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = NULL ); + bool IsNumRuleStart( SwPaM* pPaM = NULL ) const; void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = NULL ); sal_uInt16 GetNodeNumStart( SwPaM* pPaM = NULL ) const; @@ -542,10 +542,10 @@ public: /** Undo. Maintain UndoHistory in Document. Reset UndoHistory at Save, SaveAs, Create ??? */ - void DoUndo( sal_Bool bOn = sal_True ); - sal_Bool DoesUndo() const; - void DoGroupUndo( sal_Bool bUn = sal_True ); - sal_Bool DoesGroupUndo() const; + void DoUndo( bool bOn = true ); + bool DoesUndo() const; + void DoGroupUndo( bool bUn = true ); + bool DoesGroupUndo() const; void DelAllUndoObj(); /// Undo: set up Undo parenthesis, return nUndoId of this parenthesis. @@ -580,7 +580,7 @@ public: sal_uInt16 GetCntType() const; /// Are there frames, footnotes, etc. - sal_Bool HasOtherCnt() const; + bool HasOtherCnt() const; /// Apply ViewOptions with Start-/EndAction. virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE; @@ -588,16 +588,16 @@ public: /** Query text within selection. @returns FALSE, if selected range is too large to be copied into string buffer or if other errors occur. */ - sal_Bool GetSelectedText( OUString &rBuf, + bool GetSelectedText( OUString &rBuf, int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK ); /** @return graphic, if CurCrsr->Point() points to a SwGrfNode (and mark is not set or points to the same graphic). */ - const Graphic* GetGraphic( sal_Bool bWait = sal_True ) const; + const Graphic* GetGraphic( bool bWait = true ) const; const GraphicObject* GetGraphicObj() const; - sal_Bool IsGrfSwapOut( sal_Bool bOnlyLinked = sal_False ) const; + bool IsGrfSwapOut( bool bOnlyLinked = false ) const; sal_uInt16 GetGraphicType() const; const PolyPolygon *GetGraphicPolygon() const; @@ -608,7 +608,7 @@ public: void ClearAutomaticContour(); /// @return the size of a graphic in Twips if cursor is in a graphic. - sal_Bool GetGrfSize(Size&) const; + bool GetGrfSize(Size&) const; /** @return name and filter of a graphic if the cursor is in a graphic, else give a rap on the knuckles! @@ -635,7 +635,7 @@ public: svt::EmbeddedObjectRef& GetOLEObject() const; /// Is there an OLEObject with this name (SwFmt)? - sal_Bool HasOLEObj( const OUString &rName ) const; + bool HasOLEObj( const OUString &rName ) const; /// @return pointer to the data of the chart in which Cursr is. void SetChartName( const OUString &rName ); @@ -652,14 +652,14 @@ public: /** Make current selection glossary and insert into glossary document including styles. */ sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const OUString& rName, - const OUString& rShortName, sal_Bool bSaveRelFile = sal_False, + const OUString& rShortName, bool bSaveRelFile = false, const OUString* pOnlyTxt=0 ); /// Save complete content of doc as glossary. sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const OUString& rName, const OUString& rShortName, - sal_Bool bSaveRelFile = sal_False, - sal_Bool bOnlyTxt = sal_False ); + bool bSaveRelFile = false, + bool bOnlyTxt = false ); // Linguistics... /// Save selections. @@ -689,34 +689,34 @@ public: void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName ); SwFrmFmt *GetTableFmt(); - sal_Bool TextToTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR + bool TextToTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR sal_Unicode cCh, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, const SwTableAutoFmt* pTAFmt = 0 ); - sal_Bool TableToText( sal_Unicode cCh ); - sal_Bool IsTextToTableAvailable() const; + bool TableToText( sal_Unicode cCh ); + bool IsTextToTableAvailable() const; - sal_Bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const; + bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const; void SetTblBoxFormulaAttrs( const SfxItemSet& rSet ); - sal_Bool IsTableBoxTextFormat() const; + bool IsTableBoxTextFormat() const; OUString GetTableBoxText() const; TblChgMode GetTblChgMode() const; void SetTblChgMode( TblChgMode eMode ); /// Split table at cursor position. - sal_Bool SplitTable( sal_uInt16 eMode ); + bool SplitTable( sal_uInt16 eMode ); /** Merge tables. Can Merge checks if Prev or Next are possible. If pointer pChkNxtPrv is passed possible direction is given. */ - sal_Bool CanMergeTable( sal_Bool bWithPrev = sal_True, sal_Bool* pChkNxtPrv = 0 ) const; - sal_Bool MergeTable( sal_Bool bWithPrev = sal_True, sal_uInt16 nMode = 0 ); + bool CanMergeTable( bool bWithPrev = true, bool* pChkNxtPrv = 0 ) const; + bool MergeTable( bool bWithPrev = true, sal_uInt16 nMode = 0 ); /// Set up InsertDB as table Undo. - void AppendUndoForInsertFromDB( sal_Bool bIsTable ); + void AppendUndoForInsertFromDB( bool bIsTable ); /// Functions used for spell checking and text conversion. @@ -747,10 +747,10 @@ public: bool HasLastSentenceGotGrammarChecked() const; /// Is text conversion active somewhere else? - sal_Bool HasConvIter() const; + bool HasConvIter() const; /// Is hyphenation active somewhere else? - sal_Bool HasHyphIter() const; + bool HasHyphIter() const; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > @@ -773,9 +773,9 @@ public: sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const; /// Call AutoCorrect - void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True, + void AutoCorrect( SvxAutoCorrect& rACorr, bool bInsertMode = true, sal_Unicode cChar = ' ' ); - sal_Bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord ); + bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord ); /// Set our styles according to the respective rules. void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 ); @@ -786,8 +786,8 @@ public: /// Calculates selection. OUString Calculate(); - sal_Bool InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, - sal_Bool bKeepSelection = sal_False ); + bool InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, + bool bKeepSelection = false ); sal_uInt16 GetINetAttrs( SwGetINetAttrs& rArr ); OUString GetDropTxt( const sal_uInt16 nChars ) const; @@ -795,13 +795,13 @@ public: /** May an outline be moved or copied? Check whether it's in text body, not in table, and not read-only (move). */ - sal_Bool IsOutlineMovable( sal_uInt16 nIdx ) const; - sal_Bool IsOutlineCopyable( sal_uInt16 nIdx ) const; + bool IsOutlineMovable( sal_uInt16 nIdx ) const; + bool IsOutlineCopyable( sal_uInt16 nIdx ) const; - sal_uInt16 GetLineCount( sal_Bool bActPos = sal_True ); + sal_uInt16 GetLineCount( bool bActPos = true ); /// Query and set footnote-text/number. Set.. to current SSelection! - sal_Bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); + bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); bool SetCurFtn( const SwFmtFtn& rFillFtn ); bool HasFtns( bool bEndNotes = false ) const; @@ -810,7 +810,7 @@ public: SwSection const* InsertSection( SwSectionData & rNewData, SfxItemSet const*const = 0 ); - sal_Bool IsInsRegionAvailable() const; + bool IsInsRegionAvailable() const; const SwSection* GetCurrSection() const; /** @return current range like Cet CurrSection(). But this function iterates @@ -818,7 +818,7 @@ public: a footnote the reference of which is in a columned range. If bOutOfTab is set, the range comprising the table is searched and not an inner one. */ - const SwSection* GetAnySection( sal_Bool bOutOfTab = sal_False, const Point* pPt = 0 ) const; + const SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = 0 ) const; sal_uInt16 GetSectionFmtCount() const; sal_uInt16 GetSectionFmtPos( const SwSectionFmt& ) const; @@ -826,9 +826,9 @@ public: void DelSectionFmt( sal_uInt16 nFmt ); void UpdateSection(sal_uInt16 const nSect, SwSectionData &, SfxItemSet const*const = 0); - sal_Bool IsAnySectionInDoc( sal_Bool bChkReadOnly = sal_False, - sal_Bool bChkHidden = sal_False, - sal_Bool BChkTOX = sal_False ) const; + bool IsAnySectionInDoc( bool bChkReadOnly = false, + bool bChkHidden = false, + bool BChkTOX = false ) const; OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const; @@ -849,7 +849,7 @@ public: bool CanSpecialInsert() const; /// Optimizing UI. - void SetNewDoc(sal_Bool bNew = sal_True); + void SetNewDoc(bool bNew = true); sfx2::LinkManager& GetLinkManager(); inline const sfx2::LinkManager& GetLinkManager() const; @@ -866,30 +866,30 @@ public: { return ((SwEditShell*)this)->GetNumberFormatter(); } /// Interfaces for GlobalDocument. - sal_Bool IsGlobalDoc() const; - void SetGlblDocSaveLinks( sal_Bool bFlag = sal_True ); - sal_Bool IsGlblDocSaveLinks() const; + bool IsGlobalDoc() const; + void SetGlblDocSaveLinks( bool bFlag = true ); + bool IsGlblDocSaveLinks() const; sal_uInt16 GetGlobalDocContent( SwGlblDocContents& rArr ) const; - sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos, + bool InsertGlobalDocContent( const SwGlblDocContent& rPos, SwSectionData & rNew ); - sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos, + bool InsertGlobalDocContent( const SwGlblDocContent& rPos, const SwTOXBase& rTOX ); - sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos ); - sal_Bool DeleteGlobalDocContent( const SwGlblDocContents& rArr, + bool InsertGlobalDocContent( const SwGlblDocContent& rPos ); + bool DeleteGlobalDocContent( const SwGlblDocContents& rArr, size_t nPos ); - sal_Bool MoveGlobalDocContent( const SwGlblDocContents& rArr , + bool MoveGlobalDocContent( const SwGlblDocContents& rArr , size_t nFromPos, size_t nToPos, size_t nNewPos ); - sal_Bool GotoGlobalDocContent( const SwGlblDocContent& rPos ); + bool GotoGlobalDocContent( const SwGlblDocContent& rPos ); /// For Redlining. sal_uInt16 GetRedlineMode() const; void SetRedlineMode( sal_uInt16 eMode ); - sal_Bool IsRedlineOn() const; + bool IsRedlineOn() const; sal_uInt16 GetRedlineCount() const; const SwRangeRedline& GetRedline( sal_uInt16 nPos ) const; - sal_Bool AcceptRedline( sal_uInt16 nPos ); - sal_Bool RejectRedline( sal_uInt16 nPos ); + bool AcceptRedline( sal_uInt16 nPos ); + bool RejectRedline( sal_uInt16 nPos ); bool AcceptRedlinesInSelection(); bool RejectRedlinesInSelection(); @@ -898,7 +898,7 @@ public: sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const; /// Set comment to Redline at position. - sal_Bool SetRedlineComment( const OUString& rS ); + bool SetRedlineComment( const OUString& rS ); const SwRangeRedline* GetCurrRedline() const; /// Redline attributes have been changed. Updated views. @@ -920,12 +920,12 @@ public: void SetLineNumberInfo( const SwLineNumberInfo& rInfo); /// Labels: Synchronize ranges. - void SetLabelDoc( sal_Bool bFlag = sal_True ); - sal_Bool IsLabelDoc() const; + void SetLabelDoc( bool bFlag = true ); + bool IsLabelDoc() const; /// Interface for TextInputData - (for input of Japanese/Chinese chars.) SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); - OUString DeleteExtTextInput( SwExtTextInput* pDel = 0, sal_Bool bInsText = sal_True); + OUString DeleteExtTextInput( SwExtTextInput* pDel = 0, bool bInsText = true); void SetExtTextInputData( const CommandExtTextInputData& ); /// Interface for access to AutoComplete-list. diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index f688d9024e03..4a09b171f851 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -152,7 +152,7 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType OUString sDelim; sal_uInt16 nType; sal_uInt8 nLevel; - sal_Bool bDeleted; + bool bDeleted; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; @@ -169,8 +169,8 @@ public: void SetSeqFormat(sal_uLong nFormat); sal_uLong GetSeqFormat(); - sal_Bool IsDeleted() const { return bDeleted; } - void SetDeleted( sal_Bool b ) { bDeleted = b; } + bool IsDeleted() const { return bDeleted; } + void SetDeleted( bool b ) { bDeleted = b; } /// Overlay, because set-field takes care for its being updated by itself. inline OUString GetSetRefName() const; @@ -213,7 +213,7 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField OUString sExpand; OUString aPText; OUString aSeqText; - sal_Bool bInput; + bool bInput; sal_uInt16 nSeqNo; sal_uInt16 nSubType; @@ -232,15 +232,15 @@ public: inline void SetPromptText(const OUString& rStr); inline OUString GetPromptText() const; - inline void SetInputFlag(sal_Bool bInp); - inline sal_Bool GetInputFlag() const; + inline void SetInputFlag(bool bInp); + inline bool GetInputFlag() const; virtual OUString GetFieldName() const SAL_OVERRIDE; virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; - inline sal_Bool IsSequenceFld() const; + inline bool IsSequenceFld() const; /// Logical number, sequence fields. inline void SetSeqNumber( sal_uInt16 n ) { nSeqNo = n; } @@ -268,13 +268,13 @@ inline void SwSetExpField::SetPromptText(const OUString& rStr) inline OUString SwSetExpField::GetPromptText() const { return aPText; } -inline void SwSetExpField::SetInputFlag(sal_Bool bInp) +inline void SwSetExpField::SetInputFlag(bool bInp) { bInput = bInp; } -inline sal_Bool SwSetExpField::GetInputFlag() const +inline bool SwSetExpField::GetInputFlag() const { return bInput; } -inline sal_Bool SwSetExpField::IsSequenceFld() const +inline bool SwSetExpField::IsSequenceFld() const { return 0 != (nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType*)GetTyp())->GetType()); } class SwInputFieldType : public SwFieldType @@ -357,7 +357,7 @@ public: class SwInputFieldList { public: - SwInputFieldList( SwEditShell* pShell, sal_Bool bBuildTmpLst = sal_False ); + SwInputFieldList( SwEditShell* pShell, bool bBuildTmpLst = false ); ~SwInputFieldList(); sal_uInt16 Count() const; diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx index bd39df3aa757..fb7f4427a34d 100644 --- a/sw/inc/extinput.hxx +++ b/sw/inc/extinput.hxx @@ -29,8 +29,8 @@ class SwExtTextInput : public SwPaM { std::vector<sal_uInt16> aAttrs; OUString sOverwriteText; - sal_Bool bInsText : 1; - sal_Bool bIsOverwriteCursor : 1; + bool bInsText : 1; + bool bIsOverwriteCursor : 1; LanguageType eInputLanguage; public: SwExtTextInput( const SwPaM& rPam, Ring* pRing = 0 ); @@ -38,9 +38,9 @@ public: void SetInputData( const CommandExtTextInputData& rData ); const std::vector<sal_uInt16>& GetAttrs() const { return aAttrs; } - void SetInsText( sal_Bool bFlag ) { bInsText = bFlag; } - sal_Bool IsOverwriteCursor() const { return bIsOverwriteCursor; } - void SetOverwriteCursor( sal_Bool bFlag ); + void SetInsText( bool bFlag ) { bInsText = bFlag; } + bool IsOverwriteCursor() const { return bIsOverwriteCursor; } + void SetOverwriteCursor( bool bFlag ); void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;} }; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index b8039fa3e48b..5d23fdecfc69 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -168,7 +168,7 @@ class SdrDropMarkerOverlay; class SW_DLLPUBLIC SwFEShell : public SwEditShell { SdrDropMarkerOverlay *pChainFrom, *pChainTo; - sal_Bool bCheckForOLEInCaption; + bool bCheckForOLEInCaption; SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const; SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; @@ -191,20 +191,20 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const; SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const; - SAL_DLLPRIVATE sal_Bool ImpEndCreate(); + SAL_DLLPRIVATE bool ImpEndCreate(); SAL_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const; /// Methods for copying of draw objects. - SAL_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, - const Point& rInsPt, sal_Bool bIsMove, - sal_Bool bSelectInsert ); + SAL_DLLPRIVATE bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, + const Point& rInsPt, bool bIsMove, + bool bSelectInsert ); /// Get list of marked SdrObjects; /// helper method for GetSelFrmType, IsSelContainsControl. SAL_DLLPRIVATE const SdrMarkList* _GetMarkList() const; - SAL_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const; + SAL_DLLPRIVATE bool CheckHeadline( bool bRepeat ) const; using SwEditShell::Copy; @@ -218,31 +218,31 @@ public: virtual ~SwFEShell(); /// Copy and Paste methods for internal clipboard. - sal_Bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 ); - sal_Bool Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames = sal_False); + bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 ); + bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false); /// Paste some pages into another doc - used in mailmerge. - sal_Bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage); + bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage); /// Copy-Method for Drag&Drop - sal_Bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt, - sal_Bool bIsMove = sal_False, sal_Bool bSelectInsert = sal_True ); + bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt, + bool bIsMove = false, bool bSelectInsert = true ); - void SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew = sal_False ); + void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false ); /// Is selected frame within another frame? const SwFrmFmt* IsFlyInFly(); /** If an object as been given, exactly this object is selected (instead of searching over position). */ - sal_Bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 ); + bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 ); void DelSelectedObj(); /** Move selection upwards or downwards (Z-Order). TRUE = to top or bottom. FALSE = run past one other. */ - void SelectionToTop ( sal_Bool bTop = sal_True ); - void SelectionToBottom( sal_Bool bBottom = sal_True ); + void SelectionToTop ( bool bTop = true ); + void SelectionToBottom( bool bBottom = true ); short GetLayerId() const; ///< 1 Heaven, 0 Hell, -1 Ambiguous. void SelectionToHeaven(); ///< Above document. @@ -257,9 +257,9 @@ public: /** Test if there is a draw object at that position and if it should be selected. The 'should' is aimed at Writer text fly frames which may be in front of the draw object. */ - sal_Bool ShouldObjectBeSelected(const Point& rPt); + bool ShouldObjectBeSelected(const Point& rPt); - sal_Bool MoveAnchor( sal_uInt16 nDir ); + bool MoveAnchor( sal_uInt16 nDir ); /** @return if Upper of frame at current position is section frame Currently only used by the rules. To be replaced by something more @@ -270,7 +270,7 @@ public: pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor. Although (0,TRUE) is kind of a standard, the parameters are not defaulted here in order to force more conscious use especially of bStopAtFly. */ - sal_uInt16 GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const; + sal_uInt16 GetFrmType( const Point *pPt, bool bStopAtFly ) const; sal_uInt16 GetSelFrmType() const; //Selektion (Drawing) /** check whether selected frame contains a control; @@ -304,9 +304,9 @@ public: /// Set size of draw objects. void SetObjRect( const SwRect& rRect ); - long BeginDrag( const Point *pPt, sal_Bool bProp ); - long Drag ( const Point *pPt, sal_Bool bProp ); - long EndDrag ( const Point *pPt, sal_Bool bProp ); + long BeginDrag( const Point *pPt, bool bProp ); + long Drag ( const Point *pPt, bool bProp ); + long EndDrag ( const Point *pPt, bool bProp ); void BreakDrag(); /// Methods for status line. @@ -335,26 +335,26 @@ public: /** Deliver graphic in rName besides graphic name. If graphic is linked give name with path. rbLink is TRUE if graphic is linked. */ const Graphic *GetGrfAtPos( const Point &rDocPos, - OUString &rName, sal_Bool &rbLink ) const; + OUString &rName, bool &rbLink ) const; OUString GetObjTitle() const; void SetObjTitle( const OUString& rTitle ); OUString GetObjDescription() const; void SetObjDescription( const OUString& rDescription ); - sal_Bool IsFrmSelected() const; - sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const; + bool IsFrmSelected() const; + bool GetFlyFrmAttr( SfxItemSet &rSet ) const; bool SetFlyFrmAttr( SfxItemSet &rSet ); - sal_Bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 ); - const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, sal_Bool bAnchValid = sal_False, + bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 ); + const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false, SwFrmFmt *pParent = 0 ); void SetFlyPos( const Point &rAbsPos); - Point FindAnchorPos( const Point &rAbsPos, sal_Bool bMoveIt = sal_False ); + Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false ); /** Determines whether a frame or its environment is vertically formatted and right-to-left. also determines, if frame or its environmane is in mongolianlayout (vertical left-to-right) - add output parameter <bVertL2R> */ - sal_Bool IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRightToLeft, sal_Bool& bVertL2R) const; + bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0. void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style. @@ -364,10 +364,10 @@ public: SwFrmFmt* WizzardGetFly(); /// Independent selecting of flys. - sal_Bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY ) - { return GotoObj( sal_True, eType ); } - sal_Bool GotoPrevFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY) - { return GotoObj( sal_False, eType); } + bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY ) + { return GotoObj( true, eType ); } + bool GotoPrevFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY) + { return GotoObj( false, eType); } /// Iterate over flys - for Basic-collections. sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const; @@ -408,8 +408,8 @@ public: void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; /// Check resize of OLE-Object. - sal_Bool IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; } - void SetCheckForOLEInCaption( sal_Bool bFlag ) { bCheckForOLEInCaption = bFlag; } + bool IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; } + void SetCheckForOLEInCaption( bool bFlag ) { bCheckForOLEInCaption = bFlag; } /// Set name at selected FlyFrame. void SetFlyName( const OUString& rName ); @@ -424,8 +424,8 @@ public: OUString GetUniqueFrameName() const; /// Jump to named Fly (graphic/OLE). - sal_Bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL, - sal_Bool bSelFrame = sal_True ); + bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL, + bool bSelFrame = true ); /// Position is a graphic with URL? const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0, @@ -447,18 +447,18 @@ public: void CheckUnboundObjects(); /// Attention: Ambiguities if multiple selections. - sal_Bool GetObjAttr( SfxItemSet &rSet ) const; - sal_Bool SetObjAttr( const SfxItemSet &rSet ); + bool GetObjAttr( SfxItemSet &rSet ) const; + bool SetObjAttr( const SfxItemSet &rSet ); - const SdrObject* GetBestObject( sal_Bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, sal_Bool bFlat = sal_True, const ::svx::ISdrObjectFilter* pFilter = NULL ); - sal_Bool GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY); + const SdrObject* GetBestObject( bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, bool bFlat = true, const ::svx::ISdrObjectFilter* pFilter = NULL ); + bool GotoObj( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY); /// Set DragMode (e.g. Rotae), but do nothing when frame is selected. void SetDragMode( sal_uInt16 eSdrDragMode ); sal_uInt16 IsObjSelected() const; ///< @return object count, but doesn't count the objects in groups. - sal_Bool IsObjSelected( const SdrObject& rObj ) const; - sal_Bool IsObjSameLevelWithMarked(const SdrObject* pObj) const; + bool IsObjSelected( const SdrObject& rObj ) const; + bool IsObjSameLevelWithMarked(const SdrObject* pObj) const; const SdrMarkList* GetMarkList() const{ return _GetMarkList(); }; void EndTextEdit(); ///< Deletes object if required. @@ -472,22 +472,22 @@ public: or SDRCREATE_NEXTPOINT for a polygon may be relevant. After RESTRAINTEND the object is created and selected. BreakCreate interrupts the process. In this case no object is selected. */ - sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ); - sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &); + bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ); + bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &); void MoveCreate ( const Point &rPos ); - sal_Bool EndCreate ( sal_uInt16 eSdrCreateCmd ); + bool EndCreate ( sal_uInt16 eSdrCreateCmd ); void BreakCreate(); bool IsDrawCreate() const; void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId); /// Functions for Rubberbox, ti select Draw-Objects - sal_Bool BeginMark( const Point &rPos ); + bool BeginMark( const Point &rPos ); void MoveMark ( const Point &rPos ); - sal_Bool EndMark (); + bool EndMark (); void BreakMark(); /// Create and destroy group, don't when frame is selected. - sal_Bool IsGroupSelected(); ///< Can be a mixed selection! + bool IsGroupSelected(); ///< Can be a mixed selection! void GroupSelection(); ///< Afterwards the group is selected. void UnGroupSelection(); /**< The individual objects are selected, but it is possible that there are groups included. */ @@ -502,17 +502,17 @@ public: void ChgAnchor( int eAnchorId, bool bSameOnly = false, bool bPosCorr = true ); - sal_Bool SetDrawingAttr( SfxItemSet &rSet ); + bool SetDrawingAttr( SfxItemSet &rSet ); /** Get selected DrawObj as graphics (MetaFile/Bitmap). Return value indicates if it was converted. */ - sal_Bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const; + bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const; void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 ); bool Paste( const Graphic &rGrf, const OUString& rURL ); - sal_Bool Paste( SotDataObject& rObj, const Point& rPt ); + bool Paste( SotDataObject& rObj, const Point& rPt ); - sal_Bool IsAlignPossible() const; + bool IsAlignPossible() const; void SetCalcFieldValueHdl(Outliner* pOutliner); void Insert(const OUString& rGrfName, @@ -526,7 +526,7 @@ public: void InsertDrawObj( SdrObject& rDrawObj, const Point& rInsertPosition ); - sal_Bool ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltName, + bool ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltName, const Graphic* pGrf = 0 ); // --> #i972# @@ -538,22 +538,22 @@ public: void AlignAllFormulasToBaseline(); /// Provide information about content situated closes to given Point. - Point GetCntntPos( const Point& rPoint, sal_Bool bNext ) const; + Point GetCntntPos( const Point& rPoint, bool bNext ) const; /// Convert document position into position relative to the current page. Point GetRelativePagePosition(const Point& rDocPos); /// Hide or show layout-selection and pass call to CrsrSh. void ShLooseFcs(); - void ShGetFcs( sal_Bool bUpdate = sal_True ); + void ShGetFcs( bool bUpdate = true ); /// PageDescriptor-interface void ChgCurPageDesc( const SwPageDesc& ); - sal_uInt16 GetCurPageDesc( const sal_Bool bCalcFrm = sal_True ) const; + sal_uInt16 GetCurPageDesc( const bool bCalcFrm = true ) const; sal_uInt16 GetMousePageDesc( const Point &rPt ) const; sal_uInt16 GetPageDescCnt() const; SwPageDesc* FindPageDescByName( const OUString& rName, - sal_Bool bGetFromPool = sal_False, + bool bGetFromPool = false, sal_uInt16* pPos = 0 ); const SwPageDesc& GetPageDesc( sal_uInt16 i ) const; @@ -569,36 +569,36 @@ public: /// Page number of the page containing Point, O if no page. sal_uInt16 GetPageNumber( const Point &rPoint ) const; - sal_Bool GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; + bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&, const SfxItemSet* pFlyAttrSet = 0, const SfxItemSet* pGrfAttrSet = 0, SwFrmFmt* = 0 ); - sal_Bool FinishOLEObj(); ///< Shutdown server. + bool FinishOLEObj(); ///< Shutdown server. void GetTblAttr( SfxItemSet & ) const; void SetTblAttr( const SfxItemSet & ); - sal_Bool HasWholeTabSelection() const; + bool HasWholeTabSelection() const; /// Is content of a table cell or at least a table cell completely selected? - sal_Bool HasBoxSelection() const; + bool HasBoxSelection() const; bool InsertRow( sal_uInt16 nCnt, bool bBehind ); bool InsertCol( sal_uInt16 nCnt, bool bBehind ); // 0 == at the end. - sal_Bool DeleteCol(); - sal_Bool DeleteTable(); - sal_Bool DeleteRow(bool bCompleteTable = false); + bool DeleteCol(); + bool DeleteTable(); + bool DeleteRow(bool bCompleteTable = false); - sal_Bool DeleteTblSel(); ///< Current selection, may be whole table. + bool DeleteTblSel(); ///< Current selection, may be whole table. sal_uInt16 MergeTab(); /**< Merge selected parts of table. @return error via enum. */ /// Split cell vertically or horizontally. - sal_Bool SplitTab( sal_Bool nVert = sal_True, sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False ); - sal_Bool Sort(const SwSortOptions&); //Sortieren. + bool SplitTab( bool nVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false ); + bool Sort(const SwSortOptions&); //Sortieren. void SetRowHeight( const SwFmtFrmSize &rSz ); @@ -612,77 +612,77 @@ public: sal_uInt16 GetBoxAlign() const; ///< USHRT_MAX if ambiguous. /// Adjustment of Rowheights. Determine via bTstOnly if more than one row is selected. - sal_Bool BalanceRowHeight( sal_Bool bTstOnly ); + bool BalanceRowHeight( bool bTstOnly ); void SetTabBorders( const SfxItemSet& rSet ); void GetTabBorders( SfxItemSet& rSet) const; - void SetTabLineStyle(const Color* pColor, sal_Bool bSetLine = sal_False, const editeng::SvxBorderLine* pBorderLine = NULL); + void SetTabLineStyle(const Color* pColor, bool bSetLine = false, const editeng::SvxBorderLine* pBorderLine = NULL); void SetTabBackground( const SvxBrushItem &rNew ); void GetTabBackground( SvxBrushItem &rToFill ) const; void SetBoxBackground( const SvxBrushItem &rNew ); - sal_Bool GetBoxBackground( SvxBrushItem &rToFill ) const; ///< FALSE ambiguous. + bool GetBoxBackground( SvxBrushItem &rToFill ) const; ///< FALSE ambiguous. void SetBoxDirection( const SvxFrameDirectionItem& rNew ); - sal_Bool GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; ///< FALSE ambiguous. + bool GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; ///< FALSE ambiguous. void SetRowBackground( const SvxBrushItem &rNew ); - sal_Bool GetRowBackground( SvxBrushItem &rToFill ) const; ///< FALSE ambiguous. + bool GetRowBackground( SvxBrushItem &rToFill ) const; ///< FALSE ambiguous. sal_uInt8 WhichMouseTabCol( const Point &rPt ) const; void GetTabCols( SwTabCols &rToFill ) const; ///< Info about columns and margins. - void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly = sal_True ); + void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly = true ); void GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const; - void SetMouseTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly, + void SetMouseTabCols( const SwTabCols &rNew, bool bCurRowOnly, const Point &rPt ); /// pEnd will be used during MouseMove bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); void GetTabRows( SwTabCols &rToFill ) const; - void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly ); + void SetTabRows( const SwTabCols &rNew, bool bCurColOnly ); void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const; - void SetMouseTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const Point &rPt ); + void SetMouseTabRows( const SwTabCols &rNew, bool bCurColOnly, const Point &rPt ); void ProtectCells(); /**< If a table selection exists it is destroyed in case cursor is not allowed in readonly. */ void UnProtectCells(); ///< Refers to table selection. void UnProtectTbls(); ///< Unprotect all tables in selection. - sal_Bool HasTblAnyProtection( const OUString* pTblName = 0, - sal_Bool* pFullTblProtection = 0 ); - sal_Bool CanUnProtectCells() const; + bool HasTblAnyProtection( const OUString* pTblName = 0, + bool* pFullTblProtection = 0 ); + bool CanUnProtectCells() const; sal_uInt16 GetRowsToRepeat() const; void SetRowsToRepeat( sal_uInt16 nNumOfRows ); - sal_uInt16 GetVirtPageNum( const sal_Bool bCalcFrm = sal_True ); + sal_uInt16 GetVirtPageNum( const bool bCalcFrm = true ); /** @return the number of table rows currently selected if the selection start at the top of the table. */ sal_uInt16 GetRowSelectionFromTop() const; - sal_Bool IsInRepeatedHeadline() const { return CheckHeadline( true ); } - sal_Bool IsInHeadline() const { return CheckHeadline( false ); } + bool IsInRepeatedHeadline() const { return CheckHeadline( true ); } + bool IsInHeadline() const { return CheckHeadline( false ); } /** Adjusts cell widths in such a way, that their content does not need to be wrapped (if possible). bBalance provides for adjustment of selected columns. */ - void AdjustCellWidth( sal_Bool bBalance = sal_False ); + void AdjustCellWidth( bool bBalance = false ); /// Not allowed if only empty cells are selected. - sal_Bool IsAdjustCellWidthAllowed( sal_Bool bBalance = sal_False ) const; + bool IsAdjustCellWidthAllowed( bool bBalance = false ) const; /// Adjustment of cell-widths; determine via bTstOnly if more than one cell is selected. - sal_Bool BalanceCellWidth( sal_Bool bTstOnly ); + bool BalanceCellWidth( bool bTstOnly ); /// AutoFormat for table/ table selection. - sal_Bool SetTableAutoFmt( const SwTableAutoFmt& rNew ); + bool SetTableAutoFmt( const SwTableAutoFmt& rNew ); - sal_Bool GetTableAutoFmt( SwTableAutoFmt& rGet ); + bool GetTableAutoFmt( SwTableAutoFmt& rGet ); - sal_Bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 ); + bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 ); - sal_Bool GetAutoSum( OUString& rFml ) const; + bool GetAutoSum( OUString& rFml ) const; /** Phy: real page count. Virt: consider offset that may have been set by user. */ @@ -694,9 +694,9 @@ public: void InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator, - const sal_Bool bBefore, const sal_uInt16 nId, + const bool bBefore, const sal_uInt16 nId, const OUString& rCharacterStyle, - const sal_Bool bCpyBrd = sal_True ); + const bool bCpyBrd = true ); /// The ruler needs some information too. sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == not in any column. @@ -706,17 +706,17 @@ public: size_t GetCurMouseTabColNum( const Point &rPt ) const; sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; ///< Current outer column. - sal_Bool IsTableRightToLeft() const; - sal_Bool IsMouseTableRightToLeft( const Point &rPt ) const; - sal_Bool IsTableVertical() const; + bool IsTableRightToLeft() const; + bool IsMouseTableRightToLeft( const Point &rPt ) const; + bool IsTableVertical() const; - sal_Bool IsLastCellInRow() const; + bool IsLastCellInRow() const; /// Width of current range for column-dialog. long GetSectionWidth( SwFmt& rFmt ) const; void GetConnectableFrmFmts - (SwFrmFmt & rFmt, const OUString & rReference, sal_Bool bSuccessors, + (SwFrmFmt & rFmt, const OUString & rReference, bool bSuccessors, ::std::vector< OUString > & aPrevPageVec, ::std::vector< OUString > & aThisPageVec, ::std::vector< OUString > & aNextPageVec, @@ -752,7 +752,7 @@ public: void ParkCursorInTab(); SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot); - sal_Bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); + bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, const Point& _rDocPos ) const; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index ddf1c3274b87..0d1724f542e3 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -285,7 +285,7 @@ private: bool m_bUseFieldValueCache; /// control the usage of the cached field value sal_uInt16 nLang; ///< Always change via SetLanguage! - sal_Bool bIsAutomaticLanguage; + bool bIsAutomaticLanguage; sal_uInt32 nFormat; SwFieldType* pType; @@ -356,11 +356,11 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); /// Does the field possess an action on its ClickHandler? (e.g. INetFields, ...). - sal_Bool HasClickHdl() const; - sal_Bool IsFixed() const; + bool HasClickHdl() const; + bool IsFixed() const; - sal_Bool IsAutomaticLanguage() const { return bIsAutomaticLanguage;} - void SetAutomaticLanguage(sal_Bool bSet){bIsAutomaticLanguage = bSet;} + bool IsAutomaticLanguage() const { return bIsAutomaticLanguage;} + void SetAutomaticLanguage(bool bSet){bIsAutomaticLanguage = bSet;} virtual OUString GetDescription() const; /// Is this field clickable? @@ -380,7 +380,7 @@ inline sal_uInt16 SwField::GetLanguage() const class SwValueFieldType : public SwFieldType { SwDoc* pDoc; - sal_Bool bUseFormat; ///< Use number formatter. + bool bUseFormat; ///< Use number formatter. protected: SwValueFieldType( SwDoc* pDocPtr, sal_uInt16 nWhichId ); @@ -390,8 +390,8 @@ public: inline SwDoc* GetDoc() const { return pDoc; } inline void SetDoc(SwDoc* pNewDoc) { pDoc = pNewDoc; } - inline sal_Bool UseFormat() const { return bUseFormat; } - inline void EnableFormat(sal_Bool bFormat = sal_True) { bUseFormat = bFormat; } + inline bool UseFormat() const { return bUseFormat; } + inline void EnableFormat(bool bFormat = true) { bUseFormat = bFormat; } OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const; OUString DoubleToString(const double &rVal, LanguageType eLng) const; diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index fa07bd5c5c52..8593b8d6d86b 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -108,14 +108,14 @@ public: virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; virtual OUString GetPar2() const SAL_OVERRIDE; - inline sal_Bool IsDate() const + inline bool IsDate() const { return (nSubType & DATEFLD) != 0; } inline void SetOffset(long nMinutes) { nOffset = nMinutes; } inline long GetOffset() const { return nOffset; } - Date GetDate(sal_Bool bUseOffset = sal_False) const; - Time GetTime(sal_Bool bUseOffset = sal_False) const; + Date GetDate(bool bUseOffset = false) const; + Time GetTime(bool bUseOffset = false) const; void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index 448bb9e854c9..f44c03af08a5 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -215,7 +215,7 @@ public: @retval sal_True the selected item was successfully set @retval sal_True failure (empty selection) */ - sal_Bool SetSelectedItem(const OUString & rItem); + bool SetSelectedItem(const OUString & rItem); /** Sets the name of the field. diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index b27210c9b268..366511cbf7b8 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -73,10 +73,10 @@ public: void SetAnchor( const SwPosition *pPos ); }; -inline const SwFmtAnchor &SwAttrSet::GetAnchor(sal_Bool bInP) const +inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); } - inline const SwFmtAnchor &SwFmt::GetAnchor(sal_Bool bInP) const + inline const SwFmtAnchor &SwFmt::GetAnchor(bool bInP) const { return aSet.GetAnchor(bInP); } #endif diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 5ded377618a6..6819f36f929f 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -27,17 +27,17 @@ class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem { public: - SwFmtNoBalancedColumns( sal_Bool bFlag = sal_False ) + SwFmtNoBalancedColumns( bool bFlag = false ) : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(sal_Bool bInP) const +inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); } -inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(sal_Bool bInP) const +inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(bool bInP) const { return aSet.GetBalancedColumns( bInP ); } #endif diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 4c7231248af8..db50129b77d5 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -41,7 +41,7 @@ class SwColumn public: SwColumn(); - sal_Bool operator==( const SwColumn & ) const; + bool operator==( const SwColumn & ) const; void SetWishWidth( sal_uInt16 nNew ) { nWish = nNew; } void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } @@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem sal_uInt16 nWidth; ///< Total desired width of all columns. sal_Int16 aWidthAdjustValue; - sal_Bool bOrtho; /**< Only if this flag is set, the setting of GutterWidth will + bool bOrtho; /**< Only if this flag is set, the setting of GutterWidth will be accompanied by a "visual rearrangement". The flag must be reset if widths of columns or borders are changed. When it is set (again) the visual arrangement is recalculated. @@ -120,13 +120,13 @@ public: const Color& GetLineColor() const { return aLineColor;} SwColLineAdj GetLineAdj() const { return eAdj; } - sal_Bool IsOrtho() const { return bOrtho; } + bool IsOrtho() const { return bOrtho; } sal_uInt16 GetWishWidth() const { return nWidth; } sal_uInt8 GetLineHeight()const { return nLineHeight; } /** @return USHRT_MAX if ambiguous. @return smallest width if bMin is true. */ - sal_uInt16 GetGutterWidth( sal_Bool bMin = sal_False ) const; + sal_uInt16 GetGutterWidth( bool bMin = false ) const; void SetLineStyle(editeng::SvxBorderStyle eStyle) { eLineStyle = eStyle;} void SetLineWidth(sal_uLong nLWidth) { nLineWidth = nLWidth;} @@ -147,10 +147,10 @@ public: /** This too re-arranges columns automatically if flag is set. Only in this case the second parameter is needed and evaluated. */ - void SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); + void SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); /// For the reader - void _SetOrtho( sal_Bool bNew ) { bOrtho = bNew; } + void _SetOrtho( bool bNew ) { bOrtho = bNew; } /** Calculates current width of column nCol. The ratio of desired width of this column to return value is @@ -162,10 +162,10 @@ public: sal_uInt16 CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const; }; -inline const SwFmtCol &SwAttrSet::GetCol(sal_Bool bInP) const +inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const { return (const SwFmtCol&)Get( RES_COL,bInP); } -inline const SwFmtCol &SwFmt::GetCol(sal_Bool bInP) const +inline const SwFmtCol &SwFmt::GetCol(bool bInP) const { return aSet.GetCol(bInP); } #endif diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 4d69b242ec49..e677d6434f96 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -64,10 +64,10 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy ) return *this; } -inline const SwFmtChain &SwAttrSet::GetChain(sal_Bool bInP) const +inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } -inline const SwFmtChain &SwFmt::GetChain(sal_Bool bInP) const +inline const SwFmtChain &SwFmt::GetChain(bool bInP) const { return aSet.GetChain(bInP); } #endif diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 7545bfdcbd0f..c56011c744b6 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -46,10 +46,10 @@ public: void SetNewCntntIdx( const SwNodeIndex *pIdx ); }; -inline const SwFmtCntnt &SwAttrSet::GetCntnt(sal_Bool bInP) const +inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } -inline const SwFmtCntnt &SwFmt::GetCntnt(sal_Bool bInP) const +inline const SwFmtCntnt &SwFmt::GetCntnt(bool bInP) const { return aSet.GetCntnt(bInP); } #endif diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 93586fcd3ec0..99853a0eb497 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -30,7 +30,7 @@ class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem { public: SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY, - sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} + bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} /// "pure virtual methos" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -41,10 +41,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(sal_Bool bInP) const +inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const { return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); } -inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(sal_Bool bInP) const +inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(bool bInP) const { return aSet.GetEditInReadonly(bInP); } #endif diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index b1e89ecde91e..3871cf4fc0e8 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -102,7 +102,7 @@ public: void RegisterToFieldType( SwFieldType& ); bool IsFldInDoc() const; - sal_Bool IsProtect() const; + bool IsProtect() const; SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextField> const& GetXTextField() const diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 776518d71da6..4bba61e2bc45 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -29,7 +29,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem { public: - SwFmtFollowTextFlow( sal_Bool bFlag = sal_False ) + SwFmtFollowTextFlow( bool bFlag = false ) : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {} TYPEINFO_OVERRIDE(); @@ -43,10 +43,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(sal_Bool bInP) const +inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const { return (const SwFmtFollowTextFlow&)Get( RES_FOLLOW_TEXT_FLOW, bInP ); } -inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(sal_Bool bInP) const +inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(bool bInP) const { return aSet.GetFollowTextFlow( bInP ); } #endif diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index b2ca7788a6b1..a29d3c06ded8 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -52,10 +52,10 @@ inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy ) return *this; } -inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(sal_Bool bInP) const +inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(bool bInP) const { return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); } -inline const SwFmtFillOrder &SwFmt::GetFillOrder(sal_Bool bInP) const +inline const SwFmtFillOrder &SwFmt::GetFillOrder(bool bInP) const { return aSet.GetFillOrder(bInP); } #endif diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index e10e9c0e3892..5774178905f6 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -99,10 +99,10 @@ public: void SetWidthPercentRelation ( sal_Int16 n ) { m_eWidthPercentRelation = n; } }; -inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(sal_Bool bInP) const +inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); } -inline const SwFmtFrmSize &SwFmt::GetFrmSize(sal_Bool bInP) const +inline const SwFmtFrmSize &SwFmt::GetFrmSize(bool bInP) const { return aSet.GetFrmSize(bInP); } #endif diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 3d65769620b7..038b68231158 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -68,7 +68,7 @@ public: void GetFtnText( OUString& rStr ) const; /// Returns string to be displayed of footnote / endnote. - OUString GetViewNumStr( const SwDoc& rDoc, sal_Bool bInclStrs = sal_False ) const; + OUString GetViewNumStr( const SwDoc& rDoc, bool bInclStrs = false ) const; }; #endif diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 1292aa58b82c..26ec1ca4d7da 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -65,7 +65,7 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - inline sal_Bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } + inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr ); @@ -106,14 +106,14 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(sal_Bool bInP) const +inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(bool bInP) const { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); } -inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(sal_Bool bInP) const +inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(bool bInP) const { return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); } -inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(sal_Bool bInP) const +inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(bool bInP) const { return aSet.GetFtnAtTxtEnd(bInP); } -inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(sal_Bool bInP) const +inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(bool bInP) const { return aSet.GetEndAtTxtEnd(bInP); } #endif diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index ce0574650fb4..ca09e16ece7e 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -33,10 +33,10 @@ class SwFmt; class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient { - sal_Bool bActive; ///< Only for controlling (creation of content). + bool bActive; ///< Only for controlling (creation of content). public: - SwFmtHeader( sal_Bool bOn = sal_False ); + SwFmtHeader( bool bOn = false ); SwFmtHeader( SwFrmFmt *pHeaderFmt ); SwFmtHeader( const SwFmtHeader &rCpy ); virtual ~SwFmtHeader(); @@ -57,8 +57,8 @@ public: SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)GetRegisteredIn(); } void RegisterToFormat( SwFmt& rFmt ); - sal_Bool IsActive() const { return bActive; } - void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; } + bool IsActive() const { return bActive; } + void SetActive( bool bNew = true ) { bActive = bNew; } }; /**Footer, for pageformats @@ -66,10 +66,10 @@ public: class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient { - sal_Bool bActive; // Only for controlling (creation of content). + bool bActive; // Only for controlling (creation of content). public: - SwFmtFooter( sal_Bool bOn = sal_False ); + SwFmtFooter( bool bOn = false ); SwFmtFooter( SwFrmFmt *pFooterFmt ); SwFmtFooter( const SwFmtFooter &rCpy ); virtual ~SwFmtFooter(); @@ -90,18 +90,18 @@ public: SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)GetRegisteredIn(); } void RegisterToFormat( SwFmt& rFmt ); - sal_Bool IsActive() const { return bActive; } - void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; } + bool IsActive() const { return bActive; } + void SetActive( bool bNew = true ) { bActive = bNew; } }; -inline const SwFmtHeader &SwAttrSet::GetHeader(sal_Bool bInP) const +inline const SwFmtHeader &SwAttrSet::GetHeader(bool bInP) const { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } -inline const SwFmtFooter &SwAttrSet::GetFooter(sal_Bool bInP) const +inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const { return (const SwFmtFooter&)Get( RES_FOOTER,bInP); } -inline const SwFmtHeader &SwFmt::GetHeader(sal_Bool bInP) const +inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const { return aSet.GetHeader(bInP); } -inline const SwFmtFooter &SwFmt::GetFooter(sal_Bool bInP) const +inline const SwFmtFooter &SwFmt::GetFooter(bool bInP) const { return aSet.GetFooter(bInP); } #endif diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 6ab4031b5346..096bfa45dcc5 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -29,7 +29,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem { sal_uLong nStartValue :24; ///< Starting value for the paragraph. 0 == no starting value. - sal_uLong bCountLines :1; ///< Also count lines of paragraph. + bool bCountLines :1; ///< Also count lines of paragraph. public: SwFmtLineNumber(); @@ -49,13 +49,13 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; sal_uLong GetStartValue() const { return nStartValue; } - sal_Bool IsCount() const { return bCountLines != 0; } + bool IsCount() const { return bCountLines; } void SetStartValue( sal_uLong nNew ) { nStartValue = nNew; } - void SetCountLines( sal_Bool b ) { bCountLines = b; } + void SetCountLines( bool b ) { bCountLines = b; } }; -inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(sal_Bool bInP) const +inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(bool bInP) const { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); } #endif diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 0ba80aad46b4..dfb0365558f9 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -29,7 +29,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem { public: - SwFmtLayoutSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} + SwFmtLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -40,10 +40,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(sal_Bool bInP) const +inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); } -inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(sal_Bool bInP) const +inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(bool bInP) const { return aSet.GetLayoutSplit(bInP); } #endif diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index a967823700a7..2e7e01b4fca8 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -69,11 +69,11 @@ class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem SwTwips nXPos; ///< Contains *always* the current RelPos. sal_Int16 eOrient; sal_Int16 eRelation; - sal_Bool bPosToggle : 1; ///< Flip position on even pages. + bool bPosToggle : 1; ///< Flip position on even pages. public: TYPEINFO_OVERRIDE(); SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE, - sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, sal_Bool bPos = sal_False ); + sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, bool bPos = false ); inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. @@ -95,8 +95,8 @@ public: SwTwips GetPos() const { return nXPos; } void SetPos( SwTwips nNew ) { nXPos = nNew; } - sal_Bool IsPosToggle() const { return bPosToggle; } - void SetPosToggle( sal_Bool bNew ) { bPosToggle = bNew; } + bool IsPosToggle() const { return bPosToggle; } + void SetPosToggle( bool bNew ) { bPosToggle = bNew; } }; inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy ) @@ -115,14 +115,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } -inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(sal_Bool bInP) const +inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(bool bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } -inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(sal_Bool bInP) const +inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const { return (const SwFmtHoriOrient&)Get( RES_HORI_ORIENT,bInP); } -inline const SwFmtVertOrient &SwFmt::GetVertOrient(sal_Bool bInP) const +inline const SwFmtVertOrient &SwFmt::GetVertOrient(bool bInP) const { return aSet.GetVertOrient(bInP); } -inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(sal_Bool bInP) const +inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(bool bInP) const { return aSet.GetHoriOrient(bInP); } #endif diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 88924a0478da..ce5cd4b0f5bb 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient { /** This "Doc"-function is made friend in order to be able to set the auto-flag after copying!! */ - friend sal_Bool InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, sal_uInt16, + friend bool InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, sal_uInt16, SwHistory* ); ::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number. sal_uInt16 nDescNameIdx; ///< SW3-Reader: stringpool-index of style name. @@ -82,10 +82,10 @@ public: bool KnowsPageDesc() const; }; -inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(sal_Bool bInP) const +inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } -inline const SwFmtPageDesc &SwFmt::GetPageDesc(sal_Bool bInP) const +inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const { return aSet.GetPageDesc(bInP); } #endif diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index b14edc0a2689..b4d0151a5a64 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -29,7 +29,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem { public: - SwFmtRowSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} + SwFmtRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -40,10 +40,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(sal_Bool bInP) const +inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(bool bInP) const { return (const SwFmtRowSplit&)Get( RES_ROW_SPLIT,bInP); } -inline const SwFmtRowSplit &SwFmt::GetRowSplit(sal_Bool bInP) const +inline const SwFmtRowSplit &SwFmt::GetRowSplit(bool bInP) const { return aSet.GetRowSplit(bInP); } #endif diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 5f974b3ddc56..c9687ffbbfed 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -30,9 +30,9 @@ class IntlWrapper; // SwFmtSurround: How document content under the frame shall behave. class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem { - sal_Bool bAnchorOnly :1; - sal_Bool bContour :1; - sal_Bool bOutside :1; + bool bAnchorOnly :1; + bool bContour :1; + bool bOutside :1; public: SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL ); SwFmtSurround( const SwFmtSurround & ); @@ -51,13 +51,13 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwSurround GetSurround()const { return SwSurround( GetValue() ); } - sal_Bool IsAnchorOnly() const { return bAnchorOnly; } - sal_Bool IsContour() const { return bContour; } - sal_Bool IsOutside() const { return bOutside; } + bool IsAnchorOnly() const { return bAnchorOnly; } + bool IsContour() const { return bContour; } + bool IsOutside() const { return bOutside; } void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( sal_uInt16( eNew ) ); } - void SetAnchorOnly( sal_Bool bNew ) { bAnchorOnly = bNew; } - void SetContour( sal_Bool bNew ) { bContour = bNew; } - void SetOutside( sal_Bool bNew ) { bOutside = bNew; } + void SetAnchorOnly( bool bNew ) { bAnchorOnly = bNew; } + void SetContour( bool bNew ) { bContour = bNew; } + void SetOutside( bool bNew ) { bOutside = bNew; } }; inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) @@ -69,10 +69,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) return *this; } -inline const SwFmtSurround &SwAttrSet::GetSurround(sal_Bool bInP) const +inline const SwFmtSurround &SwAttrSet::GetSurround(bool bInP) const { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } -inline const SwFmtSurround &SwFmt::GetSurround(sal_Bool bInP) const +inline const SwFmtSurround &SwFmt::GetSurround(bool bInP) const { return aSet.GetSurround(bInP); } #endif diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index c50589267234..b39b8f7c5372 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -73,10 +73,10 @@ public: void SetName( const OUString& rNm ) { sName = rNm; } }; -inline const SwFmtURL &SwAttrSet::GetURL(sal_Bool bInP) const +inline const SwFmtURL &SwAttrSet::GetURL(bool bInP) const { return (const SwFmtURL&)Get( RES_URL,bInP); } -inline const SwFmtURL &SwFmt::GetURL(sal_Bool bInP) const +inline const SwFmtURL &SwFmt::GetURL(bool bInP) const { return aSet.GetURL(bInP); } #endif diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 454d5172ef6c..de88d4b4453a 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -58,10 +58,10 @@ public: const bool _bIterativeAsOnceConcurrent = false ) const; }; -inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(sal_Bool bInP) const +inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const { return (const SwFmtWrapInfluenceOnObjPos&)Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP); } - inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(sal_Bool bInP) const + inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(bool bInP) const { return aSet.GetWrapInfluenceOnObjPos(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 1d0f06ee8048..95aa7bf81ea0 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwFmt : public SwModify default is true! */ bool bFmtInDTOR : 1; /**< TRUE: Format becomes deleted. In order to be able to recognize this in FmtChg-message!! */ - sal_Bool bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph + bool bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph at format (UI-side!). */ bool bHidden : 1; boost::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag. @@ -79,21 +79,21 @@ public: virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; /// Copy attributes even among documents. - void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True ); + void CopyAttrs( const SwFmt&, bool bReplace=true ); /// Delete all attributes that are not in rFmt. void DelDiffs( const SfxItemSet& rSet ); void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); } /// 0 is Default. - sal_Bool SetDerivedFrom(SwFmt *pDerivedFrom = 0); + bool SetDerivedFrom(SwFmt *pDerivedFrom = 0); /// If bInParents is FALSE, search only in this format for attribute. //UUUUinline const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich, - sal_Bool bInParents = sal_True ) const; + bool bInParents = true ) const; //UUUUinline - SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True, + SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true, const SfxPoolItem **ppItem = 0 ) const; virtual bool SetFmtAttr( const SfxPoolItem& rAttr ); virtual bool SetFmtAttr( const SfxItemSet& rSet ); @@ -107,9 +107,9 @@ public: inline bool IsDefault() const { return DerivedFrom() == 0; } inline OUString GetName() const { return aFmtName; } - void SetName( const OUString& rNewName, sal_Bool bBroadcast=sal_False ); + void SetName( const OUString& rNewName, bool bBroadcast=false ); inline void SetName( const sal_Char* pNewName, - sal_Bool bBroadcast=sal_False); + bool bBroadcast=false); /// For querying the attribute array. inline const SwAttrSet& GetAttrSet() const { return aSet; } @@ -168,8 +168,8 @@ public: void SetGrabBagItem(const com::sun::star::uno::Any& rVal); /// Query / set bAutoUpdateFmt-flag. - sal_Bool IsAutoUpdateFmt() const { return bAutoUpdateFmt; } - void SetAutoUpdateFmt( sal_Bool bNew = sal_True ) { bAutoUpdateFmt = bNew; } + bool IsAutoUpdateFmt() const { return bAutoUpdateFmt; } + void SetAutoUpdateFmt( bool bNew = true ) { bAutoUpdateFmt = bNew; } bool IsFmtInDTOR() const { return bFmtInDTOR; } @@ -178,130 +178,130 @@ public: If nothing is found the defaulted attribute is returned. */ /// Character-attributes - implemented in charatr.hxx - inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const; - inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const; - inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const; - inline const SvxAutoKernItem &GetAutoKern( sal_Bool = sal_True ) const; - inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const; - inline const SvxContourItem &GetContour( sal_Bool = sal_True ) const; - inline const SvxKerningItem &GetKerning( sal_Bool = sal_True ) const; - inline const SvxUnderlineItem &GetUnderline( sal_Bool = sal_True ) const; - inline const SvxOverlineItem &GetOverline( sal_Bool = sal_True ) const; - inline const SvxCrossedOutItem &GetCrossedOut( sal_Bool = sal_True ) const; - inline const SvxFontHeightItem &GetSize( sal_Bool = sal_True ) const; - inline const SvxPropSizeItem &GetPropSize( sal_Bool = sal_True ) const; - inline const SvxFontItem &GetFont( sal_Bool = sal_True ) const; - inline const SvxColorItem &GetColor( sal_Bool = sal_True ) const; - inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const; - inline const SvxLanguageItem &GetLanguage( sal_Bool = sal_True ) const; - inline const SvxEscapementItem &GetEscapement( sal_Bool = sal_True ) const; - inline const SvxCaseMapItem &GetCaseMap( sal_Bool = sal_True ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( sal_Bool = sal_True ) const; - inline const SvxBlinkItem &GetBlink( sal_Bool = sal_True ) const; - inline const SvxBrushItem &GetChrBackground( sal_Bool = sal_True ) const; - inline const SvxBrushItem &GetChrHighlight( sal_Bool = sal_True ) const; - - inline const SvxFontItem &GetCJKFont( sal_Bool = sal_True ) const; - inline const SvxFontHeightItem &GetCJKSize( sal_Bool = sal_True ) const; - inline const SvxLanguageItem &GetCJKLanguage( sal_Bool = sal_True ) const; - inline const SvxPostureItem &GetCJKPosture( sal_Bool = sal_True ) const; - inline const SvxWeightItem &GetCJKWeight( sal_Bool = sal_True ) const; - inline const SvxFontItem &GetCTLFont( sal_Bool = sal_True ) const; - inline const SvxFontHeightItem &GetCTLSize( sal_Bool = sal_True ) const; - inline const SvxLanguageItem &GetCTLLanguage( sal_Bool = sal_True ) const; - inline const SvxPostureItem &GetCTLPosture( sal_Bool = sal_True ) const; - inline const SvxWeightItem &GetCTLWeight( sal_Bool = sal_True ) const; - inline const SfxBoolItem &GetWritingDirection( sal_Bool = sal_True ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const; - inline const SvxTwoLinesItem &Get2Lines( sal_Bool = sal_True ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const; - inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; - inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; - inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; - inline const SvxBoxItem &GetCharBorder( sal_Bool = sal_True ) const; - inline const SvxShadowItem &GetCharShadow( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetPosture( bool = true ) const; + inline const SvxWeightItem &GetWeight( bool = true ) const; + inline const SvxShadowedItem &GetShadowed( bool = true ) const; + inline const SvxAutoKernItem &GetAutoKern( bool = true ) const; + inline const SvxWordLineModeItem &GetWordLineMode( bool = true ) const; + inline const SvxContourItem &GetContour( bool = true ) const; + inline const SvxKerningItem &GetKerning( bool = true ) const; + inline const SvxUnderlineItem &GetUnderline( bool = true ) const; + inline const SvxOverlineItem &GetOverline( bool = true ) const; + inline const SvxCrossedOutItem &GetCrossedOut( bool = true ) const; + inline const SvxFontHeightItem &GetSize( bool = true ) const; + inline const SvxPropSizeItem &GetPropSize( bool = true ) const; + inline const SvxFontItem &GetFont( bool = true ) const; + inline const SvxColorItem &GetColor( bool = true ) const; + inline const SvxCharSetColorItem &GetCharSetColor( bool = true ) const; + inline const SvxLanguageItem &GetLanguage( bool = true ) const; + inline const SvxEscapementItem &GetEscapement( bool = true ) const; + inline const SvxCaseMapItem &GetCaseMap( bool = true ) const; + inline const SvxNoHyphenItem &GetNoHyphenHere( bool = true ) const; + inline const SvxBlinkItem &GetBlink( bool = true ) const; + inline const SvxBrushItem &GetChrBackground( bool = true ) const; + inline const SvxBrushItem &GetChrHighlight( bool = true ) const; + + inline const SvxFontItem &GetCJKFont( bool = true ) const; + inline const SvxFontHeightItem &GetCJKSize( bool = true ) const; + inline const SvxLanguageItem &GetCJKLanguage( bool = true ) const; + inline const SvxPostureItem &GetCJKPosture( bool = true ) const; + inline const SvxWeightItem &GetCJKWeight( bool = true ) const; + inline const SvxFontItem &GetCTLFont( bool = true ) const; + inline const SvxFontHeightItem &GetCTLSize( bool = true ) const; + inline const SvxLanguageItem &GetCTLLanguage( bool = true ) const; + inline const SvxPostureItem &GetCTLPosture( bool = true ) const; + inline const SvxWeightItem &GetCTLWeight( bool = true ) const; + inline const SfxBoolItem &GetWritingDirection( bool = true ) const; + inline const SvxEmphasisMarkItem &GetEmphasisMark( bool = true ) const; + inline const SvxTwoLinesItem &Get2Lines( bool = true ) const; + inline const SvxCharScaleWidthItem &GetCharScaleW( bool = true ) const; + inline const SvxCharRotateItem &GetCharRotate( bool = true ) const; + inline const SvxCharReliefItem &GetCharRelief( bool = true ) const; + inline const SvxCharHiddenItem &GetCharHidden( bool = true ) const; + inline const SvxBoxItem &GetCharBorder( bool = true ) const; + inline const SvxShadowItem &GetCharShadow( bool = true ) const; /// Frame-attributes - implemented in frmatr.hxx. - inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; - inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const; - inline const SwFmtHeader &GetHeader( sal_Bool = sal_True ) const; - inline const SwFmtFooter &GetFooter( sal_Bool = sal_True ) const; - inline const SwFmtSurround &GetSurround( sal_Bool = sal_True ) const; - inline const SwFmtHoriOrient &GetHoriOrient( sal_Bool = sal_True ) const; - inline const SwFmtAnchor &GetAnchor( sal_Bool = sal_True ) const; - inline const SwFmtCol &GetCol( sal_Bool = sal_True ) const; - inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const; - inline const SvxLRSpaceItem &GetLRSpace( sal_Bool = sal_True ) const; - inline const SvxULSpaceItem &GetULSpace( sal_Bool = sal_True ) const; - inline const SwFmtCntnt &GetCntnt( sal_Bool = sal_True ) const; - inline const SvxPrintItem &GetPrint( sal_Bool = sal_True ) const; - inline const SvxOpaqueItem &GetOpaque( sal_Bool = sal_True ) const; - inline const SvxProtectItem &GetProtect( sal_Bool = sal_True ) const; - inline const SwFmtVertOrient &GetVertOrient( sal_Bool = sal_True ) const; - inline const SvxBoxItem &GetBox( sal_Bool = sal_True ) const; - inline const SvxFmtKeepItem &GetKeep( sal_Bool = sal_True ) const; + inline const SwFmtFillOrder &GetFillOrder( bool = true ) const; + inline const SwFmtFrmSize &GetFrmSize( bool = true ) const; + inline const SwFmtHeader &GetHeader( bool = true ) const; + inline const SwFmtFooter &GetFooter( bool = true ) const; + inline const SwFmtSurround &GetSurround( bool = true ) const; + inline const SwFmtHoriOrient &GetHoriOrient( bool = true ) const; + inline const SwFmtAnchor &GetAnchor( bool = true ) const; + inline const SwFmtCol &GetCol( bool = true ) const; + inline const SvxPaperBinItem &GetPaperBin( bool = true ) const; + inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const; + inline const SvxULSpaceItem &GetULSpace( bool = true ) const; + inline const SwFmtCntnt &GetCntnt( bool = true ) const; + inline const SvxPrintItem &GetPrint( bool = true ) const; + inline const SvxOpaqueItem &GetOpaque( bool = true ) const; + inline const SvxProtectItem &GetProtect( bool = true ) const; + inline const SwFmtVertOrient &GetVertOrient( bool = true ) const; + inline const SvxBoxItem &GetBox( bool = true ) const; + inline const SvxFmtKeepItem &GetKeep( bool = true ) const; //UUUU - const SvxBrushItem& GetBackground( sal_Bool = sal_True ) const; - - inline const SvxShadowItem &GetShadow( sal_Bool = sal_True ) const; - inline const SwFmtPageDesc &GetPageDesc( sal_Bool = sal_True ) const; - inline const SvxFmtBreakItem &GetBreak( sal_Bool = sal_True ) const; - inline const SvxMacroItem &GetMacro( sal_Bool = sal_True ) const; - inline const SwFmtURL &GetURL( sal_Bool = sal_True ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( sal_Bool = sal_True ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( sal_Bool = sal_True ) const; - inline const SwFmtRowSplit &GetRowSplit( sal_Bool = sal_True ) const; - inline const SwFmtChain &GetChain( sal_Bool = sal_True ) const; - inline const SwFmtLineNumber &GetLineNumber( sal_Bool = sal_True ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( sal_Bool = sal_True ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( sal_Bool = sal_True ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const; - inline const SvxFrameDirectionItem &GetFrmDir( sal_Bool = sal_True ) const; - inline const SwTextGridItem &GetTextGrid( sal_Bool = sal_True ) const; - inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const; + const SvxBrushItem& GetBackground( bool = true ) const; + + inline const SvxShadowItem &GetShadow( bool = true ) const; + inline const SwFmtPageDesc &GetPageDesc( bool = true ) const; + inline const SvxFmtBreakItem &GetBreak( bool = true ) const; + inline const SvxMacroItem &GetMacro( bool = true ) const; + inline const SwFmtURL &GetURL( bool = true ) const; + inline const SwFmtEditInReadonly &GetEditInReadonly( bool = true ) const; + inline const SwFmtLayoutSplit &GetLayoutSplit( bool = true ) const; + inline const SwFmtRowSplit &GetRowSplit( bool = true ) const; + inline const SwFmtChain &GetChain( bool = true ) const; + inline const SwFmtLineNumber &GetLineNumber( bool = true ) const; + inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( bool = true ) const; + inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( bool = true ) const; + inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const; + inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; + inline const SwTextGridItem &GetTextGrid( bool = true ) const; + inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; // #i18732# - inline const SwFmtFollowTextFlow &GetFollowTextFlow(sal_Bool = sal_True) const; + inline const SwFmtFollowTextFlow &GetFollowTextFlow(bool = true) const; // #i28701# - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const; - inline const SdrTextVertAdjustItem& GetTextVertAdjust(sal_Bool = sal_True) const; + inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; + inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const; /// Graphics-attributes - implemented in grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( sal_Bool = sal_True ) const; - inline const SwCropGrf &GetCropGrf( sal_Bool = sal_True ) const; - inline const SwRotationGrf &GetRotationGrf(sal_Bool = sal_True ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(sal_Bool = sal_True ) const; - inline const SwContrastGrf &GetContrastGrf(sal_Bool = sal_True ) const; - inline const SwChannelRGrf &GetChannelRGrf(sal_Bool = sal_True ) const; - inline const SwChannelGGrf &GetChannelGGrf(sal_Bool = sal_True ) const; - inline const SwChannelBGrf &GetChannelBGrf(sal_Bool = sal_True ) const; - inline const SwGammaGrf &GetGammaGrf(sal_Bool = sal_True ) const; - inline const SwInvertGrf &GetInvertGrf(sal_Bool = sal_True ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(sal_Bool = sal_True ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(sal_Bool = sal_True ) const; + inline const SwMirrorGrf &GetMirrorGrf( bool = true ) const; + inline const SwCropGrf &GetCropGrf( bool = true ) const; + inline const SwRotationGrf &GetRotationGrf(bool = true ) const; + inline const SwLuminanceGrf &GetLuminanceGrf(bool = true ) const; + inline const SwContrastGrf &GetContrastGrf(bool = true ) const; + inline const SwChannelRGrf &GetChannelRGrf(bool = true ) const; + inline const SwChannelGGrf &GetChannelGGrf(bool = true ) const; + inline const SwChannelBGrf &GetChannelBGrf(bool = true ) const; + inline const SwGammaGrf &GetGammaGrf(bool = true ) const; + inline const SwInvertGrf &GetInvertGrf(bool = true ) const; + inline const SwTransparencyGrf &GetTransparencyGrf(bool = true ) const; + inline const SwDrawModeGrf &GetDrawModeGrf(bool = true ) const; /// Paragraph-attributes - implemented in paratr.hxx. - inline const SvxLineSpacingItem &GetLineSpacing( sal_Bool = sal_True ) const; - inline const SvxAdjustItem &GetAdjust( sal_Bool = sal_True ) const; - inline const SvxFmtSplitItem &GetSplit( sal_Bool = sal_True ) const; - inline const SwRegisterItem &GetRegister( sal_Bool = sal_True ) const; - inline const SwNumRuleItem &GetNumRule( sal_Bool = sal_True ) const; - inline const SvxWidowsItem &GetWidows( sal_Bool = sal_True ) const; - inline const SvxOrphansItem &GetOrphans( sal_Bool = sal_True ) const; - inline const SvxTabStopItem &GetTabStops( sal_Bool = sal_True ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( sal_Bool = sal_True ) const; - inline const SwFmtDrop &GetDrop( sal_Bool = sal_True ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(sal_Bool = sal_True) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(sal_Bool = sal_True) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const; - inline const SvxParaGridItem &GetParaGrid(sal_Bool = sal_True) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const; + inline const SvxLineSpacingItem &GetLineSpacing( bool = true ) const; + inline const SvxAdjustItem &GetAdjust( bool = true ) const; + inline const SvxFmtSplitItem &GetSplit( bool = true ) const; + inline const SwRegisterItem &GetRegister( bool = true ) const; + inline const SwNumRuleItem &GetNumRule( bool = true ) const; + inline const SvxWidowsItem &GetWidows( bool = true ) const; + inline const SvxOrphansItem &GetOrphans( bool = true ) const; + inline const SvxTabStopItem &GetTabStops( bool = true ) const; + inline const SvxHyphenZoneItem &GetHyphenZone( bool = true ) const; + inline const SwFmtDrop &GetDrop( bool = true ) const; + inline const SvxScriptSpaceItem &GetScriptSpace(bool = true) const; + inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const; + inline const SvxForbiddenRuleItem &GetForbiddenRule(bool = true) const; + inline const SvxParaVertAlignItem &GetParaVertAlign(bool = true) const; + inline const SvxParaGridItem &GetParaGrid(bool = true) const; + inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const; /// TableBox attributes - implemented in cellatr.hxx. - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( sal_Bool = sal_True ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; - inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; + inline const SwTblBoxNumFormat &GetTblBoxNumFmt( bool = true ) const; + inline const SwTblBoxFormula &GetTblBoxFormula( bool = true ) const; + inline const SwTblBoxValue &GetTblBoxValue( bool = true ) const; /** SwFmt::IsBackgroundTransparent @@ -334,18 +334,18 @@ public: // --------------- inline Implementations ------------------------ //UUUUinline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, -//UUUU sal_Bool bInParents ) const +//UUUU bool bInParents ) const //UUUU{ //UUUU return aSet.Get( nWhich, bInParents ); //UUUU} inline void SwFmt::SetName( const sal_Char* pNewName, - sal_Bool bBroadcast ) + bool bBroadcast ) { SetName(OUString::createFromAscii(pNewName), bBroadcast); } -//UUUUinline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, +//UUUUinline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, //UUUU const SfxPoolItem **ppItem ) const //UUUU{ //UUUU return aSet.GetItemState( nWhich, bSrchInParent, ppItem ); diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 0b97b3c3a5e5..adde000b9c84 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -25,63 +25,63 @@ // Inlines // Implementation of FrameAttribute methods of SwAttrSet. -inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(sal_Bool bInP) const +inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(bool bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } -inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(sal_Bool bInP) const +inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(bool bInP) const { return (const SvxLRSpaceItem&)Get( RES_LR_SPACE,bInP); } -inline const SvxULSpaceItem &SwAttrSet::GetULSpace(sal_Bool bInP) const +inline const SvxULSpaceItem &SwAttrSet::GetULSpace(bool bInP) const { return (const SvxULSpaceItem&)Get( RES_UL_SPACE,bInP); } -inline const SvxPrintItem &SwAttrSet::GetPrint(sal_Bool bInP) const +inline const SvxPrintItem &SwAttrSet::GetPrint(bool bInP) const { return (const SvxPrintItem&)Get( RES_PRINT,bInP); } -inline const SvxOpaqueItem &SwAttrSet::GetOpaque(sal_Bool bInP) const +inline const SvxOpaqueItem &SwAttrSet::GetOpaque(bool bInP) const { return (const SvxOpaqueItem&)Get( RES_OPAQUE,bInP); } -inline const SvxProtectItem &SwAttrSet::GetProtect(sal_Bool bInP) const +inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const { return (const SvxProtectItem&)Get( RES_PROTECT,bInP); } -inline const SvxBoxItem &SwAttrSet::GetBox(sal_Bool bInP) const +inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const { return (const SvxBoxItem&)Get( RES_BOX,bInP); } -inline const SvxFmtKeepItem &SwAttrSet::GetKeep(sal_Bool bInP) const +inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const { return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); } -inline const SvxBrushItem &SwAttrSet::GetBackground(sal_Bool bInP) const +inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const { return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); } -inline const SvxShadowItem &SwAttrSet::GetShadow(sal_Bool bInP) const +inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const { return (const SvxShadowItem&)Get( RES_SHADOW,bInP); } -inline const SvxFmtBreakItem &SwAttrSet::GetBreak(sal_Bool bInP) const +inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const { return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); } -inline const SvxMacroItem &SwAttrSet::GetMacro(sal_Bool bInP) const +inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const { return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); } -inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(sal_Bool bInP) const +inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const { return (const SvxFrameDirectionItem&)Get( RES_FRAMEDIR,bInP); } -inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(sal_Bool bInP) const +inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const { return (const SdrTextVertAdjustItem&)Get( RES_TEXT_VERT_ADJUST,bInP); } // Implementation of FrameAttribute methods of SwFmt. -inline const SvxPaperBinItem &SwFmt::GetPaperBin(sal_Bool bInP) const +inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const { return aSet.GetPaperBin(bInP); } -inline const SvxLRSpaceItem &SwFmt::GetLRSpace(sal_Bool bInP) const +inline const SvxLRSpaceItem &SwFmt::GetLRSpace(bool bInP) const { return aSet.GetLRSpace(bInP); } -inline const SvxULSpaceItem &SwFmt::GetULSpace(sal_Bool bInP) const +inline const SvxULSpaceItem &SwFmt::GetULSpace(bool bInP) const { return aSet.GetULSpace(bInP); } -inline const SvxPrintItem &SwFmt::GetPrint(sal_Bool bInP) const +inline const SvxPrintItem &SwFmt::GetPrint(bool bInP) const { return aSet.GetPrint(bInP); } -inline const SvxOpaqueItem &SwFmt::GetOpaque(sal_Bool bInP) const +inline const SvxOpaqueItem &SwFmt::GetOpaque(bool bInP) const { return aSet.GetOpaque(bInP); } -inline const SvxProtectItem &SwFmt::GetProtect(sal_Bool bInP) const +inline const SvxProtectItem &SwFmt::GetProtect(bool bInP) const { return aSet.GetProtect(bInP); } -inline const SvxBoxItem &SwFmt::GetBox(sal_Bool bInP) const +inline const SvxBoxItem &SwFmt::GetBox(bool bInP) const { return aSet.GetBox(bInP); } -inline const SvxFmtKeepItem &SwFmt::GetKeep(sal_Bool bInP) const +inline const SvxFmtKeepItem &SwFmt::GetKeep(bool bInP) const { return aSet.GetKeep(bInP); } //UUUUinline const SvxBrushItem &SwFmt::GetBackground(sal_Bool bInP) const //UUUU { return aSet.GetBackground(bInP); } -inline const SvxShadowItem &SwFmt::GetShadow(sal_Bool bInP) const +inline const SvxShadowItem &SwFmt::GetShadow(bool bInP) const { return aSet.GetShadow(bInP); } -inline const SvxFmtBreakItem &SwFmt::GetBreak(sal_Bool bInP) const +inline const SvxFmtBreakItem &SwFmt::GetBreak(bool bInP) const { return aSet.GetBreak(bInP); } -inline const SvxMacroItem &SwFmt::GetMacro(sal_Bool bInP) const +inline const SvxMacroItem &SwFmt::GetMacro(bool bInP) const { return aSet.GetMacro(bInP); } -inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(sal_Bool bInP) const +inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(bool bInP) const { return aSet.GetFrmDir(bInP); } -inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(sal_Bool bInP) const +inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(bool bInP) const { return aSet.GetTextVertAdjust(bInP); } #endif // INCLUDED_SW_INC_FRMATR_HXX diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index acd6a5e90071..03bda2e96c29 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -84,9 +84,9 @@ public: /** @return the real size of the frame - or an empty rectangle if no layout exists. If pPoint is given, look for the frame closest to it. */ - SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False, - const Point* pPoint = 0, - const sal_Bool bCalcFrm = sal_False ) const; + SwRect FindLayoutRect( const bool bPrtArea = false, + const Point* pPoint = 0, + const bool bCalcFrm = false ) const; /** Searches SdrObject. SdrObjUserCall is client of the format. The UserCall knows its SdrObject. */ @@ -106,7 +106,7 @@ public: const SdrObject *FindRealSdrObject() const { return ((SwFrmFmt*)this)->FindRealSdrObject(); } - sal_Bool IsLowerOf( const SwFrmFmt& rFmt ) const; + bool IsLowerOf( const SwFrmFmt& rFmt ) const; enum tLayoutDir { @@ -173,10 +173,10 @@ public: virtual void MakeFrms() SAL_OVERRIDE; SwFlyFrm* GetFrm( const Point* pDocPos = 0, - const sal_Bool bCalcFrm = sal_False ) const; + const bool bCalcFrm = false ) const; SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0, - const sal_Bool bCalcFrm = sal_False ) const; + const bool bCalcFrm = false ) const; virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE; diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 5c43030d039d..0aa3bddfff3d 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -40,11 +40,11 @@ RES_MIRROR_GRAPH_END class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem { - sal_Bool bGrfToggle; // Flip graphics on even pages. + bool bGrfToggle; // Flip graphics on even pages. public: SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT ) - : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< sal_uInt16 >(eMiro) ), bGrfToggle( sal_False ) + : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< sal_uInt16 >(eMiro) ), bGrfToggle( false ) {} SwMirrorGrf( const SwMirrorGrf &rMirrorGrf ) : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()), @@ -75,8 +75,8 @@ public: return *this; } - inline sal_Bool IsGrfToggle() const { return bGrfToggle; } - inline void SetGrfToggle( sal_Bool bNew ) { bGrfToggle = bNew; } + inline bool IsGrfToggle() const { return bGrfToggle; } + inline void SetGrfToggle( bool bNew ) { bGrfToggle = bNew; } }; class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop @@ -231,7 +231,7 @@ public: class SwInvertGrf: public SfxBoolItem { public: - SwInvertGrf( sal_Bool bVal = sal_False ) + SwInvertGrf( bool bVal = false ) : SfxBoolItem( RES_GRFATR_INVERT, bVal ) {} @@ -289,55 +289,55 @@ public: }; // Implementation of graphics attributes methods of SwAttr -inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(sal_Bool bInP) const +inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(bool bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } -inline const SwCropGrf &SwAttrSet::GetCropGrf(sal_Bool bInP) const +inline const SwCropGrf &SwAttrSet::GetCropGrf(bool bInP) const { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); } -inline const SwRotationGrf &SwAttrSet::GetRotationGrf(sal_Bool bInP) const +inline const SwRotationGrf &SwAttrSet::GetRotationGrf(bool bInP) const { return (const SwRotationGrf&)Get( RES_GRFATR_ROTATION,bInP); } -inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(sal_Bool bInP) const +inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(bool bInP) const { return (const SwLuminanceGrf&)Get( RES_GRFATR_LUMINANCE,bInP); } -inline const SwContrastGrf &SwAttrSet::GetContrastGrf(sal_Bool bInP) const +inline const SwContrastGrf &SwAttrSet::GetContrastGrf(bool bInP) const { return (const SwContrastGrf&)Get( RES_GRFATR_CONTRAST,bInP); } -inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(sal_Bool bInP) const +inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(bool bInP) const { return (const SwChannelRGrf&)Get( RES_GRFATR_CHANNELR,bInP); } -inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(sal_Bool bInP) const +inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(bool bInP) const { return (const SwChannelGGrf&)Get( RES_GRFATR_CHANNELG,bInP); } -inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(sal_Bool bInP) const +inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(bool bInP) const { return (const SwChannelBGrf&)Get( RES_GRFATR_CHANNELB,bInP); } -inline const SwGammaGrf &SwAttrSet::GetGammaGrf(sal_Bool bInP) const +inline const SwGammaGrf &SwAttrSet::GetGammaGrf(bool bInP) const { return (const SwGammaGrf&)Get( RES_GRFATR_GAMMA,bInP); } -inline const SwInvertGrf &SwAttrSet::GetInvertGrf(sal_Bool bInP) const +inline const SwInvertGrf &SwAttrSet::GetInvertGrf(bool bInP) const { return (const SwInvertGrf&)Get( RES_GRFATR_INVERT,bInP); } -inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(sal_Bool bInP) const +inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const { return (const SwTransparencyGrf&)Get( RES_GRFATR_TRANSPARENCY,bInP); } -inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(sal_Bool bInP) const +inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(bool bInP) const { return (const SwDrawModeGrf&)Get( RES_GRFATR_DRAWMODE,bInP); } // Implementation of graphics attributes methods of SwFmt -inline const SwMirrorGrf &SwFmt::GetMirrorGrf(sal_Bool bInP) const +inline const SwMirrorGrf &SwFmt::GetMirrorGrf(bool bInP) const { return aSet.GetMirrorGrf(bInP); } -inline const SwCropGrf &SwFmt::GetCropGrf(sal_Bool bInP) const +inline const SwCropGrf &SwFmt::GetCropGrf(bool bInP) const { return aSet.GetCropGrf(bInP); } -inline const SwRotationGrf &SwFmt::GetRotationGrf(sal_Bool bInP) const +inline const SwRotationGrf &SwFmt::GetRotationGrf(bool bInP) const { return aSet.GetRotationGrf(bInP); } -inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(sal_Bool bInP) const +inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(bool bInP) const { return aSet.GetLuminanceGrf( bInP); } -inline const SwContrastGrf &SwFmt::GetContrastGrf(sal_Bool bInP) const +inline const SwContrastGrf &SwFmt::GetContrastGrf(bool bInP) const { return aSet.GetContrastGrf( bInP); } -inline const SwChannelRGrf &SwFmt::GetChannelRGrf(sal_Bool bInP) const +inline const SwChannelRGrf &SwFmt::GetChannelRGrf(bool bInP) const { return aSet.GetChannelRGrf( bInP); } -inline const SwChannelGGrf &SwFmt::GetChannelGGrf(sal_Bool bInP) const +inline const SwChannelGGrf &SwFmt::GetChannelGGrf(bool bInP) const { return aSet.GetChannelGGrf( bInP); } -inline const SwChannelBGrf &SwFmt::GetChannelBGrf(sal_Bool bInP) const +inline const SwChannelBGrf &SwFmt::GetChannelBGrf(bool bInP) const { return aSet.GetChannelBGrf( bInP); } -inline const SwGammaGrf &SwFmt::GetGammaGrf(sal_Bool bInP) const +inline const SwGammaGrf &SwFmt::GetGammaGrf(bool bInP) const { return aSet.GetGammaGrf( bInP); } -inline const SwInvertGrf &SwFmt::GetInvertGrf(sal_Bool bInP) const +inline const SwInvertGrf &SwFmt::GetInvertGrf(bool bInP) const { return aSet.GetInvertGrf( bInP); } -inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(sal_Bool bInP) const +inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(bool bInP) const { return aSet.GetTransparencyGrf( bInP); } -inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(sal_Bool bInP) const +inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(bool bInP) const { return aSet.GetDrawModeGrf(bInP); } #endif // INCLUDED_SW_INC_GRFATR_HXX diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 38747bc392ff..573262081756 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -29,7 +29,7 @@ class SW_DLLPUBLIC SwHeaderAndFooterEatSpacingItem : public SfxBoolItem { public: SwHeaderAndFooterEatSpacingItem( sal_uInt16 nId = RES_HEADER_FOOTER_EAT_SPACING, - sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} + bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -40,10 +40,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const { return (const SwHeaderAndFooterEatSpacingItem&)Get( RES_HEADER_FOOTER_EAT_SPACING,bInP); } -inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(bool bInP) const { return aSet.GetHeaderAndFooterEatSpacing(bInP); } #endif diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index af4064a4fa4b..82eb27c8a22e 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -140,8 +140,8 @@ public: SwHistory* pHistory; sal_uInt16 nSplitLine; ///< Split: from this BaseLine on will be splitted TableFmlUpdtFlags eFlags; - sal_Bool bModified : 1; - sal_Bool bBehindSplitLine : 1; + bool bModified : 1; + bool bBehindSplitLine : 1; SwTableFmlUpdate( const SwTable* ); }; @@ -161,7 +161,7 @@ public: */ class SwAttrSetChg: public SwMsgPoolItem { - sal_Bool bDelSet; + bool bDelSet; SwAttrSet* pChgSet; ///< what has changed const SwAttrSet* pTheChgdSet; ///< is only used to compare public: diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 86c98a003224..0d6dd9ee9e78 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -73,10 +73,10 @@ public: SwHTMLTableLayoutCnts *GetNext() const { return pNext; } void SetWidthSet( sal_uInt8 nRef ) { nWidthSet = nRef; } - sal_Bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; } + bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; } void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; } - sal_Bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; } + bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; } bool HasNoBreakTag() const { return bNoBreakTag; } }; @@ -224,18 +224,18 @@ class SwHTMLTableLayout bool bPrcWidthOption : 1; ///< Width is given in percent. bool bUseRelWidth : 1; ///< SwTable gets relative width. - sal_Bool bMustResize : 1; ///< Table width must be defined. - sal_Bool bExportable : 1; ///< Layout may be used for export. - sal_Bool bBordersChanged : 1; ///< Borders have been changed. - sal_Bool bMayBeInFlyFrame : 1; ///< Table could be within frame. + bool bMustResize : 1; ///< Table width must be defined. + bool bExportable : 1; ///< Layout may be used for export. + bool bBordersChanged : 1; ///< Borders have been changed. + bool bMayBeInFlyFrame : 1; ///< Table could be within frame. - sal_Bool bDelayedResizeRecalc : 1; ///< Param for delayed Resize. - sal_Bool bMustNotResize : 1; ///< Table may not be resized. - sal_Bool bMustNotRecalc : 1; ///< Table may not be adapted to its contents. + bool bDelayedResizeRecalc : 1; ///< Param for delayed Resize. + bool bMustNotResize : 1; ///< Table may not be resized. + bool bMustNotRecalc : 1; ///< Table may not be adapted to its contents. void AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax, sal_uLong& rAbsMin, sal_uInt16 nCol, sal_uInt16 nColSpan, - sal_Bool bSwBorders=sal_True ) const; + bool bSwBorders=true ) const; void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const; const SwStartNode *GetAnyBoxStartNode() const; @@ -244,7 +244,7 @@ class SwHTMLTableLayout void ClearPass1Info() { nMin = nMax = 0; } - void _Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False ); + void _Resize( sal_uInt16 nAbsAvail, bool bRecalc=false ); DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* ); @@ -262,9 +262,9 @@ public: ~SwHTMLTableLayout(); sal_uInt16 GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, - sal_Bool bSwBorders=sal_True ) const; + bool bSwBorders=true ) const; sal_uInt16 GetRightCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, - sal_Bool bSwBorders=sal_True ) const; + bool bSwBorders=true ) const; inline sal_uInt16 GetInhCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; inline void SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ); @@ -276,7 +276,7 @@ public: void AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAvail, sal_uInt16 nAbsLeftSpace, sal_uInt16 nAbsRightSpace, sal_uInt16 nParentInhSpace ); - void SetWidths( sal_Bool bCallPass2=sal_False, sal_uInt16 nAbsAvail=0, + void SetWidths( bool bCallPass2=false, sal_uInt16 nAbsAvail=0, sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0, sal_uInt16 nAbsRightSpace=0, sal_uInt16 nParentInhSpace=0 ); @@ -302,9 +302,9 @@ public: bool IsTopTable() const { return pSwTable != 0; } - void SetMustResize( sal_Bool bSet ) { bMustResize = bSet; } - void SetMustNotResize( sal_Bool bSet ) { bMustNotResize = bSet; } - void SetMustNotRecalc( sal_Bool bSet ) { bMustNotRecalc = bSet; } + void SetMustResize( bool bSet ) { bMustResize = bSet; } + void SetMustNotResize( bool bSet ) { bMustNotResize = bSet; } + void SetMustNotRecalc( bool bSet ) { bMustNotRecalc = bSet; } /** Recalculation of table widths for available width that has been passed. - If bRecalc is set, contents of boxes are included into calculation. @@ -316,10 +316,10 @@ public: - If nDelay == HTMLTABLE_RESIZE_NOW, resize immediately and do not consider any resize-calls that might possibly be in order. - The return value indicates whether the table has been changed. */ - sal_Bool Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False, sal_Bool bForce=sal_False, + bool Resize( sal_uInt16 nAbsAvail, bool bRecalc=false, bool bForce=false, sal_uLong nDelay=0 ); - void BordersChanged( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False ); + void BordersChanged( sal_uInt16 nAbsAvail, bool bRecalc=false ); /** Calculate available width. This works only if a layout or a SwViewShell exists. Otherwise returns 0. @@ -344,13 +344,13 @@ public: sal_uInt16 GetRowCount() const { return nRows; } sal_uInt16 GetColCount() const { return nCols; } - void SetExportable( sal_Bool bSet ) { bExportable = bSet; } - sal_Bool IsExportable() const { return bExportable; } + void SetExportable( bool bSet ) { bExportable = bSet; } + bool IsExportable() const { return bExportable; } - sal_Bool HaveBordersChanged() const { return bBordersChanged; } + bool HaveBordersChanged() const { return bBordersChanged; } - void SetMayBeInFlyFrame( sal_Bool bSet ) { bMayBeInFlyFrame = bSet; } - sal_Bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; } + void SetMayBeInFlyFrame( bool bSet ) { bMayBeInFlyFrame = bSet; } + bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; } }; inline void SwHTMLTableLayoutCell::SetProtected() diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 0be5a59cd24b..e3e33cdf1d39 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -101,10 +101,10 @@ public: /** Detect whether the given file is in the given format. For now, only our own filters are supported! */ - static sal_Bool IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName); + static bool IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName); - static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& ); - static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); + static bool IsValidStgFilter( SotStorage& , const SfxFilter& ); + static bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); SWD_DLLPUBLIC static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index ce84f67df00c..a52a02922f34 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -44,10 +44,10 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient /**< purpose of derivation sal_uInt16 nDividerCountBy; /**< Interval for display of an user defined string every n lines */ LineNumberPosition ePos; ///< Where should the display occur (number and divicer) - sal_Bool bPaintLineNumbers; ///< Should anything be displayed? - sal_Bool bCountBlankLines; ///< Count empty lines? - sal_Bool bCountInFlys; ///< Count also within FlyFrames? - sal_Bool bRestartEachPage; /**< Restart counting at the first paragraph of each page + bool bPaintLineNumbers; ///< Should anything be displayed? + bool bCountBlankLines; ///< Count empty lines? + bool bCountInFlys; ///< Count also within FlyFrames? + bool bRestartEachPage; /**< Restart counting at the first paragraph of each page (even on follows when paragraphs are splitted) */ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; @@ -79,17 +79,17 @@ public: LineNumberPosition GetPos() const { return ePos; } void SetPos( LineNumberPosition eP ){ ePos = eP; } - sal_Bool IsPaintLineNumbers() const { return bPaintLineNumbers; } - void SetPaintLineNumbers( sal_Bool b ){ bPaintLineNumbers = b; } + bool IsPaintLineNumbers() const { return bPaintLineNumbers; } + void SetPaintLineNumbers( bool b ){ bPaintLineNumbers = b; } - sal_Bool IsCountBlankLines() const { return bCountBlankLines; } - void SetCountBlankLines( sal_Bool b ) { bCountBlankLines = b; } + bool IsCountBlankLines() const { return bCountBlankLines; } + void SetCountBlankLines( bool b ) { bCountBlankLines = b; } - sal_Bool IsCountInFlys() const { return bCountInFlys; } - void SetCountInFlys( sal_Bool b ) { bCountInFlys = b; } + bool IsCountInFlys() const { return bCountInFlys; } + void SetCountInFlys( bool b ) { bCountInFlys = b; } - sal_Bool IsRestartEachPage() const { return bRestartEachPage; } - void SetRestartEachPage( sal_Bool b ) { bRestartEachPage = b; } + bool IsRestartEachPage() const { return bRestartEachPage; } + void SetRestartEachPage( bool b ) { bRestartEachPage = b; } bool HasCharFormat() const { return GetRegisteredIn() != 0; } }; diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index 4c715c700f5c..d06ce6e82e58 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -31,7 +31,7 @@ class SwDoc; class SwDocShell; extern void ScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY); -extern sal_Bool IsScrollMDI(SwViewShell* pVwSh, const SwRect &); +extern bool IsScrollMDI(SwViewShell* pVwSh, const SwRect &); extern void SizeNotify(SwViewShell* pVwSh, const Size &); // Update of status bar during an action. @@ -49,7 +49,7 @@ SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell ); void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell ); void RescheduleProgress( SwDocShell *pDocShell ); -void EnableCmdInterface(sal_Bool bEnable = sal_True); +void EnableCmdInterface(bool bEnable = true); void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect ); @@ -62,7 +62,7 @@ TblChgMode GetTblChgDefaultMode(); bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark ); -extern void AccessibilityScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY, sal_Bool isLeftTop); +extern void AccessibilityScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY, bool isLeftTop); #endif diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 09c98bd666e4..c5546538ffe4 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -73,8 +73,8 @@ class SwCompareConfig : public utl::ConfigItem friend class SwModuleOptions; sal_uInt16 eCmpMode; //Compare/CompareDocuments; - sal_Bool bUseRsid; //Compare/Settings/Use RSID - sal_Bool bIgnorePieces; //Compare/Settings/Ignore pieces of length + bool bUseRsid; //Compare/Settings/Use RSID + bool bIgnorePieces; //Compare/Settings/Ignore pieces of length sal_uInt16 nPieceLen; //Compare/Settings/Ignore pieces of length const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); @@ -97,15 +97,15 @@ class SwInsertConfig : public utl::ConfigItem SvGlobalName aGlobalNames[5]; - sal_Bool bInsWithCaption; //Insert/Caption/Automatic - sal_Bool bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering + bool bInsWithCaption; //Insert/Caption/Automatic + bool bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering SwInsertTableOptions aInsTblOpts; - sal_Bool bIsWeb; + bool bIsWeb; const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: - SwInsertConfig(sal_Bool bWeb); + SwInsertConfig(bool bWeb); virtual ~SwInsertConfig(); virtual void Commit() SAL_OVERRIDE; @@ -124,13 +124,13 @@ class SwTableConfig : public utl::ConfigItem sal_uInt16 nTblVInsert; //int Table/Insert/Column TblChgMode eTblChgMode; //int Table/Change/Effect - sal_Bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers. - sal_Bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. - sal_Bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers. + bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers. + bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. + bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers. const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: - SwTableConfig(sal_Bool bWeb); + SwTableConfig(bool bWeb); virtual ~SwTableConfig(); virtual void Commit() SAL_OVERRIDE; @@ -144,13 +144,13 @@ class SwMiscConfig : public utl::ConfigItem friend class SwModuleOptions; OUString sWordDelimiter; // Statistics/WordNumber/Delimiter - sal_Bool bDefaultFontsInCurrDocOnly; // DefaultFont/Document - sal_Bool bShowIndexPreview; // Index/ShowPreview - sal_Bool bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink - sal_Bool bNumAlignSize; // Numbering/Graphic/KeepRatio - sal_Bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs - sal_Bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation - sal_Bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' + bool bDefaultFontsInCurrDocOnly; // DefaultFont/Document + bool bShowIndexPreview; // Index/ShowPreview + bool bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink + bool bNumAlignSize; // Numbering/Graphic/KeepRatio + bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs + bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation + bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats OUString sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) OUString sMailingPath; // FormLetter/FileOutput/Path @@ -181,7 +181,7 @@ class SW_DLLPUBLIC SwModuleOptions SwCompareConfig aCompareConfig; //fiscus: don't show tips of text fields - it's not part of the configuration! - sal_Bool bHideFieldTips : 1; + bool bHideFieldTips : 1; public: SwModuleOptions(); @@ -226,15 +226,15 @@ public: void SetMarkAlignColor(const Color &rColor) { aRevisionConfig.aMarkColor = rColor; aRevisionConfig.SetModified();} - sal_Bool IsInsWithCaption(sal_Bool bHTML) const + bool IsInsWithCaption(bool bHTML) const { return bHTML ? sal_False : aInsertConfig.bInsWithCaption; } - void SetInsWithCaption( sal_Bool bHTML, sal_Bool b ) + void SetInsWithCaption( bool bHTML, bool b ) { if(!bHTML) aInsertConfig.bInsWithCaption = b; aInsertConfig.SetModified();} - sal_Bool IsCaptionOrderNumberingFirst() const { return aInsertConfig.bCaptionOrderNumberingFirst; } - void SetCaptionOrderNumberingFirst( sal_Bool bSet ) + bool IsCaptionOrderNumberingFirst() const { return aInsertConfig.bCaptionOrderNumberingFirst; } + void SetCaptionOrderNumberingFirst( bool bSet ) { if(aInsertConfig.bCaptionOrderNumberingFirst != bSet) { @@ -243,58 +243,58 @@ public: } } - sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const + bool IsInsTblFormatNum(bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; } - void SetInsTblFormatNum( sal_Bool bHTML, sal_Bool b ) + void SetInsTblFormatNum( bool bHTML, bool b ) { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const + bool IsInsTblChangeNumFormat(bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; } - void SetInsTblChangeNumFormat( sal_Bool bHTML, sal_Bool b ) + void SetInsTblChangeNumFormat( bool bHTML, bool b ) { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const + bool IsInsTblAlignNum(bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; } - void SetInsTblAlignNum( sal_Bool bHTML, sal_Bool b ) + void SetInsTblAlignNum( bool bHTML, bool b ) { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - SwInsertTableOptions GetInsTblFlags(sal_Bool bHTML) const + SwInsertTableOptions GetInsTblFlags(bool bHTML) const { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;} - void SetInsTblFlags( sal_Bool bHTML, const SwInsertTableOptions& rOpts ) { + void SetInsTblFlags( bool bHTML, const SwInsertTableOptions& rOpts ) { bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts); bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();} - const InsCaptionOpt* GetCapOption(sal_Bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); - sal_Bool SetCapOption(sal_Bool bHTML, const InsCaptionOpt* pOpt); + const InsCaptionOpt* GetCapOption(bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); + bool SetCapOption(bool bHTML, const InsCaptionOpt* pOpt); - sal_Bool IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } - void SetGrfToGalleryAsLnk( sal_Bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; + bool IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } + void SetGrfToGalleryAsLnk( bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; aMiscConfig.SetModified();} sal_Int16 GetMailingFormats() const { return aMiscConfig.nMailingFormats;} void SetMailingFormats( sal_Int16 nSet ) { aMiscConfig.nMailingFormats = nSet; aMiscConfig.SetModified();} - sal_Bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } - void SetSinglePrintJob( sal_Bool b ) { aMiscConfig.bSinglePrintJob = b; + bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } + void SetSinglePrintJob( bool b ) { aMiscConfig.bSinglePrintJob = b; aMiscConfig.SetModified();} - sal_Bool IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } - void SetNumAlignSize( sal_Bool b ) { aMiscConfig.bNumAlignSize = b; + bool IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } + void SetNumAlignSize( bool b ) { aMiscConfig.bNumAlignSize = b; aMiscConfig.SetModified();} - sal_Bool IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } - void SetIsNameFromColumn( sal_Bool bSet ) + bool IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } + void SetIsNameFromColumn( bool bSet ) { aMiscConfig.SetModified(); aMiscConfig.bIsNameFromColumn = bSet; } - sal_Bool IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} - void SetAskForMailMerge(sal_Bool bSet) + bool IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} + void SetAskForMailMerge(bool bSet) { aMiscConfig.SetModified(); aMiscConfig.bAskForMailMergeInPrint = bSet; @@ -317,33 +317,33 @@ public: aMiscConfig.SetModified();} //convert word delimiter from or to user interface - static OUString ConvertWordDelimiter(const OUString& rDelim, sal_Bool bFromUI); + static OUString ConvertWordDelimiter(const OUString& rDelim, bool bFromUI); - sal_Bool IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} - void SetShowIndexPreview(sal_Bool bSet) + bool IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} + void SetShowIndexPreview(bool bSet) {aMiscConfig.bShowIndexPreview = bSet; aMiscConfig.SetModified();} - sal_Bool IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} - void SetDefaultFontInCurrDocOnly(sal_Bool bSet) + bool IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} + void SetDefaultFontInCurrDocOnly(bool bSet) { aMiscConfig.bDefaultFontsInCurrDocOnly = bSet; aMiscConfig.SetModified(); } - sal_Bool IsHideFieldTips() const {return bHideFieldTips;} - void SetHideFieldTips(sal_Bool bSet) {bHideFieldTips = bSet;} + bool IsHideFieldTips() const {return bHideFieldTips;} + void SetHideFieldTips(bool bSet) {bHideFieldTips = bSet;} SvxCompareMode GetCompareMode() const { return (SvxCompareMode)aCompareConfig.eCmpMode; } void SetCompareMode( SvxCompareMode eMode ) { aCompareConfig.eCmpMode = eMode; aCompareConfig.SetModified(); } - sal_Bool IsUseRsid() const { return aCompareConfig.bUseRsid; } - void SetUseRsid( sal_Bool b ) { aCompareConfig.bUseRsid = b; + bool IsUseRsid() const { return aCompareConfig.bUseRsid; } + void SetUseRsid( bool b ) { aCompareConfig.bUseRsid = b; aCompareConfig.SetModified(); } - sal_Bool IsIgnorePieces() const { return aCompareConfig.bIgnorePieces; } - void SetIgnorePieces( sal_Bool b ) { aCompareConfig.bIgnorePieces = b; + bool IsIgnorePieces() const { return aCompareConfig.bIgnorePieces; } + void SetIgnorePieces( bool b ) { aCompareConfig.bIgnorePieces = b; aCompareConfig.SetModified(); } sal_uInt16 GetPieceLen() const { return aCompareConfig.nPieceLen; } diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 68cfe73f8801..b8e72f283042 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -104,27 +104,27 @@ class SW_DLLPUBLIC SwNodes mutable SwOutlineNodes* pOutlineNds; ///< Array of all outline nodes. - sal_Bool bInNodesDel : 1; /**< In Case of recursive calling. + bool bInNodesDel : 1; /**< In Case of recursive calling. Do not update Num/Outline. */ - sal_Bool bInDelUpdOutl : 1; ///< Flag for updating of Outline. - sal_Bool bInDelUpdNum : 1; ///< Flag for updating of Outline. + bool bInDelUpdOutl : 1; ///< Flag for updating of Outline. + bool bInDelUpdNum : 1; ///< Flag for updating of Outline. /// For administering indices. void RegisterIndex( SwNodeIndex& rIdx ); void DeRegisterIndex( SwNodeIndex& rIdx ); - void RemoveNode( sal_uLong nDelPos, sal_uLong nLen, sal_Bool bDel ); + void RemoveNode( sal_uLong nDelPos, sal_uLong nLen, bool bDel ); // Actions on the nodes. void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd ); void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 ); void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize, - SwNodeIndex& rInsPos, sal_Bool bNewFrms ); + SwNodeIndex& rInsPos, bool bNewFrms ); void UpdtOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node. void _CopyNodes( const SwNodeRange&, const SwNodeIndex&, - sal_Bool bNewFrms = sal_True, sal_Bool bTblInsDummyNode = sal_False ) const; + bool bNewFrms = true, bool bTblInsDummyNode = false ) const; void _DelDummyNodes( const SwNodeRange& rRg ); protected: @@ -168,23 +168,23 @@ public: /** Is the NodesArray the regular one of Doc? (and not the UndoNds, ...) Implementation in doc.hxx (because one needs to know Doc for it) ! */ - sal_Bool IsDocNodes() const; + bool IsDocNodes() const; sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex) const; void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1); - sal_Bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, - sal_Bool bNewFrms = sal_True ); + bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, + bool bNewFrms = true ); void MoveRange( SwPaM&, SwPosition&, SwNodes& rNodes ); void _Copy( const SwNodeRange& rRg, const SwNodeIndex& rInsPos, - sal_Bool bNewFrms = sal_True ) const + bool bNewFrms = true ) const { _CopyNodes( rRg, rInsPos, bNewFrms ); } void SectionUp( SwNodeRange *); void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode ); - sal_Bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; + bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; void GoStartOfSection(SwNodeIndex *) const; void GoEndOfSection(SwNodeIndex *) const; @@ -225,7 +225,7 @@ public: const Graphic* pGraphic, SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0, - sal_Bool bDelayed = sal_False ); ///< in ndgrf.cxx + bool bDelayed = false ); ///< in ndgrf.cxx SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, @@ -281,7 +281,7 @@ public: /*, SwUndo... pUndo*/ ); /// Create regular text from what was table. - sal_Bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, + bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, SwUndoTblToTxt* = 0 ); /// Is in untbl.cxx and may called only by Undo-object. SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd, @@ -290,7 +290,7 @@ public: /** Insert a new box in the line before InsPos. Its format is taken from the following one (or from the previous one if we are at the end). In the line there must be a box already. */ - sal_Bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, + bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, /// Formats for TextNode of box. SwTxtFmtColl*, const SfxItemSet* pAutoAttr, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); @@ -300,10 +300,10 @@ public: tables is calculated from the Maximum of the boxes, provided SSize is set "absolute" (LONG_MAX). (Momentarily this is needed only for the RTF-parser.) */ - SwTableNode* SplitTable( const SwNodeIndex& rPos, sal_Bool bAfter = sal_True, - sal_Bool bCalcNewSize = sal_False ); + SwTableNode* SplitTable( const SwNodeIndex& rPos, bool bAfter = true, + bool bCalcNewSize = false ); /// Two Tables that are following one another are merged. - sal_Bool MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev = sal_True, + bool MergeTable( const SwNodeIndex& rPos, bool bWithPrev = true, sal_uInt16 nMode = 0, SwHistory* pHistory = 0 ); /// Insert a new SwSection. diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 575a3ee6a987..028ce54db912 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -33,7 +33,7 @@ class SW_DLLPUBLIC SwNodeIndex { friend void SwNodes::RegisterIndex( SwNodeIndex& ); friend void SwNodes::DeRegisterIndex( SwNodeIndex& ); - friend void SwNodes::RemoveNode( sal_uLong, sal_uLong, sal_Bool ); + friend void SwNodes::RemoveNode( sal_uLong, sal_uLong, bool ); SwNode* pNd; SwNodeIndex *pNext, *pPrev; @@ -60,19 +60,19 @@ public: inline sal_uLong operator+=( const SwNodeIndex& ); inline sal_uLong operator-=( const SwNodeIndex& ); - inline sal_Bool operator< ( const SwNodeIndex& ) const; - inline sal_Bool operator<=( const SwNodeIndex& ) const; - inline sal_Bool operator> ( const SwNodeIndex& ) const; - inline sal_Bool operator>=( const SwNodeIndex& ) const; - inline sal_Bool operator==( const SwNodeIndex& ) const; - inline sal_Bool operator!=( const SwNodeIndex& ) const; + inline bool operator< ( const SwNodeIndex& ) const; + inline bool operator<=( const SwNodeIndex& ) const; + inline bool operator> ( const SwNodeIndex& ) const; + inline bool operator>=( const SwNodeIndex& ) const; + inline bool operator==( const SwNodeIndex& ) const; + inline bool operator!=( const SwNodeIndex& ) const; - inline sal_Bool operator< ( sal_uLong nWert ) const; - inline sal_Bool operator<=( sal_uLong nWert ) const; - inline sal_Bool operator> ( sal_uLong nWert ) const; - inline sal_Bool operator>=( sal_uLong nWert ) const; - inline sal_Bool operator==( sal_uLong nWert ) const; - inline sal_Bool operator!=( sal_uLong nWert ) const; + inline bool operator< ( sal_uLong nWert ) const; + inline bool operator<=( sal_uLong nWert ) const; + inline bool operator> ( sal_uLong nWert ) const; + inline bool operator>=( sal_uLong nWert ) const; + inline bool operator==( sal_uLong nWert ) const; + inline bool operator!=( sal_uLong nWert ) const; inline SwNodeIndex& operator=( sal_uLong ); SwNodeIndex& operator=( const SwNodeIndex& ); @@ -125,51 +125,51 @@ inline SwNodes& SwNodeIndex::GetNodes() { return pNd->GetNodes(); } -inline sal_Bool SwNodeIndex::operator< ( sal_uLong nWert ) const +inline bool SwNodeIndex::operator< ( sal_uLong nWert ) const { return pNd->GetIndex() < nWert; } -inline sal_Bool SwNodeIndex::operator<=( sal_uLong nWert ) const +inline bool SwNodeIndex::operator<=( sal_uLong nWert ) const { return pNd->GetIndex() <= nWert; } -inline sal_Bool SwNodeIndex::operator> ( sal_uLong nWert ) const +inline bool SwNodeIndex::operator> ( sal_uLong nWert ) const { return pNd->GetIndex() > nWert; } -inline sal_Bool SwNodeIndex::operator>=( sal_uLong nWert ) const +inline bool SwNodeIndex::operator>=( sal_uLong nWert ) const { return pNd->GetIndex() >= nWert; } -inline sal_Bool SwNodeIndex::operator==( sal_uLong nWert ) const +inline bool SwNodeIndex::operator==( sal_uLong nWert ) const { return pNd->GetIndex() == nWert; } -inline sal_Bool SwNodeIndex::operator!=( sal_uLong nWert ) const +inline bool SwNodeIndex::operator!=( sal_uLong nWert ) const { return pNd->GetIndex() != nWert; } -inline sal_Bool SwNodeIndex::operator<( const SwNodeIndex& rIndex ) const +inline bool SwNodeIndex::operator<( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() < rIndex.GetIndex(); } -inline sal_Bool SwNodeIndex::operator<=( const SwNodeIndex& rIndex ) const +inline bool SwNodeIndex::operator<=( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() <= rIndex.GetIndex(); } -inline sal_Bool SwNodeIndex::operator>( const SwNodeIndex& rIndex ) const +inline bool SwNodeIndex::operator>( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() > rIndex.GetIndex(); } -inline sal_Bool SwNodeIndex::operator>=( const SwNodeIndex& rIndex ) const +inline bool SwNodeIndex::operator>=( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() >= rIndex.GetIndex(); } -inline sal_Bool SwNodeIndex::operator==( const SwNodeIndex& rIdx ) const +inline bool SwNodeIndex::operator==( const SwNodeIndex& rIdx ) const { return pNd == rIdx.pNd; } -inline sal_Bool SwNodeIndex::operator!=( const SwNodeIndex& rIdx ) const +inline bool SwNodeIndex::operator!=( const SwNodeIndex& rIdx ) const { return pNd != rIdx.pNd; } diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 752f86a65ab7..d66e55546118 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -31,11 +31,11 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode friend class SwNoTxtFrm; PolyPolygon *pContour; - sal_Bool bAutomaticContour : 1; // automatic contour polygon, not manipulated - sal_Bool bContourMapModeValid : 1; // contour map mode is not the graphics's + bool bAutomaticContour : 1; // automatic contour polygon, not manipulated + bool bContourMapModeValid : 1; // contour map mode is not the graphics's // preferred map mode, but either // MM100 or or pixel - sal_Bool bPixelContour : 1; // contour map mode is invalid and pixel. + bool bPixelContour : 1; // contour map mode is invalid and pixel. // Creates for all derivations an AttrSet with ranges for frame- and // graphics-attributes (only called by SwCntntNode). @@ -66,25 +66,25 @@ public: void SetDescription( const OUString& rDescription, bool bBroadcast = false ); void SetContour( const PolyPolygon *pPoly, - sal_Bool bAutomatic = sal_False ); + bool bAutomatic = false ); const PolyPolygon *HasContour() const; - sal_Bool _HasContour() const { return pContour!=0; }; + bool _HasContour() const { return pContour!=0; }; void GetContour( PolyPolygon &rPoly ) const; void CreateContour(); - void SetAutomaticContour( sal_Bool bSet ) { bAutomaticContour = bSet; } - sal_Bool HasAutomaticContour() const { return bAutomaticContour; } + void SetAutomaticContour( bool bSet ) { bAutomaticContour = bSet; } + bool HasAutomaticContour() const { return bAutomaticContour; } // set either a MM100 or pixel contour void SetContourAPI( const PolyPolygon *pPoly ); // get either a MM100 or pixel contour, return sal_False if no contour is set. - sal_Bool GetContourAPI( PolyPolygon &rPoly ) const; + bool GetContourAPI( PolyPolygon &rPoly ) const; - void SetPixelContour( sal_Bool bSet ) { bPixelContour = bSet; } - sal_Bool IsPixelContour() const; + void SetPixelContour( bool bSet ) { bPixelContour = bSet; } + bool IsPixelContour() const; - sal_Bool IsContourMapModeValid() const { return bContourMapModeValid; } + bool IsContourMapModeValid() const { return bContourMapModeValid; } // Obtains the graphic with SwapIn for GrfNode via GetData for OLE. Graphic GetGraphic() const; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 0747a346bcee..a3622e1cb616 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -51,8 +51,8 @@ public: SwOLEObj( const OUString &rName, sal_Int64 nAspect ); ~SwOLEObj(); - sal_Bool UnloadObject(); - static sal_Bool UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, + bool UnloadObject(); + static bool UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, const SwDoc* pDoc, sal_Int64 nAspect ); @@ -62,7 +62,7 @@ public: svt::EmbeddedObjectRef& GetObject(); OUString GetCurrentPersistName() const { return aName; } OUString GetStyleString(); - sal_Bool IsOleRef() const; ///< To avoid unnecessary loading of object. + bool IsOleRef() const; ///< To avoid unnecessary loading of object. }; // SwOLENode @@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode mutable SwOLEObj aOLEObj; Graphic* pGraphic; OUString sChartTblName; ///< with chart objects: name of referenced table. - sal_Bool bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify + bool bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify (e.g. copied). Is not persistent. */ SwEmbedObjectLink* mpObjectLink; @@ -114,11 +114,11 @@ public: virtual bool SavePersistentData() SAL_OVERRIDE; virtual bool RestorePersistentData() SAL_OVERRIDE; - sal_Bool IsInGlobalDocSection() const; - sal_Bool IsOLEObjectDeleted() const; + bool IsInGlobalDocSection() const; + bool IsOLEObjectDeleted() const; - sal_Bool IsOLESizeInvalid() const { return bOLESizeInvalid; } - void SetOLESizeInvalid( sal_Bool b ){ bOLESizeInvalid = b; } + bool IsOLESizeInvalid() const { return bOLESizeInvalid; } + void SetOLESizeInvalid( bool b ){ bOLESizeInvalid = b; } sal_Int64 GetAspect() const { return aOLEObj.GetObject().GetViewAspect(); } void SetAspect( sal_Int64 nAspect) { aOLEObj.GetObject().SetViewAspect( nAspect ); } @@ -127,7 +127,7 @@ public: inline void Unload() { aOLEObj.Unload(); } */ OUString GetDescription() const { return aOLEObj.GetDescription(); } - sal_Bool UpdateLinkURL_Impl(); + bool UpdateLinkURL_Impl(); void BreakFileLink_Impl(); void DisconnectFileLink_Impl(); diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 8746d106bf54..1cefdf479c1d 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -230,10 +230,10 @@ public: OutputDevice* pOut = 0 ) const; /// overriding to handle change of certain paragraph attributes - virtual sal_Bool SetAttr( const SfxPoolItem& ) SAL_OVERRIDE; - virtual sal_Bool SetAttr( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE; - virtual sal_Bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) SAL_OVERRIDE; + virtual bool SetAttr( const SfxPoolItem& ) SAL_OVERRIDE; + virtual bool SetAttr( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE; + virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) SAL_OVERRIDE; virtual sal_uInt16 ResetAllAttr() SAL_OVERRIDE; /// insert text content diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 4b3c88d18348..294a79e38bf5 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -150,15 +150,15 @@ public: inline SwSectionNode *GetSectionNode(); inline const SwSectionNode *GetSectionNode() const; - inline sal_Bool IsStartNode() const; - inline sal_Bool IsCntntNode() const; - inline sal_Bool IsEndNode() const; - inline sal_Bool IsTxtNode() const; - inline sal_Bool IsTableNode() const; - inline sal_Bool IsSectionNode() const; - inline sal_Bool IsOLENode() const; - inline sal_Bool IsNoTxtNode() const; - inline sal_Bool IsGrfNode() const; + inline bool IsStartNode() const; + inline bool IsCntntNode() const; + inline bool IsEndNode() const; + inline bool IsTxtNode() const; + inline bool IsTableNode() const; + inline bool IsSectionNode() const; + inline bool IsOLENode() const; + inline bool IsNoTxtNode() const; + inline bool IsGrfNode() const; /** Checks if this node is in redlines. @@ -166,7 +166,7 @@ public: @retval sal_True this node is in redlines @retval sal_False else */ - sal_Bool IsInRedlines() const; + bool IsInRedlines() const; /** Search table node, in which it is. If it is in no table @return 0. */ @@ -256,17 +256,17 @@ public: IDocumentListItems& getIDocumentListItems(); /// Is node in the visible area of the Shell? - sal_Bool IsInVisibleArea( SwViewShell* pSh = 0 ) const; + bool IsInVisibleArea( SwViewShell* pSh = 0 ) const; /// Is node in an protected area? bool IsInProtectSect() const; /** Is node in something that is protected (range, frame, table cells ... including anchor in case of frames or footnotes)? */ - sal_Bool IsProtect() const; + bool IsProtect() const; /** Search PageDesc with which this node is formated. If layout is existent search over layout, else only the hard way is left: search over the nodes to the front!! */ - const SwPageDesc* FindPageDesc( sal_Bool bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; + const SwPageDesc* FindPageDesc( bool bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; /// If node is in a fly return the respective format. SwFrmFmt* GetFlyFmt() const; @@ -395,8 +395,8 @@ public: void MakeStartIndex( SwIndex * pIdx ) { pIdx->Assign( this, 0 ); } void MakeEndIndex( SwIndex * pIdx ) { pIdx->Assign( this, Len() ); } - sal_Bool GoNext(SwIndex *, sal_uInt16 nMode ) const; - sal_Bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; + bool GoNext(SwIndex *, sal_uInt16 nMode ) const; + bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; /// Replacement for good old GetFrm(..): SwCntntFrm *getLayoutFrm( const SwRootFrm*, @@ -405,12 +405,12 @@ public: const bool bCalcFrm = true ) const; /** @return the real size of the frame or an empty rectangle if no layout exists. Needed for export filters. */ - SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False, + SwRect FindLayoutRect( const bool bPrtArea = false, const Point* pPoint = 0, - const sal_Bool bCalcFrm = sal_False ) const; - SwRect FindPageFrmRect( const sal_Bool bPrtArea = sal_False, + const bool bCalcFrm = false ) const; + SwRect FindPageFrmRect( const bool bPrtArea = false, const Point* pPoint = 0, - const sal_Bool bCalcFrm = sal_False ) const; + const bool bCalcFrm = false ) const; /** Method creates all views of document for given node. The content frames that are created are put in the respective layout. */ @@ -421,7 +421,7 @@ public: Add an input param to identify if acc table should be disposed */ - void DelFrms( sal_Bool bNeedDel = sal_False, sal_Bool bIsAccTableDispose = sal_True ); + void DelFrms( bool bNeedDel = false, bool bIsAccTableDispose = true ); /** @return count of elements of node content. Default is 1. There are differences between text node and formula node. */ @@ -435,23 +435,23 @@ public: /// SS for PoolItems: hard attributation. /// If bInParent is FALSE search for attribute only in this node. - const SfxPoolItem& GetAttr( sal_uInt16 nWhich, sal_Bool bInParent=sal_True ) const; - sal_Bool GetAttr( SfxItemSet& rSet, sal_Bool bInParent=sal_True ) const; + const SfxPoolItem& GetAttr( sal_uInt16 nWhich, bool bInParent=true ) const; + bool GetAttr( SfxItemSet& rSet, bool bInParent=true ) const; /// made virtual - virtual sal_Bool SetAttr( const SfxPoolItem& ); - virtual sal_Bool SetAttr( const SfxItemSet& rSet ); - virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); - virtual sal_Bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ); + virtual bool SetAttr( const SfxPoolItem& ); + virtual bool SetAttr( const SfxItemSet& rSet ); + virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ); virtual sal_uInt16 ResetAllAttr(); /// Obtains attribute that is not delivered via conditional style! - const SfxPoolItem* GetNoCondAttr( sal_uInt16 nWhich, sal_Bool bInParents ) const; + const SfxPoolItem* GetNoCondAttr( sal_uInt16 nWhich, bool bInParents ) const; /** Does node has already its own auto-attributes? Access to SwAttrSet. */ inline const SwAttrSet &GetSwAttrSet() const; inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); } - inline sal_Bool HasSwAttrSet() const { return mpAttrSet ? sal_True : sal_False; } + inline bool HasSwAttrSet() const { return mpAttrSet ? sal_True : sal_False; } virtual SwFmtColl* ChgFmtColl( SwFmtColl* ); SwFmtColl* GetFmtColl() const { return (SwFmtColl*)GetRegisteredIn(); } @@ -461,13 +461,13 @@ public: void SetCondFmtColl( SwFmtColl* ); inline SwFmtColl* GetCondFmtColl() const; - sal_Bool IsAnyCondition( SwCollCondition& rTmp ) const; + bool IsAnyCondition( SwCollCondition& rTmp ) const; void ChkCondColl(); //FEATURE::CONDCOLL /** Invalidates NumRule at the node. NumRule is updated on EndAction of a Shell at the latest. */ - sal_Bool InvalidateNumRule(); + bool InvalidateNumRule(); /** determines the text direction for a certain position. @return -1, if text direction could *not* be determined. */ @@ -513,7 +513,7 @@ public: void MakeFrms( const SwNodeIndex & rIdx ); SwTableNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; - void SetNewTable( SwTable* , sal_Bool bNewFrames=sal_True ); + void SetNewTable( SwTable* , bool bNewFrames=true ); // Removes redline objects that relate to this table from the 'Extra Redlines' table void RemoveRedlines(); @@ -568,7 +568,7 @@ public: /** Check for not hidden areas whether there is content that is not in a hidden sub-area. */ - sal_Bool IsCntntHidden() const; + bool IsCntntHidden() const; }; @@ -626,39 +626,39 @@ inline const SwCntntNode *SwNode::GetCntntNode() const return ND_CONTENTNODE & nNodeType ? (const SwCntntNode*)this : 0; } -inline sal_Bool SwNode::IsStartNode() const +inline bool SwNode::IsStartNode() const { return ND_STARTNODE & nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsCntntNode() const +inline bool SwNode::IsCntntNode() const { return ND_CONTENTNODE & nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsEndNode() const +inline bool SwNode::IsEndNode() const { return ND_ENDNODE == nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsTxtNode() const +inline bool SwNode::IsTxtNode() const { return ND_TEXTNODE == nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsTableNode() const +inline bool SwNode::IsTableNode() const { return ND_TABLENODE == nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsSectionNode() const +inline bool SwNode::IsSectionNode() const { return ND_SECTIONNODE == nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsNoTxtNode() const +inline bool SwNode::IsNoTxtNode() const { return ND_NOTXTNODE & nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsOLENode() const +inline bool SwNode::IsOLENode() const { return ND_OLENODE == nNodeType ? sal_True : sal_False; } -inline sal_Bool SwNode::IsGrfNode() const +inline bool SwNode::IsGrfNode() const { return ND_GRFNODE == nNodeType ? sal_True : sal_False; } @@ -733,7 +733,7 @@ inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const //FEATURE::CONDCOLL inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich, - sal_Bool bInParents ) const + bool bInParents ) const { return GetSwAttrSet().Get( nWhich, bInParents ); } diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 5450977c62e3..cf63e103b949 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -70,8 +70,8 @@ public: SwNumFmt& operator=( const SwNumFmt& ); - sal_Bool operator==( const SwNumFmt& ) const; - sal_Bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } + bool operator==( const SwNumFmt& ) const; + bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); } void SetCharFmt( SwCharFmt* ); @@ -89,8 +89,8 @@ public: virtual sal_Int16 GetVertOrient() const SAL_OVERRIDE; const SwFmtVertOrient* GetGraphicOrientation() const; - sal_Bool IsEnumeration() const; // #i22362# - sal_Bool IsItemize() const; // #i29560# + bool IsEnumeration() const; // #i22362# + bool IsItemize() const; // #i29560# }; class SwPaM; @@ -133,11 +133,11 @@ private: sal_uInt16 mnPoolFmtId; ///< Id-for NumRules created "automatically" sal_uInt16 mnPoolHelpId; ///< HelpId for this Pool-style. sal_uInt8 mnPoolHlpFileId; ///< FilePos at Doc on style helps. - sal_Bool mbAutoRuleFlag : 1; - sal_Bool mbInvalidRuleFlag : 1; - sal_Bool mbContinusNum : 1; ///< Continuous numbering without levels. - sal_Bool mbAbsSpaces : 1; ///< Levels represent absolute indents. - sal_Bool mbHidden : 1; ///< Is the numering rule to be hidden in the UI? + bool mbAutoRuleFlag : 1; + bool mbInvalidRuleFlag : 1; + bool mbContinusNum : 1; ///< Continuous numbering without levels. + bool mbAbsSpaces : 1; ///< Levels represent absolute indents. + bool mbHidden : 1; ///< Is the numering rule to be hidden in the UI? bool mbCountPhantoms; const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode; @@ -149,30 +149,30 @@ public: SwNumRule( const OUString& rNm, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode, SwNumRuleType = NUM_RULE, - sal_Bool bAutoFlg = sal_True ); + bool bAutoFlg = true ); SwNumRule( const SwNumRule& ); ~SwNumRule(); SwNumRule& operator=( const SwNumRule& ); - sal_Bool operator==( const SwNumRule& ) const; - sal_Bool operator!=( const SwNumRule& r ) const { return !(*this == r); } + bool operator==( const SwNumRule& ) const; + bool operator!=( const SwNumRule& r ) const { return !(*this == r); } const SwNumFmt* GetNumFmt( sal_uInt16 i ) const; const SwNumFmt& Get( sal_uInt16 i ) const; - sal_Bool IsHidden( ) const { return mbHidden; } - void SetHidden( sal_Bool bValue ) { mbHidden = bValue; } + bool IsHidden( ) const { return mbHidden; } + void SetHidden( bool bValue ) { mbHidden = bValue; } void Set( sal_uInt16 i, const SwNumFmt* ); void Set( sal_uInt16 i, const SwNumFmt& ); - OUString MakeNumString( const SwNodeNum&, sal_Bool bInclStrings = sal_True, - sal_Bool bOnlyArabic = sal_False ) const; + OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true, + bool bOnlyArabic = false ) const; /** - add optional parameter <_nRestrictToThisLevel> in order to restrict returned string to this level. */ OUString MakeNumString( const SwNumberTree::tNumberVector & rNumVector, - const sal_Bool bInclStrings = sal_True, - const sal_Bool bOnlyArabic = sal_False, + const bool bInclStrings = true, + const bool bOnlyArabic = false, const unsigned int _nRestrictToThisLevel = MAXLEVEL, Extremities* pExtremities = 0 ) const; OUString MakeRefNumString( const SwNodeNum& rNodeNum, @@ -216,7 +216,7 @@ public: SwNumRuleType GetRuleType() const { return meRuleType; } void SetRuleType( SwNumRuleType eNew ) { meRuleType = eNew; - mbInvalidRuleFlag = sal_True; } + mbInvalidRuleFlag = true; } /** A kind of copy-constructor to make sure the num formats are attached to the correctCharFormats of a document!! @@ -232,19 +232,19 @@ public: void SetName( const OUString& rNm, IDocumentListsAccess& rDocListAccess ); - sal_Bool IsAutoRule() const { return mbAutoRuleFlag; } - void SetAutoRule( sal_Bool bFlag ) { mbAutoRuleFlag = bFlag; } + bool IsAutoRule() const { return mbAutoRuleFlag; } + void SetAutoRule( bool bFlag ) { mbAutoRuleFlag = bFlag; } - sal_Bool IsInvalidRule() const { return mbInvalidRuleFlag; } - void SetInvalidRule( sal_Bool bFlag ); + bool IsInvalidRule() const { return mbInvalidRuleFlag; } + void SetInvalidRule( bool bFlag ); - sal_Bool IsContinusNum() const { return mbContinusNum; } - void SetContinusNum( sal_Bool bFlag ) { mbContinusNum = bFlag; } + bool IsContinusNum() const { return mbContinusNum; } + void SetContinusNum( bool bFlag ) { mbContinusNum = bFlag; } - sal_Bool IsAbsSpaces() const { return mbAbsSpaces; } - void SetAbsSpaces( sal_Bool bFlag ) { mbAbsSpaces = bFlag; } + bool IsAbsSpaces() const { return mbAbsSpaces; } + void SetAbsSpaces( bool bFlag ) { mbAbsSpaces = bFlag; } - sal_Bool IsOutlineRule() const { return meRuleType == OUTLINE_RULE; } + bool IsOutlineRule() const { return meRuleType == OUTLINE_RULE; } bool IsCountPhantoms() const; void SetCountPhantoms(bool bCountPhantoms); @@ -313,7 +313,7 @@ namespace numfunc @author OD */ - sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem(); + bool ChangeIndentOnTabAtFirstPosOfFirstListItem(); /** @author OD diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index ed8293b96483..a15a851181a9 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -74,7 +74,7 @@ public: SwPageFtnInfo( const SwPageFtnInfo& ); SwPageFtnInfo& operator=( const SwPageFtnInfo& ); - sal_Bool operator ==( const SwPageFtnInfo& ) const; + bool operator ==( const SwPageFtnInfo& ) const; }; /* @@ -143,8 +143,8 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify sal_uInt16 nRegHeight; ///< Sentence spacing and fontascent of style. sal_uInt16 nRegAscent; ///< For grid alignment (Registerhaltigkeit). UseOnPage eUse; - sal_Bool bLandscape; - sal_Bool bHidden; + bool bLandscape; + bool bHidden; /// Footnote information. SwPageFtnInfo aFtnInfo; @@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify No adjustment at any other place. */ SAL_DLLPRIVATE void Mirror(); - SAL_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft ); + SAL_DLLPRIVATE void ResetAllAttr( bool bLeft ); SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc ); @@ -164,8 +164,8 @@ public: OUString GetName() const { return aDescName; } void SetName( const OUString& rNewName ) { aDescName = rNewName; } - sal_Bool GetLandscape() const { return bLandscape; } - void SetLandscape( sal_Bool bNew ) { bLandscape = bNew; } + bool GetLandscape() const { return bLandscape; } + void SetLandscape( bool bNew ) { bLandscape = bNew; } const SvxNumberType &GetNumType() const { return aNumType; } void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; } @@ -174,15 +174,15 @@ public: SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; } void SetFtnInfo( const SwPageFtnInfo &rNew ) { aFtnInfo = rNew; } - inline sal_Bool IsHeaderShared() const; - inline sal_Bool IsFooterShared() const; - inline void ChgHeaderShare( sal_Bool bNew ); - inline void ChgFooterShare( sal_Bool bNew ); - sal_Bool IsFirstShared() const; - void ChgFirstShare( sal_Bool bNew ); + inline bool IsHeaderShared() const; + inline bool IsFooterShared() const; + inline void ChgHeaderShare( bool bNew ); + inline void ChgFooterShare( bool bNew ); + bool IsFirstShared() const; + void ChgFirstShare( bool bNew ); - sal_Bool IsHidden( ) const { return bHidden; } - void SetHidden( sal_Bool bValue ) { bHidden = bValue; } + bool IsHidden( ) const { return bHidden; } + void SetHidden( bool bValue ) { bHidden = bValue; } inline void SetUseOn( UseOnPage eNew ); inline UseOnPage GetUseOn() const; @@ -236,8 +236,8 @@ public: virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, - sal_Bool bCheckForThisPgDc = sal_True ) const; - sal_Bool IsFollowNextPageOfNode( const SwNode& rNd ) const; + bool bCheckForThisPgDc = true ) const; + bool IsFollowNextPageOfNode( const SwNode& rNd ) const; /// Given a SwNode return the pagedesc in use at that location. static const SwPageDesc* GetPageDescOfNode(const SwNode& rNd); @@ -255,22 +255,22 @@ inline void SwPageDesc::SetFollow( const SwPageDesc* pNew ) pFollow = pNew ? (SwPageDesc*)pNew : this; } -inline sal_Bool SwPageDesc::IsHeaderShared() const +inline bool SwPageDesc::IsHeaderShared() const { return eUse & nsUseOnPage::PD_HEADERSHARE ? sal_True : sal_False; } -inline sal_Bool SwPageDesc::IsFooterShared() const +inline bool SwPageDesc::IsFooterShared() const { return eUse & nsUseOnPage::PD_FOOTERSHARE ? sal_True : sal_False; } -inline void SwPageDesc::ChgHeaderShare( sal_Bool bNew ) +inline void SwPageDesc::ChgHeaderShare( bool bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE); else eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE); } -inline void SwPageDesc::ChgFooterShare( sal_Bool bNew ) +inline void SwPageDesc::ChgFooterShare( bool bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE); @@ -300,12 +300,12 @@ inline UseOnPage SwPageDesc::GetUseOn() const inline void SwPageDesc::ResetAllMasterAttr() { - ResetAllAttr( sal_False ); + ResetAllAttr( false ); } inline void SwPageDesc::ResetAllLeftAttr() { - ResetAllAttr( sal_True ); + ResetAllAttr( true ); } inline const SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) const diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index bb81ce815bbc..449eeba8fa6a 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient sal_uInt16 nReadFmt; ///< For Sw3-Reader: CharFormat-Id (load Pool!). sal_uInt8 nLines; ///< Line count. sal_uInt8 nChars; ///< Character count. - sal_Bool bWholeWord; ///< First word with initials. + bool bWholeWord; ///< First word with initials. public: TYPEINFO_OVERRIDE(); ///< Already in base class SwClient. @@ -80,8 +80,8 @@ public: inline sal_uInt8 GetChars() const { return nChars; } inline sal_uInt8 &GetChars() { return nChars; } - inline sal_Bool GetWholeWord() const { return bWholeWord; } - inline sal_uInt8 &GetWholeWord() { return bWholeWord; } + inline bool GetWholeWord() const { return bWholeWord; } + inline bool &GetWholeWord() { return bWholeWord; } inline sal_uInt16 GetDistance() const { return nDistance; } inline sal_uInt16 &GetDistance() { return nDistance; } @@ -103,7 +103,7 @@ class SwRegisterItem : public SfxBoolItem public: TYPEINFO_OVERRIDE(); - inline SwRegisterItem( const sal_Bool bRegister = sal_False ); + inline SwRegisterItem( const bool bRegister = false ); /// @@@ public copy assignment, but no copy ctor? inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); @@ -117,7 +117,7 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline SwRegisterItem::SwRegisterItem( const sal_Bool bRegister ) : +inline SwRegisterItem::SwRegisterItem( const bool bRegister ) : SfxBoolItem( RES_PARATR_REGISTER, bRegister ) {} @@ -163,7 +163,7 @@ class SwParaConnectBorderItem : public SfxBoolItem public: TYPEINFO_OVERRIDE(); - inline SwParaConnectBorderItem( const sal_Bool bConnect = sal_True ); + inline SwParaConnectBorderItem( const bool bConnect = true ); /// @@@ public copy assignment, but no copy ctor? inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); @@ -177,7 +177,7 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline SwParaConnectBorderItem::SwParaConnectBorderItem( const sal_Bool bConnect ) : +inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) : SfxBoolItem( RES_PARATR_CONNECT_BORDER, bConnect ) {} @@ -189,71 +189,71 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( } // Implementation of paragraph-attributes methods of SwAttrSet -inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(sal_Bool bInP) const +inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const { return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); } -inline const SvxAdjustItem &SwAttrSet::GetAdjust(sal_Bool bInP) const +inline const SvxAdjustItem &SwAttrSet::GetAdjust(bool bInP) const { return (const SvxAdjustItem&)Get( RES_PARATR_ADJUST,bInP); } -inline const SvxFmtSplitItem &SwAttrSet::GetSplit(sal_Bool bInP) const +inline const SvxFmtSplitItem &SwAttrSet::GetSplit(bool bInP) const { return (const SvxFmtSplitItem&)Get( RES_PARATR_SPLIT,bInP); } -inline const SwRegisterItem &SwAttrSet::GetRegister(sal_Bool bInP) const +inline const SwRegisterItem &SwAttrSet::GetRegister(bool bInP) const { return (const SwRegisterItem&)Get( RES_PARATR_REGISTER,bInP); } -inline const SvxWidowsItem &SwAttrSet::GetWidows(sal_Bool bInP) const +inline const SvxWidowsItem &SwAttrSet::GetWidows(bool bInP) const { return (const SvxWidowsItem&)Get( RES_PARATR_WIDOWS,bInP); } -inline const SvxOrphansItem &SwAttrSet::GetOrphans(sal_Bool bInP) const +inline const SvxOrphansItem &SwAttrSet::GetOrphans(bool bInP) const { return (const SvxOrphansItem&)Get( RES_PARATR_ORPHANS,bInP); } -inline const SvxTabStopItem &SwAttrSet::GetTabStops(sal_Bool bInP) const +inline const SvxTabStopItem &SwAttrSet::GetTabStops(bool bInP) const { return (const SvxTabStopItem&)Get( RES_PARATR_TABSTOP,bInP); } -inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(sal_Bool bInP) const +inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(bool bInP) const { return (const SvxHyphenZoneItem&)Get(RES_PARATR_HYPHENZONE,bInP); } -inline const SwFmtDrop &SwAttrSet::GetDrop(sal_Bool bInP) const +inline const SwFmtDrop &SwAttrSet::GetDrop(bool bInP) const { return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); } -inline const SwNumRuleItem &SwAttrSet::GetNumRule(sal_Bool bInP) const +inline const SwNumRuleItem &SwAttrSet::GetNumRule(bool bInP) const { return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); } -inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(sal_Bool bInP) const +inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(bool bInP) const { return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); } -inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(sal_Bool bInP) const +inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(bool bInP) const { return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); } -inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(sal_Bool bInP) const +inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(bool bInP) const { return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); } -inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(sal_Bool bInP) const +inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(bool bInP) const { return (const SvxParaVertAlignItem&)Get( RES_PARATR_VERTALIGN, bInP ); } -inline const SvxParaGridItem &SwAttrSet::GetParaGrid(sal_Bool bInP) const +inline const SvxParaGridItem &SwAttrSet::GetParaGrid(bool bInP) const { return (const SvxParaGridItem&)Get( RES_PARATR_SNAPTOGRID, bInP ); } -inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(sal_Bool bInP) const +inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) const { return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); } // Implementation of paragraph-attributes methods of SwFmt -inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(sal_Bool bInP) const +inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(bool bInP) const { return aSet.GetLineSpacing(bInP); } -inline const SvxAdjustItem &SwFmt::GetAdjust(sal_Bool bInP) const +inline const SvxAdjustItem &SwFmt::GetAdjust(bool bInP) const { return aSet.GetAdjust(bInP); } -inline const SvxFmtSplitItem &SwFmt::GetSplit(sal_Bool bInP) const +inline const SvxFmtSplitItem &SwFmt::GetSplit(bool bInP) const { return aSet.GetSplit(bInP); } -inline const SwRegisterItem &SwFmt::GetRegister(sal_Bool bInP) const +inline const SwRegisterItem &SwFmt::GetRegister(bool bInP) const { return aSet.GetRegister(bInP); } -inline const SvxWidowsItem &SwFmt::GetWidows(sal_Bool bInP) const +inline const SvxWidowsItem &SwFmt::GetWidows(bool bInP) const { return aSet.GetWidows(bInP); } -inline const SvxOrphansItem &SwFmt::GetOrphans(sal_Bool bInP) const +inline const SvxOrphansItem &SwFmt::GetOrphans(bool bInP) const { return aSet.GetOrphans(bInP); } -inline const SvxTabStopItem &SwFmt::GetTabStops(sal_Bool bInP) const +inline const SvxTabStopItem &SwFmt::GetTabStops(bool bInP) const { return aSet.GetTabStops(bInP); } -inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(sal_Bool bInP) const +inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(bool bInP) const { return aSet.GetHyphenZone(bInP); } -inline const SwFmtDrop &SwFmt::GetDrop(sal_Bool bInP) const +inline const SwFmtDrop &SwFmt::GetDrop(bool bInP) const { return aSet.GetDrop(bInP); } -inline const SwNumRuleItem &SwFmt::GetNumRule(sal_Bool bInP) const +inline const SwNumRuleItem &SwFmt::GetNumRule(bool bInP) const { return aSet.GetNumRule(bInP); } -inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(sal_Bool bInP) const +inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const { return aSet.GetScriptSpace(bInP) ; } -inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(sal_Bool bInP) const +inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const { return aSet.GetHangingPunctuation(bInP) ; } -inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(sal_Bool bInP) const +inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const { return (const SvxForbiddenRuleItem&)aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP); } -inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(sal_Bool bInP) const +inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const { return (const SvxParaVertAlignItem&)aSet.Get( RES_PARATR_VERTALIGN, bInP ); } -inline const SvxParaGridItem &SwFmt::GetParaGrid(sal_Bool bInP) const +inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const { return (const SvxParaGridItem&)aSet.Get( RES_PARATR_SNAPTOGRID, bInP ); } -inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(sal_Bool bInP) const +inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const { return (const SwParaConnectBorderItem&)aSet.Get( RES_PARATR_CONNECT_BORDER, bInP ); } #endif diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index 7280f9ed6225..7f6a9d8d5b64 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -82,7 +82,7 @@ const sal_uInt16 POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; const sal_uInt16 POOL_IDUSER_FMT = USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID); -inline sal_Bool IsPoolUserFmt( sal_uInt16 nId ) +inline bool IsPoolUserFmt( sal_uInt16 nId ) { return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID)) @@ -403,7 +403,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId ); SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage); -inline sal_Bool IsConditionalByPoolId(sal_uInt16 nId) +inline bool IsConditionalByPoolId(sal_uInt16 nId) { return RES_POOLCOLL_TEXT == nId; } diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 748c6940e724..3142000f35b2 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -51,7 +51,7 @@ class SwPrintData public: - sal_Bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl, bPrintPageBackground, + bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl, bPrintPageBackground, bPrintBlackFont, //#i81434# - printing of hidden text bPrintHiddenText, bPrintTextPlaceholder, @@ -81,7 +81,7 @@ public: bPrintRightPages = bPrintPageBackground = bPrintEmptyPages = - bUpdateFieldsInPrinting = sal_True; + bUpdateFieldsInPrinting = true; bPaperFromSetup = bPrintReverse = @@ -91,14 +91,14 @@ public: bModified = bPrintBlackFont = bPrintHiddenText = - bPrintTextPlaceholder = sal_False; + bPrintTextPlaceholder = false; nPrintPostIts = 0; } virtual ~SwPrintData() {} - sal_Bool operator==(const SwPrintData& rData)const + bool operator==(const SwPrintData& rData)const { return bPrintGraphic == rData.bPrintGraphic && @@ -129,45 +129,45 @@ public: void SetPrintUIOptions( const SwPrintUIOptions *pOpt ) { m_pPrintUIOptions = pOpt; } void SetRenderData( const SwRenderData *pData ) { m_pRenderData = pData; } - sal_Bool IsPrintGraphic() const { return bPrintGraphic; } - sal_Bool IsPrintTable() const { return bPrintTable; } - sal_Bool IsPrintDraw() const { return bPrintDraw; } - sal_Bool IsPrintControl() const { return bPrintControl; } - sal_Bool IsPrintLeftPage() const { return bPrintLeftPages; } - sal_Bool IsPrintRightPage() const { return bPrintRightPages; } - sal_Bool IsPrintReverse() const { return bPrintReverse; } - sal_Bool IsPaperFromSetup() const { return bPaperFromSetup; } - sal_Bool IsPrintEmptyPages() const { return bPrintEmptyPages; } - sal_Bool IsPrintProspect() const { return bPrintProspect; } - sal_Bool IsPrintProspectRTL() const { return bPrintProspectRTL; } - sal_Bool IsPrintPageBackground() const { return bPrintPageBackground; } - sal_Bool IsPrintBlackFont() const { return bPrintBlackFont; } - sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs; } + bool IsPrintGraphic() const { return bPrintGraphic; } + bool IsPrintTable() const { return bPrintTable; } + bool IsPrintDraw() const { return bPrintDraw; } + bool IsPrintControl() const { return bPrintControl; } + bool IsPrintLeftPage() const { return bPrintLeftPages; } + bool IsPrintRightPage() const { return bPrintRightPages; } + bool IsPrintReverse() const { return bPrintReverse; } + bool IsPaperFromSetup() const { return bPaperFromSetup; } + bool IsPrintEmptyPages() const { return bPrintEmptyPages; } + bool IsPrintProspect() const { return bPrintProspect; } + bool IsPrintProspectRTL() const { return bPrintProspectRTL; } + bool IsPrintPageBackground() const { return bPrintPageBackground; } + bool IsPrintBlackFont() const { return bPrintBlackFont; } + bool IsPrintSingleJobs() const { return bPrintSingleJobs; } sal_Int16 GetPrintPostIts() const { return nPrintPostIts; } const OUString GetFaxName() const { return sFaxName; } - sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; } - sal_Bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; } - - void SetPrintGraphic( sal_Bool b ) { doSetModified(); bPrintGraphic = b; } - void SetPrintTable( sal_Bool b ) { doSetModified(); bPrintTable = b; } - void SetPrintDraw( sal_Bool b ) { doSetModified(); bPrintDraw = b; } - void SetPrintControl( sal_Bool b ) { doSetModified(); bPrintControl = b; } - void SetPrintLeftPage( sal_Bool b ) { doSetModified(); bPrintLeftPages = b; } - void SetPrintRightPage( sal_Bool b ) { doSetModified(); bPrintRightPages = b; } - void SetPrintReverse( sal_Bool b ) { doSetModified(); bPrintReverse = b; } - void SetPaperFromSetup( sal_Bool b ) { doSetModified(); bPaperFromSetup = b; } - void SetPrintEmptyPages( sal_Bool b ) { doSetModified(); bPrintEmptyPages = b; } + bool IsPrintHiddenText() const { return bPrintHiddenText; } + bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; } + + void SetPrintGraphic( bool b ) { doSetModified(); bPrintGraphic = b; } + void SetPrintTable( bool b ) { doSetModified(); bPrintTable = b; } + void SetPrintDraw( bool b ) { doSetModified(); bPrintDraw = b; } + void SetPrintControl( bool b ) { doSetModified(); bPrintControl = b; } + void SetPrintLeftPage( bool b ) { doSetModified(); bPrintLeftPages = b; } + void SetPrintRightPage( bool b ) { doSetModified(); bPrintRightPages = b; } + void SetPrintReverse( bool b ) { doSetModified(); bPrintReverse = b; } + void SetPaperFromSetup( bool b ) { doSetModified(); bPaperFromSetup = b; } + void SetPrintEmptyPages( bool b ) { doSetModified(); bPrintEmptyPages = b; } void SetPrintPostIts( sal_Int16 n ) { doSetModified(); nPrintPostIts = n; } - void SetPrintProspect( sal_Bool b ) { doSetModified(); bPrintProspect = b; } - void SetPrintProspect_RTL( sal_Bool b ) { doSetModified(); bPrintProspectRTL = b; } - void SetPrintPageBackground( sal_Bool b ) { doSetModified(); bPrintPageBackground = b; } - void SetPrintBlackFont( sal_Bool b ) { doSetModified(); bPrintBlackFont = b; } - void SetPrintSingleJobs( sal_Bool b ) { doSetModified(); bPrintSingleJobs = b; } + void SetPrintProspect( bool b ) { doSetModified(); bPrintProspect = b; } + void SetPrintProspect_RTL( bool b ) { doSetModified(); bPrintProspectRTL = b; } + void SetPrintPageBackground( bool b ) { doSetModified(); bPrintPageBackground = b; } + void SetPrintBlackFont( bool b ) { doSetModified(); bPrintBlackFont = b; } + void SetPrintSingleJobs( bool b ) { doSetModified(); bPrintSingleJobs = b; } void SetFaxName( const OUString& rSet ) { sFaxName = rSet; } - void SetPrintHiddenText( sal_Bool b ) { doSetModified(); bPrintHiddenText = b; } - void SetPrintTextPlaceholder( sal_Bool b ) { doSetModified(); bPrintTextPlaceholder = b; } + void SetPrintHiddenText( bool b ) { doSetModified(); bPrintHiddenText = b; } + void SetPrintTextPlaceholder( bool b ) { doSetModified(); bPrintTextPlaceholder = b; } - virtual void doSetModified () { bModified = sal_True;} + virtual void doSetModified () { bModified = true;} }; class SwPrintUIOptions : public vcl::PrinterOptionsHelper @@ -184,7 +184,7 @@ public: bool IsPrintFormControls() const { return getBoolValue( "PrintControls", m_rDefaultPrintData.bPrintControl ); } bool IsPrintPageBackground() const { return getBoolValue( "PrintPageBackground", m_rDefaultPrintData.bPrintPageBackground ); } bool IsPrintProspect() const { return getBoolValue( "PrintProspect", m_rDefaultPrintData.bPrintProspect ); } - bool IsPrintProspectRTL() const { return getIntValue( "PrintProspectRTL", m_rDefaultPrintData.bPrintProspectRTL ) ? true : false; } + bool IsPrintProspectRTL() const { return getIntValue( "PrintProspectRTL", m_rDefaultPrintData.bPrintProspectRTL ? 1 : 0 ) ? true : false; } bool IsPrintTextPlaceholders() const { return getBoolValue( "PrintTextPlaceholder", m_rDefaultPrintData.bPrintTextPlaceholder ); } bool IsPrintHiddenText() const { return getBoolValue( "PrintHiddenText", m_rDefaultPrintData.bPrintHiddenText ); } bool IsPrintWithBlackTextColor() const { return getBoolValue( "PrintBlackFonts", m_rDefaultPrintData.bPrintBlackFont ); } diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index d7397b3575d7..a304772344e7 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -24,16 +24,16 @@ class SwPrintOptions : public SwPrintData, public utl::ConfigItem { - sal_Bool bIsWeb; + bool bIsWeb; com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: - SwPrintOptions(sal_Bool bWeb); + SwPrintOptions(bool bWeb); virtual ~SwPrintOptions(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; - virtual void doSetModified( ) SAL_OVERRIDE { bModified = sal_True; SetModified();} + virtual void doSetModified( ) SAL_OVERRIDE { bModified = true; SetModified();} SwPrintOptions& operator=(const SwPrintData& rData) { diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx index 06c5189bc30c..a559257d6b4d 100644 --- a/sw/inc/pvprtdat.hxx +++ b/sw/inc/pvprtdat.hxx @@ -27,12 +27,12 @@ class SwPagePreviewPrtData sal_uLong nLeftSpace, nRightSpace, nTopSpace, nBottomSpace, nHorzSpace, nVertSpace; sal_uInt8 nRow, nCol; - sal_Bool bLandscape : 1; + bool bLandscape : 1; public: SwPagePreviewPrtData() : nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0), nHorzSpace(0), nVertSpace(0), nRow(1), nCol(1), - bLandscape(0) + bLandscape(false) {} sal_uLong GetLeftSpace() const { return nLeftSpace; } @@ -60,7 +60,7 @@ public: void SetCol( sal_uInt8 n ) { nCol = n; } bool GetLandscape() const { return bLandscape; } - void SetLandscape( sal_Bool b ) { bLandscape = b; } + void SetLandscape( bool b ) { bLandscape = b; } }; #endif diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 6219b598a3ff..ab1945b437ac 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -116,7 +116,7 @@ class SW_DLLPUBLIC SwRedlineData public: SwRedlineData( RedlineType_t eT, sal_uInt16 nAut ); - SwRedlineData( const SwRedlineData& rCpy, sal_Bool bCpyNext = sal_True ); + SwRedlineData( const SwRedlineData& rCpy, bool bCpyNext = true ); // For sw3io: pNext/pExtraData are taken over. SwRedlineData( RedlineType_t eT, sal_uInt16 nAut, const DateTime& rDT, @@ -184,9 +184,9 @@ class SW_DLLPUBLIC SwRangeRedline : public SwPaM { SwRedlineData* pRedlineData; SwNodeIndex* pCntntSect; - sal_Bool bDelLastPara : 1; - sal_Bool bIsLastParaDelete : 1; - sal_Bool bIsVisible : 1; + bool bDelLastPara : 1; + bool bIsLastParaDelete : 1; + bool bIsVisible : 1; void MoveToSection(); void CopyToSection(); @@ -198,8 +198,8 @@ public: SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam ); SwRangeRedline( const SwRedlineData& rData, const SwPosition& rPos ); // For sw3io: pData is taken over! - SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, sal_Bool bVsbl, - sal_Bool bDelLP, sal_Bool bIsPD) : + SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, bool bVsbl, + bool bDelLP, bool bIsPD) : SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ), bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl ) {} @@ -210,8 +210,8 @@ public: // For Undo. void SetContentIdx( const SwNodeIndex* ); - sal_Bool IsVisible() const { return bIsVisible; } - sal_Bool IsDelLastPara() const { return bDelLastPara; } + bool IsVisible() const { return bIsVisible; } + bool IsDelLastPara() const { return bDelLastPara; } // sal_Bool indicates whether after setting of Pos no range is spanned. // -> sal-True else range and sal-False. @@ -226,7 +226,7 @@ public: *pEndPtr = rPos; } /// Do we have a valid selection? - sal_Bool HasValidRange() const; + bool HasValidRange() const; const SwRedlineData& GetRedlineData(sal_uInt16 nPos = 0) const; bool operator==( const SwRedlineData& rCmp ) const @@ -274,12 +274,12 @@ public: /// Initiate the layout. void InvalidateRange(); - sal_Bool IsOwnRedline( const SwRangeRedline& rRedl ) const + bool IsOwnRedline( const SwRangeRedline& rRedl ) const { return GetAuthor() == rRedl.GetAuthor(); } - sal_Bool CanCombine( const SwRangeRedline& rRedl ) const; + bool CanCombine( const SwRangeRedline& rRedl ) const; - void PushData( const SwRangeRedline& rRedl, sal_Bool bOwnAsNext = sal_True ); - sal_Bool PopData(); + void PushData( const SwRangeRedline& rRedl, bool bOwnAsNext = true ); + bool PopData(); /** Returns textual description of this a redline data element of diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index f42b0c8c451a..7a9365718b96 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -200,7 +200,7 @@ public: void SetCondHidden(bool const bFlag = true); bool IsCondHidden() const { return m_Data.IsCondHidden(); } // Query (also for parents) if this section is to be hidden. - sal_Bool CalcHiddenFlag() const; + bool CalcHiddenFlag() const; inline SwSection* GetParent() const; @@ -261,7 +261,7 @@ public: class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint { public: - SwSectionFrmMoveAndDeleteHint( const sal_Bool bSaveCntnt ) + SwSectionFrmMoveAndDeleteHint( const bool bSaveCntnt ) : SfxSimpleHint( SFX_HINT_DYING ) , mbSaveCntnt( bSaveCntnt ) {} @@ -269,13 +269,13 @@ class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint virtual ~SwSectionFrmMoveAndDeleteHint() {} - sal_Bool IsSaveCntnt() const + bool IsSaveCntnt() const { return mbSaveCntnt; } private: - const sal_Bool mbSaveCntnt; + const bool mbSaveCntnt; }; enum SectionSort { SORTSECT_NOT, SORTSECT_NAME, SORTSECT_POS }; @@ -321,10 +321,10 @@ public: // - all of them or only those that are in the normal Nodes-array. sal_uInt16 GetChildSections( SwSections& rArr, SectionSort eSort = SORTSECT_NOT, - sal_Bool bAllSections = sal_True ) const; + bool bAllSections = true ) const; // Query whether section is in Nodes-array or in UndoNodes-array. - sal_Bool IsInNodesArr() const; + bool IsInNodesArr() const; SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false); const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index cf7449ed429a..3ab0b228c3c4 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -106,35 +106,35 @@ class SwgReaderOption SwAsciiOptions aASCIIOpts; union { - sal_Bool bFmtsOnly; + bool bFmtsOnly; struct { - sal_Bool bFrmFmts: 1; - sal_Bool bPageDescs: 1; - sal_Bool bTxtFmts: 1; - sal_Bool bNumRules: 1; - sal_Bool bMerge:1; + bool bFrmFmts: 1; + bool bPageDescs: 1; + bool bTxtFmts: 1; + bool bNumRules: 1; + bool bMerge:1; } Fmts; } What; public: - void ResetAllFmtsOnly() { What.bFmtsOnly = 0; } - sal_Bool IsFmtsOnly() const { return What.bFmtsOnly; } + void ResetAllFmtsOnly() { What.bFmtsOnly = false; } + bool IsFmtsOnly() const { return What.bFmtsOnly; } - sal_Bool IsFrmFmts() const { return What.Fmts.bFrmFmts; } - void SetFrmFmts( const sal_Bool bNew) { What.Fmts.bFrmFmts = bNew; } + bool IsFrmFmts() const { return What.Fmts.bFrmFmts; } + void SetFrmFmts( const bool bNew) { What.Fmts.bFrmFmts = bNew; } - sal_Bool IsPageDescs() const { return What.Fmts.bPageDescs; } - void SetPageDescs( const sal_Bool bNew) { What.Fmts.bPageDescs = bNew; } + bool IsPageDescs() const { return What.Fmts.bPageDescs; } + void SetPageDescs( const bool bNew) { What.Fmts.bPageDescs = bNew; } - sal_Bool IsTxtFmts() const { return What.Fmts.bTxtFmts; } - void SetTxtFmts( const sal_Bool bNew) { What.Fmts.bTxtFmts = bNew; } + bool IsTxtFmts() const { return What.Fmts.bTxtFmts; } + void SetTxtFmts( const bool bNew) { What.Fmts.bTxtFmts = bNew; } - sal_Bool IsNumRules() const { return What.Fmts.bNumRules; } - void SetNumRules( const sal_Bool bNew) { What.Fmts.bNumRules = bNew; } + bool IsNumRules() const { return What.Fmts.bNumRules; } + void SetNumRules( const bool bNew) { What.Fmts.bNumRules = bNew; } - sal_Bool IsMerge() const { return What.Fmts.bMerge; } - void SetMerge( const sal_Bool bNew ) { What.Fmts.bMerge = bNew; } + bool IsMerge() const { return What.Fmts.bMerge; } + void SetMerge( const bool bNew ) { What.Fmts.bMerge = bNew; } const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; } void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; } @@ -169,13 +169,13 @@ public: SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFilename, SwPaM& ); // The only export interface is SwReader::Read(...)!!! - sal_Bool NeedsPasswd( const Reader& ); - sal_Bool CheckPasswd( const OUString&, const Reader& ); + bool NeedsPasswd( const Reader& ); + bool CheckPasswd( const OUString&, const Reader& ); sal_uLong Read( const Reader& ); // Ask for glossaries. - sal_Bool HasGlossaries( const Reader& ); - sal_Bool ReadGlossaries( const Reader&, SwTextBlocks&, sal_Bool bSaveRelFiles ); + bool HasGlossaries( const Reader& ); + bool ReadGlossaries( const Reader&, SwTextBlocks&, bool bSaveRelFiles ); OUString GetBaseURL() const { return sBaseURL;} @@ -204,13 +204,13 @@ protected: SfxMedium* pMedium; // Who wants to obtain a Medium (W4W). SwgReaderOption aOpt; - sal_Bool bInsertMode : 1; - sal_Bool bTmplBrowseMode : 1; - sal_Bool bReadUTF8: 1; // Interprete stream as UTF-8. - sal_Bool bBlockMode: 1; - sal_Bool bOrganizerMode : 1; - sal_Bool bHasAskTemplateName : 1; - sal_Bool bIgnoreHTMLComments : 1; + bool bInsertMode : 1; + bool bTmplBrowseMode : 1; + bool bReadUTF8: 1; // Interprete stream as UTF-8. + bool bBlockMode: 1; + bool bOrganizerMode : 1; + bool bHasAskTemplateName : 1; + bool bIgnoreHTMLComments : 1; virtual OUString GetTemplateName() const; @@ -232,24 +232,24 @@ public: // Load filter template, set it and release it again. SwDoc* GetTemplateDoc(); - sal_Bool SetTemplate( SwDoc& rDoc ); + bool SetTemplate( SwDoc& rDoc ); void ClearTemplate(); void SetTemplateName( const OUString& rDir ); void MakeHTMLDummyTemplateDoc(); - sal_Bool IsReadUTF8() const { return bReadUTF8; } - void SetReadUTF8( sal_Bool bSet ) { bReadUTF8 = bSet; } + bool IsReadUTF8() const { return bReadUTF8; } + void SetReadUTF8( bool bSet ) { bReadUTF8 = bSet; } - sal_Bool IsBlockMode() const { return bBlockMode; } - void SetBlockMode( sal_Bool bSet ) { bBlockMode = bSet; } + bool IsBlockMode() const { return bBlockMode; } + void SetBlockMode( bool bSet ) { bBlockMode = bSet; } - sal_Bool IsOrganizerMode() const { return bOrganizerMode; } - void SetOrganizerMode( sal_Bool bSet ) { bOrganizerMode = bSet; } + bool IsOrganizerMode() const { return bOrganizerMode; } + void SetOrganizerMode( bool bSet ) { bOrganizerMode = bSet; } - void SetIgnoreHTMLComments( sal_Bool bSet ) { bIgnoreHTMLComments = bSet; } + void SetIgnoreHTMLComments( bool bSet ) { bIgnoreHTMLComments = bSet; } - virtual sal_Bool HasGlossaries() const; - virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const; + virtual bool HasGlossaries() const; + virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const; // Read the sections of the document, which is equal to the medium. // Returns the count of it @@ -312,7 +312,7 @@ public: OUString GetBaseURL() const; void SetBaseURL( const OUString& rURL ); - sal_Bool IsOld() const; + bool IsOld() const; sal_uLong ConvertToNew(); // Convert text modules. sal_uInt16 GetCount() const; // Get count text modules. @@ -321,29 +321,29 @@ public: OUString GetShortName( sal_uInt16 ) const; // Get short name for index. OUString GetLongName( sal_uInt16 ) const; // Get long name for index. - sal_Bool Delete( sal_uInt16 ); + bool Delete( sal_uInt16 ); sal_uInt16 Rename( sal_uInt16, const OUString*, const OUString* ); sal_uLong CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort, const OUString& rLong ); - sal_Bool BeginGetDoc( sal_uInt16 ); // Read text modules. + bool BeginGetDoc( sal_uInt16 ); // Read text modules. void EndGetDoc(); // Release text modules. - sal_Bool BeginPutDoc( const OUString&, const OUString& ); // Begin save. + bool BeginPutDoc( const OUString&, const OUString& ); // Begin save. sal_uInt16 PutDoc(); // End save. sal_uInt16 PutText( const OUString&, const OUString&, const OUString& ); // Save (short name, text). - sal_Bool IsOnlyTextBlock( sal_uInt16 ) const; - sal_Bool IsOnlyTextBlock( const OUString& rShort ) const; + bool IsOnlyTextBlock( sal_uInt16 ) const; + bool IsOnlyTextBlock( const OUString& rShort ) const; OUString GetFileName() const; // Filename of pImp. - sal_Bool IsReadOnly() const; // ReadOnly-flag of pImp. + bool IsReadOnly() const; // ReadOnly-flag of pImp. - sal_Bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl ); - sal_Bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl ); + bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl ); + bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl ); - sal_Bool StartPutMuchBlockEntries(); + bool StartPutMuchBlockEntries(); void EndPutMuchBlockEntries(); }; @@ -355,7 +355,7 @@ SW_DLLPUBLIC SwRead SwGetReaderXML(); // END source/filter/basflt/fltini.cxx -extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); //For templates from HTML before loading shellio.cxx. +extern bool SetHTMLTemplate( SwDoc &rDoc ); //For templates from HTML before loading shellio.cxx. // Base-class of all writers. @@ -380,7 +380,7 @@ protected: const OUString* pOrigFileName; void ResetWriter(); - sal_Bool CopyNextPam( SwPaM ** ); + bool CopyNextPam( SwPaM ** ); void PutNumFmtFontsInAttrPool(); void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true ); @@ -397,18 +397,18 @@ protected: public: SwDoc* pDoc; SwPaM* pCurPam; - sal_Bool bWriteAll : 1; - sal_Bool bShowProgress : 1; - sal_Bool bWriteClipboardDoc : 1; - sal_Bool bWriteOnlyFirstTable : 1; - sal_Bool bASCII_ParaAsCR : 1; - sal_Bool bASCII_ParaAsBlanc : 1; - sal_Bool bASCII_NoLastLineEnd : 1; - sal_Bool bUCS2_WithStartChar : 1; - sal_Bool bExportPargraphNumbering : 1; - - sal_Bool bBlock : 1; - sal_Bool bOrganizerMode : 1; + bool bWriteAll : 1; + bool bShowProgress : 1; + bool bWriteClipboardDoc : 1; + bool bWriteOnlyFirstTable : 1; + bool bASCII_ParaAsCR : 1; + bool bASCII_ParaAsBlanc : 1; + bool bASCII_NoLastLineEnd : 1; + bool bUCS2_WithStartChar : 1; + bool bExportPargraphNumbering : 1; + + bool bBlock : 1; + bool bOrganizerMode : 1; Writer(); virtual ~Writer(); @@ -421,9 +421,9 @@ public: virtual void SetupFilterOptions(SfxMedium& rMedium); virtual void SetVersion( const OUString&, long ); - virtual sal_Bool IsStgWriter() const; + virtual bool IsStgWriter() const; - void SetShowProgress( sal_Bool bFlag = sal_False ) { bShowProgress = bFlag; } + void SetShowProgress( bool bFlag = false ) { bShowProgress = bFlag; } const OUString* GetOrigFileName() const { return pOrigFileName; } @@ -458,7 +458,7 @@ public: void SetStream(SvStream *const pStream); SvStream& Strm(); - void SetOrganizerMode( sal_Bool bSet ) { bOrganizerMode = bSet; } + void SetOrganizerMode( bool bSet ) { bOrganizerMode = bSet; } }; #ifndef SW_DECL_WRITER_DEFINED @@ -484,7 +484,7 @@ protected: public: StgWriter() : Writer() {} - virtual sal_Bool IsStgWriter() const SAL_OVERRIDE; + virtual bool IsStgWriter() const SAL_OVERRIDE; virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) SAL_OVERRIDE; virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ) SAL_OVERRIDE; @@ -505,24 +505,24 @@ class SW_DLLPUBLIC SwWriter SwCrsrShell *pShell; SwDoc &rDoc; - sal_Bool bWriteAll; + bool bWriteAll; public: sal_uLong Write( WriterRef& rxWriter, const OUString* = 0); - SwWriter( SvStream&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); + SwWriter( SvStream&, SwCrsrShell &, bool bWriteAll = false ); SwWriter( SvStream&, SwDoc & ); - SwWriter( SvStream&, SwPaM &, sal_Bool bWriteAll = sal_False ); + SwWriter( SvStream&, SwPaM &, bool bWriteAll = false ); SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& ); - SwWriter( SfxMedium&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); + SwWriter( SfxMedium&, SwCrsrShell &, bool bWriteAll = false ); SwWriter( SfxMedium&, SwDoc & ); }; typedef Reader* (*FnGetReader)(); typedef void (*FnGetWriter)(const OUString&, const OUString& rBaseURL, WriterRef&); -sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& ); +sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, bool, const OUString& ); sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); struct SwReaderWriterEntry @@ -530,9 +530,9 @@ struct SwReaderWriterEntry Reader* pReader; FnGetReader fnGetReader; FnGetWriter fnGetWriter; - sal_Bool bDelReader; + bool bDelReader; - SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, sal_Bool bDel ) + SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, bool bDel ) : pReader( NULL ), fnGetReader( fnReader ), fnGetWriter( fnWriter ), bDelReader( bDel ) {} diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 4a3c4b7fbe4e..1c7878dd680d 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -112,7 +112,7 @@ class AbstractInsFootNoteDlg : public VclAbstractDialog { public: virtual OUString GetFontName() = 0; - virtual sal_Bool IsEndNote() = 0; + virtual bool IsEndNote() = 0; virtual OUString GetStr() = 0; //from class Window virtual void SetHelpId( const OString& sHelpId ) = 0; @@ -132,8 +132,8 @@ class AbstractJavaEditDialog : public VclAbstractDialog public: virtual OUString GetScriptText() const = 0; virtual OUString GetScriptType() const = 0; - virtual sal_Bool IsUrl() const = 0; - virtual sal_Bool IsNew() const = 0; + virtual bool IsUrl() const = 0; + virtual bool IsNew() const = 0; virtual bool IsUpdate() const = 0; }; @@ -153,12 +153,12 @@ public: class AbstractMailMergeCreateFromDlg : public VclAbstractDialog { public: - virtual sal_Bool IsThisDocument() const = 0; + virtual bool IsThisDocument() const = 0; }; class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog { public: - virtual sal_Bool IsUseExistingConnections() const = 0; + virtual bool IsUseExistingConnections() const = 0; }; class AbstractMultiTOXTabDialog : public VclAbstractDialog @@ -268,7 +268,7 @@ public: class AbstractSwFldDlg : public SfxAbstractTabDialog { public: - virtual void Start( sal_Bool bShow = sal_True ) = 0; //this method from sfxtabdialog + virtual void Start( bool bShow = true ) = 0; //this method from sfxtabdialog virtual void Initialize(SfxChildWinInfo *pInfo) = 0; virtual void ReInitDlg() = 0; virtual void ActivateDatabasePage() = 0; @@ -288,7 +288,7 @@ public: class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog { public: - virtual void AcceptAll( sal_Bool bAccept ) = 0; + virtual void AcceptAll( bool bAccept ) = 0; }; class AbstractMarkFloatDlg : public VclAbstractDialog @@ -313,7 +313,7 @@ class AbstractMailMergeWizard : public VclAbstractDialog2 public: virtual void SetReloadDocument(const OUString& rURL) = 0; virtual OUString GetReloadDocument() const = 0; - virtual sal_Bool ShowPage( sal_uInt16 nLevel ) = 0; + virtual bool ShowPage( sal_uInt16 nLevel ) = 0; virtual sal_uInt16 GetRestartPage() const = 0; }; @@ -349,8 +349,8 @@ public: virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0; virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window *pParent, SwWrtShell &rSh, - SwField* pField, sal_Bool bNextButton = sal_False) = 0; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0; + SwField* pField, bool bNextButton = false) = 0; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0; virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, SwDBMgr* pDBMgr, bool bLabel) = 0; @@ -362,7 +362,7 @@ public: const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString *pCollName = 0, - sal_Bool bDraw = sal_False, + bool bDraw = false, const OString& sDefPage = OString() ) = 0; virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) = 0; @@ -371,10 +371,10 @@ public: virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0; virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, - sal_Bool bSetAutoFmt = sal_True, + bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ) = 0; virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0; - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; + virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0; virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, @@ -387,7 +387,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0; virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0; - virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0; + virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, bool& rWithPrev ) = 0; virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OString &rDialogType, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, @@ -411,7 +411,7 @@ public: virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(Window * pParent, - SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; + SwWrtShell &rSh, bool bEd = false) = 0; virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0; virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) = 0; virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0; @@ -435,22 +435,22 @@ public: Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, - sal_Bool bGlobal = sal_False) = 0; + bool bGlobal = false) = 0; virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, - SfxChildWinInfo* pInfo, - sal_Bool bNew=sal_True) = 0; + SfxChildWinInfo* pInfo, + bool bNew=true) = 0; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, - SfxChildWinInfo* pInfo, - sal_Bool bNew=sal_True) = 0; + SfxChildWinInfo* pInfo, + bool bNew=true) = 0; virtual VclAbstractDialog * CreateIndexMarkModalDlg( Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0; diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 1ebfce5ccbb6..fbd6c6d2e23b 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -217,124 +217,124 @@ public: // Get methods: bool indicates whether to search only in Set (sal_False) // or also in parents. If nothing is found then default attribute is returned. // Character attributes. Implementation in charatr.hxx. - inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const; - inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const; - inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const; - inline const SvxAutoKernItem &GetAutoKern( sal_Bool = sal_True ) const; - inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const; - inline const SvxContourItem &GetContour( sal_Bool = sal_True ) const; - inline const SvxKerningItem &GetKerning( sal_Bool = sal_True ) const; - inline const SvxUnderlineItem &GetUnderline( sal_Bool = sal_True ) const; - inline const SvxOverlineItem &GetOverline( sal_Bool = sal_True ) const; - inline const SvxCrossedOutItem &GetCrossedOut( sal_Bool = sal_True ) const; - inline const SvxFontHeightItem &GetSize( sal_Bool = sal_True ) const; - inline const SvxPropSizeItem &GetPropSize( sal_Bool = sal_True ) const; - inline const SvxFontItem &GetFont( sal_Bool = sal_True ) const; - inline const SvxColorItem &GetColor( sal_Bool = sal_True ) const; - inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const; - inline const SvxLanguageItem &GetLanguage( sal_Bool = sal_True ) const; - inline const SvxEscapementItem &GetEscapement( sal_Bool = sal_True ) const; - inline const SvxCaseMapItem &GetCaseMap( sal_Bool = sal_True ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( sal_Bool = sal_True ) const; - inline const SvxBlinkItem &GetBlink( sal_Bool = sal_True ) const; - inline const SvxBrushItem &GetChrBackground( sal_Bool = sal_True ) const; - inline const SvxBrushItem &GetChrHighlight( sal_Bool = sal_True ) const; - inline const SvxFontItem &GetCJKFont( sal_Bool = sal_True ) const; - inline const SvxFontHeightItem &GetCJKSize( sal_Bool = sal_True ) const; - inline const SvxLanguageItem &GetCJKLanguage( sal_Bool = sal_True ) const; - inline const SvxPostureItem &GetCJKPosture( sal_Bool = sal_True ) const; - inline const SvxWeightItem &GetCJKWeight( sal_Bool = sal_True ) const; - inline const SvxFontItem &GetCTLFont( sal_Bool = sal_True ) const; - inline const SvxFontHeightItem &GetCTLSize( sal_Bool = sal_True ) const; - inline const SvxLanguageItem &GetCTLLanguage( sal_Bool = sal_True ) const; - inline const SvxPostureItem &GetCTLPosture( sal_Bool = sal_True ) const; - inline const SvxWeightItem &GetCTLWeight( sal_Bool = sal_True ) const; - inline const SfxBoolItem &GetWritingDirection( sal_Bool = sal_True ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const; - inline const SvxTwoLinesItem &Get2Lines( sal_Bool = sal_True ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const; - inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; - inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; - inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; - inline const SvxBoxItem &GetCharBorder( sal_Bool = sal_True ) const; - inline const SvxShadowItem &GetCharShadow( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetPosture( bool = true ) const; + inline const SvxWeightItem &GetWeight( bool = true ) const; + inline const SvxShadowedItem &GetShadowed( bool = true ) const; + inline const SvxAutoKernItem &GetAutoKern( bool = true ) const; + inline const SvxWordLineModeItem &GetWordLineMode( bool = true ) const; + inline const SvxContourItem &GetContour( bool = true ) const; + inline const SvxKerningItem &GetKerning( bool = true ) const; + inline const SvxUnderlineItem &GetUnderline( bool = true ) const; + inline const SvxOverlineItem &GetOverline( bool = true ) const; + inline const SvxCrossedOutItem &GetCrossedOut( bool = true ) const; + inline const SvxFontHeightItem &GetSize( bool = true ) const; + inline const SvxPropSizeItem &GetPropSize( bool = true ) const; + inline const SvxFontItem &GetFont( bool = true ) const; + inline const SvxColorItem &GetColor( bool = true ) const; + inline const SvxCharSetColorItem &GetCharSetColor( bool = true ) const; + inline const SvxLanguageItem &GetLanguage( bool = true ) const; + inline const SvxEscapementItem &GetEscapement( bool = true ) const; + inline const SvxCaseMapItem &GetCaseMap( bool = true ) const; + inline const SvxNoHyphenItem &GetNoHyphenHere( bool = true ) const; + inline const SvxBlinkItem &GetBlink( bool = true ) const; + inline const SvxBrushItem &GetChrBackground( bool = true ) const; + inline const SvxBrushItem &GetChrHighlight( bool = true ) const; + inline const SvxFontItem &GetCJKFont( bool = true ) const; + inline const SvxFontHeightItem &GetCJKSize( bool = true ) const; + inline const SvxLanguageItem &GetCJKLanguage( bool = true ) const; + inline const SvxPostureItem &GetCJKPosture( bool = true ) const; + inline const SvxWeightItem &GetCJKWeight( bool = true ) const; + inline const SvxFontItem &GetCTLFont( bool = true ) const; + inline const SvxFontHeightItem &GetCTLSize( bool = true ) const; + inline const SvxLanguageItem &GetCTLLanguage( bool = true ) const; + inline const SvxPostureItem &GetCTLPosture( bool = true ) const; + inline const SvxWeightItem &GetCTLWeight( bool = true ) const; + inline const SfxBoolItem &GetWritingDirection( bool = true ) const; + inline const SvxEmphasisMarkItem &GetEmphasisMark( bool = true ) const; + inline const SvxTwoLinesItem &Get2Lines( bool = true ) const; + inline const SvxCharScaleWidthItem &GetCharScaleW( bool = true ) const; + inline const SvxCharRotateItem &GetCharRotate( bool = true ) const; + inline const SvxCharReliefItem &GetCharRelief( bool = true ) const; + inline const SvxCharHiddenItem &GetCharHidden( bool = true ) const; + inline const SvxBoxItem &GetCharBorder( bool = true ) const; + inline const SvxShadowItem &GetCharShadow( bool = true ) const; // Frame attributes. Implementation in frmatr.hxx. - inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; - inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const; - inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const; - inline const SvxLRSpaceItem &GetLRSpace( sal_Bool = sal_True ) const; - inline const SvxULSpaceItem &GetULSpace( sal_Bool = sal_True ) const; - inline const SwFmtCntnt &GetCntnt( sal_Bool = sal_True ) const; - inline const SwFmtHeader &GetHeader( sal_Bool = sal_True ) const; - inline const SwFmtFooter &GetFooter( sal_Bool = sal_True ) const; - inline const SvxPrintItem &GetPrint( sal_Bool = sal_True ) const; - inline const SvxOpaqueItem &GetOpaque( sal_Bool = sal_True ) const; - inline const SvxProtectItem &GetProtect( sal_Bool = sal_True ) const; - inline const SwFmtSurround &GetSurround( sal_Bool = sal_True ) const; - inline const SwFmtVertOrient &GetVertOrient( sal_Bool = sal_True ) const; - inline const SwFmtHoriOrient &GetHoriOrient( sal_Bool = sal_True ) const; - inline const SwFmtAnchor &GetAnchor( sal_Bool = sal_True ) const; - inline const SvxBoxItem &GetBox( sal_Bool = sal_True ) const; - inline const SvxFmtKeepItem &GetKeep( sal_Bool = sal_True ) const; - inline const SvxBrushItem &GetBackground( sal_Bool = sal_True ) const; - inline const SvxShadowItem &GetShadow( sal_Bool = sal_True ) const; - inline const SwFmtPageDesc &GetPageDesc( sal_Bool = sal_True ) const; - inline const SvxFmtBreakItem &GetBreak( sal_Bool = sal_True ) const; - inline const SwFmtCol &GetCol( sal_Bool = sal_True ) const; - inline const SvxMacroItem &GetMacro( sal_Bool = sal_True ) const; - inline const SwFmtURL &GetURL( sal_Bool = sal_True ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( sal_Bool = sal_True ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( sal_Bool = sal_True ) const; - inline const SwFmtRowSplit &GetRowSplit( sal_Bool = sal_True ) const; - inline const SwFmtChain &GetChain( sal_Bool = sal_True ) const; - inline const SwFmtLineNumber &GetLineNumber( sal_Bool = sal_True ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( sal_Bool = sal_True ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( sal_Bool = sal_True ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const; - inline const SvxFrameDirectionItem &GetFrmDir( sal_Bool = sal_True ) const; - inline const SwTextGridItem &GetTextGrid( sal_Bool = sal_True ) const; - inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const; - inline const SwFmtFollowTextFlow &GetFollowTextFlow(sal_Bool = sal_True) const; - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const; - inline const SdrTextVertAdjustItem& GetTextVertAdjust(sal_Bool = sal_True) const; + inline const SwFmtFillOrder &GetFillOrder( bool = true ) const; + inline const SwFmtFrmSize &GetFrmSize( bool = true ) const; + inline const SvxPaperBinItem &GetPaperBin( bool = true ) const; + inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const; + inline const SvxULSpaceItem &GetULSpace( bool = true ) const; + inline const SwFmtCntnt &GetCntnt( bool = true ) const; + inline const SwFmtHeader &GetHeader( bool = true ) const; + inline const SwFmtFooter &GetFooter( bool = true ) const; + inline const SvxPrintItem &GetPrint( bool = true ) const; + inline const SvxOpaqueItem &GetOpaque( bool = true ) const; + inline const SvxProtectItem &GetProtect( bool = true ) const; + inline const SwFmtSurround &GetSurround( bool = true ) const; + inline const SwFmtVertOrient &GetVertOrient( bool = true ) const; + inline const SwFmtHoriOrient &GetHoriOrient( bool = true ) const; + inline const SwFmtAnchor &GetAnchor( bool = true ) const; + inline const SvxBoxItem &GetBox( bool = true ) const; + inline const SvxFmtKeepItem &GetKeep( bool = true ) const; + inline const SvxBrushItem &GetBackground( bool = true ) const; + inline const SvxShadowItem &GetShadow( bool = true ) const; + inline const SwFmtPageDesc &GetPageDesc( bool = true ) const; + inline const SvxFmtBreakItem &GetBreak( bool = true ) const; + inline const SwFmtCol &GetCol( bool = true ) const; + inline const SvxMacroItem &GetMacro( bool = true ) const; + inline const SwFmtURL &GetURL( bool = true ) const; + inline const SwFmtEditInReadonly &GetEditInReadonly( bool = true ) const; + inline const SwFmtLayoutSplit &GetLayoutSplit( bool = true ) const; + inline const SwFmtRowSplit &GetRowSplit( bool = true ) const; + inline const SwFmtChain &GetChain( bool = true ) const; + inline const SwFmtLineNumber &GetLineNumber( bool = true ) const; + inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( bool = true ) const; + inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( bool = true ) const; + inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const; + inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; + inline const SwTextGridItem &GetTextGrid( bool = true ) const; + inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; + inline const SwFmtFollowTextFlow &GetFollowTextFlow(bool = true) const; + inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; + inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const; // Graphic attributes - implementation in grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( sal_Bool = sal_True ) const; - inline const SwCropGrf &GetCropGrf( sal_Bool = sal_True ) const; - inline const SwRotationGrf &GetRotationGrf(sal_Bool = sal_True ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(sal_Bool = sal_True ) const; - inline const SwContrastGrf &GetContrastGrf(sal_Bool = sal_True ) const; - inline const SwChannelRGrf &GetChannelRGrf(sal_Bool = sal_True ) const; - inline const SwChannelGGrf &GetChannelGGrf(sal_Bool = sal_True ) const; - inline const SwChannelBGrf &GetChannelBGrf(sal_Bool = sal_True ) const; - inline const SwGammaGrf &GetGammaGrf(sal_Bool = sal_True ) const; - inline const SwInvertGrf &GetInvertGrf(sal_Bool = sal_True ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(sal_Bool = sal_True ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(sal_Bool = sal_True ) const; + inline const SwMirrorGrf &GetMirrorGrf( bool = true ) const; + inline const SwCropGrf &GetCropGrf( bool = true ) const; + inline const SwRotationGrf &GetRotationGrf(bool = true ) const; + inline const SwLuminanceGrf &GetLuminanceGrf(bool = true ) const; + inline const SwContrastGrf &GetContrastGrf(bool = true ) const; + inline const SwChannelRGrf &GetChannelRGrf(bool = true ) const; + inline const SwChannelGGrf &GetChannelGGrf(bool = true ) const; + inline const SwChannelBGrf &GetChannelBGrf(bool = true ) const; + inline const SwGammaGrf &GetGammaGrf(bool = true ) const; + inline const SwInvertGrf &GetInvertGrf(bool = true ) const; + inline const SwTransparencyGrf &GetTransparencyGrf(bool = true ) const; + inline const SwDrawModeGrf &GetDrawModeGrf(bool = true ) const; // Paragraph attributes - implementation in paratr.hxx - inline const SvxLineSpacingItem &GetLineSpacing( sal_Bool = sal_True ) const; - inline const SvxAdjustItem &GetAdjust( sal_Bool = sal_True ) const; - inline const SvxFmtSplitItem &GetSplit( sal_Bool = sal_True ) const; - inline const SwRegisterItem &GetRegister( sal_Bool = sal_True ) const; - inline const SwNumRuleItem &GetNumRule( sal_Bool = sal_True ) const; - inline const SvxWidowsItem &GetWidows( sal_Bool = sal_True ) const; - inline const SvxOrphansItem &GetOrphans( sal_Bool = sal_True ) const; - inline const SvxTabStopItem &GetTabStops( sal_Bool = sal_True ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( sal_Bool = sal_True ) const; - inline const SwFmtDrop &GetDrop( sal_Bool = sal_True ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(sal_Bool = sal_True) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(sal_Bool = sal_True) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const; - inline const SvxParaGridItem &GetParaGrid(sal_Bool = sal_True) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const; + inline const SvxLineSpacingItem &GetLineSpacing( bool = true ) const; + inline const SvxAdjustItem &GetAdjust( bool = true ) const; + inline const SvxFmtSplitItem &GetSplit( bool = true ) const; + inline const SwRegisterItem &GetRegister( bool = true ) const; + inline const SwNumRuleItem &GetNumRule( bool = true ) const; + inline const SvxWidowsItem &GetWidows( bool = true ) const; + inline const SvxOrphansItem &GetOrphans( bool = true ) const; + inline const SvxTabStopItem &GetTabStops( bool = true ) const; + inline const SvxHyphenZoneItem &GetHyphenZone( bool = true ) const; + inline const SwFmtDrop &GetDrop( bool = true ) const; + inline const SvxScriptSpaceItem &GetScriptSpace(bool = true) const; + inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const; + inline const SvxForbiddenRuleItem &GetForbiddenRule(bool = true) const; + inline const SvxParaVertAlignItem &GetParaVertAlign(bool = true) const; + inline const SvxParaGridItem &GetParaGrid(bool = true) const; + inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const; // Tablebox attributes - implementation in cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( sal_Bool = sal_True ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; - inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; + inline const SwTblBoxNumFormat &GetTblBoxNumFmt( bool = true ) const; + inline const SwTblBoxFormula &GetTblBoxFormula( bool = true ) const; + inline const SwTblBoxValue &GetTblBoxValue( bool = true ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet) }; diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index 72eeeb49b3f4..a8eb9f9baf91 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -29,8 +29,8 @@ class SwEditWin; class SwOleClient : public SfxInPlaceClient { - sal_Bool bInDoVerb; - sal_Bool bOldCheckForOLEInCaption; + bool bInDoVerb; + bool bOldCheckForOLEInCaption; virtual void ObjectAreaChanged() SAL_OVERRIDE; virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; @@ -40,9 +40,9 @@ class SwOleClient : public SfxInPlaceClient public: SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); - void SetInDoVerb( sal_Bool bFlag ) { bInDoVerb = bFlag; } + void SetInDoVerb( bool bFlag ) { bInDoVerb = bFlag; } - sal_Bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } + bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } virtual void FormatChanged() SAL_OVERRIDE; }; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index b62004f25dbc..c39e67242c74 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -39,7 +39,7 @@ const int FIND_NO_RING = 2; struct SwFindParas { - virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, sal_Bool ) = 0; + virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, bool ) = 0; virtual bool IsReplaceMode() const = 0; protected: @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM sal_uInt8 nCursorBidiLevel; // bidi level of the cursor bool mbColumnSelection; // true: cursor is aprt of a column selection - sal_uLong FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, sal_Bool& bCancel ); + sal_uLong FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, bool& bCancel ); using SwPaM::Find; @@ -77,7 +77,7 @@ protected: const _SwCursor_SavePos* GetSavePos() const { return pSavePos; } virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr); + bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr); virtual void DoSetBidiLevelUpDown(); virtual bool IsSelOvrCheck(int eFlags); @@ -101,44 +101,44 @@ public: SwPaM* ) const; sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, - sal_Bool bSearchInNotes, + bool bSearchInNotes, SwDocPositions nStart, SwDocPositions nEnde, - sal_Bool& bCancel, + bool& bCancel, FindRanges = FND_IN_BODY, - int bReplace = sal_False ); + bool bReplace = false ); sal_uLong Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart, SwDocPositions nEnde, - sal_Bool& bCancel, + bool& bCancel, FindRanges = FND_IN_BODY, const SwTxtFmtColl* pReplFmt = 0 ); - sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections, + sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions nStart, SwDocPositions nEnde, - sal_Bool& bCancel, + bool& bCancel, FindRanges = FND_IN_BODY, const com::sun::star::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); // UI versions - sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - sal_Bool IsStartEndSentence( bool bEnd ) const; - sal_Bool GoStartWord(); - sal_Bool GoEndWord(); - sal_Bool GoNextWord(); - sal_Bool GoPrevWord(); - sal_Bool SelectWord( SwViewShell* pViewShell, const Point* pPt = 0 ); + bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsStartEndSentence( bool bEnd ) const; + bool GoStartWord(); + bool GoEndWord(); + bool GoNextWord(); + bool GoPrevWord(); + bool SelectWord( SwViewShell* pViewShell, const Point* pPt = 0 ); // API versions of above functions (will be used with a different // WordType for the break iterator) - sal_Bool IsStartWordWT( sal_Int16 nWordType ) const; - sal_Bool IsEndWordWT( sal_Int16 nWordType ) const; - sal_Bool IsInWordWT( sal_Int16 nWordType ) const; - sal_Bool GoStartWordWT( sal_Int16 nWordType ); - sal_Bool GoEndWordWT( sal_Int16 nWordType ); - sal_Bool GoNextWordWT( sal_Int16 nWordType ); - sal_Bool GoPrevWordWT( sal_Int16 nWordType ); - sal_Bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 ); + bool IsStartWordWT( sal_Int16 nWordType ) const; + bool IsEndWordWT( sal_Int16 nWordType ) const; + bool IsInWordWT( sal_Int16 nWordType ) const; + bool GoStartWordWT( sal_Int16 nWordType ); + bool GoEndWordWT( sal_Int16 nWordType ); + bool GoNextWordWT( sal_Int16 nWordType ); + bool GoPrevWordWT( sal_Int16 nWordType ); + bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 ); enum SentenceMoveType { @@ -147,51 +147,51 @@ public: START_SENT, END_SENT }; - sal_Bool GoSentence(SentenceMoveType eMoveType); - sal_Bool GoNextSentence(){return GoSentence(NEXT_SENT);} - sal_Bool GoEndSentence(){return GoSentence(END_SENT);} - sal_Bool GoPrevSentence(){return GoSentence(PREV_SENT);} - sal_Bool GoStartSentence(){return GoSentence(START_SENT);} - sal_Bool ExpandToSentenceBorders(); - - virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, - sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ); + bool GoSentence(SentenceMoveType eMoveType); + bool GoNextSentence(){return GoSentence(NEXT_SENT);} + bool GoEndSentence(){return GoSentence(END_SENT);} + bool GoPrevSentence(){return GoSentence(PREV_SENT);} + bool GoStartSentence(){return GoSentence(START_SENT);} + bool ExpandToSentenceBorders(); + + virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, + bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ); bool UpDown( bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX ); - sal_Bool LeftRightMargin( sal_Bool bLeftMargin, sal_Bool bAPI = sal_False ); - sal_Bool IsAtLeftRightMargin( sal_Bool bLeftMargin, sal_Bool bAPI = sal_False ) const; - sal_Bool SttEndDoc( sal_Bool bSttDoc ); - sal_Bool GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt ); - - sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual, sal_Bool bSkipHidden ) - { return LeftRight( sal_True, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); } - sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual, sal_Bool bSkipHidden ) - { return LeftRight( sal_False, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); } - sal_Bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_True, nCnt ); } - sal_Bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_False, nCnt ); } + bool LeftRightMargin( bool bLeftMargin, bool bAPI = false ); + bool IsAtLeftRightMargin( bool bLeftMargin, bool bAPI = false ) const; + bool SttEndDoc( bool bSttDoc ); + bool GoPrevNextCell( bool bNext, sal_uInt16 nCnt ); + + bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden ) + { return LeftRight( true, nCnt, nMode, bAllowVisual, bSkipHidden, false ); } + bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden ) + { return LeftRight( false, nCnt, nMode, bAllowVisual, bSkipHidden, false ); } + bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( true, nCnt ); } + bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( false, nCnt ); } virtual bool GotoTable( const OUString& rName ); - sal_Bool GotoTblBox( const OUString& rName ); + bool GotoTblBox( const OUString& rName ); bool GotoRegion( const OUString& rName ); - sal_Bool GotoFtnAnchor(); - sal_Bool GotoFtnTxt(); - sal_Bool GotoNextFtnAnchor(); - sal_Bool GotoPrevFtnAnchor(); - sal_Bool GotoNextFtnCntnt(); - sal_Bool GotoPrevFtnCntnt(); - - sal_Bool MovePara( SwWhichPara, SwPosPara ); - sal_Bool MoveSection( SwWhichSection, SwPosSection ); - sal_Bool MoveTable( SwWhichTable, SwPosTable ); - sal_Bool MoveRegion( SwWhichRegion, SwPosRegion ); + bool GotoFtnAnchor(); + bool GotoFtnTxt(); + bool GotoNextFtnAnchor(); + bool GotoPrevFtnAnchor(); + bool GotoNextFtnCntnt(); + bool GotoPrevFtnCntnt(); + + bool MovePara( SwWhichPara, SwPosPara ); + bool MoveSection( SwWhichSection, SwPosSection ); + bool MoveTable( SwWhichTable, SwPosTable ); + bool MoveRegion( SwWhichRegion, SwPosRegion ); // Is there a selection of content in table? // Return value indicates if cursor remains at its old position. - virtual sal_Bool IsSelOvr( int eFlags = + virtual bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); - virtual sal_Bool IsInProtectTable( sal_Bool bMove = sal_False, - sal_Bool bChgCrsr = sal_True ); - sal_Bool IsNoCntnt() const; + virtual bool IsInProtectTable( bool bMove = false, + bool bChgCrsr = true ); + bool IsNoCntnt() const; /** Restore cursor state to the one saved by SwCrsrSaveState **/ void RestoreSavePos(); @@ -202,8 +202,8 @@ public: // Is cursor allowed in ready only ranges? virtual bool IsReadOnlyAvailable() const; - virtual sal_Bool IsSkipOverProtectSections() const; - virtual sal_Bool IsSkipOverHiddenSections() const; + virtual bool IsSkipOverProtectSections() const; + virtual bool IsSkipOverHiddenSections() const; sal_uInt8 GetCrsrBidiLevel() const { return nCursorBidiLevel; } void SetCrsrBidiLevel( sal_uInt8 nNewLevel ) { nCursorBidiLevel = nNewLevel; } @@ -257,8 +257,8 @@ protected: sal_Int32 nTblPtCnt; sal_Int32 nTblMkCnt; SwSelBoxes m_SelectedBoxes; - sal_Bool bChg : 1; - sal_Bool bParked : 1; // Table-cursor was parked. + bool bChg : 1; + bool bParked : 1; // Table-cursor was parked. virtual bool IsSelOvrCheck(int eFlags) SAL_OVERRIDE; @@ -267,8 +267,8 @@ public: SwTableCursor( SwTableCursor& ); virtual ~SwTableCursor(); - virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, - sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ) SAL_OVERRIDE; + virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, + bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) SAL_OVERRIDE; virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE; void InsertBox( const SwTableBox& rTblBox ); @@ -279,12 +279,12 @@ public: // Creates cursor for all boxes. SwCursor* MakeBoxSels( SwCursor* pAktCrsr ); // Any boxes protected? - sal_Bool HasReadOnlyBoxSel() const; + bool HasReadOnlyBoxSel() const; // Has table cursor been changed? If so, save new values immediately. - sal_Bool IsCrsrMovedUpdt(); + bool IsCrsrMovedUpdt(); // Has table cursor been changed? - sal_Bool IsCrsrMoved() const + bool IsCrsrMoved() const { return nTblMkNd != GetMark()->nNode.GetIndex() || nTblPtNd != GetPoint()->nNode.GetIndex() || @@ -292,7 +292,7 @@ public: nTblPtCnt != GetPoint()->nContent.GetIndex(); } - sal_Bool IsChgd() const { return bChg; } + bool IsChgd() const { return bChg; } // Park table cursor at start node of boxes. void ParkCrsr(); diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx index 7d73861ce6cd..2547e3dc255d 100644 --- a/sw/inc/swdbdata.hxx +++ b/sw/inc/swdbdata.hxx @@ -31,9 +31,9 @@ struct SwDBData SwDBData() : nCommandType(0){} - sal_Bool operator !=(const SwDBData& rCmp) const + bool operator !=(const SwDBData& rCmp) const {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand || rCmp.nCommandType != nCommandType;} - sal_Bool operator ==(const SwDBData& rCmp) const + bool operator ==(const SwDBData& rCmp) const {return rCmp.sDataSource == sDataSource && rCmp.sCommand == sCommand && rCmp.nCommandType == nCommandType;} }; diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index bc6e18570e76..5c0d96666d52 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -32,11 +32,11 @@ public: // Ctor moves all lines/boxes from SwTable to it. // After that SwTable is empty and has to be deleted. SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, - sal_Bool bUpdate = sal_True ); + bool bUpdate = true ); virtual ~SwDDETable(); void ChangeContent(); - sal_Bool NoDDETable(); + bool NoDDETable(); SwDDEFieldType* GetDDEFldType(); inline const SwDDEFieldType* GetDDEFldType() const; diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index 31f37fd4f264..356c7bf56ba6 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -111,7 +111,7 @@ struct SwCallMouseEvent void Clear() { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; } - sal_Bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } + bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } }; #endif diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 621789018aeb..6b159b955b6b 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -104,8 +104,8 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser; - sal_Bool bAuthorInitialised : 1; - sal_Bool bEmbeddedLoadSave : 1; + bool bAuthorInitialised : 1; + bool bEmbeddedLoadSave : 1; // Catch hint for DocInfo. virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -115,7 +115,7 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C protected: // Envelopes, labels. void InsertEnv(SfxRequest&); - void InsertLab(SfxRequest&, sal_Bool bLabel); + void InsertLab(SfxRequest&, bool bLabel); public: // public Data - used for internal Clipboard / Drag & Drop / XSelection @@ -146,23 +146,23 @@ public: void ExecOther(SfxRequest &); // Fields, formula... // Modify user settings. - const SwMasterUsrPref *GetUsrPref(sal_Bool bWeb) const; - const SwViewOption* GetViewOption(sal_Bool bWeb); + const SwMasterUsrPref *GetUsrPref(bool bWeb) const; + const SwViewOption* GetViewOption(bool bWeb); void ApplyUsrPref(const SwViewOption &, SwView*, sal_uInt16 nDest = VIEWOPT_DEST_VIEW ); void ApplyUserMetric( FieldUnit eMetric, bool bWeb ); - void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool bWeb ); + void ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb ); void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags); void ApplyLinkMode(sal_Int32 nNewLinkMode); // Default page mode for text grid. - void ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode); + void ApplyDefaultPageMode(bool bIsSquaredPageMode); - void ApplyUserCharUnit(sal_Bool bApplyChar, bool bWeb); // apply_char_unit + void ApplyUserCharUnit(bool bApplyChar, bool bWeb); // apply_char_unit // Create ConfigItems. SwModuleOptions* GetModuleConfig() { return pModuleConfig;} - SwPrintOptions* GetPrtOptions(sal_Bool bWeb); + SwPrintOptions* GetPrtOptions(bool bWeb); SwChapterNumRules* GetChapterNumRules(); SwStdFontConfig* GetStdFontConfig() { return pStdFontConfig; } SwNavigationConfig* GetNavigationConfig(); @@ -178,15 +178,15 @@ public: static SwView* GetFirstView(); static SwView* GetNextView(SwView*); - sal_Bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; } - void SetEmbeddedLoadSave( sal_Bool bFlag ) { bEmbeddedLoadSave = bFlag; } + bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; } + void SetEmbeddedLoadSave( bool bFlag ) { bEmbeddedLoadSave = bFlag; } - void ShowDBObj( SwView& rView, const SwDBData& rData, sal_Bool bOnlyIfAvailable = sal_False); + void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false); // Table modi. - sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const; - sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const; - sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const; + bool IsInsTblFormatNum(bool bHTML) const; + bool IsInsTblChangeNumFormat(bool bHTML) const; + bool IsInsTblAlignNum(bool bHTML) const; // Redlining. sal_uInt16 GetRedlineAuthor(); @@ -202,19 +202,19 @@ public: const Color& GetRedlineMarkColor(); SvxCompareMode GetCompareMode() const; - sal_Bool IsUseRsid() const; - sal_Bool IsIgnorePieces() const; + bool IsUseRsid() const; + bool IsIgnorePieces() const; sal_uInt16 GetPieceLen() const; // Return defined DocStat - WordDelimiter. OUString GetDocStatWordDelim() const; // Pass metric of ModuleConfig (for HTML-export). - sal_uInt16 GetMetric( sal_Bool bWeb ) const; + sal_uInt16 GetMetric( bool bWeb ) const; // Pass update-statuses. - sal_uInt16 GetLinkUpdMode( sal_Bool bWeb ) const; - SwFldUpdateFlags GetFldUpdateFlags( sal_Bool bWeb ) const; + sal_uInt16 GetLinkUpdMode( bool bWeb ) const; + SwFldUpdateFlags GetFldUpdateFlags( bool bWeb ) const; // Virtual methods for options dialog. virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 83868781ff35..c2bc81be3590 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -79,12 +79,12 @@ public: SwRect &_Intersection( const SwRect &rRect ); inline SwRect GetIntersection( const SwRect& rRect ) const; - sal_Bool IsInside( const Point& rPOINT ) const; - sal_Bool IsNear(const Point& rPoint, long nTolerance ) const; - sal_Bool IsInside( const SwRect& rRect ) const; - sal_Bool IsOver( const SwRect& rRect ) const; - inline sal_Bool HasArea() const; - inline sal_Bool IsEmpty() const; + bool IsInside( const Point& rPOINT ) const; + bool IsNear(const Point& rPoint, long nTolerance ) const; + bool IsInside( const SwRect& rRect ) const; + bool IsOver( const SwRect& rRect ) const; + inline bool HasArea() const; + inline bool IsEmpty() const; inline void Clear(); inline SwRect &operator = ( const SwRect &rRect ); @@ -138,17 +138,17 @@ public: long GetBottomDistance( long ) const; long GetRightDistance( long ) const; long GetTopDistance( long ) const; - sal_Bool OverStepLeft( long ) const; - sal_Bool OverStepBottom( long ) const; - sal_Bool OverStepTop( long ) const; - sal_Bool OverStepRight( long ) const; + bool OverStepLeft( long ) const; + bool OverStepBottom( long ) const; + bool OverStepTop( long ) const; + bool OverStepRight( long ) const; }; typedef void (SwRect:: *SwRectSet)( const long nNew ); typedef long (SwRect:: *SwRectGet)() const; typedef const Point (SwRect:: *SwRectPoint)() const; typedef const Size (SwRect:: *SwRectSize)() const; -typedef sal_Bool (SwRect:: *SwRectMax)( long ) const; +typedef bool (SwRect:: *SwRectMax)( long ) const; typedef long (SwRect:: *SwRectDist)( long ) const; typedef void (SwRect:: *SwRectSetTwice)( long, long ); typedef void (SwRect:: *SwRectSetPos)( const Point& ); @@ -300,11 +300,11 @@ inline SwRect SwRect::GetIntersection( const SwRect& rRect ) const return SwRect( *this ).Intersection( rRect ); } -inline sal_Bool SwRect::HasArea() const +inline bool SwRect::HasArea() const { return !IsEmpty(); } -inline sal_Bool SwRect::IsEmpty() const +inline bool SwRect::IsEmpty() const { return !(m_Size.getHeight() && m_Size.getWidth()); } diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index aafd070da238..2e2749fe0496 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -42,19 +42,19 @@ class SwScanner sal_Int32 nOverriddenDashCount; LanguageType aCurrLang; sal_uInt16 nWordType; - sal_Bool bClip; + bool bClip; public: SwScanner( const SwTxtNode& rNd, const OUString& rTxt, const LanguageType* pLang, const ModelToViewHelper& rConvMap, sal_uInt16 nWordType, - sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClip = sal_False ); + sal_Int32 nStart, sal_Int32 nEnde, bool bClip = false ); // This next word function tries to find the language for the next word // It should currently _not_ be used for spell checking, and works only for // ! bReverse - sal_Bool NextWord(); + bool NextWord(); const OUString& GetWord() const { return aWord; } diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 6ae30996e68f..fa74018084d9 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -64,13 +64,13 @@ public: const OUString & rMimeType, bool bSynchron = false ) SAL_OVERRIDE; - sal_Bool SetData( const OUString & rMimeType, + bool SetData( const OUString & rMimeType, const ::com::sun::star::uno::Any& rData ); virtual void SendDataChanged( const SwPosition& rPos ); virtual void SendDataChanged( const SwPaM& rRange ); - sal_Bool IsLinkInServer( const SwBaseLink* ) const; + bool IsLinkInServer( const SwBaseLink* ) const; void SetNoServer(); void SetDdeBookmark( ::sw::mark::IMark& rBookmark); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index c98cc0c666eb..cda293b94632 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -117,7 +117,7 @@ protected: sal_uInt16 nRowsToRepeat; // Number of rows to repeat on every page. bool bModifyLocked :1; - sal_Bool bNewModel :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel + bool bNewModel :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel #ifdef DBG_UTIL /// This is set by functions (like Merge()) to forbid a late model change. bool m_bDontChangeModel; @@ -150,9 +150,9 @@ private: SwTable(); bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* ); bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); - sal_Bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, + bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, SwTableBox*, SwUndoTblMerge* ); - sal_Bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool ); + bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const; void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt ); bool _InsertRow( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, bool bBehind ); @@ -160,7 +160,7 @@ private: void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); void AdjustWidths( const long nOld, const long nNew ); void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, sal_Bool bCurRowOnly ); + const SwTableBox *pStart, bool bCurRowOnly ); public: @@ -174,8 +174,8 @@ public: void LockModify() { bModifyLocked = true; } // Must be used always void UnlockModify() { bModifyLocked = false;} // in pairs! - void SetTableModel( sal_Bool bNew ){ bNewModel = bNew; } - sal_Bool IsNewModel() const { return bNewModel; } + void SetTableModel( bool bNew ){ bNewModel = bNew; } + bool IsNewModel() const { return bNewModel; } sal_uInt16 GetRowsToRepeat() const { return std::min( (sal_uInt16)GetTabLines().size(), nRowsToRepeat ); } sal_uInt16 _GetRowsToRepeat() const { return nRowsToRepeat; } @@ -191,9 +191,9 @@ public: SwTableFmt* GetTableFmt() const { return (SwTableFmt*)GetRegisteredIn(); } void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, - sal_Bool bHidden = sal_False, sal_Bool bCurRowOnly = sal_False ) const; + bool bHidden = false, bool bCurRowOnly = false ) const; void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, sal_Bool bCurRowOnly ); + const SwTableBox *pStart, bool bCurRowOnly ); // The following functions are for new table model only... void CreateSelection( const SwPaM& rPam, SwSelBoxes& rBoxes, @@ -215,7 +215,7 @@ public: // The following functions are "pseudo-virtual", i.e. they are different for old and new table model // It's not allowed to change the table model after the first call of one of these functions. - sal_Bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, + bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 ) { #ifdef DBG_UTIL @@ -246,7 +246,7 @@ public: bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder ); bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); - sal_Bool Merge( const SwSelBoxes& rBoxes, + bool Merge( const SwSelBoxes& rBoxes, SwTableBox* pMergeBox, SwUndoTblMerge* = 0 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) @@ -261,7 +261,7 @@ public: // #i80314# // add 3rd parameter in order to control validation check on <rStr> static sal_uInt16 _GetBoxNum( OUString& rStr, - sal_Bool bFirst = sal_False, + bool bFirst = false, const bool bPerformValidCheck = false ); // Search content-bearing box with that name. @@ -275,11 +275,11 @@ public: bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, bool bCpyNds = true, bool bCpyName = false ) const; // Copy table in this - sal_Bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, + bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, SwUndoTblCpyTbl* pUndo = 0 ); - sal_Bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, + bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, SwUndoTblCpyTbl* pUndo = 0 ); - sal_Bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, + bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, SwUndoTblCpyTbl* pUndo ); // Copy headline of table (with content!) into an other one. bool CopyHeadlineIntoTable( SwTableNode& rTblNd ); @@ -437,15 +437,15 @@ public: // Return "value" of box (for calculating in table). double GetValue( SwTblCalcPara& rPara ) const; - sal_Bool IsInHeadline( const SwTable* pTbl = 0 ) const; + bool IsInHeadline( const SwTable* pTbl = 0 ) const; // Contains box contents, that can be formated as a number? - sal_Bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, - sal_Bool& rIsEmptyTxtNd ) const; - sal_uLong IsValidNumTxtNd( sal_Bool bCheckAttr = sal_True ) const; + bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, + bool& rIsEmptyTxtNd ) const; + sal_uLong IsValidNumTxtNd( bool bCheckAttr = true ) const; // If a table formula is set, test if box contents is congruent with number. // (For Redo of change of NumFormat!). - sal_Bool IsNumberChanged() const; + bool IsNumberChanged() const; // Is that a formula box or a box with numeric contents (AutoSum)? // What it is is indicated by the return value - the WhichId of the attribute. diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 7549eefa6fe4..7856360130b8 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -43,17 +43,17 @@ sal_Int32 GetEnumAsInt32( const com::sun::star::uno::Any& rVal ); // methods for UCB actions: // delete the file under this URL -SW_DLLPUBLIC sal_Bool UCB_DeleteFile( const OUString& rURL ); +SW_DLLPUBLIC bool UCB_DeleteFile( const OUString& rURL ); // copy/move the file to a new location -sal_Bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, - sal_Bool bCopyIsMove = sal_False ); +bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, + bool bCopyIsMove = false ); // is the URL on the current system case sentive? -SW_DLLPUBLIC sal_Bool UCB_IsCaseSensitiveFileName( const OUString& rURL ); +SW_DLLPUBLIC bool UCB_IsCaseSensitiveFileName( const OUString& rURL ); // is the URL readonly? -SW_DLLPUBLIC sal_Bool UCB_IsReadOnlyFileName( const OUString& rURL ); +SW_DLLPUBLIC bool UCB_IsReadOnlyFileName( const OUString& rURL ); // get a list of files from the folder of the URL // options: pExtension = 0 -> all, else this specific extension @@ -66,10 +66,10 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, std::vector<DateTime*>* pDateTimeList = 0 ); // is the URL an existing file? -SW_DLLPUBLIC sal_Bool UCB_IsFile( const OUString& rURL ); +SW_DLLPUBLIC bool UCB_IsFile( const OUString& rURL ); // is the URL a existing directory? -sal_Bool UCB_IsDirectory( const OUString& rURL ); +bool UCB_IsDirectory( const OUString& rURL ); } #endif diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx index b124658a68d8..d152d5da2f85 100644 --- a/sw/inc/tabcol.hxx +++ b/sw/inc/tabcol.hxx @@ -29,7 +29,7 @@ struct SwTabColsEntry long nPos; long nMin; long nMax; - sal_Bool bHidden; // For each entry a flag, hidden or not. + bool bHidden; // For each entry a flag, hidden or not. // If the flag bHidden is sal_True column separator // is not in current line. It must maintained // but it may not be displayed. @@ -64,11 +64,11 @@ public: long operator[]( size_t nPos ) const { return aData[nPos].nPos; } size_t Count() const { return aData.size(); } - sal_Bool IsHidden( size_t nPos ) const { return aData[nPos].bHidden; } - void SetHidden( size_t nPos, sal_Bool bValue ) { aData[nPos].bHidden = bValue; } + bool IsHidden( size_t nPos ) const { return aData[nPos].bHidden; } + void SetHidden( size_t nPos, bool bValue ) { aData[nPos].bHidden = bValue; } - void Insert( long nValue, sal_Bool bValue, size_t nPos ); - void Insert( long nValue, long nMin, long nMax, sal_Bool bValue, size_t nPos ); + void Insert( long nValue, bool bValue, size_t nPos ); + void Insert( long nValue, long nMin, long nMax, bool bValue, size_t nPos ); void Remove( size_t nPos, size_t nAnz = 1 ); const SwTabColsEntry& GetEntry( size_t nPos ) const { return aData[nPos]; } diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index d85d5e50138a..83040cb03006 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -179,9 +179,9 @@ public: void SetValueFormat( const OUString& rFmt, LanguageType eLng, LanguageType eSys ) { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; } - sal_Bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); - sal_Bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; - sal_Bool SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const; + bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); + bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; + bool SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const; }; /* @@ -237,14 +237,14 @@ class SW_DLLPUBLIC SwTableAutoFmt sal_uInt16 nStrResId; // Common flags of Calc and Writer. - sal_Bool bInclFont : 1; - sal_Bool bInclJustify : 1; - sal_Bool bInclFrame : 1; - sal_Bool bInclBackground : 1; - sal_Bool bInclValueFormat : 1; + bool bInclFont : 1; + bool bInclJustify : 1; + bool bInclFrame : 1; + bool bInclBackground : 1; + bool bInclValueFormat : 1; // Calc specific flags. - sal_Bool bInclWidthHeight : 1; + bool bInclWidthHeight : 1; SwBoxAutoFmt* aBoxAutoFmt[ 16 ]; @@ -253,9 +253,9 @@ class SW_DLLPUBLIC SwTableAutoFmt SwFmtPageDesc m_aPageDesc; SvxFmtKeepItem m_aKeepWithNextPara; sal_uInt16 m_aRepeatHeading; - sal_Bool m_bLayoutSplit; - sal_Bool m_bRowSplit; - sal_Bool m_bCollapsingBorders; + bool m_bLayoutSplit; + bool m_bRowSplit; + bool m_bCollapsingBorders; SvxShadowItem m_aShadow; public: @@ -280,21 +280,21 @@ public: void RestoreTableProperties(SwTable &table) const; void StoreTableProperties(const SwTable &table); - sal_Bool IsFont() const { return bInclFont; } - sal_Bool IsJustify() const { return bInclJustify; } - sal_Bool IsFrame() const { return bInclFrame; } - sal_Bool IsBackground() const { return bInclBackground; } - sal_Bool IsValueFormat() const { return bInclValueFormat; } - - void SetFont( const sal_Bool bNew ) { bInclFont = bNew; } - void SetJustify( const sal_Bool bNew ) { bInclJustify = bNew; } - void SetFrame( const sal_Bool bNew ) { bInclFrame = bNew; } - void SetBackground( const sal_Bool bNew ) { bInclBackground = bNew; } - void SetValueFormat( const sal_Bool bNew ) { bInclValueFormat = bNew; } - void SetWidthHeight( const sal_Bool bNew ) { bInclWidthHeight = bNew; } - - sal_Bool Load( SvStream& rStream, const SwAfVersions& ); - sal_Bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; + bool IsFont() const { return bInclFont; } + bool IsJustify() const { return bInclJustify; } + bool IsFrame() const { return bInclFrame; } + bool IsBackground() const { return bInclBackground; } + bool IsValueFormat() const { return bInclValueFormat; } + + void SetFont( const bool bNew ) { bInclFont = bNew; } + void SetJustify( const bool bNew ) { bInclJustify = bNew; } + void SetFrame( const bool bNew ) { bInclFrame = bNew; } + void SetBackground( const bool bNew ) { bInclBackground = bNew; } + void SetValueFormat( const bool bNew ) { bInclValueFormat = bNew; } + void SetWidthHeight( const bool bNew ) { bInclWidthHeight = bNew; } + + bool Load( SvStream& rStream, const SwAfVersions& ); + bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; }; class SW_DLLPUBLIC SwTableAutoFmtTbl @@ -302,8 +302,8 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl struct Impl; ::boost::scoped_ptr<Impl> m_pImpl; - SAL_DLLPRIVATE sal_Bool Load( SvStream& rStream ); - SAL_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const; + SAL_DLLPRIVATE bool Load( SvStream& rStream ); + SAL_DLLPRIVATE bool Save( SvStream& rStream ) const; public: explicit SwTableAutoFmtTbl(); @@ -316,8 +316,8 @@ public: void EraseAutoFmt(size_t i); SwTableAutoFmt* ReleaseAutoFmt(size_t i); - sal_Bool Load(); - sal_Bool Save() const; + bool Load(); + bool Save() const; }; #endif diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 6e80c0fec3b2..10d237ea62eb 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -84,18 +84,18 @@ void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes ); void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes ); // Collect boxes relevant for auto sum. -sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); +bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); // Check if the SelBoxes contains protected Boxes. -sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes ); +bool HasProtectedCells( const SwSelBoxes& rBoxes ); // Check if selection is balanced. -sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd); +bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd); // Check if cell is part of SSelection. // (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr() // have always the same concept of the selection. -sal_Bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); +bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); // Determine boxes to be merged. // In this process the rectangle gets "adapted" on the base of the layout, @@ -108,12 +108,12 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, sal_uInt16 CheckMergeSel( const SwPaM& rPam ); sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ); -sal_Bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); +bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); // Check if Split or InsertCol lead to a box becoming smaller than MINLAY. -sal_Bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv, +bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); -sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, +bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); // For working on tab selection also for split tables. @@ -176,11 +176,11 @@ public: void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ); void SetTableLines( const SwTable &rTable ); //Add an input param to identify if acc table should be disposed - void DelFrms ( SwTable &rTable,sal_Bool bAccTableDispose = sal_False ); + void DelFrms ( SwTable &rTable, bool bAccTableDispose = false ); void MakeFrms( SwTable &rTable ); void MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber, - const sal_Bool bBehind ); - sal_Bool AreLinesToRestore( const SwTable &rTable ) const; + const bool bBehind ); + bool AreLinesToRestore( const SwTable &rTable ) const; void ClearLineBehind() { pLineBehind = 0; } }; diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 6976500c543a..3c7d3db44351 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -37,14 +37,14 @@ private: sal_uInt16 m_nBaseHeight; sal_uInt16 m_nRubyHeight; SwTextGrid m_eGridType; - sal_Bool m_bRubyTextBelow; - sal_Bool m_bPrintGrid; - sal_Bool m_bDisplayGrid; + bool m_bRubyTextBelow; + bool m_bPrintGrid; + bool m_bDisplayGrid; //for textgrid enhancement sal_uInt16 m_nBaseWidth; - sal_Bool m_bSnapToChars; - sal_Bool m_bSquaredMode; + bool m_bSnapToChars; + bool m_bSquaredMode; public: SwTextGridItem(); @@ -78,37 +78,37 @@ public: SwTextGrid GetGridType() const { return m_eGridType; } void SetGridType( SwTextGrid eNew ) { m_eGridType = eNew; } - sal_Bool IsRubyTextBelow() const { return m_bRubyTextBelow; } - sal_Bool GetRubyTextBelow() const { return m_bRubyTextBelow; } - void SetRubyTextBelow( sal_Bool bNew ) { m_bRubyTextBelow = bNew; } + bool IsRubyTextBelow() const { return m_bRubyTextBelow; } + bool GetRubyTextBelow() const { return m_bRubyTextBelow; } + void SetRubyTextBelow( bool bNew ) { m_bRubyTextBelow = bNew; } - sal_Bool IsPrintGrid() const { return m_bPrintGrid; } - sal_Bool GetPrintGrid() const { return m_bPrintGrid; } - void SetPrintGrid( sal_Bool bNew ) { m_bPrintGrid = bNew; } + bool IsPrintGrid() const { return m_bPrintGrid; } + bool GetPrintGrid() const { return m_bPrintGrid; } + void SetPrintGrid( bool bNew ) { m_bPrintGrid = bNew; } - sal_Bool IsDisplayGrid() const { return m_bDisplayGrid; } - sal_Bool GetDisplayGrid() const { return m_bDisplayGrid; } - void SetDisplayGrid( sal_Bool bNew ) { m_bDisplayGrid = bNew; } + bool IsDisplayGrid() const { return m_bDisplayGrid; } + bool GetDisplayGrid() const { return m_bDisplayGrid; } + void SetDisplayGrid( bool bNew ) { m_bDisplayGrid = bNew; } //for textgrid enhancement sal_uInt16 GetBaseWidth() const { return m_nBaseWidth;} void SetBaseWidth( sal_uInt16 nNew ) { m_nBaseWidth = nNew; } - sal_Bool IsSnapToChars() const { return m_bSnapToChars; } - sal_Bool GetSnapToChars() const { return m_bSnapToChars; } - void SetSnapToChars( sal_Bool bNew ) { m_bSnapToChars = bNew; } + bool IsSnapToChars() const { return m_bSnapToChars; } + bool GetSnapToChars() const { return m_bSnapToChars; } + void SetSnapToChars( bool bNew ) { m_bSnapToChars = bNew; } - sal_Bool IsSquaredMode() const { return m_bSquaredMode; } - sal_Bool GetSquaredMode() const { return m_bSquaredMode; } - void SetSquaredMode( sal_Bool bNew ) { m_bSquaredMode = bNew; } - void SwitchPaperMode(sal_Bool bNew ); + bool IsSquaredMode() const { return m_bSquaredMode; } + bool GetSquaredMode() const { return m_bSquaredMode; } + void SetSquaredMode( bool bNew ) { m_bSquaredMode = bNew; } + void SwitchPaperMode(bool bNew ); void Init(); }; -inline const SwTextGridItem &SwAttrSet::GetTextGrid(sal_Bool bInP) const +inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const { return (const SwTextGridItem&)Get( RES_TEXTGRID, bInP ); } -inline const SwTextGridItem &SwFmt::GetTextGrid(sal_Bool bInP) const +inline const SwTextGridItem &SwFmt::GetTextGrid(bool bInP) const { return (const SwTextGridItem&)aSet.Get( RES_TEXTGRID, bInP ); } #endif diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index cb92306a2150..fe22c1dcaa22 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -68,8 +68,8 @@ class SW_DLLPUBLIC SwTOXMark sal_uInt16 nLevel; OUString m_aBookmarkName; OUString m_aEntryTypeName; // stored specific entry type name for INDEX field \f - sal_Bool bAutoGenerated : 1; // generated using a concordance file - sal_Bool bMainEntry : 1; // main entry emphasized by character style + bool bAutoGenerated : 1; // generated using a concordance file + bool bMainEntry : 1; // main entry emphasized by character style ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark; @@ -98,7 +98,7 @@ public: OUString GetText() const; - inline sal_Bool IsAlternativeText() const; + inline bool IsAlternativeText() const; inline OUString GetAlternativeText() const; inline void SetAlternativeText( const OUString& rAlt ); @@ -126,11 +126,11 @@ public: inline OUString GetSecondaryKeyReading() const; inline OUString GetCitationKeyReading() const; - sal_Bool IsAutoGenerated() const {return bAutoGenerated;} - void SetAutoGenerated(sal_Bool bSet) {bAutoGenerated = bSet;} + bool IsAutoGenerated() const {return bAutoGenerated;} + void SetAutoGenerated(bool bSet) {bAutoGenerated = bSet;} - sal_Bool IsMainEntry() const {return bMainEntry;} - void SetMainEntry(sal_Bool bSet) { bMainEntry = bSet;} + bool IsMainEntry() const {return bMainEntry;} + void SetMainEntry(bool bSet) { bMainEntry = bSet;} inline const SwTOXType* GetTOXType() const; @@ -224,7 +224,7 @@ struct SW_DLLPUBLIC SwFormToken sal_uInt16 nOutlineLevel;//the maximum permitted outline level in numbering sal_uInt16 nAuthorityField; //enum ToxAuthorityField sal_Unicode cTabFillChar; - sal_Bool bWithTab; // sal_True: do generate tab + bool bWithTab; // sal_True: do generate tab // character only the tab stop // #i21237# @@ -237,7 +237,7 @@ struct SW_DLLPUBLIC SwFormToken nOutlineLevel(MAXLEVEL), //default to maximum outline level nAuthorityField(0 /*AUTH_FIELD_IDENTIFIER*/), cTabFillChar(' '), - bWithTab(sal_True) // #i21237# + bWithTab(true) // #i21237# {} OUString GetString() const; @@ -297,9 +297,9 @@ class SW_DLLPUBLIC SwForm TOXTypes eType; sal_uInt16 nFormMaxLevel; - sal_Bool bGenerateTabPos : 1; - sal_Bool bIsRelTabPos : 1; - sal_Bool bCommaSeparated : 1; + bool bGenerateTabPos : 1; + bool bIsRelTabPos : 1; + bool bCommaSeparated : 1; public: SwForm( TOXTypes eTOXType = TOX_CONTENT ); @@ -321,11 +321,11 @@ public: inline TOXTypes GetTOXType() const; inline sal_uInt16 GetFormMax() const; - sal_Bool IsRelTabPos() const { return bIsRelTabPos; } - void SetRelTabPos( sal_Bool b ) { bIsRelTabPos = b; } + bool IsRelTabPos() const { return bIsRelTabPos; } + void SetRelTabPos( bool b ) { bIsRelTabPos = b; } - sal_Bool IsCommaSeparated() const { return bCommaSeparated;} - void SetCommaSeparated( sal_Bool b) { bCommaSeparated = b;} + bool IsCommaSeparated() const { return bCommaSeparated;} + void SetCommaSeparated( bool b) { bCommaSeparated = b;} static sal_uInt16 GetFormMaxLevel( TOXTypes eType ); @@ -424,17 +424,17 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient sal_uInt16 nCreateType; // sources to create the index from sal_uInt16 nOLEOptions; // OLE sources SwCaptionDisplay eCaptionDisplay; - sal_Bool bProtected : 1; // index protected ? - sal_Bool bFromChapter : 1; // create from chapter or document - sal_Bool bFromObjectNames : 1; // create a table or object index + bool bProtected : 1; // index protected ? + bool bFromChapter : 1; // create from chapter or document + bool bFromObjectNames : 1; // create a table or object index // from the names rather than the caption - sal_Bool bLevelFromChapter : 1; // User index: get the level from the source chapter + bool bLevelFromChapter : 1; // User index: get the level from the source chapter protected: // Add a data member, for record the TOC field expression of MS Word binary format // For keeping fedality and may giving a better exporting performance OUString maMSTOCExpression; - sal_Bool mbKeepExpression; + bool mbKeepExpression; public: SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm, @@ -458,8 +458,8 @@ public: // for record the TOC field expression of MS Word binary format const OUString& GetMSTOCExpression() const{return maMSTOCExpression;} void SetMSTOCExpression(const OUString& rExp) {maMSTOCExpression = rExp;} - void EnableKeepExpression() {mbKeepExpression = sal_True;} - void DisableKeepExpression() {mbKeepExpression = sal_False;} + void EnableKeepExpression() {mbKeepExpression = true;} + void DisableKeepExpression() {mbKeepExpression = false;} OUString GetTitle() const; // Title OUString GetBookmarkName() const; @@ -507,17 +507,17 @@ public: SAL_WARN_IF( nLevel >= MAXLEVEL, "sw", "Which level?"); aStyleNames[nLevel] = rSet; } - sal_Bool IsFromChapter() const { return bFromChapter;} - void SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;} + bool IsFromChapter() const { return bFromChapter;} + void SetFromChapter(bool bSet) { bFromChapter = bSet;} - sal_Bool IsFromObjectNames() const {return bFromObjectNames;} - void SetFromObjectNames(sal_Bool bSet) {bFromObjectNames = bSet;} + bool IsFromObjectNames() const {return bFromObjectNames;} + void SetFromObjectNames(bool bSet) {bFromObjectNames = bSet;} - sal_Bool IsLevelFromChapter() const {return bLevelFromChapter;} - void SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;} + bool IsLevelFromChapter() const {return bLevelFromChapter;} + void SetLevelFromChapter(bool bSet) {bLevelFromChapter = bSet;} - sal_Bool IsProtected() const { return bProtected; } - void SetProtected(sal_Bool bSet) { bProtected = bSet; } + bool IsProtected() const { return bProtected; } + void SetProtected(bool bSet) { bProtected = bSet; } OUString GetSequenceName() const {return sSequenceName;} void SetSequenceName(const OUString& rSet) {sSequenceName = rSet;} @@ -563,7 +563,7 @@ inline OUString SwTOXMark::GetEntryTypeName() const inline const SwTOXType* SwTOXMark::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } -inline sal_Bool SwTOXMark::IsAlternativeText() const +inline bool SwTOXMark::IsAlternativeText() const { return !aAltText.isEmpty(); } inline void SwTOXMark::SetAlternativeText(const OUString& rAlt) diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index ce919c5798d0..d1588022cc15 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -48,12 +48,12 @@ public: OUString GetIndexKey( const OUString& rTxt, const OUString& rTxtReading, const ::com::sun::star::lang::Locale& rLocale ) const; - OUString GetFollowingText( sal_Bool bMorePages ) const; + OUString GetFollowingText( bool bMorePages ) const; ::com::sun::star::uno::Sequence< OUString > GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const; - sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, + bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, const OUString& sSortAlgorithm, long nOptions ) const; sal_Int16 CompareIndexEntry( const OUString& rTxt1, const OUString& rTxtReading1, diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index b5e60d979b4a..7ad6dc498e7c 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -42,7 +42,7 @@ public: virtual ~SwTxtFtn(); inline SwNodeIndex *GetStartNode() const { return m_pStartNode; } - void SetStartNode( const SwNodeIndex *pNode, sal_Bool bDelNodes = sal_True ); + void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true ); void SetNumber( const sal_uInt16 nNumber, const OUString &sNumStr ); void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const; diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 28fa9d73ef64..f1159c598a75 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -61,7 +61,7 @@ public: bool IsVisitedValid() const { return m_bVisitedValid; } void SetVisitedValid( bool bNew ) { m_bVisitedValid = bNew; } - sal_Bool IsProtect() const; + bool IsProtect() const; }; inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const diff --git a/sw/inc/unobrushitemhelper.hxx b/sw/inc/unobrushitemhelper.hxx index bc8e9bb635ab..fd141e51d248 100644 --- a/sw/inc/unobrushitemhelper.hxx +++ b/sw/inc/unobrushitemhelper.hxx @@ -27,7 +27,7 @@ namespace sw { //UUUU helper function definintions for UNO API fallbacks to replace SvxBrushItem void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxItemSet& rToSet); -SW_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_Bool bSearchInParents = sal_True); +SW_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, bool bSearchInParents = true); } // namespace sw diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index dc4a57650161..be1a674a39a8 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -82,9 +82,9 @@ class SwChartLockController_Helper SwChartLockController_Helper( const SwChartLockController_Helper & ); SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ); - void LockUnlockAllCharts( sal_Bool bLock ); - void LockAllCharts() { LockUnlockAllCharts( sal_True ); }; - void UnlockAllCharts() { LockUnlockAllCharts( sal_False ); }; + void LockUnlockAllCharts( bool bLock ); + void LockAllCharts() { LockUnlockAllCharts( true ); }; + void UnlockAllCharts() { LockUnlockAllCharts( false ); }; public: SwChartLockController_Helper( SwDoc *pDocument ); @@ -139,17 +139,17 @@ class SwChartDataProvider : ::cppu::OInterfaceContainerHelper aEvtListeners; const SwDoc * pDoc; - sal_Bool bDisposed; + bool bDisposed; // disallow use of c-tor and assignment operator SwChartDataProvider( const SwChartDataProvider & ); SwChartDataProvider & operator = ( const SwChartDataProvider & ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, sal_Bool bTestOnly = sal_False ) + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, bool bTestOnly = false ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, sal_Bool bTestOnly = sal_False ) + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -196,11 +196,11 @@ public: // will send modifdied events for all data-sequences of the table void InvalidateTable( const SwTable *pTable ); - sal_Bool DeleteBox( const SwTable *pTable, const SwTableBox &rBox ); + bool DeleteBox( const SwTable *pTable, const SwTableBox &rBox ); void DisposeAllDataSequences( const SwTable *pTable ); // functionality needed to get notified about new added rows/cols - void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, sal_Bool bBehind ); + void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, bool bBehind ); }; typedef cppu::WeakImplHelper2 @@ -270,7 +270,7 @@ class SwChartDataSequence : const SfxItemPropertySet* _pPropSet; - sal_Bool bDisposed; + bool bDisposed; // disallow use of c-tor and assignment operator SwChartDataSequence( const SwChartDataSequence &rObj ); @@ -347,7 +347,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } - sal_Bool DeleteBox( const SwTableBox &rBox ); + bool DeleteBox( const SwTableBox &rBox ); void FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const; bool ExtendTo( bool bExtendCol, sal_Int32 nFirstNew, sal_Int32 nCount ); @@ -373,7 +373,7 @@ class SwChartLabeledDataSequence : ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > xLabels; - sal_Bool bDisposed; + bool bDisposed; // disallow use of c-tor and assignment operator SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ); diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index f055acc10859..975fbbde8b2c 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -54,17 +54,17 @@ class SwXBookmark; class SwUnoCollection { SwDoc* pDoc; - sal_Bool bObjectValid; + bool bObjectValid; public: SwUnoCollection(SwDoc* p) : pDoc(p), - bObjectValid(sal_True){} + bObjectValid(true){} virtual ~SwUnoCollection() {} virtual void Invalidate(); - sal_Bool IsValid() const {return bObjectValid;} + bool IsValid() const {return bObjectValid;} SwDoc* GetDoc() const {return pDoc;} }; @@ -475,7 +475,7 @@ class SwXFootnotes : public SwSimpleIndexAccessBaseClass, protected: virtual ~SwXFootnotes(); public: - SwXFootnotes(sal_Bool bEnd, SwDoc* pDoc); + SwXFootnotes(bool bEnd, SwDoc* pDoc); //XIndexAccess virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 2ce45aaf442f..aa33f99f83c8 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -23,9 +23,9 @@ class SwUnoCrsr : public virtual SwCursor, public SwModify { - sal_Bool bRemainInSection : 1; - sal_Bool bSkipOverHiddenSections : 1; - sal_Bool bSkipOverProtectSections : 1; + bool bRemainInSection : 1; + bool bSkipOverHiddenSections : 1; + bool bSkipOverProtectSections : 1; public: SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = 0 ); @@ -34,31 +34,31 @@ public: protected: virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr) SAL_OVERRIDE; + bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) SAL_OVERRIDE; virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE; public: // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. - virtual sal_Bool IsSelOvr( int eFlags = + virtual bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE; virtual bool IsReadOnlyAvailable() const SAL_OVERRIDE; - sal_Bool IsRemainInSection() const { return bRemainInSection; } - void SetRemainInSection( sal_Bool bFlag ) { bRemainInSection = bFlag; } + bool IsRemainInSection() const { return bRemainInSection; } + void SetRemainInSection( bool bFlag ) { bRemainInSection = bFlag; } - virtual sal_Bool IsSkipOverProtectSections() const SAL_OVERRIDE + virtual bool IsSkipOverProtectSections() const SAL_OVERRIDE { return bSkipOverProtectSections; } - void SetSkipOverProtectSections( sal_Bool bFlag ) + void SetSkipOverProtectSections( bool bFlag ) { bSkipOverProtectSections = bFlag; } - virtual sal_Bool IsSkipOverHiddenSections() const SAL_OVERRIDE + virtual bool IsSkipOverHiddenSections() const SAL_OVERRIDE { return bSkipOverHiddenSections; } - void SetSkipOverHiddenSections( sal_Bool bFlag ) + void SetSkipOverHiddenSections( bool bFlag ) { bSkipOverHiddenSections = bFlag; } // make copy of cursor @@ -82,7 +82,7 @@ public: // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. - virtual sal_Bool IsSelOvr( int eFlags = + virtual bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE; diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 86f0b51898dd..050c5c069307 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -88,9 +88,9 @@ namespace SwUnoCursorHelper void GetCurPageStyle(SwPaM& rPaM, OUString &rString); - inline sal_Bool IsStartOfPara(SwPaM& rUnoCrsr) + inline bool IsStartOfPara(SwPaM& rUnoCrsr) { return rUnoCrsr.GetPoint()->nContent == 0;} - inline sal_Bool IsEndOfPara(SwPaM& rUnoCrsr) + inline bool IsEndOfPara(SwPaM& rUnoCrsr) { return rUnoCrsr.GetCntntNode() && rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();} @@ -146,7 +146,7 @@ namespace SwUnoCursorHelper ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > CreateSortDescriptor(const bool bFromTable); - sal_Bool ConvertSortProperties( + bool ConvertSortProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor, SwSortOptions & rSortOpt); diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index ed2e0ac500bf..0ef486d6d5be 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -146,7 +146,7 @@ class SwXShape : public SwXShapeBaseClass, SwShapeDescriptor_Impl* pImpl; - sal_Bool m_bDescriptor; + bool m_bDescriptor; SvxShape* GetSvxShape(); diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index 6465c46b804e..65345c29e9a5 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -43,7 +43,7 @@ protected: public: SwXTextFieldMasters(SwDoc* pDoc); - static sal_Bool getInstanceName(const SwFieldType& rFldType, OUString& rName); + static bool getInstanceName(const SwFieldType& rFldType, OUString& rName); // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 658bbc9d8632..a8e0b50d18f1 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -145,7 +145,7 @@ class SwXNumberingRules : public cppu::WeakAggImplHelper5 SwDocShell* pDocShell; // Only if used as chapter numbering. SwNumRule* pNumRule; const SfxItemPropertySet* m_pPropertySet; - sal_Bool bOwnNumRuleCreated; + bool bOwnNumRuleCreated; protected: virtual ~SwXNumberingRules(); @@ -233,7 +233,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4 { sal_Int32 nReference; ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn> aTextColumns; - sal_Bool bIsAutomaticWidth; + bool bIsAutomaticWidth; sal_Int32 nAutoDistance; const SfxItemPropertySet* m_pPropSet; @@ -243,7 +243,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4 sal_Int32 nSepLineColor; sal_Int8 nSepLineHeightRelative; sal_Int8 nSepLineVertAlign;//style::VerticalAlignment - sal_Bool bSepLineIsOn; + bool bSepLineIsOn; sal_Int8 nSepLineStyle; protected: @@ -282,10 +282,10 @@ public: sal_Int32 GetSepLineColor() const {return nSepLineColor;} sal_Int8 GetSepLineHeightRelative() const {return nSepLineHeightRelative;} sal_Int8 GetSepLineVertAlign() const {return nSepLineVertAlign;} - sal_Bool GetSepLineIsOn() const {return bSepLineIsOn;} + bool GetSepLineIsOn() const {return bSepLineIsOn;} sal_Int8 GetSepLineStyle() const {return nSepLineStyle;} - sal_Bool IsAutomaticWidth() const {return bIsAutomaticWidth;} + bool IsAutomaticWidth() const {return bIsAutomaticWidth;} }; #endif diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 0d8f7f05aa8b..71f6943f1ba9 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -50,19 +50,19 @@ class SwXTextSearch : public cppu::WeakImplHelper3 SwSearchProperties_Impl* pReplaceProperties; const SfxItemPropertySet* m_pPropSet; - sal_Bool bAll : 1; - sal_Bool bWord : 1; - sal_Bool bBack : 1; - sal_Bool bExpr : 1; - sal_Bool bCase : 1; - sal_Bool bStyles:1; - sal_Bool bSimilarity : 1; - sal_Bool bLevRelax :1; + bool bAll : 1; + bool bWord : 1; + bool bBack : 1; + bool bExpr : 1; + bool bCase : 1; + bool bStyles:1; + bool bSimilarity : 1; + bool bLevRelax :1; sal_Int16 nLevExchange; sal_Int16 nLevAdd; sal_Int16 nLevRemove; - sal_Bool bIsValueSearch :1; + bool bIsValueSearch :1; protected: virtual ~SwXTextSearch(); public: @@ -106,8 +106,8 @@ public: void FillSearchItemSet(SfxItemSet& rSet) const; void FillReplaceItemSet(SfxItemSet& rSet) const; - sal_Bool HasSearchAttributes() const; - sal_Bool HasReplaceAttributes() const; + bool HasSearchAttributes() const; + bool HasReplaceAttributes() const; void FillSearchOptions( ::com::sun::star::util::SearchOptions& rSearchOpt ) const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index deaf3aec1362..0a661b4e75fd 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -171,8 +171,8 @@ class SwXStyle : public cppu::WeakImplHelper7 SfxStyleSheetBasePool* pBasePool; SfxStyleFamily eFamily; // for Notify - sal_Bool bIsDescriptor : 1; - sal_Bool bIsConditional : 1; + bool bIsDescriptor : 1; + bool bIsConditional : 1; OUString m_sParentStyleName; SwStyleProperties_Impl* pPropImpl; @@ -199,7 +199,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: - SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, sal_Bool bConditional = sal_False); + SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, bool bConditional = false); SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam, SwDoc* pDoc, const OUString& rStyleName); @@ -261,12 +261,12 @@ public: OUString GetStyleName() const { return m_sStyleName;} SfxStyleFamily GetFamily() const {return eFamily;} - sal_Bool IsDescriptor() const {return bIsDescriptor;} - sal_Bool IsConditional() const { return bIsConditional;} + bool IsDescriptor() const {return bIsDescriptor;} + bool IsConditional() const { return bIsConditional;} OUString GetParentStyleName() const { return m_sParentStyleName;} void SetDoc(SwDoc* pDc, SfxStyleSheetBasePool* pPool) { - bIsDescriptor = sal_False; m_pDoc = pDc; + bIsDescriptor = false; m_pDoc = pDc; pBasePool = pPool; StartListening(*pBasePool); } diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index a99c48c7145a..d42659dfdcaf 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -68,7 +68,7 @@ class SwXCell : public SwXCellBaseClass, public SwClient { friend void sw_setString( SwXCell &rCell, const OUString &rTxt, - sal_Bool bKeepNumberFmt ); + bool bKeepNumberFmt ); friend double sw_getValue( SwXCell &rCell ); friend void sw_setValue( SwXCell &rCell, double nVal ); @@ -312,12 +312,12 @@ private: // Descriptor-interface SwTableProperties_Impl* pTableProps; OUString m_sTableName; - sal_Bool bIsDescriptor; + bool bIsDescriptor; unsigned short nRows; unsigned short nColumns; - sal_Bool bFirstRowAsLabel :1; - sal_Bool bFirstColumnAsLabel :1; + bool bFirstRowAsLabel :1; + bool bFirstColumnAsLabel :1; protected: virtual ~SwXTextTable(); public: @@ -453,8 +453,8 @@ class SwXCellRange : public cppu::WeakImplHelper7 SwUnoCrsr* pTblCrsr; - sal_Bool bFirstRowAsLabel :1; - sal_Bool bFirstColumnAsLabel :1; + bool bFirstRowAsLabel :1; + bool bFirstColumnAsLabel :1; public: SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc); @@ -537,7 +537,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq, ::com::sun::star::uno::Sequence< OUString > *pTxtSeq, ::com::sun::star::uno::Sequence< double > *pDblSeq, - sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException); + bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException); }; @@ -626,7 +626,7 @@ public: int sw_CompareCellRanges( const OUString &rRange1StartCell, const OUString &rRange1EndCell, const OUString &rRange2StartCell, const OUString &rRange2EndCell, - sal_Bool bCmpColsFirst ); + bool bCmpColsFirst ); void sw_NormalizeRange( OUString &rCell1, OUString &rCell2 ); diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index f4d666221397..1f3d632de10e 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -172,7 +172,7 @@ private: const SfxItemPropertySet* pPropSet; SwDocShell* pDocShell; - sal_Bool bObjectValid; + bool bObjectValid; SwXDrawPage* pDrawPage; css::uno::Reference< css::drawing::XDrawPage > * pxXDrawPage; @@ -231,7 +231,7 @@ private: // set in XPagePrintable::printPages(..) to indicate that the PagePrintSettings // has to be applied in XRenderable::getRenderer(..) through which the printing // is implemented. - sal_Bool bApplyPagePrintSettingsFromXPagePrintable; + bool bApplyPagePrintSettingsFromXPagePrintable; using SfxBaseModel::addEventListener; using SfxBaseModel::removeEventListener; @@ -431,13 +431,13 @@ public: void Invalidate(); void Reactivate(SwDocShell* pNewDocShell); SwXDocumentPropertyHelper * GetPropertyHelper (); - sal_Bool IsValid() const {return bObjectValid;} + bool IsValid() const {return bObjectValid;} void InitNewDoc(); SwUnoCrsr* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr); SwUnoCrsr* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc, - css::uno::Reference< css::text::XTextCursor > & xCrsr, sal_Bool bAll, + css::uno::Reference< css::text::XTextCursor > & xCrsr, bool bAll, sal_Int32& nResult, css::uno::Reference< css::uno::XInterface > xLastResult); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index cc9ed405a2fc..f6816be6bd13 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -146,15 +146,15 @@ protected: sal_uInt8 nPagePrevRow; // Page Preview Row/Columns. sal_uInt8 nPagePrevCol; // Page Preview Row/Columns. sal_uInt8 nShdwCrsrFillMode; // FillMode for ShadowCrsr. - sal_Bool bReadonly : 1; // Readonly-Doc. - sal_Bool bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). - sal_Bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. - sal_Bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. - sal_Bool mbFormView : 1; - sal_Bool mbBrowseMode : 1; - sal_Bool mbBookView : 1; // View mode for page preview. - sal_Bool mbViewLayoutBookMode : 1; // Book view mode for edit view. - sal_Bool bShowPlaceHolderFields : 1; // Only used in printing! + bool bReadonly : 1; // Readonly-Doc. + bool bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents). + bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings. + bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents. + bool mbFormView : 1; + bool mbBrowseMode : 1; + bool mbBookView : 1; // View mode for page preview. + bool mbViewLayoutBookMode : 1; // Book view mode for edit view. + bool bShowPlaceHolderFields : 1; // Only used in printing! mutable bool bIdle; // Scale @@ -193,181 +193,181 @@ public: Options from nCoreOptions ----------------------------------------------------------------------------*/ - inline sal_Bool IsIdle() const + inline bool IsIdle() const { return bIdle; } // Logically this is a const function since it does not modify the viewoptions // but only effects idle formatting. Of course that member is already implement // in the wrong place here... Also currently there are many const modifying casts in the code // just to call this function on otherwise const objects. Thus declaring it as const now. - inline void SetIdle( sal_Bool b ) const + inline void SetIdle( bool b ) const { bIdle = b; } - inline sal_Bool IsTab(sal_Bool bHard = sal_False) const + inline bool IsTab(bool bHard = false) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) ? sal_True : sal_False; } - inline void SetTab( sal_Bool b ) { - (b != 0) ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); } + inline void SetTab( bool b ) { + b ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); } - inline sal_Bool IsBlank(sal_Bool bHard = sal_False) const + inline bool IsBlank(bool bHard = false) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_BLANK) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) ? sal_True : sal_False; } - inline void SetBlank( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_BLANK ) : ( nCoreOptions &= ~VIEWOPT_1_BLANK); } + inline void SetBlank( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_BLANK ) : ( nCoreOptions &= ~VIEWOPT_1_BLANK); } - inline sal_Bool IsHardBlank() const + inline bool IsHardBlank() const { return !bReadonly && nCoreOptions & VIEWOPT_1_HARDBLANK ? sal_True : sal_False; } - inline void SetHardBlank( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_HARDBLANK ) : ( nCoreOptions &= ~VIEWOPT_1_HARDBLANK); } + inline void SetHardBlank( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_HARDBLANK ) : ( nCoreOptions &= ~VIEWOPT_1_HARDBLANK); } - inline sal_Bool IsParagraph(sal_Bool bHard = sal_False) const + inline bool IsParagraph(bool bHard = false) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_PARAGRAPH) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) ? sal_True : sal_False; } - inline void SetParagraph( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PARAGRAPH ) : ( nCoreOptions &= ~VIEWOPT_1_PARAGRAPH); } + inline void SetParagraph( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_PARAGRAPH ) : ( nCoreOptions &= ~VIEWOPT_1_PARAGRAPH); } - inline sal_Bool IsLineBreak(sal_Bool bHard = sal_False) const + inline bool IsLineBreak(bool bHard = false) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_LINEBREAK) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) ? sal_True : sal_False; } - inline void SetLineBreak( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_LINEBREAK); } + inline void SetLineBreak( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_LINEBREAK); } - inline void SetPageBreak( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBREAK); } + inline void SetPageBreak( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_PAGEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBREAK); } - inline void SetColumnBreak( sal_Bool b) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_COLUMNBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_COLUMNBREAK); } + inline void SetColumnBreak( bool b) + { b ? (nCoreOptions |= VIEWOPT_1_COLUMNBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_COLUMNBREAK); } - inline sal_Bool IsSoftHyph() const + inline bool IsSoftHyph() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_SOFTHYPH) ? sal_True : sal_False; } - inline void SetSoftHyph( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } + inline void SetSoftHyph( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } - inline sal_Bool IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? sal_True : sal_False; } - inline void SetFldName( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); } + inline bool IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? sal_True : sal_False; } + inline void SetFldName( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); } - inline sal_Bool IsPostIts() const + inline bool IsPostIts() const { return (nCoreOptions & VIEWOPT_1_POSTITS) ? sal_True : sal_False; } - inline void SetPostIts( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); } + inline void SetPostIts( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); } void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, - sal_Bool bIsScript ) const; + bool bIsScript ) const; sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ) const; - inline sal_Bool IsShowHiddenChar(sal_Bool bHard = sal_False) const + inline bool IsShowHiddenChar(bool bHard = false) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) ? sal_True : sal_False; } - inline void SetShowHiddenChar( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } + inline void SetShowHiddenChar( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } - inline sal_Bool IsShowHiddenField() const + inline bool IsShowHiddenField() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) ? sal_True : sal_False; } - inline void SetShowHiddenField( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLD_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_FLD_HIDDEN); } + inline void SetShowHiddenField( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_FLD_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_FLD_HIDDEN); } - inline sal_Bool IsGraphic() const + inline bool IsGraphic() const { return nCoreOptions & VIEWOPT_1_GRAPHIC ? sal_True : sal_False; } - inline void SetGraphic( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_GRAPHIC ) : ( nCoreOptions &= ~VIEWOPT_1_GRAPHIC); } + inline void SetGraphic( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_GRAPHIC ) : ( nCoreOptions &= ~VIEWOPT_1_GRAPHIC); } - inline sal_Bool IsPageBack() const + inline bool IsPageBack() const { return nCoreOptions & VIEWOPT_1_PAGEBACK ? sal_True : sal_False; } - inline void SetPageBack( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); } + inline void SetPageBack( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); } - inline sal_Bool IsTable() const + inline bool IsTable() const { return nCoreOptions & VIEWOPT_1_TABLE ? sal_True : sal_False; } - inline void SetTable( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_TABLE ) : ( nCoreOptions &= ~VIEWOPT_1_TABLE); } + inline void SetTable( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_TABLE ) : ( nCoreOptions &= ~VIEWOPT_1_TABLE); } - inline sal_Bool IsDraw() const + inline bool IsDraw() const { return nCoreOptions & VIEWOPT_1_DRAW ? sal_True : sal_False; } - inline void SetDraw( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_DRAW ) : ( nCoreOptions &= ~VIEWOPT_1_DRAW); } + inline void SetDraw( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_DRAW ) : ( nCoreOptions &= ~VIEWOPT_1_DRAW); } - inline sal_Bool IsControl() const + inline bool IsControl() const { return nCoreOptions & VIEWOPT_1_CONTROL ? sal_True : sal_False; } - inline void SetControl( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CONTROL ) : ( nCoreOptions &= ~VIEWOPT_1_CONTROL); } + inline void SetControl( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_CONTROL ) : ( nCoreOptions &= ~VIEWOPT_1_CONTROL); } - inline sal_Bool IsSnap() const + inline bool IsSnap() const { return nCoreOptions & VIEWOPT_1_SNAP ? sal_True : sal_False; } - inline void SetSnap( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SNAP ) : ( nCoreOptions &= ~VIEWOPT_1_SNAP); } + inline void SetSnap( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_SNAP ) : ( nCoreOptions &= ~VIEWOPT_1_SNAP); } inline void SetSnapSize( Size &rSz ){ aSnapSize = rSz; } inline const Size &GetSnapSize() const { return aSnapSize; } - inline sal_Bool IsGridVisible() const + inline bool IsGridVisible() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_GRIDVISIBLE) ? sal_True : sal_False; } - inline void SetGridVisible( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_GRIDVISIBLE ) : ( nCoreOptions &= ~VIEWOPT_1_GRIDVISIBLE); } + inline void SetGridVisible( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_GRIDVISIBLE ) : ( nCoreOptions &= ~VIEWOPT_1_GRIDVISIBLE); } - inline sal_Bool IsOnlineSpell() const + inline bool IsOnlineSpell() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) ? sal_True : sal_False; } - inline void SetOnlineSpell( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); } + inline void SetOnlineSpell( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); } - inline sal_Bool IsViewMetaChars() const + inline bool IsViewMetaChars() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) ? sal_True : sal_False; } - inline void SetViewMetaChars( sal_Bool b) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_VIEWMETACHARS ) : ( nCoreOptions &= ~VIEWOPT_1_VIEWMETACHARS); } + inline void SetViewMetaChars( bool b) + { b ? (nCoreOptions |= VIEWOPT_1_VIEWMETACHARS ) : ( nCoreOptions &= ~VIEWOPT_1_VIEWMETACHARS); } - inline sal_Bool IsSynchronize() const + inline bool IsSynchronize() const { return nCoreOptions & VIEWOPT_1_SYNCHRONIZE ? sal_True : sal_False;} - inline void SetSynchronize( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SYNCHRONIZE ) : ( nCoreOptions &= ~VIEWOPT_1_SYNCHRONIZE); } + inline void SetSynchronize( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_SYNCHRONIZE ) : ( nCoreOptions &= ~VIEWOPT_1_SYNCHRONIZE); } - inline sal_Bool IsCrossHair() const + inline bool IsCrossHair() const { return nCoreOptions & VIEWOPT_1_CROSSHAIR ? sal_True : sal_False; } - inline void SetCrossHair( sal_Bool b ) - { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } + inline void SetCrossHair( bool b ) + { b ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } /*--------------------------------------------------------------------------- Options from nCore2Options ----------------------------------------------------------------------------*/ - inline sal_Bool IsBlackFont() const + inline bool IsBlackFont() const {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? sal_True : sal_False;} - inline void SetBlackFont(sal_Bool b) - { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);} + inline void SetBlackFont(bool b) + { b ? (nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);} - inline sal_Bool IsShowHiddenPara() const + inline bool IsShowHiddenPara() const {return nCore2Options & VIEWOPT_CORE2_HIDDENPARA ? sal_True : sal_False;} - inline void SetShowHiddenPara(sal_Bool b) - { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);} + inline void SetShowHiddenPara(bool b) + { b ? (nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);} - inline sal_Bool IsSmoothScroll() const + inline bool IsSmoothScroll() const {return nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL ? sal_True : sal_False;} - inline void SetSmoothScroll(sal_Bool b) - { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);} + inline void SetSmoothScroll(bool b) + { b ? (nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);} - inline sal_Bool IsCursorInProtectedArea() const + inline bool IsCursorInProtectedArea() const {return nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT ? sal_True : sal_False;} - inline void SetCursorInProtectedArea(sal_Bool b) - { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_CRSR_IN_PROT) : (nCore2Options &= ~VIEWOPT_CORE2_CRSR_IN_PROT);} + inline void SetCursorInProtectedArea(bool b) + { b ? (nCore2Options |= VIEWOPT_CORE2_CRSR_IN_PROT) : (nCore2Options &= ~VIEWOPT_CORE2_CRSR_IN_PROT);} - inline sal_Bool IsPDFExport() const + inline bool IsPDFExport() const {return nCore2Options & VIEWOPT_CORE2_PDF_EXPORT ? sal_True : sal_False;} - inline void SetPDFExport(sal_Bool b) - { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);} + inline void SetPDFExport(bool b) + { b ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);} - inline sal_Bool IsPrinting() const + inline bool IsPrinting() const {return nCore2Options & VIEWOPT_CORE2_PRINTING ? sal_True : sal_False;} - inline void SetPrinting(sal_Bool b) - { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);} + inline void SetPrinting(bool b) + { b ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);} inline short GetDivisionX() const { return nDivisionX; } inline void SetDivisionX( short n ){ nDivisionX = n; } @@ -378,21 +378,21 @@ public: inline void SetPagePrevRow( sal_uInt8 n ) { nPagePrevRow = n; } inline sal_uInt8 GetPagePrevCol() const { return nPagePrevCol; } inline void SetPagePrevCol( sal_uInt8 n ) { nPagePrevCol = n; } - sal_Bool IsReadonly() const { return bReadonly; } - void SetReadonly(sal_Bool bSet) { bReadonly = bSet; } + bool IsReadonly() const { return bReadonly; } + void SetReadonly(bool bSet) { bReadonly = bSet; } - sal_Bool IsSelectionInReadonly() const {return bSelectionInReadonly;} - void SetSelectionInReadonly(sal_Bool bSet) {bSelectionInReadonly = bSet;} + bool IsSelectionInReadonly() const {return bSelectionInReadonly;} + void SetSelectionInReadonly(bool bSet) {bSelectionInReadonly = bSet;} - sal_Bool IsFormView() const { return mbFormView; } - void SetFormView( sal_Bool bSet ) { mbFormView = bSet; } + bool IsFormView() const { return mbFormView; } + void SetFormView( bool bSet ) { mbFormView = bSet; } - inline sal_Bool getBrowseMode() const { return mbBrowseMode; } - inline void setBrowseMode(sal_Bool bSet) { mbBrowseMode = bSet; } - inline sal_Bool IsPagePrevBookview() const { return mbBookView; } - inline void SetPagePrevBookview(sal_Bool bSet) { mbBookView = bSet; } + inline bool getBrowseMode() const { return mbBrowseMode; } + inline void setBrowseMode(bool bSet) { mbBrowseMode = bSet; } + inline bool IsPagePrevBookview() const { return mbBookView; } + inline void SetPagePrevBookview(bool bSet) { mbBookView = bSet; } - sal_Bool IsAutoCompleteWords() const; + bool IsAutoCompleteWords() const; bool IsViewLayoutBookMode() const { return mbViewLayoutBookMode; } void SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; } @@ -440,7 +440,7 @@ public: Options from nUIOptions ----------------------------------------------------------------------------*/ - sal_Bool IsViewVScrollBar() const + bool IsViewVScrollBar() const { #if HAVE_FEATURE_DESKTOP return nUIOptions & VIEWOPT_2_VSCROLLBAR ? sal_True : sal_False; @@ -448,7 +448,7 @@ public: return sal_False; #endif } - sal_Bool IsViewHScrollBar() const + bool IsViewHScrollBar() const { #if HAVE_FEATURE_DESKTOP return nUIOptions & VIEWOPT_2_HSCROLLBAR ? sal_True : sal_False; @@ -456,34 +456,34 @@ public: return sal_False; #endif } - sal_Bool IsKeepRatio() const + bool IsKeepRatio() const { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False; } - sal_Bool IsGrfKeepZoom() const + bool IsGrfKeepZoom() const { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False; } - sal_Bool IsShowContentTips() const + bool IsShowContentTips() const { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? sal_True : sal_False; } - sal_Bool IsPrtFormat() const + bool IsPrtFormat() const { return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; } - sal_Bool IsShowScrollBarTips() const + bool IsShowScrollBarTips() const { return nUIOptions & VIEWOPT_2_SCROLLBAR_TIPS ? sal_True : sal_False; } SvxZoomType GetZoomType() const { return eZoom; } sal_uInt8 GetTblDest() const { return nTblDest; } - void SetViewVScrollBar(sal_Bool b) + void SetViewVScrollBar(bool b) { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); } - void SetViewHScrollBar(sal_Bool b) + void SetViewHScrollBar(bool b) { b ? (nUIOptions |= VIEWOPT_2_HSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_HSCROLLBAR); } - void SetKeepRatio (sal_Bool b) + void SetKeepRatio (bool b) { b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); } - void SetGrfKeepZoom (sal_Bool b) + void SetGrfKeepZoom (bool b) { b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); } - void SetShowContentTips( sal_Bool b) + void SetShowContentTips( bool b) { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); } - void SetPrtFormat( sal_Bool b) + void SetPrtFormat( bool b) { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } - void SetShowScrollBarTips( sal_Bool b) + void SetShowScrollBarTips( bool b) { b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); } void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } @@ -495,7 +495,7 @@ public: const Color& GetRetoucheColor() const { return aRetoucheColor;} void SetRetoucheColor(const Color&r) { aRetoucheColor = r; } - sal_Bool IsViewAnyRuler() const + bool IsViewAnyRuler() const { #if HAVE_FEATURE_DESKTOP return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER); @@ -503,13 +503,13 @@ public: return sal_False; #endif } - void SetViewAnyRuler(sal_Bool bSet) + void SetViewAnyRuler(bool bSet) { bSet ? (nUIOptions |= VIEWOPT_2_ANY_RULER) : (nUIOptions &= ~VIEWOPT_2_ANY_RULER);} - sal_Bool IsViewHRuler(sal_Bool bDirect = sal_False) const + bool IsViewHRuler(bool bDirect = false) const { #if HAVE_FEATURE_DESKTOP - sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? + bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? 0 != (nUIOptions & VIEWOPT_2_H_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER) @@ -520,13 +520,13 @@ public: return sal_False; #endif } - void SetViewHRuler (sal_Bool b) + void SetViewHRuler (bool b) { b ? (nUIOptions |= VIEWOPT_2_H_RULER ) : ( nUIOptions &= ~VIEWOPT_2_H_RULER);} - sal_Bool IsViewVRuler(sal_Bool bDirect = sal_False) const + bool IsViewVRuler(bool bDirect = false) const { #if HAVE_FEATURE_DESKTOP - sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? + bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? 0 !=(nUIOptions & VIEWOPT_2_V_RULER) : !bReadonly ? (nUIOptions & @@ -538,32 +538,32 @@ public: return sal_False; #endif } - void SetViewVRuler (sal_Bool b) + void SetViewVRuler (bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER);} // ShadowCursor, switch on/off, get/set color/mode. - sal_Bool IsShadowCursor() const + bool IsShadowCursor() const { return nUIOptions & VIEWOPT_2_SHADOWCRSR ? sal_True : sal_False; } - void SetShadowCursor(sal_Bool b) + void SetShadowCursor(bool b) { b ? (nUIOptions |= VIEWOPT_2_SHADOWCRSR ) : ( nUIOptions &= ~VIEWOPT_2_SHADOWCRSR); } //move vertical ruler to the right - sal_Bool IsVRulerRight() const + bool IsVRulerRight() const { return nUIOptions & VIEWOPT_2_V_RULER_RIGHT ? sal_True : sal_False; } - void SetVRulerRight(sal_Bool b) + void SetVRulerRight(bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER_RIGHT ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER_RIGHT); } - sal_Bool IsStarOneSetting() const {return bStarOneSetting; } - void SetStarOneSetting(sal_Bool bSet) {bStarOneSetting = bSet; } + bool IsStarOneSetting() const {return bStarOneSetting; } + void SetStarOneSetting(bool bSet) {bStarOneSetting = bSet; } - sal_Bool IsPagePreview() const {return bIsPagePreview; } - void SetPagePreview(sal_Bool bSet) { bIsPagePreview= bSet; } + bool IsPagePreview() const {return bIsPagePreview; } + void SetPagePreview(bool bSet) { bIsPagePreview= bSet; } sal_uInt8 GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } void SetShdwCrsrFillMode( sal_uInt8 nMode ) { nShdwCrsrFillMode = nMode; }; - sal_Bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; } - void SetShowPlaceHolderFields(sal_Bool bSet) { bShowPlaceHolderFields = bSet; } + bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; } + void SetShowPlaceHolderFields(bool bSet) { bShowPlaceHolderFields = bSet; } static Color& GetDocColor(); static Color& GetDocBoundariesColor(); @@ -584,21 +584,21 @@ public: static Color& GetPageBreakColor(); static Color& GetHeaderFooterMarkColor(); - static sal_Bool IsAppearanceFlag(sal_Int32 nFlag); + static bool IsAppearanceFlag(sal_Int32 nFlag); - static sal_Bool IsDocBoundaries() {return IsAppearanceFlag(VIEWOPT_DOC_BOUNDARIES);} - static sal_Bool IsObjectBoundaries(){return IsAppearanceFlag(VIEWOPT_OBJECT_BOUNDARIES);} - static sal_Bool IsTableBoundaries() {return IsAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES );} - static sal_Bool IsIndexShadings() {return IsAppearanceFlag(VIEWOPT_INDEX_SHADINGS );} - static sal_Bool IsLinks() {return IsAppearanceFlag(VIEWOPT_LINKS );} - static sal_Bool IsVisitedLinks() {return IsAppearanceFlag(VIEWOPT_VISITED_LINKS );} - static sal_Bool IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);} - static sal_Bool IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);} - static sal_Bool IsShadow() {return IsAppearanceFlag(VIEWOPT_SHADOW );} + static bool IsDocBoundaries() {return IsAppearanceFlag(VIEWOPT_DOC_BOUNDARIES);} + static bool IsObjectBoundaries(){return IsAppearanceFlag(VIEWOPT_OBJECT_BOUNDARIES);} + static bool IsTableBoundaries() {return IsAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES );} + static bool IsIndexShadings() {return IsAppearanceFlag(VIEWOPT_INDEX_SHADINGS );} + static bool IsLinks() {return IsAppearanceFlag(VIEWOPT_LINKS );} + static bool IsVisitedLinks() {return IsAppearanceFlag(VIEWOPT_VISITED_LINKS );} + static bool IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);} + static bool IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);} + static bool IsShadow() {return IsAppearanceFlag(VIEWOPT_SHADOW );} - static void SetAppearanceFlag(sal_Int32 nFlag, sal_Bool bSet, sal_Bool bSaveInConfig = sal_False); + static void SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInConfig = false); - void SetDocBoundaries(sal_Bool bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} + void SetDocBoundaries(bool bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} static void ApplyColorConfigValues(const svtools::ColorConfig& rConfig); }; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 3f3708028651..de76f7ea5b8e 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -112,7 +112,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring static BitmapEx* mpReplaceBmp; ///< replaced display of still loaded images static BitmapEx* mpErrorBmp; ///< error display of missed images - static sal_Bool mbLstAct; // sal_True if EndAction of last Shell + static bool mbLstAct; // sal_True if EndAction of last Shell // i.e. if the EndActions of the other // Shells on the document are through. @@ -136,19 +136,19 @@ class SW_DLLPUBLIC SwViewShell : public Ring SwViewOption *mpOpt; SwAccessibilityOptions* mpAccOptions; - sal_Bool mbDocSizeChgd :1; // For DocChgNotify(): Announce new DocSize + bool mbDocSizeChgd :1; // For DocChgNotify(): Announce new DocSize // at EndAction to DocMDI. - sal_Bool mbPaintWorks :1; // Normal Painting if sal_True, + bool mbPaintWorks :1; // Normal Painting if sal_True, // remember Paint if sal_False. - sal_Bool mbPaintInProgress :1; // Block any double paint. - sal_Bool mbViewLocked :1; // Lock visible range; + bool mbPaintInProgress :1; // Block any double paint. + bool mbViewLocked :1; // Lock visible range; // in this case MakeVisible is ineffectual. - sal_Bool mbInEndAction :1; // Avoid problems, cf. viewsh.cxx. - sal_Bool mbPreview :1; // If sal_True it is a Preview-SwViewShell. - sal_Bool mbFrameView :1; // If sal_True it is a (HTML-)Frame. - sal_Bool mbEnableSmooth :1; // Disable SmoothScroll, e.g. for drag + bool mbInEndAction :1; // Avoid problems, cf. viewsh.cxx. + bool mbPreview :1; // If sal_True it is a Preview-SwViewShell. + bool mbFrameView :1; // If sal_True it is a (HTML-)Frame. + bool mbEnableSmooth :1; // Disable SmoothScroll, e.g. for drag // of scrollbars. - sal_Bool mbEndActionByVirDev:1; // Paints from EndAction always via virtual device + bool mbEndActionByVirDev:1; // Paints from EndAction always via virtual device // (e.g. when browsing). bool mbShowHeaderSeparator:1; ///< Flag to say that we are showing the header control bool mbShowFooterSeparator:1; ///< Flag to say that we are showing the footer control @@ -175,7 +175,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring // PaintDesktop split. This pars is also used by PreviewPage. SAL_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion ); - SAL_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather + SAL_DLLPRIVATE bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather // trigger an action. SAL_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions ); @@ -207,25 +207,25 @@ public: // Bracketing of actions belonging together. inline void StartAction(); void ImplStartAction(); - inline void EndAction( const sal_Bool bIdleEnd = sal_False ); - void ImplEndAction( const sal_Bool bIdleEnd = sal_False ); + inline void EndAction( const bool bIdleEnd = false ); + void ImplEndAction( const bool bIdleEnd = false ); sal_uInt16 ActionCount() const { return mnStartAction; } - sal_Bool ActionPend() const { return mnStartAction != 0; } - sal_Bool IsInEndAction() const { return mbInEndAction; } + bool ActionPend() const { return mnStartAction != 0; } + bool IsInEndAction() const { return mbInEndAction; } - void SetEndActionByVirDev( sal_Bool b ) { mbEndActionByVirDev = b; } - sal_Bool IsEndActionByVirDev() { return mbEndActionByVirDev; } + void SetEndActionByVirDev( bool b ) { mbEndActionByVirDev = b; } + bool IsEndActionByVirDev() { return mbEndActionByVirDev; } // The ActionCount for all Shells is temporarily set to zero and then // restored at the RootFrame via UNO. void SetRestoreActions(sal_uInt16 nSet); sal_uInt16 GetRestoreActions() const; - inline sal_Bool HasInvalidRect() const { return maInvalidRect.HasArea(); } + inline bool HasInvalidRect() const { return maInvalidRect.HasArea(); } void ChgHyphenation() { Reformat(); } void ChgNumberDigits(); - sal_Bool AddPaintRect( const SwRect &rRect ); + bool AddPaintRect( const SwRect &rRect ); void InvalidateWindows( const SwRect &rRect ); @@ -249,7 +249,7 @@ public: */ void PaintTile(VirtualDevice &rDevice, int contextWidth, int contextHeight, int tilePosX, int tilePosY, long tileWidth, long tileHeight); - sal_Bool IsPaintInProgress() const { return mbPaintInProgress; } + bool IsPaintInProgress() const { return mbPaintInProgress; } bool IsDrawingLayerPaintInProgress() const { return !mPrePostPaintRegions.empty(); } // Notification that visible area has been changed. @@ -257,8 +257,8 @@ public: // The passed rect is situated on pixel borders // in order to avoid pixel errors when scrolling. virtual void VisPortChgd( const SwRect & ); - sal_Bool SmoothScroll( long lXDiff, long lYDiff, const Rectangle* );//Browser - void EnableSmooth( sal_Bool b ) { mbEnableSmooth = b; } + bool SmoothScroll( long lXDiff, long lYDiff, const Rectangle* );//Browser + void EnableSmooth( bool b ) { mbEnableSmooth = b; } const SwRect& VisArea() const { return maVisArea; } @@ -272,13 +272,13 @@ public: Point GetPagePos( sal_uInt16 nPageNum ) const; sal_uInt16 GetNumPages(); // Ask count of current pages from layout. - sal_Bool IsDummyPage( sal_uInt16 nPageNum ) const; // An empty page? + bool IsDummyPage( sal_uInt16 nPageNum ) const; // An empty page? // Invalidate first visible page for all Shells in ring. void SetFirstVisPageInvalid(); SwRootFrm *GetLayout() const; - sal_Bool IsNewLayout() const; // Has Layout been loaded or created? + bool IsNewLayout() const; // Has Layout been loaded or created? Size GetDocSize() const; // Get document size. @@ -348,7 +348,7 @@ public: inline OutputDevice* GetOut() const { return mpOut; } void SetWin(Window* win) { mpWin = win; } - static inline sal_Bool IsLstEndAction() { return SwViewShell::mbLstAct; } + static inline bool IsLstEndAction() { return SwViewShell::mbLstAct; } // Change of all page descriptors. void ChgAllPageOrientation( sal_uInt16 eOri ); @@ -356,7 +356,7 @@ public: // Printing of one page. // bIsPDFExport == true is: do PDF Export (no printing!) - sal_Bool PrintOrPDFExport( OutputDevice *pOutDev, + bool PrintOrPDFExport( OutputDevice *pOutDev, SwPrintData const& rPrintData, sal_Int32 nRenderer /* offset in vector of pages to print */ ); @@ -375,11 +375,11 @@ public: void CalcPagesForPrint( sal_uInt16 nMax ); // All about fields. - void UpdateFlds(sal_Bool bCloseDB = sal_False); - sal_Bool IsAnyFieldInDoc() const; + void UpdateFlds(bool bCloseDB = false); + bool IsAnyFieldInDoc() const; // Update all charts, for that exists any table. void UpdateAllCharts(); - sal_Bool HasCharts() const; + bool HasCharts() const; // DOCUMENT COMPATIBILITY FLAGS START @@ -423,10 +423,10 @@ public: inline const SwViewOption *GetViewOptions() const { return mpOpt; } virtual void ApplyViewOptions( const SwViewOption &rOpt ); void SetUIOptions( const SwViewOption &rOpt ); - virtual void SetReadonlyOption(sal_Bool bSet); // Set readonly-bit of ViewOptions. - void SetPDFExportOption(sal_Bool bSet); // Set/reset PDF export mode. - void SetPrtFormatOption(sal_Bool bSet); // Set PrtFormat-Bit of ViewOptions. - void SetReadonlySelectionOption(sal_Bool bSet); // Change the selection mode in readonly docs. + virtual void SetReadonlyOption(bool bSet); // Set readonly-bit of ViewOptions. + void SetPDFExportOption(bool bSet); // Set/reset PDF export mode. + void SetPrtFormatOption(bool bSet); // Set PrtFormat-Bit of ViewOptions. + void SetReadonlySelectionOption(bool bSet); // Change the selection mode in readonly docs. const SwAccessibilityOptions* GetAccessibilityOptions() const { return mpAccOptions;} @@ -458,17 +458,17 @@ public: */ void AdjustOptionsForPagePreview( SwPrintData const& rPrintOptions ); - sal_Bool IsViewLocked() const { return mbViewLocked; } - void LockView( sal_Bool b ) { mbViewLocked = b; } + bool IsViewLocked() const { return mbViewLocked; } + void LockView( bool b ) { mbViewLocked = b; } inline void LockPaint(); void ImplLockPaint(); - inline void UnlockPaint( sal_Bool bVirDev = sal_False ); - void ImplUnlockPaint( sal_Bool bVirDev ); - sal_Bool IsPaintLocked() const { return mnLockPaint != 0; } + inline void UnlockPaint( bool bVirDev = false ); + void ImplUnlockPaint( bool bVirDev ); + bool IsPaintLocked() const { return mnLockPaint != 0; } // Get/set DrawView and PageView. - sal_Bool HasDrawView() const; + bool HasDrawView() const; void MakeDrawView(); // DrawView may be used at UI. @@ -482,17 +482,17 @@ public: inline const SfxItemPool& GetAttrPool() const; SfxItemPool& GetAttrPool(); - sal_Bool IsPreview() const { return mbPreview; } + bool IsPreview() const { return mbPreview; } - sal_Bool IsFrameView() const { return mbFrameView; } + bool IsFrameView() const { return mbFrameView; } void SetFrameView( const Size& rBrowseBorder ) - { mbFrameView = sal_True; maBrowseBorder = rBrowseBorder; } + { mbFrameView = true; maBrowseBorder = rBrowseBorder; } // Makes the necessary invalidations: // If BrowseMode has changed bBrowseChgd == sal_True // or bBrowseChgd == sal_False in BrowseMode // if proportions have changed. - void CheckBrowseView( sal_Bool bBrowseChgd ); + void CheckBrowseView( bool bBrowseChgd ); const Size& GetBrowseBorder() const; sal_Int32 GetBrowseWidth() const; @@ -594,7 +594,7 @@ inline void SwViewShell::StartAction() if ( !mnStartAction++ ) ImplStartAction(); } -inline void SwViewShell::EndAction( const sal_Bool bIdleEnd ) +inline void SwViewShell::EndAction( const bool bIdleEnd ) { if( 0 == (mnStartAction - 1) ) ImplEndAction( bIdleEnd ); @@ -606,7 +606,7 @@ inline void SwViewShell::LockPaint() if ( !mnLockPaint++ ) ImplLockPaint(); } -inline void SwViewShell::UnlockPaint( sal_Bool bVirDev ) +inline void SwViewShell::UnlockPaint( bool bVirDev ) { if ( 0 == --mnLockPaint ) ImplUnlockPaint( bVirDev ); |