[Libreoffice-commits] core.git: 10 commits - basic/inc basic/source codemaker/source connectivity/source editeng/source extensions/source forms/source include/basic include/codemaker include/connectivity include/editeng include/svl include/svx sfx2/source starmath/source svl/source svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Fri Apr 4 04:44:51 PDT 2014
basic/inc/sbobjmod.hxx | 2 -
basic/source/classes/sb.cxx | 9 ++----
basic/source/classes/sbxmod.cxx | 6 ++--
basic/source/sbx/sbxobj.cxx | 10 +++----
codemaker/source/cppumaker/cppuoptions.cxx | 4 +-
codemaker/source/cppumaker/cppuoptions.hxx | 2 -
codemaker/source/javamaker/javaoptions.cxx | 4 +-
codemaker/source/javamaker/javaoptions.hxx | 2 -
connectivity/source/commontools/dbtools.cxx | 24 ++++++++---------
editeng/source/editeng/editeng.cxx | 4 +-
editeng/source/editeng/impedit.hxx | 2 -
editeng/source/editeng/impedit5.cxx | 12 ++++----
editeng/source/items/textitem.cxx | 8 ++---
editeng/source/uno/unoedprx.cxx | 5 +--
editeng/source/uno/unofored.cxx | 6 ++--
editeng/source/uno/unoforou.cxx | 14 ++++-----
editeng/source/uno/unotext.cxx | 2 -
extensions/source/dbpilots/controlwizard.cxx | 2 -
extensions/source/propctrlr/formlinkdialog.cxx | 2 -
forms/source/component/DatabaseForm.cxx | 2 -
include/basic/sbstar.hxx | 4 +-
include/basic/sbxobj.hxx | 4 +-
include/codemaker/options.hxx | 2 -
include/connectivity/dbtools.hxx | 6 ++--
include/editeng/crossedoutitem.hxx | 2 -
include/editeng/editeng.hxx | 16 +++++++----
include/editeng/postitem.hxx | 6 ++--
include/editeng/udlnitem.hxx | 4 +-
include/editeng/unoedprx.hxx | 2 -
include/editeng/unoedsrc.hxx | 3 +-
include/editeng/unofored.hxx | 2 -
include/editeng/unoforou.hxx | 2 -
include/editeng/unotext.hxx | 2 -
include/editeng/wghtitem.hxx | 4 +-
include/svl/cenumitm.hxx | 2 -
include/svl/eitem.hxx | 2 -
include/svl/style.hxx | 4 --
include/svl/visitem.hxx | 4 +-
include/svx/sdooitm.hxx | 2 -
include/svx/sdtfsitm.hxx | 10 +++----
include/svx/sdynitm.hxx | 2 -
sfx2/source/control/bindings.cxx | 2 -
starmath/source/accessibility.cxx | 6 ++--
starmath/source/accessibility.hxx | 2 -
svl/source/items/cenumitm.cxx | 4 +-
svl/source/items/style.cxx | 2 -
svl/source/items/visitem.cxx | 2 -
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4 +-
svx/source/svdraw/svdattr.cxx | 9 ++++--
sw/inc/docstyle.hxx | 4 +-
sw/source/core/uibase/app/docstyle.cxx | 2 -
51 files changed, 125 insertions(+), 119 deletions(-)
New commits:
commit 7938279a0d0374f43b4126e26a6432bbb0f7509b
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 13:20:16 2014 +0200
/include/connectivity/dbtools.hxx: sal_Bool->bool
Change-Id: Ie1e1952e3d39d53756583482826dfc3b65b5f9e0
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a08b855..dbecc45 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
}
Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext,
- sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
+ bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
{
SharedConnection xConnection = lcl_connectRowSet( _rxRowSet, _rxContext, _bSetAsActiveConnection, true );
return xConnection.getTyped();
@@ -1235,7 +1235,7 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere
Reference< XSingleSelectQueryComposer > xComposer;
try
{
- Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxContext, sal_True );
+ Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxContext, true );
if ( xConn.is() ) // implies _rxRowSet.is()
{
// build the statement the row set is based on (can't use the ActiveCommand property of the set
@@ -1447,10 +1447,10 @@ void showError(const SQLExceptionInfo& _rInfo,
}
}
-sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
+bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) )
{
- sal_Bool bSuccessfullyReRouted = sal_True;
+ bool bSuccessfullyReRouted = true;
switch (_rValue.getValueTypeClass())
{
case TypeClass_ANY:
@@ -1511,7 +1511,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
if (_rValue.getValueType() == ::getCppuType((const Sequence< sal_Int8 > *)0))
_rxUpdatedObject->updateBytes(_nColumnIndex, *(Sequence<sal_Int8>*)_rValue.getValue());
else
- bSuccessfullyReRouted = sal_False;
+ bSuccessfullyReRouted = false;
break;
case TypeClass_STRUCT:
if (_rValue.getValueType() == ::getCppuType((const DateTime*)0))
@@ -1521,7 +1521,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
else if (_rValue.getValueType() == ::getCppuType((const Time*)0))
_rxUpdatedObject->updateTime(_nColumnIndex, *(Time*)_rValue.getValue());
else
- bSuccessfullyReRouted = sal_False;
+ bSuccessfullyReRouted = false;
break;
case TypeClass_INTERFACE:
@@ -1534,16 +1534,16 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
}
// run through
default:
- bSuccessfullyReRouted = sal_False;
+ bSuccessfullyReRouted = false;
}
return bSuccessfullyReRouted;
}
-sal_Bool implSetObject( const Reference< XParameters >& _rxParameters,
+bool implSetObject( const Reference< XParameters >& _rxParameters,
const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) )
{
- sal_Bool bSuccessfullyReRouted = sal_True;
+ bool bSuccessfullyReRouted = true;
switch (_rValue.getValueTypeClass())
{
case TypeClass_UNSIGNED_HYPER:
@@ -1618,7 +1618,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters,
_rxParameters->setBytes(_nColumnIndex, *(Sequence<sal_Int8>*)_rValue.getValue());
}
else
- bSuccessfullyReRouted = sal_False;
+ bSuccessfullyReRouted = false;
break;
case TypeClass_STRUCT:
if (_rValue.getValueType() == ::getCppuType((const DateTime*)0))
@@ -1628,7 +1628,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters,
else if (_rValue.getValueType() == ::getCppuType((const Time*)0))
_rxParameters->setTime(_nColumnIndex, *(Time*)_rValue.getValue());
else
- bSuccessfullyReRouted = sal_False;
+ bSuccessfullyReRouted = false;
break;
case TypeClass_INTERFACE:
@@ -1641,7 +1641,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters,
}
// run through
default:
- bSuccessfullyReRouted = sal_False;
+ bSuccessfullyReRouted = false;
}
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index a1f70e3..997a070 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -565,7 +565,7 @@ namespace dbp
Reference< XConnection > xConnection;
m_aContext.bEmbedded = ::dbtools::isEmbeddedInDatabase( m_aContext.xForm, xConnection );
if ( !m_aContext.bEmbedded )
- xConnection = ::dbtools::connectRowset( m_aContext.xRowSet, m_xContext, sal_True );
+ xConnection = ::dbtools::connectRowset( m_aContext.xRowSet, m_xContext, true );
// get the fields
if (xConnection.is())
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 470847a..dc608df 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -448,7 +448,7 @@ namespace pcr
_rxConnection.set(_rxFormProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY);
if ( !_rxConnection.is() )
- _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xContext, sal_True );
+ _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xContext, true );
}
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 3e3a3ae..dc22fcb 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2834,7 +2834,7 @@ sal_Bool ODatabaseForm::implEnsureConnection()
Reference< XConnection > xConnection = connectRowset(
Reference<XRowSet> (m_xAggregate, UNO_QUERY),
m_xContext,
- sal_True // set a calculated connection as ActiveConnection
+ true // set a calculated connection as ActiveConnection
);
return xConnection.is();
}
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 2e1a8fa..0f84849 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -148,7 +148,7 @@ namespace dbtools
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext,
- sal_Bool _bSetAsActiveConnection
+ bool _bSetAsActiveConnection
) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException
, ::com::sun::star::lang::WrappedTargetException
, ::com::sun::star::uno::RuntimeException ) );
@@ -557,7 +557,7 @@ namespace dbtools
<TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods
*/
OOO_DLLPUBLIC_DBTOOLS
- sal_Bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject,
+ bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject,
const sal_Int32 _nColumnIndex,
const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) );
@@ -617,7 +617,7 @@ namespace dbtools
<TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods
*/
OOO_DLLPUBLIC_DBTOOLS
- sal_Bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters,
+ bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters,
const sal_Int32 _nColumnIndex,
const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) );
commit a20b62dac893af02cda0972f1c43cbf8377080cf
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 12:50:20 2014 +0200
svl/eitem.hxx: sal_Bool->bool
Change-Id: I45dfd2429a490af3cc80f51340e0c05a91425668
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 7e8b813..b3f8208 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 5163653..8019292 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 ae19bb6..3937371 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 ebeac94..4130333 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 0615cbe..17435f3 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 9c22491..2a8a32d 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 b27c631..328216b 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 f22efee..0fe0c83 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 8a194e0..4767e6d 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 644af5e..35ad48b 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 ff309bc..73be886 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 180d54e..d0213a5 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 6a7b0f7..a77dcd4 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
{
commit 20f14ed4a1c65dfadc1d8cfe0157f4a5f7ba4eb6
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 11:20:05 2014 +0200
codemaker: sal_Bool->bool
Change-Id: I0a0691df58455b712eb27695f4cce15fd3494b65
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index e2584d5..3436a17 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -34,7 +34,7 @@ using ::rtl::OString;
#define SEPARATOR '\\'
#endif
-bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw( IllegalArgument )
{
bool ret = true;
@@ -42,7 +42,7 @@ bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
if (!bCmdFile)
{
- bCmdFile = sal_True;
+ bCmdFile = true;
OString name(av[0]);
sal_Int32 index = name.lastIndexOf(SEPARATOR);
diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx
index 1e9fce0..3ac305e 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -30,7 +30,7 @@ public:
virtual ~CppuOptions() {}
- bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+ bool initOptions(int ac, char* av[], bool bCmdFile=false)
throw( IllegalArgument ) SAL_OVERRIDE;
OString prepareHelp() SAL_OVERRIDE;
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index 66f7c27..e1f2524 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -30,7 +30,7 @@
#define SEPARATOR '\\'
#endif
-bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw( IllegalArgument )
{
bool ret = true;
@@ -38,7 +38,7 @@ bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
if (!bCmdFile)
{
- bCmdFile = sal_True;
+ bCmdFile = true;
OString name(av[0]);
sal_Int32 index = name.lastIndexOf(SEPARATOR);
diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx
index d1536bb..c297f71 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -30,7 +30,7 @@ public:
virtual ~JavaOptions() {}
- bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+ bool initOptions(int ac, char* av[], bool bCmdFile=false)
throw( IllegalArgument ) SAL_OVERRIDE;
OString prepareHelp() SAL_OVERRIDE;
diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx
index b3a4e5c..c158eae 100644
--- a/include/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
@@ -47,7 +47,7 @@ public:
Options();
virtual ~Options();
- virtual bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+ virtual bool initOptions(int ac, char* av[], bool bCmdFile=false)
throw( IllegalArgument ) = 0;
virtual ::rtl::OString prepareHelp() = 0;
commit af8c8f80aa1bd8306e524d0c56fa1bc43136a324
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 10:49:16 2014 +0200
StarBASIC::ErrorHdl sal_Bool->bool
Change-Id: I68cc6c6b63174ff16e5fda00f62172e1eaacbf0d
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c1d9363..f5f247a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1822,10 +1822,9 @@ sal_Int32 StarBASIC::GetErl()
}
}
-sal_Bool StarBASIC::ErrorHdl()
+bool StarBASIC::ErrorHdl()
{
- return (sal_Bool) ( aErrorHdl.IsSet()
- ? aErrorHdl.Call( this ) : sal_False );
+ return aErrorHdl.IsSet() && aErrorHdl.Call( this );
}
Link StarBASIC::GetGlobalErrorHdl()
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index b5f50aa..5078c20 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -79,7 +79,7 @@ private:
virtual bool StoreData( SvStream& ) const SAL_OVERRIDE;
protected:
- virtual sal_Bool ErrorHdl();
+ virtual bool ErrorHdl();
virtual sal_uInt16 BreakHdl();
virtual ~StarBASIC();
commit 2d1eaee66b12fc0fdc7acdd911a63f5b68d5a196
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 10:11:25 2014 +0200
SbxObject::Call sal_Bool->bool
Change-Id: I2e52ddf704679a118fbbc4efebb7cf9fb36f0c34
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 8c5fe1b..c1d9363 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1379,9 +1379,9 @@ SbxVariable* StarBASIC::Find( const OUString& rName, SbxClassType t )
return pRes;
}
-sal_Bool StarBASIC::Call( const OUString& rName, SbxArray* pParam )
+bool StarBASIC::Call( const OUString& rName, SbxArray* pParam )
{
- sal_Bool bRes = SbxObject::Call( rName, pParam );
+ bool bRes = SbxObject::Call( rName, pParam );
if( !bRes )
{
SbxError eErr = SbxBase::GetError();
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 9bf8fc4..6b43ec6 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -297,7 +297,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
// The whole thing recursive, because Call() might be overloaded
// Qualified names are allowed
-sal_Bool SbxObject::Call( const OUString& rName, SbxArray* pParam )
+bool SbxObject::Call( const OUString& rName, SbxArray* pParam )
{
SbxVariable* pMeth = FindQualified( rName, SbxCLASS_DONTCARE);
if( pMeth && pMeth->ISA(SbxMethod) )
@@ -309,10 +309,10 @@ sal_Bool SbxObject::Call( const OUString& rName, SbxArray* pParam )
}
pMeth->Broadcast( SBX_HINT_DATAWANTED );
pMeth->SetParameters( NULL );
- return sal_True;
+ return true;
}
SetError( SbxERR_NO_METHOD );
- return sal_False;
+ return false;
}
SbxProperty* SbxObject::GetDfltProperty()
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 26302a3..b5f50aa 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -122,7 +122,7 @@ public:
static sal_Int32 GetErl();
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
- virtual sal_Bool Call( const OUString&, SbxArray* = NULL ) SAL_OVERRIDE;
+ virtual bool Call( const OUString&, SbxArray* = NULL ) SAL_OVERRIDE;
SbxArray* GetModules() { return pModules; }
SbxObject* GetRtl() { return pRtl; }
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 458b6ca..586af9f 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -63,7 +63,7 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType );
SbxVariable* FindQualified( const OUString&, SbxClassType );
// Quick-Call-Interface for Methods
- virtual sal_Bool Call( const OUString&, SbxArray* = NULL );
+ virtual bool Call( const OUString&, SbxArray* = NULL );
// Execution of DDE-Commands
SbxVariable* Execute( const OUString& );
// Manage elements
commit 88ab8181d95272bea1b15c88fcc127e7be836454
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 09:57:50 2014 +0200
SbxObject::isClass sal_Bool->bool
Change-Id: I71f7b3603df43924d7374969444b929e1eecca4e
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index b5b422d..66ddc42 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -95,7 +95,7 @@ public:
SbUserFormModuleInstance( SbUserFormModule* pParentModule, const OUString& rName,
const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
- virtual sal_Bool IsClass( const OUString& ) const SAL_OVERRIDE;
+ virtual bool IsClass( const OUString& ) const SAL_OVERRIDE;
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE;
};
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 6f6c644..2742603 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2594,10 +2594,10 @@ SbUserFormModuleInstance::SbUserFormModuleInstance( SbUserFormModule* pParentMod
{
}
-sal_Bool SbUserFormModuleInstance::IsClass( const OUString& rName ) const
+bool SbUserFormModuleInstance::IsClass( const OUString& rName ) const
{
- sal_Bool bParentNameMatches = m_pParentModule->GetName().equalsIgnoreAsciiCase( rName );
- sal_Bool bRet = bParentNameMatches || SbxObject::IsClass( rName );
+ bool bParentNameMatches = m_pParentModule->GetName().equalsIgnoreAsciiCase( rName );
+ bool bRet = bParentNameMatches || SbxObject::IsClass( rName );
return bRet;
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index e2fd6f2..9bf8fc4 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -172,9 +172,9 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
}
}
-sal_Bool SbxObject::IsClass( const OUString& rName ) const
+bool SbxObject::IsClass( const OUString& rName ) const
{
- return sal_Bool( aClassName.equalsIgnoreAsciiCase( rName ) );
+ return aClassName.equalsIgnoreAsciiCase( rName );
}
SbxVariable* SbxObject::FindUserData( sal_uInt32 nData )
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index dbc9b7a..458b6ca 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -52,7 +52,7 @@ public:
virtual SbxClassType GetClass() const SAL_OVERRIDE;
virtual void Clear() SAL_OVERRIDE;
- virtual sal_Bool IsClass( const OUString& ) const;
+ virtual bool IsClass( const OUString& ) const;
const OUString& GetClassName() const { return aClassName; }
void SetClassName( const OUString &rNew ) { aClassName = rNew; }
// Default-Property
commit 214751e3cc5b154d90963f4abf0a9317733b001b
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 4 08:45:26 2014 +0200
cleanup up the EditEngine::GetAttribs call
It was using a bool parameter, but passing various constants
through it.
Make the constants into an enum, and use the enum in the GetAttribs
call.
Change-Id: I3010397dfe83b24db3946b9dea2fb37f4393abdd
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3041378..f1961ec 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1725,11 +1725,11 @@ void EditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLs
pImpEditEngine->GetCharAttribs( nPara, rLst );
}
-SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib )
+SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib )
{
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
- return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
+ return pImpEditEngine->GetAttribs( aSel, nOnlyHardAttrib );
}
SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags ) const
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 93be9b5..5be3947 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -798,7 +798,7 @@ public:
sal_uInt32 GetParaHeight( sal_Int32 nParagraph );
SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
- SfxItemSet GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib = sal_False );
+ SfxItemSet GetAttribs( EditSelection aSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All );
void SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0 );
void RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 );
void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False );
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 447ea23..37996a4 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -303,7 +303,7 @@ sal_Bool ImpEditEngine::Redo( EditView* pView )
return sal_False;
}
-SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib )
+SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnlyHardAttrib )
{
aSel.Adjust( aEditDoc );
@@ -330,14 +330,14 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
// First the very hard formatting ...
aEditDoc.FindAttribs( pNode, nStartPos, nEndPos, aCurSet );
- if( bOnlyHardAttrib != EditEngineAttribs_OnlyHard )
+ if( nOnlyHardAttrib != EditEngineAttribs_OnlyHard )
{
// and then paragraph formatting and template...
for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
{
if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
{
- if ( bOnlyHardAttrib == EditEngineAttribs_All )
+ if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
const SfxPoolItem& rItem = pNode->GetContentAttribs().GetItem( nWhich );
aCurSet.Put( rItem );
@@ -351,7 +351,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON )
{
const SfxPoolItem* pItem = NULL;
- if ( bOnlyHardAttrib == EditEngineAttribs_All )
+ if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
pItem = &pNode->GetContentAttribs().GetItem( nWhich );
}
@@ -359,7 +359,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
{
pItem = &pNode->GetContentAttribs().GetItems().Get( nWhich );
}
- // pItem can only be NULL when bOnlyHardAttrib...
+ // pItem can only be NULL when nOnlyHardAttrib...
if ( !pItem || ( *pItem != aCurSet.Get( nWhich ) ) )
{
// Problem: When Paragraph style with for example font,
@@ -377,7 +377,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
}
// fill empty slots with defaults ...
- if ( bOnlyHardAttrib == EditEngineAttribs_All )
+ if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ )
{
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index aa49d90e..1a2a13d 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -524,7 +524,7 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
return sStr;
}
-SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -534,8 +534,7 @@ SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Boo
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- return mpTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex),
- bOnlyHardAttrib );
+ return mpTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex), nOnlyHardAttrib );
}
SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( sal_Int32 nPara ) const
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index d395baa..f667432 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -61,12 +61,12 @@ OUString SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
return convertLineEnd(rEditEngine.GetText(rSel, LINEEND_LF), GetSystemLineEnd());
}
-SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
if( rSel.nStartPara == rSel.nEndPara )
{
sal_uInt8 nFlags = 0;
- switch( bOnlyHardAttrib )
+ switch( nOnlyHardAttrib )
{
case EditEngineAttribs_All:
nFlags = GETATTRIBS_ALL;
@@ -85,7 +85,7 @@ SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, sal_Bool
}
else
{
- return rEditEngine.GetAttribs( rSel, bOnlyHardAttrib );
+ return rEditEngine.GetAttribs( rSel, nOnlyHardAttrib );
}
}
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index e6204f4..5d7d8f3 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -71,13 +71,13 @@ OUString SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
return pEditEngine->GetText( rSel, LINEEND_LF );
}
-static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib, EditEngine& rEditEngine )
+static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib, EditEngine& rEditEngine )
{
if( rSel.nStartPara == rSel.nEndPara )
{
sal_uInt8 nFlags = 0;
- switch( bOnlyHardAttrib )
+ switch( nOnlyHardAttrib )
{
case EditEngineAttribs_All:
nFlags = GETATTRIBS_ALL;
@@ -95,13 +95,13 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, sal_B
}
else
{
- return rEditEngine.GetAttribs( rSel, bOnlyHardAttrib );
+ return rEditEngine.GetAttribs( rSel, nOnlyHardAttrib );
}
}
-SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
- if( mpAttribsCache && ( 0 == bOnlyHardAttrib ) )
+ if( mpAttribsCache && ( EditEngineAttribs_All == nOnlyHardAttrib ) )
{
// have we the correct set in cache?
if( ((SvxOutlinerForwarder*)this)->maAttribCacheSelection.IsEqual(rSel) )
@@ -121,9 +121,9 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, sal_Bool bO
//! and why is the GetAttribs on the EditEngine not a const?
EditEngine& rEditEngine = (EditEngine&)rOutliner.GetEditEngine();
- SfxItemSet aSet( ImplOutlinerForwarderGetAttribs( rSel, bOnlyHardAttrib, rEditEngine ) );
+ SfxItemSet aSet( ImplOutlinerForwarderGetAttribs( rSel, nOnlyHardAttrib, rEditEngine ) );
- if( 0 == bOnlyHardAttrib )
+ if( EditEngineAttribs_All == nOnlyHardAttrib )
{
mpAttribsCache = new SfxItemSet( aSet );
maAttribCacheSelection = rSel;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index e210756..9c46bfb 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2433,7 +2433,7 @@ OUString SvxDummyTextSource::GetText( const ESelection& ) const
return OUString();
}
-SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, sal_Bool ) const
+SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, EditEngineAttribs ) const
{
// Very dangerous: The former implementation used a SfxItemPool created on the
// fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 128fdf5..bb5efa3 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -109,12 +109,18 @@ class ParaPortionList;
-/** values for GetAttribs
+/** values for:
+ SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All );
*/
-const sal_uInt8 EditEngineAttribs_All = 0; /// returns all attributes even when theire not set
-const sal_uInt8 EditEngineAttribs_HardAndPara = 1; /// returns all attributes set on paragraph and on portions
-const sal_uInt8 EditEngineAttribs_OnlyHard = 2; /// returns only attributes hard set on portions
+enum EditEngineAttribs {
+ EditEngineAttribs_All, /// returns all attributes even when theire not set
+ EditEngineAttribs_HardAndPara, /// returns all attributes set on paragraph and on portions
+ EditEngineAttribs_OnlyHard /// returns only attributes hard set on portions
+};
+/** values for:
+ SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+*/
#define GETATTRIBS_STYLESHEET (sal_uInt8)0x01
#define GETATTRIBS_PARAATTRIBS (sal_uInt8)0x02
#define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04
@@ -297,7 +303,7 @@ public:
void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const;
SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
- SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = sal_False );
+ SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All );
bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
const SfxPoolItem& GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich );
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index 34ca35f..1bc9ebc 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -36,7 +36,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index d12372c..aed5ee6 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -30,6 +30,7 @@
#include <svl/poolitem.hxx>
#include <svl/itempool.hxx>
#include <editeng/editengdllapi.h>
+#include <editeng/editeng.hxx>
#include <list>
@@ -141,7 +142,7 @@ public:
virtual sal_Int32 GetParagraphCount() const = 0;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const = 0;
virtual OUString GetText( const ESelection& rSel ) const = 0;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const = 0;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const = 0;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0;
diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx
index 5ea61a7..a07a784 100644
--- a/include/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
@@ -38,7 +38,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 22d89a1..7840909 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -56,7 +56,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 3250ec33..5c4eed6 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -177,7 +177,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 4288e4e..0e76d68 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -996,14 +996,14 @@ OUString SmTextForwarder::GetText( const ESelection& rSel ) const
return convertLineEnd(aRet, GetSystemLineEnd());
}
-SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
OSL_ENSURE( pEditEngine, "EditEngine missing" );
if( rSel.nStartPara == rSel.nEndPara )
{
sal_uInt8 nFlags = 0;
- switch( bOnlyHardAttrib )
+ switch( nOnlyHardAttrib )
{
case EditEngineAttribs_All:
nFlags = GETATTRIBS_ALL;
@@ -1022,7 +1022,7 @@ SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHa
}
else
{
- return pEditEngine->GetAttribs( rSel, bOnlyHardAttrib );
+ return pEditEngine->GetAttribs( rSel, nOnlyHardAttrib );
}
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 97e281b..fdcc40d 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -204,7 +204,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 1f5784e..a8b03dc 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -97,8 +97,8 @@ namespace accessibility
// SvxTextForwarder
sal_Int32 GetParagraphCount() const SAL_OVERRIDE { return 1; }
sal_Int32 GetTextLen( sal_Int32 /*nParagraph*/ ) const SAL_OVERRIDE { return 0; }
- OUString GetText( const ESelection& /*rSel*/ ) const SAL_OVERRIDE { return OUString(); }
- SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const SAL_OVERRIDE
+ OUString GetText( const ESelection& /*rSel*/ ) const SAL_OVERRIDE { return OUString(); }
+ SfxItemSet GetAttribs( const ESelection& /*rSel*/, EditEngineAttribs /*nOnlyHardAttrib*/ = EditEngineAttribs_All ) const SAL_OVERRIDE
{
// AW: Very dangerous: The former implementation used a SfxItemPool created on the
// fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
commit 6f349af57ebd6d160b6354c2033c46467da4598a
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 3 16:03:03 2014 +0200
remove unnecessary virtual in SfxVisibilityItem
Change-Id: Ie27ce4f3a509e0e2a4073638e745bd5166cc3c81
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index dbccd50..c4f501e 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -69,9 +69,9 @@ public:
virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
- virtual sal_uInt16 GetValueCount() const;
+ sal_uInt16 GetValueCount() const;
- virtual OUString GetValueTextByVal(bool bTheValue) const;
+ OUString GetValueTextByVal(bool bTheValue) const;
bool GetValue() const { return m_nValue.bVisible; }
commit 749fa381364c708f817ab57f6639c4f80fa9ff2b
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 3 15:52:54 2014 +0200
svl/visitem: sal_Bool->bool
Change-Id: I3d6ceb4dc8cea901a5b1cdcf00efa9074c75cca0
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 8f5088e..dbccd50 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -71,7 +71,7 @@ public:
virtual sal_uInt16 GetValueCount() const;
- virtual OUString GetValueTextByVal(sal_Bool bTheValue) const;
+ virtual OUString GetValueTextByVal(bool bTheValue) const;
bool GetValue() const { return m_nValue.bVisible; }
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index c1bf1f6..6e96def 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -101,7 +101,7 @@ sal_uInt16 SfxVisibilityItem::GetValueCount() const
}
// virtual
-OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
+OUString SfxVisibilityItem::GetValueTextByVal(bool bTheValue) const
{
return bTheValue ? OUString("TRUE") : OUString("FALSE");
}
commit 3d747045a834e5355df27b7879292abf50e2ca0e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 3 15:40:33 2014 +0200
svl/style.hxx: sal_Bool->bool
looks like I missed a couple of methods in my earlier conversion
Change-Id: I07871a451bb5954feab57de0af4f7d0678f9a7b3
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 5d2174f..493ba24 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -136,7 +136,7 @@ public:
{ return ( nMask & SFXSTYLEBIT_USERDEF) != 0; }
virtual bool IsHidden() const { return bHidden; }
- virtual void SetHidden( sal_Bool bValue );
+ virtual void SetHidden( bool bValue );
virtual sal_uLong GetHelpId( OUString& rFile );
virtual void SetHelpId( const OUString& r, sal_uLong nId );
@@ -316,8 +316,6 @@ protected:
public:
SfxStyleSheetPool( SfxItemPool const& );
-
-// virtual sal_Bool CopyTo(SfxStyleSheetPool &rDest, const String &rSourceName);
};
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index b97007a..5d26a0f 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -238,7 +238,7 @@ bool SfxStyleSheetBase::SetParent( const OUString& rName )
return true;
}
-void SfxStyleSheetBase::SetHidden( sal_Bool hidden )
+void SfxStyleSheetBase::SetHidden( bool hidden )
{
bHidden = hidden;
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index e90ff28..881cf43 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -98,8 +98,8 @@ public:
sal_Bool IsPhysical() const { return bPhysical; }
void SetPhysical(sal_Bool bPhys);
- virtual void SetHidden( sal_Bool bHidden ) SAL_OVERRIDE;
- virtual bool IsHidden( ) const SAL_OVERRIDE;
+ virtual void SetHidden( bool bHidden ) SAL_OVERRIDE;
+ virtual bool IsHidden( ) const SAL_OVERRIDE;
void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
index ca86a8c..fb91ee4 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -509,7 +509,7 @@ void SwDocStyleSheet::GetGrabBagItem(uno::Any& rVal) const
}
}
// virtual methods
-void SwDocStyleSheet::SetHidden( sal_Bool bValue )
+void SwDocStyleSheet::SetHidden( bool bValue )
{
bool bChg = false;
if(!bPhysical)
More information about the Libreoffice-commits
mailing list