Kaydet (Commit) ca83aad3 authored tarafından Noel Grandin's avatar Noel Grandin

convert dialog result methods from long->sal_Int32

Change-Id: Id3c56a2c9f8f8813e3bbff4c4ae9156b2185fc9c
Reviewed-on: https://gerrit.libreoffice.org/41206Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f80385d4
......@@ -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);
}
......
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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();
}
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment