diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 09:36:09 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 09:49:02 +0200 |
commit | c24212ec89a45c531e7f1ae6d45ccc34d26b8e98 (patch) | |
tree | 67ab6e1367310a0ba476fd8cd7a4cc2a0d474558 /sd | |
parent | c5e08b42ace5f4481c3db87b4fb6ae2dbf9d9a51 (diff) |
Silence sal_Bool -> sal_IntPtr Link return value mismatches for now
Some uses of untyped Link<> (returning sal_IntPtr) are hard to update to typed
versions, but upcoming changes to loplugin:implicitboolconversion would flag
these uses of sal_False/True, so just explicitly cast them to sal_IntPtr for
now.
Change-Id: I654e555e85faba0b30178c978e7d50fc7240b004
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/annotations/annotationtag.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 8b9fef40f97e..440c7bf940fb 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -665,7 +665,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) } } } - return sal_True; + return sal_IntPtr(true); } IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl) diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 3acd0bfc5318..31abab125e46 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -749,14 +749,14 @@ IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent*, pEvent) case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_RESIZE: SetSizePixel(GetParent()->GetSizePixel()); - return sal_True; + return sal_IntPtr(true); default: - return sal_False; + return sal_IntPtr(false); } } - return sal_False; + return sal_IntPtr(false); } void LayoutMenu::DataChanged (const DataChangedEvent& rEvent) diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index d17c08ad80dd..81fe35a6ab9a 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -604,7 +604,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) } } - return sal_True; + return sal_IntPtr(true); } void SlideSorterController::GetCtrlState (SfxItemSet& rSet) diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 8c85255985b8..6f2ac79b5bad 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -265,7 +265,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) mrSlideSorter.GetContentWindow()->SetVisibleXY(-1, nRelativePosition); mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - return sal_True; + return sal_IntPtr(true); } IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) @@ -281,7 +281,7 @@ IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) mrSlideSorter.GetContentWindow()->SetVisibleXY(nRelativePosition, -1); mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - return sal_True; + return sal_IntPtr(true); } void ScrollBarManager::SetWindowOrigin ( diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index d5ebaf6c8a07..ff3596f87c6a 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1029,7 +1029,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, break; } } - return sal_True; + return sal_IntPtr(true); } ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( |