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 /sw | |
| 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 'sw')
| -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 |
3 files changed, 3 insertions, 3 deletions
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 ) |