INTEGRATION: CWS os47 (1.3.882); FILE MERGED

2004/12/30 12:50:23 os 1.3.882.2: #i30916# mail merge API: added e-Mail, merge to single file, more printer properties
2004/12/23 12:21:48 os 1.3.882.1: #i30916# extended mail merge API - support of printer settings, file filters, e-Mail and more

1 files changed, 43 insertions, 19 deletions

diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index 92f55eb4a367..2d6912f026ec 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomailmerge.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-01 15:26:18 $
+ *  last change: $Author: rt $ $Date: 2005-01-28 15:26:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,23 +99,27 @@
 #include <sfx2/objsh.hxx>   // SfxObjectShellRef
 #endif
 
-namespace com { namespace sun { namespace star { namespace sdbc {
-    class XResultSet;
-    class XConnection;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace frame {
-    class XModel;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace text {
-    class XMailMergeListener;
-    struct MailMergeEvent;
-}}}}
+namespace com { namespace sun { namespace star {
+
+    namespace sdbc {
+        class XResultSet;
+        class XConnection;
+    }
+    namespace frame {
+        class XModel;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+    namespace text {
+        class XMailMergeListener;
+        struct MailMergeEvent;
+    }
+    namespace beans{
+        struct PropertyValue;
+    }
+
+}}}
 
 namespace rtl {
     class OUString;
@@ -179,6 +183,26 @@ class SwXMailMerge :
     sal_Bool        bSinglePrintJobs;
     sal_Bool        bFileNameFromColumn;
 
+
+    ::rtl::OUString                                         sInServerPassword;
+    ::rtl::OUString                                         sOutServerPassword;
+    ::rtl::OUString                                         sSubject;
+    ::rtl::OUString                                         sAddressFromColumn;
+    ::rtl::OUString                                         sMailBody;
+    ::rtl::OUString                                         sAttachmentName;
+    ::rtl::OUString                                         sAttachmentFilter;
+    com::sun::star::uno::Sequence< ::rtl::OUString >        aCopiesTo;
+    com::sun::star::uno::Sequence< ::rtl::OUString >        aBlindCopiesTo;
+    sal_Bool                                                bSendAsHTML;
+    sal_Bool                                                bSendAsAttachment;
+
+    com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintSettings;
+
+    sal_Bool                                                bSaveAsSingleFile;
+    ::rtl::OUString                                         sSaveFilter;
+
+
+
     sal_Bool        bDisposing;