diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-22 16:18:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-22 18:57:16 +0000 |
| commit | efeb9281535f9e32a1d23332a19da69767dd1387 (patch) | |
| tree | 8a78e678e2b640ac9d7fe366eae1f09d16ff4767 /cui | |
| parent | 0554e83ca9968e2301934bb2f420c9b9faee5681 (diff) | |
convert Link<> to typed
Change-Id: I12b3fdb443226a63786b94ce9836e9d2efa6a5c8
Reviewed-on: https://gerrit.libreoffice.org/18776
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 6 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/cuifmsearch.hxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 26b18e1c8311..8b3803186db0 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -74,7 +74,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) } FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link<>& lnkContextSupplier) + const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) :ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui") ,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) ) ,m_pPreSearchFocus( NULL ) @@ -115,7 +115,7 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex FmSearchContext fmscInitial; fmscInitial.nContext = nInitialContext; - m_lnkContextSupplier.Call(&fmscInitial); + m_lnkContextSupplier.Call(fmscInitial); DBG_ASSERT(fmscInitial.xCursor.is(), "FmSearchDialog::FmSearchDialog : invalid data supplied by ContextSupplier !"); DBG_ASSERT(comphelper::string::getTokenCount(fmscInitial.strUsedFields, ';') == (sal_Int32)fmscInitial.arrFields.size(), "FmSearchDialog::FmSearchDialog : invalid data supplied by ContextSupplied !"); @@ -520,7 +520,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) FmSearchContext fmscContext; fmscContext.nContext = nContext; - sal_uInt32 nResult = m_lnkContextSupplier.Call(&fmscContext); + sal_uInt32 nResult = m_lnkContextSupplier.Call(fmscContext); DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !"); // put the field names into the respective listbox diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f18a3ec86cb1..9f39f38c432c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1266,7 +1266,7 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::W const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link<>& lnkContextSupplier) + const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) { VclPtrInstance<FmSearchDialog> pDlg( pParent, strInitialText, _rContexts, nInitialContext, lnkContextSupplier ); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 7b803b4e2699..4c8b228850d1 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -606,7 +606,7 @@ public: const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link<>& lnkContextSupplier) SAL_OVERRIDE; + const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index fb1d9b27b936..42a9fab92c1c 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -81,7 +81,7 @@ class FmSearchDialog : public ModalDialog Link<> m_lnkFoundHandler; ///< Handler for "found" Link<> m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors - Link<> m_lnkContextSupplier; ///< for search in contexts + Link<FmSearchContext&,sal_uInt32> m_lnkContextSupplier; ///< for search in contexts /// memorize the currently selected field for every context ::std::vector<OUString> m_arrContextFields; @@ -108,7 +108,7 @@ public: arrFields of the context) */ FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link<>& lnkContextSupplier); + const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier); virtual ~FmSearchDialog(); virtual void dispose() SAL_OVERRIDE; |