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 | |
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
-rw-r--r-- | cui/source/customize/eventdlg.cxx | 2 | ||||
-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 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/sidebar/AsynchronousCall.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 2 |
16 files changed, 26 insertions, 26 deletions
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 20e00dedd7a1..970bd055bbd5 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -210,7 +210,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) } mpImpl->pEventLB->SetUpdateMode( true ); - return sal_True; + return sal_IntPtr(true); } bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet ) 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 ( diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9c82774eea12..c75b6fa9aa08 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2136,7 +2136,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) nLastItemId = pMenu->GetCurItemId(); Application::PostUserEvent( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ), 0 ); - return sal_True; + return sal_IntPtr(true); } switch(nLastItemId) { @@ -2145,9 +2145,9 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) case ID_DELETE: DeleteHdl(0); break; case ID_HIDE: HideHdl(0); break; case ID_SHOW: ShowHdl(0); break; - default: return sal_False; + default: return sal_IntPtr(false); } - return sal_True; + return sal_IntPtr(true); } SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 0866ef8993e6..7c56da1df5b1 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -454,7 +454,7 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid ) Application::PostUserEvent( LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo ); } - return sal_True; + return sal_IntPtr(true); } IMPL_STATIC_LINK_NOINSTANCE( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index cbe6f09ab13b..3cf67fe6b7bc 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -222,11 +222,11 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) if (!aCommand.isEmpty() && pBindings) { pBindings->ExecuteCommand_Impl( aCommand ); - return sal_True; + return sal_IntPtr(true); } if (!pBindings) - return sal_True; + return sal_IntPtr(true); if ( pBindings->IsBound(nId) ) // normal function @@ -235,7 +235,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) // special menu function pBindings->GetDispatcher_Impl()->Execute( nId ); - return sal_True; + return sal_IntPtr(true); } SfxPopupMenuManager::~SfxPopupMenuManager() diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 36ff55a9fde3..93e729ee1926 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -961,12 +961,12 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) nTaskId++; } - return sal_True; + return sal_IntPtr(true); } else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST ) { SfxPickList::ExecuteMenuEntry( nSlotId ); - return sal_True; + return sal_IntPtr(true); } OUString sCommand = pMenu->GetItemCommand(nSlotId); @@ -975,7 +975,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) else pBindings->Execute(nSlotId); - return sal_True; + return sal_IntPtr(true); } diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index b95dc24ee8a1..2806804efb4c 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -62,7 +62,7 @@ IMPL_LINK(AsynchronousCall, HandleUserCall, void*, EMPTYARG ) if (maAction) maAction(); - return sal_True; + return sal_IntPtr(true); } } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 0753cdefef42..633def05fb43 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -314,7 +314,7 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) Point( mpScrollContainer->GetPosPixel().X(), nYOffset)); - return sal_True; + return sal_IntPtr(true); } //----- Deck::ScrollContainerWindow ------------------------------------------- diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index e34f44c02b6b..690d6f913eff 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -749,7 +749,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent==NULL) - return sal_False; + return sal_IntPtr(false); if (pEvent->GetWindow() == mpParentWindow) { @@ -804,7 +804,7 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent) } } - return sal_True; + return sal_IntPtr(true); } void SidebarController::ShowPopupMenu ( diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 9e1500a926df..c1e10cff7684 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -507,7 +507,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl) if( bSetAutoFmt ) pShell->SetTableAutoFmt( (*pTableTbl)[ nIndex ] ); EndDialog( RET_OK ); - return sal_True; + return sal_IntPtr(true); } AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) : diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index db20ee70bcef..27a522928586 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1162,7 +1162,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent ) mrMgr.MakeVisible( this ); } } - return sal_True; + return sal_IntPtr(true); } void SwSidebarWin::Delete() diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 012a6fd02a6f..03d9f166c3f5 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -774,7 +774,7 @@ void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu) { ExcecuteContextMenuAction( pMenu->GetCurItemId()); - return sal_True; + return sal_IntPtr(true); } void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) |