summaryrefslogtreecommitdiff
path: root/sfx2/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-07 09:15:28 +0200
committerNoel Grandin <noel@peralex.com>2014-04-07 13:53:50 +0200
commit74fdda0cd41d97b6c97d2115584ee48fd552514e (patch)
treefa29308f180abbd7dec4c16f5603604a15fa079e /sfx2/inc
parent1eee88dd6bf2c647aa3458d33a5f45c51c024186 (diff)
sfx2: sal_Bool->bool
Change-Id: I48ae51781f64e60deb0c03352087100729c8c3cd
Diffstat (limited to 'sfx2/inc')
-rw-r--r--sfx2/inc/bitset.hxx46
-rw-r--r--sfx2/inc/guisaveas.hxx12
-rw-r--r--sfx2/inc/idpool.hxx12
-rw-r--r--sfx2/inc/inettbc.hxx2
4 files changed, 36 insertions, 36 deletions
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 071151351f3d..fdc17e14bb40 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -30,7 +30,7 @@ public:
BitSet operator<<( sal_uInt16 nOffset ) const;
BitSet operator>>( sal_uInt16 nOffset ) const;
static sal_uInt16 CountBits( sal_uIntPtr nBits );
- sal_Bool operator!() const;
+ bool operator!() const;
BitSet();
BitSet( const BitSet& rOrig );
~BitSet();
@@ -51,20 +51,20 @@ public:
BitSet operator^( sal_uInt16 nBit ) const;
BitSet& operator^=( const BitSet& rSet );
BitSet& operator^=( sal_uInt16 nBit );
- sal_Bool IsRealSubSet( const BitSet& rSet ) const;
- sal_Bool IsSubSet( const BitSet& rSet ) const;
- sal_Bool IsRealSuperSet( const BitSet& rSet ) const;
- sal_Bool Contains( sal_uInt16 nBit ) const;
- sal_Bool IsSuperSet( const BitSet& rSet ) const;
- sal_Bool operator==( const BitSet& rSet ) const;
- sal_Bool operator==( sal_uInt16 nBit ) const;
- sal_Bool operator!=( const BitSet& rSet ) const;
- sal_Bool operator!=( sal_uInt16 nBit ) const;
+ bool IsRealSubSet( const BitSet& rSet ) const;
+ bool IsSubSet( const BitSet& rSet ) const;
+ bool IsRealSuperSet( const BitSet& rSet ) const;
+ bool Contains( sal_uInt16 nBit ) const;
+ bool IsSuperSet( const BitSet& rSet ) const;
+ bool operator==( const BitSet& rSet ) const;
+ bool operator==( sal_uInt16 nBit ) const;
+ bool operator!=( const BitSet& rSet ) const;
+ bool operator!=( sal_uInt16 nBit ) const;
};
// returns sal_True if the set is empty
-inline sal_Bool BitSet::operator!() const
+inline bool BitSet::operator!() const
{
return nCount == 0;
}
@@ -145,43 +145,43 @@ inline BitSet& BitSet::operator^=( sal_uInt16 )
#endif
// determines if the other bitset is a real superset
-inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
+inline bool BitSet::IsRealSubSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the other bitset is a superset or equal
-inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
+inline bool BitSet::IsSubSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the other bitset is a real subset
-inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const
+inline bool BitSet::IsRealSuperSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the other bitset is a subset or equal
-inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const
+inline bool BitSet::IsSuperSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the bit is the only one in the bitset
-inline sal_Bool BitSet::operator==( sal_uInt16 ) const
+inline bool BitSet::operator==( sal_uInt16 ) const
{
- return sal_False;
+ return false;
}
// determines if the bitsets aren't equal
-inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const
+inline bool BitSet::operator!=( const BitSet& rSet ) const
{
return !( *this == rSet );
}
// determines if the bitset doesn't contain only this bit
-inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const
+inline bool BitSet::operator!=( sal_uInt16 nBit ) const
{
return !( *this == nBit );
}
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 0e9905ef2ec2..60c575405f45 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -57,15 +57,15 @@ private:
public:
SfxStoringHelper();
- sal_Bool GUIStoreModel(
+ bool GUIStoreModel(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel,
const OUString& aSlotName,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence,
- sal_Bool bPreselectPassword,
+ bool bPreselectPassword,
const OUString& aUserSelectedName,
sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES );
- static sal_Bool CheckFilterOptionsAppearence(
+ static bool CheckFilterOptionsAppearence(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
const OUString& aFilterName );
@@ -74,13 +74,13 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>& i_xOldDocInfo,
- sal_Bool bNoModify );
+ bool bNoModify );
- static sal_Bool WarnUnacceptableFormat(
+ static bool WarnUnacceptableFormat(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
const OUString& aOldUIName,
const OUString& aDefUIName,
- sal_Bool bCanProceedFurther );
+ bool bCanProceedFurther );
static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index e2679420721a..89d3077aeabf 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -31,13 +31,13 @@ private:
sal_uInt16 nRange;
sal_uInt16 nOffset;
public:
- sal_Bool Lock( const BitSet& rLockSet );
- sal_Bool IsLocked( sal_uInt16 nId ) const;
+ bool Lock( const BitSet& rLockSet );
+ bool IsLocked( sal_uInt16 nId ) const;
IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX );
sal_uInt16 Get();
- sal_Bool Put( sal_uInt16 nId );
- sal_Bool Lock( const Range& rRange );
- sal_Bool Lock( sal_uInt16 nId );
+ bool Put( sal_uInt16 nId );
+ bool Lock( const Range& rRange );
+ bool Lock( sal_uInt16 nId );
};
@@ -45,7 +45,7 @@ public:
// returns sal_True if the id is locked
-inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const
+inline bool IdPool::IsLocked( sal_uInt16 nId ) const
{
return ( this->Contains(nId-nOffset) );
}
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 9b6b7cca9eeb..a0447b480be4 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -32,7 +32,7 @@ class SfxURLToolBoxControl_Impl : public SfxToolBoxControl
private:
SvtURLBox* GetURLBox() const;
- void OpenURL( const OUString& rName, sal_Bool bNew ) const;
+ void OpenURL( const OUString& rName, bool bNew ) const;
DECL_LINK( OpenHdl, void* );
DECL_LINK( SelectHdl, void* );