[Libreoffice-commits] core.git: 4 commits - cui/source include/sfx2 sc/source sfx2/source sw/source
Noel Grandin
noel at peralex.com
Thu Aug 13 02:46:27 PDT 2015
cui/source/inc/numfmt.hxx | 4 ++--
cui/source/tabpages/numfmt.cxx | 2 +-
include/sfx2/app.hxx | 10 ++++++----
include/sfx2/templateabstractview.hxx | 6 +++---
include/sfx2/templatedlg.hxx | 4 ++--
include/sfx2/thumbnailview.hxx | 4 ++--
include/sfx2/thumbnailviewitem.hxx | 3 ---
include/sfx2/titledockwin.hxx | 4 ++--
sc/source/ui/attrdlg/attrdlg.cxx | 6 ++----
sc/source/ui/inc/attrdlg.hxx | 2 +-
sfx2/source/control/templateabstractview.cxx | 6 +-----
sfx2/source/control/templatelocalview.cxx | 4 ----
sfx2/source/control/templatesearchview.cxx | 3 +--
sfx2/source/control/thumbnailviewitem.cxx | 5 -----
sfx2/source/dialog/backingwindow.cxx | 4 +---
sfx2/source/dialog/backingwindow.hxx | 2 +-
sfx2/source/dialog/taskpane.cxx | 9 ++++-----
sfx2/source/doc/templatedlg.cxx | 20 ++++++++------------
sfx2/source/inc/templatesearchview.hxx | 4 ++--
sw/source/uibase/inc/navipi.hxx | 2 +-
sw/source/uibase/utlui/navipi.cxx | 3 +--
21 files changed, 41 insertions(+), 66 deletions(-)
New commits:
commit bb1cc8361d13461d8bcb9a9a4a8c1b9c1721c991
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 13 10:49:17 2015 +0200
make Link<> instances typed
Change-Id: I0727c3ac6e6e5cf087d63ddfb633845ae578cdbb
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 4200910..5d16fe2 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -60,7 +60,7 @@ namespace sfx2
return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
}
- void SetEndDockingHdl( const Link<>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
+ void SetEndDockingHdl( const Link<TitledDockingWindow*,void>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
/** resets the toolbox. Upon return, the only item in the toolbox is the closer.
*/
@@ -122,7 +122,7 @@ namespace sfx2
VclPtr<ToolBox> m_aToolbox;
VclPtr<Window> m_aContentWindow;
- Link<> m_aEndDockingHdl;
+ Link<TitledDockingWindow*,void> m_aEndDockingHdl;
/** The border that is painted around the inner window. The bevel
shadow lines are part of the border, so where the border is 0 no
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 004349b..4bf3d16 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -841,7 +841,7 @@ namespace sfx2
private:
DECL_LINK_TYPED( OnToolboxClicked, ToolBox*, void );
DECL_LINK( OnMenuItemSelected, Menu* );
- DECL_LINK( DockingChanged, TitledDockingWindow* );
+ DECL_LINK_TYPED( DockingChanged, TitledDockingWindow*, void );
::std::unique_ptr< PopupMenu > impl_createPopupMenu() const;
/// sets the given layout for the panel selector
@@ -951,15 +951,14 @@ namespace sfx2
}
- IMPL_LINK( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow )
+ IMPL_LINK_TYPED( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow, void )
{
- ENSURE_OR_RETURN( i_pDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?", 0L );
+ ENSURE_OR_RETURN_VOID( i_pDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?" );
if ( impl_getLayout() == LAYOUT_DRAWERS )
- return 0L;
+ return;
impl_setLayout( lcl_getTabLayoutFromAlignment( i_pDockingWindow->GetAlignment() ) );
- return 1L;
}
commit c9f20fbc2caf04629cc56f556b4a09bd6599a959
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 13 10:43:22 2015 +0200
make Link<> instances typed
Change-Id: I0805c49b1ae7f324d5235e46b3c55e67239195c7
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 2b0426e..9272c90 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -70,7 +70,7 @@ private:
DECL_LINK_TYPED(TBXTemplateHdl, ToolBox*, void);
DECL_LINK_TYPED(TBXDropdownHdl, ToolBox*, void);
- DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*);
+ DECL_LINK_TYPED(TVItemStateHdl, const ThumbnailViewItem*, void);
DECL_LINK(MenuSelectHdl, Menu*);
DECL_LINK(MoveMenuSelectHdl, Menu*);
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a522ef8..fa4563d 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -231,7 +231,7 @@ public:
void sortItems (const std::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) > &func);
- void setItemStateHdl (const Link<> &aLink) { maItemStateHdl = aLink; }
+ void setItemStateHdl (const Link<const ThumbnailViewItem*,void> &aLink) { maItemStateHdl = aLink; }
virtual void Resize() SAL_OVERRIDE;
@@ -323,7 +323,7 @@ protected:
Color maHighlightTextColor; ///< Color of the text for the higlighted item.
double mfHighlightTransparence; ///< Transparence of the highlight.
- Link<> maItemStateHdl;
+ Link<const ThumbnailViewItem*, void> maItemStateHdl;
ThumbnailItemAttributes* mpItemAttrs;
std::function<bool (const ThumbnailViewItem*)> maFilterFunc;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 275b8e5..ae677b1 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -311,15 +311,15 @@ void SfxTemplateManagerDlg::dispose()
delete maRepositories[i];
// Ignore view events since we are cleaning the object
- mpLocalView->setItemStateHdl(Link<>());
+ mpLocalView->setItemStateHdl(Link<const ThumbnailViewItem*,void>());
mpLocalView->setOpenRegionHdl(Link<void*,void>());
mpLocalView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>());
- mpRemoteView->setItemStateHdl(Link<>());
+ mpRemoteView->setItemStateHdl(Link<const ThumbnailViewItem*,void>());
mpRemoteView->setOpenRegionHdl(Link<void*,void>());
mpRemoteView->setOpenTemplateHdl(Link<ThumbnailViewItem*,void>());
- mpSearchView->setItemStateHdl(Link<>());
+ mpSearchView->setItemStateHdl(Link<const ThumbnailViewItem*,void>());
mpSearchView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>());
mpTabControl.clear();
@@ -553,7 +553,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox, void)
}
}
-IMPL_LINK(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem, void)
{
const TemplateContainerItem *pCntItem = dynamic_cast<const TemplateContainerItem*>(pItem);
@@ -561,8 +561,6 @@ IMPL_LINK(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*, pItem
OnRegionState(pItem);
else
OnTemplateState(pItem);
-
- return 0;
}
IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu)
commit ce7cec07d37747051172ebc9864c016ccf34fe14
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 13 10:00:17 2015 +0200
remove unused code
Change-Id: I5bd42970f485bd1456f8c81934ee23e09a37a6bf
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index a68f0b7..04a9b2d 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -119,8 +119,6 @@ public:
const long nPadding, sal_uInt32 nMaxTextLength,
const ThumbnailItemAttributes *pAttrs);
- void setSelectClickHdl (const Link<> &link);
-
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
void addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq);
@@ -135,7 +133,6 @@ protected:
Point maTextPos;
Point maPrev1Pos;
Rectangle maDrawArea;
- Link<> maClickHdl;
bool mbEditTitle;
VclPtr<VclMultiLineEdit> mpTitleED;
Rectangle maTextEditMaxArea;
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 1db333e..3fe237f 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -179,8 +179,6 @@ void TemplateAbstractView::insertItem(const TemplateItemProperties &rTemplate)
pChild->maPreview1 = TemplateAbstractView::getDefaultThumbnail(pCur->aPath);
}
- pChild->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
-
AppendItem(pChild);
CalculateItemPositions();
@@ -208,8 +206,6 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties>
pChild->maPreview1 = TemplateAbstractView::getDefaultThumbnail(pCur->aPath);
}
- pChild->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
-
aItems[i] = pChild;
}
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 1dc61c1..e138b88 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -71,7 +71,6 @@ void TemplateLocalView::Populate ()
TemplateContainerItem* pItem = new TemplateContainerItem( *this, i+1 );
pItem->mnRegionId = i;
pItem->maTitle = aRegionName;
- pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
sal_uInt16 nEntries = mpDocTemplates->GetCount(i);
@@ -139,7 +138,6 @@ void TemplateLocalView::showRootRegion()
pItem->mnRegionId = pCur->mnRegionId;
pItem->maTitle = pCur->maTitle;
pItem->maTemplates = pCur->maTemplates;
- pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
items[i] = pItem;
}
@@ -270,14 +268,12 @@ sal_uInt16 TemplateLocalView::createRegion(const OUString &rName)
TemplateContainerItem* pItem = new TemplateContainerItem( *this, nItemId );
pItem->mnRegionId = nRegionId;
pItem->maTitle = aRegionName;
- pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
maRegions.push_back(pItem);
pItem = new TemplateContainerItem(*this, nItemId);
pItem->mnRegionId = nRegionId;
pItem->maTitle = aRegionName;
- pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
AppendItem(pItem);
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 16fc7e2..fa6a009 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -42,7 +42,6 @@ void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionI
pItem->maTitle = rTitle;
pItem->setSubTitle(rSubtitle);
pItem->setPath(rPath);
- pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
ThumbnailView::AppendItem(pItem);
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 68586ba..ba82a1e 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -259,11 +259,6 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con
maTextEditMaxArea = Rectangle( aPos, aEditSize );
}
-void ThumbnailViewItem::setSelectClickHdl (const Link<> &link)
-{
- maClickHdl = link;
-}
-
void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs)
{
commit 200e336d1d5c036b5ecd308d93e4131274b1efb8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 13 09:33:14 2015 +0200
make Link<> instances typed
Change-Id: I7d20875cc498d54140cfe75b21373fdab9c369ce
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 0c3e212..b273476 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -86,7 +86,7 @@ public:
void SetNumberFormatList( const SvxNumberInfoItem& rItem )
{ SetInfoItem( rItem ); }
- void SetOkHdl( const Link<>& rOkHandler );
+ void SetOkHdl( const Link<SfxPoolItem*,void>& rOkHandler );
void HideLanguage(bool nFlag=true);
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -124,7 +124,7 @@ private:
SvxNumberInfoItem* pNumItem;
SvxNumberFormatShell* pNumFmtShell;
sal_uLong nInitFormat;
- Link<> fnOkHdl;
+ Link<SfxPoolItem*,void> fnOkHdl;
bool bNumItemFlag; ///< for handling with DocShell
bool bOneAreaFlag;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 6883044..de90abb 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1724,7 +1724,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
#*
#************************************************************************/
-void SvxNumberFormatTabPage::SetOkHdl( const Link<>& rOkHandler )
+void SvxNumberFormatTabPage::SetOkHdl( const Link<SfxPoolItem*,void>& rOkHandler )
{
fnOkHdl = rOkHandler;
}
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 77e6267..0123830 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -93,15 +93,17 @@ namespace sfx2
class SfxLinkItem : public SfxPoolItem
{
- Link<> aLink;
+ Link<SfxPoolItem*, void> aLink;
public:
+ SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem*, void>& rValue ) : SfxPoolItem( nWhichId )
+ { aLink = rValue; }
+
virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE
{ return new SfxLinkItem( *this ); }
virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE
{ return static_cast<const SfxLinkItem&>(rL).aLink == aLink; }
- SfxLinkItem( sal_uInt16 nWhichId, const Link<>& rValue ) : SfxPoolItem( nWhichId )
- { aLink = rValue; }
- const Link<>& GetValue() const { return aLink; }
+ const Link<SfxPoolItem*, void>&
+ GetValue() const { return aLink; }
};
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index c6aa1e1..026868b 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -117,7 +117,7 @@ public:
void setOpenRegionHdl(const Link<void*,void> &rLink);
- void setOpenTemplateHdl (const Link<> &rLink);
+ void setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink);
static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
@@ -141,8 +141,8 @@ protected:
VclPtr<PushButton> maAllButton;
VclPtr<FixedText> maFTName;
- Link<void*,void> maOpenRegionHdl;
- Link<> maOpenTemplateHdl;
+ Link<void*,void> maOpenRegionHdl;
+ Link<ThumbnailViewItem*,void> maOpenTemplateHdl;
};
#endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 64323fb..2b0426e 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -78,7 +78,7 @@ private:
DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*);
DECL_LINK_TYPED(OpenRegionHdl, void*, void);
- DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
+ DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void);
DECL_LINK(SearchUpdateHdl, void*);
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 9148f7e..6bf0f36 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -88,11 +88,9 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
}
}
-IMPL_LINK_NOARG(ScAttrDlg, OkHandler)
+IMPL_LINK_NOARG_TYPED(ScAttrDlg, OkHandler, SfxPoolItem*, void)
{
- ((Link<>&)GetOKButton().GetClickHdl()).Call( NULL );
-
- return 0;
+ GetOKButton().GetClickHdl().Call( NULL );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 456274c..4dfe613 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -38,7 +38,7 @@ protected:
virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE;
private:
- DECL_LINK( OkHandler, void* ); // for closing by double clicking in TabPages
+ DECL_LINK_TYPED( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages
sal_uInt16 m_nNumberPageId;
sal_uInt16 m_nFontPageId;
};
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 3be294c..1db333e 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -224,7 +224,7 @@ void TemplateAbstractView::setOpenRegionHdl(const Link<void*,void> &rLink)
maOpenRegionHdl = rLink;
}
-void TemplateAbstractView::setOpenTemplateHdl(const Link<> &rLink)
+void TemplateAbstractView::setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
{
maOpenTemplateHdl = rLink;
}
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 30cd035..16fc7e2 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -19,7 +19,7 @@ TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle)
VCL_BUILDER_FACTORY(TemplateSearchView)
-void TemplateSearchView::setOpenTemplateHdl(const Link<> &rLink)
+void TemplateSearchView::setOpenTemplateHdl(const Link<ThumbnailViewItem*, void> &rLink)
{
maOpenTemplateHdl = rLink;
}
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index d267e3b9..a6eabce 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED( BackingWindow, OpenRegionHdl, void*, void)
maSelTemplates.clear();
}
-IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
+IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void)
{
if (!mbIsSaveMode)
{
@@ -681,8 +681,6 @@ IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
{
}
}
-
- return 0;
}
struct ImplDelayedDispatch
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 50b3fb4..5c8dd07 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -109,7 +109,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void);
DECL_LINK(ExtLinkClickHdl, Button*);
DECL_LINK_TYPED(OpenRegionHdl, void*, void);
- DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
+ DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void);
void initControls();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index cfe7832..275b8e5 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -313,14 +313,14 @@ void SfxTemplateManagerDlg::dispose()
// Ignore view events since we are cleaning the object
mpLocalView->setItemStateHdl(Link<>());
mpLocalView->setOpenRegionHdl(Link<void*,void>());
- mpLocalView->setOpenTemplateHdl(Link<>());
+ mpLocalView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>());
mpRemoteView->setItemStateHdl(Link<>());
mpRemoteView->setOpenRegionHdl(Link<void*,void>());
- mpRemoteView->setOpenTemplateHdl(Link<>());
+ mpRemoteView->setOpenTemplateHdl(Link<ThumbnailViewItem*,void>());
mpSearchView->setItemStateHdl(Link<>());
- mpSearchView->setOpenTemplateHdl(Link<>());
+ mpSearchView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>());
mpTabControl.clear();
mpSearchEdit.clear();
@@ -684,7 +684,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void)
mpActionBar->Show();
}
-IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void)
{
if (!mbIsSaveMode)
{
@@ -710,8 +710,6 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem)
Close();
}
-
- return 0;
}
IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx
index 86551f3..69873c6 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -18,7 +18,7 @@ public:
TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL);
- void setOpenTemplateHdl (const Link<> &rLink);
+ void setOpenTemplateHdl (const Link<ThumbnailViewItem*, void> &rLink);
void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
const OUString &rTitle, const OUString &rSubtitle,
@@ -28,7 +28,7 @@ protected:
virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
protected:
- Link<> maOpenTemplateHdl;
+ Link<ThumbnailViewItem*, void> maOpenTemplateHdl;
};
#endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 3848662..ccb64a1 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -106,7 +106,7 @@ class SwNavigationPI : public vcl::Window,
DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void );
DECL_LINK( EditAction, NumEditAction * );
DECL_LINK( EditGetFocus, NumEditAction * );
- DECL_LINK( DoneLink, SfxPoolItem * );
+ DECL_LINK_TYPED( DoneLink, SfxPoolItem *, void );
DECL_LINK( MenuSelectHdl, Menu * );
DECL_LINK_TYPED( ChangePageHdl, Idle*, void );
DECL_LINK( PageEditModifyHdl, void* );
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 54b3323..8b5700d 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1076,7 +1076,7 @@ void SwNavigationPI::UpdateListBox()
aDocListBox->SetUpdateMode(true);
}
-IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
+IMPL_LINK_TYPED(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void)
{
const SfxViewFrameItem* pFrameItem = PTR_CAST(SfxViewFrameItem, pItem );
if( pFrameItem )
@@ -1096,7 +1096,6 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
aContentTree->Update();
}
}
- return 0;
}
OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
More information about the Libreoffice-commits
mailing list