diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 16:58:33 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 18:45:14 +0100 |
commit | 3e5ff1f8d4da3470fa4016264c9410834a9736d8 (patch) | |
tree | 15f1dd6828469d083eb6ad2f96efc4a949e576b0 /sc | |
parent | e7a99b3cde77be1604c2360d3e55b5247ad32cc0 (diff) |
Be explicit when using bool as integral value (as Link return value)
Change-Id: I3b345be909ed2cb93cd0d478af4b26c9909d2726
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/tablink.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/anyrefdg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/namedlg/namedlg.cxx | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 4e741185d476..245f36ba52d1 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -487,9 +487,8 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) { - long nRes = Refresh( aFileName, aFilterName, aSourceArea, - GetRefreshDelay() ) == true; - return nRes; + return long( + Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() )); } IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 9ad746df0823..e4e04fbd0ceb 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -984,7 +984,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) { ScDBDocFunc aFunc(*this); - sal_Bool bContinue = sal_True; + bool bContinue = true; ScDBData* pDBData = static_cast<ScDBData*>(pRefreshTimer); ScImportParam aImportParam; pDBData->GetImportParam( aImportParam ); @@ -1001,7 +1001,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) } } - return bContinue != 0; + return long(bContinue); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 0e89441aa5da..5c095a8b0d25 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -418,8 +418,7 @@ sal_Bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilt IMPL_LINK_NOARG(ScTableLink, RefreshHdl) { - long nRes = Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() ) != 0; - return nRes; + return long(Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() )); } IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 00945de87c5a..5f04c4caa769 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -330,7 +330,7 @@ void ScFormulaReferenceHelper::Init() IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel ) { if ( !pSelAccel ) - return 0; + return long(false); switch ( pSelAccel->GetCurKeyCode().GetCode() ) { @@ -341,7 +341,7 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel ) m_pDlg->RefInputDone( true ); break; } - return true; + return long(true); } typedef std::vector<Window*> winvec; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index b013ba54c3c2..12ed8411c3c2 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -483,7 +483,7 @@ IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl) IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl) { - return AddPushed(); + return long(AddPushed()); } IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl) |