diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-03 12:54:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-03 22:24:23 +0200 |
| commit | e44db461ca135fcbef7854c7304c894b65fcd497 (patch) | |
| tree | bf24b37c2abdbddcde0eaee322d09c61c93569e7 /svx/source | |
| parent | 446f4b086ccd4cdb9524637e4808dbe6b7d40f7e (diff) | |
Ensure that VCL builder entry points use proper function type
This removes duplicating typedefs from NotebookBarAddonsMerger,
and removes dependency of include/vcl/builder.hxx on
include/vcl/NotebookBarAddonsMerger.hxx.
Change-Id: Ica5787c934d1b8ce21623f28ce155337637fdf54
Reviewed-on: https://gerrit.libreoffice.org/78549
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/relfld.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index a51290c0df9b..b30d234aed4a 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -95,6 +95,8 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { + static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>, + decltype(makeSvxLanguageBox)>); WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = BuilderUtils::extractDropdown(rMap); if (bDropdown) @@ -108,6 +110,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageBox(VclPtr<vcl::Window> & rR extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { + static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>, + decltype(makeSvxLanguageComboBox)>); WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = BuilderUtils::extractDropdown(rMap); if (bDropdown) diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index fc2c7a4df643..47642e3ec716 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -32,6 +32,8 @@ SvxRelativeField::SvxRelativeField( extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { + static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>, + decltype(makeSvxRelativeField)>); OUString const custom(BuilderUtils::extractCustomProperty(rMap)); FieldUnit const eUnit(BuilderUtils::detectUnit(custom)); rRet = VclPtr<SvxRelativeField>::Create(pParent, diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 0eec2058e451..68a6aaea3313 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -43,6 +43,8 @@ SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ) extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) { + static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>, + decltype(makeSvxTextEncodingBox)>); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; bool bDropdown = BuilderUtils::extractDropdown(rMap); if (bDropdown) |