summaryrefslogtreecommitdiff
path: root/sw/source/ui/inc/mailmrge.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/inc/mailmrge.hxx')
-rw-r--r--sw/source/ui/inc/mailmrge.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index e1f9f355c96a..43534f76a3da 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/ui/inc/mailmrge.hxx
@@ -126,7 +126,7 @@ class SwMailMergeDlg : public SvxStandardDialog
const String& rDBName;
const String& rTableName;
- USHORT nMergeType;
+ sal_uInt16 nMergeType;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
@@ -155,7 +155,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0);
~SwMailMergeDlg();
- inline USHORT GetMergeType() { return nMergeType; }
+ inline sal_uInt16 GetMergeType() { return nMergeType; }
const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;}
inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
@@ -177,7 +177,7 @@ public:
SwMailMergeCreateFromDlg(Window* pParent);
~SwMailMergeCreateFromDlg();
- BOOL IsThisDocument() const {return aThisDocRB.IsChecked();}
+ sal_Bool IsThisDocument() const {return aThisDocRB.IsChecked();}
};
/* -----------------04.02.2003 13:41-----------------
*
@@ -197,7 +197,7 @@ public:
SwMailMergeFieldConnectionsDlg(Window* pParent);
~SwMailMergeFieldConnectionsDlg();
- BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();}
+ sal_Bool IsUseExistingConnections() const {return aUseExistingRB.IsChecked();}
};
#endif