summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
commite8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch)
treedae18a3acbf29c192118e7c003f80df8da8e21ae /desktop
parent1c8402465cfd4df862409dc310f5f099d044c4d8 (diff)
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'desktop')
-rw-r--r--desktop/inc/app.hxx2
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/deployment/gui/descedit.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx2
-rw-r--r--desktop/source/splash/splash.cxx8
10 files changed, 17 insertions, 17 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index efe4edc4a4b9..58700919638e 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -76,7 +76,7 @@ class Desktop : public Application
virtual void Init();
virtual void InitFinished();
virtual void DeInit();
- virtual sal_Bool QueryExit();
+ virtual bool QueryExit();
virtual sal_uInt16 Exception(sal_uInt16 nError);
virtual void OverrideSystemSettings( AllSettings& rSettings );
virtual void AppEvent( const ApplicationEvent& rAppEvent );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 316580e75f18..eb938930885e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -703,7 +703,7 @@ void Desktop::DeInit()
SAL_INFO( "desktop.app", "FINISHED WITH Destop::DeInit" );
}
-sal_Bool Desktop::QueryExit()
+bool Desktop::QueryExit()
{
try
{
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 7554c64b1154..0a30de2f0e0b 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -50,7 +50,7 @@ void DescriptionEdit::Init()
// read-only
SetReadOnly();
// no cursor
- EnableCursor( sal_False );
+ EnableCursor( false );
}
// -----------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index df4b1245fb64..66cdab2ed355 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1176,7 +1176,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
}
//------------------------------------------------------------------------------
-sal_Bool ExtMgrDialog::Close()
+bool ExtMgrDialog::Close()
{
bool bRet = m_pManager->queryTermination();
if ( bRet )
@@ -1556,7 +1556,7 @@ void UpdateRequiredDialog::Resize()
Rectangle aNativeControlRegion, aNativeContentRegion;
if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
CTRL_STATE_ENABLED, aValue, OUString(),
- aNativeControlRegion, aNativeContentRegion ) != sal_False )
+ aNativeControlRegion, aNativeContentRegion ) )
{
nProgressHeight = aNativeControlRegion.GetHeight();
}
@@ -1601,7 +1601,7 @@ short UpdateRequiredDialog::Execute()
//------------------------------------------------------------------------------
// VCL::Dialog
-sal_Bool UpdateRequiredDialog::Close()
+bool UpdateRequiredDialog::Close()
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index b4817edb213b..39f122e16be7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -142,7 +142,7 @@ public:
virtual ~ExtMgrDialog();
virtual bool Notify( NotifyEvent& rNEvt );
- virtual sal_Bool Close();
+ virtual bool Close();
virtual void showProgress( bool bStart );
virtual void updateProgress( const OUString &rText,
@@ -216,7 +216,7 @@ public:
virtual short Execute();
virtual void Resize();
- virtual sal_Bool Close();
+ virtual bool Close();
virtual void showProgress( bool bStart );
virtual void updateProgress( const OUString &rText,
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 3bae5ce8558a..d91dd066c15c 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -578,7 +578,7 @@ UpdateDialog::~UpdateDialog()
}
//------------------------------------------------------------------------------
-sal_Bool UpdateDialog::Close() {
+bool UpdateDialog::Close() {
m_thread->stop();
return ModalDialog::Close();
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index b19e575986cf..1fe77c521d5c 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -86,7 +86,7 @@ public:
~UpdateDialog();
- virtual sal_Bool Close();
+ virtual bool Close();
virtual short Execute();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index e76153b650bf..23e68f35abbd 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -235,14 +235,14 @@ UpdateInstallDialog::UpdateInstallDialog(
m_xExtensionManager = css::deployment::ExtensionManager::get( xCtx );
m_cancel.SetClickHdl(LINK(this, UpdateInstallDialog, cancelHandler));
- m_mle_info.EnableCursor(sal_False);
+ m_mle_info.EnableCursor(false);
if ( ! dp_misc::office_is_running())
m_help.Disable();
}
UpdateInstallDialog::~UpdateInstallDialog() {}
-sal_Bool UpdateInstallDialog::Close()
+bool UpdateInstallDialog::Close()
{
m_thread->stop();
return ModalDialog::Close();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 3a61fe033c03..2bd9daf6c328 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -62,7 +62,7 @@ public:
~UpdateInstallDialog();
- sal_Bool Close();
+ bool Close();
virtual short Execute();
private:
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 755684be2bef..c85d3b7f87f4 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -169,7 +169,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
_bProgressEnd = sal_False;
SolarMutexGuard aSolarGuard;
if ( _eBitmapMode == BM_FULLSCREEN )
- ShowFullScreenMode( sal_True );
+ ShowFullScreenMode( true );
Show();
Paint(Rectangle());
Flush();
@@ -196,7 +196,7 @@ void SAL_CALL SplashScreen::reset()
if (_bVisible && !_bProgressEnd )
{
if ( _eBitmapMode == BM_FULLSCREEN )
- ShowFullScreenMode( sal_True );
+ ShowFullScreenMode( true );
Show();
updateStatus();
}
@@ -213,7 +213,7 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
if (_bVisible && !_bProgressEnd)
{
if ( _eBitmapMode == BM_FULLSCREEN )
- ShowFullScreenMode( sal_True );
+ ShowFullScreenMode( true );
Show();
updateStatus();
}
@@ -229,7 +229,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
SolarMutexGuard aSolarGuard;
if (_bVisible && !_bProgressEnd) {
if ( _eBitmapMode == BM_FULLSCREEN )
- ShowFullScreenMode( sal_True );
+ ShowFullScreenMode( true );
Show();
if (nValue >= _iMax) _iProgress = _iMax;
else _iProgress = nValue;