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 /sd/source | |
| parent | e7a99b3cde77be1604c2360d3e55b5247ad32cc0 (diff) | |
Be explicit when using bool as integral value (as Link return value)
Change-Id: I3b345be909ed2cb93cd0d478af4b26c9909d2726
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/docshell/docshel2.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsb.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index bd11df4f1dd2..379aa76caf9d 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -417,12 +417,12 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr IMPL_LINK( DrawDocShell, RenameSlideHdl, AbstractSvxNameDialog*, pDialog ) { if( ! pDialog ) - return 0; + return long(false); OUString aNewName; pDialog->GetName( aNewName ); - return IsNewPageNameValid( aNewName ); + return long(IsNewPageNameValid( aNewName )); } } // end of namespace sd diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 71e7b2fa4d60..1179330ded88 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -955,7 +955,7 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog) if (pDescriptor.get() != NULL) pCurrentPage = pDescriptor->GetPage(); - return ( (pCurrentPage!=NULL && aNewName == pCurrentPage->GetName()) + return long( (pCurrentPage!=NULL && aNewName == pCurrentPage->GetName()) || (mrSlideSorter.GetViewShell() && mrSlideSorter.GetViewShell()->GetDocSh()->IsNewPageNameValid( aNewName ) )); } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 26dc337f6124..31bc8879e563 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -151,7 +151,7 @@ IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog*, pDialog ) SdPage* pCurrentPage = GetDoc()->GetSdPage( maTabControl.GetCurPageId() - 1, GetPageKind() ); - return pCurrentPage && ( aNewName == pCurrentPage->GetName() || GetDocSh()->IsNewPageNameValid( aNewName ) ); + return long(pCurrentPage && ( aNewName == pCurrentPage->GetName() || GetDocSh()->IsNewPageNameValid( aNewName ) )); } |