diff options
| author | Ocke Janssen <oj@openoffice.org> | 2002-08-21 11:23:43 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2002-08-21 11:23:43 +0000 |
| commit | 6c87801b73f0d94cf414dbd2e7aeb9b8689a2068 (patch) | |
| tree | e44a936cc0cac5ee51601993d72b0488595af27d /sw/source/ui/inc/mailmrge.hxx | |
| parent | 90129b85bae7742cae0822d1f384140c495dc41e (diff) | |
#102514# #63936# #98342# make some changes to common database access
Diffstat (limited to 'sw/source/ui/inc/mailmrge.hxx')
| -rw-r--r-- | sw/source/ui/inc/mailmrge.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index 73af4df9605e..89c4405f4d3d 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: os $ $Date: 2001-06-08 13:47:32 $ + * last change: $Author: oj $ $Date: 2002-08-21 12:23:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,7 +160,7 @@ class SwMailMergeDlg : public SvxStandardDialog const String& rTableName; USHORT nMergeType; - ::com::sun::star::uno::Sequence< sal_Int32 > aSelection; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; @@ -179,13 +179,13 @@ public: const String& rSourceName, const String& rTblName, sal_Int32 nCommandType, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - ::com::sun::star::uno::Sequence< sal_Int32 >* pSelection = 0); + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); ~SwMailMergeDlg(); inline USHORT GetMergeType() { return nMergeType; } - const ::com::sun::star::uno::Sequence< sal_Int32 > GetSelection() const{return aSelection;} - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet(); + 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; }; |