[Libreoffice-commits] core.git: cui/source include/vcl sw/inc sw/source

[Noel Grandin]

 cui/source/factory/dlgfact.cxx    |    4 ++--
 cui/source/factory/dlgfact.hxx    |    4 ++--
 include/vcl/abstdlg.hxx           |    4 ++--
 sw/inc/swabstdlg.hxx              |    2 +-
 sw/source/ui/dialog/swdlgfact.cxx |    4 ++--
 sw/source/ui/dialog/swdlgfact.hxx |    4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit ca83aad3703a2c3b28eb7cca43f3b6d2e9351aa4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Aug 16 10:37:26 2017 +0200

    convert dialog result methods from long->sal_Int32
    
    Change-Id: Id3c56a2c9f8f8813e3bbff4c4ae9156b2185fc9c
    Reviewed-on: https://gerrit.libreoffice.org/41206
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 05c834392c11..d49a73467796 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -160,7 +160,7 @@ void  VclAbstractDialog2_Impl::StartExecuteModal( const Link<Dialog&,void>& rEnd
 }
 
 // virtual
-long VclAbstractDialog2_Impl::GetResult()
+sal_Int32 VclAbstractDialog2_Impl::GetResult()
 {
     return m_pDlg->GetResult();
 }
@@ -236,7 +236,7 @@ SvxDistributeVertical AbstractSvxDistributeDialog_Impl::GetDistributeVer()const
     return pDlg->GetDistributeVer();
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::EndDialog(long nResult)
+void AbstractHangulHanjaConversionDialog_Impl::EndDialog(sal_Int32 nResult)
 {
     pDlg->EndDialog(nResult);
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index e333254d3cc8..a6ce3a9ac050 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -84,7 +84,7 @@ public:
     virtual         ~VclAbstractDialog2_Impl() override;
     virtual void    dispose() override;
     virtual void    StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override;
-    virtual long    GetResult() override;
+    virtual sal_Int32 GetResult() override;
 private:
     DECL_LINK( EndDialogHdl, Dialog&, void );
 };
@@ -135,7 +135,7 @@ public:
 class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog
 {
     DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog)
-    virtual void      EndDialog(long nResult) override;
+    virtual void      EndDialog(sal_Int32 nResult) override;
     virtual void      EnableRubySupport( bool _bVal ) override;
     virtual void      SetByCharacter( bool _bByCharacter ) override ;
     virtual void      SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) override;
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 5303165f2e9b..40f75ed293b6 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -55,7 +55,7 @@ protected:
     virtual             ~VclAbstractDialog2() override;
 public:
     virtual void        StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) = 0;
-    virtual long        GetResult() = 0;
+    virtual sal_Int32   GetResult() = 0;
 };
 
 class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog
@@ -63,7 +63,7 @@ class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog
 protected:
     virtual             ~VclAbstractTerminatedDialog() override = default;
 public:
-    virtual void        EndDialog(long nResult) = 0;
+    virtual void        EndDialog(sal_Int32 nResult) = 0;
 };
 
 class VCL_DLLPUBLIC VclAbstractRefreshableDialog : public VclAbstractDialog
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;