summaryrefslogtreecommitdiff
path: root/sfx2/source/bastyp
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/source/bastyp
parent1eee88dd6bf2c647aa3458d33a5f45c51c024186 (diff)
sfx2: sal_Bool->bool
Change-Id: I48ae51781f64e60deb0c03352087100729c8c3cd
Diffstat (limited to 'sfx2/source/bastyp')
-rw-r--r--sfx2/source/bastyp/bitset.cxx12
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx10
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx18
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx2
-rw-r--r--sfx2/source/bastyp/helper.cxx2
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx10
6 files changed, 27 insertions, 27 deletions
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 45f6894d0738..1cc36a78cdf2 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -256,13 +256,13 @@ BitSet& BitSet::operator|=( sal_uInt16 nBit )
// determines if the bit is set (may be the only one)
-sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
+bool BitSet::Contains( sal_uInt16 nBit ) const
{
sal_uInt16 nBlock = nBit / 32;
sal_uIntPtr nBitVal = 1L << (nBit % 32);
if ( nBlock >= nBlocks )
- return sal_False;
+ return false;
return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal;
}
@@ -270,17 +270,17 @@ sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
// determines if the bitsets are equal
-sal_Bool BitSet::operator==( const BitSet& rSet ) const
+bool BitSet::operator==( const BitSet& rSet ) const
{
if ( nBlocks != rSet.nBlocks )
- return sal_False;
+ return false;
sal_uInt16 nBlock = nBlocks;
while ( nBlock-- > 0 )
if ( *(pBitmap+nBlock) != *(rSet.pBitmap+nBlock) )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 7f810df8c85d..ce63b91d5e8d 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -116,7 +116,7 @@ namespace
}
static SfxFilterList_Impl* pFilterArr = 0;
-static sal_Bool bFirstRead = sal_True;
+static bool bFirstRead = true;
static void CreateFilterArr()
{
@@ -565,7 +565,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
const SfxFilter* pFilter = pOldFilter;
- sal_Bool bPreview = rMedium.IsPreview_Impl();
+ bool bPreview = rMedium.IsPreview_Impl();
SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false);
if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) )
return ERRCODE_ABORT;
@@ -602,14 +602,14 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
}
}
- sal_Bool bHidden = bPreview;
+ bool bHidden = bPreview;
SFX_ITEMSET_ARG( rMedium.GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false);
if ( !bHidden && pFlags )
{
OUString aFlags( pFlags->GetValue() );
aFlags = aFlags.toAsciiUpperCase();
if( -1 != aFlags.indexOf( 'H' ) )
- bHidden = sal_True;
+ bHidden = true;
}
*ppFilter = pFilter;
@@ -1130,7 +1130,7 @@ void SfxFilterContainer::ReadFilters_Impl( bool bUpdate )
if ( !pFilterArr )
CreateFilterArr();
- bFirstRead = sal_False;
+ bFirstRead = false;
SfxFilterList_Impl& rList = *pFilterArr;
try
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index f9541d4006f5..c667f1948492 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -57,7 +57,7 @@ void SfxFrameHTMLParser::ParseFrameOptions(
// Netscape does however not allow for a direct
// seting to 0, while IE4.0 does
// We will not mimic that bug !
- sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False;
+ bool bMarginWidth = false, bMarginHeight = false;
for (size_t i = 0, n = rOptions.size(); i < n; ++i)
{
@@ -84,14 +84,14 @@ void SfxFrameHTMLParser::ParseFrameOptions(
if( !bMarginHeight )
aMargin.Height() = 0;
- bMarginWidth = sal_True;
+ bMarginWidth = true;
break;
case HTML_O_MARGINHEIGHT:
aMargin.Height() = aOption.GetNumber();
if( !bMarginWidth )
aMargin.Width() = 0;
- bMarginHeight = sal_True;
+ bMarginHeight = true;
break;
case HTML_O_SCROLLING:
pFrame->SetScrollingMode(
@@ -101,10 +101,10 @@ void SfxFrameHTMLParser::ParseFrameOptions(
case HTML_O_FRAMEBORDER:
{
OUString aStr = aOption.GetString();
- sal_Bool bBorder = sal_True;
+ bool bBorder = true;
if ( aStr.equalsIgnoreAsciiCase("NO") ||
aStr.equalsIgnoreAsciiCase("0") )
- bBorder = sal_False;
+ bBorder = false;
pFrame->SetFrameBorder( bBorder );
break;
}
@@ -115,17 +115,17 @@ void SfxFrameHTMLParser::ParseFrameOptions(
if (aOption.GetTokenString().equalsIgnoreAsciiCase(HTML_O_READONLY))
{
OUString aStr = aOption.GetString();
- sal_Bool bReadonly = sal_True;
+ bool bReadonly = true;
if ( aStr.equalsIgnoreAsciiCase("FALSE") )
- bReadonly = sal_False;
+ bReadonly = false;
pFrame->SetReadOnly( bReadonly );
}
else if (aOption.GetTokenString().equalsIgnoreAsciiCase(HTML_O_EDIT))
{
OUString aStr = aOption.GetString();
- sal_Bool bEdit = sal_True;
+ bool bEdit = true;
if ( aStr.equalsIgnoreAsciiCase("FALSE") )
- bEdit = sal_False;
+ bEdit = false;
pFrame->SetEditable( bEdit );
}
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index fd51807079ca..1ef646d1322c 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -287,7 +287,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
.append('=').append(nVal);
}
- sal_Bool bVal = sal_True;
+ bool bVal = true;
aAny = xSet->getPropertyValue("FrameIsAutoScroll");
if ( (aAny >>= bVal) && !bVal )
{
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 00f98dac008e..e00e6cb266d5 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -164,7 +164,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin
while ( xResultSet->next() )
{
OUString aTitle( xRow->getString(1) );
- sal_Bool bFolder = xRow->getBoolean(2);
+ bool bFolder = xRow->getBoolean(2);
OUString aRow = aTitle;
aRow += "\t";
aRow += xContentAccess->queryContentIdentifierString();
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 174456ce4727..6f1c82526a44 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -119,7 +119,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase
sal_uInt16 nShape = IMAP_OBJ_RECTANGLE;
std::vector<sal_uInt32> aCoords;
OUString aName, aHRef, aAlt, aTarget, sEmpty;
- sal_Bool bNoHRef = sal_False;
+ bool bNoHRef = false;
SvxMacroTableDtor aMacroTbl;
for (size_t i = rOptions.size(); i; )
@@ -142,7 +142,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase
aHRef = INetURLObject::GetAbsURL( rBaseURL, rOption.GetString() );
break;
case HTML_O_NOHREF:
- bNoHRef = sal_True;
+ bNoHRef = true;
break;
case HTML_O_ALT:
aAlt = rOption.GetString();
@@ -181,7 +181,7 @@ IMAPOBJ_SETEVENT:
if( bNoHRef )
aHRef = "";
- sal_Bool bNewArea = sal_True;
+ bool bNewArea = true;
switch( nShape )
{
case IMAP_OBJ_RECTANGLE:
@@ -222,7 +222,7 @@ IMAPOBJ_SETEVENT:
}
break;
default:
- bNewArea = sal_False;
+ bNewArea = false;
}
return bNewArea;
@@ -270,7 +270,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
if( pHTTPHeader )
{
SvKeyValue aKV;
- for( sal_Bool bCont = pHTTPHeader->GetFirst( aKV ); bCont;
+ for( bool bCont = pHTTPHeader->GetFirst( aKV ); bCont;
bCont = pHTTPHeader->GetNext( aKV ) )
{
if( aKV.GetKey().equalsIgnoreAsciiCase(