summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-11 16:13:28 +0200
committerNoel Grandin <noel@peralex.com>2014-02-12 09:01:11 +0200
commit365d3105c97182def553d7dca4a88a59fce73d08 (patch)
treed47ec70c7b7f18f3ad1d4e75e3dd826d825a2a99
parent68c80b09e8613be0250a1583cd43c196be85715a (diff)
sal_Bool->bool
Change-Id: I3d7d146723900b676e852132e8b99b60122c0b2b
-rw-r--r--sc/inc/global.hxx8
-rw-r--r--sc/source/core/data/global.cxx16
2 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 13e4cdfcea1d..7eb87012d5e4 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -599,12 +599,12 @@ public:
static OUString GetErrorString(sal_uInt16 nErrNumber);
static OUString GetLongErrorString(sal_uInt16 nErrNumber);
- static sal_Bool EETextObjEqual( const EditTextObject* pObj1,
+ static bool EETextObjEqual( const EditTextObject* pObj1,
const EditTextObject* pObj2 );
- static sal_Bool CheckWidthInvalidate( bool& bNumFormatChanged,
+ static bool CheckWidthInvalidate( bool& bNumFormatChanged,
const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs );
- static sal_Bool HasAttrChanged( const SfxItemSet& rNewAttrs,
+ static bool HasAttrChanged( const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs,
const sal_uInt16 nWhich );
@@ -665,7 +665,7 @@ SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pStri
/// a "ReadOnly" formatter for UNO/XML export
static SvNumberFormatter* GetEnglishFormatter();
- static sal_Bool IsSystemRTL(); // depending on system language
+ static bool IsSystemRTL(); // depending on system language
static LanguageType GetEditDefaultLanguage(); // for EditEngine::SetDefaultLanguage
SC_DLLPUBLIC static sal_uInt8 GetDefaultScriptType(); // for all WEAK characters
/** Map ATTR_((CJK|CTL)_)?FONT_... to proper WhichIDs.
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 374c032f1ea9..40bcb0d0065a 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -147,11 +147,11 @@ void global_InitAppOptions();
//
//========================================================================
-sal_Bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
+bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs,
const sal_uInt16 nWhich )
{
- sal_Bool bInvalidate = false;
+ bool bInvalidate = false;
const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich );
const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich );
@@ -177,7 +177,7 @@ sal_Bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
? rNewAttrs.Get( nWhich )
: rNewAttrs.GetPool()->GetDefaultItem( nWhich );
- bInvalidate = sal::static_int_cast<sal_Bool>(rNewItem != rOldItem);
+ bInvalidate = rNewItem != rOldItem;
}
return bInvalidate;
@@ -222,7 +222,7 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter()
//------------------------------------------------------------------------
-sal_Bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged,
+bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged,
const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs )
{
@@ -889,11 +889,11 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico
//------------------------------------------------------------------------
-sal_Bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
+bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
const EditTextObject* pObj2 )
{
if ( pObj1 == pObj2 ) // both empty or the same object
- return sal_True;
+ return true;
if ( pObj1 && pObj2 )
{
@@ -912,7 +912,7 @@ sal_Bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
sal_uLong nSize = aStream1.Tell();
if ( aStream2.Tell() == nSize )
if ( !memcmp( aStream1.GetData(), aStream2.GetData(), (sal_uInt16) nSize ) )
- return sal_True;
+ return true;
}
return false;
@@ -971,7 +971,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget )
//------------------------------------------------------------------------
-sal_Bool ScGlobal::IsSystemRTL()
+bool ScGlobal::IsSystemRTL()
{
return MsLangId::isRightToLeft( Application::GetSettings().GetLanguageTag().getLanguageType() );
}