#105490# MailMerge usability

3 files changed, 31 insertions, 9 deletions

diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 5ca054561bf7..68c8c15230be 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.hrc,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: os $ $Date: 2002-08-23 10:26:12 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:14:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,7 @@
 //Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist.
 #define RID_SW_NAME                 ( RC_APP_BEGIN + 8)
 #define MSG_SAVEAS_HTML_QUERY       ( RC_APP_BEGIN + 9)
-#define MSG_INDEX_OVERFLOW          ( RC_APP_BEGIN + 10)
+
 
 #define STR_UNBENANNT               (RC_APP_BEGIN + 13)
 #define STR_VERSION                 (RC_APP_BEGIN + 14)
@@ -118,7 +118,10 @@
 #define STR_REDLINE_UNKNOWN_AUTHOR  (RC_APP_BEGIN + 76)
 #define STR_WESTERN_FONT            (RC_APP_BEGIN + 77)
 #define STR_CJK_FONT                (RC_APP_BEGIN + 78)
-
+#define MSG_INS_MERGE_FIELDS        (RC_APP_BEGIN + 79)
+#define MSG_PRINT_AS_MERGE          (RC_APP_BEGIN + 80)
+#define MSG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 81)
+#define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82)
 #define SID_TOGGLETOOLBOX           (RC_APP_BEGIN + 89)
 
 #define STR_ENV_TITLE               (RC_APP_BEGIN + 91)
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx
index 01be0b38c516..17279d27bdf0 100644
--- a/sw/source/ui/inc/dbconfig.hxx
+++ b/sw/source/ui/inc/dbconfig.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbconfig.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-06-25 14:46:04 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:14:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,13 +68,15 @@ struct SwDBData;
 class SwDBConfig : public utl::ConfigItem
 {
     const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
-    SwDBData*       pImpl;
+    SwDBData*       pAdrImpl;
+    SwDBData*       pBibImpl;
 public:
     SwDBConfig();
     virtual ~SwDBConfig();
 
     void                    Load();
     const SwDBData&         GetAddressSource();
+    const SwDBData&         GetBibliographySource();
 };
 
 #endif
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index 89c4405f4d3d..b187a375dece 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.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-21 12:23:41 $
+ *  last change: $Author: os $ $Date: 2002-11-29 12:14:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,6 +188,23 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
 
 };
+/* -----------------27.11.2002 12:05-----------------
+ *
+ * --------------------------------------------------*/
+class SwMailMergeCreateFromDlg : public ModalDialog
+{
+    FixedLine       aCreateFromFL;
+    RadioButton     aThisDocRB;
+    RadioButton     aUseTemplateRB;
 
+    OKButton        aOK;
+    CancelButton    aCancel;
+    HelpButton      aHelp;
+public:
+    SwMailMergeCreateFromDlg(Window* pParent);
+    ~SwMailMergeCreateFromDlg();
+
+    BOOL    IsThisDocument() const {return aThisDocRB.IsChecked();}
+};
 #endif