#105490# MailMerge usability

4 files changed, 19 insertions, 13 deletions

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 57d786cd62ef..f16669640e56 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbmgr.hxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: os $ $Date: 2002-09-18 10:39:26 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:00:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -248,8 +248,7 @@ public:
 
     // Mischen von Datensaetzen in Felder
     BOOL            MergeNew(USHORT nOpt, SwWrtShell& rSh,
-                             const ::svx::ODataAccessDescriptor& _rDescriptor,
-                             const String *pPrinter = NULL);
+                             const ::svx::ODataAccessDescriptor& _rDescriptor);
     BOOL            Merge(SwWrtShell* pSh);
     // Mischen von Datensaetzen in Felder, dann drucken
     BOOL            MergePrint( SwView& rView,
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 510f91bccf3d..358998cde73f 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editsh.hxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: os $ $Date: 2002-08-26 14:38:51 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:00:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -410,6 +410,8 @@ public:
                         SvStringsDtor* pAllDBNames = 0 );
 
     BOOL IsAnyDatabaseFieldInDoc()const;
+    //check whether DB fields point to an available data source and returns it
+    BOOL IsFieldDataSourceAvailable(String& rUsedDataSource) const;
     void UpdateExpFlds(BOOL bCloseDB = FALSE);// nur alle ExpressionFelder updaten
     void SetFixFields( BOOL bOnlyTimeDate = FALSE,
                         const DateTime* pNewDateTime = 0 );
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 9e8f40ca7738..aeac03c46f10 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helpid.h,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: os $ $Date: 2002-11-27 08:08:36 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:00:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -904,6 +904,12 @@
 #define HID_INSERT_IDX_MRK_PHONETIC_READING         (HID_BASE + 2175 )
 #define HID_COLUMN_VALUESET                         (HID_BASE + 2176 )
 #define HID_PVIEW_ZOOM_LB                           (HID_BASE + 2177 )
+#define HID_MAIL_MERGE_SELECT                       (HID_BASE + 2178 )
+#define HID_MAIL_MERGE_CREATE_FROM                  (HID_BASE + 2179 )
+#define HID_MAIL_MERGE_INSERT_FIELDS                (HID_BASE + 2180 )
+#define HID_PRINT_AS_MERGE                          (HID_BASE + 2181 )
+#define HID_MERGE_SOURCE_UNAVAILABLE                (HID_BASE + 2182 )
+#define HID_DATA_SOURCES_UNAVAILABLE                (HID_BASE + 2183 )
 
 
 
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 6fa4d4d28c8c..f1204f9c8774 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swmodule.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: os $ $Date: 2002-08-30 10:21:34 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:00:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -164,6 +164,8 @@ class SwModule: public SwModuleDummy , public SfxListener
 
     // Hint abfangen fuer DocInfo
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    // form letter execution
+    void    GenerateFormLetter(BOOL bUseCurrentDocument);
 
 protected:
     // Briefumschlaege, Etiketten
@@ -227,9 +229,6 @@ public:
     svx::ColorConfig&   GetColorConfig();
     SvtAccessibilityOptions&    GetAccessibilityOptions();
 
-    // UNO
-//  virtual Reflection* GetReflection( UsrUik aUIK );
-
     // Ueber Sichten iterieren
     static SwView*      GetFirstView();
     static SwView*      GetNextView(SwView*);