mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svtools: sal_Bool->bool

Browse Source 
Change-Id: I56072620f9ea28833e1590a7fff7d71ed11fc34c
This commit is contained in:
Noel Grandin
2014-03-19 13:12:56 +02:00
parent 9f12e4a351
commit cafdef8109
7 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svtools/addresstemplate.hxx
View File

@@ -112,7 +112,7 @@ namespace svt
virtual bool PreNotify( NotifyEvent& _rNEvt ); virtual bool PreNotify( NotifyEvent& _rNEvt );
// implementations // implementations
void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar); void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar);
void implSelectField(ListBox* _pBox, const OUString& _rText); void implSelectField(ListBox* _pBox, const OUString& _rText);
void initalizeListBox(ListBox* _pList); void initalizeListBox(ListBox* _pList);

18
include/svtools/apearcfg.hxx
View File

@@ -47,12 +47,12 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
short nAAMinPixelHeight ; short nAAMinPixelHeight ;
#endif #endif
sal_Bool bMenuMouseFollow ; bool bMenuMouseFollow ;
#if defined( UNX ) #if defined( UNX )
sal_Bool bFontAntialiasing ; bool bFontAntialiasing ;
#endif #endif
static sal_Bool bInitialized ; static bool bInitialized ;
SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
@@ -76,19 +76,19 @@ public:
void SetApplicationDefaults ( Application* pApp ); void SetApplicationDefaults ( Application* pApp );
void SetMenuMouseFollow(sal_Bool bSet) {bMenuMouseFollow = bSet; SetModified();} void SetMenuMouseFollow(bool bSet) {bMenuMouseFollow = bSet; SetModified();}
sal_Bool IsMenuMouseFollow() const{return bMenuMouseFollow;} bool IsMenuMouseFollow() const{return bMenuMouseFollow;}
#if defined( UNX ) #if defined( UNX )
void SetFontAntiAliasing( sal_Bool bSet ) { bFontAntialiasing = bSet; SetModified(); } void SetFontAntiAliasing( bool bSet ) { bFontAntialiasing = bSet; SetModified(); }
sal_Bool IsFontAntiAliasing() const { return bFontAntialiasing; } bool IsFontAntiAliasing() const { return bFontAntialiasing; }
sal_uInt16 GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } sal_uInt16 GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; }
void SetFontAntialiasingMinPixelHeight( sal_uInt16 _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } void SetFontAntialiasingMinPixelHeight( sal_uInt16 _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); }
#endif #endif
static sal_Bool IsInitialized() { return bInitialized; } static bool IsInitialized() { return bInitialized; }
static void SetInitialized() { bInitialized = sal_True; } static void SetInitialized() { bInitialized = true; }
}; };
#endif // _OFA_APEARCFG_HXX #endif // _OFA_APEARCFG_HXX

13
include/svtools/asynclink.hxx
View File

@@ -34,8 +34,8 @@ class SVT_DLLPUBLIC AsynchronLink
Link _aLink; Link _aLink;
sal_uLong _nEventId; sal_uLong _nEventId;
Timer* _pTimer; Timer* _pTimer;
sal_Bool _bInCall; bool _bInCall;
sal_Bool* _pDeleted; bool* _pDeleted;
void* _pArg; void* _pArg;
::osl::Mutex* _pMutex; ::osl::Mutex* _pMutex;
@@ -47,7 +47,7 @@ public:
: _aLink( rLink ) : _aLink( rLink )
, _nEventId( 0 ) , _nEventId( 0 )
, _pTimer( 0 ) , _pTimer( 0 )
, _bInCall( sal_False ) , _bInCall( false )
, _pDeleted( 0 ) , _pDeleted( 0 )
, _pArg( 0 ) , _pArg( 0 )
, _pMutex( 0 ) , _pMutex( 0 )
@@ -55,7 +55,7 @@ public:
AsynchronLink() AsynchronLink()
: _nEventId( 0 ) : _nEventId( 0 )
, _pTimer( 0 ) , _pTimer( 0 )
, _bInCall( sal_False ) , _bInCall( false )
, _pDeleted( 0 ) , _pDeleted( 0 )
, _pArg( 0 ) , _pArg( 0 )
, _pMutex( 0 ) , _pMutex( 0 )
@@ -64,10 +64,9 @@ public:
void CreateMutex(); void CreateMutex();
void operator=( const Link& rLink ) { _aLink = rLink; } void operator=( const Link& rLink ) { _aLink = rLink; }
void Call( void* pObj, sal_Bool bAllowDoubles = sal_False, void Call( void* pObj, bool bAllowDoubles = false, bool bUseTimer = false );
sal_Bool bUseTimer = sal_False );
void ClearPendingCall( ); void ClearPendingCall( );
sal_Bool IsSet() const { return _aLink.IsSet(); } bool IsSet() const { return _aLink.IsSet(); }
Link GetLink() const { return _aLink; } Link GetLink() const { return _aLink; }
}; };

2
sfx2/source/control/shell.cxx
View File

@@ -1142,7 +1142,7 @@ void SfxShell::UIFeatureChanged()
pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) ); pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
// Multiple views allowed // Multiple views allowed
pImp->pUpdater->Call( pFrame->GetDispatcher(), sal_True ); pImp->pUpdater->Call( pFrame->GetDispatcher(), true );
} }
} }

6
svtools/source/config/apearcfg.cxx
View File

@@ -36,7 +36,7 @@
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False; bool SvtTabAppearanceCfg::bInitialized = false;
SvtTabAppearanceCfg::SvtTabAppearanceCfg() SvtTabAppearanceCfg::SvtTabAppearanceCfg()
:ConfigItem(OUString("Office.Common/View")) :ConfigItem(OUString("Office.Common/View"))
@@ -47,9 +47,9 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
#if defined( UNX ) #if defined( UNX )
,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT ) ,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT )
#endif #endif
,bMenuMouseFollow(sal_False) ,bMenuMouseFollow ( false )
#if defined( UNX ) #if defined( UNX )
,bFontAntialiasing ( sal_True ) ,bFontAntialiasing ( true )
#endif #endif
{ {
const Sequence<OUString>& rNames = GetPropertyNames(); const Sequence<OUString>& rNames = GetPropertyNames();

12
svtools/source/control/asynclink.cxx
View File

@@ -32,11 +32,11 @@ void AsynchronLink::CreateMutex()
if( !_pMutex ) _pMutex = new osl::Mutex; if( !_pMutex ) _pMutex = new osl::Mutex;
} }
void AsynchronLink::Call( void* pObj, sal_Bool void AsynchronLink::Call( void* pObj, bool
#ifdef DBG_UTIL #ifdef DBG_UTIL
bAllowDoubles bAllowDoubles
#endif #endif
, sal_Bool bUseTimer ) , bool bUseTimer )
{ {
#ifdef DBG_UTIL #ifdef DBG_UTIL
if ( bUseTimer || !_bInCall ) if ( bUseTimer || !_bInCall )
@@ -82,7 +82,7 @@ AsynchronLink::~AsynchronLink()
Application::RemoveUserEvent( _nEventId ); Application::RemoveUserEvent( _nEventId );
} }
delete _pTimer; delete _pTimer;
if( _pDeleted ) *_pDeleted = sal_True; if( _pDeleted ) *_pDeleted = true;
delete _pMutex; delete _pMutex;
} }
@@ -109,13 +109,13 @@ void AsynchronLink::ClearPendingCall()
void AsynchronLink::Call_Impl( void* pArg ) void AsynchronLink::Call_Impl( void* pArg )
{ {
_bInCall = sal_True; _bInCall = true;
sal_Bool bDeleted = sal_False; bool bDeleted = false;
_pDeleted = &bDeleted; _pDeleted = &bDeleted;
_aLink.Call( pArg ); _aLink.Call( pArg );
if( !bDeleted ) if( !bDeleted )
{ {
_bInCall = sal_False; _bInCall = false;
_pDeleted = 0; _pDeleted = 0;
} }
} }

10
svtools/source/dialogs/addresstemplate.cxx
View File

@@ -680,7 +680,7 @@ void AssignmentPersistentData::Commit()
resetFields(); resetFields();
m_pFieldScroller->SetThumbPos(0); m_pFieldScroller->SetThumbPos(0);
m_pImpl->nFieldScrollPos = -1; m_pImpl->nFieldScrollPos = -1;
implScrollFields(0, sal_False, sal_False); implScrollFields(0, false, false);
// the logical names // the logical names
OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES));
@@ -813,7 +813,7 @@ void AssignmentPersistentData::Commit()
IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar) IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar)
{ {
implScrollFields( _pScrollBar->GetThumbPos(), sal_True, sal_True ); implScrollFields( _pScrollBar->GetThumbPos(), true, true );
return 0L; return 0L;
} }
@@ -1026,7 +1026,7 @@ void AssignmentPersistentData::Commit()
} }
void AddressBookSourceDialog::implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar) void AddressBookSourceDialog::implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar)
{ {
if (_nPos == m_pImpl->nFieldScrollPos) if (_nPos == m_pImpl->nFieldScrollPos)
// nothing to do // nothing to do
@@ -1283,7 +1283,7 @@ void AssignmentPersistentData::Commit()
{ // we can still scroll down { // we can still scroll down
sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2; sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2;
// -> scroll down // -> scroll down
implScrollFields(m_pImpl->nFieldScrollPos + 1, sal_False, sal_True); implScrollFields(m_pImpl->nFieldScrollPos + 1, false, true);
// give the left control in the "next" line the focus // give the left control in the "next" line the focus
m_pImpl->pFields[nNextFocusList]->GrabFocus(); m_pImpl->pFields[nNextFocusList]->GrabFocus();
// return saying "have handled this" // return saying "have handled this"
@@ -1297,7 +1297,7 @@ void AssignmentPersistentData::Commit()
if (m_pImpl->nFieldScrollPos > 0) if (m_pImpl->nFieldScrollPos > 0)
{ // we can still scroll up { // we can still scroll up
// -> scroll up // -> scroll up
implScrollFields(m_pImpl->nFieldScrollPos - 1, sal_False, sal_True); implScrollFields(m_pImpl->nFieldScrollPos - 1, false, true);
// give the right control in the "prebious" line the focus // give the right control in the "prebious" line the focus
m_pImpl->pFields[0 - 1 + 2]->GrabFocus(); m_pImpl->pFields[0 - 1 + 2]->GrabFocus();
// return saying "have handled this" // return saying "have handled this"