summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/items/textitem.cxx8
-rw-r--r--include/editeng/crossedoutitem.hxx2
-rw-r--r--include/editeng/postitem.hxx6
-rw-r--r--include/editeng/udlnitem.hxx4
-rw-r--r--include/editeng/wghtitem.hxx4
-rw-r--r--include/svl/cenumitm.hxx2
-rw-r--r--include/svl/eitem.hxx2
-rw-r--r--include/svx/sdooitm.hxx2
-rw-r--r--include/svx/sdtfsitm.hxx10
-rw-r--r--include/svx/sdynitm.hxx2
-rw-r--r--sfx2/source/control/bindings.cxx2
-rw-r--r--svl/source/items/cenumitm.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx9
13 files changed, 30 insertions, 27 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 7e8b813e133e..b3f8208a4180 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -607,7 +607,7 @@ bool SvxPostureItem::GetBoolValue() const
-void SvxPostureItem::SetBoolValue( sal_Bool bVal )
+void SvxPostureItem::SetBoolValue( bool bVal )
{
SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
}
@@ -637,7 +637,7 @@ bool SvxWeightItem::GetBoolValue() const
-void SvxWeightItem::SetBoolValue( sal_Bool bVal )
+void SvxWeightItem::SetBoolValue( bool bVal )
{
SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
}
@@ -1292,7 +1292,7 @@ bool SvxTextLineItem::GetBoolValue() const
-void SvxTextLineItem::SetBoolValue( sal_Bool bVal )
+void SvxTextLineItem::SetBoolValue( bool bVal )
{
SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
}
@@ -1522,7 +1522,7 @@ bool SvxCrossedOutItem::GetBoolValue() const
-void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal )
+void SvxCrossedOutItem::SetBoolValue( bool bVal )
{
SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
}
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 5163653daccf..8019292c90a5 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -59,7 +59,7 @@ public:
virtual bool HasBoolValue() const SAL_OVERRIDE;
virtual bool GetBoolValue() const SAL_OVERRIDE;
- virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE;
+ virtual void SetBoolValue( bool bVal ) SAL_OVERRIDE;
inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
{
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index ae19bb660308..3937371b5ce2 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -49,15 +49,15 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE;
virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
virtual bool HasBoolValue() const SAL_OVERRIDE;
- virtual bool GetBoolValue() const SAL_OVERRIDE;
- virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE;
+ virtual bool GetBoolValue() const SAL_OVERRIDE;
+ virtual void SetBoolValue( bool bVal ) SAL_OVERRIDE;
inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
SetValue( rPost.GetValue() );
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index ebeac9447720..4130333a4a42 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -58,8 +58,8 @@ public:
void SetValue( sal_uInt16 nNewVal )
{SfxEnumItem::SetValue(nNewVal); }
virtual bool HasBoolValue() const SAL_OVERRIDE;
- virtual bool GetBoolValue() const SAL_OVERRIDE;
- virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE;
+ virtual bool GetBoolValue() const SAL_OVERRIDE;
+ virtual void SetBoolValue( bool bVal ) SAL_OVERRIDE;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 0615cbeed02f..17435f3770c9 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -56,8 +56,8 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
virtual bool HasBoolValue() const SAL_OVERRIDE;
- virtual bool GetBoolValue() const SAL_OVERRIDE;
- virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE;
+ virtual bool GetBoolValue() const SAL_OVERRIDE;
+ virtual void SetBoolValue( bool bVal ) SAL_OVERRIDE;
inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
SetValue( rWeight.GetValue() );
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 9c224914ae50..2a8a32d441a2 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -75,7 +75,7 @@ public:
virtual bool GetBoolValue() const;
- virtual void SetBoolValue(sal_Bool bValue);
+ virtual void SetBoolValue(bool bValue);
};
#endif // INCLUDED_SVL_CENUMITM_HXX
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index b27c631eacfc..328216bfa05e 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -113,7 +113,7 @@ public:
virtual sal_uInt16 GetValueCount() const;
- virtual OUString GetValueTextByVal(sal_Bool bTheValue) const;
+ virtual OUString GetValueTextByVal(bool bTheValue) const;
};
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index f22efee95453..0fe0c83e9110 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -37,7 +37,7 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE;
- virtual OUString GetValueTextByVal(sal_Bool bVal) const SAL_OVERRIDE;
+ virtual OUString GetValueTextByVal(bool bVal) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE;
};
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 8a194e07be82..4767e6d8d32a 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -49,17 +49,17 @@ public:
SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE;
- virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; }
+ virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
- virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE;
virtual bool HasBoolValue() const SAL_OVERRIDE;
virtual bool GetBoolValue() const SAL_OVERRIDE;
- virtual void SetBoolValue(sal_Bool bVal) SAL_OVERRIDE;
+ virtual void SetBoolValue(bool bVal) SAL_OVERRIDE;
};
#endif
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index 644af5ec815f..35ad48bd9f12 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -36,7 +36,7 @@ public:
SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE;
- virtual OUString GetValueTextByVal(sal_Bool bVal) const SAL_OVERRIDE;
+ virtual OUString GetValueTextByVal(bool bVal) const SAL_OVERRIDE;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE;
};
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ff309bca02cb..73be886eb76a 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1239,7 +1239,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
((SfxEnumItemInterface *)pNewItem)->HasBoolValue())
{
// and Enums with Bool-Interface
- ((SfxEnumItemInterface*)pNewItem)->SetBoolValue(sal_True);
+ ((SfxEnumItemInterface*)pNewItem)->SetBoolValue(true);
aReq.AppendItem( *pNewItem );
}
else {
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 180d54e6309b..d0213a5ab228 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -109,7 +109,7 @@ bool SfxEnumItemInterface::GetBoolValue() const
}
// virtual
-void SfxEnumItemInterface::SetBoolValue(sal_Bool)
+void SfxEnumItemInterface::SetBoolValue(bool)
{}
SfxEnumItem::SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream)
@@ -228,7 +228,7 @@ sal_uInt16 SfxBoolItem::GetValueCount() const
}
// virtual
-OUString SfxBoolItem::GetValueTextByVal(sal_Bool bTheValue) const
+OUString SfxBoolItem::GetValueTextByVal(bool bTheValue) const
{
return bTheValue ? OUString("TRUE") : OUString("FALSE");
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 6a7b0f7d43d5..a77dcd408cc6 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -767,7 +767,7 @@ SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrOnOffItem(Which(),rIn);
}
-OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const
+OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const
{
if (bVal)
return ImpGetResStr(STR_ItemValON);
@@ -799,7 +799,7 @@ SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrYesNoItem(Which(),rIn);
}
-OUString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const
+OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const
{
if (bVal)
return ImpGetResStr(STR_ItemValYES);
@@ -1084,7 +1084,10 @@ bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; }
bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
-void SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
+void SdrTextFitToSizeTypeItem::SetBoolValue(bool bVal)
+{
+ SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE));
+}
bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
generated by cgit (git 2.34.1) at 2025-01-13 02:16:53 +0000