cui/source/factory/dlgfact.cxx | 2 +- cui/source/factory/dlgfact.hxx | 2 +- cui/source/inc/cuigaldlg.hxx | 2 +- include/svx/svxdlg.hxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 042d9a5a71b9a21fca144123f82141f92f305169 Author: Noel Grandin <[email protected]> Date: Mon Dec 11 14:34:35 2017 +0200 sal_uIntPtr->sal_uInt32 in AbstractGalleryIdDialog to match the underlying call to SetId in GalleryTheme Change-Id: If862c1f7c2d7c05484347ef46a9d504e95686ec7 Reviewed-on: https://gerrit.libreoffice.org/46273 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ca9fb47b02b6..51d4d26b7be5 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -417,7 +417,7 @@ OUString AbstractTitleDialog_Impl::GetTitle() const return pDlg->GetTitle(); } -sal_uLong AbstractGalleryIdDialog_Impl::GetId() const +sal_uInt32 AbstractGalleryIdDialog_Impl::GetId() const { return pDlg->GetId(); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index e9d61e3bcf93..c3240f954532 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -225,8 +225,8 @@ class GalleryIdDialog; class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog { DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog) - virtual sal_uLong GetId() const override ; + virtual sal_uInt32 GetId() const override; }; class URLDlg; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 55e4402b2ced..7c6cda281bec 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -191,7 +191,7 @@ public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog() override; virtual void dispose() override; - sal_uLong GetId() const { return m_pLbResName->GetSelectedEntryPos(); } + sal_uInt32 GetId() const { return m_pLbResName->GetSelectedEntryPos(); } }; class GalleryThemeProperties : public SfxTabDialog diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 63b1190df9a5..67f06b9e1a02 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -123,7 +123,7 @@ class AbstractGalleryIdDialog :public VclAbstractDialog protected: virtual ~AbstractGalleryIdDialog() override = default; public: - virtual sal_uIntPtr GetId() const =0; + virtual sal_uInt32 GetId() const =0; }; class AbstractURLDlg :public VclAbstractDialog _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
