diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-26 21:48:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-26 23:00:35 +0200 |
| commit | 13cd7ea2b3123e24bb5ff29a8dcbb55a8fcf3859 (patch) | |
| tree | 981a8f5a47e3368061191f2d20729e4904f8df19 | |
| parent | ODF import: workaround dubious draw:fill="solid" on frame styles (diff) | |
| download | core-13cd7ea2b3123e24bb5ff29a8dcbb55a8fcf3859.tar.gz core-13cd7ea2b3123e24bb5ff29a8dcbb55a8fcf3859.zip | |
dbaccess: fix windows build breakage
Change-Id: I69f45dd2d7426ecd99dca7e80e98e95c3e52d4a0
| -rw-r--r-- | dbaccess/source/ui/dlg/dsselect.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dsselect.hxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index a812a6b1afcb..baa9047c6c45 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -102,7 +102,7 @@ bool ODatasourceSelectDialog::Close() } #ifdef HAVE_ODBC_ADMINISTRATION -IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) +IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void) { if ( !m_pODBCManagement.get() ) m_pODBCManagement.reset( new OOdbcManagement( LINK( this, ODatasourceSelectDialog, ManageProcessFinished ) ) ); @@ -112,7 +112,7 @@ IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) // TODO: error message m_pDatasource->GrabFocus(); m_pManageDatasources->Disable(); - return 1L; + return; } m_pDatasource->Disable(); @@ -121,7 +121,6 @@ IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) m_pManageDatasources->Disable(); SAL_WARN_IF( !m_pODBCManagement->isRunning(), "dbaccess.ui", "ODatasourceSelectDialog::ManageClickHdl: success, but not running - you were *fast*!" ); - return 0L; } IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished ) diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 2cb4cb6537e6..31c8116ba9e9 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -63,7 +63,7 @@ public: protected: DECL_LINK( ListDblClickHdl, ListBox * ); #ifdef HAVE_ODBC_ADMINISTRATION - DECL_LINK( ManageClickHdl, void* ); + DECL_LINK_TYPED(ManageClickHdl, Button*, void); DECL_LINK( ManageProcessFinished, void* ); #endif void fillListBox(const StringBag& _rDatasources); |