[Libreoffice-commits] .: 22 commits - chart2/source codemaker/source comphelper/inc comphelper/source hwpfilter/source i18nutil/inc i18nutil/source jvmfwk/source lingucomponent/source padmin/source rdbmaker/inc rdbmaker/source regexp/inc registry/source sc/inc scripting/source sc/source sd/inc sd/source svl/inc svl/source sw/inc sw/source testtools/source xmlhelp/source xmlsecurity/inc xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 4 12:32:12 PDT 2012
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 6
chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 4
chart2/source/view/axes/VAxisProperties.cxx | 6
chart2/source/view/axes/VAxisProperties.hxx | 10 -
codemaker/source/cppumaker/cpputype.cxx | 14 -
codemaker/source/cppumaker/cpputype.hxx | 8
comphelper/inc/comphelper/propagg.hxx | 12 -
comphelper/source/container/embeddedobjectcontainer.cxx | 10 -
comphelper/source/property/propagg.cxx | 4
hwpfilter/source/hwpreader.cxx | 84 ++++-----
i18nutil/inc/i18nutil/oneToOneMapping.hxx | 2
i18nutil/source/utility/oneToOneMapping.cxx | 4
jvmfwk/source/elements.cxx | 4
jvmfwk/source/elements.hxx | 4
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 4
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx | 4
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 2
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 4
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 4
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 4
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 4
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 2
padmin/source/progress.cxx | 6
padmin/source/progress.hxx | 4
rdbmaker/inc/codemaker/registry.hxx | 6
rdbmaker/inc/codemaker/typemanager.hxx | 4
rdbmaker/source/codemaker/typemanager.cxx | 4
rdbmaker/source/rdbmaker/rdboptions.cxx | 2
rdbmaker/source/rdbmaker/rdboptions.hxx | 6
rdbmaker/source/rdbmaker/specialtypemanager.cxx | 2
regexp/inc/regexp/reclass.hxx | 2
registry/source/reflread.cxx | 6
registry/source/regimpl.hxx | 8
sc/inc/stlsheet.hxx | 10 -
sc/source/core/data/stlsheet.cxx | 18 +-
scripting/source/basprov/basmethnode.cxx | 2
scripting/source/basprov/basmethnode.hxx | 2
scripting/source/vbaevents/eventhelper.cxx | 6
sd/inc/stlsheet.hxx | 12 -
sd/source/core/stlsheet.cxx | 28 +--
svl/inc/svl/hint.hxx | 8
svl/inc/svl/srchitem.hxx | 90 +++++-----
svl/inc/svl/style.hxx | 45 ++---
svl/inc/svl/svdde.hxx | 4
svl/source/items/srchitem.cxx | 14 -
svl/source/items/style.cxx | 57 +++---
svl/source/svdde/ddecli.cxx | 6
sw/inc/docstyle.hxx | 16 -
sw/source/ui/app/docstyle.cxx | 64 +++----
testtools/source/bridgetest/cppobj.cxx | 10 -
xmlhelp/source/cxxhelp/provider/databases.hxx | 2
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 4
xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 2
xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 4
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 4
xmlsecurity/source/dialogs/certificatechooser.cxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 4
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
59 files changed, 331 insertions(+), 339 deletions(-)
New commits:
commit 4338d2f80ac68c6b55a9006254151f370bb8c6ab
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 26 14:19:01 2012 +0200
sal_Bool->bool in svl::DdeTransaction
Change-Id: I97dd4411b5293b8f61527505e54608442eb18cca
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 0d8bc21..785c1f4 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -100,14 +100,14 @@ protected:
long nTime;
Link aData;
Link aDone;
- sal_Bool bBusy;
+ bool bBusy;
DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER long = 0 );
public:
virtual ~DdeTransaction();
- sal_Bool IsBusy() { return bBusy; }
+ bool IsBusy() { return bBusy; }
const rtl::OUString GetName() const;
void Execute();
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 368ef13..007fb36 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -85,7 +85,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback(
if( (DWORD)(*iter)->nId == nInfo1 )
{
nCode = (*iter)->nType & (XCLASS_MASK | XTYP_MASK);
- (*iter)->bBusy = sal_False;
+ (*iter)->bBusy = false;
(*iter)->Done( 0 != hData );
bFound = sal_True;
}
@@ -266,7 +266,7 @@ DdeTransaction::DdeTransaction( DdeConnection& d, const String& rItemName,
nTime = n;
nId = 0;
nType = 0;
- bBusy = sal_False;
+ bBusy = false;
rDde.aTransactions.push_back( this );
}
@@ -329,7 +329,7 @@ void DdeTransaction::Execute()
if ( nId && rDde.pImp->hConv )
DdeAbandonTransaction( pInst->hDdeInstCli, rDde.pImp->hConv, nId);
nId = 0;
- bBusy = sal_True;
+ bBusy = true;
HDDEDATA hRet = DdeClientTransaction( (unsigned char*)pData, nData,
rDde.pImp->hConv, hItem, nExtFmt,
(UINT)nType, TIMEOUT_ASYNC,
commit c29633988bc1877c5f6e2a89be4840c70afde418
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 26 16:05:01 2012 +0200
sal_Bool->bool in svl::SfxStyleSheetBase
Change-Id: Id506fa56d07be56d63715703e354625715275933
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index 2e5c130..c66d536 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -51,17 +51,17 @@ public:
ScStyleSheet( const ScStyleSheet& rStyle );
- virtual sal_Bool SetParent ( const String& rParentName );
+ virtual bool SetParent ( const String& rParentName );
virtual SfxItemSet& GetItemSet ();
- virtual sal_Bool IsUsed () const;
- virtual sal_Bool HasFollowSupport () const;
- virtual sal_Bool HasParentSupport () const;
+ virtual bool IsUsed () const;
+ virtual bool HasFollowSupport () const;
+ virtual bool HasParentSupport () const;
virtual const String& GetName() const;
virtual const String& GetParent() const;
virtual const String& GetFollow() const;
- virtual sal_Bool SetName( const String& );
+ virtual bool SetName( const String& );
void SetUsage( ScStyleSheet::Usage eUse ) const
{ eUsage = eUse; }
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 0b5fd72..abb8c3d 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -85,20 +85,20 @@ ScStyleSheet::~ScStyleSheet()
//------------------------------------------------------------------------
-sal_Bool ScStyleSheet::HasFollowSupport() const
+bool ScStyleSheet::HasFollowSupport() const
{
return false;
}
//------------------------------------------------------------------------
-sal_Bool ScStyleSheet::HasParentSupport () const
+bool ScStyleSheet::HasParentSupport () const
{
- sal_Bool bHasParentSupport = false;
+ bool bHasParentSupport = false;
switch ( GetFamily() )
{
- case SFX_STYLE_FAMILY_PARA: bHasParentSupport = sal_True; break;
+ case SFX_STYLE_FAMILY_PARA: bHasParentSupport = true; break;
case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = false; break;
default:
{
@@ -111,9 +111,9 @@ sal_Bool ScStyleSheet::HasParentSupport () const
//------------------------------------------------------------------------
-sal_Bool ScStyleSheet::SetParent( const String& rParentName )
+bool ScStyleSheet::SetParent( const String& rParentName )
{
- sal_Bool bResult = false;
+ bool bResult = false;
String aEffName = rParentName;
SfxStyleSheetBase* pStyle = pPool->Find( aEffName, nFamily );
if (!pStyle)
@@ -263,7 +263,7 @@ SfxItemSet& ScStyleSheet::GetItemSet()
//------------------------------------------------------------------------
-sal_Bool ScStyleSheet::IsUsed() const
+bool ScStyleSheet::IsUsed() const
{
if ( GetFamily() == SFX_STYLE_FAMILY_PARA )
{
@@ -277,7 +277,7 @@ sal_Bool ScStyleSheet::IsUsed() const
return eUsage == USED;
}
else
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -332,7 +332,7 @@ const String& ScStyleSheet::GetFollow() const
//! Flag gesetzt und abgefragt werden.
//! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt.
-sal_Bool ScStyleSheet::SetName( const String& rNew )
+bool ScStyleSheet::SetName( const String& rNew )
{
String aFileStdName = rtl::OUString(STRING_STANDARD);
if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 364df81..191bcf9 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -54,13 +54,13 @@ public:
SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask );
SdStyleSheet( const SdStyleSheet& );
- virtual sal_Bool SetParent (const String& rParentName);
+ virtual bool SetParent (const String& rParentName);
virtual SfxItemSet& GetItemSet();
- virtual sal_Bool IsUsed() const;
- virtual sal_Bool HasFollowSupport() const;
- virtual sal_Bool HasParentSupport() const;
- virtual sal_Bool HasClearParentSupport() const;
- virtual sal_Bool SetName( const UniString& );
+ virtual bool IsUsed() const;
+ virtual bool HasFollowSupport() const;
+ virtual bool HasParentSupport() const;
+ virtual bool HasClearParentSupport() const;
+ virtual bool SetName( const UniString& );
virtual void SetHelpId( const String& r, sal_uLong nId );
void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True);
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 4bedcc0..5c56cfb 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -197,9 +197,9 @@ void SdStyleSheet::Store(SvStream& rOut)
|*
\************************************************************************/
-sal_Bool SdStyleSheet::SetParent(const String& rParentName)
+bool SdStyleSheet::SetParent(const String& rParentName)
{
- sal_Bool bResult = sal_False;
+ bool bResult = sal_False;
if (SfxStyleSheet::SetParent(rParentName))
{
@@ -211,7 +211,7 @@ sal_Bool SdStyleSheet::SetParent(const String& rParentName)
SfxStyleSheetBase* pStyle = pPool->Find(rParentName, nFamily);
if (pStyle)
{
- bResult = sal_True;
+ bResult = true;
SfxItemSet& rParentSet = pStyle->GetItemSet();
GetItemSet().SetParent(&rParentSet);
Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
@@ -219,14 +219,14 @@ sal_Bool SdStyleSheet::SetParent(const String& rParentName)
}
else
{
- bResult = sal_True;
+ bResult = true;
GetItemSet().SetParent(NULL);
Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
}
}
else
{
- bResult = sal_True;
+ bResult = true;
}
}
return bResult;
@@ -342,9 +342,9 @@ SfxItemSet& SdStyleSheet::GetItemSet()
|*
\************************************************************************/
-sal_Bool SdStyleSheet::IsUsed() const
+bool SdStyleSheet::IsUsed() const
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
sal_uInt16 nListenerCount = GetListenerCount();
if (nListenerCount > 0)
@@ -636,28 +636,28 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingIte
// --------------------------------------------------------------------
-sal_Bool SdStyleSheet::HasFollowSupport() const
+bool SdStyleSheet::HasFollowSupport() const
{
- return sal_False;
+ return false;
}
// --------------------------------------------------------------------
-sal_Bool SdStyleSheet::HasParentSupport() const
+bool SdStyleSheet::HasParentSupport() const
{
- return sal_True;
+ return true;
}
// --------------------------------------------------------------------
-sal_Bool SdStyleSheet::HasClearParentSupport() const
+bool SdStyleSheet::HasClearParentSupport() const
{
- return sal_True;
+ return true;
}
// --------------------------------------------------------------------
-sal_Bool SdStyleSheet::SetName( const UniString& rName )
+bool SdStyleSheet::SetName( const UniString& rName )
{
return SfxStyleSheet::SetName( rName );
}
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index e8eb492..f0878c4 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -85,11 +85,11 @@ protected:
rtl::OUString maDisplayName;
String aHelpFile; // Name der Hilfedatei
SfxItemSet* pSet; // ItemSet
- sal_uInt16 nMask; // Flags
+ sal_uInt16 nMask; // Flags
- sal_uLong nHelpId; // Hilfe-ID
+ sal_uLong nHelpId; // Hilfe-ID
- sal_Bool bMySet; // sal_True: Set loeschen im dtor
+ bool bMySet; // sal_True: Set loeschen im dtor
SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask );
SfxStyleSheetBase( const SfxStyleSheetBase& );
@@ -104,7 +104,7 @@ public:
virtual const UniString& GetName() const;
// sets the internal name of this style
- virtual sal_Bool SetName( const UniString& );
+ virtual bool SetName( const UniString& );
/** returns the display name of this style, it is used at the user interface.
If the display name is empty, this method returns the internal name. */
@@ -114,13 +114,13 @@ public:
virtual void SetDisplayName( const rtl::OUString& );
virtual const UniString& GetParent() const;
- virtual sal_Bool SetParent( const UniString& );
+ virtual bool SetParent( const UniString& );
virtual const UniString& GetFollow() const;
- virtual sal_Bool SetFollow( const UniString& );
- virtual sal_Bool HasFollowSupport() const; // Default sal_True
- virtual sal_Bool HasParentSupport() const; // Default sal_True
- virtual sal_Bool HasClearParentSupport() const; // Default sal_False
- virtual sal_Bool IsUsed() const; // Default sal_True
+ virtual bool SetFollow( const UniString& );
+ virtual bool HasFollowSupport() const; // Default true
+ virtual bool HasParentSupport() const; // Default true
+ virtual bool HasClearParentSupport() const; // Default false
+ virtual bool IsUsed() const; // Default true
// Default aus dem Itemset; entweder dem uebergebenen
// oder aus dem per GetItemSet() zurueckgelieferten Set
virtual UniString GetDescription();
@@ -130,8 +130,8 @@ public:
SfxStyleFamily GetFamily() const { return nFamily; }
sal_uInt16 GetMask() const { return nMask; }
void SetMask( sal_uInt16 mask) { nMask = mask; }
- sal_Bool IsUserDefined() const
- { return sal_Bool( ( nMask & SFXSTYLEBIT_USERDEF) != 0 ); }
+ bool IsUserDefined() const
+ { return ( nMask & SFXSTYLEBIT_USERDEF) != 0; }
virtual sal_uLong GetHelpId( String& rFile );
virtual void SetHelpId( const String& r, sal_uLong nId );
@@ -171,17 +171,18 @@ protected:
SfxStyleSheetBasePool* pBasePool;
SfxStyleFamily nSearchFamily;
- sal_uInt16 nMask;
- sal_Bool SearchUsed() const { return bSearchUsed; }
+ sal_uInt16 nMask;
+
+ bool SearchUsed() const { return bSearchUsed; }
private:
- sal_uInt16 GetPos(){return nAktPosition;}
- SVL_DLLPRIVATE sal_Bool IsTrivialSearch();
- SVL_DLLPRIVATE sal_Bool DoesStyleMatch(SfxStyleSheetBase *pStyle);
+ sal_uInt16 GetPos() { return nAktPosition; }
+ SVL_DLLPRIVATE bool IsTrivialSearch();
+ SVL_DLLPRIVATE bool DoesStyleMatch(SfxStyleSheetBase *pStyle);
SfxStyleSheetBase* pAktStyle;
- sal_uInt16 nAktPosition;
- sal_Bool bSearchUsed;
+ sal_uInt16 nAktPosition;
+ bool bSearchUsed;
friend class SfxStyleSheetBasePool;
};
@@ -207,7 +208,7 @@ protected:
sal_uInt16 nMask;
SfxStyleSheetBase& Add( SfxStyleSheetBase& );
- void ChangeParent( const UniString&, const UniString&, sal_Bool bVirtual = sal_True );
+ void ChangeParent( const UniString&, const UniString&, bool bVirtual = true );
virtual SfxStyleSheetBase* Create( const UniString&, SfxStyleFamily, sal_uInt16 );
virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& );
@@ -247,7 +248,7 @@ public:
virtual SfxStyleSheetBase* Next();
virtual SfxStyleSheetBase* Find( const UniString&, SfxStyleFamily eFam, sal_uInt16 n=0xFFFF );
- virtual sal_Bool SetParent(SfxStyleFamily eFam,
+ virtual bool SetParent(SfxStyleFamily eFam,
const UniString &rStyle,
const UniString &rParent);
@@ -271,7 +272,7 @@ public:
SfxStyleSheet( const SfxStyleSheet& );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- virtual sal_Bool SetParent( const UniString& );
+ virtual bool SetParent( const UniString& );
protected:
SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 2a434b8..1c8a7c8 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -162,7 +162,7 @@ const XubString& SfxStyleSheetBase::GetName() const
return aName;
}
-sal_Bool SfxStyleSheetBase::SetName( const XubString& rName )
+bool SfxStyleSheetBase::SetName( const XubString& rName )
{
if(rName.Len() == 0)
return sal_False;
@@ -214,10 +214,10 @@ const XubString& SfxStyleSheetBase::GetParent() const
return aParent;
}
-sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName )
+bool SfxStyleSheetBase::SetParent( const XubString& rName )
{
if ( rName == aName )
- return sal_False;
+ return false;
if( aParent != rName )
{
@@ -225,20 +225,20 @@ sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName )
if( rName.Len() && !pIter )
{
OSL_FAIL( "StyleSheet-Parent nicht gefunden" );
- return sal_False;
+ return false;
}
// rekursive Verknuepfungen verhindern
if( aName.Len() )
while(pIter)
{
if(pIter->GetName() == aName)
- return sal_False;
+ return false;
pIter = pPool->Find(pIter->GetParent(), nFamily);
}
aParent = rName;
}
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
- return sal_True;
+ return true;
}
// Follow aendern
@@ -248,19 +248,19 @@ const XubString& SfxStyleSheetBase::GetFollow() const
return aFollow;
}
-sal_Bool SfxStyleSheetBase::SetFollow( const XubString& rName )
+bool SfxStyleSheetBase::SetFollow( const XubString& rName )
{
if( aFollow != rName )
{
if( !pPool->Find( rName, nFamily ) )
{
OSL_FAIL( "StyleSheet-Follow nicht gefunden" );
- return sal_False;
+ return false;
}
aFollow = rName;
}
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
- return sal_True;
+ return true;
}
// Itemset setzen. Die Dflt-Implementation legt ein neues Set an.
@@ -291,30 +291,30 @@ void SfxStyleSheetBase::SetHelpId( const String& rFile, sal_uLong nId )
// Folgevorlage m"oglich? Default: Ja
-sal_Bool SfxStyleSheetBase::HasFollowSupport() const
+bool SfxStyleSheetBase::HasFollowSupport() const
{
- return sal_True;
+ return true;
}
// Basisvorlage m"oglich? Default: Ja
-sal_Bool SfxStyleSheetBase::HasParentSupport() const
+bool SfxStyleSheetBase::HasParentSupport() const
{
- return sal_True;
+ return true;
}
// Basisvorlage uf NULL setzen m"oglich? Default: Nein
-sal_Bool SfxStyleSheetBase::HasClearParentSupport() const
+bool SfxStyleSheetBase::HasClearParentSupport() const
{
- return sal_False;
+ return false;
}
// Defaultmaessig sind alle StyleSheets Used
-sal_Bool SfxStyleSheetBase::IsUsed() const
+bool SfxStyleSheetBase::IsUsed() const
{
- return sal_True;
+ return true;
}
// eingestellte Attribute ausgeben
@@ -361,17 +361,17 @@ SfxStyleFamily SfxStyleSheetIterator::GetSearchFamily() const
return nSearchFamily;
}
-inline sal_Bool SfxStyleSheetIterator::IsTrivialSearch()
+inline bool SfxStyleSheetIterator::IsTrivialSearch()
{
return nMask == 0xFFFF && GetSearchFamily() == SFX_STYLE_FAMILY_ALL;
}
-sal_Bool SfxStyleSheetIterator::DoesStyleMatch(SfxStyleSheetBase *pStyle)
+bool SfxStyleSheetIterator::DoesStyleMatch(SfxStyleSheetBase *pStyle)
{
return ((GetSearchFamily() == SFX_STYLE_FAMILY_ALL) ||
( pStyle->GetFamily() == GetSearchFamily() ))
&& (( pStyle->GetMask() & ( GetSearchMask() & ~SFXSTYLEBIT_USED )) ||
- ( bSearchUsed ? pStyle->IsUsed() : sal_False ) ||
+ ( bSearchUsed ? pStyle->IsUsed() : false ) ||
GetSearchMask() == SFXSTYLEBIT_ALL );
}
@@ -581,16 +581,15 @@ SfxStyleSheetBasePool::~SfxStyleSheetBasePool()
delete pImp;
}
-sal_Bool SfxStyleSheetBasePool::SetParent(SfxStyleFamily eFam, const XubString& rStyle, const XubString& rParent)
+bool SfxStyleSheetBasePool::SetParent(SfxStyleFamily eFam, const XubString& rStyle, const XubString& rParent)
{
SfxStyleSheetIterator aIter(this,eFam,SFXSTYLEBIT_ALL);
- SfxStyleSheetBase *pStyle =
- aIter.Find(rStyle);
+ SfxStyleSheetBase *pStyle = aIter.Find(rStyle);
OSL_ENSURE(pStyle, "Vorlage nicht gefunden. Writer mit Solar <2541??");
if(pStyle)
return pStyle->SetParent(rParent);
else
- return sal_False;
+ return false;
}
@@ -807,7 +806,7 @@ void SfxStyleSheetBasePool::Clear()
void SfxStyleSheetBasePool::ChangeParent(const XubString& rOld,
const XubString& rNew,
- sal_Bool bVirtual)
+ bool bVirtual)
{
const sal_uInt16 nTmpMask = GetSearchMask();
SetSearchMask(GetSearchFamily(), 0xffff);
@@ -865,10 +864,10 @@ SfxStyleSheet::~SfxStyleSheet()
}
-sal_Bool SfxStyleSheet::SetParent( const XubString& rName )
+bool SfxStyleSheet::SetParent( const XubString& rName )
{
if(aParent == rName)
- return sal_True;
+ return true;
const XubString aOldParent(aParent);
if(SfxStyleSheetBase::SetParent(rName)) {
// aus der Benachrichtigungskette des alten
@@ -885,9 +884,9 @@ sal_Bool SfxStyleSheet::SetParent( const XubString& rName )
if(pParent)
StartListening(*pParent);
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// alle Zuhoerer benachtichtigen
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 576e5d2..82b4788 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -130,13 +130,13 @@ public:
void PresetParent(const String& rName){ aParent = rName; }
void PresetFollow(const String& rName){ aFollow = rName; }
- virtual sal_Bool SetName( const String& rStr);
- virtual sal_Bool SetParent( const String& rStr);
- virtual sal_Bool SetFollow( const String& rStr);
+ virtual bool SetName( const String& rStr);
+ virtual bool SetParent( const String& rStr);
+ virtual bool SetFollow( const String& rStr);
- virtual sal_Bool HasFollowSupport() const;
- virtual sal_Bool HasParentSupport() const;
- virtual sal_Bool HasClearParentSupport() const;
+ virtual bool HasFollowSupport() const;
+ virtual bool HasParentSupport() const;
+ virtual bool HasClearParentSupport() const;
virtual String GetDescription();
virtual String GetDescription(SfxMapUnit eUnit);
@@ -147,7 +147,7 @@ public:
const SwNumRule* GetNumRule();
void SetNumRule(const SwNumRule& rRule);
- virtual sal_Bool IsUsed() const;
+ virtual bool IsUsed() const;
};
/*--------------------------------------------------------------------
@@ -204,7 +204,7 @@ public:
virtual SfxStyleSheetBase* Find( const String&, SfxStyleFamily eFam,
sal_uInt16 n=0xFFFF );
- virtual sal_Bool SetParent( SfxStyleFamily eFam, const String &rStyle,
+ virtual bool SetParent( SfxStyleFamily eFam, const String &rStyle,
const String &rParent );
virtual void Remove( SfxStyleSheetBase* pStyle);
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 8276247..ae984bd 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -530,19 +530,19 @@ const String& SwDocStyleSheet::GetFollow() const
--------------------------------------------------------------------*/
-sal_Bool SwDocStyleSheet::HasFollowSupport() const
+bool SwDocStyleSheet::HasFollowSupport() const
{
switch(nFamily)
{
case SFX_STYLE_FAMILY_PARA :
- case SFX_STYLE_FAMILY_PAGE : return sal_True;
+ case SFX_STYLE_FAMILY_PAGE : return true;
case SFX_STYLE_FAMILY_FRAME:
case SFX_STYLE_FAMILY_CHAR :
- case SFX_STYLE_FAMILY_PSEUDO: return sal_False;
+ case SFX_STYLE_FAMILY_PSEUDO: return false;
default:
OSL_ENSURE(!this, "unknown style family");
}
- return sal_False;
+ return false;
}
/*--------------------------------------------------------------------
@@ -550,28 +550,28 @@ sal_Bool SwDocStyleSheet::HasFollowSupport() const
--------------------------------------------------------------------*/
-sal_Bool SwDocStyleSheet::HasParentSupport() const
+bool SwDocStyleSheet::HasParentSupport() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch(nFamily)
{
case SFX_STYLE_FAMILY_CHAR :
case SFX_STYLE_FAMILY_PARA :
- case SFX_STYLE_FAMILY_FRAME: bRet = sal_True;
+ case SFX_STYLE_FAMILY_FRAME: bRet = true;
default:; //prevent warning
}
return bRet;
}
-sal_Bool SwDocStyleSheet::HasClearParentSupport() const
+bool SwDocStyleSheet::HasClearParentSupport() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch(nFamily)
{
case SFX_STYLE_FAMILY_PARA :
case SFX_STYLE_FAMILY_CHAR :
- case SFX_STYLE_FAMILY_FRAME: bRet = sal_True;
+ case SFX_STYLE_FAMILY_FRAME: bRet = true;
default:; //prevent warning
}
return bRet;
@@ -758,20 +758,20 @@ String SwDocStyleSheet::GetDescription()
--------------------------------------------------------------------*/
-sal_Bool SwDocStyleSheet::SetName( const String& rStr)
+bool SwDocStyleSheet::SetName( const String& rStr)
{
if( !rStr.Len() )
- return sal_False;
+ return false;
if( aName != rStr )
{
if( !SfxStyleSheetBase::SetName( rStr ))
- return sal_False;
+ return false;
}
else if(!bPhysical)
FillStyleSheet( FillPhysical );
- int bChg = sal_False;
+ int bChg = false;
switch(nFamily)
{
case SFX_STYLE_FAMILY_CHAR :
@@ -780,7 +780,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
if( pCharFmt && pCharFmt->GetName() != rStr )
{
pCharFmt->SetName( rStr );
- bChg = sal_True;
+ bChg = true;
}
break;
}
@@ -794,7 +794,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
else
pColl->SetName(rStr);
- bChg = sal_True;
+ bChg = true;
}
break;
}
@@ -808,7 +808,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
else
pFrmFmt->SetName( rStr );
- bChg = sal_True;
+ bChg = true;
}
break;
}
@@ -830,7 +830,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
rDoc.GetIDocumentUndoRedo().DoUndo(bDoesUndo);
rDoc.SetModified();
- bChg = sal_True;
+ bChg = true;
}
break;
case SFX_STYLE_FAMILY_PSEUDO:
@@ -848,7 +848,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
pNumRule = rDoc.FindNumRulePtr(rStr);
rDoc.SetModified();
- bChg = sal_True;
+ bChg = true;
}
}
else
@@ -857,7 +857,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
((SwNumRule*)pNumRule)->SetName( rStr, rDoc );
rDoc.SetModified();
- bChg = sal_True;
+ bChg = true;
}
}
@@ -875,7 +875,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
if( pSh )
pSh->CallChgLnk();
}
- return sal_True;
+ return true;
}
/*--------------------------------------------------------------------
@@ -883,7 +883,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
--------------------------------------------------------------------*/
-sal_Bool SwDocStyleSheet::SetParent( const String& rStr)
+bool SwDocStyleSheet::SetParent( const String& rStr)
{
SwFmt* pFmt = 0, *pParent = 0;
switch(nFamily)
@@ -913,7 +913,7 @@ sal_Bool SwDocStyleSheet::SetParent( const String& rStr)
OSL_ENSURE(!this, "unknown style family");
}
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pFmt && pFmt->DerivedFrom() &&
pFmt->DerivedFrom()->GetName() != rStr )
{
@@ -938,10 +938,10 @@ sal_Bool SwDocStyleSheet::SetParent( const String& rStr)
--------------------------------------------------------------------*/
-sal_Bool SwDocStyleSheet::SetFollow( const String& rStr)
+bool SwDocStyleSheet::SetFollow( const String& rStr)
{
if( rStr.Len() && !SfxStyleSheetBase::SetFollow( rStr ))
- return sal_False;
+ return false;
SwImplShellAction aTmpSh( rDoc );
switch(nFamily)
@@ -987,7 +987,7 @@ sal_Bool SwDocStyleSheet::SetFollow( const String& rStr)
OSL_ENSURE(!this, "unknwown style family");
}
- return sal_True;
+ return true;
}
/*--------------------------------------------------------------------
@@ -1843,7 +1843,7 @@ SwFrmFmt* SwDocStyleSheet::GetFrmFmt()
return pFrmFmt;
}
-sal_Bool SwDocStyleSheet::IsUsed() const
+bool SwDocStyleSheet::IsUsed() const
{
if( !bPhysical )
{
@@ -1852,7 +1852,7 @@ sal_Bool SwDocStyleSheet::IsUsed() const
}
if( !bPhysical )
- return sal_False;
+ return false;
const SwModify* pMod;
switch( nFamily )
@@ -1863,11 +1863,11 @@ sal_Bool SwDocStyleSheet::IsUsed() const
case SFX_STYLE_FAMILY_PAGE : pMod = pDesc; break;
case SFX_STYLE_FAMILY_PSEUDO:
- return pNumRule ? rDoc.IsUsed( *pNumRule ) : sal_False;
+ return pNumRule ? rDoc.IsUsed( *pNumRule ) : false;
default:
OSL_ENSURE(!this, "unknown style family");
- return sal_False;
+ return false;
}
return rDoc.IsUsed( *pMod );
}
@@ -2230,7 +2230,7 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
-sal_Bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
+bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
const String &rStyle, const String &rParent )
{
SwFmt* pFmt = 0, *pParent = 0;
@@ -2259,7 +2259,7 @@ sal_Bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
OSL_ENSURE(!this, "unknown style family");
}
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pFmt && pFmt->DerivedFrom() &&
pFmt->DerivedFrom()->GetName() != rParent )
{
commit 055b6f1271cf90240caa3ab0f22f3e760fcefd51
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 26 13:43:26 2012 +0200
sal_Bool->bool in svl::SvxSearchItem
Change-Id: I60230e57993ee24fc80eb26d16588f131ec1f8dc
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 719219c..0e83ebc 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -63,17 +63,17 @@ class SVL_DLLPUBLIC SvxSearchItem :
// Calc-Spezifische Daten
sal_uInt16 nCellType; // Suche in Formeln/Werten/Notizen
sal_uInt16 nAppFlag; // Fuer welche Applikation ist der Dialog ueberhaupt
- sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise
- sal_Bool bAllTables; // in alle Tabellen suchen
- sal_Bool bSearchFiltered; // search filtered cells.
+ bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise
+ bool bAllTables; // in alle Tabellen suchen
+ bool bSearchFiltered; // search filtered cells.
// Writer-spezifisch
- sal_Bool bNotes;
+ bool bNotes;
- sal_Bool bBackward; // Suche Rueckwaerts
- sal_Bool bPattern; // Suche nach Vorlagen
- sal_Bool bContent; // Suche im Inhalt
- sal_Bool bAsianOptions; // use asian options?
+ bool bBackward; // Suche Rueckwaerts
+ bool bPattern; // Suche nach Vorlagen
+ bool bContent; // Suche im Inhalt
+ bool bAsianOptions; // use asian options?
public:
TYPEINFO();
@@ -104,54 +104,54 @@ public:
inline const String GetReplaceString() const;
inline void SetReplaceString(const String& rNewString);
- inline sal_Bool GetWordOnly() const;
- void SetWordOnly(sal_Bool bNewWordOnly);
+ inline bool GetWordOnly() const;
+ void SetWordOnly(bool bNewWordOnly);
- inline sal_Bool GetExact() const;
- void SetExact(sal_Bool bNewExact);
+ inline bool GetExact() const;
+ void SetExact(bool bNewExact);
- sal_Bool GetBackward() const { return bBackward; }
- void SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; }
+ bool GetBackward() const { return bBackward; }
+ void SetBackward(bool bNewBackward) { bBackward = bNewBackward; }
- inline sal_Bool GetSelection() const;
- void SetSelection(sal_Bool bNewSelection);
+ inline bool GetSelection() const;
+ void SetSelection(bool bNewSelection);
- inline sal_Bool GetRegExp() const;
- void SetRegExp( sal_Bool bVal );
+ inline bool GetRegExp() const;
+ void SetRegExp( bool bVal );
- sal_Bool GetPattern() const { return bPattern; }
- void SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; }
+ bool GetPattern() const { return bPattern; }
+ void SetPattern(bool bNewPattern) { bPattern = bNewPattern; }
- sal_Bool IsContent() const { return bContent; }
- void SetContent( sal_Bool bNew ) { bContent = bNew; }
+ bool IsContent() const { return bContent; }
+ void SetContent( bool bNew ) { bContent = bNew; }
SfxStyleFamily GetFamily() const { return eFamily; }
void SetFamily( SfxStyleFamily eNewFamily )
{ eFamily = eNewFamily; }
- sal_Bool GetRowDirection() const { return bRowDirection; }
- void SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; }
+ bool GetRowDirection() const { return bRowDirection; }
+ void SetRowDirection(bool bNewRowDirection) { bRowDirection = bNewRowDirection; }
- sal_Bool IsAllTables() const { return bAllTables; }
- void SetAllTables(sal_Bool bNew) { bAllTables = bNew; }
+ bool IsAllTables() const { return bAllTables; }
+ void SetAllTables(bool bNew) { bAllTables = bNew; }
- sal_Bool IsSearchFiltered() const { return bSearchFiltered; }
- void SetSearchFiltered(sal_Bool b) { bSearchFiltered = b; }
+ bool IsSearchFiltered() const { return bSearchFiltered; }
+ void SetSearchFiltered(bool b) { bSearchFiltered = b; }
sal_uInt16 GetCellType() const { return nCellType; }
void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }
- sal_Bool GetNotes() const { return bNotes; }
- void SetNotes(sal_Bool bNew) { bNotes = bNew; }
+ bool GetNotes() const { return bNotes; }
+ void SetNotes(bool bNew) { bNotes = bNew; }
sal_uInt16 GetAppFlag() const { return nAppFlag; }
void SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; }
- inline sal_Bool IsLevenshtein() const;
- void SetLevenshtein( sal_Bool bVal );
+ inline bool IsLevenshtein() const;
+ void SetLevenshtein( bool bVal );
- inline sal_Bool IsLEVRelaxed() const;
- void SetLEVRelaxed(sal_Bool bSet);
+ inline bool IsLEVRelaxed() const;
+ void SetLEVRelaxed(bool bSet);
inline sal_uInt16 GetLEVOther() const;
inline void SetLEVOther(sal_uInt16 nSet);
@@ -169,11 +169,11 @@ public:
inline sal_Int32 GetTransliterationFlags() const;
void SetTransliterationFlags( sal_Int32 nFlags );
- inline sal_Bool IsMatchFullHalfWidthForms() const;
- void SetMatchFullHalfWidthForms( sal_Bool bVal );
+ inline bool IsMatchFullHalfWidthForms() const;
+ void SetMatchFullHalfWidthForms( bool bVal );
- inline sal_Bool IsUseAsianOptions() const { return bAsianOptions; }
- inline void SetUseAsianOptions( sal_Bool bVal ) { bAsianOptions = bVal; }
+ inline bool IsUseAsianOptions() const { return bAsianOptions; }
+ inline void SetUseAsianOptions( bool bVal ) { bAsianOptions = bVal; }
};
const String SvxSearchItem::GetSearchString() const
@@ -196,30 +196,30 @@ void SvxSearchItem::SetReplaceString(const String& rNewString)
aSearchOpt.replaceString = rNewString;
}
-sal_Bool SvxSearchItem::GetWordOnly() const
+bool SvxSearchItem::GetWordOnly() const
{
return 0 != (aSearchOpt.searchFlag &
com::sun::star::util::SearchFlags::NORM_WORD_ONLY);
}
-sal_Bool SvxSearchItem::GetExact() const
+bool SvxSearchItem::GetExact() const
{
return 0 == (aSearchOpt.transliterateFlags &
com::sun::star::i18n::TransliterationModules_IGNORE_CASE);
}
-sal_Bool SvxSearchItem::GetSelection() const
+bool SvxSearchItem::GetSelection() const
{
return 0 != (aSearchOpt.searchFlag &
com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE);
}
-sal_Bool SvxSearchItem::GetRegExp() const
+bool SvxSearchItem::GetRegExp() const
{
return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ;
}
-sal_Bool SvxSearchItem::IsLEVRelaxed() const
+bool SvxSearchItem::IsLEVRelaxed() const
{
return 0 != (aSearchOpt.searchFlag &
com::sun::star::util::SearchFlags::LEV_RELAXED);
@@ -255,7 +255,7 @@ void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal )
aSearchOpt.deletedChars = nVal;
}
-sal_Bool SvxSearchItem::IsLevenshtein() const
+bool SvxSearchItem::IsLevenshtein() const
{
return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE;
}
@@ -275,7 +275,7 @@ sal_Int32 SvxSearchItem::GetTransliterationFlags() const
return aSearchOpt.transliterateFlags;
}
-sal_Bool SvxSearchItem::IsMatchFullHalfWidthForms() const
+bool SvxSearchItem::IsMatchFullHalfWidthForms() const
{
return 0 != (aSearchOpt.transliterateFlags &
com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH);
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 2aa8e31..d68a887 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -279,7 +279,7 @@ void SvxSearchItem::Commit()
{
}
-void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal )
+void SvxSearchItem::SetMatchFullHalfWidthForms( bool bVal )
{
if (bVal)
aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_WIDTH;
@@ -288,7 +288,7 @@ void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal )
}
-void SvxSearchItem::SetWordOnly( sal_Bool bVal )
+void SvxSearchItem::SetWordOnly( bool bVal )
{
if (bVal)
aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
@@ -297,7 +297,7 @@ void SvxSearchItem::SetWordOnly( sal_Bool bVal )
}
-void SvxSearchItem::SetExact( sal_Bool bVal )
+void SvxSearchItem::SetExact( bool bVal )
{
if (!bVal)
aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE;
@@ -306,7 +306,7 @@ void SvxSearchItem::SetExact( sal_Bool bVal )
}
-void SvxSearchItem::SetSelection( sal_Bool bVal )
+void SvxSearchItem::SetSelection( bool bVal )
{
if (bVal)
{
@@ -321,7 +321,7 @@ void SvxSearchItem::SetSelection( sal_Bool bVal )
}
-void SvxSearchItem::SetRegExp( sal_Bool bVal )
+void SvxSearchItem::SetRegExp( bool bVal )
{
if ( bVal )
aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
@@ -330,7 +330,7 @@ void SvxSearchItem::SetRegExp( sal_Bool bVal )
}
-void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal )
+void SvxSearchItem::SetLEVRelaxed( bool bVal )
{
if (bVal)
aSearchOpt.searchFlag |= SearchFlags::LEV_RELAXED;
@@ -339,7 +339,7 @@ void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal )
}
-void SvxSearchItem::SetLevenshtein( sal_Bool bVal )
+void SvxSearchItem::SetLevenshtein( bool bVal )
{
if ( bVal )
aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
commit e247cb585c749ac1ea2abdb29c872fb977ab3fe3
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 26 11:24:31 2012 +0200
sal_Bool->bool in svl::DECL_PTRHINT
Change-Id: Ib9a0aa8e22cb84b07b7346e5647b2a2667f05c6a
diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx
index 8c5c5d9..52401e2 100644
--- a/svl/inc/svl/hint.hxx
+++ b/svl/inc/svl/hint.hxx
@@ -36,20 +36,20 @@ public:
class Visibility Name: public SfxHint \
{ \
Type* pObj; \
- sal_Bool bIsOwner; \
+ bool bIsOwner; \
\
public: \
TYPEINFO(); \
- Name( Type* Object, sal_Bool bOwnedByHint = sal_False ); \
+ Name( Type* Object, bool bOwnedByHint = false ); \
~Name(); \
\
Type* GetObject() const { return pObj; } \
- sal_Bool IsOwner() const { return bIsOwner; } \
+ bool IsOwner() const { return bIsOwner; } \
}
#define IMPL_PTRHINT(Name, Type) \
TYPEINIT1(Name, SfxHint); \
- Name::Name( Type* pObject, sal_Bool bOwnedByHint ) \
+ Name::Name( Type* pObject, bool bOwnedByHint ) \
{ pObj = pObject; bIsOwner = bOwnedByHint; } \
Name::~Name() {}
commit 14916972c532bc4713c2bc11acd3c4f9c74e93a1
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 17:28:22 2012 +0200
sal_Bool->bool in xmlsecurity
Change-Id: I80b20f5df179f994e5004c1ef390457c252478ef
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 52d5730..cf85800 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -62,7 +62,7 @@ private:
CancelButton maCancelBtn;
HelpButton maHelpBtn;
- sal_Bool mbInitialized;
+ bool mbInitialized;
sal_uInt16 GetSelectedEntryPos( void ) const;
DECL_LINK(ViewButtonHdl, void *);
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 2bbbe08..26b03fb 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -54,12 +54,12 @@ private:
OKButton maOkBtn;
HelpButton maHelpBtn;
- sal_Bool mbCheckForPrivateKey;
+ bool mbCheckForPrivateKey;
cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
cssu::Reference< dcss::security::XCertificate > mxCert;
public:
- CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, sal_Bool bCheckForPrivateKey );
+ CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, bool bCheckForPrivateKey );
virtual ~CertificateViewer();
};
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 7c6e44c..967dc59 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -143,8 +143,8 @@ private:
cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors;
- sal_Bool mbAuthorsReadonly;
- sal_Bool mbURLsReadonly;
+ bool mbAuthorsReadonly;
+ bool mbURLsReadonly;
DECL_LINK( ViewCertPBHdl, void* );
DECL_LINK( RemoveCertPBHdl, void* );
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index c93e692..27a486d 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -76,7 +76,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X
mxCtx = _rxCtx;
mxSecurityEnvironment = _rxSecurityEnvironment;
- mbInitialized = sal_False;
+ mbInitialized = false;
// disable buttons
CertificateHighlightHdl( NULL );
@@ -183,7 +183,7 @@ void CertificateChooser::ImplInitialize()
// enable/disable buttons
CertificateHighlightHdl( NULL );
- mbInitialized = sal_True;
+ mbInitialized = true;
}
}
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 27e0cbc..7a7486e 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -51,7 +51,7 @@ namespace
CertificateViewer::CertificateViewer(
Window* _pParent,
const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
- const cssu::Reference< dcss::security::XCertificate >& _rXCert, sal_Bool bCheckForPrivateKey )
+ const cssu::Reference< dcss::security::XCertificate >& _rXCert, bool bCheckForPrivateKey )
:TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
,maTabCtrl ( this, XMLSEC_RES( 1 ) )
,maOkBtn ( this, XMLSEC_RES( BTN_OK ) )
@@ -456,7 +456,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl)
SvLBoxEntry* pEntry = maCertPathLB.FirstSelected();
if( pEntry )
{
- CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, sal_False );
+ CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, false );
aViewer.Execute();
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 32616ae..951ed31 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -751,7 +751,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
DBG_ASSERT( xCert.is(), "Error getting cCertificate!" );
if ( xCert.is() )
{
- CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, sal_False );
+ CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, false );
aViewer.Execute();
}
}
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 4d951ed..c814c59 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -203,7 +203,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl)
if ( xCert.is() )
{
- CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, sal_False );
+ CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, false );
aViewer.Execute();
}
}
commit b3c13b940a4b023bdbf37bfc0b9385a54e3d8b3f
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 17:21:29 2012 +0200
sal_Bool->bool in xmlhelp
Change-Id: I509cf60e4bbbe7dfb25a3943d97c9d35a22e0bb6
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 9803dc5..1722972 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -298,7 +298,7 @@ namespace chelp {
com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_xSMgr;
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA;
- sal_Bool m_bShowBasic;
+ bool m_bShowBasic;
char* m_pErrorDoc;
int m_nCustomCSSDocLength;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 6e7f68d..f592d11 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -536,9 +536,9 @@ namespace chelp {
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMSF;
com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider;
sal_Int32 m_nRow;
- sal_Bool m_nWasNull;
+ bool m_nWasNull;
sal_Int32 m_nOpenMode;
- sal_Bool m_bRowCountFinal;
+ bool m_bRowCountFinal;
typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet;
typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet;
commit 8e995db6a2dd2becb2e88903a28877db2591ae06
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 17:18:19 2012 +0200
sal_Bool->bool in codemaker
Change-Id: Icea58e7c1dea14f524d6a8d479b7d85e79d6266b
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index f4f1304..eca0143 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -152,8 +152,8 @@ CppuType::CppuType(typereg::Reader& typeReader,
const OString& typeName,
const TypeManager& typeMgr)
: m_inheritedMemberCount(0)
- , m_cppuTypeLeak(sal_False)
- , m_cppuTypeDynamic(sal_True)
+ , m_cppuTypeLeak(false)
+ , m_cppuTypeDynamic(true)
, m_indentLength(0)
, m_typeName(typeName)
, m_name(typeName.copy(typeName.lastIndexOf('/') + 1))
@@ -294,9 +294,9 @@ sal_Bool CppuType::dump(CppuOptions* pOptions)
// meaningful (getCppuType is just a forward to cppu::UnoType::get now),
// and -CS is handled the same way as -C now:
if (pOptions->isValid("-L"))
- m_cppuTypeLeak = sal_True;
+ m_cppuTypeLeak = true;
if (pOptions->isValid("-C") || pOptions->isValid("-CS"))
- m_cppuTypeDynamic = sal_False;
+ m_cppuTypeDynamic = false;
}
OString outPath;
@@ -1360,8 +1360,8 @@ InterfaceType::InterfaceType(typereg::Reader& typeReader,
: CppuType(typeReader, typeName, typeMgr)
{
m_inheritedMemberCount = 0;
- m_hasAttributes = sal_False;
- m_hasMethods = sal_False;
+ m_hasAttributes = false;
+ m_hasMethods = false;
}
InterfaceType::~InterfaceType()
@@ -2320,7 +2320,7 @@ sal_Bool ConstantsType::dump(CppuOptions* pOptions)
addSpecialDependencies();
if (pOptions->isValid("-U"))
- m_cppuTypeDynamic = sal_True;
+ m_cppuTypeDynamic = true;
OString outPath;
if (pOptions->isValid("-O"))
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx
index 83a3807..a2781cb 100644
--- a/codemaker/source/cppumaker/cpputype.hxx
+++ b/codemaker/source/cppumaker/cpputype.hxx
@@ -138,8 +138,8 @@ protected:
protected:
sal_uInt32 m_inheritedMemberCount;
- sal_Bool m_cppuTypeLeak;
- sal_Bool m_cppuTypeDynamic;
+ bool m_cppuTypeLeak;
+ bool m_cppuTypeDynamic;
sal_Int32 m_indentLength;
::rtl::OString m_typeName;
::rtl::OString m_name;
@@ -189,8 +189,8 @@ protected:
protected:
sal_uInt32 m_inheritedMemberCount;
- sal_Bool m_hasAttributes;
- sal_Bool m_hasMethods;
+ bool m_hasAttributes;
+ bool m_hasMethods;
private:
void dumpExceptionSpecification(
commit ab7bc4f4c29dbeb206098b5a7e56682834af04b0
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 17:11:17 2012 +0200
sal_Bool->bool in registry
Change-Id: I6afabf33e1d1ab890c979193c25381e0d38c1f50
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 3c103c2..e511788 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -53,9 +53,9 @@ class BlopObject
public:
const sal_uInt8* m_pBuffer;
sal_uInt32 m_bufferLen;
- sal_Bool m_isCopied;
+ bool m_isCopied;
- BlopObject(const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer);
+ BlopObject(const sal_uInt8* buffer, sal_uInt32 len, bool copyBuffer);
// throws std::bad_alloc
~BlopObject();
@@ -124,7 +124,7 @@ public:
}
};
-BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer)
+BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len, bool copyBuffer)
: m_bufferLen(len)
, m_isCopied(copyBuffer)
{
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index dda3b3c..f89d2e5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -103,10 +103,10 @@ public:
~ORegistry();
- sal_Bool isReadOnly() const
+ bool isReadOnly() const
{ return m_readOnly; }
- sal_Bool isOpen() const
+ bool isOpen() const
{ return m_isOpen; }
ORegKey* getRootKey();
@@ -160,8 +160,8 @@ private:
sal_uInt32 m_refCount;
osl::Mutex m_mutex;
- sal_Bool m_readOnly;
- sal_Bool m_isOpen;
+ bool m_readOnly;
+ bool m_isOpen;
rtl::OUString m_name;
store::OStoreFile m_file;
KeyMap m_openKeyTable;
commit 2765cf0ca81b606f169d8ec723d41d509f336628
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 17:09:01 2012 +0200
sal_Bool->bool in rdbmaker
Change-Id: I454e5f4522cd5c5c1f04fde7cb79feab5ae63528
diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx
index bb30b85..67eae38 100644
--- a/rdbmaker/inc/codemaker/registry.hxx
+++ b/rdbmaker/inc/codemaker/registry.hxx
@@ -33,7 +33,7 @@ struct TypeReader_Impl
{
TypeReader_Impl(const sal_uInt8* buffer,
sal_uInt32 bufferLen,
- sal_Bool copyData)
+ bool copyData)
: m_refCount(0)
, m_copyData(copyData)
, m_blopSize(bufferLen)
@@ -62,7 +62,7 @@ struct TypeReader_Impl
}
sal_Int32 m_refCount;
- sal_Bool m_copyData;
+ bool m_copyData;
sal_Int32 m_blopSize;
const sal_uInt8* m_pBlop;
typereg::Reader* m_pReader;
@@ -77,7 +77,7 @@ public:
inline TypeReader( const sal_uInt8* buffer,
sal_uInt32 bufferLen,
- sal_Bool copyData)
+ bool copyData)
{
m_pImpl = new TypeReader_Impl(buffer, bufferLen, copyData);
acquire();
diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx
index 086ce75..a6da27d 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -94,14 +94,14 @@ struct RegistryTypeManagerImpl
RegistryTypeManagerImpl()
: m_pMergedRegistry(NULL)
, m_base("/")
- , m_isMerged(sal_False)
+ , m_isMerged(false)
{}
T2TypeClassMap m_t2TypeClass;
RegistryList m_registries;
Registry* m_pMergedRegistry;
::rtl::OString m_base;
- sal_Bool m_isMerged;
+ bool m_isMerged;
};
class RegistryTypeManager : public TypeManager
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx
index b0d0a14..1348a1e 100644
--- a/rdbmaker/source/codemaker/typemanager.cxx
+++ b/rdbmaker/source/codemaker/typemanager.cxx
@@ -168,7 +168,7 @@ TypeReader RegistryTypeManager::getTypeReader(const OString& name)
sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
if (!key.getValue(OUString(), pBuffer))
{
- reader = TypeReader(pBuffer, valueSize, sal_True);
+ reader = TypeReader(pBuffer, valueSize, true);
}
rtl_freeMemory(pBuffer);
}
@@ -195,7 +195,7 @@ RTTypeClass RegistryTypeManager::getTypeClass(const OString& name)
sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
if (!key.getValue(OUString(), pBuffer))
{
- TypeReader reader(pBuffer, valueSize, sal_False);
+ TypeReader reader(pBuffer, valueSize, false);
RTTypeClass ret = reader.getTypeClass();
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx
index 6353f41..54d92eb 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -277,7 +277,7 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
}
m_options["-L"] = OString();
- m_generateTypeList = sal_True;
+ m_generateTypeList = true;
break;
default:
throw IllegalArgument("the option is unknown" + OString(av[i]));
diff --git a/rdbmaker/source/rdbmaker/rdboptions.hxx b/rdbmaker/source/rdbmaker/rdboptions.hxx
index 7352cd4..aebf6d1 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.hxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.hxx
@@ -27,7 +27,7 @@ class RdbOptions : public Options
public:
RdbOptions()
: Options()
- , m_generateTypeList(sal_False)
+ , m_generateTypeList(false)
{}
~RdbOptions() {}
@@ -39,11 +39,11 @@ public:
::rtl::OString prepareVersion();
- sal_Bool generateTypeList()
+ bool generateTypeList()
{ return m_generateTypeList; }
protected:
- sal_Bool m_generateTypeList;
+ bool m_generateTypeList;
};
#endif // _RDBMAKER_RDBOPTIONS_HXX_
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
index b643adb..72f8341 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
@@ -66,7 +66,7 @@ TypeReader SpecialTypeManager::getTypeReader(const OString& name)
if ( (blopSize = getTypeBlop( name.getStr(), &pBlop)) > 0 )
{
- reader = TypeReader(pBlop, blopSize, sal_True);
+ reader = TypeReader(pBlop, blopSize, true);
}
if ( pBlop )
commit b6831de354009a09b0606c0efe04b5601dd77f4c
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 17:00:42 2012 +0200
sal_Bool->bool in testtools
Change-Id: I716c0a08565e874bcb0667e72ed5261231a4743d
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index def69d9..e10a47b 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -130,8 +130,8 @@ class Test_Impl :
{
TestData _aData, _aStructData;
sal_Int32 m_nLastCallId;
- sal_Bool m_bFirstCall;
- sal_Bool m_bSequenceOfCallTestPassed;
+ bool m_bFirstCall;
+ bool m_bSequenceOfCallTestPassed;
Mutex m_mutex;
Sequence<sal_Bool> _arBool;
@@ -155,8 +155,8 @@ class Test_Impl :
public:
Test_Impl() : m_nLastCallId( 0 ),
- m_bFirstCall( sal_True ),
- m_bSequenceOfCallTestPassed( sal_True )
+ m_bFirstCall( true ),
+ m_bSequenceOfCallTestPassed( true )
{}
virtual ~Test_Impl()
{
@@ -514,7 +514,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su
wait(nWaitMUSEC);
if( m_bFirstCall )
{
- m_bFirstCall = sal_False;
+ m_bFirstCall = false;
}
else
{
commit f649c5acd4269eb6df4303127fb780d18ffe388a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 16:57:23 2012 +0200
sal_Bool->bool in scripting
Change-Id: Ibb61dc696c4341a0b58d8fd7c2fdfb4c5b991596
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index a1d7c5c..d81b713 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -66,7 +66,7 @@ namespace basprov
,m_sScriptingContext( sScriptingContext )
,m_pMethod( pMethod )
,m_bIsAppScript( isAppScript )
- ,m_bEditable( sal_True )
+ ,m_bEditable( true )
{
if ( m_pMethod )
{
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 6f9fd1d..65e4d41 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -61,7 +61,7 @@ namespace basprov
// properties
::rtl::OUString m_sURI;
- sal_Bool m_bEditable;
+ bool m_bEditable;
protected:
// OPropertySetHelper
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 7249d14..ef33f8c 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -631,13 +631,13 @@ private:
Reference< XComponentContext > m_xContext;
Reference< frame::XModel > m_xModel;
- sal_Bool m_bDocClosed;
+ bool m_bDocClosed;
SfxObjectShell* mpShell;
rtl::OUString msProject;
};
EventListener::EventListener( const Reference< XComponentContext >& rxContext ) :
-OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(sal_False), mpShell( 0 )
+OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(false), mpShell( 0 )
{
registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) );
@@ -731,7 +731,7 @@ EventListener::queryClosing( const lang::EventObject& /*Source*/, ::sal_Bool /*G
void SAL_CALL
EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
{
- m_bDocClosed = sal_True;
+ m_bDocClosed = true;
uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
if (xCloseBroadcaster.is())
{
commit 9d7c5393309d6e50554a18e2e50b4b97bb26cb57
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 16:55:02 2012 +0200
sal_Bool->bool in regexp
Change-Id: I45301c519037ac6c027bfb5a44e8a2a2d53b3ad2
diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx
index d59664f..71a3f18 100644
--- a/regexp/inc/regexp/reclass.hxx
+++ b/regexp/inc/regexp/reclass.hxx
@@ -307,7 +307,7 @@ class REGEXP_DLLPUBLIC Regexpr
struct re_pattern_buffer *bufp;
- sal_Bool isIgnoreCase;
+ bool isIgnoreCase;
/** Either a translate table to apply to all characters before comparing
them, or zero for no translation. The translation is applied to a
commit c849c4b987021d933690ec77b714b9202df0686a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 16:52:21 2012 +0200
sal_Bool->bool in hwpfilter
Change-Id: Ief6d6678a04084a90d07d87780689b92af2e3ba4
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index b356836..201c1f5 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -371,20 +371,14 @@ void HwpReader::makeMeta()
static struct
{
const char *name;
- sal_Bool bMade;
+ bool bMade;
}
-
-
ArrowShape[] =
{
- { "", sal_False },
- {
- "Arrow", sal_False
- },
- { "Line Arrow", sal_False },
- {
- "Square", sal_False
- }
+ { "", false },
+ { "Arrow", false },
+ { "Line Arrow", false },
+ { "Square", false }
};
static struct
@@ -449,7 +443,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
{
if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade )
{
- ArrowShape[prop->line_tstyle].bMade = sal_True;
+ ArrowShape[prop->line_tstyle].bMade = true;
padd(ascii("draw:name"), sXML_CDATA,
ascii(ArrowShape[prop->line_tstyle].name));
if( prop->line_tstyle == 1 )
@@ -473,7 +467,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
}
if( prop->line_hstyle && !ArrowShape[prop->line_hstyle].bMade)
{
- ArrowShape[prop->line_hstyle].bMade = sal_True;
+ ArrowShape[prop->line_hstyle].bMade = true;
padd(ascii("draw:name"), sXML_CDATA,
ascii(ArrowShape[prop->line_hstyle].name));
if( prop->line_hstyle == 1 )
@@ -927,7 +921,7 @@ struct PageSetting
footer_odd = 0L;
footer_even = 0L;
pagenumber=0L;
- bIsSet = sal_False;
+ bIsSet = false;
}
HeaderFooter *header ;
HeaderFooter *header_odd ;
@@ -936,7 +930,7 @@ struct PageSetting
HeaderFooter *footer_odd ;
HeaderFooter *footer_even ;
ShowPageNum *pagenumber;
- sal_Bool bIsSet;
+ bool bIsSet;
};
void HwpReader::makeMasterStyles()
@@ -951,12 +945,12 @@ void HwpReader::makeMasterStyles()
{
ShowPageNum *pn = hwpfile.getPageNumber(i);
pSet[pn->m_nPageNumber].pagenumber = pn;
- pSet[pn->m_nPageNumber].bIsSet = sal_True;
+ pSet[pn->m_nPageNumber].bIsSet = true;
}
for( i = 0 ; i < hwpfile.getHeaderFooterCount() ; i++ )
{
HeaderFooter* hf = hwpfile.getHeaderFooter(i);
- pSet[hf->m_nPageNumber].bIsSet = sal_True;
+ pSet[hf->m_nPageNumber].bIsSet = true;
if( hf->type == 0 ) // header
{
switch( hf->where )
commit 2e7c6b8684a40f30b2af38be035802d222b24d20
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 16:48:37 2012 +0200
sal_Bool->bool in padmin
Change-Id: Ica624c28b4e423531be3ef6a601f266d1cad1d07
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 135a5dc..a87a3d0 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.cxx
@@ -40,7 +40,7 @@ ProgressDialog::ProgressDialog( Window* pParent,
maProgressBar( this, PaResId( RID_PROGRESS_STATUSBAR ) ),
mnMax( nMax ),
mnMin( nMin ),
- mbCanceled( sal_False )
+ mbCanceled( false )
{
maFilename.SetStyle( maFilename.GetStyle() | WB_PATHELLIPSIS );
if( ! bCancelable )
@@ -64,7 +64,7 @@ void ProgressDialog::startOperation( const String& rOperation )
{
maOperation.SetText( rOperation );
maProgressBar.SetValue( 0 );
- mbCanceled = sal_False;
+ mbCanceled = false;
if( ! IsVisible() )
Show( sal_True );
}
@@ -86,7 +86,7 @@ IMPL_LINK( ProgressDialog, ClickBtnHdl, Button*, pButton )
{
if( pButton == &maCancelButton )
{
- mbCanceled = sal_True;
+ mbCanceled = true;
}
return 0;
}
diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx
index 890f0a1..dcb8a09 100644
--- a/padmin/source/progress.hxx
+++ b/padmin/source/progress.hxx
@@ -37,7 +37,7 @@ namespace padmin {
ProgressBar maProgressBar;
int mnMax, mnMin;
- sal_Bool mbCanceled;
+ bool mbCanceled;
public:
ProgressDialog( Window*, sal_Bool bCancelable = sal_True, int nMin = 0, int nMax = 100 );
@@ -50,7 +50,7 @@ namespace padmin {
void startOperation( const String& );
void setFilename( const String& );
- sal_Bool isCanceled() { return mbCanceled; }
+ bool isCanceled() { return mbCanceled; }
};
} // namespace
commit 4faa36e42fd421d2abebd448f5ae3a6f7944f098
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 16:12:58 2012 +0200
sal_Bool->bool in jvmfwk
Change-Id: I8821bc7e4615421a710e6fdf913e646059dd5665
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index aab9b67..17d1f27 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -1031,7 +1031,7 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
//================================================================================
MergedSettings::MergedSettings():
- m_bEnabled(sal_False),
+ m_bEnabled(false),
m_sClassPath(),
m_vmParams(),
m_JRELocations(),
@@ -1078,7 +1078,7 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user)
m_JRELocations = * share.getJRELocations();
}
-sal_Bool MergedSettings::getEnabled() const
+bool MergedSettings::getEnabled() const
{
return m_bEnabled;
}
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 524efeb..7c99c50 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -275,7 +275,7 @@ private:
void merge(const NodeJava & share, const NodeJava & user);
- sal_Bool m_bEnabled;
+ bool m_bEnabled;
::rtl::OUString m_sClassPath;
@@ -291,7 +291,7 @@ public:
/** the default is true.
*/
- sal_Bool getEnabled() const;
+ bool getEnabled() const;
const ::rtl::OUString & getUserClassPath() const;
commit 6972b7a0af1b1f674988e42643491e2597ceef24
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 16:08:38 2012 +0200
sal_Bool->bool in i18nutil
Change-Id: Iafb0095a1320ad785e1d0ccbaeac9f26cc4dd02f
diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/i18nutil/inc/i18nutil/oneToOneMapping.hxx
index 4d1fb2e..533e4ad 100644
--- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx
+++ b/i18nutil/inc/i18nutil/oneToOneMapping.hxx
@@ -75,7 +75,7 @@ protected:
UnicodePairWithFlag *mpTableWF;
UnicodePairFlag mnFlag;
UnicodePairWithFlag **mpIndex[256];
- sal_Bool mbHasIndex;
+ bool mbHasIndex;
};
} } } }
diff --git a/i18nutil/source/utility/oneToOneMapping.cxx b/i18nutil/source/utility/oneToOneMapping.cxx
index d36188b..39c74de 100644
--- a/i18nutil/source/utility/oneToOneMapping.cxx
+++ b/i18nutil/source/utility/oneToOneMapping.cxx
@@ -61,7 +61,7 @@ oneToOneMappingWithFlag::oneToOneMappingWithFlag( UnicodePairWithFlag *rpTableWF
: oneToOneMapping( NULL, rnSize, sizeof(UnicodePairWithFlag) ),
mpTableWF ( rpTableWF ),
mnFlag ( rnFlag ),
- mbHasIndex( sal_False )
+ mbHasIndex( false )
{
}
@@ -98,7 +98,7 @@ void oneToOneMappingWithFlag::makeIndex()
mpIndex[high][low] = &mpTableWF[k];
}
- mbHasIndex = sal_True;
+ mbHasIndex = true;
}
}
commit b377ccca01070ce096fdf13aafc34020d5bc80ca
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 15:37:34 2012 +0200
sal_Bool->bool in lingucomponent
Change-Id: Ic3b55606faf60648d3a680b7a60c331047151ab5
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index b3106a0..f555052 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -84,7 +84,7 @@ using ::rtl::OUString;
Hyphenator::Hyphenator() :
aEvtListeners ( GetLinguMutex() )
{
- bDisposing = sal_False;
+ bDisposing = false;
pPropHelper = NULL;
aDicts = NULL;
numdict = 0;
@@ -860,7 +860,7 @@ void SAL_CALL Hyphenator::dispose()
if (!bDisposing)
{
- bDisposing = sal_True;
+ bDisposing = true;
EventObject aEvtObj( (XHyphenator *) this );
aEvtListeners.disposeAndClear( aEvtObj );
if (pPropHelper)
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index 933155b..504c370 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -88,8 +88,8 @@ class Hyphenator :
::cppu::OInterfaceContainerHelper aEvtListeners;
Reference< XMultiServiceFactory > rSMgr;
- linguistic::PropertyHelper_Hyphenation* pPropHelper;
- sal_Bool bDisposing;
+ linguistic::PropertyHelper_Hyphenation* pPropHelper;
+ bool bDisposing;
// disallow copy-constructor and assignment-operator for now
Hyphenator(const Hyphenator &);
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 1f88342..d020551 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -88,7 +88,7 @@ class MacSpellChecker :
::cppu::OInterfaceContainerHelper aEvtListeners;
Reference< XPropertyChangeListener > xPropHelper;
linguistic::PropertyHelper_Spell * pPropHelper;
- sal_Bool bDisposing;
+ bool bDisposing;
// disallow copy-constructor and assignment-operator for now
MacSpellChecker(const MacSpellChecker &);
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index c094195..f09e5aa 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -66,7 +66,7 @@ MacSpellChecker::MacSpellChecker() :
aDEncs = NULL;
aDLocs = NULL;
aDNames = NULL;
- bDisposing = sal_False;
+ bDisposing = false;
pPropHelper = NULL;
numdict = 0;
NSApplicationLoad();
@@ -523,7 +523,7 @@ void SAL_CALL
if (!bDisposing)
{
- bDisposing = sal_True;
+ bDisposing = true;
EventObject aEvtObj( (XSpellChecker *) this );
aEvtListeners.disposeAndClear( aEvtObj );
}
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 39d67d2..de1b7b6 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -81,7 +81,7 @@ SpellChecker::SpellChecker() :
numdict(0),
aEvtListeners(GetLinguMutex()),
pPropHelper(NULL),
- bDisposing(sal_False)
+ bDisposing(false)
{
}
@@ -587,7 +587,7 @@ void SAL_CALL SpellChecker::dispose()
if (!bDisposing)
{
- bDisposing = sal_True;
+ bDisposing = true;
EventObject aEvtObj( (XSpellChecker *) this );
aEvtListeners.disposeAndClear( aEvtObj );
if (pPropHelper)
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index d862dbd..998d4e8 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -76,8 +76,8 @@ class SpellChecker :
sal_Int32 numdict;
::cppu::OInterfaceContainerHelper aEvtListeners;
- linguistic::PropertyHelper_Spelling* pPropHelper;
- sal_Bool bDisposing;
+ linguistic::PropertyHelper_Spelling* pPropHelper;
+ bool bDisposing;
// disallow copy-constructor and assignment-operator for now
SpellChecker(const SpellChecker &);
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index ae88aea..6ae4d25 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -93,7 +93,7 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl()
Thesaurus::Thesaurus() :
aEvtListeners ( GetLinguMutex() )
{
- bDisposing = sal_False;
+ bDisposing = false;
pPropHelper = NULL;
aThes = NULL;
aCharSetInfo = NULL;
@@ -682,7 +682,7 @@ void SAL_CALL Thesaurus::dispose()
if (!bDisposing)
{
- bDisposing = sal_True;
+ bDisposing = true;
EventObject aEvtObj( (XThesaurus *) this );
aEvtListeners.disposeAndClear( aEvtObj );
if (pPropHelper)
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 58957f9..9a84b4b 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -85,7 +85,7 @@ class Thesaurus :
::cppu::OInterfaceContainerHelper aEvtListeners;
linguistic::PropertyHelper_Thesaurus* pPropHelper;
- sal_Bool bDisposing;
+ bool bDisposing;
CharClass ** aCharSetInfo;
MyThes ** aThes;
rtl_TextEncoding * aTEncs;
commit dea967349cea054b20fdfb22d6c59eee08f3faeb
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 15:30:51 2012 +0200
sal_Bool -> bool in hwpfilter
Change-Id: Ia1b6830ef9ab06a1914abb7f6d5857ce9d845061
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 44e8544..b356836 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -94,16 +94,16 @@ struct HwpReaderPrivate
{
HwpReaderPrivate()
{
- bFirstPara = sal_True;
- bInBody = sal_False;
- bInHeader = sal_False;
+ bFirstPara = true;
+ bInBody = false;
+ bInHeader = false;
nPnPos = 0;
pPn = 0L;
}
- sal_Bool bFirstPara;
- sal_Bool bInBody;
- sal_Bool bInHeader;
+ bool bFirstPara;
+ bool bInBody;
+ bool bInHeader;
ShowPageNum *pPn;
int nPnPos;
};
@@ -196,10 +196,10 @@ void HwpReader::makeBody()
rstartEl(ascii("office:body"), rList);
makeTextDecls();
HWPPara *hwppara = hwpfile.GetFirstPara();
- d->bInBody = sal_True;
+ d->bInBody = true;
parsePara(hwppara);
rendEl(ascii("office:body"));
- d->bInBody = sal_False;
+ d->bInBody = false;
}
@@ -1109,11 +1109,11 @@ void HwpReader::makeMasterStyles()
rstartEl(ascii("style:header"), rList);
if( pPage->pagenumber && pPage->pagenumber->where < 4 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
}
parsePara(pPage->header->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
rendEl(ascii("style:header"));
}
@@ -1123,12 +1123,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && ( pPage->pagenumber->where < 4
|| pPage->pagenumber->where == 7 ) )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
d->nPnPos = 3;
}
parsePara(pPage->header_even->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:header"));
@@ -1158,12 +1158,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && ( pPage->pagenumber->where < 4
|| pPage->pagenumber->where == 7 ) )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->nPnPos = 1;
d->pPn = pPage->pagenumber;
}
parsePara(pPage->header_odd->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:header-left"));
@@ -1210,11 +1210,11 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
}
parsePara(pPage->footer->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
rendEl(ascii("style:footer"));
}
@@ -1224,12 +1224,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
d->nPnPos = 3;
}
parsePara(pPage->footer_even->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:footer"));
@@ -1259,12 +1259,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
d->nPnPos = 1;
}
parsePara(pPage->footer_odd->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:footer-left"));
@@ -2722,12 +2722,12 @@ void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
padd(ascii("text:style-name"), sXML_CDATA,
ascii(getTStyleName(para->cshape.index, buf)));
@@ -2793,12 +2793,12 @@ void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
padd(ascii("text:style-name"), sXML_CDATA,
ascii(getTStyleName(curr, buf)));
@@ -2871,14 +2871,14 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
if( !pstart )
STARTP;
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
for (n = 0; n < para->nch && para->hhstr[n]->hh;
@@ -4811,12 +4811,12 @@ void HwpReader::parsePara(HWPPara * para, sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
rendEl( ascii("text:p") );
commit c69280ab4ef3d24d255605620ce5a4faca3ea184
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 15:25:26 2012 +0200
sal_Bool -> bool in chart2
Change-Id: Idba76b64746fb1eec0a723a9fcbac025eda3d9a1
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 049d0e9..86ec8f2 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -430,11 +430,9 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
}
}
-sal_Bool AxisLabelProperties::getIsStaggered() const
+bool AxisLabelProperties::getIsStaggered() const
{
- if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering )
- return sal_True;
- return sal_False;
+ return ( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering );
}
//.............................................................................
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 573173c..eda2862 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -70,10 +70,10 @@ struct AxisLabelProperties
AxisLabelStaggering eStaggering;
- sal_Bool bLineBreakAllowed;
- sal_Bool bOverlapAllowed;
+ bool bLineBreakAllowed;
+ bool bOverlapAllowed;
- sal_Bool bStackCharacters;
+ bool bStackCharacters;
double fRotationAngleDegree;
sal_Int32 nRhythm; //show only each nth label with n==nRhythm
@@ -83,7 +83,7 @@ struct AxisLabelProperties
void init( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& xAxisModel );
- sal_Bool getIsStaggered() const;
+ bool getIsStaggered() const;
};
struct AxisProperties
@@ -109,7 +109,7 @@ struct AxisProperties
//this direction is used to indicate in which direction inner tickmarks are to be drawn
double m_fInnerDirectionSign;
LabelAlignment m_aLabelAlignment;
- sal_Bool m_bDisplayLabels;
+ bool m_bDisplayLabels;
sal_Int32 m_nNumberFormatKey;
commit 9ee020af1cece4c8ad09cf6b2522647133ccffd2
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 15:19:10 2012 +0200
sal_Bool -> bool in chart2
Change-Id: I60f2ead9986afb13157ac9e6a394ff02bcf4de6f
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index ad05e71..ceb5a15 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -62,7 +62,7 @@ ChartTypeParameter::ChartTypeParameter()
, nSplineOrder(3)
, nGeometry3D(DataPointGeometry3D::CUBOID)
, eThreeDLookScheme(ThreeDLookScheme_Realistic)
- , bSortByXValues(sal_False)
+ , bSortByXValues(false)
{
}
@@ -81,7 +81,7 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit
, nSplineOrder(3)
, nGeometry3D(DataPointGeometry3D::CUBOID)
, eThreeDLookScheme(ThreeDLookScheme_Realistic)
- , bSortByXValues(sal_False)
+ , bSortByXValues(false)
{
}
ChartTypeParameter::~ChartTypeParameter()
@@ -218,7 +218,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r
sal_Int32 nSplineOrder = rParameter.nSplineOrder;
CurveStyle eCurveStyle = rParameter.eCurveStyle;
sal_Int32 nGeometry3D = rParameter.nGeometry3D;
- sal_Bool bSortByXValues = rParameter.bSortByXValues;
+ bool bSortByXValues = rParameter.bSortByXValues;
rParameter = (*aIter).second;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 0904445..43ee9d8 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -82,8 +82,8 @@ public:
sal_Int32 nGeometry3D;
- ThreeDLookScheme eThreeDLookScheme;
- sal_Bool bSortByXValues;
+ ThreeDLookScheme eThreeDLookScheme;
+ bool bSortByXValues;
};
typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap;
commit 4aa117b81ed236bea291007f4722a8ca6fef732e
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 15:13:24 2012 +0200
sal_Bool -> bool in comphelper
Change-Id: Ib7f2a10a4ff0227a5d5c137602c3c2f353334d24
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index e525478..13dcb7d 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -86,7 +86,7 @@ struct EmbedImpl
uno::WeakReference < uno::XInterface > m_xModel;
//EmbeddedObjectContainerNameMap maTempObjectContainer;
//uno::Reference < embed::XStorage > mxTempStorage;
- sal_Bool bOwnsStorage;
+ bool bOwnsStorage;
const uno::Reference < embed::XStorage >& GetReplacements();
};
@@ -117,7 +117,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
{
pImpl = new EmbedImpl;
pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
- pImpl->bOwnsStorage = sal_True;
+ pImpl->bOwnsStorage = true;
pImpl->mpTempObjectContainer = 0;
}
@@ -125,7 +125,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed::
{
pImpl = new EmbedImpl;
pImpl->mxStorage = rStor;
- pImpl->bOwnsStorage = sal_False;
+ pImpl->bOwnsStorage = false;
pImpl->mpTempObjectContainer = 0;
}
@@ -133,7 +133,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed::
{
pImpl = new EmbedImpl;
pImpl->mxStorage = rStor;
- pImpl->bOwnsStorage = sal_False;
+ pImpl->bOwnsStorage = false;
pImpl->mpTempObjectContainer = 0;
pImpl->m_xModel = xModel;
}
@@ -146,7 +146,7 @@ void EmbeddedObjectContainer::SwitchPersistence( const uno::Reference < embed::X
pImpl->mxStorage->dispose();
pImpl->mxStorage = rStor;
- pImpl->bOwnsStorage = sal_False;
+ pImpl->bOwnsStorage = false;
}
sal_Bool EmbeddedObjectContainer::CommitImageSubStorage()
commit 414ac85bfee7d034668e954e0f68751852c24062
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 25 15:11:54 2012 +0200
sal_Bool -> bool in comphelper
Change-Id: Id9f4aef6c7453cebd83dcaedf2ad7427e03cc960
diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx
index 305c552..f499b20 100644
--- a/comphelper/inc/comphelper/propagg.hxx
+++ b/comphelper/inc/comphelper/propagg.hxx
@@ -45,15 +45,15 @@ namespace internal
{
sal_Int32 nOriginalHandle;
sal_Int32 nPos;
- sal_Bool bAggregate;
+ bool bAggregate;
- OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, sal_Bool _bAggregate)
+ OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, bool _bAggregate)
:nOriginalHandle(_nOriginalHandle) ,nPos(_nPos) ,bAggregate(_bAggregate) { }
OPropertyAccessor()
- :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(sal_False) { }
+ :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(false) { }
- sal_Bool operator==(const OPropertyAccessor& rOb) const { return nPos == rOb.nPos; }
- sal_Bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; }
+ bool operator==(const OPropertyAccessor& rOb) const { return nPos == rOb.nPos; }
+ bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; }
};
typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > > PropertyAccessorMap;
@@ -149,7 +149,7 @@ public:
@return sal_True, if _nHandle marks an aggregate property, otherwise sal_False
*/
- virtual sal_Bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle,
+ virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle,
sal_Int32 _nHandle) const;
/** returns information about a property given by handle
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index a2d9ff0..bc24d94 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -226,11 +226,11 @@ sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandl
}
//------------------------------------------------------------------------------
-sal_Bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
+bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const
{
ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle);
- sal_Bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate;
+ bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate;
if (bRet)
{
if (_pOriginalHandle)
More information about the Libreoffice-commits
mailing list