diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index b7804eb0ff70..28310b054216 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbaccess_helpid.hrc,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-24 14:35:08 $
+ *  last change: $Author: fs $ $Date: 2001-04-26 12:11:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -252,6 +252,8 @@
 #define HID_BROWSER_COLUMNINFO                      (HID_DBACCESS_START + 160)
 #define HID_DSADMIN_USECATALOG                      (HID_DBACCESS_START + 161)
 #define HID_BROWSER_VIEW_CREATE_DESIGN              (HID_DBACCESS_START + 162)
+#define HID_DSADMIN_DOCUMENTS                       (HID_DBACCESS_START + 163)
+#define HID_DSADMIN_DOCUMENTLINKS                   (HID_DBACCESS_START + 164)
 
 // don't forget to update the file util/hidother.src
 #endif // _DBA_DBACCESS_HELPID_HRC_
@@ -259,6 +261,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.27  2001/04/24 14:35:08  oj
+ *  new helpids
+ *
  *  Revision 1.26  2001/04/24 08:34:41  oj
  *  wrong hid name
  *
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index d9f3591585cb..e5040d4bc5cf 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbumiscres.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2001-03-19 11:35:13 $
+ *  last change: $Author: fs $ $Date: 2001-04-26 12:08:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,51 +188,25 @@ String STR_OBJECT_ALREADY_EXSISTS
     Text[ arabic ] = "ÎØà ÃËäÇÁ ÇáÅäÔÇÁ!";
 };
 
+String STR_UNEXPECTED_ERROR
+{
+    Text = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgeführt werden.";
+    Text [ english ] = "An unexpected error occured. The operation could not be completed.";
+    Text [ english_us ] = "An unexpected error occured. The operation could not be completed.";
+};
+
+String STR_COULDNOTOPEN_LINKEDDOC
+{
+    Text = "Das Dokument\n\n$file$\n\nkonnte nicht geöffnet werden.";
+    Text [ english ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text [ english_us ] = "Th document\n\n$file$\n\ncould not be opened.";
+};
+
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
- *  Revision 1.14  2001/03/14 09:16:28  fs
- *  wrong texts in the semicolon-separated lists (english_us)
- *
- *  Revision 1.13  2001/03/09 20:39:55  kz
- *  Merge SRC624: 09.03.01 - 21:40:01 (NoBranch)
- *
- *  Revision 1.12  2001/02/13 09:48:18  fs
- *  #83632# merge IBMPC, IBMPC(850), DOS
- *
- *  Revision 1.11  2001/01/30 09:46:40  fs
- *  add the 'spreadsheet' to english_us, too
- *
- *  Revision 1.10  2001/01/29 16:02:05  nn
- *  added DST_CALC
- *
- *  Revision 1.9  2001/01/11 09:20:21  oj
- *  #81232# new string
- *
- *  Revision 1.8  2001/01/04 11:21:03  fs
- *  #81485# added dsn type ADO
- *
- *  Revision 1.7  2000/12/14 11:22:34  nf
- *  Replacement of StarPortal: Sun Webtop
- *
- *  Revision 1.6  2000/12/14 10:52:01  fs
- *  #81961# added a comment for the translation department
- *
- *  Revision 1.5  2000/11/29 09:47:29  kz
- *  Merge SRC614: 29.11.00 - 10:46:51 (NoBranch)
- *
- *  Revision 1.4  2000/11/21 15:01:37  oj
- *  #80549# wrong dsn for text
- *
- *  Revision 1.3  2000/10/27 15:17:01  kz
- *  Merge SRC610: 27.10.00 - 17:16:44 (NoBranch)
- *
- *  Revision 1.2  2000/10/19 13:42:45  fs
- *  URL prefix for text files is sdbc:flat:file:, not sdbc:text:
- *
- *  Revision 1.1  2000/10/05 10:09:02  fs
- *  initial checkin
- *
+ *  Revision 1.15  2001/03/19 11:35:13  kz
+ *  Merge SRC625: 19.03.01 - 12:35:02 (NoBranch)
  *
  *  Revision 1.0 26.09.00 08:26:13  fs
  ************************************************************************/
diff --git a/dbaccess/source/ui/misc/makefile.mk b/dbaccess/source/ui/misc/makefile.mk
index 2229011b51c2..4fb05f881a43 100644
--- a/dbaccess/source/ui/misc/makefile.mk
+++ b/dbaccess/source/ui/misc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: fs $ $Date: 2001-04-11 12:57:56 $
+#   last change: $Author: fs $ $Date: 2001-04-26 12:08:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -82,6 +82,9 @@ SRCFILES =	\
 # ... object files ............................
 
 SLOFILES=	\
+        $(SLO)$/documentautolinker.obj		\
+        $(SLO)$/linkeddocuments.obj			\
+        $(SLO)$/filenotation.obj			\
         $(SLO)$/indexcollection.obj			\
         $(SLO)$/UITools.obj					\
         $(SLO)$/WCPage.obj					\