mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence sal_Bool -> sal_IntPtr Link return value mismatches for now

Browse Source 
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
This commit is contained in:
Stephan Bergmann 2015-05-08 09:36:09 +02:00
parent c5e08b42ac
commit c24212ec89
16 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/customize/eventdlg.cxx
View File

@ -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 )

2
sd/source/ui/annotations/annotationtag.cxx
View File

@ -665,7 +665,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent)
}
}
}
return sal_True;
return sal_IntPtr(true);
}
IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl)

6
sd/source/ui/sidebar/LayoutMenu.cxx
View File

@ -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)

2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx
View File

@ -604,7 +604,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent)
}
}
return sal_True;
return sal_IntPtr(true);
}
void SlideSorterController::GetCtrlState (SfxItemSet& rSet)

4
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
View File

@ -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 (

2
sd/source/ui/view/ViewShellManager.cxx
View File

@ -1029,7 +1029,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
break;
}
}
return sal_True;
return sal_IntPtr(true);
}
ShellDescriptor ViewShellManager::Implementation::CreateSubShell (

6
sfx2/source/dialog/templdlg.cxx
View File

@ -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

2
sfx2/source/menu/mnuitem.cxx
View File

@ -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 )

6
sfx2/source/menu/mnumgr.cxx
View File

@ -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()

6
sfx2/source/menu/virtmenu.cxx
View File

@ -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);
}

2
sfx2/source/sidebar/AsynchronousCall.cxx
View File

@ -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

2
sfx2/source/sidebar/Deck.cxx
View File

@ -314,7 +314,7 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG)
Point(
mpScrollContainer->GetPosPixel().X(),
nYOffset));
return sal_True;
return sal_IntPtr(true);
}
//----- Deck::ScrollContainerWindow -------------------------------------------

4
sfx2/source/sidebar/SidebarController.cxx
View File

@ -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 (

2
sw/source/ui/table/tautofmt.cxx
View File

@ -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) :

2
sw/source/uibase/docvw/SidebarWin.cxx
View File

@ -1162,7 +1162,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent )
mrMgr.MakeVisible( this );
}
}
return sal_True;
return sal_IntPtr(true);
}
void SwSidebarWin::Delete()

2
sw/source/uibase/utlui/glbltree.cxx
View File

@ -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 )