summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svtools/addresstemplate.hxx2
-rw-r--r--include/svtools/apearcfg.hxx20
-rw-r--r--include/svtools/asynclink.hxx13
-rw-r--r--sfx2/source/control/shell.cxx2
-rw-r--r--svtools/source/config/apearcfg.cxx6
-rw-r--r--svtools/source/control/asynclink.cxx12
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx10
7 files changed, 32 insertions, 33 deletions
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index dc72b9e2f896..68b9ff80c867 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -112,7 +112,7 @@ namespace svt
virtual bool PreNotify( NotifyEvent& _rNEvt );
// 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 initalizeListBox(ListBox* _pList);
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 45a8e8fac2f5..f08ec1a19b86 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -47,12 +47,12 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
short nAAMinPixelHeight ;
#endif
- sal_Bool bMenuMouseFollow ;
+ bool bMenuMouseFollow ;
#if defined( UNX )
- sal_Bool bFontAntialiasing ;
+ bool bFontAntialiasing ;
#endif
- static sal_Bool bInitialized ;
+ static bool bInitialized ;
SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
@@ -76,19 +76,19 @@ public:
void SetApplicationDefaults ( Application* pApp );
- void SetMenuMouseFollow(sal_Bool bSet) {bMenuMouseFollow = bSet; SetModified();}
- sal_Bool IsMenuMouseFollow() const{return bMenuMouseFollow;}
+ void SetMenuMouseFollow(bool bSet) {bMenuMouseFollow = bSet; SetModified();}
+ bool IsMenuMouseFollow() const{return bMenuMouseFollow;}
#if defined( UNX )
- void SetFontAntiAliasing( sal_Bool bSet ) { bFontAntialiasing = bSet; SetModified(); }
- sal_Bool IsFontAntiAliasing() const { return bFontAntialiasing; }
+ void SetFontAntiAliasing( bool bSet ) { bFontAntialiasing = bSet; SetModified(); }
+ 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(); }
#endif
- static sal_Bool IsInitialized() { return bInitialized; }
- static void SetInitialized() { bInitialized = sal_True; }
+ static bool IsInitialized() { return bInitialized; }
+ static void SetInitialized() { bInitialized = true; }
};
#endif // _OFA_APEARCFG_HXX
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index 1428cd564133..55a156e37014 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -34,8 +34,8 @@ class SVT_DLLPUBLIC AsynchronLink
Link _aLink;
sal_uLong _nEventId;
Timer* _pTimer;
- sal_Bool _bInCall;
- sal_Bool* _pDeleted;
+ bool _bInCall;
+ bool* _pDeleted;
void* _pArg;
::osl::Mutex* _pMutex;
@@ -47,7 +47,7 @@ public:
: _aLink( rLink )
, _nEventId( 0 )
, _pTimer( 0 )
- , _bInCall( sal_False )
+ , _bInCall( false )
, _pDeleted( 0 )
, _pArg( 0 )
, _pMutex( 0 )
@@ -55,7 +55,7 @@ public:
AsynchronLink()
: _nEventId( 0 )
, _pTimer( 0 )
- , _bInCall( sal_False )
+ , _bInCall( false )
, _pDeleted( 0 )
, _pArg( 0 )
, _pMutex( 0 )
@@ -64,10 +64,9 @@ public:
void CreateMutex();
void operator=( const Link& rLink ) { _aLink = rLink; }
- void Call( void* pObj, sal_Bool bAllowDoubles = sal_False,
- sal_Bool bUseTimer = sal_False );
+ void Call( void* pObj, bool bAllowDoubles = false, bool bUseTimer = false );
void ClearPendingCall( );
- sal_Bool IsSet() const { return _aLink.IsSet(); }
+ bool IsSet() const { return _aLink.IsSet(); }
Link GetLink() const { return _aLink; }
};
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index f77261b4a5f8..4f8248d1cba8 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1142,7 +1142,7 @@ void SfxShell::UIFeatureChanged()
pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
// Multiple views allowed
- pImp->pUpdater->Call( pFrame->GetDispatcher(), sal_True );
+ pImp->pUpdater->Call( pFrame->GetDispatcher(), true );
}
}
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 0276b9116b4b..3c2a70e15c63 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -36,7 +36,7 @@
using namespace ::rtl;
using namespace ::com::sun::star::uno;
-sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
+bool SvtTabAppearanceCfg::bInitialized = false;
SvtTabAppearanceCfg::SvtTabAppearanceCfg()
:ConfigItem(OUString("Office.Common/View"))
@@ -47,9 +47,9 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
#if defined( UNX )
,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT )
#endif
- ,bMenuMouseFollow(sal_False)
+ ,bMenuMouseFollow ( false )
#if defined( UNX )
- ,bFontAntialiasing ( sal_True )
+ ,bFontAntialiasing ( true )
#endif
{
const Sequence<OUString>& rNames = GetPropertyNames();
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 32c5bd810ed2..cdc18888cfe9 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -32,11 +32,11 @@ void AsynchronLink::CreateMutex()
if( !_pMutex ) _pMutex = new osl::Mutex;
}
-void AsynchronLink::Call( void* pObj, sal_Bool
+void AsynchronLink::Call( void* pObj, bool
#ifdef DBG_UTIL
bAllowDoubles
#endif
-, sal_Bool bUseTimer )
+, bool bUseTimer )
{
#ifdef DBG_UTIL
if ( bUseTimer || !_bInCall )
@@ -82,7 +82,7 @@ AsynchronLink::~AsynchronLink()
Application::RemoveUserEvent( _nEventId );
}
delete _pTimer;
- if( _pDeleted ) *_pDeleted = sal_True;
+ if( _pDeleted ) *_pDeleted = true;
delete _pMutex;
}
@@ -109,13 +109,13 @@ void AsynchronLink::ClearPendingCall()
void AsynchronLink::Call_Impl( void* pArg )
{
- _bInCall = sal_True;
- sal_Bool bDeleted = sal_False;
+ _bInCall = true;
+ bool bDeleted = false;
_pDeleted = &bDeleted;
_aLink.Call( pArg );
if( !bDeleted )
{
- _bInCall = sal_False;
+ _bInCall = false;
_pDeleted = 0;
}
}
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index ce6fcc0ce60b..28de0481f5fa 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -680,7 +680,7 @@ void AssignmentPersistentData::Commit()
resetFields();
m_pFieldScroller->SetThumbPos(0);
m_pImpl->nFieldScrollPos = -1;
- implScrollFields(0, sal_False, sal_False);
+ implScrollFields(0, false, false);
// the logical names
OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES));
@@ -813,7 +813,7 @@ void AssignmentPersistentData::Commit()
IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar)
{
- implScrollFields( _pScrollBar->GetThumbPos(), sal_True, sal_True );
+ implScrollFields( _pScrollBar->GetThumbPos(), true, true );
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)
// nothing to do
@@ -1283,7 +1283,7 @@ void AssignmentPersistentData::Commit()
{ // we can still scroll down
sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2;
// -> 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
m_pImpl->pFields[nNextFocusList]->GrabFocus();
// return saying "have handled this"
@@ -1297,7 +1297,7 @@ void AssignmentPersistentData::Commit()
if (m_pImpl->nFieldScrollPos > 0)
{ // we can still 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
m_pImpl->pFields[0 - 1 + 2]->GrabFocus();
// return saying "have handled this"
generated by cgit (git 2.34.1) at 2025-03-01 20:11:11 +0000