diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 10:37:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 13:03:32 +0200 |
| commit | ca83aad3703a2c3b28eb7cca43f3b6d2e9351aa4 (patch) | |
| tree | 94c77aa4cec83f4152420fa9f246281c1343c3c7 /sw | |
| parent | f80385d44814df4cef9fef025240a078f1996bec (diff) | |
convert dialog result methods from long->sal_Int32
Change-Id: Id3c56a2c9f8f8813e3bbff4c4ae9156b2185fc9c
Reviewed-on: https://gerrit.libreoffice.org/41206
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index a0b572ae0006..ba607870619d 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -113,7 +113,7 @@ public: //from class SalFrame virtual void SetWindowState( const OString & rStr ) = 0; virtual OString GetWindowState() const = 0; - virtual void EndDialog(long nResult) override = 0; + virtual void EndDialog(sal_Int32 nResult) override = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index c3d64b266ed6..9d6f17de3971 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -406,7 +406,7 @@ OString AbstractFieldInputDlg_Impl::GetWindowState() const return pDlg->GetWindowState(); } -void AbstractFieldInputDlg_Impl::EndDialog(long n) +void AbstractFieldInputDlg_Impl::EndDialog(sal_Int32 n) { pDlg->EndDialog(n); } @@ -597,7 +597,7 @@ void AbstractMailMergeWizard_Impl::StartExecuteModal( const Link<Dialog&,void>& LINK( this, AbstractMailMergeWizard_Impl, EndDialogHdl ) ); } -long AbstractMailMergeWizard_Impl::GetResult() +sal_Int32 AbstractMailMergeWizard_Impl::GetResult() { return pDlg->GetResult(); } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 93598fd0392e..d6375e95103f 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -238,7 +238,7 @@ class AbstractFieldInputDlg_Impl : public AbstractFieldInputDlg //from class SalFrame virtual void SetWindowState( const OString & rStr ) override; virtual OString GetWindowState() const override; - virtual void EndDialog(long) override; + virtual void EndDialog(sal_Int32) override; }; class SwInsFootNoteDlg; @@ -355,7 +355,7 @@ public: virtual ~AbstractMailMergeWizard_Impl() override; virtual void dispose() override; virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; - virtual long GetResult() override; + virtual sal_Int32 GetResult() override; virtual OUString GetReloadDocument() const override; virtual bool ShowPage( sal_uInt16 nLevel ) override; |