summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-09-02 15:59:16 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-09-03 07:21:26 +0000
commit411e32244c7bff5fb64a049b1c63cf15ac166cd3 (patch)
treecb24cba623bc3dd64bca0352e230e8508631ac0a /dbaccess
parent37603521c0a6a0a34174a5020a6999ffb9d041d8 (diff)
convert Link<> to typed
Change-Id: Ic15d0539aa00b46694a1715b6dda9d78bb1c00d8 Reviewed-on: https://gerrit.libreoffice.org/18269 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx4
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx3
-rw-r--r--dbaccess/source/ui/inc/JoinDesignView.hxx4
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/VertSplitView.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwview.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx3
11 files changed, 13 insertions, 18 deletions
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index f702fe55c1c6..aad77d2e31d8 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -139,13 +139,11 @@ void UnoDataBrowserView::dispose()
ODataView::dispose();
}
-IMPL_LINK_NOARG( UnoDataBrowserView, SplitHdl )
+IMPL_LINK_NOARG_TYPED( UnoDataBrowserView, SplitHdl, Splitter*, void )
{
long nYPos = m_pSplitter->GetPosPixel().Y();
m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nYPos ) );
Resize();
-
- return 0L;
}
void UnoDataBrowserView::setSplitter(Splitter* _pSplitter)
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 469536b9af6f..d13f0bc8d248 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -50,7 +50,7 @@ void OSplitterView::dispose()
vcl::Window::dispose();
}
-IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ )
+IMPL_LINK_NOARG_TYPED( OSplitterView, SplitHdl, Splitter*, void )
{
OSL_ENSURE(m_pSplitter, "Splitter is NULL!");
if ( m_bVertical )
@@ -62,7 +62,6 @@ IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ )
m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) );
Resize();
- return 0L;
}
void OSplitterView::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index a292b36001ec..4a22a2a02994 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -23,6 +23,8 @@
#include <dbaccess/dataview.hxx>
#include "QEnumTypes.hxx"
+class Splitter;
+
namespace dbaui
{
class OJoinController;
@@ -61,7 +63,7 @@ namespace dbaui
protected:
// return the Rectangle where I can paint myself
virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE;
- DECL_LINK( SplitHdl, void* );
+ DECL_LINK_TYPED( SplitHdl, Splitter*, void );
};
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 64d8fae01233..d54b74a7c517 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -151,7 +151,7 @@ namespace dbaui
protected:
// return the Rectangle where I can paint myself
virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE;
- DECL_LINK( SplitHdl, void* );
+ DECL_LINK_TYPED( SplitHdl, Splitter*, void );
private:
using OQueryView::SaveTabWinUIConfig;
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 8b960403a723..9a6fbec1aa73 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -38,7 +38,7 @@ namespace dbaui
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
void ArrangeChildren( long nSplitPos ,Rectangle& rRect);
- DECL_LINK( SplitHdl, Splitter* );
+ DECL_LINK_TYPED( SplitHdl, Splitter*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index ac7bde548eed..dcc6deddedc3 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -33,7 +33,7 @@ namespace dbaui
bool m_bVertical;
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
- DECL_LINK( SplitHdl, Splitter* );
+ DECL_LINK_TYPED( SplitHdl, Splitter*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index 4b350c89b125..4c116418f397 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -51,7 +51,7 @@ namespace dbaui
mutable VclPtr<SbaGridControl> m_pVclControl; // our grid's VCL representation
VclPtr<vcl::Window> m_pStatus;
- DECL_LINK( SplitHdl, void* );
+ DECL_LINK_TYPED( SplitHdl, Splitter*, void );
// attribute access
public:
css::uno::Reference< css::awt::XControl > getGridControl() const { return m_xGrid; }
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 735e60ed0f16..fd84eb52b293 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -46,7 +46,7 @@ namespace dbaui
VclPtr<Splitter> m_pSplitter;
css::uno::Reference< css::frame::XFrame2 > m_xBeamer;
- DECL_LINK( SplitHdl, void* );
+ DECL_LINK_TYPED( SplitHdl, Splitter*, void );
public:
OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >&);
virtual ~OQueryContainerWindow();
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 7f1932ce502e..764643d7f011 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2527,7 +2527,7 @@ void OQueryDesignView::dispose()
OQueryView::dispose();
}
-IMPL_LINK_NOARG( OQueryDesignView, SplitHdl )
+IMPL_LINK_NOARG_TYPED( OQueryDesignView, SplitHdl, Splitter*, void )
{
if (!getController().isReadOnly())
{
@@ -2538,7 +2538,6 @@ IMPL_LINK_NOARG( OQueryDesignView, SplitHdl )
Resize();
m_bInSplitHandler = true;
}
- return 0L;
}
void OQueryDesignView::Construct()
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index edf49a59f14d..a3fffc9b179a 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -133,12 +133,10 @@ namespace dbaui
if(m_pViewSwitch)
m_pViewSwitch->GrabFocus();
}
- IMPL_LINK_NOARG( OQueryContainerWindow, SplitHdl )
+ IMPL_LINK_NOARG_TYPED( OQueryContainerWindow, SplitHdl, Splitter*, void )
{
m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) );
Resize();
-
- return 0L;
}
void OQueryContainerWindow::Construct()
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 90e012ff5d93..2c0259037d10 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -105,14 +105,13 @@ void OTableBorderWindow::Resize()
Size(nOutputWidth, nOutputHeight-nSplitPos-nSplitterHeight) );
}
-IMPL_LINK( OTableBorderWindow, SplitHdl, Splitter*, pSplit )
+IMPL_LINK_TYPED( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void )
{
if(pSplit == m_aHorzSplitter.get())
{
m_aHorzSplitter->SetPosPixel( Point( m_aHorzSplitter->GetPosPixel().X(),m_aHorzSplitter->GetSplitPosPixel() ) );
Resize();
}
- return 0;
}
void OTableBorderWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )